Changeset 27269 in osm for applications/editors

Timestamp:

2011-12-17T19:04:21+01:00 (13 years ago)

Author:

akks

Message:

'fixed NPE at startup'

Location:

applications/editors/josm/plugins/routing

Files:

• build.xml (modified) (1 diff)
• src/com/innovant/josm/plugin/routing/RoutingPlugin.java (modified) (2 diffs)

applications/editors/josm/plugins/routing/build.xml

@@ -26 +26 @@
 -->
 <project name="routing" default="dist" basedir=".">
-    <property name="commit.message" value="Changed the constructor signature of the plugin main class"/>
-    <property name="plugin.main.version" value="4549"/>
+    <property name="commit.message" value="fixed NPE at startup"/>
+    <property name="plugin.main.version" value="4666"/>
     <!-- Define some properties -->
     <property name="josm" location="../../core/dist/josm-custom.jar"/>

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

@@ -198 +198 @@
             newFrame.addMapMode(removeRouteNodeButton);
             newFrame.addMapMode(moveRouteNodeButton);
-            newFrame.toolGroup.add(addRouteNodeButton);
-            newFrame.toolGroup.add(removeRouteNodeButton);
-            newFrame.toolGroup.add(moveRouteNodeButton);
+//            newFrame.toolGroup.add(addRouteNodeButton);
+//            newFrame.toolGroup.add(removeRouteNodeButton);
+//            newFrame.toolGroup.add(moveRouteNodeButton);
             // Hide them by default
             addRouteNodeButton.setVisible(false);
@@ -216 +216 @@
      */
     public void activeLayerChange(Layer oldLayer, Layer newLayer) {
-                
+                if (addRouteNodeButton==null) return;
                 if (newLayer instanceof RoutingLayer) {                 /*   show Routing toolbar and dialog window  */
                         addRouteNodeButton.setVisible(true);