Changeset 8285 in josm for trunk/src/org/openstreetmap/josm/command

Timestamp:

2015-04-28T00:49:49+02:00 (10 years ago)

Author:

Don-vip

Message:

fix sonar squid:S2039 - Member variable visibility should be specified

Location:

trunk/src/org/openstreetmap/josm/command

Files:

• Command.java (modified) (2 diffs)
• MoveCommand.java (modified) (2 diffs)
• RotateCommand.java (modified) (1 diff)
• ScaleCommand.java (modified) (2 diffs)
• TransformNodesCommand.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/command/Command.java

@@ -60 +60 @@
     public static class OldNodeState {
 
-        final LatLon latlon;
-        final EastNorth eastNorth; // cached EastNorth to be used for applying exact displacement
-        final boolean modified;
+        private final LatLon latlon;
+        private final EastNorth eastNorth; // cached EastNorth to be used for applying exact displacement
+        private final boolean modified;
 
         /**
@@ -72 +72 @@
             eastNorth = node.getEastNorth();
             modified = node.isModified();
+        }
+
+        /**
+         * Returns old lat/lon.
+         * @return old lat/lon
+         * @see Node#getCoor()
+         */
+        public final LatLon getLatlon() {
+            return latlon;
+        }
+
+        /**
+         * Returns old east/north.
+         * @return old east/north
+         * @see Node#getEastNorth()
+         */
+        public final EastNorth getEastNorth() {
+            return eastNorth;
+        }
+
+        /**
+         * Returns old modified state.
+         * @return old modified state
+         * @see Node #isModified()
+         */
+        public final boolean isModified() {
+            return modified;
         }
     }

trunk/src/org/openstreetmap/josm/command/MoveCommand.java

@@ -171 +171 @@
         for (Node n : nodes) {
             OldNodeState os = it.next();
-            if (os.eastNorth != null) {
-                n.setEastNorth(os.eastNorth.add(x, y));
+            if (os.getEastNorth() != null) {
+                n.setEastNorth(os.getEastNorth().add(x, y));
             }
         }
@@ -197 +197 @@
         for (Node n : nodes) {
             OldNodeState os = it.next();
-            n.setCoor(os.latlon);
-            n.setModified(os.modified);
+            n.setCoor(os.getLatlon());
+            n.setModified(os.isModified());
         }
     }

trunk/src/org/openstreetmap/josm/command/RotateCommand.java

@@ -76 +76 @@
             double cosPhi = Math.cos(rotationAngle);
             double sinPhi = Math.sin(rotationAngle);
-            EastNorth oldEastNorth = oldStates.get(n).eastNorth;
+            EastNorth oldEastNorth = oldStates.get(n).getEastNorth();
             double x = oldEastNorth.east() - pivot.east();
             double y = oldEastNorth.north() - pivot.north();

trunk/src/org/openstreetmap/josm/command/ScaleCommand.java

@@ -26 +26 @@
     /**
      * World position of the mouse when the user started the command.
-     *
      */
-    EastNorth startEN = null;
+    private EastNorth startEN = null;
 
     /**
@@ -69 +68 @@
     protected void transformNodes() {
         for (Node n : nodes) {
-            EastNorth oldEastNorth = oldStates.get(n).eastNorth;
+            EastNorth oldEastNorth = oldStates.get(n).getEastNorth();
             double dx = oldEastNorth.east() - pivot.east();
             double dy = oldEastNorth.north() - pivot.north();

trunk/src/org/openstreetmap/josm/command/TransformNodesCommand.java

@@ -94 +94 @@
         for (Node n : nodes) {
             OldNodeState os = oldStates.get(n);
-            n.setCoor(os.latlon);
-            n.setModified(os.modified);
+            n.setCoor(os.getLatlon());
+            n.setModified(os.isModified());
         }
     }