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

Timestamp:

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

Author:

Don-vip

Message:

findbugs - SF_SWITCH_NO_DEFAULT + various sonar fixes

File:

• trunk/src/org/openstreetmap/josm/command/conflict/VersionConflictResolveCommand.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/command/conflict/VersionConflictResolveCommand.java

@@ -17 +17 @@
 /**
  * Represents the resolution of a version conflict between two {@link OsmPrimitive}s.
- *
- *
+ * @since 1622
  */
 public class VersionConflictResolveCommand extends ConflictResolveCommand {
@@ -35 +34 @@
     @Override
     public String getDescriptionText() {
-        String msg = "";
+        String msg;
         switch(OsmPrimitiveType.from(conflict.getMy())) {
         case NODE: msg = marktr("Resolve version conflict for node {0}"); break;
         case WAY: msg = marktr("Resolve version conflict for way {0}"); break;
         case RELATION: msg = marktr("Resolve version conflict for relation {0}"); break;
+        default: throw new AssertionError();
         }
         return tr(msg, conflict.getMy().getId());