Changeset 8372 in josm for trunk/src/org/openstreetmap/josm/gui/history/CoordinateInfoViewer.java

Timestamp:

2015-05-17T02:24:13+02:00 (9 years ago)

Author:

Don-vip

Message:

code cleanup

File:

• trunk/src/org/openstreetmap/josm/gui/history/CoordinateInfoViewer.java (modified) (4 diffs)

trunk/src/org/openstreetmap/josm/gui/history/CoordinateInfoViewer.java

@@ -100 +100 @@
 
     /**
-     *
+     * Constructs a new {@code CoordinateInfoViewer}.
      * @param model the model. Must not be null.
      * @throws IllegalArgumentException if model is null
@@ -173 +173 @@
         private transient HistoryBrowserModel model;
         private PointInTimeType role;
+
+        protected LatLon coord;
+        protected LatLon oppositeCoord;
 
         protected HistoryOsmPrimitive getPrimitive() {
@@ -249 +252 @@
         }
 
-        protected void refresh() {
+        protected final boolean prepareRefresh() {
             HistoryOsmPrimitive p = getPrimitive();
             HistoryOsmPrimitive  opposite = getOppositePrimitive();
-            if (!(p instanceof HistoryNode)) return;
-            if (!(opposite instanceof HistoryNode)) return;
+            if (!(p instanceof HistoryNode)) return false;
+            if (!(opposite instanceof HistoryNode)) return false;
             HistoryNode node = (HistoryNode)p;
             HistoryNode oppositeNode = (HistoryNode) opposite;
 
-            LatLon coord = node.getCoords();
-            LatLon oppositeCoord = oppositeNode.getCoords();
+            coord = node.getCoords();
+            oppositeCoord = oppositeNode.getCoords();
+            return true;
+        }
+
+        protected void refresh() {
+            if (!prepareRefresh()) return;
 
             // display the coordinates
@@ -323 +331 @@
         @Override
         protected void refresh() {
-            HistoryOsmPrimitive p = getPrimitive();
-            HistoryOsmPrimitive opposite = getOppositePrimitive();
-            if (!(p instanceof HistoryNode)) return;
-            if (!(opposite instanceof HistoryNode)) return;
-            HistoryNode node = (HistoryNode) p;
-            HistoryNode oppositeNode = (HistoryNode) opposite;
-
-            LatLon coord = node.getCoords();
-            LatLon oppositeCoord = oppositeNode.getCoords();
+            if (!prepareRefresh()) return;
 
             // update distance