Changeset 1814 in josm for trunk/src/org/openstreetmap/josm/actions

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

Location:

trunk/src/org/openstreetmap/josm/actions

Files:

• AbstractInfoAction.java (modified) (1 diff)
• AddNodeAction.java (modified) (1 diff)
• AlignInCircleAction.java (modified) (1 diff)
• AlignInLineAction.java (modified) (4 diffs)
• ApiPreconditionChecker.java (modified) (2 diffs)
• AutoScaleAction.java (modified) (1 diff)
• CombineWayAction.java (modified) (10 diffs)
• CopyAction.java (modified) (8 diffs)
• CreateCircleAction.java (modified) (2 diffs)
• DistributeAction.java (modified) (4 diffs)
• DuplicateAction.java (modified) (1 diff)
• GpxExportAction.java (modified) (3 diffs)
• JoinNodeWayAction.java (modified) (2 diffs)
• JosmAction.java (modified) (3 diffs)
• MergeNodesAction.java (modified) (12 diffs)
• MirrorAction.java (modified) (3 diffs)
• MoveAction.java (modified) (1 diff)
• OrthogonalizeAction.java (modified) (8 diffs)
• PasteAction.java (modified) (5 diffs)
• PasteTagsAction.java (modified) (5 diffs)
• ReverseWayAction.java (modified) (4 diffs)
• SaveActionBase.java (modified) (1 diff)
• SelectAllAction.java (modified) (3 diffs)
• SplitWayAction.java (modified) (5 diffs)
• UnGlueAction.java (modified) (14 diffs)
• UnselectAllAction.java (modified) (2 diffs)
• UpdateDataAction.java (modified) (3 diffs)
• UpdateSelectionAction.java (modified) (3 diffs)
• UploadAction.java (modified) (3 diffs)
• mapmode/DeleteAction.java (modified) (3 diffs)
• mapmode/DrawAction.java (modified) (24 diffs)
• mapmode/ExtrudeAction.java (modified) (5 diffs)
• mapmode/SelectAction.java (modified) (9 diffs)
• mapmode/ZoomAction.java (modified) (3 diffs)
• search/SearchAction.java (modified) (3 diffs)
• search/SearchCompiler.java (modified) (19 diffs)
• search/SelectionWebsiteLoader.java (modified) (3 diffs)

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

@@ -46 +46 @@
 
     protected void launchBrowser() {
-        ArrayList<OsmPrimitive> primitivesToShow = new ArrayList<OsmPrimitive>(Main.ds.getSelected());
+        ArrayList<OsmPrimitive> primitivesToShow = new ArrayList<OsmPrimitive>(getCurrentDataSet().getSelected());
 
         // filter out new primitives which are not yet uploaded to the server

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

@@ -79 +79 @@
         /* Now execute the commands to add the dupicated contents of the paste buffer to the map */
         Main.main.undoRedo.add(new AddCommand(nnew));
-        Main.ds.setSelected(nnew);
+        getCurrentDataSet().setSelected(nnew);
         Main.map.mapView.repaint();
     }

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

@@ -79 +79 @@
 
     public void actionPerformed(ActionEvent e) {
-        Collection<OsmPrimitive> sel = Main.ds.getSelected();
+        Collection<OsmPrimitive> sel = getCurrentDataSet().getSelected();
         Collection<Node> nodes = new LinkedList<Node>();
         Collection<Way> ways = new LinkedList<Way>();

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."));

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

@@ -100 +100 @@
                     List<OsmPrimitive> newNodes = new LinkedList<OsmPrimitive>();
                     newNodes.add(osmPrimitive);
-                    Main.ds.setSelected(newNodes);
+                    Main.main.getCurrentDataSet().setSelected(newNodes);
                     return false;
                 }
@@ -120 +120 @@
                 newNodes.add(osmPrimitive);
 
-                Main.ds.setSelected(newNodes);
+                Main.main.getCurrentDataSet().setSelected(newNodes);
                 return false;
             }

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

@@ -79 +79 @@
             Collection<OsmPrimitive> sel = new HashSet<OsmPrimitive>();
             if (mode.equals("selection")) {
-                sel = Main.ds.getSelected();
+                sel = getCurrentDataSet().getSelected();
             } else if (mode.equals("conflict")) {
                 if (Main.map.conflictDialog.getConflicts() != null) {

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

@@ -52 +52 @@
     public CombineWayAction() {
         super(tr("Combine Way"), "combineway", tr("Combine several ways into one."),
-        Shortcut.registerShortcut("tools:combineway", tr("Tool: {0}", tr("Combine Way")), KeyEvent.VK_C, Shortcut.GROUP_EDIT), true);
+                Shortcut.registerShortcut("tools:combineway", tr("Tool: {0}", tr("Combine Way")), KeyEvent.VK_C, Shortcut.GROUP_EDIT), true);
         DataSet.selListeners.add(this);
     }
 
     public void actionPerformed(ActionEvent event) {
-        Collection<OsmPrimitive> selection = Main.ds.getSelected();
+        Collection<OsmPrimitive> selection = getCurrentDataSet().getSelected();
         LinkedList<Way> selectedWays = new LinkedList<Way>();
 
         for (OsmPrimitive osm : selection)
-            if (osm instanceof Way)
+            if (osm instanceof Way) {
                 selectedWays.add((Way)osm);
+            }
 
         if (selectedWays.size() < 2) {
@@ -82 +83 @@
             new HashMap<Pair<Relation,String>, HashSet<Way>>();
         HashSet<Relation> relationsUsingWays = new HashSet<Relation>();
-        for (Relation r : Main.ds.relations) {
-            if (r.deleted || r.incomplete) continue;
+        for (Relation r : getCurrentDataSet().relations) {
+            if (r.deleted || r.incomplete) {
+                continue;
+            }
             for (RelationMember rm : r.members) {
                 if (rm.member instanceof Way) {
@@ -112 +115 @@
                         tr("Combine ways with different memberships?"),
                         tr("The selected ways have differing relation memberships.  "
-                            + "Do you still want to combine them?"),
-                        new String[] {tr("Combine Anyway"), tr("Cancel")},
-                        new String[] {"combineway.png", "cancel.png"}).getValue();
-                if (option == 1) break;
+                                + "Do you still want to combine them?"),
+                                new String[] {tr("Combine Anyway"), tr("Cancel")},
+                                new String[] {"combineway.png", "cancel.png"}).getValue();
+                if (option == 1) {
+                    break;
+                }
 
                 return;
@@ -125 +130 @@
         for (Way w : selectedWays) {
             for (Entry<String,String> e : w.entrySet()) {
-                if (!props.containsKey(e.getKey()))
+                if (!props.containsKey(e.getKey())) {
                     props.put(e.getKey(), new TreeSet<String>());
+                }
                 props.get(e.getKey()).add(e.getValue());
             }
@@ -139 +145 @@
             if (secondTry instanceof List) {
                 int option = new ExtendedDialog(Main.parent,
-                    tr("Change directions?"),
-                    tr("The ways can not be combined in their current directions.  "
-                        + "Do you want to reverse some of them?"),
-                    new String[] {tr("Reverse and Combine"), tr("Cancel")},
-                    new String[] {"wayflip.png", "cancel.png"}).getValue();
+                        tr("Change directions?"),
+                        tr("The ways can not be combined in their current directions.  "
+                                + "Do you want to reverse some of them?"),
+                                new String[] {tr("Reverse and Combine"), tr("Cancel")},
+                                new String[] {"wayflip.png", "cancel.png"}).getValue();
                 if (option != 1) return;
                 nodeList = (List<Node>) secondTry;
@@ -160 +166 @@
         for (Way w : selectedWays) {
             modifyWay = w;
-            if (w.id != 0) break;
+            if (w.id != 0) {
+                break;
+            }
         }
         Way newWay = new Way(modifyWay);
@@ -188 +196 @@
         if (!components.isEmpty()) {
             int answer = new ExtendedDialog(Main.parent,
-                tr("Enter values for all conflicts."),
-                p,
-                new String[] {tr("Solve Conflicts"), tr("Cancel")},
-                new String[] {"dialogs/conflict.png", "cancel.png"}).getValue();
+                    tr("Enter values for all conflicts."),
+                    p,
+                    new String[] {tr("Solve Conflicts"), tr("Cancel")},
+                    new String[] {"dialogs/conflict.png", "cancel.png"}).getValue();
             if (answer != 1) return;
 
-            for (Entry<String, JComboBox> e : components.entrySet())
+            for (Entry<String, JComboBox> e : components.entrySet()) {
                 newWay.put(e.getKey(), e.getValue().getEditor().getItem().toString());
+            }
         }
 
@@ -224 +233 @@
         }
         Main.main.undoRedo.add(new SequenceCommand(tr("Combine {0} ways", selectedWays.size()), cmds));
-        Main.ds.setSelected(modifyWay);
+        getCurrentDataSet().setSelected(modifyWay);
     }
 
@@ -242 +251 @@
 
         HashSet<Pair<Node,Node>> chunkSet = new HashSet<Pair<Node,Node>>();
-        for (Way w : ways)
+        for (Way w : ways) {
             chunkSet.addAll(w.getNodePairs(ignoreDirection));
+        }
 
         LinkedList<Pair<Node,Node>> chunks = new LinkedList<Pair<Node,Node>>(chunkSet);
 
-        if (chunks.isEmpty()) {
+        if (chunks.isEmpty())
             return tr("All the ways were empty");
-        }
 
         List<Node> nodeList = Pair.toArrayList(chunks.poll());
@@ -273 +282 @@
                 break;
             }
-            if (!foundChunk) break;
-        }
-
-        if (!chunks.isEmpty()) {
+            if (!foundChunk) {
+                break;
+            }
+        }
+
+        if (!chunks.isEmpty())
             return tr("Could not combine ways "
-                + "(They could not be merged into a single string of nodes)");
-        }
+                    + "(They could not be merged into a single string of nodes)");
 
         return nodeList;

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

@@ -45 +45 @@
 
     public void actionPerformed(ActionEvent e) {
-        if(noSelection()) return;
+        if(isEmptySelection()) return;
 
         Main.pasteBuffer = copyData();
-        Main.pasteSource = Main.main.createOrGetEditLayer();
+        Main.pasteSource = getEditLayer();
         Main.main.menu.paste.setEnabled(true); /* now we have a paste buffer we can make paste available */
 
@@ -56 +56 @@
     }
 
