Changeset 11376 in josm for trunk

Timestamp:

2016-12-10T06:47:17+01:00 (8 years ago)

Author:

Don-vip

Message:

findbugs - UWF_FIELD_NOT_INITIALIZED_IN_CONSTRUCTOR

Location:

trunk/src/org/openstreetmap/josm

Files:

• actions/JoinAreasAction.java (modified) (5 diffs)
• tools/RightAndLefthandTraffic.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/actions/JoinAreasAction.java

@@ -67 +67 @@
     public static class JoinAreasResult {
 
-        public boolean hasChanges;
-
-        public List<Multipolygon> polygons;
+        private final boolean hasChanges;
+        private final List<Multipolygon> polygons;
+
+        /**
+         * Constructs a new {@code JoinAreasResult}.
+         * @param hasChanges whether the result has changes
+         * @param polygons the result polygons, can be null
+         */
+        public JoinAreasResult(boolean hasChanges, List<Multipolygon> polygons) {
+            this.hasChanges = hasChanges;
+            this.polygons = polygons;
+        }
+
+        /**
+         * Determines if the result has changes.
+         * @return {@code true} if the result has changes
+         */
+        public final boolean hasChanges() {
+            return hasChanges;
+        }
+
+        /**
+         * Returns the result polygons, can be null.
+         * @return the result polygons, can be null
+         */
+        public final List<Multipolygon> getPolygons() {
+            return polygons;
+        }
     }
 
@@ -545 +570 @@
     public JoinAreasResult joinAreas(List<Multipolygon> areas) throws UserCancelException {
 
-        JoinAreasResult result = new JoinAreasResult();
-        result.hasChanges = false;
+        boolean hasChanges = false;
 
         List<Way> allStartingWays = new ArrayList<>();
@@ -565 +589 @@
 
         if (removedDuplicates) {
-            result.hasChanges = true;
+            hasChanges = true;
             commitCommands(marktr("Removed duplicate nodes"));
         }
@@ -574 +598 @@
         //no intersections, return.
         if (nodes.isEmpty())
-            return result;
+            return new JoinAreasResult(hasChanges, null);
         commitCommands(marktr("Added node on all intersections"));
 
@@ -655 +679 @@
         }
 
-        result.hasChanges = true;
-        result.polygons = polygons;
-        return result;
+        return new JoinAreasResult(true, polygons);
     }
 

trunk/src/org/openstreetmap/josm/tools/RightAndLefthandTraffic.java

@@ -111 +111 @@
             try {
                 JoinAreasResult result = new JoinAreasAction().joinAreas(areas);
-                if (result.hasChanges) {
-                    for (Multipolygon mp : result.polygons) {
+                if (result.hasChanges()) {
+                    for (Multipolygon mp : result.getPolygons()) {
                         optimizedWays.add(mp.outerWay);
                     }