Index: /trunk/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java	(revision 382)
+++ /trunk/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java	(revision 383)
@@ -183,6 +183,11 @@
 		Collection<OsmPrimitive> sel = Main.ds.getSelected();
 		OsmPrimitive osm = Main.map.mapView.getNearest(e.getPoint());
-		Collection osmColl = osm == null
-			? Collections.emptyList() : Collections.singleton(osm);
+		Collection<OsmPrimitive> osmColl;
+		if (osm == null) {
+			osmColl = Collections.emptySet();
+		} else {
+			osmColl = Collections.singleton(osm);
+		}
+
 		if (ctrl && shift) {
 			selectPrims(osmColl, true, false);
Index: /trunk/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java	(revision 382)
+++ /trunk/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java	(revision 383)
@@ -62,5 +62,5 @@
 		if (name == null) {
 			String what = (w.get("highway") != null) ? "highway " : (w.get("railway") != null) ? "railway " : (w.get("waterway") != null) ? "waterway " : "";
-			int nodesNo = new HashSet(w.nodes).size();
+			int nodesNo = new HashSet<Node>(w.nodes).size();
 			name = what + trn("{0} node", "{0} nodes", nodesNo, nodesNo);
 		}
Index: /trunk/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java	(revision 382)
+++ /trunk/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java	(revision 383)
@@ -95,5 +95,6 @@
 				Relation toDelete = (Relation) displaylist.getSelectedValue();
 				if (toDelete != null) {
-					Main.main.editLayer().add(new DeleteCommand(Collections.singleton(toDelete)));
+					Main.main.undoRedo.add(
+						new DeleteCommand(Collections.singleton(toDelete)));
 				}
 			}
Index: /trunk/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java	(revision 382)
+++ /trunk/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java	(revision 383)
@@ -200,5 +200,5 @@
 		String enabledProp = Main.pref.get("plugins");
 		if ((enabledProp == null) || ("".equals(enabledProp))) {
-			enabledPlugins = Collections.EMPTY_SET;
+			enabledPlugins = Collections.emptySet();
 		}
 		else