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

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

Files:

• AutosaveTask.java (modified) (1 diff)
• CustomConfigurator.java (modified) (2 diffs)
• Preferences.java (modified) (3 diffs)
• imagery/ImageryLayerInfo.java (modified) (1 diff)
• osm/DataSet.java (modified) (2 diffs)
• osm/DataSetMerger.java (modified) (1 diff)
• osm/FilterMatcher.java (modified) (7 diffs)
• osm/NoteData.java (modified) (1 diff)
• osm/Storage.java (modified) (1 diff)
• osm/Way.java (modified) (1 diff)
• osm/visitor/paint/StyledMapRenderer.java (modified) (2 diffs)
• osm/visitor/paint/WireframeMapRenderer.java (modified) (1 diff)
• osm/visitor/paint/relations/Multipolygon.java (modified) (1 diff)
• osm/visitor/paint/relations/MultipolygonCache.java (modified) (2 diffs)
• projection/datum/NTV2GridShiftFile.java (modified) (2 diffs)
• projection/datum/NTV2SubGrid.java (modified) (2 diffs)
• validation/OsmValidator.java (modified) (2 diffs)
• validation/routines/DomainValidator.java (modified) (1 diff)
• validation/tests/MultipolygonTest.java (modified) (3 diffs)
• validation/tests/TagChecker.java (modified) (3 diffs)
• validation/tests/WayConnectedToArea.java (modified) (1 diff)

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

@@ -118 +118 @@
     }
 
