Changeset 3704 in josm for trunk/src

Timestamp:

2010-12-07T12:06:59+01:00 (14 years ago)

Author:

bastiK

Message:

added multipoly plugin to josm core. authors: bilbo and Viesturs Zarins (extropy)

Location:

trunk/src/org/openstreetmap/josm

Files:

• actions/CreateMultipolygonAction.java (added)
• data/osm/MultipolygonCreate.java (added)
• gui/MainMenu.java (modified) (4 diffs)
• plugins/PluginHandler.java (modified) (1 diff)

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

@@ -25 +25 @@
 import org.openstreetmap.josm.actions.CopyAction;
 import org.openstreetmap.josm.actions.CreateCircleAction;
+import org.openstreetmap.josm.actions.CreateMultipolygonAction;
 import org.openstreetmap.josm.actions.DeleteAction;
 import org.openstreetmap.josm.actions.DistributeAction;
@@ -135 +136 @@
     /* View menu */
     public final JosmAction toggleGPXLines = new ToggleGPXLinesAction();
+    public final InfoAction info = new InfoAction();
+    public final HistoryInfoAction historyinfo = new HistoryInfoAction();
 
     /* Tools menu */
@@ -154 +157 @@
     public final JosmAction simplifyWay = new SimplifyWayAction();
     public final JosmAction joinAreas = new JoinAreasAction();
-    public final InfoAction info = new InfoAction();
-    public final HistoryInfoAction historyinfo = new HistoryInfoAction();
+    public final JosmAction createMultipolygon = new CreateMultipolygonAction();
 
     /* Audio menu */
@@ -319 +321 @@
         add(toolsMenu, joinNodeWay);
         add(toolsMenu, unglueNodes);
+        toolsMenu.addSeparator();
         add(toolsMenu, joinAreas);
+        add(toolsMenu, createMultipolygon);
 
         if (!Main.pref.getBoolean("audio.menuinvisible", false)) {

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

@@ -89 +89 @@
             {"usertools", IN_CORE},
             {"AgPifoJ", IN_CORE}, {"utilsplugin", IN_CORE}, {"ghost", IN_CORE},
-            {"validator", IN_CORE}}) {
+            {"validator", IN_CORE}, {"multipoly", IN_CORE}}) {
             DEPRECATED_PLUGINS.put(depr[0], depr.length >= 2 ? depr[1] : null);
         }