Index: applications/editors/josm/plugins/utilsplugin2/.classpath
===================================================================
--- applications/editors/josm/plugins/utilsplugin2/.classpath	(revision 30000)
+++ applications/editors/josm/plugins/utilsplugin2/.classpath	(revision 30002)
@@ -2,5 +2,5 @@
 <classpath>
 	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/JOSM"/>
 	<classpathentry kind="output" path="build"/>
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 30000)
+++ applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/UtilsPlugin2.java	(revision 30002)
@@ -2,11 +2,12 @@
 package org.openstreetmap.josm.plugins.utilsplugin2;
 
-import java.awt.event.KeyEvent;
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.HashSet;
 import java.util.Set;
+
 import javax.swing.JMenu;
 import javax.swing.JMenuItem;
+
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.actions.search.PushbackTokenizer;
@@ -25,5 +26,14 @@
 import org.openstreetmap.josm.plugins.Plugin;
 import org.openstreetmap.josm.plugins.PluginInformation;
-import org.openstreetmap.josm.plugins.utilsplugin2.actions.*;
+import org.openstreetmap.josm.plugins.utilsplugin2.actions.AddIntersectionsAction;
+import org.openstreetmap.josm.plugins.utilsplugin2.actions.AlignWayNodesAction;
+import org.openstreetmap.josm.plugins.utilsplugin2.actions.ExtractPointAction;
+import org.openstreetmap.josm.plugins.utilsplugin2.actions.PasteRelationsAction;
+import org.openstreetmap.josm.plugins.utilsplugin2.actions.SplitObjectAction;
+import org.openstreetmap.josm.plugins.utilsplugin2.actions.SplitOnIntersectionsAction;
+import org.openstreetmap.josm.plugins.utilsplugin2.actions.SymmetryAction;
+import org.openstreetmap.josm.plugins.utilsplugin2.actions.TagBufferAction;
+import org.openstreetmap.josm.plugins.utilsplugin2.actions.TagSourceAction;
+import org.openstreetmap.josm.plugins.utilsplugin2.actions.UnGlueRelationAction;
 import org.openstreetmap.josm.plugins.utilsplugin2.curves.CurveAction;
 import org.openstreetmap.josm.plugins.utilsplugin2.customurl.ChooseURLAction;
@@ -32,6 +42,19 @@
 import org.openstreetmap.josm.plugins.utilsplugin2.latlon.LatLonAction;
 import org.openstreetmap.josm.plugins.utilsplugin2.replacegeometry.ReplaceGeometryAction;
-import org.openstreetmap.josm.plugins.utilsplugin2.selection.*;
-import static org.openstreetmap.josm.tools.I18n.marktr;
+import org.openstreetmap.josm.plugins.utilsplugin2.selection.AdjacentNodesAction;
+import org.openstreetmap.josm.plugins.utilsplugin2.selection.AdjacentWaysAction;
+import org.openstreetmap.josm.plugins.utilsplugin2.selection.ConnectedWaysAction;
+import org.openstreetmap.josm.plugins.utilsplugin2.selection.IntersectedWaysAction;
+import org.openstreetmap.josm.plugins.utilsplugin2.selection.IntersectedWaysRecursiveAction;
+import org.openstreetmap.josm.plugins.utilsplugin2.selection.MiddleNodesAction;
+import org.openstreetmap.josm.plugins.utilsplugin2.selection.NodeWayUtils;
+import org.openstreetmap.josm.plugins.utilsplugin2.selection.SelectAllInsideAction;
+import org.openstreetmap.josm.plugins.utilsplugin2.selection.SelectBoundaryAction;
+import org.openstreetmap.josm.plugins.utilsplugin2.selection.SelectHighwayAction;
+import org.openstreetmap.josm.plugins.utilsplugin2.selection.SelectModNodesAction;
+import org.openstreetmap.josm.plugins.utilsplugin2.selection.SelectModWaysAction;
+import org.openstreetmap.josm.plugins.utilsplugin2.selection.SelectWayNodesAction;
+import org.openstreetmap.josm.plugins.utilsplugin2.selection.UndoSelectionAction;
+import org.openstreetmap.josm.plugins.utilsplugin2.selection.UnselectNodesAction;
 
 public class UtilsPlugin2 extends Plugin {
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 30000)
+++ applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/actions/ExtractPointAction.java	(revision 30002)
@@ -33,5 +33,5 @@
                 tr("Extracts node from a way"),
                 Shortcut.registerShortcut("tools:extnode", tr("Tool: {0}","Extract node"),
-                KeyEvent.VK_J, Shortcut.ALT), true);
+                KeyEvent.VK_J, Shortcut.ALT_SHIFT), true);
         putValue("help", ht("/Action/ExtractNode"));
     }
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 30000)
+++ applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/actions/SplitOnIntersectionsAction.java	(revision 30002)
@@ -90,13 +90,4 @@
         }
     }
