Changeset 6246 in josm for trunk/src/org/openstreetmap/josm/gui/dialogs/properties/TagEditHelper.java

Timestamp:

2013-09-22T18:36:07+02:00 (11 years ago)

Author:

Don-vip

Message:

Sonar/FindBugs - various bugfixes / violation fixes

File:

• trunk/src/org/openstreetmap/josm/gui/dialogs/properties/TagEditHelper.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/gui/dialogs/properties/TagEditHelper.java

@@ -38 +38 @@
 import java.util.List;
 import java.util.Map;
-import java.util.Vector;
 
 import javax.swing.AbstractAction;
@@ -374 +373 @@
                     }
                 }
-                Collection<Command> commands=new Vector<Command>();
+                Collection<Command> commands = new ArrayList<Command>();
                 commands.add(new ChangePropertyCommand(sel, key, null));
                 if (value.equals(tr("<different>"))) {
-                    HashMap<String, Vector<OsmPrimitive>> map=new HashMap<String, Vector<OsmPrimitive>>();
+                    Map<String, ArrayList<OsmPrimitive>> map = new HashMap<String, ArrayList<OsmPrimitive>>();
                     for (OsmPrimitive osm: sel) {
-                        String val=osm.get(key);
-                        if(val != null)
-                        {
+                        String val = osm.get(key);
+                        if (val != null) {
                             if (map.containsKey(val)) {
                                 map.get(val).add(osm);
                             } else {
-                                Vector<OsmPrimitive> v = new Vector<OsmPrimitive>();
+                                ArrayList<OsmPrimitive> v = new ArrayList<OsmPrimitive>();
                                 v.add(osm);
                                 map.put(val, v);
@@ -391 +389 @@
                         }
                     }
-                    for (Map.Entry<String, Vector<OsmPrimitive>> e: map.entrySet()) {
+                    for (Map.Entry<String, ArrayList<OsmPrimitive>> e: map.entrySet()) {
                         commands.add(new ChangePropertyCommand(e.getValue(), newkey, e.getKey()));
                     }