Changeset 1169 in josm for trunk/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java

Timestamp:

2008-12-23T15:07:05+01:00 (16 years ago)

Author:

stoecker

Message:

removed usage of tab stops

File:

• trunk/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java (modified) (1 diff)

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

@@ -26 +26 @@
 
 public class JoinNodeWayAction extends JosmAction {
-        public JoinNodeWayAction() {
-            super(tr("Join node to way"), "joinnodeway", tr("Join a node into the nearest way segments"),
-                        Shortcut.registerShortcut("tools:joinnodeway", tr("Tool: {0}", tr("Join node to way")), KeyEvent.VK_J, Shortcut.GROUP_EDIT), true);
-        }
+    public JoinNodeWayAction() {
+        super(tr("Join node to way"), "joinnodeway", tr("Join a node into the nearest way segments"),
+            Shortcut.registerShortcut("tools:joinnodeway", tr("Tool: {0}", tr("Join node to way")), KeyEvent.VK_J, Shortcut.GROUP_EDIT), true);
+    }
 
-        public void actionPerformed(ActionEvent e) {
-                Collection<OsmPrimitive> sel = Main.ds.getSelected();
-                if (sel.size() != 1 || !(sel.iterator().next() instanceof Node)) return;
-                Node node = (Node) sel.iterator().next();
+    public void actionPerformed(ActionEvent e) {
+        Collection<OsmPrimitive> sel = Main.ds.getSelected();
+        if (sel.size() != 1 || !(sel.iterator().next() instanceof Node)) return;
+        Node node = (Node) sel.iterator().next();
 
-                List<WaySegment> wss = Main.map.mapView.getNearestWaySegments(
-                        Main.map.mapView.getPoint(node.eastNorth));
-                HashMap<Way, List<Integer>> insertPoints = new HashMap<Way, List<Integer>>();
-                for (WaySegment ws : wss) {
-                        List<Integer> is;
-                        if (insertPoints.containsKey(ws.way)) {
-                                is = insertPoints.get(ws.way);
-                        } else {
-                                is = new ArrayList<Integer>();
-                                insertPoints.put(ws.way, is);
-                        }
+        List<WaySegment> wss = Main.map.mapView.getNearestWaySegments(
+            Main.map.mapView.getPoint(node.eastNorth));
+        HashMap<Way, List<Integer>> insertPoints = new HashMap<Way, List<Integer>>();
+        for (WaySegment ws : wss) {
+            List<Integer> is;
+            if (insertPoints.containsKey(ws.way)) {
+                is = insertPoints.get(ws.way);
+            } else {
+                is = new ArrayList<Integer>();
+                insertPoints.put(ws.way, is);
+            }
 
-                        if (ws.way.nodes.get(ws.lowerIndex) != node
-                                        && ws.way.nodes.get(ws.lowerIndex+1) != node) {
-                                is.add(ws.lowerIndex);
-                        }
-                }
+            if (ws.way.nodes.get(ws.lowerIndex) != node
+                    && ws.way.nodes.get(ws.lowerIndex+1) != node) {
+                is.add(ws.lowerIndex);
+            }
+        }
 
-                Collection<Command> cmds = new LinkedList<Command>();
-                for (Map.Entry<Way, List<Integer>> insertPoint : insertPoints.entrySet()) {
-                        Way w = insertPoint.getKey();
-                        Way wnew = new Way(w);
-                        List<Integer> is = insertPoint.getValue();
-                        pruneSuccsAndReverse(is);
-                        for (int i : is) wnew.nodes.add(i+1, node);
-                        cmds.add(new ChangeCommand(w, wnew));
-                }
+        Collection<Command> cmds = new LinkedList<Command>();
+        for (Map.Entry<Way, List<Integer>> insertPoint : insertPoints.entrySet()) {
+            Way w = insertPoint.getKey();
+            Way wnew = new Way(w);
+            List<Integer> is = insertPoint.getValue();
+            pruneSuccsAndReverse(is);
+            for (int i : is) wnew.nodes.add(i+1, node);
+            cmds.add(new ChangeCommand(w, wnew));
+        }
 
-                Main.main.undoRedo.add(new SequenceCommand(tr("Join Node and Line"), cmds));
-                Main.map.repaint();
-        }
+        Main.main.undoRedo.add(new SequenceCommand(tr("Join Node and Line"), cmds));
+        Main.map.repaint();
+    }
 
-        private static void pruneSuccsAndReverse(List<Integer> is) {
-                //if (is.size() < 2) return;
+    private static void pruneSuccsAndReverse(List<Integer> is) {
+        //if (is.size() < 2) return;
 
-                HashSet<Integer> is2 = new HashSet<Integer>();
-                for (int i : is) {
-                        if (!is2.contains(i - 1) && !is2.contains(i + 1)) {
-                                is2.add(i);
-                        }
-                }
-                is.clear();
-                is.addAll(is2);
-                Collections.sort(is);
-                Collections.reverse(is);
-        }
+        HashSet<Integer> is2 = new HashSet<Integer>();
+        for (int i : is) {
+            if (!is2.contains(i - 1) && !is2.contains(i + 1)) {
+                is2.add(i);
+            }
+        }
+        is.clear();
+        is.addAll(is2);
+        Collections.sort(is);
+        Collections.reverse(is);
+    }
 }