-    
-    private void filterInnerNodes( Node n, List<Way> ways ) {
-        Iterator<Way> it = ways.iterator();
-        while (it.hasNext()) {
-            Way w = it.next();
-            if(!w.isInnerNode(n))
-                it.remove();
-        }
-    }
 
     @Override
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 30000)
+++ applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/customurl/UtilsPluginPreferences.java	(revision 30002)
@@ -41,5 +41,5 @@
         // FIXME: get rid of hardcoded URLS
 
-        String addr =  URLList.getSelectedURL();
+        URLList.getSelectedURL();
         table=new JTable(new DefaultTableModel(null,new String[]{"Title","URL"}));
 
@@ -107,5 +107,5 @@
     private void fillRows(List<String> items) {
         if (items==null) return;
-        int p=0,row=0;
+        int p=0;
         String name, url;
         DefaultTableModel model = (DefaultTableModel) table.getModel();
@@ -115,12 +115,9 @@
             if (p>=n) break;
             name = items.get(p);
-            //System.out.println("name="+name);
             p++;
             if (p>=n) break;
             url = items.get(p);
-            //System.out.println("url="+url);
             p++;
             model.addRow(new String[]{name,url});
-            row++;
         }
         model.addRow(new String[]{"",""});
@@ -129,5 +126,5 @@
     @Override
     public boolean ok() {
-        String addr=combo1.getText();
+        combo1.getText();
         List<String> lst = readItemsFromTable();
         URLList.updateURLList(lst);
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 30000)
+++ applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/latlon/LatLonDialog.java	(revision 30002)
@@ -52,5 +52,4 @@
     private JRadioButton rbClosedWay;
     private ButtonGroup bgType;
-    private String geomType;
 
     private LatLon[] latLonCoordinates;
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 30000)
+++ applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/selection/MiddleNodesAction.java	(revision 30002)
@@ -30,6 +30,4 @@
         putValue("help", ht("/Action/MiddleNodes"));
     }
-
-    private  Set<Way> activeWays = new HashSet<Way>();
 
     @Override
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 30000)
+++ applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/selection/NodeWayUtils.java	(revision 30002)
@@ -430,8 +430,6 @@
      */
     public static int getRayIntersectionsCount(EastNorth point, List<EastNorth> polygonPoints) {
-        int n=polygonPoints.size();
         if (point==null) return 0;
         EastNorth oldPoint = null;
-                //polygonPoints.get(n-1);
         double n1,n2,n3,e1,e2,e3,d;
         int interCount=0;
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 30000)
+++ applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/selection/SelectAllInsideAction.java	(revision 30002)
@@ -30,5 +30,4 @@
     @Override
     public void actionPerformed(ActionEvent e) {
-        long t=System.currentTimeMillis();
         Collection<OsmPrimitive> insideSelected = NodeWayUtils.selectAllInside(getCurrentDataSet().getSelected(), getCurrentDataSet());
         
@@ -40,5 +39,4 @@
                tr("Warning"), JOptionPane.WARNING_MESSAGE);
         }
-
     }
 
Index: applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/selection/SelectHighwayAction.java
===================================================================
--- applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/selection/SelectHighwayAction.java	(revision 30000)
+++ applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/selection/SelectHighwayAction.java	(revision 30002)
@@ -29,5 +29,4 @@
     @Override
     public void actionPerformed(ActionEvent e) {
-        Collection<OsmPrimitive> selection = getCurrentDataSet().getSelected();
         List<Way> selectedWays = OsmPrimitive.getFilteredList(getCurrentDataSet().getSelected(), Way.class);
 
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 30000)
+++ applications/editors/josm/plugins/utilsplugin2/src/org/openstreetmap/josm/plugins/utilsplugin2/selection/SelectWayNodesAction.java	(revision 30002)
@@ -23,5 +23,4 @@
 public class SelectWayNodesAction extends JosmAction {
 
-    private Node selectedNode;
     private ArrayList<Node> selectedNodes;
 
@@ -44,5 +43,4 @@
         Collection<OsmPrimitive> selection = getCurrentDataSet().getSelected();
 
-        String errMsg = null;
         for (OsmPrimitive p : selection) {
             if (p instanceof Way) {