Changeset 36085 in osm for applications/editors/josm/plugins/routing/src/com/innovant/josm/plugin/routing/gui

Timestamp:

2023-05-26T16:46:48+02:00 (2 years ago)

Author:

taylor.smock

Message:

Fix #22968: ClassCastException in RoutingGraph#applyAlgorithm

The problem pretty much comes down to the active layer not being the routing
layer.

This additionally fixes many SonarLint issues and drops a dependency on log4j.

Location:

applications/editors/josm/plugins/routing/src/com/innovant/josm/plugin/routing/gui

Files:

• RoutingDialog.java (modified) (1 diff)
• RoutingMenu.java (modified) (8 diffs)
• RoutingPreferenceDialog.java (modified) (10 diffs)

applications/editors/josm/plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingDialog.java

@@ -18 +18 @@
 import com.innovant.josm.plugin.routing.RoutingLayer;
 import com.innovant.josm.plugin.routing.RoutingModel;
-
 
 /**

applications/editors/josm/plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingMenu.java

@@ -5 +5 @@
 import static org.openstreetmap.josm.tools.I18n.tr;
 
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
 import java.awt.event.ItemEvent;
-import java.awt.event.ItemListener;
 import java.awt.event.KeyEvent;
 
@@ -17 +14 @@
 import javax.swing.JRadioButtonMenuItem;
 
-import org.openstreetmap.josm.gui.MainApplication;
-import org.openstreetmap.josm.gui.MainMenu;
-
 import com.innovant.josm.jrt.core.RoutingGraph.RouteType;
 import com.innovant.josm.plugin.routing.RoutingLayer;
 import com.innovant.josm.plugin.routing.RoutingModel;
 import com.innovant.josm.plugin.routing.RoutingPlugin;
+import org.openstreetmap.josm.gui.MainApplication;
+import org.openstreetmap.josm.gui.MainMenu;
 
 /**
@@ -51 +47 @@
 
         startMI = new JMenuItem(tr("Add routing layer"));
-        startMI.addActionListener(new ActionListener() {
-            @Override
-            public void actionPerformed(ActionEvent e) {
-                RoutingPlugin.getInstance().addLayer();
-            }
-        });
+        startMI.addActionListener(e -> RoutingPlugin.getInstance().addLayer());
         menu.add(startMI);
 
@@ -66 +57 @@
         JRadioButtonMenuItem rshorter = new JRadioButtonMenuItem(tr("Shortest"));
         rshorter.setSelected(true);
-        rshorter.addItemListener(new ItemListener() {
-            @Override
-            public void itemStateChanged(ItemEvent e) {
-                if (MainApplication.getLayerManager().getActiveLayer() instanceof RoutingLayer) {
-                    RoutingLayer layer = (RoutingLayer) MainApplication.getLayerManager().getActiveLayer();
-                    RoutingModel routingModel = layer.getRoutingModel();
-                    if (e.getStateChange() == ItemEvent.SELECTED) {
-                        routingModel.routingGraph.setTypeRoute(RouteType.SHORTEST);
-                    } else {
-                        routingModel.routingGraph.setTypeRoute(RouteType.FASTEST);
-                    }
-                    //  routingModel.routingGraph.resetGraph();
-                    //  routingModel.routingGraph.createGraph();
-                    //TODO: Change this way
-                    //FIXME: do not change node but recalculate routing.
-                    routingModel.setNodesChanged();
-                    MainApplication.getMap().repaint();
+        rshorter.addItemListener(e -> {
+            if (MainApplication.getLayerManager().getActiveLayer() instanceof RoutingLayer) {
+                RoutingLayer layer = (RoutingLayer) MainApplication.getLayerManager().getActiveLayer();
+                RoutingModel routingModel = layer.getRoutingModel();
+                if (e.getStateChange() == ItemEvent.SELECTED) {
+                    routingModel.routingGraph.setTypeRoute(RouteType.SHORTEST);
+                } else {
+                    routingModel.routingGraph.setTypeRoute(RouteType.FASTEST);
                 }
+                //  routingModel.routingGraph.resetGraph();
+                //  routingModel.routingGraph.createGraph();
+                //TODO: Change this way
+                //FIXME: do not change node but recalculate routing.
+                routingModel.setNodesChanged();
+                MainApplication.getMap().repaint();
             }
-
         });
 
@@ -96 +83 @@
         criteriaM.addSeparator();
         JCheckBoxMenuItem cbmi = new JCheckBoxMenuItem(tr("Ignore oneways"));
-        cbmi.addItemListener(new ItemListener() {
-            @Override
-            public void itemStateChanged(ItemEvent e) {
-                if (MainApplication.getLayerManager().getActiveLayer() instanceof RoutingLayer) {
-                    RoutingLayer layer = (RoutingLayer) MainApplication.getLayerManager().getActiveLayer();
-                    RoutingModel routingModel = layer.getRoutingModel();
-                    if (e.getStateChange() == ItemEvent.SELECTED)
-                        routingModel.routingGraph.getRoutingProfile().setOnewayUse(false);
-                    else
-                        routingModel.routingGraph.getRoutingProfile().setOnewayUse(true);
-                    routingModel.setNodesChanged();
-                    routingModel.setOnewayChanged();
-                    MainApplication.getMap().repaint();
-                }
+        cbmi.addItemListener(e -> {
+            if (MainApplication.getLayerManager().getActiveLayer() instanceof RoutingLayer) {
+                RoutingLayer layer = (RoutingLayer) MainApplication.getLayerManager().getActiveLayer();
+                RoutingModel routingModel = layer.getRoutingModel();
+                routingModel.routingGraph.getRoutingProfile().setOnewayUse(e.getStateChange() != ItemEvent.SELECTED);
+                routingModel.setNodesChanged();
+                routingModel.setOnewayChanged();
+                MainApplication.getMap().repaint();
             }
         });
@@ -117 +98 @@
         menu.addSeparator();
         reverseMI = new JMenuItem(tr("Reverse route"));
-        reverseMI.addActionListener(new ActionListener() {
-            @Override
-            public void actionPerformed(ActionEvent e) {
-                if (MainApplication.getLayerManager().getActiveLayer() instanceof RoutingLayer) {
-                    RoutingLayer layer = (RoutingLayer) MainApplication.getLayerManager().getActiveLayer();
-                    RoutingModel routingModel = layer.getRoutingModel();
-                    routingModel.reverseNodes();
-                    MainApplication.getMap().repaint();
-                }
+        reverseMI.addActionListener(e -> {
+            if (MainApplication.getLayerManager().getActiveLayer() instanceof RoutingLayer) {
+                RoutingLayer layer = (RoutingLayer) MainApplication.getLayerManager().getActiveLayer();
+                RoutingModel routingModel = layer.getRoutingModel();
+                routingModel.reverseNodes();
+                MainApplication.getMap().repaint();
             }
         });
@@ -131 +109 @@
 
         clearMI = new JMenuItem(tr("Clear route"));
-        clearMI.addActionListener(new ActionListener() {
-            @Override
-            public void actionPerformed(ActionEvent e) {
-                if (MainApplication.getLayerManager().getActiveLayer() instanceof RoutingLayer) {
-                    RoutingLayer layer = (RoutingLayer) MainApplication.getLayerManager().getActiveLayer();
-                    RoutingModel routingModel = layer.getRoutingModel();
-                    // Reset routing nodes and paths
-                    routingModel.reset();
-                    RoutingPlugin.getInstance().getRoutingDialog().clearNodes();
-                    MainApplication.getMap().repaint();
-                }
+        clearMI.addActionListener(e -> {
+            if (MainApplication.getLayerManager().getActiveLayer() instanceof RoutingLayer) {
+                RoutingLayer layer = (RoutingLayer) MainApplication.getLayerManager().getActiveLayer();
+                RoutingModel routingModel = layer.getRoutingModel();
+                // Reset routing nodes and paths
+                routingModel.reset();
+                RoutingPlugin.getInstance().getRoutingDialog().clearNodes();
+                MainApplication.getMap().repaint();
             }
         });
@@ -147 +122 @@
 
         regraphMI = new JMenuItem(tr("Reconstruct Graph"));
-        regraphMI.addActionListener(new ActionListener() {
-            @Override
-            public void actionPerformed(ActionEvent e) {
-                if (MainApplication.getLayerManager().getActiveLayer() instanceof RoutingLayer) {
-                    RoutingLayer layer = (RoutingLayer) MainApplication.getLayerManager().getActiveLayer();
-                    RoutingModel routingModel = layer.getRoutingModel();
-                    routingModel.routingGraph.resetGraph();
-                    routingModel.routingGraph.createGraph();
-                }
+        regraphMI.addActionListener(e -> {
+            if (MainApplication.getLayerManager().getActiveLayer() instanceof RoutingLayer) {
+                RoutingLayer layer = (RoutingLayer) MainApplication.getLayerManager().getActiveLayer();
+                RoutingModel routingModel = layer.getRoutingModel();
+                routingModel.routingGraph.resetGraph();
+                routingModel.routingGraph.createGraph();
             }
         });

applications/editors/josm/plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java

@@ -7 +7 @@
 import java.awt.Dimension;
 import java.awt.GridBagLayout;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
 import java.awt.event.MouseAdapter;
 import java.awt.event.MouseEvent;
@@ -26 +24 @@
 import javax.swing.table.DefaultTableModel;
 
-import org.apache.log4j.Logger;
+import com.innovant.josm.jrt.osm.OsmWayTypes;
 import org.openstreetmap.josm.data.Preferences;
 import org.openstreetmap.josm.gui.preferences.DefaultTabPreferenceSetting;
@@ -32 +30 @@
 import org.openstreetmap.josm.spi.preferences.Config;
 import org.openstreetmap.josm.tools.GBC;
-
-import com.innovant.josm.jrt.osm.OsmWayTypes;
+import org.openstreetmap.josm.tools.Logging;
 
 public class RoutingPreferenceDialog extends DefaultTabPreferenceSetting {
 
-    /**
-     * Logger
-     */
-    static Logger logger = Logger.getLogger(RoutingPreferenceDialog.class);
 
     private Map<String, String> orig;
