Index: /applications/editors/josm/plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/DataImportPlugin.java
===================================================================
--- /applications/editors/josm/plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/DataImportPlugin.java	(revision 18070)
+++ /applications/editors/josm/plugins/dataimport/src/org/openstreetmap/josm/plugins/dataimport/DataImportPlugin.java	(revision 18071)
@@ -7,6 +7,6 @@
 
 import org.openstreetmap.josm.actions.ExtensionFileFilter;
-import org.openstreetmap.josm.io.TangoGPS;
-import org.openstreetmap.josm.io.Tcx;
+import org.openstreetmap.josm.plugins.dataimport.io.TangoGPS;
+import org.openstreetmap.josm.plugins.dataimport.io.Tcx;
 import org.openstreetmap.josm.plugins.Plugin;
 
Index: /applications/editors/josm/plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java
===================================================================
--- /applications/editors/josm/plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java	(revision 18070)
+++ /applications/editors/josm/plugins/michigan_left/src/MichiganLeft/MichiganLeftAction.java	(revision 18071)
@@ -28,5 +28,5 @@
 public class MichiganLeftAction extends JosmAction {
     private LinkedList<Command> cmds = new LinkedList<Command>();
-    
+
     public MichiganLeftAction() {
     super(tr("Michigan Left"), "michigan_left", tr("Adds no left turn for sets of 4 or 5 ways."), Shortcut.registerShortcut("tools:michigan_left", tr("Tool: {0}", tr("Michigan Left")),
@@ -50,5 +50,5 @@
     {
       // Find extremities of ways
-      Hashtable ExtremNodes=new Hashtable();
+      Hashtable<Node, Integer> ExtremNodes=new Hashtable<Node, Integer>();
       for (OsmPrimitive prim : selection) {
         if (prim instanceof Way)
@@ -59,6 +59,6 @@
         }
       }
-      System.out.println(tr("{0} extrem nodes.", ExtremNodes.size()));     
-      
+      System.out.println(tr("{0} extrem nodes.", ExtremNodes.size()));
+
       ArrayList<Node> viaNodes=new ArrayList<Node>();
       // find via nodes (they have 3 occurences in the list)
@@ -72,12 +72,12 @@
           viaNodes.add(extrem);
         }
-      } 
-      System.out.println(tr("{0} via nodes.", viaNodes.size()));     
-  
+      }
+      System.out.println(tr("{0} via nodes.", viaNodes.size()));
+
       if (viaNodes.size() != 2) {
         JOptionPane.showMessageDialog(Main.parent, tr("Unable to find via nodes. Please check your selection"));
         return;
       }
-      
+
       Node viaFirst = viaNodes.get(0);
       Node viaLast = viaNodes.get(1);      // Find middle segment
@@ -96,6 +96,6 @@
         }
       }
-      System.out.println(tr("MIddle way: {0}", middle.getId()));       
-         
+      System.out.println(tr("MIddle way: {0}", middle.getId()));
+
       // Build relations
       for (OsmPrimitive prim : selection) {
@@ -121,9 +121,9 @@
       Command c = new SequenceCommand(tr("Create Michigan left turn restriction"), cmds);
       Main.main.undoRedo.add(c);
-      cmds.clear();     
+      cmds.clear();
     }
   }
 
-  public void incrementHashtable(Hashtable hash, Node node)
+  public void incrementHashtable(Hashtable<Node, Integer> hash, Node node)
   {
     System.out.println(tr("Processing {0}", node.getId()));
@@ -137,25 +137,25 @@
       hash.put(node, new Integer (1));
   }
-  
+
   public void buildRelation(Way fromWay, Way toWay, Node viaNode)
   {
-    System.out.println(tr("Relation: from {0} to {1} via {2}", fromWay.getId(), toWay.getId(), viaNode.getId()));       
-    
+    System.out.println(tr("Relation: from {0} to {1} via {2}", fromWay.getId(), toWay.getId(), viaNode.getId()));
+
     Relation relation = new Relation();
-    
+
     RelationMember from = new RelationMember("from", fromWay);
     relation.addMember(from);
-    
+
     RelationMember to = new RelationMember("to", toWay);
     relation.addMember(to);
-    
+
     RelationMember via = new RelationMember("via", viaNode);
     relation.addMember(via);
-    
+
     relation.put("type", "restriction");
     relation.put("restriction", "no_left_turn");
 
     cmds.add(new AddCommand(relation));
-  }  
+  }
 
 }
Index: /applications/editors/josm/plugins/openstreetbugs/build.xml
===================================================================
--- /applications/editors/josm/plugins/openstreetbugs/build.xml	(revision 18070)
+++ /applications/editors/josm/plugins/openstreetbugs/build.xml	(revision 18071)
@@ -26,5 +26,5 @@
                 <attribute name="Plugin-Description" value="Imports issues from OpenStreetBugs"/>
                 <attribute name="Plugin-Link" value="http://wiki.openstreetmap.org/index.php/JOSM/Plugins/OpenStreetBugs"/>
-                <attribute name="Plugin-Mainversion" value="2219"/>
+                <attribute name="Plugin-Mainversion" value="2264"/>
                 <attribute name="Plugin-Version" value="${version.entry.commit.revision}"/>
             </manifest>
Index: /applications/editors/josm/plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbLayer.java
===================================================================
--- /applications/editors/josm/plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbLayer.java	(revision 18070)
+++ /applications/editors/josm/plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbLayer.java	(revision 18071)
@@ -220,5 +220,5 @@
             }
             // prefer already selected node when multiple nodes on one point
-            else if(minDistanceSq == dist && n.isSelected() && !minPrimitive.isSelected())
+            else if(minDistanceSq == dist && data.isSelected(n) && !data.isSelected(minPrimitive))
             {
                 minPrimitive = n;