Changeset 14214 in josm for trunk/src/org/openstreetmap/josm/command

Timestamp:

2018-09-01T15:29:15+02:00 (6 years ago)

Author:

Don-vip

Message:

sonarqube - squid:S4551 - Enum values should be compared with "=="

Location:

trunk/src/org/openstreetmap/josm/command/conflict

Files:

• CoordinateConflictResolveCommand.java (modified) (1 diff)
• DeletedStateConflictResolveCommand.java (modified) (2 diffs)
• TagConflictResolveCommand.java (modified) (2 diffs)

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

@@ -54 +54 @@
         super.executeCommand();
 
-        if (decision.equals(MergeDecisionType.KEEP_MINE)) {
+        if (decision == MergeDecisionType.KEEP_MINE) {
             // do nothing
-        } else if (decision.equals(MergeDecisionType.KEEP_THEIR)) {
+        } else if (decision == MergeDecisionType.KEEP_THEIR) {
             Node my = (Node) conflict.getMy();
             Node their = (Node) conflict.getTheir();

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

@@ -54 +54 @@
         super.executeCommand();
 
-        if (decision.equals(MergeDecisionType.KEEP_MINE)) {
+        if (decision == MergeDecisionType.KEEP_MINE) {
             if (conflict.getMy().isDeleted() || conflict.isMyDeleted()) {
                 // because my was involved in a conflict it my still be referred
@@ -60 +60 @@
                 deleteMy();
             }
-        } else if (decision.equals(MergeDecisionType.KEEP_THEIR)) {
+        } else if (decision == MergeDecisionType.KEEP_THEIR) {
             if (conflict.getTheir().isDeleted()) {
                 deleteMy();

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

@@ -36 +36 @@
         int n = 0;
         for (TagMergeItem item: mergeItems) {
-            if (!item.getMergeDecision().equals(MergeDecisionType.UNDECIDED)) {
+            if (item.getMergeDecision() != MergeDecisionType.UNDECIDED) {
                 n++;
             }
@@ -90 +90 @@
         //
         for (TagMergeItem item: mergeItems) {
-            if (!item.getMergeDecision().equals(MergeDecisionType.UNDECIDED)) {
+            if (item.getMergeDecision() != MergeDecisionType.UNDECIDED) {
                 item.applyToMyPrimitive(conflict.getMy());
             }