Changeset 11452 in josm for trunk/src/org/openstreetmap/josm/command/conflict

Timestamp:

2017-01-12T01:24:40+01:00 (7 years ago)

Author:

Don-vip

Message:

sonar - fb-contrib:SEO_SUBOPTIMAL_EXPRESSION_ORDER - Performance - Method orders expressions in a conditional in a sub optimal way

Location:

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

Files:

• CoordinateConflictResolveCommand.java (modified) (1 diff)
• DeletedStateConflictResolveCommand.java (modified) (1 diff)

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

@@ -86 +86 @@
         if (!super.equals(obj)) return false;
         CoordinateConflictResolveCommand that = (CoordinateConflictResolveCommand) obj;
-        return Objects.equals(conflict, that.conflict) &&
-                decision == that.decision;
+        return decision == that.decision && Objects.equals(conflict, that.conflict);
     }
 }

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

@@ -101 +101 @@
         if (!super.equals(obj)) return false;
         DeletedStateConflictResolveCommand that = (DeletedStateConflictResolveCommand) obj;
-        return Objects.equals(conflict, that.conflict) &&
-                decision == that.decision;
+        return decision == that.decision && Objects.equals(conflict, that.conflict);
     }
 }