Index: /applications/editors/josm/plugins/CommandLine/src/CommandLine/CommandLine.java =================================================================== --- /applications/editors/josm/plugins/CommandLine/src/CommandLine/CommandLine.java (revision 29770) +++ /applications/editors/josm/plugins/CommandLine/src/CommandLine/CommandLine.java (revision 29771) @@ -190,6 +190,5 @@ if ( Main.main.menu != null ) { - 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")); + commandMenu = Main.main.menu.addMenu(marktr("Commands") , KeyEvent.VK_O, Main.main.menu.defaultMenuPos, ht("/Plugin/CommandLine")); MainMenu.add(commandMenu, new CommandLineAction(this)); } Index: /applications/editors/josm/plugins/Create_grid_of_ways/build.xml =================================================================== --- /applications/editors/josm/plugins/Create_grid_of_ways/build.xml (revision 29770) +++ /applications/editors/josm/plugins/Create_grid_of_ways/build.xml (revision 29771) @@ -32,5 +32,5 @@ - + Index: /applications/editors/josm/plugins/Create_grid_of_ways/nbproject/project.xml =================================================================== --- /applications/editors/josm/plugins/Create_grid_of_ways/nbproject/project.xml (revision 29771) +++ /applications/editors/josm/plugins/Create_grid_of_ways/nbproject/project.xml (revision 29771) @@ -0,0 +1,66 @@ + + + org.netbeans.modules.ant.freeform + + + Create_grid_of_ways + + + + Create_grid_of_ways + + + + + java + src + UTF-8 + + + + . + UTF-8 + + + + + compile + + + clean + + + install + + + clean + compile + + + + + + + src + + + build.xml + + + + + + + + + + + + + src + ../../core/src + 1.6 + + + + Index: /applications/editors/josm/plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java =================================================================== --- /applications/editors/josm/plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java (revision 29770) +++ /applications/editors/josm/plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java (revision 29771) @@ -44,4 +44,5 @@ * existing ones (--this is from a translation machine--) */ + @Override public void actionPerformed(ActionEvent e) { Collection sel = Main.main.getCurrentDataSet().getSelected(); Index: /applications/editors/josm/plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysPlugin.java =================================================================== --- /applications/editors/josm/plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysPlugin.java (revision 29770) +++ /applications/editors/josm/plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysPlugin.java (revision 29771) @@ -9,5 +9,5 @@ public CreateGridOfWaysPlugin(PluginInformation info) { super(info); - MainMenu.add(Main.main.menu.toolsMenu, new CreateGridOfWaysAction()); + MainMenu.add(Main.main.menu.moreToolsMenu, new CreateGridOfWaysAction()); } } Index: /applications/editors/josm/plugins/OpeningHoursEditor/build.xml =================================================================== --- /applications/editors/josm/plugins/OpeningHoursEditor/build.xml (revision 29770) +++ /applications/editors/josm/plugins/OpeningHoursEditor/build.xml (revision 29771) @@ -32,5 +32,5 @@ - + + OpeningHoursEditor + + + + + java + src + UTF-8 + + + + . + UTF-8 + + + + + compile + + + clean + + + install + + + clean + compile + + + + + + + src + + + build.xml + + + + + + + + + + + + + src + ../../core/src + 1.6 + + + + Index: /applications/editors/josm/plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java =================================================================== --- /applications/editors/josm/plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java (revision 29770) +++ /applications/editors/josm/plugins/OpeningHoursEditor/src/org/openstreetmap/josm/plugins/ohe/OhePlugin.java (revision 29771) @@ -73,5 +73,5 @@ public OhePlugin(PluginInformation info) { super(info); - MainMenu.add(Main.main.menu.toolsMenu, new OheMenuAction()); + MainMenu.add(Main.main.menu.dataMenu, new OheMenuAction()); } @@ -108,4 +108,5 @@ } + @Override public void actionPerformed(ActionEvent evt) { // fetch active Layer Index: /applications/editors/josm/plugins/alignways/build.xml =================================================================== --- /applications/editors/josm/plugins/alignways/build.xml (revision 29770) +++ /applications/editors/josm/plugins/alignways/build.xml (revision 29771) @@ -35,5 +35,5 @@ with --> - + + alignways + + + + + . + UTF-8 + + + + java + src + UTF-8 + + + + java + test/unit + UTF-8 + + + + + compile + + + clean + + + install + + + clean + compile + + + + + + + src + + + + test/unit + + + build.xml + + + + + + + + + + + + + + src + ../../core/src;lib + 1.6 + + + test/unit + + 1.6 + + + + Index: /applications/editors/josm/plugins/alignways/src/com/tilusnet/josm/plugins/alignways/AlignWaysPlugin.java =================================================================== --- /applications/editors/josm/plugins/alignways/src/com/tilusnet/josm/plugins/alignways/AlignWaysPlugin.java (revision 29770) +++ /applications/editors/josm/plugins/alignways/src/com/tilusnet/josm/plugins/alignways/AlignWaysPlugin.java (revision 29771) @@ -31,7 +31,7 @@ // Add the action entries to the Tools Menu - Main.main.menu.toolsMenu.addSeparator(); + Main.main.menu.moreToolsMenu.addSeparator(); awAction = new AlignWaysAction(); - MainMenu.add(Main.main.menu.toolsMenu, awAction); + MainMenu.add(Main.main.menu.moreToolsMenu, awAction); } Index: /applications/editors/josm/plugins/buildings_tools/build.xml =================================================================== --- /applications/editors/josm/plugins/buildings_tools/build.xml (revision 29770) +++ /applications/editors/josm/plugins/buildings_tools/build.xml (revision 29771) @@ -4,5 +4,5 @@ - + + buildings_tools + + + + + java + src + UTF-8 + + + + . + UTF-8 + + + + + compile + + + clean + + + runjosm + + + clean + compile + + + + + + + src + + + build.xml + + + + + + + + + + + + + src + ../../core/src + 1.6 + + + + Index: /applications/editors/josm/plugins/buildings_tools/src/buildings_tools/BuildingSizeAction.java =================================================================== --- /applications/editors/josm/plugins/buildings_tools/src/buildings_tools/BuildingSizeAction.java (revision 29770) +++ /applications/editors/josm/plugins/buildings_tools/src/buildings_tools/BuildingSizeAction.java (revision 29771) @@ -19,4 +19,5 @@ } + @Override public void actionPerformed(ActionEvent arg0) { BuildingSizeDialog dlg = new BuildingSizeDialog(); Index: /applications/editors/josm/plugins/buildings_tools/src/buildings_tools/BuildingsToolsPlugin.java =================================================================== --- /applications/editors/josm/plugins/buildings_tools/src/buildings_tools/BuildingsToolsPlugin.java (revision 29770) +++ /applications/editors/josm/plugins/buildings_tools/src/buildings_tools/BuildingsToolsPlugin.java (revision 29771) @@ -26,5 +26,5 @@ super(info); Main.main.menu.editMenu.addSeparator(); - MainMenu.add(Main.main.menu.editMenu, new BuildingSizeAction()); + MainMenu.add(Main.main.menu.dataMenu, new BuildingSizeAction()); } Index: /applications/editors/josm/plugins/lakewalker/build.xml =================================================================== --- /applications/editors/josm/plugins/lakewalker/build.xml (revision 29770) +++ /applications/editors/josm/plugins/lakewalker/build.xml (revision 29771) @@ -5,5 +5,5 @@ - + + lakewalker + + + + + java + src + UTF-8 + + + + . + UTF-8 + + + + + compile + + + clean + + + runjosm + + + clean + compile + + + + + + + src + + + build.xml + + + + + + + + + + + + + src + ../../core/src + 1.6 + + + + Index: /applications/editors/josm/plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPlugin.java =================================================================== --- /applications/editors/josm/plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPlugin.java (revision 29770) +++ /applications/editors/josm/plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPlugin.java (revision 29771) @@ -17,5 +17,5 @@ public LakewalkerPlugin(PluginInformation info) { super(info); - MainMenu.add(Main.main.menu.toolsMenu, new LakewalkerAction(tr("Lake Walker"))); + MainMenu.add(Main.main.menu.moreToolsMenu, new LakewalkerAction(tr("Lake Walker"))); } Index: /applications/editors/josm/plugins/livegps/build.xml =================================================================== --- /applications/editors/josm/plugins/livegps/build.xml (revision 29770) +++ /applications/editors/josm/plugins/livegps/build.xml (revision 29771) @@ -27,5 +27,5 @@ - + - + + terracer + + + + + java + src + UTF-8 + + + + . + UTF-8 + + + + + compile + + + clean + + + runjosm + + + clean + compile + + + + + + + src + + + build.xml + + + + + + + + + + + + + src + ../../core/src + 1.6 + + + + Index: /applications/editors/josm/plugins/terracer/src/terracer/TerracerPlugin.java =================================================================== --- /applications/editors/josm/plugins/terracer/src/terracer/TerracerPlugin.java (revision 29770) +++ /applications/editors/josm/plugins/terracer/src/terracer/TerracerPlugin.java (revision 29771) @@ -22,6 +22,6 @@ super(info); - MainMenu.add(Main.main.menu.toolsMenu, new TerracerAction()); - MainMenu.add(Main.main.menu.toolsMenu, new ReverseTerraceAction()); + MainMenu.add(Main.main.menu.moreToolsMenu, new TerracerAction()); + MainMenu.add(Main.main.menu.moreToolsMenu, new ReverseTerraceAction()); } } Index: /applications/editors/josm/plugins/tracer/build.xml =================================================================== --- /applications/editors/josm/plugins/tracer/build.xml (revision 29770) +++ /applications/editors/josm/plugins/tracer/build.xml (revision 29771) @@ -4,5 +4,5 @@ - + Index: /applications/editors/josm/plugins/tracer/nbproject/project.xml =================================================================== --- /applications/editors/josm/plugins/tracer/nbproject/project.xml (revision 29771) +++ /applications/editors/josm/plugins/tracer/nbproject/project.xml (revision 29771) @@ -0,0 +1,66 @@ + + + org.netbeans.modules.ant.freeform + + + Tracer + + + + Tracer + + + + + java + src + UTF-8 + + + + . + UTF-8 + + + + + compile + + + clean + + + runjosm + + + clean + compile + + + + + + + src + + + build.xml + + + + + + + + + + + + + src + ../../core/src + 1.6 + + + + Index: /applications/editors/josm/plugins/tracer/src/org/openstreetmap/josm/plugins/tracer/TracerPlugin.java =================================================================== --- /applications/editors/josm/plugins/tracer/src/org/openstreetmap/josm/plugins/tracer/TracerPlugin.java (revision 29770) +++ /applications/editors/josm/plugins/tracer/src/org/openstreetmap/josm/plugins/tracer/TracerPlugin.java (revision 29771) @@ -16,5 +16,5 @@ public TracerPlugin(PluginInformation info) { super(info); - MainMenu.add(Main.main.menu.toolsMenu, new TracerAction(Main.map)); + MainMenu.add(Main.main.menu.moreToolsMenu, new TracerAction(Main.map)); } Index: /applications/editors/josm/plugins/utilsplugin2/build.xml =================================================================== --- /applications/editors/josm/plugins/utilsplugin2/build.xml (revision 29770) +++ /applications/editors/josm/plugins/utilsplugin2/build.xml (revision 29771) @@ -5,7 +5,7 @@ - + - + Index: /applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/UtilsPlugin2.java =================================================================== --- /applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/UtilsPlugin2.java (revision 29770) +++ /applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/UtilsPlugin2.java (revision 29771) @@ -71,10 +71,7 @@ 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,12 +91,6 @@ 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()); Index: /applications/editors/josm/plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoPlugin.java =================================================================== --- /applications/editors/josm/plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoPlugin.java (revision 29770) +++ /applications/editors/josm/plugins/videomapping/src/org/openstreetmap/josm/plugins/videomapping/VideoPlugin.java (revision 29771) @@ -78,6 +78,5 @@ 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 = Main.main.menu.addMenu(marktr("Video"), 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) { Index: /applications/editors/josm/plugins/waydownloader/build.xml =================================================================== --- /applications/editors/josm/plugins/waydownloader/build.xml (revision 29770) +++ /applications/editors/josm/plugins/waydownloader/build.xml (revision 29771) @@ -17,5 +17,5 @@ - + Index: /applications/editors/josm/plugins/waydownloader/nbproject/project.xml =================================================================== --- /applications/editors/josm/plugins/waydownloader/nbproject/project.xml (revision 29771) +++ /applications/editors/josm/plugins/waydownloader/nbproject/project.xml (revision 29771) @@ -0,0 +1,66 @@ + + + org.netbeans.modules.ant.freeform + + + waydownloader + + + + waydownloader + + + + + java + src + UTF-8 + + + + . + UTF-8 + + + + + compile + + + clean + + + runjosm + + + clean + compile + + + + + + + src + + + build.xml + + + + + + + + + + + + + src + ../../core/src + 1.6 + + + + Index: /applications/editors/josm/plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java =================================================================== --- /applications/editors/josm/plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java (revision 29770) +++ /applications/editors/josm/plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java (revision 29771) @@ -47,5 +47,5 @@ super(info); //add WayDownloadAction to tools menu - MainMenu.add(Main.main.menu.toolsMenu, new WayDownloadAction()); + MainMenu.add(Main.main.menu.moreToolsMenu, new WayDownloadAction()); } @@ -92,8 +92,9 @@ /** Called when the WayDownloadAction action is triggered (e.g. user clicked the menu option) */ + @Override public void actionPerformed(ActionEvent e) { selectedNode = null; Collection selection = Main.main.getCurrentDataSet().getSelectedNodes(); - if (selection.size()==0) { + if (selection.isEmpty()) { Collection selWays = Main.main.getCurrentDataSet().getSelectedWays(); if (!workFromWaySelection(selWays)) { @@ -104,5 +105,5 @@ } - if ( selection.size()==0 || selection.size()>1 || ! (selection.iterator().next() instanceof Node)) { + if ( selection.isEmpty() || selection.size()>1 || ! (selection.iterator().next() instanceof Node)) { showWarningMessage(tr("Could not find a unique node to start downloading from.")); return; @@ -115,5 +116,5 @@ //Find connected way List connectedWays = findConnectedWays(selectedNode); - if (connectedWays.size()==0) { + if (connectedWays.isEmpty()) { showWarningMessage( tr("There are no ways connected to node ''{0}''. Aborting.", @@ -143,4 +144,5 @@ Main.worker.submit( new Runnable() { + @Override public void run() { try { @@ -162,9 +164,10 @@ * Logic to excute after the download has happened */ + @Override public void run() { //Find ways connected to the node after the download List connectedWays = findConnectedWays(selectedNode); - if (connectedWays.size()==0) { + if (connectedWays.isEmpty()) { String msg = tr("Way downloader data inconsistency. Prior connected way ''{0}'' wasn''t discovered after download", priorConnectedWay.getDisplayName(DefaultNameFormatter.getInstance()) Index: /applications/editors/josm/plugins/wayselector/build.xml =================================================================== --- /applications/editors/josm/plugins/wayselector/build.xml (revision 29770) +++ /applications/editors/josm/plugins/wayselector/build.xml (revision 29771) @@ -17,5 +17,5 @@ - + Index: /applications/editors/josm/plugins/wayselector/nbproject/project.xml =================================================================== --- /applications/editors/josm/plugins/wayselector/nbproject/project.xml (revision 29771) +++ /applications/editors/josm/plugins/wayselector/nbproject/project.xml (revision 29771) @@ -0,0 +1,66 @@ + + + org.netbeans.modules.ant.freeform + + + wayselector + + + + wayselector + + + + + java + src + UTF-8 + + + + . + UTF-8 + + + + + compile + + + clean + + + runjosm + + + clean + compile + + + + + + + src + + + build.xml + + + + + + + + + + + + + src + ../../core/src + 1.6 + + + + Index: /applications/editors/josm/plugins/wayselector/src/org/openstreetmap/josm/plugins/wayselector/WaySelectorPlugin.java =================================================================== --- /applications/editors/josm/plugins/wayselector/src/org/openstreetmap/josm/plugins/wayselector/WaySelectorPlugin.java (revision 29770) +++ /applications/editors/josm/plugins/wayselector/src/org/openstreetmap/josm/plugins/wayselector/WaySelectorPlugin.java (revision 29771) @@ -28,5 +28,5 @@ super(info); - MainMenu.add(Main.main.menu.toolsMenu, new WaySelectAction()); + MainMenu.add(Main.main.menu.selectionMenu, new WaySelectAction()); }