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 29753)
+++ applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/UtilsPlugin2.java	(revision 29769)
@@ -71,23 +71,35 @@
     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,7 +117,6 @@
         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());
Index: applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/actions/ExtractPointAction.java
===================================================================
--- applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/actions/ExtractPointAction.java	(revision 29753)
+++ applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/actions/ExtractPointAction.java	(revision 29769)
@@ -2,5 +2,4 @@
 package org.openstreetmap.josm.plugins.utilsplugin2.actions;
 
-import java.awt.MouseInfo;
 import java.awt.Point;
 import static org.openstreetmap.josm.gui.help.HelpUtil.ht;
Index: applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/actions/PasteRelationsAction.java
===================================================================
--- applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/actions/PasteRelationsAction.java	(revision 29753)
+++ applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/actions/PasteRelationsAction.java	(revision 29769)
@@ -24,4 +24,5 @@
     }
 
+    @Override
     public void actionPerformed( ActionEvent e ) {
         Collection<OsmPrimitive> selection = getCurrentDataSet().getSelected();
Index: applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/actions/SplitOnIntersectionsAction.java
===================================================================
--- applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/actions/SplitOnIntersectionsAction.java	(revision 29753)
+++ applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/actions/SplitOnIntersectionsAction.java	(revision 29769)
@@ -30,4 +30,5 @@
     }
 
+    @Override
     public void actionPerformed( ActionEvent e ) {
         List<Command> list = new ArrayList<Command>();
Index: applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/actions/SymmetryAction.java
===================================================================
--- applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/actions/SymmetryAction.java	(revision 29753)
+++ applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/actions/SymmetryAction.java	(revision 29769)
@@ -40,4 +40,5 @@
     }
 
+    @Override
     public void actionPerformed(ActionEvent e) {
         Collection<OsmPrimitive> sel = getCurrentDataSet().getSelected();
Index: applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/actions/TagBufferAction.java
===================================================================
--- applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/actions/TagBufferAction.java	(revision 29753)
+++ applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/actions/TagBufferAction.java	(revision 29769)
@@ -28,4 +28,5 @@
     }
 
+    @Override
     public void actionPerformed( ActionEvent e ) {
         Collection<OsmPrimitive> selection = getCurrentDataSet().getSelected();
Index: applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/actions/TagSourceAction.java
===================================================================
--- applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/actions/TagSourceAction.java	(revision 29753)
+++ applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/actions/TagSourceAction.java	(revision 29769)
@@ -29,4 +29,5 @@
     }
 
