Changeset 2575 in josm for trunk

Timestamp:

2009-12-05T16:08:16+01:00 (14 years ago)

Author:

stoecker

Message:

include utilsplugin, fix #4086

Location:

trunk

Files:

• images/joinareas.png (added)
• images/simplify.png (added)
• src/org/openstreetmap/josm/actions/JoinAreasAction.java (added)
• src/org/openstreetmap/josm/actions/JumpToAction.java (added)
• src/org/openstreetmap/josm/actions/SimplifyWayAction.java (added)
• src/org/openstreetmap/josm/gui/MainMenu.java (modified) (5 diffs)
• src/org/openstreetmap/josm/gui/MapStatus.java (modified) (2 diffs)
• src/org/openstreetmap/josm/plugins/PluginHandler.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/gui/MainMenu.java

@@ -38 +38 @@
 import org.openstreetmap.josm.actions.InfoAction;
 import org.openstreetmap.josm.actions.JoinNodeWayAction;
+import org.openstreetmap.josm.actions.JoinAreasAction;
 import org.openstreetmap.josm.actions.JosmAction;
 import org.openstreetmap.josm.actions.MergeLayerAction;
@@ -56 +57 @@
 import org.openstreetmap.josm.actions.SelectAllAction;
 import org.openstreetmap.josm.actions.ShowStatusReportAction;
+import org.openstreetmap.josm.actions.SimplifyWayAction;
 import org.openstreetmap.josm.actions.SplitWayAction;
 import org.openstreetmap.josm.actions.ToggleGPXLinesAction;
@@ -140 +142 @@
     public final JosmAction joinNodeWay = new JoinNodeWayAction();
     public final JosmAction unglueNodes = new UnGlueAction();
+    public final JosmAction simplifyWay = new SimplifyWayAction();
+    public final JosmAction joinAreas = new JoinAreasAction();
     public final InfoAction info = new InfoAction();
     public final HistoryInfoAction historyinfo = new HistoryInfoAction();
@@ -265 +269 @@
         toolsMenu.addSeparator();
         add(toolsMenu, reverseWay);
+        add(toolsMenu, simplifyWay);
         toolsMenu.addSeparator();
         add(toolsMenu, alignInCircle);
@@ -278 +283 @@
         add(toolsMenu, joinNodeWay);
         add(toolsMenu, unglueNodes);
+        add(toolsMenu, joinAreas);
         toolsMenu.addSeparator();
         add(toolsMenu, info);

trunk/src/org/openstreetmap/josm/gui/MapStatus.java

@@ -40 +40 @@
 
 import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.actions.JumpToAction;
 import org.openstreetmap.josm.data.coor.CoordinateFormat;
 import org.openstreetmap.josm.data.coor.LatLon;
@@ -501 +502 @@
         this.mv = mapFrame.mapView;
 
+        JumpToAction JumpToAct = new JumpToAction();
+        lonText.addMouseListener(JumpToAct);
+        latText.addMouseListener(JumpToAct);
+
         // Listen for mouse movements and set the position text field
         mv.addMouseMotionListener(new MouseMotionListener(){

trunk/src/org/openstreetmap/josm/plugins/PluginHandler.java

@@ -46 +46 @@
                 "lang-ru", "ewmsplugin", "ywms", "tways-0.2", "geotagged", "landsat",
                 "namefinder", "waypoints", "slippy_map_chooser", "tcx-support", "usertools",
-                "AgPifoJ"};
+                "AgPifoJ", "utilsplugin"};
     public static String [] unmaintained = new String[] {"gpsbabelgui", "Intersect_way"};