Changeset 10216 in josm for trunk/src/org/openstreetmap/josm/command/DeleteCommand.java

Timestamp:

2016-05-15T14:48:06+02:00 (10 years ago)

Author:

Don-vip

Message:

findbugs - SF_SWITCH_NO_DEFAULT + various sonar fixes

File:

• trunk/src/org/openstreetmap/josm/command/DeleteCommand.java (modified) (4 diffs)

trunk/src/org/openstreetmap/josm/command/DeleteCommand.java

@@ -160 +160 @@
     }
 
-    private Set<OsmPrimitiveType> getTypesToDelete() {
-        Set<OsmPrimitiveType> typesToDelete = EnumSet.noneOf(OsmPrimitiveType.class);
+    private EnumSet<OsmPrimitiveType> getTypesToDelete() {
+        EnumSet<OsmPrimitiveType> typesToDelete = EnumSet.noneOf(OsmPrimitiveType.class);
         for (OsmPrimitive osm : toDelete) {
             typesToDelete.add(OsmPrimitiveType.from(osm));
@@ -172 +172 @@
         if (toDelete.size() == 1) {
             OsmPrimitive primitive = toDelete.iterator().next();
-            String msg = "";
+            String msg;
             switch(OsmPrimitiveType.from(primitive)) {
             case NODE: msg = marktr("Delete node {0}"); break;
             case WAY: msg = marktr("Delete way {0}"); break;
             case RELATION:msg = marktr("Delete relation {0}"); break;
+            default: throw new AssertionError();
             }
 
@@ -182 +183 @@
         } else {
             Set<OsmPrimitiveType> typesToDelete = getTypesToDelete();
-            String msg = "";
+            String msg;
             if (typesToDelete.size() > 1) {
                 msg = trn("Delete {0} object", "Delete {0} objects", toDelete.size(), toDelete.size());
@@ -191 +192 @@
                 case WAY: msg = trn("Delete {0} way", "Delete {0} ways", toDelete.size(), toDelete.size()); break;
                 case RELATION: msg = trn("Delete {0} relation", "Delete {0} relations", toDelete.size(), toDelete.size()); break;
+                default: throw new AssertionError();
                 }
             }