Changeset 29769 in osm for applications/editors/josm

Timestamp:

2013-07-24T18:01:58+02:00 (11 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

Files:

• CommandLine/nbproject (added)
• CommandLine/nbproject/project.xml (added)
• CommandLine/src/CommandLine/AnyAction.java (modified) (2 diffs)
• CommandLine/src/CommandLine/CommandLine.java (modified) (1 diff)
• CommandLine/src/CommandLine/DummyAction.java (modified) (1 diff)
• CommandLine/src/CommandLine/Loader.java (modified) (3 diffs)
• CommandLine/src/CommandLine/NodeAction.java (modified) (2 diffs)
• CommandLine/src/CommandLine/PointAction.java (modified) (2 diffs)
• CommandLine/src/CommandLine/RelationAction.java (modified) (1 diff)
• CommandLine/src/CommandLine/WayAction.java (modified) (3 diffs)
• imagerycache/nbproject/project.xml (modified) (4 diffs)
• imagerycache/src/org/openstreetmap/josm/plugins/imagerycache/OsmDBTilesLoader.java (modified) (3 diffs)
• imagerycache/src/org/openstreetmap/josm/plugins/imagerycache/TileDAOMapDB.java (modified) (2 diffs)
• livegps/nbproject (added)
• livegps/nbproject/project.xml (added)
• livegps/src/livegps/AppendableGpxTrackSegment.java (modified) (2 diffs)
• livegps/src/livegps/LiveGpsAcquirer.java (modified) (6 diffs)
• livegps/src/livegps/LiveGpsDialog.java (modified) (2 diffs)
• livegps/src/livegps/LiveGpsPlugin.java (modified) (5 diffs)
• livegps/src/livegps/SingleSegmentGpxTrack.java (modified) (1 diff)
• opendata/src/org/openstreetmap/josm/plugins/opendata/OdPlugin.java (modified) (1 diff)
• opendata/src/org/openstreetmap/josm/plugins/opendata/core/actions/OpenPreferencesActions.java (modified) (1 diff)
• reverter/nbproject/project.xml (modified) (2 diffs)
• reverter/src/reverter/ObjectsHistoryAction.java (modified) (1 diff)
• reverter/src/reverter/RevertChangesetAction.java (modified) (1 diff)
• reverter/src/reverter/ReverterPlugin.java (modified) (1 diff)
• utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/UtilsPlugin2.java (modified) (2 diffs)
• utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/actions/ExtractPointAction.java (modified) (1 diff)
• utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/actions/PasteRelationsAction.java (modified) (1 diff)
• utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/actions/SplitOnIntersectionsAction.java (modified) (1 diff)
• utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/actions/SymmetryAction.java (modified) (1 diff)
• utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/actions/TagBufferAction.java (modified) (1 diff)
• utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/actions/TagSourceAction.java (modified) (1 diff)
• utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/actions/UnGlueRelationAction.java (modified) (1 diff)
• utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/customurl/ChooseURLAction.java (modified) (3 diffs)
• utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/customurl/OpenPageAction.java (modified) (2 diffs)
• utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/customurl/UtilsPluginPreferences.java (modified) (3 diffs)
• utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/latlon/LatLonAction.java (modified) (1 diff)
• utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/latlon/LatLonDialog.java (modified) (8 diffs)
• utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/selection/AdjacentNodesAction.java (modified) (1 diff)
• utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/selection/AdjacentWaysAction.java (modified) (1 diff)
• utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/selection/ConnectedWaysAction.java (modified) (1 diff)
• utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/selection/IntersectedWaysAction.java (modified) (1 diff)
• utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/selection/IntersectedWaysRecursiveAction.java (modified) (2 diffs)
• utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/selection/MiddleNodesAction.java (modified) (1 diff)
• utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/selection/NodeWayUtils.java (modified) (4 diffs)
• utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/selection/SelectAllInsideAction.java (modified) (1 diff)
• utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/selection/SelectBoundaryAction.java (modified) (2 diffs)
• utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/selection/SelectModNodesAction.java (modified) (1 diff)
• utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/selection/SelectModWaysAction.java (modified) (1 diff)
• utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/selection/SelectWayNodesAction.java (modified) (1 diff)
• utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/selection/UndoSelectionAction.java (modified) (2 diffs)
• utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/selection/UnselectNodesAction.java (modified) (1 diff)
• videomapping/nbproject (added)
• videomapping/nbproject/project.xml (added)
• videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoPlugin.java (modified) (20 diffs)
• videomapping/src/org/openstreetmap/josm/plugins/videomapping/video/GPSVideoPlayer.java (modified) (1 diff)
• videomapping/src/org/openstreetmap/josm/plugins/videomapping/video/VideoEngine.java (modified) (3 diffs)
• videomapping/src/org/openstreetmap/josm/plugins/videomapping/video/VideoPlayer.java (modified) (9 diffs)
• videomapping/src/org/openstreetmap/josm/plugins/videomapping/video/VideoPlayerObserver.java (modified) (1 diff)
• videomapping/src/org/openstreetmap/josm/plugins/videomapping/video/VideosObserver.java (modified) (1 diff)

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

applications/editors/josm/plugins/imagerycache/nbproject/project.xml

@@ -17 +17 @@
                 </source-folder>
                 <source-folder>
-                    <label>src</label>
-                    <type>java</type>
-                    <location>src</location>
-                    <encoding>UTF-8</encoding>
+                    <label>F:\Java\josm\core\src</label>
+                    <location>F:\Java\josm\core\src</location>
                 </source-folder>
                 <source-folder>
@@ -27 +25 @@
                     <location>F:\Java\josm\core\src</location>
                     <encoding>UTF-8</encoding>
-                </source-folder>
-                <source-folder>
-                    <label>F:\Java\josm\core\src</label>
-                    <location>F:\Java\josm\core\src</location>
                 </source-folder>
             </folders>
@@ -54 +48 @@
                 <items>
                     <source-folder style="packages">
-                        <label>src</label>
-                        <location>src</location>
-                    </source-folder>
-                    <source-folder style="packages">
                         <label>F:\Java\josm\core\src</label>
                         <location>F:\Java\josm\core\src</location>
@@ -77 +67 @@
         <java-data xmlns="http://www.netbeans.org/ns/freeform-project-java/3">
             <compilation-unit>
-                <package-root>src</package-root>
+                <package-root>F:\Java\josm\core\src</package-root>
                 <classpath mode="compile">../../core/src</classpath>
-                <source-level>1.6</source-level>
-            </compilation-unit>
-            <compilation-unit>
-                <package-root>F:\Java\josm\core\src</package-root>
                 <source-level>1.6</source-level>
             </compilation-unit>

applications/editors/josm/plugins/imagerycache/src/org/openstreetmap/josm/plugins/imagerycache/OsmDBTilesLoader.java

@@ -14 +14 @@
 import org.openstreetmap.gui.jmapviewer.OsmTileLoader;
 import org.openstreetmap.gui.jmapviewer.Tile;
+import org.openstreetmap.gui.jmapviewer.interfaces.CachedTileLoader;
+import org.openstreetmap.gui.jmapviewer.interfaces.TileClearController;
 import org.openstreetmap.gui.jmapviewer.interfaces.TileJob;
 import org.openstreetmap.gui.jmapviewer.interfaces.TileLoaderListener;
@@ -24 +26 @@
  * @author Alexei Kasatkin, based on OsmFileCacheTileLoader by @author Jan Peter Stotz, @author Stefan Zeller
  */
-class OsmDBTilesLoader extends OsmTileLoader {
+class OsmDBTilesLoader extends OsmTileLoader implements CachedTileLoader {
     
     
@@ -49 +51 @@
     }
 
+    @Override
+    public void clearCache(TileSource source) {
+        clearCache(source, null);
+    }
+
+    @Override
+    public void clearCache(TileSource source, TileClearController controller) {
+        dao.cleanStorage(source.getName());
+    }
+    
     protected class DatabaseLoadJob implements TileJob {
 

applications/editors/josm/plugins/imagerycache/src/org/openstreetmap/josm/plugins/imagerycache/TileDAOMapDB.java

@@ -6 +6 @@
 import org.mapdb.DB;
 import org.mapdb.DBMaker;
+import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.preferences.BooleanProperty;
 
@@ -186 +187 @@
     }
 
+    public void cleanStorage(String name) {
+        Main.info("Cleaning storage: {0}", name);
+        dbs.get(name).close();
+        for (int t=0; t<20; t++) {
+            try {
+                String fname = getDBFileName(name, t);
+                File f = new File(cacheFolder, fname);
+                if (!f.exists() || !f.canWrite()) continue;
+                f.delete();
+            } catch (Exception e) {
+                Main.warn("Can not delete file");
+            }
+        }
+    }
 }

applications/editors/josm/plugins/livegps/src/livegps/AppendableGpxTrackSegment.java

@@ -19 +19 @@
     private double length;
 
+    @Override
     public Bounds getBounds() {
         return bounds;
     }
 
+    @Override
     public Collection<WayPoint> getWayPoints() {
         return new CopyList<WayPoint>(wayPoints, size);
@@ -51 +53 @@
     }
 
+    @Override
     public double length() {
         return length;

applications/editors/josm/plugins/livegps/src/livegps/LiveGpsAcquirer.java

@@ -3 +3 @@
 import static org.openstreetmap.josm.tools.I18n.tr;
 
-import java.lang.Float;
 
 import java.beans.PropertyChangeEvent;
@@ -16 +15 @@
 
 import org.openstreetmap.josm.Main;
-import org.openstreetmap.josm.data.coor.LatLon;
 
 import org.json.JSONObject;
@@ -118 +116 @@
     }
 
+    @Override
     public void run() {
         LiveGpsData oldGpsData = null;
@@ -133 +132 @@
                         Thread.sleep(1000);
                     } catch (InterruptedException ignore) {}
-                };
+                }
             }
 
