Changeset 11924 in osm for applications/editors/josm/plugins/lakewalker

Timestamp:

2008-11-14T12:04:03+01:00 (16 years ago)

Author:

stoecker

Message:

updated lakewalker integration to current JOSM

Location:

applications/editors/josm/plugins/lakewalker

Files:

• build.xml (modified) (1 diff)
• src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java (modified) (6 diffs)
• src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerActionOld.java (deleted)
• src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPlugin.java (modified) (1 diff)
• src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerWMS.java (modified) (3 diffs)

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

@@ -59 +59 @@
         <attribute name="Plugin-Description" value="Interface to Lakewalker module" />
         <attribute name="Plugin-Version" value="${version.entry.commit.revision}"/>
+        <attribute name="Plugin-Mainversion" value="1065"/>
         <attribute name="Plugin-Date" value="${version.entry.commit.date}"/>
         <attribute name="Author" value="Brent Easton &lt;b.easton@uws.edu.au>, Jason Reid &lt;jrreid@ucalgary.ca>"/>

applications/editors/josm/plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerAction.java

@@ -33 +33 @@
 import org.openstreetmap.josm.command.Command;
 import org.openstreetmap.josm.command.SequenceCommand;
+import org.openstreetmap.josm.tools.ShortCut;
 
 import org.xml.sax.SAXException;
@@ -54 +55 @@
   
   public LakewalkerAction(String name) {
-    super(name, "lakewalker-sml", tr("Lake Walker."), KeyEvent.VK_L, KeyEvent.CTRL_MASK
-        | KeyEvent.SHIFT_MASK, true);
+    super(name, "lakewalker-sml", tr("Lake Walker."),
+    ShortCut.registerShortCut("tools:lakewalker", tr("Tool: {0}", tr("Lake Walker")),
+    KeyEvent.VK_L, ShortCut.GROUP_EDIT, ShortCut.SHIFT_DEFAULT), true);
     this.name = name;
     setEnabled(true);
@@ -61 +63 @@
   
   public void actionPerformed(ActionEvent e) {
+    if(Main.map == null || Main.map.mapView == null)
+      return;
 
     Main.map.mapView.setCursor(oldCursor);
@@ -150 +154 @@
          */
         
-        setStatus("Running vertex reduction...");
+        setStatus(tr("Running vertex reduction..."));
         
         nodelist = lw.vertexReduce(nodelist, epsilon);
         
-        System.out.println("After vertex reduction "+nodelist.size()+" nodes remain.");
+        //System.out.println("After vertex reduction "+nodelist.size()+" nodes remain.");
         
         /**
@@ -160 +164 @@
          */
         
-        setStatus("Running Douglas-Peucker approximation...");
+        setStatus(tr("Running Douglas-Peucker approximation..."));
         
         nodelist = lw.douglasPeucker(nodelist, epsilon);
         
-        System.out.println("After Douglas-Peucker approximation "+nodelist.size()+" nodes remain.");
+        //System.out.println("After Douglas-Peucker approximation "+nodelist.size()+" nodes remain.");
           
         /**
@@ -170 +174 @@
          */
         
-        setStatus("Removing duplicate nodes...");
+        setStatus(tr("Removing duplicate nodes..."));
         
         nodelist = lw.duplicateNodeRemove(nodelist);
         
-        System.out.println("After removing duplicate nodes, "+nodelist.size()+" nodes remain.");
+        //System.out.println("After removing duplicate nodes, "+nodelist.size()+" nodes remain.");
           
         

applications/editors/josm/plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPlugin.java

@@ -16 +16 @@
  */
 public class LakewalkerPlugin extends Plugin {
+  public LakewalkerPlugin() {
+    Main.main.menu.add(Main.main.menu.toolsMenu, new LakewalkerAction(tr("Lake Walker")));
+  }
 
-  public static final String VERSION = "0.4";
-  
-  protected String name;
-  protected String name2;
-
-  public LakewalkerPlugin() {
-    name = tr("Lake Walker");
-    name2 = tr("Lake Walker (Old)");
-    JMenu toolsMenu = null;
-    for (int i = 0; i < Main.main.menu.getMenuCount() && toolsMenu == null; i++) {
-      JMenu menu = Main.main.menu.getMenu(i);
-      String name = menu.getText();
-      if (name != null && name.equals(tr("Tools"))) {
-        toolsMenu = menu;
-      }
-    }
-
-    if (toolsMenu == null) {
-      toolsMenu = new JMenu(name);
-      toolsMenu.add(new JMenuItem(new LakewalkerActionOld(name2)));
-      toolsMenu.add(new JMenuItem(new LakewalkerAction(name)));
-      Main.main.menu.add(toolsMenu, 2);
-    }
-    else {
-      toolsMenu.addSeparator();
-      toolsMenu.add(new JMenuItem(new LakewalkerAction(name)));
-      toolsMenu.add(new JMenuItem(new LakewalkerActionOld(name2)));
-    }
-    
-  }
-  
   public PreferenceSetting getPreferenceSetting() 
   {

applications/editors/josm/plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerWMS.java

@@ -1 +1 @@
 package org.openstreetmap.josm.plugins.lakewalker;
+
+import static org.openstreetmap.josm.tools.I18n.tr;
 
 import org.openstreetmap.josm.Main;
@@ -41 +43 @@
         public BufferedImage getTile(int x, int y) throws LakewalkerException {
                 String status = getStatus();
-                setStatus("Downloading image tile...");
+                setStatus(tr("Downloading image tile..."));
                 
                 String layer = "global_mosaic_base";
@@ -144 +146 @@
             
             if(this.image == null){
-                throw new LakewalkerException("Could not acquire image");
+                throw new LakewalkerException(tr("Could not acquire image"));
             }