-    private String getFileName(String layerName, int index) {
+    private static String getFileName(String layerName, int index) {
         String result = layerName;
         for (char illegalCharacter : ILLEGAL_CHARACTERS) {

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

@@ -614 +614 @@
         }
 
-        private void processPluginInstallElement(Element elem) {
+        private static void processPluginInstallElement(Element elem) {
             String install = elem.getAttribute("install");
             String uninstall = elem.getAttribute("remove");
@@ -739 +739 @@
         }
 
-        private String normalizeDirName(String dir) {
+        private static String normalizeDirName(String dir) {
             String s = dir.replace('\\', '/');
             if (s.endsWith("/")) s = s.substring(0, s.length()-1);

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

@@ -689 +689 @@
     }
 
-    private void addPossibleResourceDir(Set<String> locations, String s) {
+    private static void addPossibleResourceDir(Set<String> locations, String s) {
         if (s != null) {
             if (!s.endsWith(File.separator)) {
@@ -867 +867 @@
     }
 
-    private void setCorrectPermissions(File file) {
+    private static void setCorrectPermissions(File file) {
         if (!file.setReadable(false, false) && Main.isDebugEnabled()) {
             Main.debug(tr("Unable to set file non-readable {0}", file.getAbsolutePath()));
@@ -1337 +1337 @@
     }
 
-    private <T> Collection<Map<String, String>> serializeListOfStructs(Collection<T> l, Class<T> klass) {
+    private static <T> Collection<Map<String, String>> serializeListOfStructs(Collection<T> l, Class<T> klass) {
         if (l == null)
             return null;

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

@@ -247 +247 @@
 
     // some additional checks to respect extended URLs in preferences (legacy workaround)
-    private boolean isSimilar(String a, String b) {
+    private static boolean isSimilar(String a, String b) {
         return Objects.equals(a, b) || (a != null && b != null && !a.isEmpty() && !b.isEmpty() && (a.contains(b) || b.contains(a)));
     }

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

trunk/src/org/openstreetmap/josm/data/projection/datum/NTV2GridShiftFile.java

@@ -83 +83 @@
     private NTV2SubGrid lastSubGrid;
 
-    private void readBytes(InputStream in, byte[] b) throws IOException {
+    private static void readBytes(InputStream in, byte[] b) throws IOException {
         if (in.read(b) < b.length) {
             Main.error("Failed to read expected amount of bytes ("+ b.length +") from stream");
@@ -167 +167 @@
      * @return an array of top level Sub Grids with lower level Sub Grids set.
      */
-    private NTV2SubGrid[] createSubGridTree(NTV2SubGrid[] subGrid) {
+    private static NTV2SubGrid[] createSubGridTree(NTV2SubGrid[] subGrid) {
         int topLevelCount = 0;
         Map<String, List<NTV2SubGrid>> subGridMap = new HashMap<>();

trunk/src/org/openstreetmap/josm/data/projection/datum/NTV2SubGrid.java

@@ -149 +149 @@
     }
 
-    private void readBytes(InputStream in, byte[] b) throws IOException {
+    private static void readBytes(InputStream in, byte[] b) throws IOException {
         if (in.read(b) < b.length) {
             Main.error("Failed to read expected amount of bytes ("+ b.length +") from stream");
@@ -209 +209 @@
      * @return interpolated value
      */
-    private double interpolate(float a, float b, float c, float d, double x, double y) {
+    private static double interpolate(float a, float b, float c, float d, double x, double y) {
         return a + (((double) b - (double) a) * x) + (((double) c - (double) a) * y) +
         (((double) a + (double) d - b - c) * x * y);

trunk/src/org/openstreetmap/josm/data/validation/OsmValidator.java

@@ -162 +162 @@
      * Check if plugin directory exists (store ignored errors file)
      */
-    private void checkValidatorDir() {
+    private static void checkValidatorDir() {
         try {
             File pathDir = new File(getValidatorDir());
@@ -173 +173 @@
     }
 
-    private void loadIgnoredErrors() {
+    private static void loadIgnoredErrors() {
         ignoredErrors.clear();
         if (Main.pref.getBoolean(ValidatorPreference.PREF_USE_IGNORE, true)) {

trunk/src/org/openstreetmap/josm/data/validation/routines/DomainValidator.java

@@ -218 +218 @@
     }
 
-    private String chompLeadingDot(String str) {
+    private static String chompLeadingDot(String str) {
         if (str.startsWith(".")) {
             return str.substring(1);

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

@@ -91 +91 @@
     }
 
-    private GeneralPath createPath(List<Node> nodes) {
+    private static GeneralPath createPath(List<Node> nodes) {
         GeneralPath result = new GeneralPath();
         result.moveTo((float) nodes.get(0).getCoor().lat(), (float) nodes.get(0).getCoor().lon());
@@ -109 +109 @@
     }
 
-    private Intersection getPolygonIntersection(GeneralPath outer, List<Node> inner) {
+    private static Intersection getPolygonIntersection(GeneralPath outer, List<Node> inner) {
         boolean inside = false;
         boolean outside = false;
@@ -292 +292 @@
     }
 
-    private void addRelationIfNeeded(TestError error, Relation r) {
+    private static void addRelationIfNeeded(TestError error, Relation r) {
         // Fix #8212 : if the error references only incomplete primitives,
         // add multipolygon in order to let user select something and fix the error

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

@@ -297 +297 @@
      * @param s string to check
      */
-    private boolean containsLow(String s) {
+    private static boolean containsLow(String s) {
         if (s == null)
             return false;
@@ -454 +454 @@
     }
 
-    private Map<String, String> getPossibleValues(Set<String> values) {
+    private static Map<String, String> getPossibleValues(Set<String> values) {
         // generate a map with common typos
         Map<String, String> map = new HashMap<>();
@@ -666 +666 @@
             public boolean valueBool;
 
-            private Pattern getPattern(String str) throws PatternSyntaxException {
+            private static Pattern getPattern(String str) throws PatternSyntaxException {
                 if (str.endsWith("/i"))
                     return Pattern.compile(str.substring(1, str.length()-2), Pattern.CASE_INSENSITIVE);

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

@@ -84 +84 @@
     }
 
-    private boolean isArea(OsmPrimitive p) {
+    private static boolean isArea(OsmPrimitive p) {
         return (p.hasKey("landuse") || p.hasKey("natural"))
                 && ElemStyles.hasAreaElemStyle(p, false);