-    public static DataSet copyData() {
+    public DataSet copyData() {
         /* New pasteBuffer - will be assigned to the global one at the end */
         final DataSet pasteBuffer = new DataSet();
@@ -62 +62 @@
         /* temporarily maps old nodes to new so we can do a true deep copy */
 
-        if(noSelection()) return pasteBuffer;
+        if(isEmptySelection()) return pasteBuffer;
 
         /* scan the selected objects, mapping them to copies; when copying a way or relation,
@@ -71 +71 @@
                  * or a way and a node in that way is selected, we'll see it twice, once via the
                  * way and once directly; and so on. */
-                if (map.containsKey(n)) { return; }
+                if (map.containsKey(n))
+                    return;
                 Node nnew = new Node(n);
                 map.put(n, nnew);
@@ -78 +79 @@
             public void visit(Way w) {
                 /* check if already in pasteBuffer - could have come from a relation, and directly etc. */
-                if (map.containsKey(w)) { return; }
+                if (map.containsKey(w))
+                    return;
                 Way wnew = new Way();
                 wnew.cloneFrom(w);
@@ -93 +95 @@
             }
             public void visit(Relation e) {
-                if (map.containsKey(e)) { return; }
+                if (map.containsKey(e))
+                    return;
                 Relation enew = new Relation(e);
                 List<RelationMember> members = new ArrayList<RelationMember>();
@@ -108 +111 @@
             }
             public void visitAll() {
-                for (OsmPrimitive osm : Main.ds.getSelected())
+                for (OsmPrimitive osm : getCurrentDataSet().getSelected()) {
                     osm.visit(this);
+                }
 
                 // Used internally only (in PasteTagsAction), therefore no need to translate these
-                if(Main.ds.getSelectedNodes().size() > 0)
+                if(getCurrentDataSet().getSelectedNodes().size() > 0) {
                     pasteBuffer.dataSources.add(new DataSource(null, "Copied Nodes"));
-                if(Main.ds.getSelectedWays().size() > 0)
+                }
+                if(getCurrentDataSet().getSelectedWays().size() > 0) {
                     pasteBuffer.dataSources.add(new DataSource(null, "Copied Ways"));
-                if(Main.ds.getSelectedRelations().size() > 0)
+                }
+                if(getCurrentDataSet().getSelectedRelations().size() > 0) {
                     pasteBuffer.dataSources.add(new DataSource(null, "Copied Relations"));
+                }
             }
         }.visitAll();
@@ -128 +135 @@
     }
 
-    private static boolean noSelection() {
-        Collection<OsmPrimitive> sel = Main.ds.getSelected();
+    private boolean isEmptySelection() {
+        Collection<OsmPrimitive> sel = getCurrentDataSet().getSelected();
         if (sel.isEmpty()) {
-            JOptionPane.showMessageDialog(Main.parent,
-                    tr("Please select something to copy."));
+            JOptionPane.showMessageDialog(
+                    Main.parent,
+                    tr("Please select something to copy.")
+            );
             return true;
         }

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

@@ -80 +80 @@
         }
 
-        Collection<OsmPrimitive> sel = Main.ds.getSelected();
+        Collection<OsmPrimitive> sel = getCurrentDataSet().getSelected();
         Collection<Node> nodes = new LinkedList<Node>();
         Way existingWay = null;
@@ -170 +170 @@
             if (a1 < 999) {
                 // if it is, delete it
-                CollectBackReferencesVisitor refs = new CollectBackReferencesVisitor(Main.ds);
+                CollectBackReferencesVisitor refs = new CollectBackReferencesVisitor(getCurrentDataSet());
                 refs.visit(n1);
                 if (refs.data.isEmpty() || ((refs.data.size() == 1) && (refs.data.contains(existingWay)))) {

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

@@ -29 +29 @@
     public DistributeAction() {
         super(tr("Distribute Nodes"), "distribute", tr("Distribute the selected nodes to equal distances along a line."),
-        Shortcut.registerShortcut("tools:distribute", tr("Tool: {0}", tr("Distribute Nodes")), KeyEvent.VK_B, Shortcut.GROUP_EDIT), true);
+                Shortcut.registerShortcut("tools:distribute", tr("Tool: {0}", tr("Distribute Nodes")), KeyEvent.VK_B, Shortcut.GROUP_EDIT), true);
     }
 
@@ -38 +38 @@
      */
     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>();
@@ -48 +48 @@
         // 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) {
@@ -54 +54 @@
                     itnodes.addAll(((Way)osm).nodes);
                 }
+        }
 
         if (nodes.size() < 3) {

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

@@ -9 +9 @@
 import java.util.Collection;
 
-import org.openstreetmap.josm.actions.CopyAction;
-import org.openstreetmap.josm.actions.PasteAction;
 import org.openstreetmap.josm.data.SelectionChangedListener;
 import org.openstreetmap.josm.data.osm.DataSet;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
+import org.openstreetmap.josm.gui.layer.Layer;
+import org.openstreetmap.josm.gui.layer.Layer.LayerChangeListener;
 import org.openstreetmap.josm.tools.Shortcut;
-import org.openstreetmap.josm.Main;
 
-public final class DuplicateAction extends JosmAction implements SelectionChangedListener {
+public final class DuplicateAction extends JosmAction implements SelectionChangedListener, LayerChangeListener {
 
     public DuplicateAction() {
         super(tr("Duplicate"), "duplicate",
-            tr("Duplicate selection by copy and immediate paste."),
-            Shortcut.registerShortcut("system:duplicate", tr("Edit: {0}", tr("Duplicate")), KeyEvent.VK_D, Shortcut.GROUP_MENU), true);
+                tr("Duplicate selection by copy and immediate paste."),
+                Shortcut.registerShortcut("system:duplicate", tr("Edit: {0}", tr("Duplicate")), KeyEvent.VK_D, Shortcut.GROUP_MENU), true);
         setEnabled(false);
         DataSet.selListeners.add(this);
+        Layer.listeners.add(this);
     }
 
     public void actionPerformed(ActionEvent e) {
-        PasteAction.pasteData(CopyAction.copyData(), Main.main.createOrGetEditLayer(), e);
+        new PasteAction().pasteData(new CopyAction().copyData(), getEditLayer(), e);
     }
 
+
+    protected void refreshEnabled() {
+        setEnabled(getCurrentDataSet() != null
+                && ! getCurrentDataSet().getSelected().isEmpty()
+        );
+    }
+
+    /* ---------------------------------------------------------------------------------- */
+    /* Interface SelectionChangeListener                                                  */
+    /* ---------------------------------------------------------------------------------- */
     public void selectionChanged(Collection<? extends OsmPrimitive> newSelection) {
-        setEnabled(! newSelection.isEmpty());
+        refreshEnabled();
+    }
+
+    /* ---------------------------------------------------------------------------------- */
+    /* Interface LayerChangeListener                                                      */
+    /* ---------------------------------------------------------------------------------- */
+    public void activeLayerChange(Layer oldLayer, Layer newLayer) {
+        refreshEnabled();
+    }
+
+    public void layerAdded(Layer newLayer) {
+        refreshEnabled();
+    }
+
+    public void layerRemoved(Layer oldLayer) {
+        refreshEnabled();
     }
 }

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

@@ -84 +84 @@
     public void export(Layer layer) {
         if (layer == null)
-            throw new IllegalArgumentException(tr("paramenter ''{0'' must not be null", "layer"));
+            throw new IllegalArgumentException(tr("paramenter ''{0}'' must not be null", "layer"));
         if (! (layer instanceof OsmDataLayer) && ! (layer instanceof GpxLayer))
             throw new IllegalArgumentException(tr("expected instance of OsmDataLayer or GpxLayer. Got ''{0}''.", layer.getClass().getName()));
@@ -98 +98 @@
     }
 
-    public static void exportGpx(File file, Layer layer) {
+    /**
+     * Exports a layer to a file.
+     * 
+     * <code>layer</code> must not be null. <code>layer</code> must be an instance of
+     * {@see OsmDataLayer} or {@see GpxLayer}.
+     * 
+     * @param layer the layer
+     * @exception IllegalArgumentException thrown if layer is null
+     * @exception IllegalArgumentException thrown if layer is neither an instance of {@see OsmDataLayer}
+     *  nor of {@see GpxLayer}
+     */
+
+    public void exportGpx(File file, Layer layer) {
+        if (layer == null)
+            throw new IllegalArgumentException(tr("paramenter ''{0}'' must not be null", "layer"));
+        if (! (layer instanceof OsmDataLayer) && ! (layer instanceof GpxLayer))
+            throw new IllegalArgumentException(tr("expected instance of OsmDataLayer or GpxLayer. Got ''{0}''.", layer.getClass().getName()));
+        if (file == null)
+            throw new IllegalArgumentException(tr("paramenter ''{0}'' must not be null", "file"));
+
         String fn = file.getPath();
         if (fn.indexOf('.') == -1) {
@@ -172 +191 @@
             gpxData = ((GpxLayer)layer).data;
         } else {
-            gpxData = OsmDataLayer.toGpxData(Main.ds, file);
+            gpxData = OsmDataLayer.toGpxData(getCurrentDataSet(), file);
         }
 

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

@@ -28 +28 @@
     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);
+                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();
+        Collection<OsmPrimitive> sel = getCurrentDataSet().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));
+                Main.map.mapView.getPoint(node));
         HashMap<Way, List<Integer>> insertPoints = new HashMap<Way, List<Integer>>();
         for (WaySegment ws : wss) {
@@ -60 +60 @@
             List<Integer> is = insertPoint.getValue();
             pruneSuccsAndReverse(is);
-            for (int i : is) wnew.nodes.add(i+1, node);
+            for (int i : is) {
+                wnew.nodes.add(i+1, node);
+            }
             cmds.add(new ChangeCommand(w, wnew));
         }

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

@@ -9 +9 @@
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.osm.DataSet;
+import org.openstreetmap.josm.gui.layer.OsmDataLayer;
 import org.openstreetmap.josm.tools.Destroyable;
 import org.openstreetmap.josm.tools.ImageProvider;
@@ -61 +62 @@
         putValue(SHORT_DESCRIPTION, Main.platform.makeTooltip(tooltip, sc));
         putValue("toolbar", iconName);
-        if (register)
+        if (register) {
             Main.toolbar.register(this);
+        }
     }
 
