Changeset 10248 in josm for trunk

Timestamp:

2016-05-17T18:19:04+02:00 (8 years ago)

Author:

Don-vip

Message:

findbugs - NM_CONFUSING

Location:

trunk/src/org/openstreetmap/josm

Files:

• command/Command.java (modified) (5 diffs)
• command/MoveCommand.java (modified) (1 diff)
• command/TransformNodesCommand.java (modified) (1 diff)
• gui/dialogs/relation/MemberTableLinkedCellRenderer.java (modified) (1 diff)
• gui/dialogs/relation/sort/WayConnectionType.java (modified) (1 diff)

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

@@ -63 +63 @@
     public static class OldNodeState {
 
-        private final LatLon latlon;
+        private final LatLon latLon;
         private final EastNorth eastNorth; // cached EastNorth to be used for applying exact displacement
         private final boolean modified;
@@ -72 +72 @@
          */
         public OldNodeState(Node node) {
-            latlon = node.getCoor();
+            latLon = node.getCoor();
             eastNorth = node.getEastNorth();
             modified = node.isModified();
@@ -81 +81 @@
          * @return old lat/lon
          * @see Node#getCoor()
+         * @since 10248
          */
-        public final LatLon getLatlon() {
-            return latlon;
+        public final LatLon getLatLon() {
+            return latLon;
         }
 
@@ -106 +107 @@
         @Override
         public int hashCode() {
-            return Objects.hash(latlon, eastNorth, modified);
+            return Objects.hash(latLon, eastNorth, modified);
         }
 
@@ -115 +116 @@
             OldNodeState that = (OldNodeState) obj;
             return modified == that.modified &&
-                    Objects.equals(latlon, that.latlon) &&
+                    Objects.equals(latLon, that.latLon) &&
                     Objects.equals(eastNorth, that.eastNorth);
         }

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

@@ -218 +218 @@
         for (Node n : nodes) {
             OldNodeState os = it.next();
-            n.setCoor(os.getLatlon());
+            n.setCoor(os.getLatLon());
             n.setModified(os.isModified());
         }

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

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

trunk/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableLinkedCellRenderer.java

@@ -33 +33 @@
 
         this.value = (WayConnectionType) value;
-        setToolTipText(((WayConnectionType) value).getToolTip());
+        setToolTipText(((WayConnectionType) value).getTooltip());
         renderBackgroundForeground(getModel(table), null, isSelected);
         return this;

trunk/src/org/openstreetmap/josm/gui/dialogs/relation/sort/WayConnectionType.java

@@ -73 +73 @@
     }
 
-    public String getToolTip() {
+    /**
+     * Returns tooltip.
+     * @return tooltip
+     * @since 10248
+     */
+    public String getTooltip() {
         if (!isValid())
             return "";