@@ -81 +74 @@
         p.add(Box.createHorizontalGlue(), GBC.std().fill(GBC.HORIZONTAL));
         p.add(add, GBC.std().insets(0, 5, 0, 0));
-        add.addActionListener(new ActionListener() {
-            @Override
-            public void actionPerformed(ActionEvent e) {
-                JPanel p = new JPanel(new GridBagLayout());
-                p.add(new JLabel(tr("Weight")), GBC.std().insets(0, 0, 5, 0));
-                JComboBox<String> key = new JComboBox<>();
-                for (OsmWayTypes pk : OsmWayTypes.values()) {
-                    key.addItem(pk.getTag());
-                }
-                JTextField value = new JTextField(10);
-                p.add(key, GBC.eop().insets(5, 0, 0, 0).fill(GBC.HORIZONTAL));
-                p.add(new JLabel(tr("Value")), GBC.std().insets(0, 0, 5, 0));
-                p.add(value, GBC.eol().insets(5, 0, 0, 0).fill(GBC.HORIZONTAL));
-                int answer = JOptionPane.showConfirmDialog(gui, p,
-                        tr("Enter weight values"),
-                        JOptionPane.OK_CANCEL_OPTION);
-                if (answer == JOptionPane.OK_OPTION) {
-                    model
-                    .addRow(new String[] {
-                            key.getSelectedItem().toString(),
-                            value.getText() });
-                }
+        add.addActionListener(e -> {
+            JPanel p1 = new JPanel(new GridBagLayout());
+            p1.add(new JLabel(tr("Weight")), GBC.std().insets(0, 0, 5, 0));
+            JComboBox<String> key = new JComboBox<>();
+            for (OsmWayTypes pk : OsmWayTypes.values()) {
+                key.addItem(pk.getTag());
+            }
+            JTextField value = new JTextField(10);
+            p1.add(key, GBC.eop().insets(5, 0, 0, 0).fill(GBC.HORIZONTAL));
+            p1.add(new JLabel(tr("Value")), GBC.std().insets(0, 0, 5, 0));
+            p1.add(value, GBC.eol().insets(5, 0, 0, 0).fill(GBC.HORIZONTAL));
+            int answer = JOptionPane.showConfirmDialog(gui, p1,
+                    tr("Enter weight values"),
+                    JOptionPane.OK_CANCEL_OPTION);
+            if (answer == JOptionPane.OK_OPTION) {
+                model
+                .addRow(new String[] {
+                        key.getSelectedItem().toString(),
+                        value.getText() });
             }
         });
@@ -108 +98 @@
         JButton delete = new JButton(tr("Delete"));
         p.add(delete, GBC.std().insets(0, 5, 0, 0));
-        delete.addActionListener(new ActionListener() {
-            @Override
-            public void actionPerformed(ActionEvent e) {
-                if (list.getSelectedRow() == -1)
-                    JOptionPane.showMessageDialog(gui,
-                            tr("Please select the row to delete."));
-                else {
-                    Integer i;
-                    while ((i = list.getSelectedRow()) != -1) {
-                        model.removeRow(i);
-                    }
+        delete.addActionListener(e -> {
+            if (list.getSelectedRow() == -1)
+                JOptionPane.showMessageDialog(gui,
+                        tr("Please select the row to delete."));
+            else {
+                int i;
+                while ((i = list.getSelectedRow()) != -1) {
+                    model.removeRow(i);
                 }
             }
@@ -125 +112 @@
         JButton edit = new JButton(tr("Edit"));
         p.add(edit, GBC.std().insets(5, 5, 5, 0));
-        edit.addActionListener(new ActionListener() {
-            @Override
-            public void actionPerformed(ActionEvent e) {
-                edit(gui, list);
-            }
-        });
+        edit.addActionListener(e -> edit(gui, list));
 
-        JTabbedPane Opciones = new JTabbedPane();
-        Opciones.setComponentOrientation(ComponentOrientation.LEFT_TO_RIGHT);
+        JTabbedPane options = new JTabbedPane();
+        options.setComponentOrientation(ComponentOrientation.LEFT_TO_RIGHT);
 
-        Opciones.addTab("Profile", null, p, null);
-        //      Opciones.addTab("Preferences", new JPanel());
+        options.addTab("Profile", null, p, null);
+        //      options.addTab("Preferences", new JPanel());
 
         list.addMouseListener(new MouseAdapter() {
@@ -145 +127 @@
         });
 
-        principal.add(Opciones, GBC.eol().fill(GBC.BOTH));
+        principal.add(options, GBC.eol().fill(GBC.BOTH));
 
     }
@@ -184 +166 @@
         readPreferences();
         // Put these values in the model
-        for (String tag : orig.keySet()) {
-            model.addRow(new String[] {tag, orig.get(tag)});
+        for (Map.Entry<String, String> entry : orig.entrySet()) {
+            model.addRow(new String[] {entry.getKey(), entry.getValue()});
         }
     }
@@ -192 +174 @@
         orig = Preferences.main().getAllPrefix("routing.profile.default.speed");
         if (orig.size() == 0) { // defaults
-            logger.debug("Loading Default Preferences.");
+            Logging.trace("Loading Default Preferences.");
             for (OsmWayTypes owt : OsmWayTypes.values()) {
                 Config.getPref().putInt("routing.profile.default.speed."
@@ -198 +180 @@
             }
             orig = Preferences.main().getAllPrefix("routing.profile.default.speed");
-        } else logger.debug("Default preferences already exist.");
+        } else Logging.trace("Default preferences already exist.");
     }
     /*