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

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/data/osm

Files:

• AbstractPrimitive.java (modified) (2 diffs)
• BBox.java (modified) (1 diff)
• OsmPrimitive.java (modified) (1 diff)
• QuadBuckets.java (modified) (1 diff)
• RelationMemberData.java (modified) (1 diff)
• visitor/paint/StyledMapRenderer.java (modified) (1 diff)
• visitor/paint/WireframeMapRenderer.java (modified) (1 diff)

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);

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

@@ -313 +313 @@
      */
     public boolean isInWorld() {
-        return isValid() && xmin >= -180.0 && xmax <= 180.0 && ymin >= -90.0 && ymax <= 90.0;
+        return xmin >= -180.0 && xmax <= 180.0 && ymin >= -90.0 && ymax <= 90.0 && isValid();
     }
 

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

@@ -1170 +1170 @@
      */
     public boolean hasEqualTechnicalAttributes(OsmPrimitive other) {
-        if (other == null) return false;
-
-        return isDeleted() == other.isDeleted()
-                && isModified() == other.isModified()
-                && timestamp == other.timestamp
-                && version == other.version
-                && isVisible() == other.isVisible()
-                && Objects.equals(user, other.user)
-                && changesetId == other.changesetId;
+        return other != null
+            && timestamp == other.timestamp
+            && version == other.version
+            && changesetId == other.changesetId
+            && isDeleted() == other.isDeleted()
+            && isModified() == other.isModified()
+            && isVisible() == other.isVisible()
+            && Objects.equals(user, other.user);
     }
 

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

@@ -274 +274 @@
             }
             doAddContent(o);
-            if (isLeaf() && content.size() > MAX_OBJECTS_PER_NODE && level < QuadTiling.NR_LEVELS) {
+            if (level < QuadTiling.NR_LEVELS && isLeaf() && content.size() > MAX_OBJECTS_PER_NODE) {
                 doSplit();
             }

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

@@ -107 +107 @@
         RelationMemberData that = (RelationMemberData) obj;
         return memberId == that.memberId &&
-                Objects.equals(role, that.role) &&
-                memberType == that.memberType;
+               memberType == that.memberType &&
+               Objects.equals(role, that.role);
     }
 }

trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/StyledMapRenderer.java

@@ -1089 +1089 @@
                 } else if (m.isNode()) {
                     Node n = m.getNode();
-                    if ("via".equals(m.getRole()) && via == null) {
+                    if (via == null && "via".equals(m.getRole())) {
                         via = n;
                     }

trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/WireframeMapRenderer.java

@@ -297 +297 @@
         /* head only takes over control if the option is true,
            the direction should be shown at all and not only because it's selected */
-        boolean showOnlyHeadArrowOnly = showThisDirectionArrow && !ds.isSelected(w) && showHeadArrowOnly;
+        boolean showOnlyHeadArrowOnly = showThisDirectionArrow && showHeadArrowOnly && !ds.isSelected(w);
         Color wayColor;