Changeset 11452 in josm for trunk/src/org/openstreetmap/josm/data/osm/AbstractPrimitive.java

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

File:

• trunk/src/org/openstreetmap/josm/data/osm/AbstractPrimitive.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/data/osm/AbstractPrimitive.java

@@ -296 +296 @@
         if (changesetId < 0)
             throw new IllegalArgumentException(MessageFormat.format("Parameter ''{0}'' >= 0 expected, got {1}", "changesetId", changesetId));
-        if (isNew() && changesetId > 0)
+        if (changesetId > 0 && isNew())
             throw new IllegalStateException(tr("Cannot assign a changesetId > 0 to a new primitive. Value of changesetId is {0}", changesetId));
 
@@ -380 +380 @@
     @Override
     public void setVisible(boolean visible) {
-        if (isNew() && !visible)
+        if (!visible && isNew())
             throw new IllegalStateException(tr("A primitive with ID = 0 cannot be invisible."));
         updateFlags(FLAG_VISIBLE, visible);