@@ -92 +94 @@
     private void setHelpId() {
         String helpId = "Action/"+getClass().getName().substring(getClass().getName().lastIndexOf('.')+1);
-        if (helpId.endsWith("Action"))
+        if (helpId.endsWith("Action")) {
             helpId = helpId.substring(0, helpId.length()-6);
+        }
         putValue("help", helpId);
     }
+
+    /**
+     * Replies the current edit layer
+     * 
+     * @return the current edit layer. null, if no edit layer exists
+     */
+    protected OsmDataLayer getEditLayer() {
+        return Main.main.getEditLayer();
+    }
+
+    /**
+     * Replies the current dataset
+     * 
+     * @return the current dataset. null, if no current dataset exists
+     */
+    protected DataSet getCurrentDataSet() {
+        return Main.main.getCurrentDataSet();
+    }
 }

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

@@ -55 +55 @@
     public MergeNodesAction() {
         super(tr("Merge Nodes"), "mergenodes", tr("Merge nodes into the oldest one."),
-        Shortcut.registerShortcut("tools:mergenodes", tr("Tool: {0}", tr("Merge Nodes")), KeyEvent.VK_M, Shortcut.GROUP_EDIT), true);
+                Shortcut.registerShortcut("tools:mergenodes", tr("Tool: {0}", tr("Merge Nodes")), KeyEvent.VK_M, Shortcut.GROUP_EDIT), true);
         DataSet.selListeners.add(this);
     }
 
     public void actionPerformed(ActionEvent event) {
-        Collection<OsmPrimitive> selection = Main.ds.getSelected();
+        Collection<OsmPrimitive> selection = getCurrentDataSet().getSelected();
         LinkedList<Node> selectedNodes = new LinkedList<Node>();
 
@@ -67 +67 @@
         // anyway as long as we have at least two nodes
         for (OsmPrimitive osm : selection)
-            if (osm instanceof Node)
+            if (osm instanceof Node) {
                 selectedNodes.add((Node)osm);
+            }
 
         if (selectedNodes.size() < 2) {
@@ -93 +94 @@
             }
         }
-        if (useNode == null)
+        if (useNode == null) {
             useNode = selectedNodes.iterator().next();
+        }
 
         mergeNodes(selectedNodes, useNode);
@@ -102 +104 @@
      * really do the merging - returns the node that is left
      */
-    public static Node mergeNodes(LinkedList<Node> allNodes, Node dest) {
+    public Node mergeNodes(LinkedList<Node> allNodes, Node dest) {
         Node newNode = new Node(dest);
 
@@ -118 +120 @@
             new HashMap<Pair<Relation,String>, HashSet<Node>>();
         HashSet<Relation> relationsUsingNodes = new HashSet<Relation>();
-        for (Relation r : Main.ds.relations) {
-            if (r.deleted || r.incomplete) continue;
+        for (Relation r : getCurrentDataSet().relations) {
+            if (r.deleted || r.incomplete) {
+                continue;
+            }
             for (RelationMember rm : r.members) {
                 if (rm.member instanceof Node) {
@@ -148 +152 @@
                         tr("Merge nodes with different memberships?"),
                         tr("The selected nodes have differing relation memberships.  "
-                            + "Do you still want to merge them?"),
-                        new String[] {tr("Merge Anyway"), tr("Cancel")},
-                        new String[] {"mergenodes.png", "cancel.png"}).getValue();
-                if (option == 1) break;
+                                + "Do you still want to merge them?"),
+                                new String[] {tr("Merge Anyway"), tr("Cancel")},
+                                new String[] {"mergenodes.png", "cancel.png"}).getValue();
+                if (option == 1) {
+                    break;
+                }
                 return null;
             }
@@ -160 +166 @@
         for (Node n : allNodes) {
             for (Entry<String,String> e : n.entrySet()) {
-                if (!props.containsKey(e.getKey()))
+                if (!props.containsKey(e.getKey())) {
                     props.put(e.getKey(), new TreeSet<String>());
+                }
                 props.get(e.getKey()).add(e.getValue());
             }
@@ -187 +194 @@
         if (!components.isEmpty()) {
             int answer = new ExtendedDialog(Main.parent,
-                tr("Enter values for all conflicts."),
-                p,
-                new String[] {tr("Solve Conflicts"), tr("Cancel")},
-                new String[] {"dialogs/conflict.png", "cancel.png"}).getValue();
+                    tr("Enter values for all conflicts."),
+                    p,
+                    new String[] {tr("Solve Conflicts"), tr("Cancel")},
+                    new String[] {"dialogs/conflict.png", "cancel.png"}).getValue();
             if (answer != 1)
                 return null;
-            for (Entry<String, JComboBox> e : components.entrySet())
+            for (Entry<String, JComboBox> e : components.entrySet()) {
                 newNode.put(e.getKey(), e.getValue().getEditor().getItem().toString());
+            }
         }
 
@@ -202 +210 @@
         Collection<OsmPrimitive> del = new HashSet<OsmPrimitive>();
 
-        for (Way w : Main.ds.ways) {
-            if (w.deleted || w.incomplete || w.nodes.size() < 1) continue;
+        for (Way w : getCurrentDataSet().ways) {
+            if (w.deleted || w.incomplete || w.nodes.size() < 1) {
+                continue;
+            }
             boolean modify = false;
             for (Node sn : allNodes) {
-                if (sn == dest) continue;
+                if (sn == dest) {
+                    continue;
+                }
                 if (w.nodes.contains(sn)) {
                     modify = true;
                 }
             }
-            if (!modify) continue;
+            if (!modify) {
+                continue;
+            }
             // OK - this way contains one or more nodes to change
             ArrayList<Node> nn = new ArrayList<Node>();
@@ -227 +241 @@
             if (nn.size() < 2) {
                 CollectBackReferencesVisitor backRefs =
-                    new CollectBackReferencesVisitor(Main.ds, false);
+                    new CollectBackReferencesVisitor(getCurrentDataSet(), false);
                 w.visit(backRefs);
                 if (!backRefs.data.isEmpty()) {
                     JOptionPane.showMessageDialog(Main.parent,
-                        tr("Cannot merge nodes: " +
+                            tr("Cannot merge nodes: " +
                             "Would have to delete a way that is still used."));
                     return null;
@@ -247 +261 @@
         del.addAll(allNodes);
         del.remove(dest);
-        if (!del.isEmpty()) cmds.add(new DeleteCommand(del));
+        if (!del.isEmpty()) {
+            cmds.add(new DeleteCommand(del));
+        }
 
         // modify all relations containing the now-deleted nodes
@@ -270 +286 @@
 
         Main.main.undoRedo.add(new SequenceCommand(tr("Merge {0} nodes", allNodes.size()), cmds));
-        Main.ds.setSelected(dest);
+        getCurrentDataSet().setSelected(dest);
 
         return dest;

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

@@ -14 +14 @@
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.command.Command;
-import org.openstreetmap.josm.command.ChangeCommand;
 import org.openstreetmap.josm.command.MoveCommand;
 import org.openstreetmap.josm.command.SequenceCommand;
-import org.openstreetmap.josm.data.coor.EastNorth;
 import org.openstreetmap.josm.data.osm.Node;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
@@ -34 +32 @@
     public MirrorAction() {
         super(tr("Mirror"), "mirror", tr("Mirror selected nodes and ways."),
-        Shortcut.registerShortcut("tools:mirror", tr("Tool: {0}", tr("Mirror")),
-            KeyEvent.VK_M, Shortcut.GROUP_EDIT, Shortcut.SHIFT_DEFAULT), true);
+                Shortcut.registerShortcut("tools:mirror", tr("Tool: {0}", tr("Mirror")),
+                        KeyEvent.VK_M, Shortcut.GROUP_EDIT, Shortcut.SHIFT_DEFAULT), true);
     }
 
     public void actionPerformed(ActionEvent e) {
-        Collection<OsmPrimitive> sel = Main.ds.getSelected();
+        Collection<OsmPrimitive> sel = getCurrentDataSet().getSelected();
         HashSet<Node> nodes = new HashSet<Node>();
 
@@ -66 +64 @@
         Collection<Command> cmds = new LinkedList<Command>();
 
-        for (Node n : nodes)
+        for (Node n : nodes) {
             cmds.add(new MoveCommand(n, 2 * (middle - n.getEastNorth().east()), 0.0));
+        }
 
         Main.main.undoRedo.add(new SequenceCommand(tr("Mirror"), cmds));

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

@@ -85 +85 @@
         }
 
-        Collection<OsmPrimitive> selection = Main.ds.getSelected();
+        Collection<OsmPrimitive> selection = getCurrentDataSet().getSelected();
         Collection<Node> affectedNodes = AllNodesVisitor.getAllNodes(selection);
 

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;

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

@@ -31 +31 @@
     public PasteAction() {
         super(tr("Paste"), "paste", tr("Paste contents of paste buffer."),
-            Shortcut.registerShortcut("system:paste", tr("Edit: {0}", tr("Paste")), KeyEvent.VK_V, Shortcut.GROUP_MENU), true);
+                Shortcut.registerShortcut("system:paste", tr("Edit: {0}", tr("Paste")), KeyEvent.VK_V, Shortcut.GROUP_MENU), true);
         setEnabled(false);
     }
@@ -39 +39 @@
     }
 
-    public static void pasteData(DataSet pasteBuffer, Layer source, ActionEvent e) {
+    public  void pasteData(DataSet pasteBuffer, Layer source, ActionEvent e) {
         /* Find the middle of the pasteBuffer area */
         double maxEast = -1E100, minEast = 1E100, maxNorth = -1E100, minNorth = 1E100;
@@ -63 +63 @@
 
         HashMap<OsmPrimitive,OsmPrimitive> map = new HashMap<OsmPrimitive,OsmPrimitive>();
-          /* temporarily maps old nodes to new so we can do a true deep copy */
+        /* temporarily maps old nodes to new so we can do a true deep copy */
 
         /* do the deep copy of the paste buffer contents, leaving the pasteBuffer unchanged */
@@ -69 +69 @@
             Node nnew = new Node(n);
             nnew.id = 0;
-            if (Main.main.createOrGetEditLayer() == source) {
+            if (Main.map.mapView.getEditLayer() == source) {
                 nnew.setEastNorth(nnew.getEastNorth().add(offsetEast, offsetNorth));
             }
@@ -113 +113 @@
 
         Main.main.undoRedo.add(new SequenceCommand(tr("Paste"), clist));
-        Main.ds.setSelected(osms);
+        getCurrentDataSet().setSelected(osms);
         Main.map.mapView.repaint();
     }

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

@@ -27 +27 @@
     public PasteTagsAction(JosmAction copyAction) {
         super(tr("Paste Tags"), "pastetags",
-            tr("Apply tags of contents of paste buffer to all selected items."),
-            Shortcut.registerShortcut("system:pastestyle", tr("Edit: {0}", tr("Paste Tags")), KeyEvent.VK_V, Shortcut.GROUP_MENU, Shortcut.SHIFT_DEFAULT), true);
+                tr("Apply tags of contents of paste buffer to all selected items."),
+                Shortcut.registerShortcut("system:pastestyle", tr("Edit: {0}", tr("Paste Tags")), KeyEvent.VK_V, Shortcut.GROUP_MENU, Shortcut.SHIFT_DEFAULT), true);
         DataSet.selListeners.add(this);
         copyAction.addListener(this);
@@ -43 +43 @@
             OsmPrimitive osm = it.next();
             Map<String, String> m = osm.keys;
-            if(m == null)
+            if(m == null) {
                 continue;
+            }
 
             for (String key : m.keySet()) {
@@ -55 +56 @@
         Collection<Command> clist = new LinkedList<Command>();
         String pbSource = "Multiple Sources";
-        if(Main.pasteBuffer.dataSources.size() == 1)
+        if(Main.pasteBuffer.dataSources.size() == 1) {
             pbSource = ((DataSource) Main.pasteBuffer.dataSources.toArray()[0]).origin;
+        }
 
         boolean pbNodes = Main.pasteBuffer.nodes.size() > 0;
         boolean pbWays  = Main.pasteBuffer.ways.size() > 0;
 
-        boolean seNodes = Main.ds.getSelectedNodes().size() > 0;
-        boolean seWays  = Main.ds.getSelectedWays().size() > 0;
-        boolean seRels  = Main.ds.getSelectedRelations().size() > 0;
+        boolean seNodes = getCurrentDataSet().getSelectedNodes().size() > 0;
+        boolean seWays  = getCurrentDataSet().getSelectedWays().size() > 0;
+        boolean seRels  = getCurrentDataSet().getSelectedRelations().size() > 0;
 
         if(!seNodes && seWays && !seRels && pbNodes && pbSource.equals("Copied Nodes")) {
             // Copy from nodes to ways
-            pasteKeys(clist, Main.pasteBuffer.nodes, Main.ds.getSelectedWays());
+            pasteKeys(clist, Main.pasteBuffer.nodes, getCurrentDataSet().getSelectedWays());
         } else if(seNodes && !seWays && !seRels && pbWays && pbSource.equals("Copied Ways")) {
             // Copy from ways to nodes
-            pasteKeys(clist, Main.pasteBuffer.ways, Main.ds.getSelectedNodes());
+            pasteKeys(clist, Main.pasteBuffer.ways, getCurrentDataSet().getSelectedNodes());
         } else {
             // Copy from equal to equal
-            pasteKeys(clist, Main.pasteBuffer.nodes, Main.ds.getSelectedNodes());
-            pasteKeys(clist, Main.pasteBuffer.ways, Main.ds.getSelectedWays());
-            pasteKeys(clist, Main.pasteBuffer.relations, Main.ds.getSelectedRelations());
+            pasteKeys(clist, Main.pasteBuffer.nodes, getCurrentDataSet().getSelectedNodes());
+            pasteKeys(clist, Main.pasteBuffer.ways, getCurrentDataSet().getSelectedWays());
+            pasteKeys(clist, Main.pasteBuffer.relations, getCurrentDataSet().getSelectedRelations());
         }
         Main.main.undoRedo.add(new SequenceCommand(tr("Paste Tags"), clist));
-        Main.ds.setSelected(Main.ds.getSelected()); // to force selection listeners, in particular the tag panel, to update
+        getCurrentDataSet().setSelected(getCurrentDataSet().getSelected()); // to force selection listeners, in particular the tag panel, to update
         Main.map.mapView.repaint();
     }
@@ -86 +88 @@
         for (Iterator<? extends OsmPrimitive> it = osms.iterator(); it.hasNext();) {
             OsmPrimitive osm = it.next();
-            if (osm.keys == null || osm.keys.isEmpty())
+            if (osm.keys == null || osm.keys.isEmpty()) {
                 continue;
+            }
             for (String key : osm.keys.keySet()) {
                 String value = osm.keys.get(key);
-                if (! kvSeen.containsKey(key))
+                if (! kvSeen.containsKey(key)) {
                     kvSeen.put(key, value);
-                else if (! kvSeen.get(key).equals(value))
+                } else if (! kvSeen.get(key).equals(value))
                     return true;
             }
@@ -110 +113 @@
                 ! selection.isEmpty() &&
                 ! pasteBuffer.allPrimitives().isEmpty() &&
-                (Main.ds.getSelectedNodes().isEmpty() ||
-                    ! containsSameKeysWithDifferentValues(pasteBuffer.nodes)) &&
-                (Main.ds.getSelectedWays().isEmpty() ||
-                    ! containsSameKeysWithDifferentValues(pasteBuffer.ways)) &&
-                (Main.ds.getSelectedRelations().isEmpty() ||
-                    ! containsSameKeysWithDifferentValues(pasteBuffer.relations)));
+                (getCurrentDataSet().getSelectedNodes().isEmpty() ||
+                        ! containsSameKeysWithDifferentValues(pasteBuffer.nodes)) &&
+                        (getCurrentDataSet().getSelectedWays().isEmpty() ||
+                                ! containsSameKeysWithDifferentValues(pasteBuffer.ways)) &&
+                                (getCurrentDataSet().getSelectedRelations().isEmpty() ||
+                                        ! containsSameKeysWithDifferentValues(pasteBuffer.relations)));
     }
 
     @Override public void pasteBufferChanged(DataSet newPasteBuffer) {
-        possiblyEnable(Main.ds.getSelected(), newPasteBuffer);
+        possiblyEnable(getCurrentDataSet().getSelected(), newPasteBuffer);
     }
 

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

@@ -30 +30 @@
     public ReverseWayAction() {
         super(tr("Reverse Ways"), "wayflip", tr("Reverse the direction of all selected ways."),
-        Shortcut.registerShortcut("tools:reverse", tr("Tool: {0}", tr("Reverse Ways")), KeyEvent.VK_R, Shortcut.GROUP_EDIT), true);
+                Shortcut.registerShortcut("tools:reverse", tr("Tool: {0}", tr("Reverse Ways")), KeyEvent.VK_R, Shortcut.GROUP_EDIT), true);
     }
 
@@ -47 +47 @@
 
             public void visitAll() {
-                for (OsmPrimitive osm : Main.ds.getSelected())
+                for (OsmPrimitive osm : getCurrentDataSet().getSelected()) {
                     osm.visit(this);
+                }
             }
         }.visitAll();
@@ -69 +70 @@
                     final Collection<Command> changePropertyCommands = reverseWayTagCorrector.execute(w, wnew);
                     propertiesUpdated = propertiesUpdated
-                        || (changePropertyCommands != null && !changePropertyCommands.isEmpty());
+                    || (changePropertyCommands != null && !changePropertyCommands.isEmpty());
                     c.addAll(changePropertyCommands);
                 }
@@ -80 +81 @@
         }
         Main.main.undoRedo.add(new SequenceCommand(tr("Reverse ways"), c));
