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

Timestamp:

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

Author:

jttt

Message:

Adapt to latest josm

Location:

applications/editors/josm/plugins/slippymap

Files:

• build.xml (modified) (5 diffs)
• src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java (modified) (4 diffs)
• src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java (deleted)

applications/editors/josm/plugins/slippymap/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="Added haiti imagery tile source" />
-        <property name="plugin.main.version" value="2830" />
+        <property name="plugin.main.version" value="3408" />
 
         <property name="josm"                   location="../../core/dist/josm-custom.jar"/>
@@ -87 +87 @@
 
         <!--
-                         ************************** 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}
                         **
@@ -139 +139 @@
 
         <!--
-                        ** 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>
@@ -184 +184 @@
         <target name="publish" depends="ensure-svn-present,core-info,commit-current,update-current,clean,dist,commit-dist">
         </target>
-        
+
         <target name="dev-install">
                 <copy file="${plugin.jar}" todir="c:/data/projekte/osm/josm-dev/plugins" />

applications/editors/josm/plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java

@@ -4 +4 @@
 
 import java.awt.Color;
-import java.awt.Component;
 import java.awt.Graphics;
 import java.awt.Graphics2D;
@@ -21 +20 @@
 
 import javax.swing.AbstractAction;
+import javax.swing.Action;
 import javax.swing.Icon;
 import javax.swing.JCheckBoxMenuItem;
 import javax.swing.JMenuItem;
 import javax.swing.JPopupMenu;
-import javax.swing.JSeparator;
 import javax.swing.SwingUtilities;
 
@@ -44 +43 @@
 import org.openstreetmap.josm.data.osm.visitor.BoundingXYVisitor;
 import org.openstreetmap.josm.gui.MapView;
+import org.openstreetmap.josm.gui.MapView.LayerChangeListener;
 import org.openstreetmap.josm.gui.dialogs.LayerListDialog;
 import org.openstreetmap.josm.gui.dialogs.LayerListPopup;
 import org.openstreetmap.josm.gui.layer.Layer;
 import org.openstreetmap.josm.tools.ImageProvider;
-import org.openstreetmap.josm.gui.MapView.LayerChangeListener;
 
 /**
@@ -993 +992 @@
 
     @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(this.getAssociatedFile(), this)),
-                new JSeparator(),
-                new JMenuItem(new LayerListPopup.InfoAction(this)) };
+                new RenameLayerAction(this.getAssociatedFile(), this),
+                SeparatorLayerAction.INSTANCE,
+                new LayerListPopup.InfoAction(this) };
     }