+    @Override
     public void actionPerformed( ActionEvent e ) {
         Collection<OsmPrimitive> selection = getCurrentDataSet().getSelected();
Index: applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/actions/UnGlueRelationAction.java
===================================================================
--- applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/actions/UnGlueRelationAction.java	(revision 29753)
+++ applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/actions/UnGlueRelationAction.java	(revision 29769)
@@ -46,4 +46,5 @@
      * Called when the action is executed.
      */
+    @Override
     public void actionPerformed(ActionEvent e) {
 
Index: applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/customurl/ChooseURLAction.java
===================================================================
--- applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/customurl/ChooseURLAction.java	(revision 29753)
+++ applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/customurl/ChooseURLAction.java	(revision 29769)
@@ -2,9 +2,5 @@
 
 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,6 +9,4 @@
 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,5 +16,4 @@
 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;
 
Index: applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/customurl/OpenPageAction.java
===================================================================
--- applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/customurl/OpenPageAction.java	(revision 29753)
+++ applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/customurl/OpenPageAction.java	(revision 29769)
@@ -40,4 +40,5 @@
     }
 
+    @Override
     public void actionPerformed(ActionEvent e) {
         Collection<OsmPrimitive> sel = getCurrentDataSet().getSelected();
@@ -62,24 +63,24 @@
         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) {
Index: applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/customurl/UtilsPluginPreferences.java
===================================================================
--- applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/customurl/UtilsPluginPreferences.java	(revision 29753)
+++ applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/customurl/UtilsPluginPreferences.java	(revision 29769)
@@ -48,4 +48,5 @@
         resetButton = new JButton(tr("Reset"));
         resetButton.addActionListener(new ActionListener() {
+            @Override
             public void actionPerformed(ActionEvent e) {
                 fillRows(URLList.resetURLList());
@@ -55,4 +56,5 @@
         saveButton = new JButton(tr("Save to file"));
         saveButton.addActionListener(new ActionListener() {
+            @Override
             public void actionPerformed(ActionEvent e) {
                 URLList.saveURLList(readItemsFromTable());
@@ -62,4 +64,5 @@
         loadButton = new JButton(tr("Load from file"));
         loadButton.addActionListener(new ActionListener() {
+            @Override
             public void actionPerformed(ActionEvent e) {
                 fillRows(URLList.loadURLList());
Index: applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/latlon/LatLonAction.java
===================================================================
--- applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/latlon/LatLonAction.java	(revision 29753)
+++ applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/latlon/LatLonAction.java	(revision 29769)
@@ -35,4 +35,5 @@
     }
 
+    @Override
     public void actionPerformed(ActionEvent e) {
         if (!isEnabled())
Index: applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/latlon/LatLonDialog.java
===================================================================
--- applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/latlon/LatLonDialog.java	(revision 29753)
+++ applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/latlon/LatLonDialog.java	(revision 29769)
@@ -7,9 +7,6 @@
 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,5 +17,4 @@
 import java.util.regex.Pattern;
 
-import javax.swing.AbstractAction;
 import javax.swing.BorderFactory;
 import javax.swing.JLabel;
@@ -27,5 +23,4 @@
 import javax.swing.JTabbedPane;
 
-import javax.swing.text.Document;
 import javax.swing.JTextArea;
 import javax.swing.JScrollPane;
@@ -45,5 +40,4 @@
 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,13 +282,13 @@
 
     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,4 +296,5 @@
 
     static class TextFieldFocusHandler implements FocusListener {
+        @Override 
         public void focusGained(FocusEvent e) {
             Component c = e.getComponent();
@@ -309,4 +304,5 @@
             }
         }
+        @Override 
         public void focusLost(FocusEvent e) {}
     }
@@ -448,11 +444,11 @@
 
     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();
         }
Index: applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/selection/AdjacentNodesAction.java
===================================================================
--- applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/selection/AdjacentNodesAction.java	(revision 29753)
+++ applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/selection/AdjacentNodesAction.java	(revision 29769)
@@ -31,4 +31,5 @@
     private  Set<Way> activeWays = new HashSet<Way>();
 
+    @Override
     public void actionPerformed(ActionEvent e) {
         Collection<OsmPrimitive> selection = getCurrentDataSet().getSelected();
Index: applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/selection/AdjacentWaysAction.java
===================================================================
--- applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/selection/AdjacentWaysAction.java	(revision 29753)
+++ applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/selection/AdjacentWaysAction.java	(revision 29769)
@@ -30,4 +30,5 @@
     }
 
+    @Override
     public void actionPerformed(ActionEvent e) {
         Collection<OsmPrimitive> selection = getCurrentDataSet().getSelected();
Index: applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/selection/ConnectedWaysAction.java
===================================================================
--- applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/selection/ConnectedWaysAction.java	(revision 29753)
+++ applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/selection/ConnectedWaysAction.java	(revision 29769)
@@ -27,4 +27,5 @@
     }
 
+    @Override
     public void actionPerformed(ActionEvent e) {
         Collection<OsmPrimitive> selection = getCurrentDataSet().getSelected();
Index: applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/selection/IntersectedWaysAction.java
===================================================================
--- applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/selection/IntersectedWaysAction.java	(revision 29753)
+++ applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/selection/IntersectedWaysAction.java	(revision 29769)
@@ -29,4 +29,5 @@
     }
 
+    @Override
     public void actionPerformed(ActionEvent e) {
         Set<Way> selectedWays = OsmPrimitive.getFilteredSet(getCurrentDataSet().getSelected(), Way.class);
Index: applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/selection/IntersectedWaysRecursiveAction.java
===================================================================
--- applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/selection/IntersectedWaysRecursiveAction.java	(revision 29753)
+++ applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/selection/IntersectedWaysRecursiveAction.java	(revision 29769)
@@ -30,6 +30,6 @@
     }
 
+    @Override
     public void actionPerformed(ActionEvent e) {
-        Collection<OsmPrimitive> selection = getCurrentDataSet().getSelected();
         
         Set<Way> selectedWays = OsmPrimitive.getFilteredSet(getCurrentDataSet().getSelected(), Way.class);
@@ -41,5 +41,4 @@
                     selectedWays, newWays);
             getCurrentDataSet().addSelected(newWays);
-            return;
         } else {
              JOptionPane.showMessageDialog(Main.parent,
Index: applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/selection/MiddleNodesAction.java
===================================================================
--- applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/selection/MiddleNodesAction.java	(revision 29753)
+++ applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/selection/MiddleNodesAction.java	(revision 29769)
@@ -33,10 +33,9 @@
     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) {
Index: applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/selection/NodeWayUtils.java
===================================================================
--- applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/selection/NodeWayUtils.java	(revision 29753)
+++ applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/selection/NodeWayUtils.java	(revision 29769)
@@ -181,10 +181,9 @@
 
     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,5 +206,4 @@
                  }
             } while ( c >0 && level < maxLevel );
-            return;
     }
 
@@ -234,5 +232,4 @@
             } while ( c >0 && level < maxLevel );
            // System.out.println("time = "+(System.currentTimeMillis()-t)+" ways = "+newWays.size());
-            return;
     }
 
@@ -269,5 +266,5 @@
             }
         }
-        if (newNodes.size()==0) {
+        if (newNodes.isEmpty()) {
                 JOptionPane.showMessageDialog(Main.parent,
                     tr("Please select two nodes connected by way!"),
Index: applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/selection/SelectAllInsideAction.java
===================================================================
--- applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/selection/SelectAllInsideAction.java	(revision 29753)
+++ applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/selection/SelectAllInsideAction.java	(revision 29769)
@@ -8,6 +8,4 @@
 import java.awt.event.KeyEvent;
 import java.util.Collection;
-import java.util.HashSet;
-import java.util.Set;
 
 import javax.swing.JOptionPane;
Index: applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/selection/SelectBoundaryAction.java
===================================================================
--- applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/selection/SelectBoundaryAction.java	(revision 29753)
+++ applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/selection/SelectBoundaryAction.java	(revision 29769)
@@ -19,5 +19,4 @@
 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,6 +39,7 @@
     }
 
+    @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);
Index: applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/selection/SelectModNodesAction.java
===================================================================
--- applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/selection/SelectModNodesAction.java	(revision 29753)
+++ applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/selection/SelectModNodesAction.java	(revision 29769)
@@ -32,4 +32,5 @@
     }
 
+    @Override
      public void actionPerformed(ActionEvent e) {
         Collection<OsmPrimitive> selection = getCurrentDataSet().getSelected();
Index: applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/selection/SelectModWaysAction.java
===================================================================
--- applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/selection/SelectModWaysAction.java	(revision 29753)
+++ applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/selection/SelectModWaysAction.java	(revision 29769)
@@ -32,4 +32,5 @@
     }
 
+    @Override
     public void actionPerformed(ActionEvent e) {
         Collection<OsmPrimitive> selection = getCurrentDataSet().getSelected();
Index: applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/selection/SelectWayNodesAction.java
===================================================================
--- applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/selection/SelectWayNodesAction.java	(revision 29753)
+++ applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/selection/SelectWayNodesAction.java	(revision 29769)
@@ -40,4 +40,5 @@
      * 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();
Index: applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/selection/UndoSelectionAction.java
===================================================================
--- applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/selection/UndoSelectionAction.java	(revision 29753)
+++ applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/selection/UndoSelectionAction.java	(revision 29769)
@@ -10,7 +10,5 @@
 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,9 +32,10 @@
     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();
Index: applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/selection/UnselectNodesAction.java
===================================================================
--- applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/selection/UnselectNodesAction.java	(revision 29753)
+++ applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/selection/UnselectNodesAction.java	(revision 29769)
@@ -28,4 +28,5 @@
     }
 
+    @Override
     public void actionPerformed(ActionEvent e) {
         Collection<OsmPrimitive> selection = getCurrentDataSet().getSelected();