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

Timestamp:

2015-10-13T23:50:14+02:00 (9 years ago)

Author:

Don-vip

Message:

sonar - squid:S2325 - "private" methods that don't access instance data should be "static"

Location:

trunk/src/org/openstreetmap/josm/data/osm

Files:

• DataSet.java (modified) (2 diffs)
• DataSetMerger.java (modified) (1 diff)
• FilterMatcher.java (modified) (7 diffs)
• NoteData.java (modified) (1 diff)
• Storage.java (modified) (1 diff)
• Way.java (modified) (1 diff)
• visitor/paint/StyledMapRenderer.java (modified) (2 diffs)
• visitor/paint/WireframeMapRenderer.java (modified) (1 diff)
• visitor/paint/relations/Multipolygon.java (modified) (1 diff)
• visitor/paint/relations/MultipolygonCache.java (modified) (2 diffs)

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

@@ -969 +969 @@
     }
 
-    private void deleteWay(Way way) {
+    private static void deleteWay(Way way) {
         way.setNodes(null);
         way.setDeleted(true);
@@ -1099 +1099 @@
     }
 
-    private void reindexRelation(Relation relation) {
+    private static void reindexRelation(Relation relation) {
         BBox before = relation.getBBox();
         relation.updatePosition();

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

@@ -218 +218 @@
     }
 
-    private void resetPrimitive(OsmPrimitive osm) {
+    private static void resetPrimitive(OsmPrimitive osm) {
         if (osm instanceof Way) {
             ((Way) osm).setNodes(null);

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

@@ -136 +136 @@
      * when hidden is false, returns whether the primitive is disabled or hidden
      */
-    private boolean isFiltered(OsmPrimitive primitive, boolean hidden) {
+    private static boolean isFiltered(OsmPrimitive primitive, boolean hidden) {
         return hidden ? primitive.isDisabledAndHidden() : primitive.isDisabled();
     }
@@ -147 +147 @@
      * @return true, if at least one non-inverted filter applies to the primitive
      */
-    private boolean isFilterExplicit(OsmPrimitive primitive, boolean hidden) {
+    private static boolean isFilterExplicit(OsmPrimitive primitive, boolean hidden) {
         return hidden ? primitive.getHiddenType() : primitive.getDisabledType();
     }
@@ -162 +162 @@
      * (c) at least one of the parent ways is explicitly filtered
      */
-    private boolean allParentWaysFiltered(OsmPrimitive primitive, boolean hidden) {
+    private static boolean allParentWaysFiltered(OsmPrimitive primitive, boolean hidden) {
         List<OsmPrimitive> refs = primitive.getReferrers();
         boolean isExplicit = false;
@@ -175 +175 @@
     }
 
-    private boolean oneParentWayNotFiltered(OsmPrimitive primitive, boolean hidden) {
+    private static boolean oneParentWayNotFiltered(OsmPrimitive primitive, boolean hidden) {
         List<OsmPrimitive> refs = primitive.getReferrers();
         for (OsmPrimitive p: refs) {
@@ -185 +185 @@
     }
 
-    private boolean allParentMultipolygonsFiltered(OsmPrimitive primitive, boolean hidden) {
+    private static boolean allParentMultipolygonsFiltered(OsmPrimitive primitive, boolean hidden) {
         boolean isExplicit = false;
         for (Relation r : new SubclassFilteredCollection<OsmPrimitive, Relation>(
@@ -196 +196 @@
     }
 
-    private boolean oneParentMultipolygonNotFiltered(OsmPrimitive primitive, boolean hidden) {
+    private static boolean oneParentMultipolygonNotFiltered(OsmPrimitive primitive, boolean hidden) {
         for (Relation r : new SubclassFilteredCollection<OsmPrimitive, Relation>(
                 primitive.getReferrers(), OsmPrimitive.multipolygonPredicate)) {
@@ -205 +205 @@
     }
 
-    private FilterType test(List<FilterInfo> filters, OsmPrimitive primitive, boolean hidden) {
+    private static FilterType test(List<FilterInfo> filters, OsmPrimitive primitive, boolean hidden) {
 
         if (primitive.isIncomplete())

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

@@ -279 +279 @@
     }
 
-    private User getCurrentUser() {
+    private static User getCurrentUser() {
         JosmUserIdentityManager userMgr = JosmUserIdentityManager.getInstance();
         return User.createOsmUser(userMgr.getUserId(), userMgr.getUserName());

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

@@ -266 +266 @@
      * Additional mixing of hash
      */
-    private int rehash(int h) {
+    private static int rehash(int h) {
         return 1103515245*h >> 2;
     }

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

@@ -81 +81 @@
      * Prevent directly following identical nodes in ways.
      */
-    private List<Node> removeDouble(List<Node> nodes) {
+    private static List<Node> removeDouble(List<Node> nodes) {
         Node last = null;
         int count = nodes.size();

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

@@ -363 +363 @@
     }
 
-    private Polygon buildPolygon(Point center, int radius, int sides, double rotation) {
+    private static Polygon buildPolygon(Point center, int radius, int sides, double rotation) {
         Polygon polygon = new Polygon();
         for (int i = 0; i < sides; i++) {
@@ -1500 +1500 @@
     }
 
-    private double[] pointAt(double t, Polygon poly, double pathLength) {
+    private static double[] pointAt(double t, Polygon poly, double pathLength) {
         double totalLen = t * pathLength;
         double curLen = 0;

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

@@ -276 +276 @@
     }
 
-    private boolean isNodeTagged(Node n) {
+    private static boolean isNodeTagged(Node n) {
         return n.isTagged() || n.isAnnotated();
     }

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

@@ -77 +77 @@
         }
 
-        private void setNormalized(Collection<String> literals, List<String> target) {
+        private static void setNormalized(Collection<String> literals, List<String> target) {
             target.clear();
             for (String l: literals) {

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

@@ -202 +202 @@
     }
 
-    private void dispatchEvent(AbstractDatasetChangedEvent event, Relation r, Collection<Map<Relation, Multipolygon>> maps) {
+    private static void dispatchEvent(AbstractDatasetChangedEvent event, Relation r, Collection<Map<Relation, Multipolygon>> maps) {
         for (Map<Relation, Multipolygon> map : maps) {
             Multipolygon m = map.get(r);
@@ -217 +217 @@
     }
 
-    private void removeMultipolygonFrom(Relation r, Collection<Map<Relation, Multipolygon>> maps) {
+    private static void removeMultipolygonFrom(Relation r, Collection<Map<Relation, Multipolygon>> maps) {
         for (Map<Relation, Multipolygon> map : maps) {
             map.remove(r);