Changeset 1814 in josm for trunk/src/org/openstreetmap/josm/actions/AlignInLineAction.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/AlignInLineAction.java (modified) (4 diffs)

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

@@ -31 +31 @@
     public AlignInLineAction() {
         super(tr("Align Nodes in Line"), "alignline", tr("Move the selected nodes in to a line."),
-        Shortcut.registerShortcut("tools:alignline", tr("Tool: {0}", tr("Align Nodes in Line")), KeyEvent.VK_L, Shortcut.GROUP_EDIT), true);
+                Shortcut.registerShortcut("tools:alignline", tr("Tool: {0}", tr("Align Nodes in Line")), KeyEvent.VK_L, Shortcut.GROUP_EDIT), true);
     }
 
@@ -40 +40 @@
      */
     public void actionPerformed(ActionEvent e) {
-        Collection<OsmPrimitive> sel = Main.ds.getSelected();
+        Collection<OsmPrimitive> sel = getCurrentDataSet().getSelected();
         Collection<Node> nodes = new LinkedList<Node>();
         Collection<Node> itnodes = new LinkedList<Node>();
@@ -50 +50 @@
         // special case if no single nodes are selected and exactly one way is:
         // then use the way's nodes
-        if ((nodes.size() == 0) && (sel.size() == 1))
+        if ((nodes.size() == 0) && (sel.size() == 1)) {
             for (OsmPrimitive osm : sel)
                 if (osm instanceof Way) {
@@ -56 +56 @@
                     itnodes.addAll(((Way)osm).nodes);
                 }
+        }
         if (nodes.size() < 3) {
             JOptionPane.showMessageDialog(Main.parent, tr("Please select at least three nodes."));