Changeset 8365 in josm for trunk/src/org/openstreetmap/josm/data

Timestamp:

2015-05-16T15:13:38+02:00 (9 years ago)

Author:

Don-vip

Message:

fix Findbugs performance issues

Location:

trunk/src/org/openstreetmap/josm/data

Files:

• APIDataSet.java (modified) (1 diff)
• imagery/ImageryInfo.java (modified) (1 diff)
• osm/Changeset.java (modified) (1 diff)
• osm/Node.java (modified) (1 diff)
• osm/NodeData.java (modified) (4 diffs)
• osm/NoteData.java (modified) (1 diff)
• osm/Relation.java (modified) (1 diff)
• osm/Way.java (modified) (1 diff)
• osm/history/HistoryOsmPrimitive.java (modified) (1 diff)
• validation/tests/DuplicateRelation.java (modified) (1 diff)
• validation/tests/SimilarNamedWays.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/data/APIDataSet.java

@@ -338 +338 @@
                         @Override
                         public int compare(Relation o1, Relation o2) {
-                            return Integer.valueOf(uploadOrder.indexOf(o1)).compareTo(uploadOrder.indexOf(o2));
+                            return Integer.compare(uploadOrder.indexOf(o1), uploadOrder.indexOf(o2));
                         }
                     }

trunk/src/org/openstreetmap/josm/data/imagery/ImageryInfo.java

@@ -678 +678 @@
                 this.imageryType = type;
                 if (m.group(2) != null) {
-                    defaultMaxZoom = Integer.valueOf(m.group(2));
+                    defaultMaxZoom = Integer.parseInt(m.group(2));
                 }
                 if (m.group(1) != null) {
-                    defaultMinZoom = Integer.valueOf(m.group(1));
+                    defaultMinZoom = Integer.parseInt(m.group(1));
                 }
                 break;

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

@@ -93 +93 @@
 
     public int compareTo(Changeset other) {
-        return Integer.valueOf(getId()).compareTo(other.getId());
+        return Integer.compare(getId(), other.getId());
     }
 

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

@@ -296 +296 @@
     @Override
     public int compareTo(OsmPrimitive o) {
-        return o instanceof Node ? Long.valueOf(getUniqueId()).compareTo(o.getUniqueId()) : 1;
+        return o instanceof Node ? Long.compare(getUniqueId(), o.getUniqueId()) : 1;
     }
 

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

@@ -15 +15 @@
     private double lon = Double.NaN;
 
-    public NodeData() {}
+    /**
+     * Constructs a new {@code NodeData}.
+     */
+    public NodeData() {
 
+    }
+
+    /**
+     * Constructs a new {@code NodeData}.
+     * @param data node data to copy
+     */
     public NodeData(NodeData data) {
         super(data);
@@ -44 +53 @@
     @Override
     public EastNorth getEastNorth() {
-        /*
-         * No internal caching of projected coordinates needed. In contrast to getEastNorth()
-         * on Node, this method is rarely used. Caching would be overkill.
-         */
+        // No internal caching of projected coordinates needed. In contrast to getEastNorth()
+        // on Node, this method is rarely used. Caching would be overkill.
         return Projections.project(getCoor());
     }
@@ -53 +60 @@
     @Override
     public void setEastNorth(EastNorth eastNorth) {
-        LatLon ll = Projections.inverseProject(eastNorth);
-        setCoor(ll);
+        setCoor(Projections.inverseProject(eastNorth));
     }
 
@@ -76 +82 @@
         visitor.visit(this);
     }
-
 }

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

@@ -52 +52 @@
                 return -1;
             }
-            return Long.valueOf(Math.abs(n1.getId())).compareTo(Long.valueOf(Math.abs(n2.getId())));
+            return Long.compare(Math.abs(n1.getId()), Math.abs(n2.getId()));
         }
     };

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

@@ -300 +300 @@
     @Override
     public int compareTo(OsmPrimitive o) {
-        return o instanceof Relation ? Long.valueOf(getUniqueId()).compareTo(o.getUniqueId()) : -1;
-    }
-
+        return o instanceof Relation ? Long.compare(getUniqueId(), o.getUniqueId()) : -1;
+    }
+
+    /**
+     * Returns the first member.
+     * @return first member, or {@code null}
+     */
     public RelationMember firstMember() {
-        if (isIncomplete()) return null;
-
-        RelationMember[] members = this.members;
-        return (members.length == 0) ? null : members[0];
-    }
+        return (isIncomplete() || members.length == 0) ? null : members[0];
+    }
+
+    /**
+     * Returns the last member.
+     * @return last member, or {@code null}
+     */
     public RelationMember lastMember() {
-        if (isIncomplete()) return null;
-
-        RelationMember[] members = this.members;
-        return (members.length == 0) ? null : members[members.length - 1];
+        return (isIncomplete() || members.length == 0) ? null : members[members.length - 1];
     }
 

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

@@ -351 +351 @@
         if (o instanceof Relation)
             return 1;
-        return o instanceof Way ? Long.valueOf(getUniqueId()).compareTo(o.getUniqueId()) : -1;
+        return o instanceof Way ? Long.compare(getUniqueId(), o.getUniqueId()) : -1;
     }
 

trunk/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java

@@ -156 +156 @@
         if (this.id != o.id)
             throw new ClassCastException(tr("Cannot compare primitive with ID ''{0}'' to primitive with ID ''{1}''.", o.id, this.id));
-        return Long.valueOf(this.version).compareTo(o.version);
+        return Long.compare(this.version, o.version);
     }
 

trunk/src/org/openstreetmap/josm/data/validation/tests/DuplicateRelation.java

@@ -131 +131 @@
      * Class to store relation data (keys are usually cleanup and may not be equal to original relation)
      */
-    private class RelationPair {
+    private static class RelationPair {
         /** Member objects of the relation */
         private RelationMembers members;

trunk/src/org/openstreetmap/josm/data/validation/tests/SimilarNamedWays.java

@@ -223 +223 @@
     }
 
-    public class RegExprRule implements NormalizeRule {
+    public static class RegExprRule implements NormalizeRule {
         private final Pattern regExpr;
         private final String replacement;
@@ -243 +243 @@
     }
 
-    public class SynonymRule implements NormalizeRule {
+    public static class SynonymRule implements NormalizeRule {
 
         private final String[] words;