@@ -167 +166 @@
                 try {
                     Thread.sleep(1000);
-                } catch (InterruptedException ignore) {} ;
+                } catch (InterruptedException ignore) {} 
                 // send warning to layer
             }
@@ -235 +234 @@
                 Watch.put("enable", true);
                 Watch.put("json", true);
-            } catch (JSONException je) {};
+            } catch (JSONException je) {}
 
             String Request = "?WATCH=" + Watch.toString() + ";\n";

applications/editors/josm/plugins/livegps/src/livegps/LiveGpsDialog.java

@@ -6 +6 @@
 import static org.openstreetmap.josm.tools.I18n.tr;
 
-import java.awt.BorderLayout;
 import java.awt.Color;
 import java.awt.GridLayout;
@@ -15 +14 @@
 import javax.swing.JLabel;
 import javax.swing.JPanel;
-import javax.swing.JScrollPane;
 
 import org.openstreetmap.josm.gui.MapFrame;

applications/editors/josm/plugins/livegps/src/livegps/LiveGpsPlugin.java

@@ -52 +52 @@
         }
 
+        @Override
         public void actionPerformed(ActionEvent e) {
             enableTracking(lgpscapture.isSelected());
@@ -66 +67 @@
         }
 
+        @Override
         public void actionPerformed(ActionEvent e) {
             if (lgpslayer != null) {
@@ -84 +86 @@
         }
 
+        @Override
         public void actionPerformed(ActionEvent e) {
             if (lgpslayer != null) {
@@ -91 +94 @@
     }
 
+    @Override
     public void activeLayerChange(Layer oldLayer, Layer newLayer) {
     }
 
+    @Override
     public void layerAdded(Layer newLayer) {
     }
 
+    @Override
     public void layerRemoved(Layer oldLayer) {
         if (oldLayer != lgpslayer)
@@ -110 +116 @@
         super(info);
         MainMenu menu = Main.main.menu;
-        lgpsmenu = menu.addMenu(marktr("LiveGPS"), KeyEvent.VK_G,
-                menu.defaultMenuPos, ht("/Plugin/LiveGPS"));
-
+        boolean oldMenu = org.openstreetmap.josm.data.Version.getInstance().getVersion() < 6082;
+        lgpsmenu = oldMenu ?
+                menu.addMenu(marktr("LiveGPS"), KeyEvent.VK_G, menu.defaultMenuPos, ht("/Plugin/LiveGPS"))
+                : menu.gpsMenu;
+        if (lgpsmenu.getItemCount()>0) {
+            lgpsmenu.addSeparator();
+        }
+            
         JosmAction captureAction = new CaptureAction();
         lgpscapture = new JCheckBoxMenuItem(captureAction);

applications/editors/josm/plugins/livegps/src/livegps/SingleSegmentGpxTrack.java

@@ -20 +20 @@
 
 
+    @Override
     public Map<String, Object> getAttributes() {
         return attr;
     }
 
+    @Override
     public Bounds getBounds() {
         return trackSegment.getBounds();
     }
 
+    @Override
     public Collection<GpxTrackSegment> getSegments() {
         return Collections.singleton(trackSegment);
     }
 
+    @Override
     public double length() {
         return trackSegment.length();

applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/OdPlugin.java

@@ -96 +96 @@
         loadModules();
         // Add menu
-        menu = Main.main.menu.addMenu(marktr("Open Data"), KeyEvent.VK_O, Main.main.menu.defaultMenuPos, ht("/Plugin/OpenData"));
+        boolean oldMenu = org.openstreetmap.josm.data.Version.getInstance().getVersion() < 6082;
+        
+        menu = oldMenu?
+            Main.main.menu.addMenu(marktr("Open Data"), KeyEvent.VK_O, Main.main.menu.defaultMenuPos, ht("/Plugin/OpenData"))
+            : Main.main.menu.dataMenu;
         buildMenu();
         // Add download task

applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/actions/OpenPreferencesActions.java

@@ -31 +31 @@
     public OpenPreferencesActions() {
         super(false);
-        putValue(NAME, tr("Preferences"));
+        putValue(NAME, tr("OpenData preferences"));
         putValue(SMALL_ICON, ImageProvider.get("dialogs", ICON_CORE_24));
                 putValue("toolbar", "opendata_open_preferences");

applications/editors/josm/plugins/reverter/nbproject/project.xml

@@ -41 +41 @@
                     <target>dist</target>
                 </action>
+                <action name="run">
+                    <script>${ant.script}</script>
+                    <target>runjosm</target>
+                </action>
             </ide-actions>
             <export>
@@ -62 +66 @@
                     <ide-action name="rebuild"/>
                     <ide-action name="clean"/>
+                    <ide-action name="run"/>
                 </context-menu>
             </view>

applications/editors/josm/plugins/reverter/src/reverter/ObjectsHistoryAction.java

@@ -20 +20 @@
         setEnabled(false);
     }
+    @Override
     public void actionPerformed(ActionEvent arg0) {
         new ObjectsHistoryDialog().setVisible(true);

applications/editors/josm/plugins/reverter/src/reverter/RevertChangesetAction.java

@@ -23 +23 @@
     }
 
+    @Override
     public void actionPerformed(ActionEvent arg0)  {
         final ChangesetIdQuery dlg = new ChangesetIdQuery();

applications/editors/josm/plugins/reverter/src/reverter/ReverterPlugin.java

@@ -19 +19 @@
     public ReverterPlugin(PluginInformation info) {
         super(info);
-        JMenu historyMenu = Main.main.menu.addMenu(marktr("History"), KeyEvent.VK_Y,
-                Main.main.menu.defaultMenuPos,ht("/Plugin/Reverter"));
+        boolean oldMenu = org.openstreetmap.josm.data.Version.getInstance().getVersion() < 6082;
+        JMenu historyMenu = oldMenu?
+                Main.main.menu.addMenu(marktr("History"), KeyEvent.VK_Y,  Main.main.menu.defaultMenuPos, ht("/Plugin/Reverter"))
+                : Main.main.menu.dataMenu;
         //MainMenu.add(historyMenu, new ObjectsHistoryAction());
         MainMenu.add(historyMenu, new RevertChangesetAction());

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

@@ -71 +71 @@
     public UtilsPlugin2(PluginInformation info) {
         super(info);
-
-        JMenu toolsMenu = Main.main.menu.addMenu(marktr("More tools"), KeyEvent.VK_Q, 4, "help");
-        unglueRelation = MainMenu.add(toolsMenu, new UnGlueRelationAction());
+        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;
+                
         addIntersections = MainMenu.add(toolsMenu, new AddIntersectionsAction());
         splitObject = MainMenu.add(toolsMenu, new SplitObjectAction());
-        
+        alignWayNodes = MainMenu.add(toolsMenu, new AlignWayNodesAction());
+        symmetry = MainMenu.add(toolsMenu, new SymmetryAction());
+        splitOnIntersections = MainMenu.add(toolsMenu, new SplitOnIntersectionsAction());
+        unglueRelation = MainMenu.add(toolsMenu, new UnGlueRelationAction());
         toolsMenu.addSeparator();
         replaceGeometry = MainMenu.add(toolsMenu, new ReplaceGeometryAction());
+        extractPoint = MainMenu.add(toolsMenu, new ExtractPointAction());
         tagBuffer = MainMenu.add(toolsMenu, new TagBufferAction());
         sourceTag = MainMenu.add(toolsMenu, new TagSourceAction());
         pasteRelations = MainMenu.add(toolsMenu, new PasteRelationsAction());
-        alignWayNodes = MainMenu.add(toolsMenu, new AlignWayNodesAction());
-        splitOnIntersections = MainMenu.add(toolsMenu, new SplitOnIntersectionsAction());
-        extractPoint = MainMenu.add(toolsMenu, new ExtractPointAction());
-        symmetry = MainMenu.add(toolsMenu, new SymmetryAction());
-        wiki = MainMenu.add(toolsMenu, new OpenPageAction());
+        wiki = MainMenu.add(dataMenu, new OpenPageAction());
         latlon = MainMenu.add(toolsMenu, new LatLonAction());
-
-        JMenu selectionMenu = Main.main.menu.addMenu(marktr("Selection"), KeyEvent.VK_N, Main.main.menu.defaultMenuPos, "help");
+        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();
+        }
+        
         selectWayNodes = MainMenu.add(selectionMenu, new SelectWayNodesAction());
         adjNodes = MainMenu.add(selectionMenu, new AdjacentNodesAction());
@@ -105 +117 @@
         selectAreaBoundary = MainMenu.add(selectionMenu, new SelectBoundaryAction());
         
-        selectURL = MainMenu.add(toolsMenu, new ChooseURLAction());
-        drawArc = MainMenu.add(toolsMenu, new CurveAction());
-
+        selectURL = MainMenu.add(dataMenu, new ChooseURLAction());
+        
         // register search operators
         SearchCompiler.addMatchFactory(new UtilsUnaryMatchFactory());

applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/actions/ExtractPointAction.java

@@ -2 +2 @@
 package org.openstreetmap.josm.plugins.utilsplugin2.actions;
 
-import java.awt.MouseInfo;
 import java.awt.Point;
 import static org.openstreetmap.josm.gui.help.HelpUtil.ht;

applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/actions/PasteRelationsAction.java

@@ -24 +24 @@
     }
 
+    @Override
     public void actionPerformed( ActionEvent e ) {
         Collection<OsmPrimitive> selection = getCurrentDataSet().getSelected();

applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/actions/SplitOnIntersectionsAction.java

@@ -30 +30 @@
     }
 
+    @Override
     public void actionPerformed( ActionEvent e ) {
         List<Command> list = new ArrayList<Command>();

applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/actions/SymmetryAction.java

@@ -40 +40 @@
     }
 
+    @Override
     public void actionPerformed(ActionEvent e) {
         Collection<OsmPrimitive> sel = getCurrentDataSet().getSelected();

applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/actions/TagBufferAction.java

@@ -28 +28 @@
     }
 
+    @Override
     public void actionPerformed( ActionEvent e ) {
         Collection<OsmPrimitive> selection = getCurrentDataSet().getSelected();

applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/actions/TagSourceAction.java

@@ -29 +29 @@
     }
 
+    @Override
     public void actionPerformed( ActionEvent e ) {
         Collection<OsmPrimitive> selection = getCurrentDataSet().getSelected();

applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/actions/UnGlueRelationAction.java

@@ -46 +46 @@
      * Called when the action is executed.
      */
+    @Override
     public void actionPerformed(ActionEvent e) {
 

applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/customurl/ChooseURLAction.java

@@ -2 +2 @@
 
 import java.awt.GridBagLayout;
-import java.awt.event.ItemEvent;
 import java.util.List;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-import javax.swing.JComboBox;
 import javax.swing.JPanel;
 import javax.swing.event.ListSelectionEvent;
@@ -13 +9 @@
 import org.openstreetmap.josm.Main;
 import java.awt.event.ActionEvent;
-import java.awt.event.ItemListener;
-import java.awt.event.KeyEvent;
 import javax.swing.JCheckBox;
 import javax.swing.JLabel;
@@ -22 +16 @@
 import javax.swing.event.ListSelectionListener;
 import org.openstreetmap.josm.actions.JosmAction;
-import org.openstreetmap.josm.gui.SelectionManager;
 import static org.openstreetmap.josm.tools.I18n.tr;
 

applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/customurl/OpenPageAction.java

@@ -40 +40 @@
     }
 
+    @Override
     public void actionPerformed(ActionEvent e) {
         Collection<OsmPrimitive> sel = getCurrentDataSet().getSelected();
@@ -62 +63 @@
         try {
         while (m.find()) {
-                key=m.group(1); val=null;                
-                if (key.equals("#id")) {
-                    if (p!=null) val=Long.toString(p.getId()); ;
-                } else if (key.equals("#type")) {
-                    if (p!=null) val = OsmPrimitiveType.from(p).getAPIName(); ;
-                } else if (key.equals("#lat")) {
-                    val = Double.toString(center.lat());
-                } else if (key.equals("#lon")) {
-                    val = Double.toString(center.lon());
+            key=m.group(1); val=null;                
+            if (key.equals("#id")) {
+                if (p!=null) val=Long.toString(p.getId());
+            } else if (key.equals("#type")) {
+                if (p!=null) val = OsmPrimitiveType.from(p).getAPIName();
+            } else if (key.equals("#lat")) {
+                val = Double.toString(center.lat());
+            } else if (key.equals("#lon")) {
+                val = Double.toString(center.lon());
+            }
+            else {
+                if (p!=null) {
+                    val =p.get(key);
+                    if (val!=null) val =URLEncoder.encode(p.get(key), "UTF-8"); else return;
                 }
-                else {
-                    if (p!=null) {
-                        val =p.get(key);
-                        if (val!=null) val =URLEncoder.encode(p.get(key), "UTF-8"); else return;
-                    }
-                }
-                keys[i]=m.group();
-                if  (val!=null) vals[i]=val;
-                else vals[i]="";
-                i++;
+            }
+            keys[i]=m.group();
+            if  (val!=null) vals[i]=val;
+            else vals[i]="";
+            i++;
         }
         } catch (UnsupportedEncodingException ex) {

applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/customurl/UtilsPluginPreferences.java

@@ -48 +48 @@
         resetButton = new JButton(tr("Reset"));
         resetButton.addActionListener(new ActionListener() {
+            @Override
             public void actionPerformed(ActionEvent e) {
                 fillRows(URLList.resetURLList());
@@ -55 +56 @@
         saveButton = new JButton(tr("Save to file"));
         saveButton.addActionListener(new ActionListener() {
+            @Override
             public void actionPerformed(ActionEvent e) {
                 URLList.saveURLList(readItemsFromTable());
@@ -62 +64 @@
         loadButton = new JButton(tr("Load from file"));
         loadButton.addActionListener(new ActionListener() {
+            @Override
             public void actionPerformed(ActionEvent e) {
                 fillRows(URLList.loadURLList());

applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/latlon/LatLonAction.java

@@ -35 +35 @@
     }
 
+    @Override
     public void actionPerformed(ActionEvent e) {
         if (!isEnabled())

applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/latlon/LatLonDialog.java

@@ -7 +7 @@
 import java.awt.Component;
 import java.awt.GridBagLayout;
-import java.awt.event.ActionEvent;
 import java.awt.event.FocusEvent;
 import java.awt.event.FocusListener;
-import java.awt.event.WindowAdapter;
-import java.awt.event.WindowEvent;
 import java.text.NumberFormat;
 import java.text.ParsePosition;
@@ -20 +17 @@
 import java.util.regex.Pattern;
 
-import javax.swing.AbstractAction;
 import javax.swing.BorderFactory;
 import javax.swing.JLabel;
@@ -27 +23 @@
 import javax.swing.JTabbedPane;
 
-import javax.swing.text.Document;
 import javax.swing.JTextArea;
 import javax.swing.JScrollPane;
@@ -45 +40 @@
 import org.openstreetmap.josm.gui.widgets.HtmlPanel;
 import org.openstreetmap.josm.tools.GBC;
-import org.openstreetmap.josm.tools.ImageProvider;
 import org.openstreetmap.josm.tools.WindowGeometry;
 
@@ -288 +282 @@
 
     class LatLonInputVerifier implements DocumentListener {
-        public void changedUpdate(DocumentEvent e) {
+        @Override public void changedUpdate(DocumentEvent e) {
             parseLatLonUserInput();
         }
 
-        public void insertUpdate(DocumentEvent e) {
+        @Override public void insertUpdate(DocumentEvent e) {
             parseLatLonUserInput();
         }
 
-        public void removeUpdate(DocumentEvent e) {
+        @Override public void removeUpdate(DocumentEvent e) {
             parseLatLonUserInput();
         }
@@ -302 +296 @@
 
     static class TextFieldFocusHandler implements FocusListener {
+        @Override 
         public void focusGained(FocusEvent e) {
             Component c = e.getComponent();
@@ -309 +304 @@
             }
         }
+        @Override 
         public void focusLost(FocusEvent e) {}
     }
@@ -448 +444 @@
 
     private class CoordinateListener implements DocumentListener {
-        public void changedUpdate(DocumentEvent e) {
+        @Override public void changedUpdate(DocumentEvent e) {
             //not fired
         }
-        public void insertUpdate(DocumentEvent e) {
+        @Override public void insertUpdate(DocumentEvent e) {
             updateButtons();
         }
-        public void removeUpdate(DocumentEvent e) {
+        @Override public void removeUpdate(DocumentEvent e) {
             updateButtons();
         }

applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/selection/AdjacentNodesAction.java

@@ -31 +31 @@
     private  Set<Way> activeWays = new HashSet<Way>();
 
+    @Override
     public void actionPerformed(ActionEvent e) {
         Collection<OsmPrimitive> selection = getCurrentDataSet().getSelected();

applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/selection/AdjacentWaysAction.java

@@ -30 +30 @@
     }
 
+    @Override
     public void actionPerformed(ActionEvent e) {
         Collection<OsmPrimitive> selection = getCurrentDataSet().getSelected();

applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/selection/ConnectedWaysAction.java

@@ -27 +27 @@
     }
 
+    @Override
     public void actionPerformed(ActionEvent e) {
         Collection<OsmPrimitive> selection = getCurrentDataSet().getSelected();

applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/selection/IntersectedWaysAction.java

@@ -29 +29 @@
     }
 
+    @Override
     public void actionPerformed(ActionEvent e) {
         Set<Way> selectedWays = OsmPrimitive.getFilteredSet(getCurrentDataSet().getSelected(), Way.class);

applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/selection/IntersectedWaysRecursiveAction.java

@@ -30 +30 @@
     }
 
+    @Override
     public void actionPerformed(ActionEvent e) {
-        Collection<OsmPrimitive> selection = getCurrentDataSet().getSelected();
         
         Set<Way> selectedWays = OsmPrimitive.getFilteredSet(getCurrentDataSet().getSelected(), Way.class);
@@ -41 +41 @@
                     selectedWays, newWays);
             getCurrentDataSet().addSelected(newWays);
-            return;
         } else {
              JOptionPane.showMessageDialog(Main.parent,

applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/selection/MiddleNodesAction.java

@@ -33 +33 @@
     private  Set<Way> activeWays = new HashSet<Way>();
 
+    @Override
     public void actionPerformed(ActionEvent e) {
         Collection<OsmPrimitive> selection = getCurrentDataSet().getSelected();
         Set<Node> selectedNodes = OsmPrimitive.getFilteredSet(selection, Node.class);
 
-        Set<Way> selectedWays = OsmPrimitive.getFilteredSet(getCurrentDataSet().getSelected(), Way.class);
-        
         // if no 2 nodes and no ways are selected, do nothing
         if (selectedNodes.size() != 2) {

applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/selection/NodeWayUtils.java

@@ -181 +181 @@
 
     public static void addWaysIntersectingWaysRecursively
-            (Collection<Way> allWays, Collection<Way> initWays, Set<Way> newWays)
-    {
+            (Collection<Way> allWays, Collection<Way> initWays, Set<Way> newWays) {
             Set<Way> foundWays = new HashSet<Way>();
             foundWays.addAll(initWays);
             newWays.addAll(initWays);
-            Set<Way> newFoundWays = new HashSet<Way>();
+            Set<Way> newFoundWays;
 
             int level=0,c;
@@ -207 +206 @@
                  }
             } while ( c >0 && level < maxLevel );
-            return;
     }
 
@@ -234 +232 @@
             } while ( c >0 && level < maxLevel );
            // System.out.println("time = "+(System.currentTimeMillis()-t)+" ways = "+newWays.size());
-            return;
     }
 
@@ -269 +266 @@
             }
         }
-        if (newNodes.size()==0) {
+        if (newNodes.isEmpty()) {
                 JOptionPane.showMessageDialog(Main.parent,
                     tr("Please select two nodes connected by way!"),

applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/selection/SelectAllInsideAction.java

@@ -8 +8 @@
 import java.awt.event.KeyEvent;
 import java.util.Collection;
-import java.util.HashSet;
-import java.util.Set;
 
 import javax.swing.JOptionPane;

applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/selection/SelectBoundaryAction.java

@@ -19 +19 @@
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.actions.JosmAction;
-import org.openstreetmap.josm.data.coor.EastNorth;
 import org.openstreetmap.josm.data.osm.Node;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
@@ -40 +39 @@
     }
 
+    @Override
     public void actionPerformed(ActionEvent e) {
-        long t=System.currentTimeMillis();
+        //long t=System.currentTimeMillis();
         Set<Way> selectedWays = OsmPrimitive.getFilteredSet(getCurrentDataSet().getSelected(), Way.class);
         Set<Node> selectedNodes = OsmPrimitive.getFilteredSet(getCurrentDataSet().getSelected(), Node.class);

applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/selection/SelectModNodesAction.java

@@ -32 +32 @@
     }
 
+    @Override
      public void actionPerformed(ActionEvent e) {
         Collection<OsmPrimitive> selection = getCurrentDataSet().getSelected();

applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/selection/SelectModWaysAction.java

@@ -32 +32 @@
     }
 
+    @Override
     public void actionPerformed(ActionEvent e) {
         Collection<OsmPrimitive> selection = getCurrentDataSet().getSelected();

applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/selection/SelectWayNodesAction.java

@@ -40 +40 @@
      * This method does some checking on the selection and calls the matching selectWayNodes method.
      */
+    @Override
     public void actionPerformed(ActionEvent e) {
         Collection<OsmPrimitive> selection = getCurrentDataSet().getSelected();

applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/selection/UndoSelectionAction.java

@@ -10 +10 @@
 import java.util.HashSet;
 import java.util.LinkedList;
-import java.util.List;
 import java.util.Set;
-import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.actions.JosmAction;
 import org.openstreetmap.josm.data.osm.*;
@@ -34 +32 @@
     private Collection<OsmPrimitive> lastSel;
     private int index;
+    @Override
     public void actionPerformed(ActionEvent e) {
-        LinkedList<Collection<? extends OsmPrimitive>>history
+        LinkedList<Collection<? extends OsmPrimitive>> history
                     = getCurrentDataSet().getSelectionHistory();
+        if (history==null || history.isEmpty()) return; // empty history
         int num=history.size();
-        if (history==null || num==0) return; // empty history
         
         Collection<OsmPrimitive> selection = getCurrentDataSet().getSelected();

applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/selection/UnselectNodesAction.java

@@ -28 +28 @@
     }
 
+    @Override
     public void actionPerformed(ActionEvent e) {
         Collection<OsmPrimitive> selection = getCurrentDataSet().getSelected();

applications/editors/josm/plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoPlugin.java

@@ -48 +48 @@
 //Here we manage properties and start the other classes
 public class VideoPlugin extends Plugin implements LayerChangeListener{
-        private JMenu VMenu,VDeinterlacer;
-        private JosmAction VAdd,/*VRemove,*/VStart,Vbackward,Vforward,VJump,Vfaster,Vslower,Vloop;
-        private JRadioButtonMenuItem VIntBob,VIntNone,VIntLinear;
+    private JMenu VMenu,VDeinterlacer;
+    private JosmAction VAdd,/*VRemove,*/VStart,Vbackward,Vforward,VJump,Vfaster,Vslower,Vloop;
+    private JRadioButtonMenuItem VIntBob,VIntNone,VIntLinear;
     private JCheckBoxMenuItem VCenterIcon,VSubTitles;
     private JMenuItem VJumpLength,VLoopLength;
@@ -61 +61 @@
     private Integer jumpLength,loopLength;
     private String mostRecentFolder;
-        private GpxLayer gpsLayer;
-        private VideoPositionLayer videoPositionLayer;
-        private GPSVideoPlayer gpsVideoPlayer;
-        
-        public static String VLC_VERSION = "2.0.x";
-
-        public VideoPlugin(PluginInformation info) {
-                super(info);
-                VideoEngine.setupPlayer();
-                MapView.addLayerChangeListener(this);                           
-                createMenusAndShortCuts();
-                enableVideoControlMenus(false);
-                setDefaults();
-                loadProperties();
-        }
-
-        private void createMenusAndShortCuts() {
-                VMenu = Main.main.menu.addMenu(marktr("Video"), KeyEvent.VK_D, Main.main.menu.defaultMenuPos,ht("/Plugin/Videomapping"));
-                VMenu.setEnabled(false);
-                VAdd= new JosmAction(tr("Import Video"),"videomapping",tr("Sync a video against this GPS track"),null,false) {
-            public void actionPerformed(ActionEvent arg0) {                 
+    private GpxLayer gpsLayer;
+    private VideoPositionLayer videoPositionLayer;
+    private GPSVideoPlayer gpsVideoPlayer;
+
+    public static String VLC_VERSION = "2.0.x";
+
+    public VideoPlugin(PluginInformation info) {
+        super(info);
+        VideoEngine.setupPlayer();
+        MapView.addLayerChangeListener(this);                           
+        createMenusAndShortCuts();
+        enableVideoControlMenus(false);
+        setDefaults();
+        loadProperties();
+    }
+
+    private void createMenusAndShortCuts() {
+        boolean oldMenu = org.openstreetmap.josm.data.Version.getInstance().getVersion() < 6082;
+        VMenu = Main.main.menu.addMenu(marktr("Video"), oldMenu?KeyEvent.VK_D: KeyEvent.VK_Q, Main.main.menu.defaultMenuPos,ht("/Plugin/Videomapping"));
+        VMenu.setEnabled(false);
+        VAdd= new JosmAction(tr("Import Video"),"videomapping",tr("Sync a video against this GPS track"),null,false) {
+            @Override public void actionPerformed(ActionEvent arg0) {                 
                     importVideoFile();
                 }
         };
         /*VRemove=*/ new JosmAction(tr("Remove Video"),"videomapping",tr("removes current video from layer"),null,false) {
-            public void actionPerformed(ActionEvent arg0) {
+            @Override public void actionPerformed(ActionEvent arg0) {
             }
         };
         VStart = new JosmAction(tr("Play/Pause"), "audio-playpause", tr("starts/pauses video playback"),
                 Shortcut.registerShortcut("videomapping:startstop",tr("Video: {0}", tr("Play/Pause")),KeyEvent.VK_NUMPAD5, Shortcut.DIRECT), false, "vm_play_pause",false) {            
-            public void actionPerformed(ActionEvent e) {
+            @Override public void actionPerformed(ActionEvent e) {
                 if (gpsVideoPlayer != null) {
                     gpsVideoPlayer.pause();
@@ -99 +100 @@
         Vbackward = new JosmAction(tr("Backward"), "audio-prev", tr("jumps n sec back"),
                 Shortcut.registerShortcut("videomapping:backward",tr("Video: {0}", tr("Backward")),KeyEvent.VK_NUMPAD4, Shortcut.DIRECT), false, "vm_prev",false) {
-            public void actionPerformed(ActionEvent e) {
+            @Override public void actionPerformed(ActionEvent e) {
                 if (gpsVideoPlayer != null) {
                     gpsVideoPlayer.backward();
@@ -107 +108 @@
         Vforward= new JosmAction(tr("Forward"), "audio-next", tr("jumps n sec forward"),
                 Shortcut.registerShortcut("videomapping:forward",tr("Video: {0}", tr("Forward")),KeyEvent.VK_NUMPAD6, Shortcut.DIRECT), false, "vm_next",false) {
-            public void actionPerformed(ActionEvent e) {
+            @Override public void actionPerformed(ActionEvent e) {
                 if (gpsVideoPlayer != null) {
                     gpsVideoPlayer.forward();
@@ -116 +117 @@
                 Shortcut.registerShortcut("videomapping:faster",tr("Video: {0}", tr("Faster")),KeyEvent.VK_NUMPAD8, Shortcut.DIRECT), false, "vm_faster",false) {
             
-            public void actionPerformed(ActionEvent e) {
+            @Override public void actionPerformed(ActionEvent e) {
                 if (gpsVideoPlayer != null) {
                     gpsVideoPlayer.setSpeed(gpsVideoPlayer.getSpeed()+20);
@@ -125 +126 @@
                 Shortcut.registerShortcut("videomapping:slower",tr("Video: {0}", tr("Slower")),KeyEvent.VK_NUMPAD2, Shortcut.DIRECT), false, "vm_slower",false) {
             
-            public void actionPerformed(ActionEvent e) {
+            @Override public void actionPerformed(ActionEvent e) {
                 if (gpsVideoPlayer != null) {
                     gpsVideoPlayer.setSpeed(gpsVideoPlayer.getSpeed()-20);
@@ -132 +133 @@
         };
         VJump= new JosmAction(tr("Jump To"), "jumpto", tr("jumps to the entered gps time"),null, false) {
-            public void actionPerformed(ActionEvent e) {
+            @Override public void actionPerformed(ActionEvent e) {
                 showJumpTo();
             }
@@ -140 +141 @@
         Vloop= new JosmAction(tr("Loop"), "loop", tr("loops n sec around current position"),
                 Shortcut.registerShortcut("videomapping:loop",tr("Video: {0}", tr("Loop")),KeyEvent.VK_NUMPAD7, Shortcut.DIRECT), false) {            
-            public void actionPerformed(ActionEvent e) {
+            @Override public void actionPerformed(ActionEvent e) {
                 if (gpsVideoPlayer != null) {
                     gpsVideoPlayer.toggleLooping();
@@ -149 +150 @@
         //now the options menu
         VCenterIcon = new JCheckBoxMenuItem(new JosmAction(tr("Keep centered"), (String)null, tr("follows the video icon automaticly"),null, false,"vm_keepcentered",false) {            
-            public void actionPerformed(ActionEvent e) {
+            @Override public void actionPerformed(ActionEvent e) {
                 if (videoPositionLayer != null) {
                     videoPositionLayer.setAutoCenter(VCenterIcon.isSelected());
@@ -157 +158 @@
         
         VSubTitles = new JCheckBoxMenuItem(new JosmAction(tr("Subtitles"), (String)null, tr("Show subtitles in video"),null, false,"vm_subtitles",false) {
-            public void actionPerformed(ActionEvent e) {
+            @Override public void actionPerformed(ActionEvent e) {
                 if (gpsVideoPlayer != null) {
                     gpsVideoPlayer.setSubtitles(VSubTitles.isSelected());
@@ -165 +166 @@
         
         VJumpLength = new JMenuItem(new JosmAction(tr("Jump length"), (String)null, tr("Set the length of a jump"),null, false,"vm_jumplen",false) {            
-            public void actionPerformed(ActionEvent e) {
+            @Override public void actionPerformed(ActionEvent e) {
                 Object[] possibilities = {"200", "500", "1000", "2000", "10000"};
                 String s = (String)JOptionPane.showInputDialog(Main.parent,tr("Jump in video for x ms"),tr("Jump length"),JOptionPane.QUESTION_MESSAGE,null,possibilities,jumpLength);
@@ -174 +175 @@
         
         VLoopLength = new JMenuItem(new JosmAction(tr("Loop length"), (String)null, tr("Set the length around a looppoint"),null, false,"vm_looplen",false) {            
-            public void actionPerformed(ActionEvent e) {
+            @Override public void actionPerformed(ActionEvent e) {
                 Object[] possibilities = {"500", "1000", "3000", "5000", "10000"};
                 String s = (String)JOptionPane.showInputDialog(Main.parent,tr("Jump in video for x ms"),tr("Loop length"),JOptionPane.QUESTION_MESSAGE,null,possibilities,loopLength);
@@ -184 +185 @@
         VDeinterlacer= new JMenu("Deinterlacer");
         VIntNone= new JRadioButtonMenuItem(new JosmAction(tr("none"), (String)null, tr("no deinterlacing"),null, false,"vm_deinterlacer",false) {            
-            public void actionPerformed(ActionEvent e) {
+            @Override public void actionPerformed(ActionEvent e) {
                 if (gpsVideoPlayer != null) {
                     gpsVideoPlayer.setDeinterlacer(null);
@@ -191 +192 @@
         });
         VIntBob= new JRadioButtonMenuItem(new JosmAction("bob", (String)null, tr("deinterlacing using line doubling"),null, false,"vm_bobdeinterlace",false) {
-            public void actionPerformed(ActionEvent e) {
+            @Override public void actionPerformed(ActionEvent e) {
                 if (gpsVideoPlayer != null) {
                     gpsVideoPlayer.setDeinterlacer(DeinterlaceMode.BOB);
@@ -198 +199 @@
         });
         VIntLinear= new JRadioButtonMenuItem(new JosmAction("linear", (String)null, tr("deinterlacing using linear interpolation"),null, false,"vm_lineardeinterlace",false) {
-            public void actionPerformed(ActionEvent e) {
+            @Override public void actionPerformed(ActionEvent e) {
                 if (gpsVideoPlayer != null) {
                     gpsVideoPlayer.setDeinterlacer(DeinterlaceMode.LINEAR);
@@ -223 +224 @@
     }
 
-        protected void importVideoFile() {
-                JFileChooser fc = new JFileChooser(mostRecentFolder);
+    protected void importVideoFile() {
+        JFileChooser fc = new JFileChooser(mostRecentFolder);
         fc.setSelectedFile(new File(mostRecentFolder));
         if (fc.showOpenDialog(Main.parent) != JFileChooser.CANCEL_OPTION) {
-                mostRecentFolder=fc.getSelectedFile().getAbsolutePath();
-                saveProperties();
-                if (videoPositionLayer == null && gpsLayer != null) {
-                        videoPositionLayer = new VideoPositionLayer(gpsLayer);
-                gpsVideoPlayer = new GPSVideoPlayer(new SimpleDateFormat("hh:mm:ss") ,videoPositionLayer);
-                gpsVideoPlayer.setJumpLength(jumpLength);
-                gpsVideoPlayer.setLoopLength(loopLength);
-                enableVideoControlMenus(true);
-                }
-                if (gpsVideoPlayer != null && gpsVideoPlayer.isCorrectlyInitiliazed()) {
-                    gpsVideoPlayer.addVideo(fc.getSelectedFile());
-                } else {
+            mostRecentFolder=fc.getSelectedFile().getAbsolutePath();
+            saveProperties();
+            if (videoPositionLayer == null && gpsLayer != null) {
+                videoPositionLayer = new VideoPositionLayer(gpsLayer);
+                gpsVideoPlayer = new GPSVideoPlayer(new SimpleDateFormat("hh:mm:ss") ,videoPositionLayer);
+                gpsVideoPlayer.setJumpLength(jumpLength);
+                gpsVideoPlayer.setLoopLength(loopLength);
+                enableVideoControlMenus(true);
+            }
+            if (gpsVideoPlayer != null && gpsVideoPlayer.isCorrectlyInitiliazed()) {
+                gpsVideoPlayer.addVideo(fc.getSelectedFile());
+            } else {
                 JOptionPane.showMessageDialog(Main.parent, 
-                        tr("VLC library is not correctly initialized."+
-                                " Please check that VLC {0} is correctly installed on your system."+
-                                " Its architecture (32/64 bits) must also be the same as the JRE that runs JOSM.", VLC_VERSION),
-                        tr("Error"), JOptionPane.ERROR_MESSAGE
-                        );
-                }
+                    tr("VLC library is not correctly initialized."+
+                            " Please check that VLC {0} is correctly installed on your system."+
+                            " Its architecture (32/64 bits) must also be the same as the JRE that runs JOSM.", VLC_VERSION),
+                    tr("Error"), JOptionPane.ERROR_MESSAGE);
+            }
         }               
-        }
-
-        private void enableVideoControlMenus(boolean b) {
-                VStart.setEnabled(b);
+    }
+
+    private void enableVideoControlMenus(boolean b) {
+        VStart.setEnabled(b);
         Vbackward.setEnabled(b);
         Vforward.setEnabled(b);
@@ -257 +257 @@
         Vslower.setEnabled(b);
         VJump.setEnabled(b);            
-        }
+    }
         
-        private void setDefaults() {
-                autoCenter=false;
+    private void setDefaults() {
+        autoCenter=false;
 //              deinterlacer="";
-                jumpLength=1000;
-                loopLength=6000;
-                mostRecentFolder=System.getProperty("user.home");               
-        }
+        jumpLength=1000;
+        loopLength=6000;
+        mostRecentFolder=System.getProperty("user.home");               
+    }
         
-        private void loadProperties() {
+    private void loadProperties() {
         String temp;        
         temp=Main.pref.get(PROP_AUTOCENTER);
@@ -283 +283 @@
     }
         
-        private void saveProperties(){
+    private void saveProperties(){
         Main.pref.put(PROP_AUTOCENTER, autoCenter);
         Main.pref.put(PROP_JUMPLENGTH, jumpLength.toString());
@@ -290 +290 @@
     }
         
-        private void showJumpTo()
-        {
-        try {
-                JOptionPane d=new JOptionPane(tr("Jump to"), JOptionPane.QUESTION_MESSAGE, JOptionPane.OK_CANCEL_OPTION);               
-                SimpleDateFormat gpsTimeFormat= new SimpleDateFormat("HH:mm:ss");
-                String timerange=gpsTimeFormat.format(videoPositionLayer.getFirstWayPoint().getTime())+" - ";
-                timerange=timerange+gpsTimeFormat.format(videoPositionLayer.getLastWayPoint().getTime());
-                d.add(new JLabel(timerange)); //TODO for some reason this doesn't work -> use dialog
-                final JFormattedTextField inp = new JFormattedTextField(new MaskFormatter("##:##:##"));
-                inp.setText(gpsTimeFormat.format( videoPositionLayer.getGPSDate()));
-                inp.setInputVerifier(new InputVerifier() {                                      
-                                @Override
-                                public boolean verify(JComponent input) {
-                                        return false;
-                                }
-                        });
-                //hack to set the focus
-                SwingUtilities.invokeLater(new Runnable() {
-                    public void run() {
-                        inp.requestFocus();
-                        inp.setCaretPosition(0);
-                    }
-                });
-                if (JOptionPane.showConfirmDialog(Main.panel,inp, tr("Jump to GPS time"),JOptionPane.OK_CANCEL_OPTION) == JOptionPane.OK_OPTION)
-                {
-                        //add the day to the time
-                        Date t = gpsTimeFormat.parse(inp.getText());                    
-                        Calendar time = Calendar.getInstance();
-                        Calendar date = Calendar.getInstance();
-                        time.setTime(t);
-                        date.setTime(videoPositionLayer.getFirstWayPoint().getTime());
-                        time.set(date.get(Calendar.YEAR), date.get(Calendar.MONTH), date.get(Calendar.DATE));
-                    if (t!=null)
-                    {
-                        videoPositionLayer.jump(time.getTime());
-                    }                       
-                }
+    private void showJumpTo() {
+        try {
+            JOptionPane d=new JOptionPane(tr("Jump to"), JOptionPane.QUESTION_MESSAGE, JOptionPane.OK_CANCEL_OPTION);           
+            SimpleDateFormat gpsTimeFormat= new SimpleDateFormat("HH:mm:ss");
+            String timerange=gpsTimeFormat.format(videoPositionLayer.getFirstWayPoint().getTime())+" - ";
+            timerange=timerange+gpsTimeFormat.format(videoPositionLayer.getLastWayPoint().getTime());
+            d.add(new JLabel(timerange)); //TODO for some reason this doesn't work -> use dialog
+            final JFormattedTextField inp = new JFormattedTextField(new MaskFormatter("##:##:##"));
+            inp.setText(gpsTimeFormat.format( videoPositionLayer.getGPSDate()));
+            inp.setInputVerifier(new InputVerifier() {                                  
+                    @Override
+                    public boolean verify(JComponent input) {
+                        return false;
+                    }
+                });
+            //hack to set the focus
+            SwingUtilities.invokeLater(new Runnable() {
+                @Override
+                public void run() {
+                    inp.requestFocus();
+                    inp.setCaretPosition(0);
+                }
+            });
+            if (JOptionPane.showConfirmDialog(Main.panel,inp, tr("Jump to GPS time"),JOptionPane.OK_CANCEL_OPTION) == JOptionPane.OK_OPTION)
+            {
+                    //add the day to the time
+                    Date t = gpsTimeFormat.parse(inp.getText());                        
+                    Calendar time = Calendar.getInstance();
+                    Calendar date = Calendar.getInstance();
+                    time.setTime(t);
+                    date.setTime(videoPositionLayer.getFirstWayPoint().getTime());
+                    time.set(date.get(Calendar.YEAR), date.get(Calendar.MONTH), date.get(Calendar.DATE));
+                if (t!=null)
+                {
+                    videoPositionLayer.jump(time.getTime());
+                }                       
+            }
         } catch (ParseException e1) {
-                e1.printStackTrace();
+            e1.printStackTrace();
         }
-        }
-        
-
-        public void activeLayerChange(Layer oldLayer, Layer newLayer) {
+    }
+
+    @Override
+    public void activeLayerChange(Layer oldLayer, Layer newLayer) {
         VMenu.setEnabled(true);
         if (newLayer instanceof GpxLayer)
@@ -343 +343 @@
     }
 
-        public void layerAdded(Layer arg0) {
-                activeLayerChange(null,arg0);
-                
-        }
-
-        public void layerRemoved(Layer arg0) {
-                if(arg0 instanceof VideoPositionLayer)
-                        enableVideoControlMenus(false);
-                activeLayerChange(null,arg0);
-                
-        }
+    @Override
+    public void layerAdded(Layer arg0) {
+        activeLayerChange(null,arg0);
+    }
+
+    @Override
+    public void layerRemoved(Layer arg0) {
+        if(arg0 instanceof VideoPositionLayer)
+                enableVideoControlMenus(false);
+        activeLayerChange(null,arg0);
+    }
   }

applications/editors/josm/plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/video/GPSVideoPlayer.java

@@ -42 +42 @@
                 syncButton.setBackground(Color.RED);            
                 syncButton.addActionListener(new ActionListener() {
+            @Override
             public void actionPerformed(ActionEvent e) {
                 resync(e);

applications/editors/josm/plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/video/VideoEngine.java

@@ -319 +319 @@
         }
 
-        public void backward(MediaPlayer arg0) {
-                
-        }
+        @Override
+        public void backward(MediaPlayer arg0) { }
 /*
         public void buffering(MediaPlayer arg0) {
@@ -327 +326 @@
         }
 */
-        public void error(MediaPlayer arg0) {
-                
-        }
-
-        public void finished(MediaPlayer arg0) {
-                
-        }
-
-        public void forward(MediaPlayer arg0) {
-                
-        }
-
-        public void lengthChanged(MediaPlayer arg0, long arg1) {
-                
-        }
+        @Override
+        public void error(MediaPlayer arg0) { }
+
+        @Override
+        public void finished(MediaPlayer arg0) { }
+
+        @Override
+        public void forward(MediaPlayer arg0) { }
+
+        @Override
+        public void lengthChanged(MediaPlayer arg0, long arg1) { }
 /*
         public void mediaChanged(MediaPlayer arg0) {
@@ -353 +348 @@
         }
 */
-        public void opening(MediaPlayer arg0) {
-                
-        }
-
-        public void pausableChanged(MediaPlayer arg0, int arg1) {
-                
-        }
-
-        public void paused(MediaPlayer arg0) {
-                        
-        }
-
-        public void playing(MediaPlayer arg0) {
-                
-        }
-
-        public void positionChanged(MediaPlayer arg0, float arg1) {
-                
-        }
-
-        public void seekableChanged(MediaPlayer arg0, int arg1) {
-                
-        }
-
-        public void snapshotTaken(MediaPlayer arg0, String arg1) {
-                
-        }
-
-        public void stopped(MediaPlayer arg0) {
-                
-        }
-
-        public void timeChanged(MediaPlayer arg0, long arg1) {
-                
-        }
-
-        public void titleChanged(MediaPlayer arg0, int arg1) {
-                
-        }
+        @Override
+        public void opening(MediaPlayer arg0) { }
+
+        @Override
+        public void pausableChanged(MediaPlayer arg0, int arg1) { }
+
+        @Override
+        public void paused(MediaPlayer arg0) { }
+
+        @Override
+        public void playing(MediaPlayer arg0) { }
+
+        @Override
+        public void positionChanged(MediaPlayer arg0, float arg1) { }
+
+        @Override
+        public void seekableChanged(MediaPlayer arg0, int arg1) { }
+
+        @Override
+        public void snapshotTaken(MediaPlayer arg0, String arg1) { }
+
+        @Override
+        public void stopped(MediaPlayer arg0) { }
+
+        @Override
+        public void timeChanged(MediaPlayer arg0, long arg1) { }
+
+        @Override
+        public void titleChanged(MediaPlayer arg0, int arg1) { }
 
         public boolean isNoVideoPlaying() {

applications/editors/josm/plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/video/VideoPlayer.java

@@ -30 +30 @@
 import uk.co.caprica.vlcj.player.DeinterlaceMode;
 
-//basic UI of a videoplayer for multiple videos incl. notifications
+/** basic UI of a videoplayer for multiple videos incl. notifications
+ */
 public class VideoPlayer extends JFrame implements WindowListener, VideosObserver, VideoPlayerObserver {
         private static final int notificationIntervall = 500;
@@ -205 +206 @@
         
         play.addActionListener(new ActionListener() {            
-            public void actionPerformed(ActionEvent arg0) {
+            @Override public void actionPerformed(ActionEvent arg0) {
             pause();                
             }
@@ -212 +213 @@
         back.addActionListener(new ActionListener() {
             
-            public void actionPerformed(ActionEvent arg0) {
+            @Override public void actionPerformed(ActionEvent arg0) {
                 backward();
             }
@@ -219 +220 @@
         forward.addActionListener(new ActionListener() {
             
-            public void actionPerformed(ActionEvent arg0) {
+            @Override public void actionPerformed(ActionEvent arg0) {
                 forward();
             }
@@ -226 +227 @@
         loop.addActionListener(new ActionListener() {
 
-            public void actionPerformed(ActionEvent arg0) {
+            @Override public void actionPerformed(ActionEvent arg0) {
                 toggleLooping();
             }
@@ -233 +234 @@
         mute.addActionListener(new ActionListener() {
 
-            public void actionPerformed(ActionEvent arg0) {
+            @Override public void actionPerformed(ActionEvent arg0) {
                 mute();
             }
@@ -239 +240 @@
         
         timeline.addChangeListener(new ChangeListener() {
+            @Override
             public void stateChanged(ChangeEvent e) {
                         //skip events, fired by this sliede, one cycle ago              
@@ -252 +254 @@
         
         speed.addChangeListener(new ChangeListener() {            
+            @Override
             public void stateChanged(ChangeEvent arg0) {                            
                 if(!speed.getValueIsAdjusting())
@@ -311 +314 @@
         }
 
-        public void windowActivated(WindowEvent arg0) {
-                // TODO Auto-generated method stub
-                
-        }
-
-        public void windowClosed(WindowEvent arg0) {
-                
-        }
-
+        @Override
+        public void windowActivated(WindowEvent arg0) { }
+
+        @Override
+        public void windowClosed(WindowEvent arg0) { }
+
+        @Override
         public void windowClosing(WindowEvent arg0) {   
                 videoengine.unload();
         }
 
-        public void windowDeactivated(WindowEvent arg0) {
-                // TODO Auto-generated method stub
-                
-        }
-
-        public void windowDeiconified(WindowEvent arg0) {
-                // TODO Auto-generated method stub
-                
-        }
-
-        public void windowIconified(WindowEvent arg0) {
-                // TODO Auto-generated method stub
-                
-        }
-
-        public void windowOpened(WindowEvent arg0) {
-                // TODO Auto-generated method stub
-                
-        }
-
+        @Override
+        public void windowDeactivated(WindowEvent arg0) { }
+
+        @Override
+        public void windowDeiconified(WindowEvent arg0) { }
+
+        @Override
+        public void windowIconified(WindowEvent arg0) { }
+
+        @Override
+        public void windowOpened(WindowEvent arg0) { }
+
+        @Override
         public void update(VideoObserversEvents event) {
-                switch (event)
-                {               
-                        case resizing:
-                        {
-                                pack();
-                                break;
-                        }
-                        case speeding:
-                        {
-                                speed.setValue(videoengine.getSpeed());
-                                break;
-                        }
-                        case jumping:
-                        {                       
-                                break;
-                        }
-                }               
+            switch (event)
+            {           
+                case resizing:
+                {
+                    pack();
+                    break;
+                }
+                case speeding:
+                {
+                    speed.setValue(videoengine.getSpeed());
+                    break;
+                }
+                case jumping:
+                {                       
+                    break;
+                }
+            }           
         }
 
         //keep internal controls up to date during playback
+        @Override
         public void update_plays() {
                 timeline.setValue(videoengine.getPosition());

applications/editors/josm/plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/video/VideoPlayerObserver.java

@@ -1 +1 @@
 package org.openstreetmap.josm.plugins.videomapping.video;
 
-//update mechanism for GPS position, title bar,...
+/** Update mechanism for GPS position, title bar,...
+ */
 public interface VideoPlayerObserver {
         public void update_plays();
-
 }

applications/editors/josm/plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/video/VideosObserver.java

@@ -1 +1 @@
 package org.openstreetmap.josm.plugins.videomapping.video;
 
-//getting basic control informations per video
+/** Getting basic control informations per video
+ */
 public interface VideosObserver {
-
         void update(VideoObserversEvents event);
-
 }