Changeset 29769 in osm for applications/editors/josm/plugins/CommandLine/src

Timestamp:

2013-07-24T18:01:58+02:00 (12 years ago)

Author:

akks

Message:

[josm_utilsplugin2. josm_commandline, josm_livegps, josm_reverter, josm_opendata, josm_videomapping]:
rearrange menu items and change menu accelerators, add Netbeans projects, fix some syntax warnings

Location:

applications/editors/josm/plugins/CommandLine/src/CommandLine

Files:

• AnyAction.java (modified) (2 diffs)
• CommandLine.java (modified) (1 diff)
• DummyAction.java (modified) (1 diff)
• Loader.java (modified) (3 diffs)
• NodeAction.java (modified) (2 diffs)
• PointAction.java (modified) (2 diffs)
• RelationAction.java (modified) (1 diff)
• WayAction.java (modified) (3 diffs)

applications/editors/josm/plugins/CommandLine/src/CommandLine/AnyAction.java

@@ -107 +107 @@
     }
 
+        @Override
         public void eventDispatched(AWTEvent arg0) {
-                if (!(arg0 instanceof KeyEvent))
-                        return;
-                KeyEvent ev = (KeyEvent) arg0;
+        if (!(arg0 instanceof KeyEvent))
+                return;
+        KeyEvent ev = (KeyEvent) arg0;
         isCtrlDown = (ev.getModifiersEx() & KeyEvent.CTRL_DOWN_MASK) != 0;
         if (ev.getKeyCode() == KeyEvent.VK_ESCAPE && ev.getID() == KeyEvent.KEY_PRESSED) {
@@ -142 +143 @@
             // We invoke this to prevent strange things from happening
             EventQueue.invokeLater(new Runnable() {
+                @Override
                 public void run() {
                     // Don't change cursor when mode has changed already

applications/editors/josm/plugins/CommandLine/src/CommandLine/CommandLine.java

@@ -190 +190 @@
 
         if ( Main.main.menu != null ) {
-            commandMenu = Main.main.menu.addMenu(marktr("Commands") , KeyEvent.VK_M, Main.main.menu.defaultMenuPos, ht("/Plugin/CommandLine"));
-            MainMenu.add(Main.main.menu.toolsMenu, new CommandLineAction(this));
+            boolean oldMenu = org.openstreetmap.josm.data.Version.getInstance().getVersion() < 6082;
+            commandMenu = Main.main.menu.addMenu(marktr("Commands") , oldMenu?KeyEvent.VK_M : KeyEvent.VK_O, Main.main.menu.defaultMenuPos, ht("/Plugin/CommandLine"));
+            MainMenu.add(commandMenu, new CommandLineAction(this));
         }
         loadCommands();

applications/editors/josm/plugins/CommandLine/src/CommandLine/DummyAction.java

@@ -18 +18 @@
 
 public class DummyAction extends MapMode implements AWTEventListener {
-        private CommandLine parentPlugin;
+    private CommandLine parentPlugin;
 
-        public DummyAction(MapFrame mapFrame, CommandLine parentPlugin) {
-                super(null, "addsegment.png", null, mapFrame, ImageProvider.getCursor("normal", null));
-                this.parentPlugin = parentPlugin;
-        }
+    public DummyAction(MapFrame mapFrame, CommandLine parentPlugin) {
+            super(null, "addsegment.png", null, mapFrame, ImageProvider.getCursor("normal", null));
+            this.parentPlugin = parentPlugin;
+    }
 
-        public void eventDispatched(AWTEvent arg0) {
-                if (!(arg0 instanceof KeyEvent))
-                        return;
-                KeyEvent ev = (KeyEvent) arg0;
+    @Override
+    public void eventDispatched(AWTEvent arg0) {
+        if (!(arg0 instanceof KeyEvent))
+                return;
+        KeyEvent ev = (KeyEvent) arg0;
         if (ev.getKeyCode() == KeyEvent.VK_ESCAPE && ev.getID() == KeyEvent.KEY_PRESSED) {
             ev.consume();

applications/editors/josm/plugins/CommandLine/src/CommandLine/Loader.java

@@ -67 +67 @@
         }
 
+        @Override
         public void startElement(String namespaceURI, String localName, String rawName, Attributes attrs) {
                 int len = attrs.getLength();
@@ -125 +126 @@
         }
 
+        @Override
         public void characters(char ch[], int start, int length) 
         {
@@ -165 +167 @@
         }
 
+        @Override
         public void warning(SAXParseException ex) {
           System.err.println("Warning in command xml file " + currentFile + ": " + ex.getMessage());
         }
 
+        @Override
         public void error(SAXParseException ex) {
           System.err.println("Error in command xml file " + currentFile + ": " + ex.getMessage());
         }
 
+        @Override
         public void fatalError(SAXParseException ex) throws SAXException {
           System.err.println("Error in command xml file " + currentFile + ": " + ex.getMessage());

applications/editors/josm/plugins/CommandLine/src/CommandLine/NodeAction.java

@@ -109 +109 @@
     }
 
+        @Override
         public void eventDispatched(AWTEvent arg0) {
-                if (!(arg0 instanceof KeyEvent))
-                        return;
-                KeyEvent ev = (KeyEvent) arg0;
+        if (!(arg0 instanceof KeyEvent))
+                return;
+        KeyEvent ev = (KeyEvent) arg0;
         isCtrlDown = (ev.getModifiersEx() & KeyEvent.CTRL_DOWN_MASK) != 0;
         if (ev.getKeyCode() == KeyEvent.VK_ESCAPE && ev.getID() == KeyEvent.KEY_PRESSED) {
@@ -144 +145 @@
             // We invoke this to prevent strange things from happening
             EventQueue.invokeLater(new Runnable() {
+                @Override
                 public void run() {
                     // Don't change cursor when mode has changed already

applications/editors/josm/plugins/CommandLine/src/CommandLine/PointAction.java

@@ -120 +120 @@
         }
 
+        @Override
         public void eventDispatched(AWTEvent arg0) {
                 if (!(arg0 instanceof KeyEvent))
@@ -157 +158 @@
                         // We invoke this to prevent strange things from happening
                         EventQueue.invokeLater(new Runnable() {
+                                @Override
                                 public void run() {
                                         // Don't change cursor when mode has changed already

applications/editors/josm/plugins/CommandLine/src/CommandLine/RelationAction.java

@@ -25 +25 @@
         }
 
+        @Override
         public void eventDispatched(AWTEvent arg0) {
                 if (!(arg0 instanceof KeyEvent))

applications/editors/josm/plugins/CommandLine/src/CommandLine/WayAction.java

@@ -130 +130 @@
     }
 
+        @Override
         public void eventDispatched(AWTEvent arg0) {
-                if (!(arg0 instanceof KeyEvent))
-                        return;
-                KeyEvent ev = (KeyEvent) arg0;
+        if (!(arg0 instanceof KeyEvent))
+                return;
+        KeyEvent ev = (KeyEvent) arg0;
         isCtrlDown = (ev.getModifiersEx() & KeyEvent.CTRL_DOWN_MASK) != 0;
         if (ev.getKeyCode() == KeyEvent.VK_ESCAPE && ev.getID() == KeyEvent.KEY_PRESSED) {
@@ -143 +144 @@
     private void updCursor() {
         if (mousePos != null) {
-                        if (!Main.isDisplayingMapView())
-                                return;
-                        nearestWay = Main.map.mapView.getNearestWay(mousePos, OsmPrimitive.isUsablePredicate);
-                        if (nearestWay != null) {
-                                setCursor(cursorActive);
-                        }
-                        else {
-                                setCursor(cursorNormal);
-                        }
-                }
+            if (!Main.isDisplayingMapView())
+                    return;
+            nearestWay = Main.map.mapView.getNearestWay(mousePos, OsmPrimitive.isUsablePredicate);
+            if (nearestWay != null) {
+                setCursor(cursorActive);
+            }
+            else {
+                setCursor(cursorNormal);
+            }
+        }
     }
 
-        private void processMouseEvent(MouseEvent e) {
-                if (e != null) { mousePos = e.getPoint(); }
-        }
+    private void processMouseEvent(MouseEvent e) {
+        if (e != null) { mousePos = e.getPoint(); }
+    }
 
     private void setCursor(final Cursor c) {
@@ -165 +166 @@
             // We invoke this to prevent strange things from happening
             EventQueue.invokeLater(new Runnable() {
+                @Override
                 public void run() {
                     // Don't change cursor when mode has changed already