Changeset 1814 in josm for trunk/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java

Timestamp:

2009-07-19T19:04:49+02:00 (15 years ago)

Author:

Gubaer

Message:

removed dependencies to Main.ds, removed Main.ds
removed AddVisitor, NameVisitor, DeleteVisitor - unnecessary double dispatching for these simple cases

File:

• trunk/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java (modified) (8 diffs)

trunk/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java

@@ -38 +38 @@
     public OrthogonalizeAction() {
         super(tr("Orthogonalize Shape"),
-            "ortho",
-            tr("Move nodes so all angles are 90 or 270 degree"),
-            Shortcut.registerShortcut("tools:orthogonalize", tr("Tool: {0}", tr("Orthogonalize Shape")),
-            KeyEvent.VK_Q,
-            Shortcut.GROUP_EDIT), true);
+                "ortho",
+                tr("Move nodes so all angles are 90 or 270 degree"),
+                Shortcut.registerShortcut("tools:orthogonalize", tr("Tool: {0}", tr("Orthogonalize Shape")),
+                        KeyEvent.VK_Q,
+                        Shortcut.GROUP_EDIT), true);
     }
 
     public void actionPerformed(ActionEvent e) {
 
-        Collection<OsmPrimitive> sel = Main.ds.getSelected();
+        Collection<OsmPrimitive> sel = getCurrentDataSet().getSelected();
 
         ArrayList<Node> dirnodes = new ArrayList<Node>();
@@ -84 +84 @@
                 double angle2 = Math.abs(way.nodes.get(i2).getEastNorth().heading(way.nodes.get(i3).getEastNorth()));
                 double delta = Math.abs(angle2 - angle1);
-                while(delta > Math.PI) delta -= Math.PI;
+                while(delta > Math.PI) {
+                    delta -= Math.PI;
+                }
                 if(delta < Math.PI/4) {
                     JOptionPane.showMessageDialog(Main.parent, tr("Please select ways with almost right angles to orthogonalize."));
@@ -96 +98 @@
                     "to undesirable results when doing rectangular alignments.<br>" +
                     "Change your projection to get rid of this warning.<br>" +
-                    "Do you want to continue?");
-
-            if (!DontShowAgainInfo.show("align_rectangular_4326", msg, false)) {
+            "Do you want to continue?");
+
+            if (!DontShowAgainInfo.show("align_rectangular_4326", msg, false))
                 return;
-            }
         }
         // Check, if selection held neither none nor two nodes
@@ -122 +123 @@
 
         for (OsmPrimitive osm : sel) {
-            if(!(osm instanceof Way))
+            if(!(osm instanceof Way)) {
                 continue;
+            }
 
             Way way = (Way)osm;
@@ -158 +160 @@
                         diff = heading_diff(headings[i], headings[i - 1]);
                     }
-                    if (diff > angle_diff_max) angle_diff_max = diff;
+                    if (diff > angle_diff_max) {
+                        angle_diff_max = diff;
+                    }
                 }
 
@@ -164 +168 @@
                     // rearrange headings: everything < 0 gets PI/2-rotated
                     for (int i=0; i < sides; i++) {
-                        if (headings[i] < 0)
+                        if (headings[i] < 0) {
                             headings[i] += Math.PI/2;
+                        }
                     }
                 }
@@ -217 +222 @@
                 // been duplicated
 
-                if (u == 0) continue;
+                if (u == 0) {
+                    continue;
+                }
 
                 // q is a number between 0 and 1
@@ -257 +264 @@
         double llimit = -Math.PI/4;
         double ulimit = Math.PI/4;
-        while (h - align_to > ulimit) h -= Math.PI/2;
-        while (h - align_to < llimit) h += Math.PI/2;
+        while (h - align_to > ulimit) {
+            h -= Math.PI/2;
+        }
+        while (h - align_to < llimit) {
+            h += Math.PI/2;
+        }
 
         return h;