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

Timestamp:

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

Author:

jttt

Message:

Adapt to latest josm

Location:

applications/editors/josm/plugins/walkingpapers

Files:

• build.xml (modified) (4 diffs)
• src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersLayer.java (modified) (4 diffs)

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

@@ -14 +14 @@
 **
 ** 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
@@ -23 +23 @@
 <project name="walkingpapers" default="dist" basedir=".">
 
-        <!-- 
-        ** update before publishing 
+        <!--
+        ** update before publishing
         -->
         <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" />
 
-        
+
         <property name="josm"                   location="../../core/dist/josm-custom.jar"/>
         <property name="plugin.dist.dir"        value="../../dist"/>
@@ -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>

applications/editors/josm/plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersLayer.java

@@ -4 +4 @@
 
 import java.awt.Color;
-import java.awt.Component;
 import java.awt.Graphics2D;
 import java.awt.Image;
@@ -14 +13 @@
 import java.util.TreeSet;
 
+import javax.swing.Action;
 import javax.swing.Icon;
-import javax.swing.JMenuItem;
-import javax.swing.JSeparator;
 
 import org.openstreetmap.josm.Main;
@@ -119 +117 @@
         }
 
-        class TileTimeComp implements Comparator<WalkingPapersTile> {
+        static class TileTimeComp implements Comparator<WalkingPapersTile> {
                 public int compare(WalkingPapersTile s1, WalkingPapersTile s2) {
                         long t1 = s1.access_time();
@@ -349 +347 @@
 
         @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(associatedFile, this)),
-                                new JSeparator(),
-                                new JMenuItem(new LayerListPopup.InfoAction(this)) };
+                                SeparatorLayerAction.INSTANCE,
+                                new LayerListPopup.InfoAction(this) };
         }