Changeset 29771 in osm for applications/editors/josm/plugins/utilsplugin2

Timestamp:

2013-07-24T21:45:09+02:00 (11 years ago)

Author:

akks

Message:

[josm_plugins]: move more plugin items to new menus, set minimum JOSM to 6082, add Netbeans projects

Location:

applications/editors/josm/plugins/utilsplugin2

Files:

• build.xml (modified) (1 diff)
• src/org/openstreetmap/josm/plugins/utilsplugin2/UtilsPlugin2.java (modified) (2 diffs)

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

@@ -5 +5 @@
     <property name="commit.message" value="[josm_utilsplugin2]: pasting tags is in core long ago. Please update you ancient JOSM :)"/>
     <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
-    <property name="plugin.main.version" value="4980"/>
+    <property name="plugin.main.version" value="6082"/>
 
-    <property name="plugin.author" value="Kalle Lampila, Upliner, and others"/>
+    <property name="plugin.author" value="Kalle Lampila, Upliner, Zverik, akks, joshdoe and others"/>
     <property name="plugin.class" value="org.openstreetmap.josm.plugins.utilsplugin2.UtilsPlugin2"/>
     <property name="plugin.description" value="Several utilities that make your life easier."/>

applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/UtilsPlugin2.java

@@ -71 +71 @@
     public UtilsPlugin2(PluginInformation info) {
         super(info);
-        boolean oldMenu = org.openstreetmap.josm.data.Version.getInstance().getVersion() < 6082;
-        JMenu toolsMenu = oldMenu
-                ?  Main.main.menu.addMenu(marktr("More tools"), KeyEvent.VK_Q, 4, "help")
-                :  Main.main.menu.moreToolsMenu;
-        
-        JMenu dataMenu = oldMenu ? toolsMenu: Main.main.menu.dataMenu;
+        JMenu toolsMenu = Main.main.menu.moreToolsMenu;
+        JMenu dataMenu = Main.main.menu.dataMenu;
+        JMenu selectionMenu = Main.main.menu.selectionMenu;
                 
         addIntersections = MainMenu.add(toolsMenu, new AddIntersectionsAction());
@@ -94 +91 @@
         drawArc = MainMenu.add(toolsMenu, new CurveAction());
 
-        JMenu selectionMenu;
-        if (oldMenu) {
-            selectionMenu = Main.main.menu.addMenu(marktr("Selection"), KeyEvent.VK_N, 4, "help");
-        } else {
-            selectionMenu = Main.main.menu.selectionMenu;
-            selectionMenu.addSeparator();
-        }
-        
+        selectionMenu.addSeparator();
+           
         selectWayNodes = MainMenu.add(selectionMenu, new SelectWayNodesAction());
         adjNodes = MainMenu.add(selectionMenu, new AdjacentNodesAction());