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

Timestamp:

2017-06-01T01:20:37+02:00 (5 years ago)

Author:

Don-vip

Message:

sonar - squid:S3516 - Methods returns should not be invariant

File:

• trunk/src/org/openstreetmap/josm/command/ChangeRelationMemberRoleCommand.java (modified) (1 diff)

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

@@ -48 +48 @@
     @Override
     public boolean executeCommand() {
-        if (position < 0 || position >= relation.getMembersCount())
-            return true;
-
-        oldRole = relation.getMember(position).getRole();
-        if (newRole.equals(oldRole)) return true;
-        relation.setMember(position, new RelationMember(newRole, relation.getMember(position).getMember()));
-
-        oldModified = relation.isModified();
-        relation.setModified(true);
+        if (position >= 0 && position < relation.getMembersCount()) {
+            oldRole = relation.getMember(position).getRole();
+            if (!newRole.equals(oldRole)) {
+                relation.setMember(position, new RelationMember(newRole, relation.getMember(position).getMember()));
+                oldModified = relation.isModified();
+                relation.setModified(true);
+            }
+        }
         return true;
     }