Changeset 8372 in josm for trunk/src

Timestamp:

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

Author:

Don-vip

Message:

code cleanup

Location:

trunk/src/org/openstreetmap/josm

Files:

• actions/mapmode/ImproveWayAccuracyHelper.java (modified) (2 diffs)
• gui/history/CoordinateInfoViewer.java (modified) (4 diffs)
• tools/date/PrimaryDateParser.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/actions/mapmode/ImproveWayAccuracyHelper.java

@@ -57 +57 @@
         }
 
-        candidate = Main.map.mapView.getNearestWay(p,
-                OsmPrimitive.isSelectablePredicate);
-
-        return candidate;
+        return Main.map.mapView.getNearestWay(p, OsmPrimitive.isSelectablePredicate);
     }
 
@@ -145 +142 @@
             EastNorth a = wpp.a.getEastNorth();
             EastNorth b = wpp.b.getEastNorth();
-            
+
             // Finding intersection of the segment with its altitude from p
             EastNorth altitudeIntersection = Geometry.closestPointToSegment(a, b, pEN);
             currentDistance = pEN.distance(altitudeIntersection);
-            
+
             if (!altitudeIntersection.equals(a) && !altitudeIntersection.equals(b)) {
                 // If the segment intersects with the altitude from p,

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

trunk/src/org/openstreetmap/josm/tools/date/PrimaryDateParser.java

@@ -183 +183 @@
 
     private Date parseShortStandardDate(String date) {
-        int year;
-        int month;
-        int day;
-        int hour;
-        int minute;
-        int second;
-
-        year = Integer.parseInt(date.substring(0, 4));
-        month = Integer.parseInt(date.substring(5, 7));
-        day = Integer.parseInt(date.substring(8, 10));
-        hour = Integer.parseInt(date.substring(11, 13));
-        minute = Integer.parseInt(date.substring(14, 16));
-        second = Integer.parseInt(date.substring(17, 19));
+        int year = Integer.parseInt(date.substring(0, 4));
+        int month = Integer.parseInt(date.substring(5, 7));
+        int day = Integer.parseInt(date.substring(8, 10));
+        int hour = Integer.parseInt(date.substring(11, 13));
+        int minute = Integer.parseInt(date.substring(14, 16));
+        int second = Integer.parseInt(date.substring(17, 19));
 
         calendar.clear();
@@ -209 +202 @@
 
     private Date parseLongStandardDate(String date) {
-        int year;
-        int month;
-        int day;
-        int hour;
-        int minute;
-        int second;
-        int millisecond;
-
-        year = Integer.parseInt(date.substring(0, 4));
-        month = Integer.parseInt(date.substring(5, 7));
-        day = Integer.parseInt(date.substring(8, 10));
-        hour = Integer.parseInt(date.substring(11, 13));
-        minute = Integer.parseInt(date.substring(14, 16));
-        second = Integer.parseInt(date.substring(17, 19));
-        millisecond = Integer.parseInt(date.substring(20, 23));
+        int year = Integer.parseInt(date.substring(0, 4));
+        int month = Integer.parseInt(date.substring(5, 7));
+        int day = Integer.parseInt(date.substring(8, 10));
+        int hour = Integer.parseInt(date.substring(11, 13));
+        int minute = Integer.parseInt(date.substring(14, 16));
+        int second = Integer.parseInt(date.substring(17, 19));
+        int millisecond = Integer.parseInt(date.substring(20, 23));
 
         calendar.clear();