Changeset 10250 in josm for trunk/src/org/openstreetmap/josm/data/validation

Timestamp:

2016-05-18T17:44:31+02:00 (9 years ago)

Author:

Don-vip

Message:

findbugs - UWF_FIELD_NOT_INITIALIZED_IN_CONSTRUCTOR

Location:

trunk/src/org/openstreetmap/josm/data/validation

Files:

• PaintVisitor.java (modified) (3 diffs)
• tests/CrossingWays.java (modified) (3 diffs)

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

@@ -123 +123 @@
 
             if (selected) {
-                g.setColor(getHighlightColor());
+                g.setColor(getHighlightColor(color));
                 g.fillOval(p.x - 5, p.y - 5, 10, 10);
             }
@@ -146 +146 @@
         int deg = (int) Math.toDegrees(t);
         if (selected) {
-            g.setColor(getHighlightColor());
+            g.setColor(getHighlightColor(color));
             int[] x = new int[] {(int) (p1.x + cosT), (int) (p2.x + cosT),
                                  (int) (p2.x - cosT), (int) (p1.x - cosT)};
@@ -260 +260 @@
     /**
      * Gets the color to draw highlight markers with.
+     * @param color severity color
      * @return The color.
      */
-    private Color getHighlightColor() {
+    private static Color getHighlightColor(Color color) {
         return new Color(color.getRed(), color.getGreen(), color.getBlue(), (int) (color.getAlpha() * .4));
     }

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

@@ -40 +40 @@
 
     /** All way segments, grouped by cells */
-    private Map<Point2D, List<WaySegment>> cellSegments;
+    private final Map<Point2D, List<WaySegment>> cellSegments = new HashMap<>(1000);
     /** The already detected errors */
-    private Set<WaySegment> errorSegments;
+    private final Set<WaySegment> errorSegments = new HashSet<>();
     /** The already detected ways in error */
-    private Map<List<Way>, List<WaySegment>> seenWays;
+    private final Map<List<Way>, List<WaySegment>> seenWays = new HashMap<>(50);
 
     /**
@@ -188 +188 @@
     public void startTest(ProgressMonitor monitor) {
         super.startTest(monitor);
-        cellSegments = new HashMap<>(1000);
-        errorSegments = new HashSet<>();
-        seenWays = new HashMap<>(50);
+        cellSegments.clear();
+        errorSegments.clear();
+        seenWays.clear();
     }
 
@@ -196 +196 @@
     public void endTest() {
         super.endTest();
-        cellSegments = null;
-        errorSegments = null;
-        seenWays = null;
+        cellSegments.clear();
+        errorSegments.clear();
+        seenWays.clear();
     }