Changeset 383 in josm for trunk/src/org

Timestamp:

2007-10-14T00:11:21+02:00 (17 years ago)

Author:

gebner

Message:

Fix warnings reported by -Xlint.

Location:

trunk/src/org/openstreetmap/josm

Files:

• actions/mapmode/SelectAction.java (modified) (1 diff)
• data/osm/visitor/NameVisitor.java (modified) (1 diff)
• gui/dialogs/RelationListDialog.java (modified) (1 diff)
• gui/preferences/PluginPreference.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java

@@ -183 +183 @@
                 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);

trunk/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java

@@ -62 +62 @@
                 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);
                 }

trunk/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java

@@ -95 +95 @@
                                 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)));
                                 }
                         }

trunk/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java

@@ -200 +200 @@
                 String enabledProp = Main.pref.get("plugins");
                 if ((enabledProp == null) || ("".equals(enabledProp))) {
-                        enabledPlugins = Collections.EMPTY_SET;
+                        enabledPlugins = Collections.emptySet();
                 }
                 else