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

Timestamp:

2010-08-03T08:17:26+02:00 (15 years ago)

Author:

jttt

Message:

Adapt to latest josm

Location:

applications/editors/josm/plugins/routing

Files:

• build.xml (modified) (4 diffs)
• src/com/innovant/josm/plugin/routing/RoutingLayer.java (modified) (3 diffs)

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

@@ -18 +18 @@
 **
 ** To build against the core in ../../core, create a correct manifest and deploy to
-** SVN, 
+** SVN,
 **    set the properties commit.message and plugin.main.version
 ** and run
@@ -28 +28 @@
 
         <property name="commit.message" value="Changed the constructor signature of the plugin main class" />
-        <property name="plugin.main.version" value="2830" />
+        <property name="plugin.main.version" value="3408" />
 
         <!-- Define some properties -->
@@ -106 +106 @@
 
         <!--
-                 ************************** Publishing the plugin *********************************** 
-                -->
-        <!--
-                ** extracts the JOSM release for the JOSM version in ../core and saves it in the 
+                 ************************** Publishing the plugin ***********************************
+                -->
+        <!--
+                ** extracts the JOSM release for the JOSM version in ../core and saves it in the
                 ** property ${coreversion.info.entry.revision}
                 **
@@ -158 +158 @@
 
         <!--
-                ** commits the plugin.jar 
+                ** commits the plugin.jar
                 -->
         <target name="commit-dist">
                 <echo>
         ***** Properties of published ${plugin.jar} *****
-        Commit message    : '${commit.message}'                                 
+        Commit message    : '${commit.message}'
         Plugin-Mainversion: ${plugin.main.version}
         JOSM build version: ${coreversion.info.entry.revision}
         Plugin-Version    : ${version.entry.commit.revision}
-        ***** / Properties of published ${plugin.jar} *****                                     
-                                                
+        ***** / Properties of published ${plugin.jar} *****
+
         Now commiting ${plugin.jar} ...
         </echo>

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

@@ -30 +30 @@
 import java.awt.BasicStroke;
 import java.awt.Color;
-import java.awt.Component;
 import java.awt.Graphics;
 import java.awt.Graphics2D;
@@ -39 +38 @@
 import java.util.List;
 
+import javax.swing.Action;
 import javax.swing.Icon;
-import javax.swing.JMenuItem;
-import javax.swing.JSeparator;
 
 import org.apache.log4j.Logger;
@@ -182 +180 @@
      */
     @Override
-    public Component[] getMenuEntries() {
-        Collection<Component> components = new ArrayList<Component>();
-        components.add(new JMenuItem(LayerListDialog.getInstance().createShowHideLayerAction(this)));
+    public Action[] getMenuEntries() {
+        Collection<Action> components = new ArrayList<Action>();
+        components.add(LayerListDialog.getInstance().createShowHideLayerAction());
 //        components.add(new JMenuItem(new LayerListDialog.ShowHideMarkerText(this)));
-        components.add(new JMenuItem(LayerListDialog.getInstance().createDeleteLayerAction(this)));
-        components.add(new JSeparator());
-        components.add(new JMenuItem(new RenameLayerAction(getAssociatedFile(), this)));
-        components.add(new JSeparator());
-        components.add(new JMenuItem(new LayerListPopup.InfoAction(this)));
-        return components.toArray(new Component[0]);
+        components.add(LayerListDialog.getInstance().createDeleteLayerAction());
+        components.add(SeparatorLayerAction.INSTANCE);
+        components.add(new RenameLayerAction(getAssociatedFile(), this));
+        components.add(SeparatorLayerAction.INSTANCE);
+        components.add(new LayerListPopup.InfoAction(this));
+        return components.toArray(new Action[0]);
     }