Changeset 30353 in osm for applications/editors

Timestamp:

2014-03-24T22:03:31+01:00 (10 years ago)

Author:

donvip

Message:

[josm_measurement] code cleanup

Location:

applications/editors/josm/plugins/measurement/src/org/openstreetmap/josm/plugins/measurement

Files:

• MeasurementDialog.java (modified) (3 diffs)
• MeasurementLayer.java (modified) (1 diff)
• MeasurementPlugin.java (modified) (1 diff)

applications/editors/josm/plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementDialog.java

@@ -88 +88 @@
 
         resetButton = new SideButton(new AbstractAction() {
-                {
-                        putValue(NAME, tr("Reset"));
-                        putValue(SMALL_ICON,ImageProvider.get("dialogs", "select"));
-                        putValue(SHORT_DESCRIPTION, tr("Reset current measurement results and delete measurement path."));
-                        putValue("help", HelpUtil.ht("/Dialog/Measurement#Reset"));
-                }
+            {
+                putValue(NAME, tr("Reset"));
+                putValue(SMALL_ICON,ImageProvider.get("dialogs", "select"));
+                putValue(SHORT_DESCRIPTION, tr("Reset current measurement results and delete measurement path."));
+                putValue("help", HelpUtil.ht("/Dialog/Measurement#Reset"));
+            }
             @Override
             public void actionPerformed(ActionEvent e)
             {
-                resetValues();
+                resetValues();
             }
         });
@@ -222 +222 @@
             ds = currentDs;
         }
-        }
-
-        @Override
-        public void destroy() {
-                super.destroy();
-                NavigatableComponent.removeSoMChangeListener(this);
-                DataSet.removeSelectionListener(this);
-                if (ds != null) {
-                    ds.removeDataSetListener(this);
-                    ds = null;
-                }
-        }
-
-        private boolean waysContain(Node n) {
-            if (ways != null) {
-                for (Way w : ways) {
-                    if (w.containsNode(n)) {
-                        return true;
-                    }
-                }
-            }
-            return false;
-        }
-        
+    }
+
+    @Override
+    public void destroy() {
+        super.destroy();
+        NavigatableComponent.removeSoMChangeListener(this);
+        DataSet.removeSelectionListener(this);
+        if (ds != null) {
+            ds.removeDataSetListener(this);
+            ds = null;
+        }
+    }
+
+    private boolean waysContain(Node n) {
+        if (ways != null) {
+            for (Way w : ways) {
+                if (w.containsNode(n)) {
+                    return true;
+                }
+            }
+        }
+        return false;
+    }
+    
     @Override public void nodeMoved(NodeMovedEvent event) {
         Node n = event.getNode();
@@ -262 +262 @@
     @Override public void dataChanged(DataChangedEvent event) {}
 
-        @Override
-        public void systemOfMeasurementChanged(String oldSoM, String newSoM) {
-                // Refresh selection to take into account new system of measurement
-                selectionChanged(Main.main.getCurrentDataSet().getSelected());
-        }
+    @Override
+    public void systemOfMeasurementChanged(String oldSoM, String newSoM) {
+        // Refresh selection to take into account new system of measurement
+        selectionChanged(Main.main.getCurrentDataSet().getSelected());
+    }
 }

applications/editors/josm/plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementLayer.java

@@ -144 +144 @@
     }
     
-        /*
+    /*
      * Use an equal area sinusoidal projection to improve accuracy and so we can still use normal polygon area calculation
-     * http://stackoverflow.com/questions/4681737/how-to-calculate-the-area-of-a-polygon-on-the-earths-surface-using-python
+     * https://stackoverflow.com/questions/4681737/how-to-calculate-the-area-of-a-polygon-on-the-earths-surface-using-python
      */
     public static double calcX(LatLon p1){
         return p1.lat() * Math.PI * 6367000 / 180;
-        }
+    }
 
     public static double calcY(LatLon p1){

applications/editors/josm/plugins/measurement/src/org/openstreetmap/josm/plugins/measurement/MeasurementPlugin.java

@@ -32 +32 @@
             newFrame.addMapMode(btn);
         } else {
-                btn = null;
-                mode = null;
-                measurementDialog = null;
+            btn = null;
+            mode = null;
+            measurementDialog = null;
         }
     }