Changeset 11852 in josm for trunk/src/org/openstreetmap

Timestamp:

2017-04-08T01:08:59+02:00 (7 years ago)

Author:

Don-vip

Message:

sonar - squid:S1444 - "public static" fields should be constant

Location:

trunk/src/org/openstreetmap/josm

Files:

• data/validation/OsmValidator.java (modified) (5 diffs)
• data/validation/tests/CrossingWays.java (modified) (1 diff)
• data/validation/util/ValUtil.java (modified) (2 diffs)
• gui/layer/ValidatorLayer.java (modified) (1 diff)

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

@@ -75 +75 @@
     }
 
-    public static volatile ValidatorLayer errorLayer;
+    private static volatile ValidatorLayer errorLayer;
 
     /** The validate action */
@@ -81 +81 @@
 
     /** Grid detail, multiplier of east,north values for valuable cell sizing */
-    public static double griddetail;
+    private static double griddetail;
 
     private static final Collection<String> ignoredErrors = new TreeSet<>();
@@ -215 +215 @@
     }
 
+    /**
+     * Initializes error layer.
+     */
     public static synchronized void initializeErrorLayer() {
         if (!ValidatorPreference.PREF_LAYER.get())
@@ -222 +225 @@
             Main.getLayerManager().addLayer(errorLayer);
         }
+    }
+
+    /**
+     * Resets error layer.
+     * @since 11852
+     */
+    public static synchronized void resetErrorLayer() {
+        errorLayer = null;
     }
 
@@ -303 +314 @@
             OsmValidator.griddetail = 1.0;
         }
+    }
+
+    /**
+     * Returns grid detail, multiplier of east,north values for valuable cell sizing
+     * @return grid detail
+     * @since 11852
+     */
+    public static double getGridDetail() {
+        return griddetail;
     }
 

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

@@ -323 +323 @@
 
         List<List<WaySegment>> cells = new ArrayList<>();
-        for (Point2D cell : ValUtil.getSegmentCells(n1, n2, OsmValidator.griddetail)) {
+        for (Point2D cell : ValUtil.getSegmentCells(n1, n2, OsmValidator.getGridDetail())) {
             List<WaySegment> segments = cellSegments.get(cell);
             if (segments == null) {

trunk/src/org/openstreetmap/josm/data/validation/util/ValUtil.java

@@ -43 +43 @@
         Set<Point2D> cellNodes = new HashSet<>();
         Point2D cell;
+        double griddetail = OsmValidator.getGridDetail();
 
         // First, round coordinates
         // CHECKSTYLE.OFF: SingleSpaceSeparator
-        long x0 = Math.round(n1.getEastNorth().east()  * OsmValidator.griddetail);
-        long y0 = Math.round(n1.getEastNorth().north() * OsmValidator.griddetail);
-        long x1 = Math.round(n2.getEastNorth().east()  * OsmValidator.griddetail);
-        long y1 = Math.round(n2.getEastNorth().north() * OsmValidator.griddetail);
+        long x0 = Math.round(n1.getEastNorth().east()  * griddetail);
+        long y0 = Math.round(n1.getEastNorth().north() * griddetail);
+        long x1 = Math.round(n2.getEastNorth().east()  * griddetail);
+        long y1 = Math.round(n2.getEastNorth().north() * griddetail);
         // CHECKSTYLE.ON: SingleSpaceSeparator
 
@@ -76 +77 @@
         // Then floor coordinates, in case the way is in the border of the cell.
         // CHECKSTYLE.OFF: SingleSpaceSeparator
-        x0 = (long) Math.floor(n1.getEastNorth().east()  * OsmValidator.griddetail);
-        y0 = (long) Math.floor(n1.getEastNorth().north() * OsmValidator.griddetail);
-        x1 = (long) Math.floor(n2.getEastNorth().east()  * OsmValidator.griddetail);
-        y1 = (long) Math.floor(n2.getEastNorth().north() * OsmValidator.griddetail);
+        x0 = (long) Math.floor(n1.getEastNorth().east()  * griddetail);
+        y0 = (long) Math.floor(n1.getEastNorth().north() * griddetail);
+        x1 = (long) Math.floor(n2.getEastNorth().east()  * griddetail);
+        y1 = (long) Math.floor(n2.getEastNorth().north() * griddetail);
         // CHECKSTYLE.ON: SingleSpaceSeparator
 

trunk/src/org/openstreetmap/josm/gui/layer/ValidatorLayer.java

@@ -162 +162 @@
             e.scheduleRemoval(Collections.singleton(this));
         } else if (e.getRemovedLayer() == this) {
-            OsmValidator.errorLayer = null;
+            OsmValidator.resetErrorLayer();
         }
     }