-        if (propertiesUpdated)
-            DataSet.fireSelectionChanged(Main.ds.getSelected());
+        if (propertiesUpdated) {
+            DataSet.fireSelectionChanged(getCurrentDataSet().getSelected());
+        }
         Main.map.repaint();
     }

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

@@ -160 +160 @@
             OsmBzip2Importer osmBzip2Importer = new OsmBzip2Importer();
             if (gpxImExporter.acceptFile(file)) {
-                GpxExportAction.exportGpx(file, layer);
+                new GpxExportAction().exportGpx(file, layer);
             } else if (osmImExporter.acceptFile(file)
                     || osmGzipImporter.acceptFile(file)

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

@@ -7 +7 @@
 import java.awt.event.KeyEvent;
 
-import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.gui.layer.Layer;
 import org.openstreetmap.josm.gui.layer.Layer.LayerChangeListener;
@@ -24 +23 @@
         if (!isEnabled())
             return;
-        Main.ds.setSelected(Main.ds.allNonDeletedCompletePrimitives());
+        getCurrentDataSet().setSelected(getCurrentDataSet().allNonDeletedCompletePrimitives());
     }
 
@@ -32 +31 @@
      */
     protected void refreshEnabled() {
-        setEnabled(Main.map != null
-                && Main.map.mapView !=null
-                && Main.map.mapView.getEditLayer() != null
-        );
+        setEnabled(getEditLayer() != null);
     }
 

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

@@ -32 +32 @@
 import org.openstreetmap.josm.data.osm.Way;
 import org.openstreetmap.josm.data.osm.visitor.AbstractVisitor;
-import org.openstreetmap.josm.data.osm.visitor.NameVisitor;
 import org.openstreetmap.josm.data.osm.visitor.Visitor;
+import org.openstreetmap.josm.gui.PrimitiveNameFormatter;
 import org.openstreetmap.josm.tools.Shortcut;
 
