Changeset 22550 in osm for applications/editors/josm/plugins/openlayers

Timestamp:

2010-08-03T08:21:38+02:00 (15 years ago)

Author:

jttt

Message:

Adapt to latest josm

Location:

applications/editors/josm/plugins/openlayers

Files:

• build.xml (modified) (4 diffs)
• src/org/openstreetmap/josm/plugins/openLayers/OpenLayersLayer.java (modified) (3 diffs)

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

@@ -33 +33 @@
         <property name="commit.message" value="Changed the constructor signature of the plugin main class" />
         <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
-        <property name="plugin.main.version" value="2830" />
+        <property name="plugin.main.version" value="3408" />
 
         <property name="josm"                   location="../../core/dist/josm-custom.jar"/>
@@ -103 +103 @@
 
         <!--
-        ************************** Publishing the plugin *********************************** 
+        ************************** Publishing the plugin ***********************************
         -->
         <!--
-                ** extracts the JOSM release for the JOSM version in ../core and saves it in the 
+                ** extracts the JOSM release for the JOSM version in ../core and saves it in the
                 ** property ${coreversion.info.entry.revision}
                 **
@@ -155 +155 @@
 
         <!--
-                ** 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>
@@ -197 +197 @@
                 </fail>
         </target>
- 
+
         <target name="publish" depends="ensure-svn-present,core-info,commit-current,update-current,clean,dist,commit-dist">
         </target>

applications/editors/josm/plugins/openlayers/src/org/openstreetmap/josm/plugins/openLayers/OpenLayersLayer.java

@@ -1 +1 @@
 package org.openstreetmap.josm.plugins.openLayers;
 
-import java.awt.Component;
 import java.awt.Dimension;
 import java.awt.Graphics2D;
@@ -7 +6 @@
 import java.beans.PropertyChangeListener;
 
+import javax.swing.Action;
 import javax.swing.Icon;
-import javax.swing.JMenuItem;
-import javax.swing.JSeparator;
 
 import org.mozilla.javascript.NativeArray;
@@ -77 +75 @@
 
     @Override
-    public Component[] getMenuEntries() {
-        return new Component[] {
-            new JMenuItem(LayerListDialog.getInstance().createShowHideLayerAction(this)),
-            new JMenuItem(LayerListDialog.getInstance().createDeleteLayerAction(this)),
-            new JSeparator(),
+    public Action[] getMenuEntries() {
+        return new Action[] {
+            LayerListDialog.getInstance().createShowHideLayerAction(),
+            LayerListDialog.getInstance().createDeleteLayerAction(),
+            SeparatorLayerAction.INSTANCE,
             // color,
-            new JMenuItem(new RenameLayerAction(getAssociatedFile(), this)),
-            new JSeparator(),
-            new JMenuItem(new LayerListPopup.InfoAction(this)) };
+            new RenameLayerAction(getAssociatedFile(), this),
+            SeparatorLayerAction.INSTANCE,
+            new LayerListPopup.InfoAction(this) };
     }