Changeset 25814 in osm for applications/editors

Timestamp:

2011-04-08T14:32:17+02:00 (14 years ago)

Author:

akks

Message:

Added Selection menu with "extend selection" functions.

Location:

applications/editors/josm/plugins/utilsplugin2

Files:

• . (modified) (1 prop)
• build.xml (modified) (2 diffs)
• images/adjnodes.png (added)
• images/adjways.png (added)
• images/adjwaysall.png (added)
• images/intway.png (added)
• images/intwayall.png (added)
• src/utilsplugin2/AdjacentNodesAction.java (added)
• src/utilsplugin2/AdjacentWaysAction.java (added)
• src/utilsplugin2/ConnectedWaysAction.java (added)
• src/utilsplugin2/IntersectedWaysAction.java (added)
• src/utilsplugin2/IntersectedWaysRecursiveAction.java (added)
• src/utilsplugin2/NodeWayUtils.java (added)
• src/utilsplugin2/UtilsPlugin2.java (modified) (5 diffs)

applications/editors/josm/plugins/utilsplugin2

@@ -1 +1 @@
 build
+.project

@@ -1 +1 @@
 build
+.project

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

@@ -31 +31 @@
 
     <!-- enter the SVN commit message -->
-    <property name="commit.message" value="fix" />
+    <property name="commit.message" value="extend selection" />
     <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
     <property name="plugin.main.version" value="3835" />
@@ -254 +254 @@
     <target name="publish" depends="ensure-svn-present,core-info,commit-current,update-current,clean,dist,commit-dist">
     </target>
+    <target name="runjosm" depends="install">
+        <java jar="${josm}" >
+            <arg line="../../data_nodist/neubrandenburg.osm"/>
+        </java>
+    </target>
 </project>

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

@@ -2 +2 @@
 package utilsplugin2;
 
+import java.awt.event.KeyEvent;
+import javax.swing.JMenu;
 import javax.swing.JMenuItem;
 
@@ -9 +11 @@
 import org.openstreetmap.josm.plugins.Plugin;
 import org.openstreetmap.josm.plugins.PluginInformation;
+import static org.openstreetmap.josm.tools.I18n.marktr;
 
 public class UtilsPlugin2 extends Plugin {
@@ -15 +18 @@
     JMenuItem splitObject;
     JMenuItem selectWayNodes;
+    JMenuItem adjNodes;
+    JMenuItem adjWays;
+    JMenuItem adjWaysAll;
+    JMenuItem intWays;
+    JMenuItem intWaysR;
 
     public UtilsPlugin2(PluginInformation info) {
@@ -22 +30 @@
         addIntersections = MainMenu.add(Main.main.menu.toolsMenu, new AddIntersectionsAction());
         splitObject = MainMenu.add(Main.main.menu.toolsMenu, new SplitObjectAction());
-        selectWayNodes = MainMenu.add(Main.main.menu.toolsMenu, new SelectWayNodesAction());
+        Main.main.menu.toolsMenu.addSeparator();
+        JMenu m1 = Main.main.menu.addMenu(marktr("Selection"), KeyEvent.VK_S, Main.main.menu.defaultMenuPos, "help");
+
+        selectWayNodes = MainMenu.add(m1, new SelectWayNodesAction());
+        adjNodes = MainMenu.add(m1, new AdjacentNodesAction());
+        adjWays = MainMenu.add(m1, new AdjacentWaysAction());
+        adjWaysAll = MainMenu.add(m1, new ConnectedWaysAction());
+        intWays = MainMenu.add(m1, new IntersectedWaysAction());
+        intWaysR = MainMenu.add(m1, new IntersectedWaysRecursiveAction());
     }
 
@@ -28 +44 @@
     public void mapFrameInitialized(MapFrame oldFrame, MapFrame newFrame) {
         boolean enabled = newFrame != null;
+        enabled = false;
         unglueRelation.setEnabled(enabled);
         addIntersections.setEnabled(enabled);
         splitObject.setEnabled(enabled);
         selectWayNodes.setEnabled(enabled);
+        adjNodes.setEnabled(enabled);
+        adjWays.setEnabled(enabled);
+        adjWaysAll.setEnabled(enabled);
+        intWays.setEnabled(enabled);
+        intWaysR.setEnabled(enabled);
     }
 }

@@ -1 +1 @@
 build
+.project