@@ -65 +65 @@
     public void actionPerformed(ActionEvent e) {
 
-        Collection<OsmPrimitive> selection = Main.ds.getSelected();
+        Collection<OsmPrimitive> selection = getCurrentDataSet().getSelected();
 
         if (!checkSelection(selection)) {
@@ -99 +99 @@
             HashMap<Way, Integer> wayOccurenceCounter = new HashMap<Way, Integer>();
             for (Node n : selectedNodes) {
-                for (Way w : Main.ds.ways) {
+                for (Way w : getCurrentDataSet().ways) {
                     if (w.deleted || w.incomplete) {
                         continue;
@@ -272 +272 @@
         Boolean warnme=false;
         // now copy all relations to new way also
-        for (Relation r : Main.ds.relations) {
+
+        for (Relation r : getCurrentDataSet().relations) {
             if (r.deleted || r.incomplete) {
                 continue;
@@ -329 +330 @@
         }
 
-        NameVisitor v = new NameVisitor();
-        v.visit(selectedWay);
         Main.main.undoRedo.add(
                 new SequenceCommand(tr("Split way {0} into {1} parts",
-                        v.name, wayChunks.size()),
+                        new PrimitiveNameFormatter().getName(selectedWay), wayChunks.size()),
                         commandList));
-        Main.ds.setSelected(newSelection);
+        getCurrentDataSet().setSelected(newSelection);
     }
 

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

@@ -50 +50 @@
     public UnGlueAction() {
         super(tr("UnGlue Ways"), "unglueways", tr("Duplicate nodes that are used by multiple ways."),
-        Shortcut.registerShortcut("tools:unglue", tr("Tool: {0}", tr("UnGlue Ways")), KeyEvent.VK_G, Shortcut.GROUP_EDIT), true);
+                Shortcut.registerShortcut("tools:unglue", tr("Tool: {0}", tr("UnGlue Ways")), KeyEvent.VK_G, Shortcut.GROUP_EDIT), true);
         //DataSet.selListeners.add(this);
     }
@@ -61 +61 @@
     public void actionPerformed(ActionEvent e) {
 
-        Collection<OsmPrimitive> selection = Main.ds.getSelected();
+        Collection<OsmPrimitive> selection = getCurrentDataSet().getSelected();
 
         String errMsg = null;
         if (checkSelection(selection)) {
             int count = 0;
-            for (Way w : Main.ds.ways) {
-                if (w.deleted || w.incomplete || w.nodes.size() < 1) continue;
-                if (!w.nodes.contains(selectedNode)) continue;
+            for (Way w : getCurrentDataSet().ways) {
+                if (w.deleted || w.incomplete || w.nodes.size() < 1) {
+                    continue;
+                }
+                if (!w.nodes.contains(selectedNode)) {
+                    continue;
+                }
                 count++;
             }
@@ -74 +78 @@
                 // If there aren't enough ways, maybe the user wanted to unglue the nodes
                 // (= copy tags to a new node)
-                if(checkForUnglueNode(selection))
+                if(checkForUnglueNode(selection)) {
                     unglueNode(e);
-                else
+                } else {
                     errMsg = tr("This node is not glued to anything else.");
+                }
             } else {
                 // and then do the work.
@@ -86 +91 @@
             for (Node n : selectedNodes) {
                 int count = 0;
-                for (Way w : Main.ds.ways) {
-                    if (w.deleted || w.incomplete || w.nodes.size() < 1) continue;
-                    if (!w.nodes.contains(n)) continue;
+                for (Way w : getCurrentDataSet().ways) {
+                    if (w.deleted || w.incomplete || w.nodes.size() < 1) {
+                        continue;
+                    }
+                    if (!w.nodes.contains(n)) {
+                        continue;
+                    }
                     count++;
                 }
@@ -118 +127 @@
                 "\n"+
                 tr("Note: If a way is selected, this way will get fresh copies of the unglued\n"+
-                   "nodes and the new nodes will be selected. Otherwise, all ways will get their\n"+
-                   "own copy and all nodes will be selected.");
-        }
-
-        if(errMsg != null)
+                        "nodes and the new nodes will be selected. Otherwise, all ways will get their\n"+
+                "own copy and all nodes will be selected.");
+        }
+
+        if(errMsg != null) {
             JOptionPane.showMessageDialog(Main.parent, errMsg);
+        }
 
         selectedNode = null;
@@ -156 +166 @@
 
         Main.main.undoRedo.add(new SequenceCommand(tr("Unglued Node"), cmds));
-        Main.ds.setSelected(n);
+        getCurrentDataSet().setSelected(n);
         Main.map.mapView.repaint();
     }
@@ -176 +186 @@
             return false;
         boolean isPartOfWay = false;
-        for(Way w : Main.ds.ways) {
+        for(Way w : getCurrentDataSet().ways) {
             if(w.nodes.contains(n)) {
                 isPartOfWay = true;
@@ -250 +260 @@
         for (OsmPrimitive p : selection) {
             if (p instanceof Way) {
-                if (selectedWay != null) {
+                if (selectedWay != null)
                     return false;
-                }
                 selectedWay = (Way) p;
             }
         }
-        if (selectedWay == null) {
-            return false;
-        }
+        if (selectedWay == null)
+            return false;
 
         selectedNodes = new ArrayList<Node>();
@@ -264 +272 @@
             if (p instanceof Node) {
                 Node n = (Node) p;
-                if (!selectedWay.nodes.contains(n)) {
+                if (!selectedWay.nodes.contains(n))
                     return false;
-                }
                 selectedNodes.add(n);
             }
@@ -311 +318 @@
         Relation newRel = null;
         HashSet<String> rolesToReAdd = null;
-        for (Relation r : Main.ds.relations) {
-            if (r.deleted || r.incomplete) continue;
+        for (Relation r : getCurrentDataSet().relations) {
+            if (r.deleted || r.incomplete) {
+                continue;
+            }
             newRel = null;
             rolesToReAdd = null;
@@ -330 +339 @@
                 for (RelationMember rm : r.members) {
                     //if (rm.member != selectedNode) {
-                        newRel.members.add(rm);
+                    newRel.members.add(rm);
                     //}
                 }
@@ -356 +365 @@
             boolean firstway = true;
             // modify all ways containing the nodes
-            for (Way w : Main.ds.ways) {
-                if (w.deleted || w.incomplete || w.nodes.size() < 1) continue;
-                if (!w.nodes.contains(selectedNode)) continue;
-                if (!firstway) cmds.add(new ChangeCommand(w, modifyWay(selectedNode, w, cmds, newNodes)));
+            for (Way w : getCurrentDataSet().ways) {
+                if (w.deleted || w.incomplete || w.nodes.size() < 1) {
+                    continue;
+                }
+                if (!w.nodes.contains(selectedNode)) {
+                    continue;
+                }
+                if (!firstway) {
+                    cmds.add(new ChangeCommand(w, modifyWay(selectedNode, w, cmds, newNodes)));
+                }
                 firstway = false;
             }
@@ -372 +387 @@
             newNodes.add(selectedNode);
         } // if a node and a way has been selected, new selection is only the new node that was added to the selected way
-        Main.ds.setSelected(newNodes);
+        getCurrentDataSet().setSelected(newNodes);
     }
 
@@ -393 +408 @@
 
         Main.main.undoRedo.add(new SequenceCommand(tr("Dupe {0} nodes into {1} nodes", selectedNodes.size(), selectedNodes.size()+allNewNodes.size()), cmds));
-        Main.ds.setSelected(allNewNodes);
-    }
-
-// Disabled because we have such a nice help text that would not be shown otherwise.
-//
-//  /**
-//   * Enable the menu option if the selection looks like we could use it.
-//   */
-//  public void selectionChanged(Collection<? extends OsmPrimitive> newSelection) {
-//      setEnabled(checkSelection(newSelection) || checkSelection2(newSelection));
-//      selectedNode = null;
-//      selectedWay = null;
-//      selectedNodes = null;
-//  }
+        getCurrentDataSet().setSelected(allNewNodes);
+    }
 }

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

@@ -44 +44 @@
         if (!isEnabled())
             return;
-        Main.ds.setSelected();
+        getCurrentDataSet().setSelected();
     }
     /**
@@ -51 +51 @@
      */
     protected void refreshEnabled() {
-        setEnabled(Main.map != null
-                && Main.map.mapView !=null
-                && Main.map.mapView.getEditLayer() != null
-        );
+        setEnabled(getEditLayer() != null);
     }
 

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

@@ -16 +16 @@
 import org.openstreetmap.josm.data.osm.DataSource;
 import org.openstreetmap.josm.gui.layer.Layer;
+import org.openstreetmap.josm.gui.layer.OsmDataLayer;
 import org.openstreetmap.josm.gui.layer.Layer.LayerChangeListener;
 import org.openstreetmap.josm.tools.Shortcut;
@@ -38 +39 @@
      */
     protected void refreshEnabled() {
-        setEnabled(Main.main != null
-                && Main.map != null
-                && Main.map.mapView !=null
-                && Main.map.mapView.getEditLayer() != null
-        );
+        setEnabled(getEditLayer() != null);
     }
 
@@ -50 +47 @@
         int bboxCount = 0;
         List<Area> areas = new ArrayList<Area>();
-        for(DataSource ds : Main.main.createOrGetEditLayer().data.dataSources) {
+        for(DataSource ds : Main.map.mapView.getEditLayer().data.dataSources) {
             areas.add(new Area(ds.bounds.asRect()));
         }

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

@@ -42 +42 @@
     protected void handlePrimitiveGoneException(long id) {
         MultiFetchServerObjectReader reader = new MultiFetchServerObjectReader();
-        reader.append(Main.main.createOrGetEditLayer().data,id);
+        reader.append(getCurrentDataSet(),id);
         DataSet ds = null;
         try {
@@ -194 +194 @@
      */
     protected void refreshEnabled() {
-        setEnabled(Main.main != null
-                && Main.map != null
-                && Main.map.mapView !=null
-                && Main.map.mapView.getEditLayer() != null
-                && ! Main.map.mapView.getEditLayer().data.getSelected().isEmpty()
+        setEnabled(getCurrentDataSet() != null
+                && ! getCurrentDataSet().getSelected().isEmpty()
         );
     }
@@ -208 +205 @@
         if (! isEnabled())
             return;
-        Collection<OsmPrimitive> selection = Main.ds.getSelected();
+        Collection<OsmPrimitive> selection = getCurrentDataSet().getSelected();
         if (selection.size() == 0) {
             JOptionPane.showMessageDialog(

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

@@ -178 +178 @@
         }
 
-        ConflictCollection conflicts = Main.main.createOrGetEditLayer().getConflicts();
+        ConflictCollection conflicts = Main.map.mapView.getEditLayer().getConflicts();
         if (conflicts !=null && !conflicts.isEmpty()) {
             JOptionPane.showMessageDialog(Main.parent,tr("There are unresolved conflicts. You have to resolve these first."));
@@ -189 +189 @@
         final LinkedList<OsmPrimitive> update = new LinkedList<OsmPrimitive>();
         final LinkedList<OsmPrimitive> delete = new LinkedList<OsmPrimitive>();
-        for (OsmPrimitive osm : Main.ds.allPrimitives()) {
+        for (OsmPrimitive osm : getCurrentDataSet().allPrimitives()) {
             if (osm.get("josm/ignore") != null) {
                 continue;
@@ -231 +231 @@
             @Override protected void realRun() throws SAXException, IOException {
                 try {
-                    server.uploadOsm(Main.ds.version, all, progressMonitor.createSubTaskMonitor(ProgressMonitor.ALL_TICKS, false));
-                    Main.main.createOrGetEditLayer().cleanData(server.processed, !add.isEmpty());
+                    server.uploadOsm(getCurrentDataSet().version, all, progressMonitor.createSubTaskMonitor(ProgressMonitor.ALL_TICKS, false));
+                    getEditLayer().cleanData(server.processed, !add.isEmpty());
                 } catch (Exception sxe) {
                     if (uploadCancelled) {

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

@@ -77 +77 @@
         Command c;
         if (ctrl) {
-            c = DeleteCommand.deleteWithReferences(Main.ds.getSelected());
+            c = DeleteCommand.deleteWithReferences(getCurrentDataSet().getSelected());
         } else {
-            c = DeleteCommand.delete(Main.ds.getSelected(), !alt);
+            c = DeleteCommand.delete(getCurrentDataSet().getSelected(), !alt);
         }
         if (c != null) {
@@ -85 +85 @@
         }
 
-        Main.ds.setSelected();
+        getCurrentDataSet().setSelected();
         Main.map.repaint();
     }
@@ -124 +124 @@
         }
 
-        Main.ds.setSelected();
+        getCurrentDataSet().setSelected();
         Main.map.mapView.repaint();
     }

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

@@ -94 +94 @@
         // Add extra shortcut N
         Main.contentPane.getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW).put(
-            Shortcut.registerShortcut("mapmode:drawfocus", tr("Mode: Draw Focus"), KeyEvent.VK_N, Shortcut.GROUP_EDIT).getKeyStroke(), tr("Draw"));
+                Shortcut.registerShortcut("mapmode:drawfocus", tr("Mode: Draw Focus"), KeyEvent.VK_N, Shortcut.GROUP_EDIT).getKeyStroke(), tr("Draw"));
 
         cursorCrosshair = getCursor();
@@ -124 +124 @@
                         return;
                     switch(c) {
-                        case way:
-                            Main.map.mapView.setCursor(cursorJoinWay);
-                            break;
-                        case node:
-                            Main.map.mapView.setCursor(cursorJoinNode);
-                            break;
-                        default:
-                            Main.map.mapView.setCursor(cursorCrosshair);
-                            break;
+                    case way:
+                        Main.map.mapView.setCursor(cursorJoinWay);
+                        break;
+                    case node:
+                        Main.map.mapView.setCursor(cursorJoinNode);
+                        break;
+                    default:
+                        Main.map.mapView.setCursor(cursorCrosshair);
+                    break;
                     }
                 }
@@ -162 +162 @@
 
         // This happens when nothing is selected, but we still want to highlight the "target node"
-        if (mouseOnExistingNode == null && Main.ds.getSelected().size() == 0
-                && mousePos != null)
+        if (mouseOnExistingNode == null && getCurrentDataSet().getSelected().size() == 0
+                && mousePos != null) {
             mouseOnExistingNode = Main.map.mapView.getNearestNode(mousePos);
+        }
 
         if (mouseOnExistingNode != null) {
@@ -170 +171 @@
             // We also need this list for the statusbar help text
             oldHighlights.add(mouseOnExistingNode);
-            if(drawTargetHighlight)
+            if(drawTargetHighlight) {
                 mouseOnExistingNode.highlighted = true;
+            }
             return;
         }
@@ -259 +261 @@
 
     private void tryAgain(MouseEvent e) {
-        Main.ds.setSelected();
+        getCurrentDataSet().setSelected();
         mouseClicked(e);
     }
@@ -306 +308 @@
         mousePos = e.getPoint();
 
-        Collection<OsmPrimitive> selection = Main.ds.getSelected();
+        Collection<OsmPrimitive> selection = getCurrentDataSet().getSelected();
         Collection<Command> cmds = new LinkedList<Command>();
 
         ArrayList<Way> reuseWays = new ArrayList<Way>(),
-            replacedWays = new ArrayList<Way>();
+        replacedWays = new ArrayList<Way>();
         boolean newNode = false;
         Node n = null;
 
-        if (!ctrl)
+        if (!ctrl) {
             n = Main.map.mapView.getNearestNode(mousePos);
+        }
 
         if (n != null) {
@@ -323 +326 @@
                 // (this is just a convenience option so that people don't
                 // have to switch modes)
-                Main.ds.setSelected(n);
-                selection = Main.ds.getSelected();
+                getCurrentDataSet().setSelected(n);
+                selection = getCurrentDataSet().getSelected();
                 // The user explicitly selected a node, so let him continue drawing
                 wayIsFinished = false;
@@ -334 +337 @@
             if (n.getCoor().isOutSideWorld()) {
                 JOptionPane.showMessageDialog(Main.parent,
-                    tr("Cannot add a node outside of the world."));
+                        tr("Cannot add a node outside of the world."));
                 return;
             }
@@ -366 +369 @@
 
                     pruneSuccsAndReverse(is);
-                    for (int i : is) segSet.add(
-                        Pair.sort(new Pair<Node,Node>(w.nodes.get(i), w.nodes.get(i+1))));
-                    for (int i : is) wnew.addNode(i + 1, n);
+                    for (int i : is) {
+                        segSet.add(
+                                Pair.sort(new Pair<Node,Node>(w.nodes.get(i), w.nodes.get(i+1))));
+                    }
+                    for (int i : is) {
+                        wnew.addNode(i + 1, n);
+                    }
 
                     // If ALT is pressed, a new way should be created and that new way should get
@@ -375 +382 @@
                     // but pressing ALT prevents this. Therefore we must de-select the way manually
                     // here so /only/ the new way will be selected after this method finishes.
-                    if(alt) wnew.selected = false;
+                    if(alt) {
+                        wnew.selected = false;
+                    }
 
                     cmds.add(new ChangeCommand(insertPoint.getKey(), wnew));
@@ -450 +459 @@
                     int nodeCount=0;
                     for (Node p : way.nodes)
-                        if(p.equals(n0)) nodeCount++;
-                    if(nodeCount > 1) way = null;
+                        if(p.equals(n0)) {
+                            nodeCount++;
+                        }
+                    if(nodeCount > 1) {
+                        way = null;
+                    }
                 }
 
@@ -476 +489 @@
 
                 // Add new node to way
-                if (way.nodes.get(way.nodes.size() - 1) == n0)
+                if (way.nodes.get(way.nodes.size() - 1) == n0) {
                     way.addNode(n);
-                else
+                } else {
                     way.addNode(0, n);
+                }
 
                 extendedWay = true;
-                Main.ds.setSelected(way);
+                getCurrentDataSet().setSelected(way);
             }
         }
@@ -488 +502 @@
         String title;
         if (!extendedWay) {
-            if (!newNode) {
+            if (!newNode)
                 return; // We didn't do anything.
-            } else if (reuseWays.isEmpty()) {
+            else if (reuseWays.isEmpty()) {
                 title = tr("Add node");
             } else {
                 title = tr("Add node into way");
-                for (Way w : reuseWays) w.selected = false;
-            }
-            Main.ds.setSelected(n);
+                for (Way w : reuseWays) {
+                    w.selected = false;
+                }
+            }
+            getCurrentDataSet().setSelected(n);
         } else if (!newNode) {
             title = tr("Connect existing way to node");
@@ -508 +524 @@
 
         Main.main.undoRedo.add(c);
-        if(!wayIsFinished) lastUsedNode = n;
+        if(!wayIsFinished) {
+            lastUsedNode = n;
+        }
 
         computeHelperLine();
@@ -534 +552 @@
             int posn0 = selectedWay.nodes.indexOf(currentNode);
             if( posn0 != -1 && // n0 is part of way
-                (posn0 >= 1                          && targetNode.equals(selectedWay.nodes.get(posn0-1))) || // previous node
-                (posn0 < selectedWay.nodes.size()-1) && targetNode.equals(selectedWay.nodes.get(posn0+1))) {  // next node
-                Main.ds.setSelected(targetNode);
+                    (posn0 >= 1                          && targetNode.equals(selectedWay.nodes.get(posn0-1))) || // previous node
+                    (posn0 < selectedWay.nodes.size()-1) && targetNode.equals(selectedWay.nodes.get(posn0+1))) {  // next node
+                getCurrentDataSet().setSelected(targetNode);
                 lastUsedNode = targetNode;
                 return true;
@@ -618 +636 @@
         double angle = -1;
 
-        Collection<OsmPrimitive> selection = Main.ds.getSelected();
+        Collection<OsmPrimitive> selection = getCurrentDataSet().getSelected();
 
         Node selectedNode = null;
@@ -638 +656 @@
         if(!ctrl && currentMouseNode == null) {
             List<WaySegment> wss = Main.map.mapView.getNearestWaySegments(mousePos);
-            for(WaySegment ws : wss)
+            for(WaySegment ws : wss) {
                 mouseOnExistingWays.add(ws.way);
+            }
         }
 
@@ -692 +711 @@
         if (previousNode != null) {
             angle = hdg - Math.toDegrees(previousNode.getCoor().heading(currentBaseNode.getCoor()));
-            if (angle < 0) angle += 360;
+            if (angle < 0) {
+                angle += 360;
+            }
         }
         Main.map.statusLine.setAngle(angle);
@@ -715 +736 @@
      *  <code>null</code> otherwise.
      */
-    public static Way getWayForNode(Node n) {
+    public Way getWayForNode(Node n) {
         Way way = null;
-        for (Way w : Main.ds.ways) {
-            if (w.deleted || w.incomplete || w.nodes.size() < 1) continue;
+        for (Way w : getCurrentDataSet().ways) {
+            if (w.deleted || w.incomplete || w.nodes.size() < 1) {
+                continue;
+            }
             Node firstNode = w.nodes.get(0);
             Node lastNode = w.nodes.get(w.nodes.size() - 1);
@@ -805 +828 @@
         default:
             EastNorth P = n.getEastNorth();
-            seg = segs.iterator().next();
-            A = seg.a.getEastNorth();
-            B = seg.b.getEastNorth();
-            double a = P.distanceSq(B);
-            double b = P.distanceSq(A);
-            double c = A.distanceSq(B);
-            q = (a - b + c) / (2*c);
-            n.setEastNorth(new EastNorth(B.east() + q * (A.east() - B.east()), B.north() + q * (A.north() - B.north())));
+        seg = segs.iterator().next();
+        A = seg.a.getEastNorth();
+        B = seg.b.getEastNorth();
+        double a = P.distanceSq(B);
+        double b = P.distanceSq(A);
+        double c = A.distanceSq(B);
+        q = (a - b + c) / (2*c);
+        n.setEastNorth(new EastNorth(B.east() + q * (A.east() - B.east()), B.north() + q * (A.north() - B.north())));
         }
     }
@@ -883 +906 @@
             // oldHighlights may store a node or way, check if it's a node
             OsmPrimitive x = oldHighlights.iterator().next();
-            if (x instanceof Node)
+            if (x instanceof Node) {
                 rv = tr("Select node under cursor.");
-            else
+            } else {
                 rv = trn("Insert new node into way.", "Insert new node into {0} ways.",
-                oldHighlights.size(), oldHighlights.size());
+                        oldHighlights.size(), oldHighlights.size());
+            }
         }
 
@@ -894 +918 @@
          */
         if (currentBaseNode != null && !wayIsFinished) {
-            if (alt)
+            if (alt) {
                 rv += " " + tr("Start new way from last node.");
-            else
+            } else {
                 rv += " " + tr("Continue way from last node.");
+            }
         }
 
@@ -904 +929 @@
          * Handle special case: Highlighted node == selected node => finish drawing
          */
-        if (n != null && Main.ds.getSelectedNodes().contains(n)) {
-            if (wayIsFinished)
+        if (n != null && getCurrentDataSet().getSelectedNodes().contains(n)) {
+            if (wayIsFinished) {
                 rv = tr("Select node under cursor.");
-            else
+            } else {
                 rv = tr("Finish drawing.");
+            }
         }
 
@@ -914 +940 @@
          * Handle special case: Self-Overlapping or closing way
          */
-        if (Main.ds.getSelectedWays().size() > 0 && !wayIsFinished && !alt) {
-            Way w = (Way) Main.ds.getSelectedWays().iterator().next();
+        if (getCurrentDataSet().getSelectedWays().size() > 0 && !wayIsFinished && !alt) {
+            Way w = (Way) getCurrentDataSet().getSelectedWays().iterator().next();
             for (Node m : w.nodes) {
                 if (m.equals(mouseOnExistingNode) || mouseOnExistingWays.contains(w)) {

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

@@ -77 +77 @@
         super(tr("Extrude"), "extrude/extrude", tr("Create areas"),
                 Shortcut.registerShortcut("mapmode:extrude", tr("Mode: {0}", tr("Extrude")), KeyEvent.VK_X, Shortcut.GROUP_EDIT),
-            mapFrame,
-            getCursor("normal", "rectangle", Cursor.DEFAULT_CURSOR));
+                mapFrame,
+                getCursor("normal", "rectangle", Cursor.DEFAULT_CURSOR));
         putValue("help", "Action/Extrude/Extrude");
         initialMoveDelay = Main.pref.getInteger("edit.initial-move-delay",200);
@@ -160 +160 @@
 
             double u = ((en3.east() - en1.east()) * (en2.east() - en1.east()) +
-                        (en3.north() - en1.north()) * (en2.north() - en1.north())) /
-                       en2.distanceSq(en1);
+                    (en3.north() - en1.north()) * (en2.north() - en1.north())) /
+                    en2.distanceSq(en1);
             // the point on the segment from which the distance to mouse pos is shortest
             EastNorth base = new EastNorth(en1.east() + u * (en2.east() - en1.east()),
-                                           en1.north() + u * (en2.north() - en1.north()));
+                    en1.north() + u * (en2.north() - en1.north()));
 
             // find out the distance, in metres, between the base point and the mouse cursor
@@ -219 +219 @@
         initialMousePos = e.getPoint();
 
-        if(selectedSegment != null)
-            Main.ds.setSelected(selectedSegment.way);
+        if(selectedSegment != null) {
+            getCurrentDataSet().setSelected(selectedSegment.way);
+        }
     }
 
@@ -241 +242 @@
             wnew.addNode(selectedSegment.lowerIndex+1, n3);
             wnew.addNode(selectedSegment.lowerIndex+1, n4);
-            if (wnew.nodes.size() == 4) wnew.addNode(n1);
+            if (wnew.nodes.size() == 4) {
+                wnew.addNode(n1);
+            }
             Collection<Command> cmds = new LinkedList<Command>();
             cmds.add(new AddCommand(n4));
@@ -258 +261 @@
 
     @Override public String getModeHelpText() {
-        if (mode == Mode.select) {
+        if (mode == Mode.select)
             return tr("Release the mouse button to select the objects in the rectangle.");
-        } else if (mode == Mode.EXTRUDE) {
+        else if (mode == Mode.EXTRUDE)
             return tr("Draw a rectangle of the desired size, then release the mouse button.");
-        } else if (mode == Mode.rotate) {
+        else if (mode == Mode.rotate)
             return tr("Release the mouse button to stop rotating.");
-        } else {
+        else
             return tr("Drag a way segment to make a rectangle.");
-        }
-    }
-
-        @Override public boolean layerIsSupported(Layer l) {
-                return l instanceof OsmDataLayer;
-        }
+    }
+
+    @Override public boolean layerIsSupported(Layer l) {
+        return l instanceof OsmDataLayer;
+    }
 }

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

@@ -207 +207 @@
             // Currently we support moving and rotating, which do not affect relations.
             // So don't add them in the first place to make handling easier
-            Collection<OsmPrimitive> selection = Main.ds.getSelectedNodesAndWays();
+            Collection<OsmPrimitive> selection = getCurrentDataSet().getSelectedNodesAndWays();
             Collection<Node> affectedNodes = AllNodesVisitor.getAllNodes(selection);
 
@@ -355 +355 @@
 
         if (ctrl && shift) {
-            if (Main.ds.getSelected().isEmpty()) {
+            if (getCurrentDataSet().getSelected().isEmpty()) {
                 selectPrims(osmColl, true, false, false, false);
             }
@@ -366 +366 @@
             // move.
             selectPrims(osmColl,
-                    shift || Main.ds.getSelected().containsAll(osmColl),
+                    shift || getCurrentDataSet().getSelected().containsAll(osmColl),
                     ctrl, false, false);
             mode = Mode.move;
@@ -403 +403 @@
 
             // Select Draw Tool if no selection has been made
-            if(Main.ds.getSelected().size() == 0 && !cancelDrawMode) {
+            if(getCurrentDataSet().getSelected().size() == 0 && !cancelDrawMode) {
                 Main.map.selectDrawTool(true);
                 return;
@@ -419 +419 @@
 
                 // If the user double-clicked a node, change to draw mode
-                List<OsmPrimitive> sel = new ArrayList<OsmPrimitive>(Main.ds.getSelected());
+                List<OsmPrimitive> sel = new ArrayList<OsmPrimitive>(getCurrentDataSet().getSelected());
                 if(e.getClickCount() >=2 && sel.size() == 1 && sel.get(0) instanceof Node) {
                     // We need to do it like this as otherwise drawAction will see a double
@@ -431 +431 @@
                 }
             } else {
-                Collection<OsmPrimitive> selection = Main.ds.getSelected();
+                Collection<OsmPrimitive> selection = getCurrentDataSet().getSelected();
                 Collection<OsmPrimitive> s = new TreeSet<OsmPrimitive>();
                 int max = Main.pref.getInteger("warn.move.maxelements", 20);
@@ -469 +469 @@
                         if (selNodes.size() > 0) {
                             selNodes.add(n);
-                            MergeNodesAction.mergeNodes(selNodes, n);
+                            new MergeNodesAction().mergeNodes(selNodes, n);
                         }
                     }
@@ -496 +496 @@
             curSel = new LinkedList<OsmPrimitive>(); // new selection will replace the old.
         } else {
-            curSel = Main.ds.getSelected();
+            curSel = getCurrentDataSet().getSelected();
         }
 
@@ -512 +512 @@
             }
         }
-        Main.ds.setSelected(curSel);
+        getCurrentDataSet().setSelected(curSel);
         Main.map.mapView.repaint();
     }

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

@@ -7 +7 @@
 import java.awt.event.KeyEvent;
 
-import org.openstreetmap.josm.data.coor.EastNorth;
 import org.openstreetmap.josm.gui.MapFrame;
 import org.openstreetmap.josm.gui.MapView;
@@ -47 +46 @@
     public ZoomAction(MapFrame mapFrame) {
         super(tr("Zoom"), "zoom", tr("Zoom and move map"),
-        Shortcut.registerShortcut("mapmode:zoom", tr("Mode: {0}", tr("Zoom")), KeyEvent.VK_Z, Shortcut.GROUP_EDIT),
-        mapFrame, ImageProvider.getCursor("normal", "zoom"));
+                Shortcut.registerShortcut("mapmode:zoom", tr("Mode: {0}", tr("Zoom")), KeyEvent.VK_Z, Shortcut.GROUP_EDIT),
+                mapFrame, ImageProvider.getCursor("normal", "zoom"));
         mv = mapFrame.mapView;
         selectionManager = new SelectionManager(this, true, mv);
@@ -57 +56 @@
      */
     public void selectionEnded(Rectangle r, boolean alt, boolean shift, boolean ctrl) {
-        if (r.width >= 3 && r.height >= 3)
+        if (r.width >= 3 && r.height >= 3) {
             mv.zoomToFactor(mv.getEastNorth(r.x+r.width/2, r.y+r.height/2), r.getWidth()/mv.getWidth());
+        }
     }
 

trunk/src/org/openstreetmap/josm/actions/search/SearchAction.java

@@ -164 +164 @@
         }
         try {
-            Collection<OsmPrimitive> sel = Main.ds.getSelected();
+            Collection<OsmPrimitive> sel = Main.main.getCurrentDataSet().getSelected();
             SearchCompiler.Match matcher = SearchCompiler.compile(search, caseSensitive, regexSearch);
             int foundMatches = 0;
-            for (OsmPrimitive osm : Main.ds.allNonDeletedCompletePrimitives()) {
+            for (OsmPrimitive osm : Main.main.getCurrentDataSet().allNonDeletedCompletePrimitives()) {
                 if (mode == SearchMode.replace) {
                     if (matcher.match(osm)) {
@@ -183 +183 @@
                 }
             }
-            Main.ds.setSelected(sel);
+            Main.main.getCurrentDataSet().setSelected(sel);
             if (foundMatches == 0) {
                 String msg = null;
@@ -241 +241 @@
      */
     protected void refreshEnabled() {
-        setEnabled(Main.map != null
-                && Main.map.mapView !=null
-                && Main.map.mapView.getEditLayer() != null
-        );
+        setEnabled(getEditLayer() != null);
     }
 

trunk/src/org/openstreetmap/josm/actions/search/SearchCompiler.java

@@ -133 +133 @@
                 String value = null;
 
-                if (key.equals("timestamp"))
+                if (key.equals("timestamp")) {
                     value = DateUtils.fromDate(osm.getTimestamp());
-                else
+                } else {
                     value = osm.get(key);
+                }
 
                 if (value == null)
@@ -169 +170 @@
 
         public ExactKeyValue(boolean regexp, String key, String value) throws ParseError {
-            if (key == "") {
+            if (key == "")
                 throw new ParseError(tr("Key cannot be empty when tag operator is used. Sample use: key=value"));
-            }
             this.key = key;
             this.value = value;
@@ -223 +223 @@
         public boolean match(OsmPrimitive osm) throws ParseError {
 
-            if (osm.keys == null || osm.keys.isEmpty()) {
+            if (osm.keys == null || osm.keys.isEmpty())
                 return mode == Mode.NONE;
-            }
 
             switch (mode) {
@@ -238 +237 @@
             case ANY_KEY:
                 for (String v:osm.keys.values()) {
-                    if (v.equals(value)) {
+                    if (v.equals(value))
                         return true;
-                    }
                 }
                 return false;
@@ -247 +245 @@
             case ANY_KEY_REGEXP:
                 for (String v:osm.keys.values()) {
-                    if (valuePattern.matcher(v).matches()) {
+                    if (valuePattern.matcher(v).matches())
                         return true;
-                    }
                 }
                 return false;
@@ -257 +254 @@
                     if (keyPattern.matcher(entry.getKey()).matches()) {
                         if (mode == Mode.ANY_VALUE_REGEXP
-                                || valuePattern.matcher(entry.getValue()).matches()) {
+                                || valuePattern.matcher(entry.getValue()).matches())
                             return true;
-                        }
                     }
                 }
@@ -265 +261 @@
             case MISSING_KEY_REGEXP:
                 for (String k:osm.keys.keySet()) {
-                    if (keyPattern.matcher(k).matches()) {
+                    if (keyPattern.matcher(k).matches())
                         return false;
-                    }
                 }
                 return true;
@@ -337 +332 @@
                 // is not Java 1.5
                 //String name = java.text.Normalizer.normalize(name, java.text.Normalizer.Form.NFC);
-                if (!caseSensitive)
+                if (!caseSensitive) {
                     name = name.toLowerCase();
+                }
                 if (name.indexOf(search) != -1)
                     return true;
@@ -356 +352 @@
             } else if ("relation".equals(type)) {
                 this.type = Relation.class;
-            } else {
+            } else
                 throw new ParseError(tr("Unknown primitive type: {0}. Allowed values are node, way or relation",
                         type));
-            }
         }
         @Override public boolean match(OsmPrimitive osm) {
@@ -441 +436 @@
             // "parent" (null) should mean the same as "parent()"
             // (Always). I.e. match everything
-            if (child == null)
+            if (child == null) {
                 child = new Always();
+            }
 
             if (osm instanceof Way) {
-                for (Node n : ((Way)osm).nodes)
+                for (Node n : ((Way)osm).nodes) {
                     isParent |= child.match(n);
+                }
             } else if (osm instanceof Relation) {
                 for (RelationMember member : ((Relation)osm).members) {
-                    if (member.member != null)
+                    if (member.member != null) {
                         isParent |= child.match(member.member);
+                    }
                 }
             }
@@ -464 +462 @@
             // "child" (null) should mean the same as "child()"
             // (Always). I.e. match everything
-            if (parent == null)
+            if (parent == null) {
                 parent = new Always();
+            }
 
             boolean isChild = false;
-            CollectBackReferencesVisitor backRefs = new CollectBackReferencesVisitor(Main.ds);
+            CollectBackReferencesVisitor backRefs = new CollectBackReferencesVisitor(Main.main.getCurrentDataSet());
             osm.visit(backRefs);
             for (OsmPrimitive p : backRefs.data) {
@@ -485 +484 @@
 
     public static Match compile(String searchStr, boolean caseSensitive, boolean regexSearch)
-            throws ParseError {
+    throws ParseError {
         return new SearchCompiler(caseSensitive, regexSearch,
                 new PushbackTokenizer(
-                    new PushbackReader(new StringReader(searchStr))))
-            .parse();
+                        new PushbackReader(new StringReader(searchStr))))
+        .parse();
     }
 
     public Match parse() throws ParseError {
         Match m = parseJuxta();
-        if (!tokenizer.readIfEqual(null)) {
+        if (!tokenizer.readIfEqual(null))
             throw new ParseError(tr("Unexpected token: {0}", tokenizer.nextToken()));
-        }
         return m;
     }
@@ -515 +513 @@
         if (tokenizer.readIfEqual("|")) {
             Match b = parseNot();
-            if (a == null || b == null) {
+            if (a == null || b == null)
                 throw new ParseError(tr("Missing arguments for or."));
-            }
             return new Or(a, b);
         }
@@ -526 +523 @@
         if (tokenizer.readIfEqual("-")) {
             Match m = parseParens();
-            if (m == null) {
+            if (m == null)
                 throw new ParseError(tr("Missing argument for not."));
-            }
             return new Not(m);
         }
@@ -537 +533 @@
         if (tokenizer.readIfEqual("(")) {
             Match m = parseJuxta();
-            if (!tokenizer.readIfEqual(")")) {
+            if (!tokenizer.readIfEqual(")"))
                 throw new ParseError(tr("Expected closing parenthesis."));
-            }
             return m;
         }
@@ -550 +545 @@
         if (tokenizer.readIfEqual(":")) {
             String tok2 = tokenizer.readText();
-            if (tok == null) tok = "";
-            if (tok2 == null) tok2 = "";
+            if (tok == null) {
+                tok = "";
+            }
+            if (tok2 == null) {
+                tok2 = "";
+            }
             return parseKV(tok, tok2);
         }
@@ -557 +556 @@
         if (tokenizer.readIfEqual("=")) {
             String tok2 = tokenizer.readText();
-            if (tok == null) tok = "";
-            if (tok2 == null) tok2 = "";
+            if (tok == null) {
+                tok = "";
+            }
+            if (tok2 == null) {
+                tok2 = "";
+            }
             return new ExactKeyValue(regexSearch, tok, tok2);
         }
 
-        if (tok == null) {
+        if (tok == null)
             return null;
-        } else if (tok.equals("modified")) {
+        else if (tok.equals("modified"))
             return new Modified();
-        } else if (tok.equals("incomplete")) {
+        else if (tok.equals("incomplete"))
             return new Incomplete();
-        } else if (tok.equals("untagged")) {
+        else if (tok.equals("untagged"))
             return new Untagged();
-        } else if (tok.equals("selected")) {
+        else if (tok.equals("selected"))
             return new Selected();
-        } else if (tok.equals("child")) {
+        else if (tok.equals("child"))
             return new Child(parseParens());
-        } else if (tok.equals("parent")) {
+        else if (tok.equals("parent"))
             return new Parent(parseParens());
-        } else {
+        else
             return new Any(tok);
-        }
     }
 
     private Match parseKV(String key, String value) throws ParseError {
-        if (key.equals("type")) {
+        if (key.equals("type"))
             return new ExactType(value);
-        } else if (key.equals("user")) {
+        else if (key.equals("user"))
             return new UserMatch(value);
-        } else if (key.equals("nodes")) {
+        else if (key.equals("nodes")) {
             try {
                 String[] range = value.split("-");
-                if (range.length == 1) {
+                if (range.length == 1)
                     return new NodeCount(Integer.parseInt(value));
-                } else if (range.length == 2) {
+                else if (range.length == 2)
                     return new NodeCountRange(Integer.parseInt(range[0]), Integer.parseInt(range[1]));
-                } else {
+                else
                     throw new ParseError(tr("Wrong number of parameters for nodes operator."));
-                }
             } catch (NumberFormatException e) {
                 throw new ParseError(tr("Incorrect value of nodes operator: {0}. Nodes operator expects number of nodes or range, for example nodes:10-20", value));
@@ -606 +607 @@
                 throw new ParseError(tr("Incorrect value of id operator: {0}. Number is expected.", value));
             }
-        } else {
+        } else
             return new KeyValue(key, value);
-        }
     }
 
@@ -627 +627 @@
         // insensitively, but the OSM data is in Unicode. With
         // UNICODE_CASE casefolding is made Unicode-aware.
-        if (!caseSensitive)
+        if (!caseSensitive) {
             searchFlags |= (Pattern.CASE_INSENSITIVE | Pattern.UNICODE_CASE);
+        }
 
         return searchFlags;

trunk/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java

@@ -40 +40 @@
     @Override protected void realRun() {
         progressMonitor.setTicksCount(2);
-        sel = mode != SearchAction.SearchMode.remove ? new LinkedList<OsmPrimitive>() : Main.ds.allNonDeletedPrimitives();
+        sel = mode != SearchAction.SearchMode.remove ? new LinkedList<OsmPrimitive>() : Main.main.getCurrentDataSet().allNonDeletedPrimitives();
         try {
             URLConnection con = url.openConnection();
@@ -47 +47 @@
             progressMonitor.subTask(tr("Downloading..."));
             Map<Long, String> ids = idReader.parseIds(in);
-            for (OsmPrimitive osm : Main.ds.allNonDeletedPrimitives()) {
+            for (OsmPrimitive osm : Main.main.getCurrentDataSet().allNonDeletedPrimitives()) {
                 if (ids.containsKey(osm.id) && osm.getClass().getName().toLowerCase().endsWith(ids.get(osm.id))) {
                     if (mode == SearchAction.SearchMode.remove) {
@@ -86 +86 @@
     @Override protected void finish() {
         if (sel != null) {
-            Main.ds.setSelected(sel);
+            Main.main.getCurrentDataSet().setSelected(sel);
         }
     }