Changeset 7801 in josm for trunk/src/org/openstreetmap/josm/gui/conflict

Timestamp:

2014-12-13T01:07:04+01:00 (9 years ago)

Author:

Don-vip

Message:

fix some Sonar issues

File:

• trunk/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java

@@ -35 +35 @@
 
     /**
-     * constuctor
+     * constructor
      */
     public MultiValueResolutionDecision() {
@@ -148 +148 @@
         case KEEP_ONE: return value;
         case SUM_ALL_NUMERIC: return tags.getSummedValues(getKey());
-        case KEEP_NONE: return null;
         case KEEP_ALL: return tags.getJoinedValues(getKey());
+        case KEEP_NONE:
         default: return null;
         }
@@ -308 +308 @@
         case KEEP_ONE: return new Tag(getKey(),value);
         case KEEP_NONE: return new Tag(getKey(), "");
-        case UNDECIDED: return null;
+        case UNDECIDED:
         default: return null;
         }