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

Timestamp:

2016-12-15T07:31:46+01:00 (7 years ago)

Author:

Don-vip

Message:

sonar - squid:ClassVariableVisibilityCheck - Class variable fields should not have public accessibility

Location:

trunk/src/org/openstreetmap/josm

Files:

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

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

@@ -98 +98 @@
 
     public static class Multipolygon {
-        public Way outerWay;
-        public List<Way> innerWays;
-
+        private final Way outerWay;
+        private final List<Way> innerWays;
+
+        /**
+         * Constructs a new {@code Multipolygon}.
+         * @param way outer way
+         */
         public Multipolygon(Way way) {
             outerWay = way;
             innerWays = new ArrayList<>();
+        }
+
+        /**
+         * Returns the outer way.
+         * @return the outer way
+         */
+        public final Way getOuterWay() {
+            return outerWay;
+        }
+
+        /**
+         * Returns the inner ways.
+         * @return the inner ways
+         */
+        public final List<Way> getInnerWays() {
+            return innerWays;
         }
     }
@@ -1239 +1259 @@
     /**
      * Joins the lists of ways.
-     * @param polygon The list of outer ways that belong to that multigon.
+     * @param polygon The list of outer ways that belong to that multipolygon.
      * @return The newly created outer way
      * @throws UserCancelException if user cancels the operation

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

@@ -113 +113 @@
                 if (result.hasChanges()) {
                     for (Multipolygon mp : result.getPolygons()) {
-                        optimizedWays.add(mp.outerWay);
+                        optimizedWays.add(mp.getOuterWay());
                     }
                 }