Changeset 28568 in osm for applications/editors/josm/plugins/routing

Timestamp:

2012-08-18T20:23:57+02:00 (12 years ago)

Author:

donvip

Message:

[josm_routing] fix a bunch of Exceptions (including #josm3011)

Location:

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

Files:

• RoutingPlugin.java (modified) (2 diffs)
• gui/RoutingMenu.java (modified) (4 diffs)

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

@@ -30 +30 @@
 import static org.openstreetmap.josm.tools.I18n.tr;
 
+import java.io.File;
 import java.util.ArrayList;
 
@@ -138 +139 @@
                 datasetAdapter = new DataSetListenerAdapter(this);
                 plugin = this; // Assign reference to the plugin class
-                if (new java.io.File("log4j.xml").exists()) {
-                        DOMConfigurator.configure("log4j.xml");
+                File log4jConfigFile = new java.io.File("log4j.xml");
+                if (log4jConfigFile.exists()) {
+                        DOMConfigurator.configure(log4jConfigFile.getPath());
                 } else {
                         System.err.println("Routing plugin warning: log4j configuration not found");

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

@@ -72 +72 @@
 
         /**
-         * @param s
          */
         public RoutingMenu() {
@@ -194 +193 @@
                 clearMI.setEnabled(false);
                 criteriaM.setEnabled(false);
+                regraphMI.setEnabled(false);
         }
 
@@ -204 +204 @@
                 clearMI.setEnabled(true);
                 criteriaM.setEnabled(true);
+                regraphMI.setEnabled(true);
         }
 
@@ -210 +211 @@
                 clearMI.setEnabled(false);
                 criteriaM.setEnabled(false);
+                regraphMI.setEnabled(false);
         }
 }