Changeset 27288 in osm

Timestamp:

2011-12-20T21:40:05+01:00 (13 years ago)

Author:

stoecker

Message:

update to new JOSM feature, see #josm6953

Location:

applications/editors/josm/plugins/routing

Files:

• build.xml (modified) (1 diff)
• data/ar.lang (deleted)
• data/he.lang (deleted)
• data/is.lang (deleted)
• src/com/innovant/josm/plugin/routing/RoutingPlugin.java (modified) (3 diffs)
• src/com/innovant/josm/plugin/routing/actions/AddRouteNodeAction.java (modified) (2 diffs)
• src/com/innovant/josm/plugin/routing/actions/MoveRouteNodeAction.java (modified) (2 diffs)
• src/com/innovant/josm/plugin/routing/actions/RemoveRouteNodeAction.java (modified) (2 diffs)

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

@@ -27 +27 @@
 <project name="routing" default="dist" basedir=".">
     <property name="commit.message" value="fixed NPE at startup"/>
-    <property name="plugin.main.version" value="4666"/>
+    <property name="plugin.main.version" value="4669"/>
     <!-- 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

@@ -195 +195 @@
             removeRouteNodeButton = new IconToggleButton(removeRouteNodeAction);
             moveRouteNodeButton = new IconToggleButton(moveRouteNodeAction);
+            addRouteNodeButton.setAutoHideDisabledButton(true);
+            removeRouteNodeButton.setAutoHideDisabledButton(true);
+            moveRouteNodeButton.setAutoHideDisabledButton(true);
             newFrame.addMapMode(addRouteNodeButton);
             newFrame.addMapMode(removeRouteNodeButton);
             newFrame.addMapMode(moveRouteNodeButton);
-//            newFrame.toolGroup.add(addRouteNodeButton);
-//            newFrame.toolGroup.add(removeRouteNodeButton);
-//            newFrame.toolGroup.add(moveRouteNodeButton);
-            // Hide them by default
-            addRouteNodeButton.setVisible(false);
-            removeRouteNodeButton.setVisible(false);
-            moveRouteNodeButton.setVisible(false);
             // Enable menu
             menu.enableStartItem();
@@ -216 +212 @@
      */
     public void activeLayerChange(Layer oldLayer, Layer newLayer) {
-                if (addRouteNodeButton==null) return;
                 if (newLayer instanceof RoutingLayer) {                 /*   show Routing toolbar and dialog window  */
-                        addRouteNodeButton.setVisible(true);
-                    removeRouteNodeButton.setVisible(true);
-                    moveRouteNodeButton.setVisible(true);
                     menu.enableRestOfItems();                   
                     routingDialog.showDialog();
                     routingDialog.refresh();
                 }else{                                                                                  /*   hide Routing toolbar and dialog window  */
-                        addRouteNodeButton.setVisible(false);
-                    removeRouteNodeButton.setVisible(false);
-                    moveRouteNodeButton.setVisible(false);
                     menu.disableRestOfItems();
                     routingDialog.hideDialog();
@@ -240 +229 @@
         // Add button(s) to the tool bar when the routing layer is added
         if (newLayer instanceof RoutingLayer) {
-            addRouteNodeButton.setVisible(true);
-            removeRouteNodeButton.setVisible(true);
-            moveRouteNodeButton.setVisible(true);
             menu.enableRestOfItems();
             // Set layer on top and select layer, also refresh toggleDialog to reflect selection

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

@@ -38 +38 @@
 import org.openstreetmap.josm.gui.MapFrame;
 import org.openstreetmap.josm.tools.ImageProvider;
+
+import org.openstreetmap.josm.gui.layer.Layer;
 
 import com.innovant.josm.plugin.routing.RoutingLayer;
@@ -105 +107 @@
         Main.map.repaint();
     }
-
+    @Override public boolean layerIsSupported(Layer l) {
+        return l instanceof RoutingLayer;
+    }
 }

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

@@ -40 +40 @@
 import org.openstreetmap.josm.gui.MapFrame;
 import org.openstreetmap.josm.tools.ImageProvider;
+
+import org.openstreetmap.josm.gui.layer.Layer;
 
 import com.innovant.josm.plugin.routing.RoutingLayer;
@@ -154 +156 @@
         }
     }
+    @Override public boolean layerIsSupported(Layer l) {
+        return l instanceof RoutingLayer;
+    }
+
 }

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

@@ -39 +39 @@
 import org.openstreetmap.josm.gui.MapFrame;
 import org.openstreetmap.josm.tools.ImageProvider;
+import org.openstreetmap.josm.gui.layer.Layer;
 
 import com.innovant.josm.plugin.routing.RoutingLayer;
@@ -122 +123 @@
     }
 
+    @Override public boolean layerIsSupported(Layer l) {
+        return l instanceof RoutingLayer;
+    }
+
 }