Changeset 1750 in josm for trunk/src

Timestamp:

2009-07-08T21:50:32+02:00 (15 years ago)

Author:

Gubaer

Message:

new: replaced global conflict list by conflict list per layer, similar to datasets

Location:

trunk/src/org/openstreetmap/josm

Files:

• Main.java (modified) (14 diffs)
• actions/AutoScaleAction.java (modified) (3 diffs)
• actions/CopyAction.java (modified) (1 diff)
• actions/DeleteAction.java (modified) (1 diff)
• actions/DuplicateAction.java (modified) (1 diff)
• actions/GpxExportAction.java (modified) (1 diff)
• actions/MoveAction.java (modified) (2 diffs)
• actions/PasteAction.java (modified) (1 diff)
• actions/SaveActionBase.java (modified) (5 diffs)
• actions/UpdateDataAction.java (modified) (1 diff)
• actions/UpdateSelectionAction.java (modified) (3 diffs)
• actions/UploadAction.java (modified) (3 diffs)
• actions/downloadtasks/DownloadOsmTask.java (modified) (2 diffs)
• actions/downloadtasks/DownloadOsmTaskList.java (modified) (3 diffs)
• actions/mapmode/DeleteAction.java (modified) (3 diffs)
• actions/mapmode/DrawAction.java (modified) (5 diffs)
• actions/mapmode/ExtrudeAction.java (modified) (3 diffs)
• actions/mapmode/SelectAction.java (modified) (25 diffs)
• command/AddCommand.java (modified) (4 diffs)
• command/ChangeCommand.java (modified) (2 diffs)
• command/ChangePropertyCommand.java (modified) (5 diffs)
• command/ChangeRelationMemberRoleCommand.java (modified) (3 diffs)
• command/Command.java (modified) (3 diffs)
• command/ConflictResolveCommand.java (added)
• command/CoordinateConflictResolveCommand.java (modified) (6 diffs)
• command/DeleteCommand.java (modified) (8 diffs)
• command/DeletedStateConflictResolveCommand.java (modified) (7 diffs)
• command/MoveCommand.java (modified) (7 diffs)
• command/PurgePrimitivesCommand.java (modified) (8 diffs)
• command/RelationMemberConflictResolverCommand.java (modified) (7 diffs)
• command/RemoveRelationMemberCommand.java (modified) (1 diff)
• command/RotateCommand.java (modified) (7 diffs)
• command/SequenceCommand.java (modified) (4 diffs)
• command/TagConflictResolveCommand.java (modified) (7 diffs)
• command/UndeletePrimitivesCommand.java (modified) (4 diffs)
• command/VersionConflictResolveCommand.java (modified) (6 diffs)
• command/WayNodesConflictResolverCommand.java (modified) (7 diffs)
• data/conflict (added)
• data/conflict/Conflict.java (added)
• data/conflict/ConflictCollection.java (added)
• data/conflict/IConflictListener.java (added)
• data/osm/Node.java (modified) (3 diffs)
• data/osm/visitor/MergeVisitor.java (modified) (9 diffs)
• gui/MapView.java (modified) (19 diffs)
• gui/dialogs/CommandStackDialog.java (modified) (3 diffs)
• gui/dialogs/ConflictDialog.java (modified) (7 diffs)
• gui/dialogs/HistoryDialog.java (modified) (3 diffs)
• gui/dialogs/ToggleDialog.java (modified) (4 diffs)
• gui/dialogs/relation/GenericRelationEditor.java (modified) (2 diffs)
• gui/history/PointInTimeType.java (modified) (1 diff)
• gui/layer/OsmDataLayer.java (modified) (9 diffs)
• io/OsmApi.java (modified) (2 diffs)
• io/OsmServerWriter.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/Main.java

@@ -150 +150 @@
         panel.setVisible(false);
         panel.removeAll();
-        if (map != null)
+        if (map != null) {
             map.fillPanel(panel);
-        else {
+        } else {
             old.destroy();
             panel.add(gettingStarted, BorderLayout.CENTER);
@@ -169 +169 @@
         if (map != null) {
             map.mapView.removeLayer(layer);
-            if (layer instanceof OsmDataLayer)
+            if (layer instanceof OsmDataLayer) {
                 ds = new DataSet();
-            if (map.mapView.getAllLayers().isEmpty())
+            }
+            if (map.mapView.getAllLayers().isEmpty()) {
                 setMapFrame(null);
+            }
         }
     }
@@ -182 +184 @@
     public Main(SplashScreen splash) {
         main = this;
-//        platform = determinePlatformHook();
+        //        platform = determinePlatformHook();
         platform.startupHook();
         contentPane.add(panel, BorderLayout.CENTER);
         panel.add(gettingStarted, BorderLayout.CENTER);
 
-        if(splash != null) splash.setStatus(tr("Creating main GUI"));
+        if(splash != null) {
+            splash.setStatus(tr("Creating main GUI"));
+        }
         menu = new MainMenu();
 
@@ -197 +201 @@
         contentPane.getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW)
         .put(Shortcut.registerShortcut("system:help", tr("Help"),
-        KeyEvent.VK_F1, Shortcut.GROUP_DIRECT).getKeyStroke(), "Help");
+                KeyEvent.VK_F1, Shortcut.GROUP_DIRECT).getKeyStroke(), "Help");
         contentPane.getActionMap().put("Help", menu.help);
 
@@ -223 +227 @@
     }
     /**
-     * @return The edit osm layer. If none exists, it will be created.
-     */
-    public final OsmDataLayer editLayer() {
-        if (map == null || map.mapView.editLayer == null)
+     * Replies the current edit layer. Creates one if no {@see OsmDataLayer}
+     * exists. Replies null, if the currently active layer isn't an instance
+     * of {@see OsmDataLayer}.
+     * 
+     * @return the current edit layer
+     */
+    public final OsmDataLayer createOrGetEditLayer() {
+        if (map == null || map.mapView.getEditLayer() == null) {
             menu.newAction.actionPerformed(null);
-        return map.mapView.editLayer;
+        }
+        return map.mapView.getEditLayer();
+    }
+
+    /**
+     * Replies true if this map view has an edit layer
+     * 
+     * @return true if this map view has an edit layer
+     */
+    public boolean hasEditLayer() {
+        if (map == null) return false;
+        if (map.mapView == null) return false;
+        if (map.mapView.getEditLayer() == null) return false;
+        return true;
     }
 
@@ -263 +284 @@
         if(!Main.proj.equals(oldProj))
         {
-            if(b != null)
+            if(b != null) {
                 map.mapView.zoomTo(b);
-            /* TODO - remove layers with fixed projection */
+                /* TODO - remove layers with fixed projection */
+            }
         }
     }
@@ -279 +301 @@
             try {
                 String laf = Main.pref.get("laf");
-                if(laf != null && laf.length() > 0)
+                if(laf != null && laf.length() > 0) {
                     UIManager.setLookAndFeel(laf);
+                }
             }
             catch (final javax.swing.UnsupportedLookAndFeelException e) {
@@ -310 +333 @@
                     x = Integer.valueOf(m.group(5));
                     y = Integer.valueOf(m.group(7));
-                    if (m.group(4).equals("-"))
+                    if (m.group(4).equals("-")) {
                         x = screenDimension.width - x - w;
-                    if (m.group(6).equals("-"))
+                    }
+                    if (m.group(6).equals("-")) {
                         y = screenDimension.height - y - h;
+                    }
                 }
                 bounds = new Rectangle(x,y,w,h);
@@ -324 +349 @@
             }
         }
-        if (bounds == null)
+        if (bounds == null) {
             bounds = !args.containsKey("no-maximize") ? new Rectangle(0,0,screenDimension.width,screenDimension.height) : new Rectangle(1000,740);
-
-            // preinitialize a wait dialog for all early downloads (e.g. via command line)
-            pleaseWaitDlg = new PleaseWaitDialog(null);
+        }
+
+        // preinitialize a wait dialog for all early downloads (e.g. via command line)
+        pleaseWaitDlg = new PleaseWaitDialog(null);
     }
 
@@ -335 +361 @@
         pleaseWaitDlg = new PleaseWaitDialog(parent);
 
-        if (args.containsKey("download"))
-            for (String s : args.get("download"))
+        if (args.containsKey("download")) {
+            for (String s : args.get("download")) {
                 downloadFromParamString(false, s);
-        if (args.containsKey("downloadgps"))
-            for (String s : args.get("downloadgps"))
+            }
+        }
+        if (args.containsKey("downloadgps")) {
+            for (String s : args.get("downloadgps")) {
                 downloadFromParamString(true, s);
-        if (args.containsKey("selection"))
-            for (String s : args.get("selection"))
+            }
+        }
+        if (args.containsKey("selection")) {
+            for (String s : args.get("selection")) {
                 SearchAction.search(s, SearchAction.SearchMode.add, false, false);
+            }
+        }
     }
 
@@ -360 +392 @@
             if (modified) {
                 final String msg = uploadedModified ? "\n"
-                +tr("Hint: Some changes came from uploading new data to the server.") : "";
-                int result = new ExtendedDialog(parent, tr("Unsaved Changes"),
-                new javax.swing.JLabel(tr("There are unsaved changes. Discard the changes and continue?")+msg),
-                new String[] {tr("Save and Exit"), tr("Discard and Exit"), tr("Cancel")},
-                new String[] {"save.png", "exit.png", "cancel.png"}).getValue();
-
-                // Save before exiting
-                if(result == 1) {
-                    Boolean savefailed = false;
-                    for (final Layer l : map.mapView.getAllLayers()) {
-                        if (l instanceof OsmDataLayer && ((OsmDataLayer)l).isModified()) {
-                            SaveAction save = new SaveAction(l);
-                            if(!save.doSave())
-                                savefailed = true;
+                        +tr("Hint: Some changes came from uploading new data to the server.") : "";
+                        int result = new ExtendedDialog(parent, tr("Unsaved Changes"),
+                                new javax.swing.JLabel(tr("There are unsaved changes. Discard the changes and continue?")+msg),
+                                new String[] {tr("Save and Exit"), tr("Discard and Exit"), tr("Cancel")},
+                                new String[] {"save.png", "exit.png", "cancel.png"}).getValue();
+
+                        // Save before exiting
+                        if(result == 1) {
+                            Boolean savefailed = false;
+                            for (final Layer l : map.mapView.getAllLayers()) {
+                                if (l instanceof OsmDataLayer && ((OsmDataLayer)l).isModified()) {
+                                    SaveAction save = new SaveAction(l);
+                                    if(!save.doSave()) {
+                                        savefailed = true;
+                                    }
+                                }
+                            }
+                            return savefailed;
                         }
-                    }
-                    return savefailed;
-                }
-                else if(result != 2) // Cancel exiting unless the 2nd button was clicked
-                    return true;
+                        else if(result != 2) // Cancel exiting unless the 2nd button was clicked
+                            return true;
             }
         }
@@ -388 +421 @@
         if (s.startsWith("http:")) {
             final Bounds b = OsmUrlToBounds.parse(s);
-            if (b == null)
+            if (b == null) {
                 JOptionPane.showMessageDialog(Main.parent, tr("Ignoring malformed URL: \"{0}\"", s));
-            else {
+            } else {
                 //DownloadTask osmTask = main.menu.download.downloadTasks.get(0);
                 DownloadTask osmTask = new DownloadOsmTask();
@@ -428 +461 @@
             platform = new PlatformHookWindows();
         } else if (os.equals("Linux") || os.equals("Solaris") ||
-            os.equals("SunOS") || os.equals("AIX") ||
-            os.equals("FreeBSD") || os.equals("NetBSD") || os.equals("OpenBSD")) {
+                os.equals("SunOS") || os.equals("AIX") ||
+                os.equals("FreeBSD") || os.equals("NetBSD") || os.equals("OpenBSD")) {
             platform = new PlatformHookUnixoid();
         } else if (os.toLowerCase().startsWith("mac os x")) {
@@ -468 +501 @@
                 int x = (int)bounds.getX();
                 int y = (int)bounds.getY();
-                if (width > screenDimension.width)
+                if (width > screenDimension.width) {
                     width = screenDimension.width;
-                if (height > screenDimension.height)
+                }
+                if (height > screenDimension.height) {
                     width = screenDimension.height;
-                if (x < 0)
+                }
+                if (x < 0) {
                     x = 0;
-                if (y < 0)
+                }
+                if (y < 0) {
                     y = 0;
+                }
                 newGeometry = width + "x" + height + "+" + x + "+" + y;
             }

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

@@ -8 +8 @@
 import java.awt.event.KeyEvent;
 import java.util.Collection;
+import java.util.HashSet;
 
 import javax.swing.JOptionPane;
@@ -70 +71 @@
         BoundingXYVisitor v = new BoundingXYVisitor();
         if (mode.equals("data")) {
-            for (Layer l : Main.map.mapView.getAllLayers())
+            for (Layer l : Main.map.mapView.getAllLayers()) {
                 l.visitBoundingBox(v);
-        } else if (mode.equals("layer"))
+            }
+        } else if (mode.equals("layer")) {
             Main.map.mapView.getActiveLayer().visitBoundingBox(v);
-        else if (mode.equals("selection") || mode.equals("conflict")) {
-            Collection<OsmPrimitive> sel = mode.equals("selection") ? Main.ds.getSelected()
-                    : Main.map.conflictDialog.conflicts.keySet();
+        } else if (mode.equals("selection") || mode.equals("conflict")) {
+            Collection<OsmPrimitive> sel = new HashSet<OsmPrimitive>();
+            if (mode.equals("selection")) {
+                sel = Main.ds.getSelected();
+            } else if (mode.equals("conflict")) {
+                if (Main.map.conflictDialog.getConflicts() != null) {
+                    sel = Main.map.conflictDialog.getConflicts().getMyConflictParties();
+                }
+            }
             if (sel.isEmpty()) {
                 JOptionPane.showMessageDialog(Main.parent,
@@ -82 +90 @@
                 return null;
             }
-            for (OsmPrimitive osm : sel)
+            for (OsmPrimitive osm : sel) {
                 osm.visit(v);
+            }
             // increase bbox by 0.001 degrees on each side. this is required
             // especially if the bbox contains one single node, but helpful

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

@@ -48 +48 @@
 
         Main.pasteBuffer = copyData();
-        Main.pasteSource = Main.main.editLayer();
+        Main.pasteSource = Main.main.createOrGetEditLayer();
         Main.main.menu.paste.setEnabled(true); /* now we have a paste buffer we can make paste available */
 

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

@@ -25 +25 @@
 
     public void actionPerformed(ActionEvent e) {
-        if(!Main.map.mapView.isVisibleDrawableLayer())
+        if(!Main.map.mapView.isActiveLayerVisible())
             return;
         new org.openstreetmap.josm.actions.mapmode.DeleteAction(Main.map)

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

@@ -28 +28 @@
 
     public void actionPerformed(ActionEvent e) {
-        PasteAction.pasteData(CopyAction.copyData(), Main.main.editLayer(), e);
+        PasteAction.pasteData(CopyAction.copyData(), Main.main.createOrGetEditLayer(), e);
     }
 

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

@@ -64 +64 @@
             return;
 
-        exportGpx(file, this.layer == null ? Main.main.editLayer() : this.layer);
+        exportGpx(file, this.layer == null ? Main.main.createOrGetEditLayer() : this.layer);
     }
 

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

@@ -46 +46 @@
             sc = Shortcut.registerShortcut("core:moveright", tr("Move objects {0}", directiontext), KeyEvent.VK_RIGHT, Shortcut.GROUPS_ALT1+Shortcut.GROUP_DIRECT);
         }
-        if (text) {
+        if (text)
             return directiontext;
-        } else {
+        else
             return sc;
-        }
     }
 
     public MoveAction(Direction dir) {
         super(tr("Move {0}", calltosupermustbefirststatementinconstructor(dir, true)), null,
-              tr("Moves Objects {0}", calltosupermustbefirststatementinconstructor(dir, true)),
-              (Shortcut)calltosupermustbefirststatementinconstructor(dir, false), true);
+                tr("Moves Objects {0}", calltosupermustbefirststatementinconstructor(dir, true)),
+                (Shortcut)calltosupermustbefirststatementinconstructor(dir, false), true);
         myDirection = dir;
     }
@@ -92 +91 @@
         ? Main.main.undoRedo.commands.getLast() : null;
 
-        if (c instanceof MoveCommand && affectedNodes.equals(((MoveCommand)c).objects))
+        if (c instanceof MoveCommand && affectedNodes.equals(((MoveCommand)c).getMovedNodes())) {
             ((MoveCommand)c).moveAgain(distx, disty);
-        else
+        } else {
             Main.main.undoRedo.add(
                     c = new MoveCommand(selection, distx, disty));
+        }
 
         for (Node n : affectedNodes) {

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

@@ -69 +69 @@
             Node nnew = new Node(n);
             nnew.id = 0;
-            if (Main.main.editLayer() == source) {
+            if (Main.main.createOrGetEditLayer() == source) {
                 nnew.setEastNorth(nnew.getEastNorth().add(offsetEast, offsetNorth));
             }

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

@@ -20 +20 @@
 import org.apache.tools.bzip2.CBZip2OutputStream;
 import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.data.conflict.ConflictCollection;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.gui.ExtendedDialog;
@@ -49 +50 @@
         Layer layer = this.layer;
         if (layer == null && Main.map != null && (Main.map.mapView.getActiveLayer() instanceof OsmDataLayer
-                || Main.map.mapView.getActiveLayer() instanceof GpxLayer))
+                || Main.map.mapView.getActiveLayer() instanceof GpxLayer)) {
             layer = Main.map.mapView.getActiveLayer();
-        if (layer == null)
-            layer = Main.main.editLayer();
+        }
+        if (layer == null) {
+            layer = Main.main.createOrGetEditLayer();
+        }
 
         if (!checkSaveConditions(layer))
@@ -87 +90 @@
         }
 
-        if (layer instanceof OsmDataLayer && isDataSetEmpty((OsmDataLayer)layer) && 1 != new ExtendedDialog(Main.parent, tr("Empty document"), tr("The document contains no data."), new String[] {tr("Save anyway"), tr("Cancel")}, new String[] {"save.png", "cancel.png"}).getValue()) {
-            return false;
-        }
-        if (layer instanceof GpxLayer && ((GpxLayer)layer).data == null) {
-            return false;
-        }
-        if (!Main.map.conflictDialog.conflicts.isEmpty()) {
-            int answer = new ExtendedDialog(Main.parent,
-                tr("Conflicts"),
-                tr("There are unresolved conflicts. Conflicts will not be saved and handled as if you rejected all. Continue?"),
-                new String[] {tr("Reject Conflicts and Save"), tr("Cancel")},
-                new String[] {"save.png", "cancel.png"}).getValue();
-
-            if (answer != 1) return false;
+        if (layer instanceof OsmDataLayer && isDataSetEmpty((OsmDataLayer)layer) && 1 != new ExtendedDialog(Main.parent, tr("Empty document"), tr("The document contains no data."), new String[] {tr("Save anyway"), tr("Cancel")}, new String[] {"save.png", "cancel.png"}).getValue())
+            return false;
+        if (layer instanceof GpxLayer && ((GpxLayer)layer).data == null)
+            return false;
+        if (layer instanceof OsmDataLayer)  {
+            ConflictCollection conflicts = ((OsmDataLayer)layer).getConflicts();
+            if (conflicts != null && !conflicts.isEmpty()) {
+                int answer = new ExtendedDialog(Main.parent,
+                        tr("Conflicts"),
+                        tr("There are unresolved conflicts. Conflicts will not be saved and handled as if you rejected all. Continue?"),
+                        new String[] {tr("Reject Conflicts and Save"), tr("Cancel")},
+                        new String[] {"save.png", "cancel.png"}).getValue();
+
+                if (answer != 1) return false;
+            }
         }
         return true;
@@ -148 +152 @@
             OsmGzipImporter osmGzipImporter = new OsmGzipImporter();
             OsmBzip2Importer osmBzip2Importer = new OsmBzip2Importer();
-            if (gpxImExporter.acceptFile(file))
+            if (gpxImExporter.acceptFile(file)) {
                 GpxExportAction.exportGpx(file, layer);
-            else if (osmImExporter.acceptFile(file)
+            } else if (osmImExporter.acceptFile(file)
                     || osmGzipImporter.acceptFile(file)
                     || osmBzip2Importer.acceptFile(file))
@@ -180 +184 @@
                 w.close();
                 // FIXME - how to close?
-                if (!Main.pref.getBoolean("save.keepbackup") && (tmpFile != null))
+                if (!Main.pref.getBoolean("save.keepbackup") && (tmpFile != null)) {
                     tmpFile.delete();
+                }
             } else {
                 JOptionPane.showMessageDialog(Main.parent, tr("Unknown file extension."));

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

@@ -32 +32 @@
         int bboxCount = 0;
         List<Area> areas = new ArrayList<Area>();
-        for(DataSource ds : Main.main.editLayer().data.dataSources) {
+        for(DataSource ds : Main.main.createOrGetEditLayer().data.dataSources) {
             areas.add(new Area(ds.bounds.asRect()));
         }

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

@@ -35 +35 @@
     protected void handlePrimitiveGoneException(long id) {
         MultiFetchServerObjectReader reader = new MultiFetchServerObjectReader();
-        reader.append(Main.main.editLayer().data,id);
+        reader.append(Main.main.createOrGetEditLayer().data,id);
         DataSet ds = null;
         try {
@@ -43 +43 @@
             return;
         }
-        Main.main.editLayer().mergeFrom(ds);
+        Main.main.createOrGetEditLayer().mergeFrom(ds);
     }
 
@@ -90 +90 @@
             return;
         }
-        Main.main.editLayer().mergeFrom(ds);
+        Main.main.createOrGetEditLayer().mergeFrom(ds);
     }
 
     public void updatePrimitive(long id) {
-        OsmPrimitive primitive = Main.main.editLayer().data.getPrimitiveById(id);
+        OsmPrimitive primitive = Main.main.createOrGetEditLayer().data.getPrimitiveById(id);
         Set<OsmPrimitive> s = new HashSet<OsmPrimitive>();
         s.add(primitive);

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

@@ -23 +23 @@
 
 import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.data.conflict.ConflictCollection;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.gui.ExtendedDialog;
@@ -159 +160 @@
         }
 
-        if (!Main.map.conflictDialog.conflicts.isEmpty()) {
+        ConflictCollection conflicts = Main.main.createOrGetEditLayer().getConflicts();
+        if (conflicts !=null && !conflicts.isEmpty()) {
             JOptionPane.showMessageDialog(Main.parent,tr("There are unresolved conflicts. You have to resolve these first."));
             Main.map.conflictDialog.action.button.setSelected(true);
@@ -212 +214 @@
                 try {
                     server.uploadOsm(Main.ds.version, all);
-                    Main.main.editLayer().cleanData(server.processed, !add.isEmpty());
+                    Main.main.createOrGetEditLayer().cleanData(server.processed, !add.isEmpty());
                 } catch (Exception sxe) {
                     if (uploadCancelled) {

trunk/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java

@@ -39 +39 @@
         private DataSet dataSet;
         private boolean newLayer;
-        private int num = 1;
         private String msg = "";
 
@@ -69 +68 @@
             }
             rememberDownloadedData(dataSet);
-            OsmDataLayer layer = new OsmDataLayer(dataSet, tr("Data Layer {0}", num), null);
+            OsmDataLayer layer = new OsmDataLayer(dataSet, OsmDataLayer.createNewName(), null);
             if (newLayer) {
                 Main.main.addLayer(layer);
             } else {
-                Main.main.editLayer().mergeFrom(layer);
+                Main.main.createOrGetEditLayer().mergeFrom(layer);
             }
 

trunk/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java

@@ -42 +42 @@
     public void download(boolean newLayer, List<Rectangle2D> rects) {
         if(newLayer) {
-            Layer l = new OsmDataLayer(new DataSet(), tr("Data Layer"), null);
+            Layer l = new OsmDataLayer(new DataSet(), OsmDataLayer.createNewName(), null);
             Main.main.addLayer(l);
             Main.map.mapView.setActiveLayer(l);
@@ -98 +98 @@
         }
 
-        Set<Long> myPrimitiveIds = Main.main.editLayer().data.getPrimitiveIds();
+        Set<Long> myPrimitiveIds = Main.main.createOrGetEditLayer().data.getPrimitiveIds();
         Set<Long> downloadedIds = getDownloadedIds();
         myPrimitiveIds.removeAll(downloadedIds);
@@ -108 +108 @@
 
     protected void checkPotentiallyDeletedPrimitives(Set<Long> potentiallyDeleted) {
-        DataSet ds =  Main.main.editLayer().data;
+        DataSet ds =  Main.main.createOrGetEditLayer().data;
         ArrayList<OsmPrimitive> toSelect = new ArrayList<OsmPrimitive>();
         for (Long id : potentiallyDeleted) {

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

@@ -64 +64 @@
     @Override public void actionPerformed(ActionEvent e) {
         super.actionPerformed(e);
-        if(!Main.map.mapView.isDrawableLayer())
+        if(!Main.map.mapView.isActiveLayerDrawable())
             return;
         doActionPerformed(e);
@@ -70 +70 @@
 
     public void doActionPerformed(ActionEvent e) {
-        if(!Main.map.mapView.isDrawableLayer())
+        if(!Main.map.mapView.isActiveLayerDrawable())
             return;
         boolean ctrl = (e.getModifiers() & ActionEvent.CTRL_MASK) != 0;
@@ -96 +96 @@
         if (e.getButton() != MouseEvent.BUTTON1)
             return;
-        if(!Main.map.mapView.isVisibleDrawableLayer())
+        if(!Main.map.mapView.isActiveLayerVisible())
             return;
         boolean ctrl = (e.getModifiers() & ActionEvent.CTRL_MASK) != 0;

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

@@ -240 +240 @@
      */
     public void eventDispatched(AWTEvent event) {
-        if(Main.map == null || Main.map.mapView == null || !Main.map.mapView.isDrawableLayer())
+        if(Main.map == null || Main.map.mapView == null || !Main.map.mapView.isActiveLayerDrawable())
             return;
         updateKeyModifiers((InputEvent) event);
@@ -251 +251 @@
      */
     public void selectionChanged(Collection<? extends OsmPrimitive> newSelection) {
-        if(!Main.map.mapView.isDrawableLayer())
+        if(!Main.map.mapView.isActiveLayerDrawable())
             return;
         computeHelperLine();
@@ -288 +288 @@
         if (e.getButton() != MouseEvent.BUTTON1)
             return;
-        if(!Main.map.mapView.isDrawableLayer())
+        if(!Main.map.mapView.isActiveLayerDrawable())
             return;
 
@@ -576 +576 @@
 
     @Override public void mouseMoved(MouseEvent e) {
-        if(!Main.map.mapView.isDrawableLayer())
+        if(!Main.map.mapView.isActiveLayerDrawable())
             return;
 
@@ -705 +705 @@
      */
     @Override public void mouseExited(MouseEvent e) {
-        if(!Main.map.mapView.isDrawableLayer())
+        if(!Main.map.mapView.isActiveLayerDrawable())
             return;
         mousePos = e.getPoint();

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

@@ -126 +126 @@
      */
     @Override public void mouseDragged(MouseEvent e) {
-        if(!Main.map.mapView.isVisibleDrawableLayer())
+        if(!Main.map.mapView.isActiveLayerVisible())
             return;
         if (mode == Mode.select) return;
@@ -195 +195 @@
      */
     @Override public void mousePressed(MouseEvent e) {
-        if(!Main.map.mapView.isVisibleDrawableLayer())
+        if(!Main.map.mapView.isActiveLayerVisible())
             return;
         if (!(Boolean)this.getValue("active")) return;
@@ -227 +227 @@
      */
     @Override public void mouseReleased(MouseEvent e) {
-        if(!Main.map.mapView.isVisibleDrawableLayer())
+        if(!Main.map.mapView.isActiveLayerVisible())
             return;
         restoreCursor();

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

@@ -96 +96 @@
     public SelectAction(MapFrame mapFrame) {
         super(tr("Select"), "move/move", tr("Select, move and rotate objects"),
-            Shortcut.registerShortcut("mapmode:select", tr("Mode: {0}", tr("Select")), KeyEvent.VK_S, Shortcut.GROUP_EDIT),
-            mapFrame,
-            getCursor("normal", "selection", Cursor.DEFAULT_CURSOR));
+                Shortcut.registerShortcut("mapmode:select", tr("Mode: {0}", tr("Select")), KeyEvent.VK_S, Shortcut.GROUP_EDIT),
+                mapFrame,
+                getCursor("normal", "selection", Cursor.DEFAULT_CURSOR));
         putValue("help", "Action/Move/Move");
         selectionManager = new SelectionManager(this, false, mapFrame.mapView);
@@ -131 +131 @@
         Main.map.mapView.addMouseListener(this);
         Main.map.mapView.addMouseMotionListener(this);
-        Main.map.mapView.enableVirtualNodes(
-        Main.pref.getInteger("mappaint.node.virtual-size", 8) != 0);
+        Main.map.mapView.setVirtualNodesEnabled(
+                Main.pref.getInteger("mappaint.node.virtual-size", 8) != 0);
     }
 
@@ -140 +140 @@
         Main.map.mapView.removeMouseListener(this);
         Main.map.mapView.removeMouseMotionListener(this);
-        Main.map.mapView.enableVirtualNodes(false);
+        Main.map.mapView.setVirtualNodesEnabled(false);
     }
 
@@ -149 +149 @@
      */
     @Override public void mouseDragged(MouseEvent e) {
-        if(!Main.map.mapView.isVisibleDrawableLayer())
+        if(!Main.map.mapView.isActiveLayerVisible())
             return;
 
@@ -162 +162 @@
                 return;
 
-        if (mode == Mode.move)
+        if (mode == Mode.move) {
             setCursor(Cursor.getPredefinedCursor(Cursor.MOVE_CURSOR));
+        }
 
         if (mousePos == null) {
@@ -196 +197 @@
             virtualCmds.add(new MoveCommand(virtualNode, dx, dy));
             String text = trn("Add and move a virtual new node to way",
-            "Add and move a virtual new node to {0} ways", virtualWays.size(),
-            virtualWays.size());
+                    "Add and move a virtual new node to {0} ways", virtualWays.size(),
+                    virtualWays.size());
 
             Main.main.undoRedo.add(new SequenceCommand(text, virtualCmds));
@@ -214 +215 @@
 
             Command c = !Main.main.undoRedo.commands.isEmpty()
-                ? Main.main.undoRedo.commands.getLast() : null;
-            if (c instanceof SequenceCommand)
+            ? Main.main.undoRedo.commands.getLast() : null;
+            if (c instanceof SequenceCommand) {
                 c = ((SequenceCommand)c).getLastCommand();
+            }
 
             if (mode == Mode.move) {
-                if (c instanceof MoveCommand && affectedNodes.equals(((MoveCommand)c).objects))
+                if (c instanceof MoveCommand && affectedNodes.equals(((MoveCommand)c).getMovedNodes())) {
                     ((MoveCommand)c).moveAgain(dx,dy);
-                else
+                } else {
                     Main.main.undoRedo.add(
-                        c = new MoveCommand(selection, dx, dy));
+                            c = new MoveCommand(selection, dx, dy));
+                }
 
                 for (Node n : affectedNodes) {
@@ -231 +234 @@
 
                         JOptionPane.showMessageDialog(Main.parent,
-                            tr("Cannot move objects outside of the world."));
+                                tr("Cannot move objects outside of the world."));
                         restoreCursor();
                         return;
@@ -237 +240 @@
                 }
             } else if (mode == Mode.rotate) {
-                if (c instanceof RotateCommand && affectedNodes.equals(((RotateCommand)c).objects))
+                if (c instanceof RotateCommand && affectedNodes.equals(((RotateCommand)c).getRotatedNodes())) {
                     ((RotateCommand)c).rotateAgain(mouseStartEN, mouseEN);
-                else
+                } else {
                     Main.main.undoRedo.add(new RotateCommand(selection, mouseStartEN, mouseEN));
+                }
             }
         }
@@ -255 +259 @@
      */
     @Override public void mouseMoved(MouseEvent e) {
-        if (needMouseMove && mode == Mode.rotate)
+        if (needMouseMove && mode == Mode.rotate) {
             mouseDragged(e);
+        }
     }
 
@@ -271 +276 @@
         {
             Collection<WaySegment> nearestWaySegs = allSegements
-                 ? c.getNearestWaySegments(p)
-                 : Collections.singleton(c.getNearestWaySegment(p));
+            ? c.getNearestWaySegments(p)
+                    : Collections.singleton(c.getNearestWaySegment(p));
 
             for(WaySegment nearestWS : nearestWaySegs) {
-                if (nearestWS == null)
+                if (nearestWS == null) {
                     continue;
+                }
 
                 osm = nearestWS.way;
@@ -294 +300 @@
                             if(virtualWayNode != null) {
                                 if(  !w.nodes.get(nearestWS.lowerIndex+1).equals(virtualWayNode)
-                                  && !w.nodes.get(nearestWS.lowerIndex  ).equals(virtualWayNode))
+                                        && !w.nodes.get(nearestWS.lowerIndex  ).equals(virtualWayNode)) {
                                     continue;
-                            } else
+                                }
+                            } else {
                                 virtualWayNode = w.nodes.get(nearestWS.lowerIndex+1);
+                            }
 
                             virtualWays.add(nearestWS);
-                            if(virtualNode == null)
+                            if(virtualNode == null) {
                                 virtualNode = new Node(Main.map.mapView.getLatLon(pc.x, pc.y));
+                            }
                         }
                     }
@@ -322 +331 @@
      */
     @Override public void mousePressed(MouseEvent e) {
-        if(!Main.map.mapView.isVisibleDrawableLayer())
+        if(!Main.map.mapView.isActiveLayerVisible())
             return;
 
@@ -335 +344 @@
         // We don't want to change to draw tool if the user tries to (de)select
         // stuff but accidentally clicks in an empty area when selection is empty
-        if(shift || ctrl)
+        if(shift || ctrl) {
             cancelDrawMode = true;
+        }
 
         mouseDownTime = System.currentTimeMillis();
@@ -345 +355 @@
 
         if (ctrl && shift) {
-            if (Main.ds.getSelected().isEmpty()) selectPrims(osmColl, true, false, false, false);
+            if (Main.ds.getSelected().isEmpty()) {
+                selectPrims(osmColl, true, false, false, false);
+            }
             mode = Mode.rotate;
             setCursor(ImageProvider.getCursor("rotate", null));
@@ -354 +366 @@
             // move.
             selectPrims(osmColl,
-                shift || Main.ds.getSelected().containsAll(osmColl),
-                ctrl, false, false);
+                    shift || Main.ds.getSelected().containsAll(osmColl),
+                    ctrl, false, false);
             mode = Mode.move;
         } else {
@@ -373 +385 @@
         // Mode.move   redraws when mouseDragged is called
         // Mode.rotate redraws here
-        if(mode == Mode.rotate)
+        if(mode == Mode.rotate) {
             Main.map.mapView.repaint();
+        }
 
         mousePos = e.getPoint();
@@ -383 +396 @@
      */
     @Override public void mouseReleased(MouseEvent e) {
-        if(!Main.map.mapView.isVisibleDrawableLayer())
+        if(!Main.map.mapView.isActiveLayerVisible())
             return;
 
@@ -402 +415 @@
             if (!didMove) {
                 selectPrims(
-                    Main.map.mapView.getNearestCollection(e.getPoint()),
-                    shift, ctrl, true, false);
+                        Main.map.mapView.getNearestCollection(e.getPoint()),
+                        shift, ctrl, true, false);
 
                 // If the user double-clicked a node, change to draw mode
@@ -423 +436 @@
                 for (OsmPrimitive osm : selection)
                 {
-                    if(osm instanceof Node)
+                    if(osm instanceof Node) {
                         s.add(osm);
-                    else if(osm instanceof Way)
+                    } else if(osm instanceof Way)
                     {
                         s.add(osm);
@@ -433 +446 @@
                     {
                         if(1 != new ExtendedDialog(Main.parent, tr("Move elements"),
-                        tr("You did move more than {0} elements. "
-                        + "Moving a large number of elements is often an error.\n"
-                        + "Really move them?", max),
-                        new String[] {tr("Move them"), tr("Undo move")},
-                        new String[] {"reorder.png", "cancel.png"}).getValue())
+                                tr("You did move more than {0} elements. "
+                                        + "Moving a large number of elements is often an error.\n"
+                                        + "Really move them?", max),
+                                        new String[] {tr("Move them"), tr("Undo move")},
+                                        new String[] {"reorder.png", "cancel.png"}).getValue())
                         {
                             Main.main.undoRedo.undo();
@@ -451 +464 @@
                         LinkedList<Node> selNodes = new LinkedList<Node>();
                         for (OsmPrimitive osm : selection)
-                            if (osm instanceof Node)
+                            if (osm instanceof Node) {
                                 selNodes.add((Node)osm);
+                            }
                         if (selNodes.size() > 0) {
                             selNodes.add(n);
@@ -474 +488 @@
 
     public void selectPrims(Collection<OsmPrimitive> selectionList, boolean shift,
-    boolean ctrl, boolean released, boolean area) {
+            boolean ctrl, boolean released, boolean area) {
         if ((shift && ctrl) || (ctrl && !released))
             return; // not allowed together
 
         Collection<OsmPrimitive> curSel;
-        if (!ctrl && !shift)
+        if (!ctrl && !shift) {
             curSel = new LinkedList<OsmPrimitive>(); // new selection will replace the old.
-        else
+        } else {
             curSel = Main.ds.getSelected();
+        }
 
         for (OsmPrimitive osm : selectionList)
@@ -488 +503 @@
             if (ctrl)
             {
-                if(curSel.contains(osm))
+                if(curSel.contains(osm)) {
                     curSel.remove(osm);
-                else if(!area)
+                } else if(!area) {
                     curSel.add(osm);
-            }
-            else
+                }
+            } else {
                 curSel.add(osm);
+            }
         }
         Main.ds.setSelected(curSel);
@@ -501 +517 @@
 
     @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.move) {
+        else if (mode == Mode.move)
             return tr("Release the mouse button to stop moving. Ctrl to merge with nearest node.");
-        } else if (mode == Mode.rotate) {
+        else if (mode == Mode.rotate)
             return tr("Release the mouse button to stop rotating.");
-        } else {
+        else
             return tr("Move objects by dragging; Shift to add to selection (Ctrl to toggle); Shift-Ctrl to rotate selected; or change selection");
-        }
     }
 

trunk/src/org/openstreetmap/josm/command/AddCommand.java

@@ -10 +10 @@
 import javax.swing.tree.MutableTreeNode;
 
-import org.openstreetmap.josm.Main;
-import org.openstreetmap.josm.data.osm.DataSet;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.data.osm.visitor.AddVisitor;
 import org.openstreetmap.josm.data.osm.visitor.DeleteVisitor;
 import org.openstreetmap.josm.data.osm.visitor.NameVisitor;
-import org.openstreetmap.josm.gui.layer.Layer;
-import org.openstreetmap.josm.gui.layer.OsmDataLayer;
 
 /**
@@ -23 +19 @@
  * way.
  *
- * See {@link ChangeCommand ChangeCommand} for comments on relation back references.
+ * See {@see ChangeCommand} for comments on relation back references.
  *
  * @author imi
@@ -34 +30 @@
     private final OsmPrimitive osm;
 
-    private DataSet ds;
-
     /**
      * Create the command and specify the element to add.
      */
     public AddCommand(OsmPrimitive osm) {
+        super();
         this.osm = osm;
-        this.ds = Main.main.editLayer().data;
     }
 
     @Override public boolean executeCommand() {
-        osm.visit(new AddVisitor(ds));
+        osm.visit(new AddVisitor(getLayer().data));
         return true;
     }
 
     @Override public void undoCommand() {
-        osm.visit(new DeleteVisitor(ds));
+        osm.visit(new DeleteVisitor(getLayer().data));
     }
 
@@ -57 +51 @@
     }
 
-    // faster implementation
-    @Override public boolean invalidBecauselayerRemoved(Layer oldLayer) {
-        return oldLayer instanceof OsmDataLayer && ((OsmDataLayer)oldLayer).data == ds;
-    }
-
     @Override public MutableTreeNode description() {
         NameVisitor v = new NameVisitor();
         osm.visit(v);
-        return new DefaultMutableTreeNode(new JLabel(tr("Add")+" "+tr(v.className)+" "+v.name, v.icon, JLabel.HORIZONTAL));
+        return new DefaultMutableTreeNode(
+                new JLabel(tr("Add {0} {1}", tr(v.className), v.name), v.icon, JLabel.HORIZONTAL));
     }
 }

trunk/src/org/openstreetmap/josm/command/ChangeCommand.java

@@ -25 +25 @@
 
     public ChangeCommand(OsmPrimitive osm, OsmPrimitive newOsm) {
+        super();
         this.osm = osm;
         this.newOsm = newOsm;
@@ -43 +44 @@
         NameVisitor v = new NameVisitor();
         osm.visit(v);
-        return new DefaultMutableTreeNode(new JLabel(tr("Change")+" "+tr(v.className)+" "+v.name, v.icon, JLabel.HORIZONTAL));
+        return new DefaultMutableTreeNode(new JLabel(tr("Change {0} {1}", tr(v.className), v.name), v.icon, JLabel.HORIZONTAL));
     }
 }

trunk/src/org/openstreetmap/josm/command/ChangePropertyCommand.java

@@ -40 +40 @@
 
     public ChangePropertyCommand(Collection<? extends OsmPrimitive> objects, String key, String value) {
+        super();
         this.objects = new LinkedList<OsmPrimitive>();
         this.key = key;
@@ -45 +46 @@
         if (value == null) {
             for (OsmPrimitive osm : objects) {
-                if(osm.get(key) != null)
+                if(osm.get(key) != null) {
                     this.objects.add(osm);
+                }
             }
         } else {
@@ -64 +66 @@
         String val = object.get(key);
         if ((value == null && val != null)
-        || (value != null && (val == null || !value.equals(val))))
+                || (value != null && (val == null || !value.equals(val)))) {
             this.objects.add(object);
+        }
     }
 
@@ -95 +98 @@
             text = value == null
             ? tr("Remove \"{0}\" for {1} ''{2}''", key, tr(v.className), v.name)
-            : tr("Set {0}={1} for {2} ''{3}''",key,value, tr(v.className), v.name);
+                    : tr("Set {0}={1} for {2} ''{3}''",key,value, tr(v.className), v.name);
         }
         else
@@ -101 +104 @@
             text = value == null
             ? tr("Remove \"{0}\" for {1} {2}", key, objects.size(), trn("object","objects",objects.size()))
-            : tr("Set {0}={1} for {2} {3}",key,value, objects.size(), trn("object","objects",objects.size()));
+                    : tr("Set {0}={1} for {2} {3}",key,value, objects.size(), trn("object","objects",objects.size()));
         }
         DefaultMutableTreeNode root = new DefaultMutableTreeNode(new JLabel(text, ImageProvider.get("data", "key"), JLabel.HORIZONTAL));

trunk/src/org/openstreetmap/josm/command/ChangeRelationMemberRoleCommand.java

@@ -13 +13 @@
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.data.osm.Relation;
-import org.openstreetmap.josm.data.osm.RelationMember;
-
 import org.openstreetmap.josm.data.osm.visitor.NameVisitor;
 
@@ -36 +34 @@
 
     public ChangeRelationMemberRoleCommand(Relation relation, int position, String newRole) {
+        super();
         this.relation = relation;
         this.position = position;
@@ -67 +66 @@
         NameVisitor v = new NameVisitor();
         relation.visit(v);
-        return new DefaultMutableTreeNode(new JLabel(tr("ChangeRelationMemberRole")+" "+tr(v.className)+" "+v.name, v.icon, JLabel.HORIZONTAL));
+        return new DefaultMutableTreeNode(new JLabel(tr("ChangeRelationMemberRole {0} {1}", tr(v.className), v.name), v.icon, JLabel.HORIZONTAL));
     }
 }

trunk/src/org/openstreetmap/josm/command/Command.java

@@ -11 +11 @@
 
 import org.openstreetmap.josm.Main;
-import org.openstreetmap.josm.data.osm.DataSet;
 import org.openstreetmap.josm.data.osm.Node;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
@@ -25 +24 @@
  * one atomic action on a specific dataset, such as move or delete.
  *
- * Remember that the command must be executable and undoable, even if the
- * Main.ds has changed, so the command must save the dataset it operates on
- * if necessary.
- *
+ * The command remembers the {@see OsmDataLayer} it is operating on.
+ * 
  * @author imi
  */
 abstract public class Command {
 
-   private static final class CloneVisitor extends AbstractVisitor {
-      public Map<OsmPrimitive, OsmPrimitive> orig = new HashMap<OsmPrimitive, OsmPrimitive>();
+    private static final class CloneVisitor extends AbstractVisitor {
+        public Map<OsmPrimitive, OsmPrimitive> orig = new HashMap<OsmPrimitive, OsmPrimitive>();
 
-      public void visit(Node n) {
-         orig.put(n, new Node(n));
-      }
-      public void visit(Way w) {
-         orig.put(w, new Way(w));
-      }
-      public void visit(Relation e) {
-         orig.put(e, new Relation(e));
-      }
-   }
+        public void visit(Node n) {
+            orig.put(n, new Node(n));
+        }
+        public void visit(Way w) {
+            orig.put(w, new Way(w));
+        }
+        public void visit(Relation e) {
+            orig.put(e, new Relation(e));
+        }
+    }
 
-   private CloneVisitor orig;
+    /** the map of OsmPrimitives in the original state to OsmPrimitives in cloned state */
+    private Map<OsmPrimitive, OsmPrimitive> cloneMap = new HashMap<OsmPrimitive, OsmPrimitive>();
 
-   protected DataSet ds;
+    /** the layer which this command is applied to */
+    private OsmDataLayer layer;
 
-   public Command() {
-      this.ds = Main.main.editLayer().data;
-   }
-   /**
-    * Executes the command on the dataset. This implementation will remember all
-    * primitives returned by fillModifiedData for restoring them on undo.
-    */
-   public boolean did_execute = false;
-   public boolean executeCommand() {
-      did_execute = true;
-      orig = new CloneVisitor();
-      Collection<OsmPrimitive> all = new HashSet<OsmPrimitive>();
-      fillModifiedData(all, all, all);
-      for (OsmPrimitive osm : all)
-         osm.visit(orig);
-      return true;
-   }
+    public Command() {
+        this.layer = Main.main.map.mapView.getEditLayer();
+    }
+    /**
+     * Executes the command on the dataset. This implementation will remember all
+     * primitives returned by fillModifiedData for restoring them on undo.
+     */
+    public boolean executeCommand() {
+        CloneVisitor visitor = new CloneVisitor();
+        Collection<OsmPrimitive> all = new HashSet<OsmPrimitive>();
+        fillModifiedData(all, all, all);
+        for (OsmPrimitive osm : all) {
+            osm.visit(visitor);
+        }
+        cloneMap = visitor.orig;
+        return true;
+    }
 
-   /**
-    * Undoes the command.
-    * It can be assumed that all objects are in the same state they were before.
-    * It can also be assumed that executeCommand was called exactly once before.
-    *
-    * This implementation undoes all objects stored by a former call to executeCommand.
-    */
-   public void undoCommand() {
-      for (Entry<OsmPrimitive, OsmPrimitive> e : orig.orig.entrySet())
-         e.getKey().cloneFrom(e.getValue());
-   }
+    /**
+     * Undoes the command.
+     * It can be assumed that all objects are in the same state they were before.
+     * It can also be assumed that executeCommand was called exactly once before.
+     *
+     * This implementation undoes all objects stored by a former call to executeCommand.
+     */
+    public void undoCommand() {
+        for (Entry<OsmPrimitive, OsmPrimitive> e : cloneMap.entrySet()) {
+            e.getKey().cloneFrom(e.getValue());
+        }
+    }
 
-   /**
-    * Called when a layer has been removed to have the command remove itself from
-    * any buffer if it is not longer applicable to the dataset (e.g. it was part of
-    * the removed layer)
-    */
-   public boolean invalidBecauselayerRemoved(Layer oldLayer) {
-      if (!(oldLayer instanceof OsmDataLayer))
-         return false;
-      HashSet<OsmPrimitive> modified = new HashSet<OsmPrimitive>();
-      fillModifiedData(modified, modified, modified);
-      if (modified.isEmpty())
-         return false;
-
-      HashSet<OsmPrimitive> all = new HashSet<OsmPrimitive>(((OsmDataLayer)oldLayer).data.allPrimitives());
-      for (OsmPrimitive osm : all)
-         if (all.contains(osm))
-                 return true;
-
-      return false;
-   }
+    /**
+     * Called when a layer has been removed to have the command remove itself from
+     * any buffer if it is not longer applicable to the dataset (e.g. it was part of
+     * the removed layer)
+     * 
+     * @param oldLayer the old layer
+     * @return true if this command
+     */
+    public boolean invalidBecauselayerRemoved(Layer oldLayer) {
+        if (!(oldLayer instanceof OsmDataLayer))
+            return false;
+        return layer == oldLayer;
+    }
 
     /**
@@ -107 +100 @@
      */
     public OsmPrimitive getOrig(OsmPrimitive osm) {
-        OsmPrimitive o = orig.orig.get(osm);
+        OsmPrimitive o = cloneMap.get(osm);
         if (o != null)
-             return o;
+            return o;
         Main.debug("unable to find osm with id: " + osm.id + " hashCode: " + osm.hashCode());
-        for (OsmPrimitive t : orig.orig.keySet()) {
-             OsmPrimitive to = orig.orig.get(t);
-             Main.debug("now: " + t.id + " hashCode: " + t.hashCode());
-             Main.debug("orig: " + to.id + " hashCode: " + to.hashCode());
+        for (OsmPrimitive t : cloneMap.keySet()) {
+            OsmPrimitive to = cloneMap.get(t);
+            Main.debug("now: " + t.id + " hashCode: " + t.hashCode());
+            Main.debug("orig: " + to.id + " hashCode: " + to.hashCode());
         }
         return o;
     }
 
-   /**
-    * Fill in the changed data this command operates on.
-    * Add to the lists, don't clear them.
-    *
-    * @param modified The modified primitives
-    * @param deleted The deleted primitives
-    * @param added The added primitives
-    */
-   abstract public void fillModifiedData(Collection<OsmPrimitive> modified,
-         Collection<OsmPrimitive> deleted,
-         Collection<OsmPrimitive> added);
+    /**
+     * Replies the layer this command is (or was) applied to.
+     * 
+     * @return
+     */
+    protected  OsmDataLayer getLayer() {
+        return layer;
+    }
 
-   abstract public MutableTreeNode description();
+    /**
+     * Fill in the changed data this command operates on.
+     * Add to the lists, don't clear them.
+     *
+     * @param modified The modified primitives
+     * @param deleted The deleted primitives
+     * @param added The added primitives
+     */
+    abstract public void fillModifiedData(Collection<OsmPrimitive> modified,
+            Collection<OsmPrimitive> deleted,
+            Collection<OsmPrimitive> added);
+
+    abstract public MutableTreeNode description();
+
+
+
 }

trunk/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java

@@ -10 +10 @@
 import javax.swing.tree.MutableTreeNode;
 
-import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.data.conflict.Conflict;
 import org.openstreetmap.josm.data.osm.Node;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
-import org.openstreetmap.josm.data.osm.Relation;
-import org.openstreetmap.josm.data.osm.Way;
 import org.openstreetmap.josm.gui.conflict.MergeDecisionType;
 import org.openstreetmap.josm.tools.ImageProvider;
@@ -22 +20 @@
  *
  */
-public class CoordinateConflictResolveCommand extends Command {
+public class CoordinateConflictResolveCommand extends ConflictResolveCommand {
 
-    /** my node (in the local dataset). merge decisions are applied to this
-     *  node
-     */
-    private final Node my;
-    /** their node (in the server dataset) */
-    private final Node their;
+    /** the conflict to resolve */
+    private Conflict<Node> conflict;
 
     /** the merge decision */
@@ -42 +36 @@
      */
     public CoordinateConflictResolveCommand(Node my, Node their, MergeDecisionType decision) {
-        this.my = my;
-        this.their = their;
+        this.conflict = new Conflict<Node>(my,their);
         this.decision = decision;
     }
@@ -52 +45 @@
         return new DefaultMutableTreeNode(
                 new JLabel(
-                        tr("Resolve conflicts in coordinates in {0}",my.id),
+                        tr("Resolve conflicts in coordinates in {0}",conflict.getMy().id),
                         ImageProvider.get("data", "object"),
                         JLabel.HORIZONTAL
@@ -69 +62 @@
             // do nothing
         } else if (decision.equals(MergeDecisionType.KEEP_THEIR)) {
+            Node my = conflict.getMy();
+            Node their = conflict.getTheir();
             my.setCoor(their.getCoor());
         } else
             // should not happen
             throw new IllegalStateException(tr("cannot resolve undecided conflict"));
+
+        // remember the layer this command was applied to
+        //
+        rememberConflict(conflict);
 
         return true;
@@ -80 +79 @@
     public void fillModifiedData(Collection<OsmPrimitive> modified, Collection<OsmPrimitive> deleted,
             Collection<OsmPrimitive> added) {
-        modified.add(my);
-    }
-
-    @Override
-    public void undoCommand() {
-        // restore former state of modified primitives
-        //
-        super.undoCommand();
-
-        // restore a conflict if necessary
-        //
-        if (!Main.map.conflictDialog.conflicts.containsKey(my)) {
-            Main.map.conflictDialog.addConflict(my, their);
-        }
+        modified.add(conflict.getMy());
     }
 }

trunk/src/org/openstreetmap/josm/command/DeleteCommand.java

@@ -42 +42 @@
 
     /**
-     * The primitive that get deleted.
-     */
-    private final Collection<? extends OsmPrimitive> data;
+     * The primitives that get deleted.
+     */
+    private final Collection<? extends OsmPrimitive> toDelete;
 
     /**
@@ -50 +50 @@
      */
     public DeleteCommand(Collection<? extends OsmPrimitive> data) {
-        this.data = data;
+        super();
+        this.toDelete = data;
     }
 
@@ -58 +59 @@
      */
     public DeleteCommand(OsmPrimitive data) {
-        this.data = Collections.singleton(data);
+        this.toDelete = Collections.singleton(data);
     }
 
     @Override public boolean executeCommand() {
         super.executeCommand();
-        for (OsmPrimitive osm : data) {
+        for (OsmPrimitive osm : toDelete) {
             osm.delete(true);
         }
@@ -71 +72 @@
     @Override public void fillModifiedData(Collection<OsmPrimitive> modified, Collection<OsmPrimitive> deleted,
             Collection<OsmPrimitive> added) {
-        deleted.addAll(data);
+        deleted.addAll(toDelete);
     }
 
@@ -77 +78 @@
         NameVisitor v = new NameVisitor();
 
-        if (data.size() == 1) {
-            data.iterator().next().visit(v);
+        if (toDelete.size() == 1) {
+            toDelete.iterator().next().visit(v);
             return new DefaultMutableTreeNode(new JLabel(tr("Delete {1} {0}", v.name, tr(v.className)), v.icon,
                     JLabel.HORIZONTAL));
@@ -85 +86 @@
         String cname = null;
         String cnamem = null;
-        for (OsmPrimitive osm : data) {
+        for (OsmPrimitive osm : toDelete) {
             osm.visit(v);
             if (cname == null) {
@@ -95 +96 @@
             }
         }
-        DefaultMutableTreeNode root = new DefaultMutableTreeNode(new JLabel(tr("Delete {0} {1}", data.size(), trn(
-                cname, cnamem, data.size())), ImageProvider.get("data", cname), JLabel.HORIZONTAL));
-        for (OsmPrimitive osm : data) {
+        DefaultMutableTreeNode root = new DefaultMutableTreeNode(new JLabel(tr("Delete {0} {1}", toDelete.size(), trn(
+                cname, cnamem, toDelete.size())), ImageProvider.get("data", cname), JLabel.HORIZONTAL));
+        for (OsmPrimitive osm : toDelete) {
             osm.visit(v);
             root.add(new DefaultMutableTreeNode(v.toLabel()));
@@ -276 +277 @@
             Relation rel = new Relation(cur);
             for (OsmPrimitive osm : relationsToBeChanged.get(cur)) {
-                for (RelationMember rm : rel.members) {
-                    if (rm.member == osm) {
-                        RelationMember mem = new RelationMember();
-                        mem.role = rm.role;
-                        mem.member = rm.member;
-                        rel.members.remove(mem);
-                        break;
-                    }
-                }
+                rel.removeMembersFor(osm);
             }
             cmds.add(new ChangeCommand(cur, rel));

trunk/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java

@@ -10 +10 @@
 import javax.swing.tree.MutableTreeNode;
 
-import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.data.conflict.Conflict;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.gui.conflict.MergeDecisionType;
+import org.openstreetmap.josm.gui.layer.OsmDataLayer;
 import org.openstreetmap.josm.tools.ImageProvider;
 
@@ -19 +20 @@
  *
  */
-public class DeletedStateConflictResolveCommand extends Command {
+public class DeletedStateConflictResolveCommand extends ConflictResolveCommand {
 
-    /** my primitive (in the local dataset). merge decisions are applied to this
-     *  node
-     */
-    private final OsmPrimitive my;
-    /** their primitive (in the server dataset) */
-    private final OsmPrimitive their;
+    /** the conflict to resolve */
+    private Conflict<OsmPrimitive> conflict;
 
     /** the merge decision */
     private final MergeDecisionType decision;
-
-
 
     /**
@@ -41 +36 @@
      */
     public DeletedStateConflictResolveCommand(OsmPrimitive my, OsmPrimitive their, MergeDecisionType decision) {
-        this.my = my;
-        this.their = their;
+        this.conflict = new Conflict<OsmPrimitive>(my, their);
         this.decision = decision;
     }
@@ -51 +45 @@
         return new DefaultMutableTreeNode(
                 new JLabel(
-                        tr("Resolve conflicts in deleted state in {0}",my.id),
+                        tr("Resolve conflicts in deleted state in {0}",conflict.getMy().id),
                         ImageProvider.get("data", "object"),
                         JLabel.HORIZONTAL
@@ -65 +59 @@
         super.executeCommand();
 
+        OsmDataLayer layer = getLayer();
+
         if (decision.equals(MergeDecisionType.KEEP_MINE)) {
-            if (my.deleted) {
+            if (conflict.getMy().deleted) {
                 // because my was involved in a conflict it my still be referred
                 // to from a way or a relation. Fix this now.
                 //
-                Main.main.editLayer().data.unlinkReferencesToPrimitive(my);
+                layer.data.unlinkReferencesToPrimitive(conflict.getMy());
             }
         } else if (decision.equals(MergeDecisionType.KEEP_THEIR)) {
-            if (their.deleted) {
-                Main.main.editLayer().data.unlinkReferencesToPrimitive(my);
-                my.delete(true);
+            if (conflict.getTheir().deleted) {
+                layer.data.unlinkReferencesToPrimitive(conflict.getMy());
+                conflict.getMy().delete(true);
             } else {
-                my.deleted = their.deleted;
+                conflict.getMy().deleted = conflict.getTheir().deleted;
             }
         } else
@@ -83 +79 @@
             throw new IllegalStateException(tr("cannot resolve undecided conflict"));
 
+        rememberConflict(conflict);
         return true;
     }
@@ -89 +86 @@
     public void fillModifiedData(Collection<OsmPrimitive> modified, Collection<OsmPrimitive> deleted,
             Collection<OsmPrimitive> added) {
-        modified.add(my);
-    }
-
-    @Override
-    public void undoCommand() {
-        // restore former state of modified primitives
-        //
-        super.undoCommand();
-
-        // restore a conflict if necessary
-        //
-        if (!Main.map.conflictDialog.conflicts.containsKey(my)) {
-            Main.map.conflictDialog.addConflict(my, their);
-        }
+        modified.add(conflict.getMy());
     }
 }

trunk/src/org/openstreetmap/josm/command/MoveCommand.java

@@ -15 +15 @@
 import javax.swing.tree.MutableTreeNode;
 
-import org.openstreetmap.josm.data.coor.EastNorth;
 import org.openstreetmap.josm.data.coor.LatLon;
 import org.openstreetmap.josm.data.osm.Node;
@@ -32 +31 @@
      * The objects that should be moved.
      */
-    public Collection<Node> objects = new LinkedList<Node>();
+    private Collection<Node> nodes = new LinkedList<Node>();
     /**
      * x difference movement. Coordinates are in northern/eastern
@@ -64 +63 @@
      */
     public MoveCommand(Collection<OsmPrimitive> objects, double x, double y) {
+        super();
         this.x = x;
         this.y = y;
-        this.objects = AllNodesVisitor.getAllNodes(objects);
-        for (Node n : this.objects) {
+        this.nodes = AllNodesVisitor.getAllNodes(objects);
+        for (Node n : this.nodes) {
             OldState os = new OldState();
             os.latlon = new LatLon(n.getCoor());
@@ -84 +84 @@
      */
     public void moveAgain(double x, double y) {
-        for (Node n : objects) {
+        for (Node n : nodes) {
             n.setEastNorth(n.getEastNorth().add(x, y));
         }
@@ -92 +92 @@
 
     @Override public boolean executeCommand() {
-        for (Node n : objects) {
+        for (Node n : nodes) {
             n.setEastNorth(n.getEastNorth().add(x, y));
             n.modified = true;
@@ -101 +101 @@
     @Override public void undoCommand() {
         Iterator<OldState> it = oldState.iterator();
-        for (Node n : objects) {
+        for (Node n : nodes) {
             OldState os = it.next();
             n.setCoor(os.latlon);
@@ -109 +109 @@
 
     @Override public void fillModifiedData(Collection<OsmPrimitive> modified, Collection<OsmPrimitive> deleted, Collection<OsmPrimitive> added) {
-        for (OsmPrimitive osm : objects)
+        for (OsmPrimitive osm : nodes) {
             modified.add(osm);
+        }
     }
 
     @Override public MutableTreeNode description() {
-        return new DefaultMutableTreeNode(new JLabel(tr("Move")+" "+objects.size()+" "+trn("node","nodes",objects.size()), ImageProvider.get("data", "node"), JLabel.HORIZONTAL));
+        return new DefaultMutableTreeNode(new JLabel(tr("Move")+" "+nodes.size()+" "+trn("node","nodes",nodes.size()), ImageProvider.get("data", "node"), JLabel.HORIZONTAL));
+    }
+
+    public Collection<Node> getMovedNodes() {
+        return nodes;
     }
 }

trunk/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java

@@ -6 +6 @@
 import java.util.ArrayList;
 import java.util.Collection;
-import java.util.HashMap;
 import java.util.List;
-import java.util.Map;
+import java.util.logging.Logger;
 
 import javax.swing.JLabel;
@@ -15 +14 @@
 
 import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.data.conflict.ConflictCollection;
 import org.openstreetmap.josm.data.osm.DataSet;
 import org.openstreetmap.josm.data.osm.Node;
@@ -21 +21 @@
 import org.openstreetmap.josm.data.osm.RelationMember;
 import org.openstreetmap.josm.data.osm.Way;
+import org.openstreetmap.josm.gui.layer.OsmDataLayer;
 import org.openstreetmap.josm.tools.ImageProvider;
 
@@ -34 +35 @@
  * 
  */
-public class PurgePrimitivesCommand extends Command{
-
+public class PurgePrimitivesCommand extends ConflictResolveCommand{
+
+    static private final Logger logger = Logger.getLogger(PurgePrimitivesCommand.class.getName());
 
     /**
@@ -144 +146 @@
     private ArrayList<OsmParentChildPair> pairs;
 
-    private Map<OsmPrimitive, OsmPrimitive> resolvedConflicts;
 
     /**
@@ -154 +155 @@
         purgedPrimitives = new ArrayList<OsmPrimitive>();
         pairs = new ArrayList<OsmParentChildPair>();
-        resolvedConflicts = new HashMap<OsmPrimitive, OsmPrimitive>();
     }
 
@@ -219 +219 @@
             purge(toPurge, Main.ds, hive);
             if (toPurge instanceof Node) {
-                Main.ds.nodes.remove(toPurge);
+                getLayer().data.nodes.remove(toPurge);
             } else if (primitive instanceof Way) {
-                Main.ds.ways.remove(toPurge);
+                getLayer().data.ways.remove(toPurge);
             } else if (primitive instanceof Relation) {
-                Main.ds.relations.remove(toPurge);
+                getLayer().data.relations.remove(toPurge);
             }
             purgedPrimitives.add(toPurge);
-            if (Main.map.conflictDialog.conflicts.containsKey(toPurge)) {
-                resolvedConflicts.put(toPurge, Main.map.conflictDialog.conflicts.get(toPurge));
-                Main.map.conflictDialog.removeConflictForPrimitive(toPurge);
+            ConflictCollection conflicts = getLayer().getConflicts();
+            if (conflicts.hasConflictForMy(toPurge)) {
+                rememberConflict(conflicts.getConflictForMy(toPurge));
+                conflicts.remove(toPurge);
             }
         }
@@ -246 +247 @@
     @Override
     public void undoCommand() {
+        if (! Main.map.mapView.hasLayer(getLayer())) {
+            logger.warning(tr("Can't undo command ''{0}'' because layer ''{1}'' is not present anymore",
+                    this.toString(),
+                    getLayer().toString()
+            ));
+            return;
+        }
+        Main.map.mapView.setActiveLayer(getLayer());
 
         // restore purged primitives
         //
         for (OsmPrimitive purged : purgedPrimitives) {
-            Main.ds.addPrimitive(purged);
-        }
-
-        // restore conflicts
-        //
-        for (OsmPrimitive primitive : resolvedConflicts.keySet()) {
-            Main.map.conflictDialog.addConflict(primitive, resolvedConflicts.get(primitive));
-        }
-
+            getLayer().data.addPrimitive(purged);
+        }
+        reconstituteConflicts();
         // will restore the former references to the purged nodes
         //

trunk/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java

@@ -6 +6 @@
 import java.util.Collection;
 import java.util.List;
+import java.util.logging.Logger;
 
 import javax.swing.JLabel;
@@ -15 +16 @@
 import org.openstreetmap.josm.data.osm.Relation;
 import org.openstreetmap.josm.data.osm.RelationMember;
+import org.openstreetmap.josm.gui.layer.OsmDataLayer;
 import org.openstreetmap.josm.tools.ImageProvider;
 
@@ -23 +25 @@
  */
 public class RelationMemberConflictResolverCommand extends Command {
+    private static final Logger logger = Logger.getLogger(RelationMemberConflictResolverCommand.class.getName());
 
     /** my relation */
@@ -32 +35 @@
      */
     private final List<RelationMember> mergedMembers;
+
+    /** the layer this conflict is resolved in */
+    private OsmDataLayer layer;
 
     /**
@@ -71 +77 @@
             my.members.add(n);
         }
+
+        // remember the layer
+        layer = Main.main.map.mapView.getEditLayer();
         return true;
     }
@@ -82 +91 @@
     @Override
     public void undoCommand() {
+        if (! Main.map.mapView.hasLayer(layer)) {
+            logger.warning(tr("Can't undo command ''{0}'' because layer ''{1}'' is not present anymore",
+                    this.toString(),
+                    layer.toString()
+            ));
+            return;
+        }
+
+        Main.map.mapView.setActiveLayer(layer);
+        OsmDataLayer editLayer = Main.map.mapView.getEditLayer();
+
         // restore the former state
         //
@@ -88 +108 @@
         // restore a conflict if necessary
         //
-        if (!Main.map.conflictDialog.conflicts.containsKey(my)) {
-            Main.map.conflictDialog.conflicts.put(my,their);
+        if (!editLayer.getConflicts().hasConflictForMy(my)) {
+            editLayer.getConflicts().add(my,their);
         }
     }

trunk/src/org/openstreetmap/josm/command/RemoveRelationMemberCommand.java

@@ -64 +64 @@
         NameVisitor v = new NameVisitor();
         relation.visit(v);
-        return new DefaultMutableTreeNode(new JLabel(tr("RemoveRelationMember")+" "+tr(v.className)+" "+v.name, v.icon, JLabel.HORIZONTAL));
+        return new DefaultMutableTreeNode(new JLabel(tr("RemoveRelationMember {0} {1}", tr(v.className), v.name), v.icon, JLabel.HORIZONTAL));
     }
 }

trunk/src/org/openstreetmap/josm/command/RotateCommand.java

@@ -30 +30 @@
      * The objects to rotate.
      */
-    public Collection<Node> objects = new LinkedList<Node>();
+    private Collection<Node> nodes = new LinkedList<Node>();
 
     /**
@@ -70 +70 @@
     public RotateCommand(Collection<OsmPrimitive> objects, EastNorth start, EastNorth end) {
 
-        this.objects = AllNodesVisitor.getAllNodes(objects);
+        this.nodes = AllNodesVisitor.getAllNodes(objects);
         pivot = new EastNorth(0,0);
 
-        for (Node n : this.objects) {
+        for (Node n : this.nodes) {
             OldState os = new OldState();
             os.latlon = new LatLon(n.getCoor());
@@ -81 +81 @@
             pivot = pivot.add(os.eastNorth.east(), os.eastNorth.north());
         }
-        pivot = new EastNorth(pivot.east()/this.objects.size(), pivot.north()/this.objects.size());
+        pivot = new EastNorth(pivot.east()/this.nodes.size(), pivot.north()/this.nodes.size());
 
         rotationAngle = Math.PI/2;
@@ -105 +105 @@
      */
     private void rotateNodes(boolean setModified) {
-        for (Node n : objects) {
+        for (Node n : nodes) {
             double cosPhi = Math.cos(rotationAngle);
             double sinPhi = Math.sin(rotationAngle);
@@ -114 +114 @@
             double ny = -cosPhi * x + sinPhi * y + pivot.north();
             n.setEastNorth(new EastNorth(nx, ny));
-            if (setModified)
+            if (setModified) {
                 n.modified = true;
+            }
         }
     }
@@ -125 +126 @@
 
     @Override public void undoCommand() {
-        for (Node n : objects) {
+        for (Node n : nodes) {
             OldState os = oldState.get(n);
             n.setCoor(os.latlon);
@@ -133 +134 @@
 
     @Override public void fillModifiedData(Collection<OsmPrimitive> modified, Collection<OsmPrimitive> deleted, Collection<OsmPrimitive> added) {
-        for (OsmPrimitive osm : objects)
+        for (OsmPrimitive osm : nodes) {
             modified.add(osm);
+        }
     }
 
     @Override public MutableTreeNode description() {
-        return new DefaultMutableTreeNode(new JLabel(tr("Rotate")+" "+objects.size()+" "+trn("node","nodes",objects.size()), ImageProvider.get("data", "node"), JLabel.HORIZONTAL));
+        return new DefaultMutableTreeNode(new JLabel(tr("Rotate {0} {1}",nodes.size(),trn("node","nodes",nodes.size())), ImageProvider.get("data", "node"), JLabel.HORIZONTAL));
+    }
+
+    public Collection<Node> getRotatedNodes() {
+        return nodes;
     }
 }

trunk/src/org/openstreetmap/josm/command/SequenceCommand.java

@@ -33 +33 @@
      */
     public SequenceCommand(String name, Collection<Command> sequenz) {
+        super();
         this.name = name;
         this.sequence = new Command[sequenz.size()];
@@ -45 +46 @@
     }
 
-    public int executed_commands = 0;
     @Override public boolean executeCommand() {
         for (int i=0; i < sequence.length; i++) {
             Command c = sequence[i];
             boolean result = c.executeCommand();
-            if (!result)
+            if (!result) {
                 Main.debug("SequenceCommand, executing command[" + i + "] " +  c + " result: " + result);
+            }
             if (!result && !continueOnError) {
                 this.undoCommands(i-1);
@@ -72 +73 @@
         if (!sequence_complete)
             return;
-        for (int i = start; i >= 0; --i)
+        for (int i = start; i >= 0; --i) {
             sequence[i].undoCommand();
+        }
     }
 
@@ -81 +83 @@
 
     @Override public void fillModifiedData(Collection<OsmPrimitive> modified, Collection<OsmPrimitive> deleted, Collection<OsmPrimitive> added) {
-        for (Command c : sequence)
+        for (Command c : sequence) {
             c.fillModifiedData(modified, deleted, added);
+        }
     }
 
     @Override public MutableTreeNode description() {
         DefaultMutableTreeNode root = new DefaultMutableTreeNode(tr("Sequence")+": "+name);
-        for (Command c : sequence)
+        for (Command c : sequence) {
             root.add(c.description());
+        }
         return root;
     }

trunk/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java

@@ -6 +6 @@
 import java.util.Collection;
 import java.util.List;
+import java.util.logging.Logger;
 
 import javax.swing.JLabel;
@@ -11 +12 @@
 import javax.swing.tree.MutableTreeNode;
 
-import org.openstreetmap.josm.Main;
-import org.openstreetmap.josm.data.osm.Node;
+import org.openstreetmap.josm.data.conflict.Conflict;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.data.osm.OsmPrimitiveType;
-import org.openstreetmap.josm.data.osm.Relation;
-import org.openstreetmap.josm.data.osm.Way;
 import org.openstreetmap.josm.gui.conflict.MergeDecisionType;
 import org.openstreetmap.josm.gui.conflict.tags.TagMergeItem;
@@ -25 +23 @@
  *
  */
-public class TagConflictResolveCommand extends Command {
+public class TagConflictResolveCommand extends ConflictResolveCommand {
+    private static final Logger logger = Logger.getLogger(TagConflictResolveCommand.class.getName());
 
-    /** my primitive (in the local dataset). merge decisions are applied to this
-     *  primitive
-     */
-    private final OsmPrimitive my;
-    /** their primitive (in the server dataset) */
-    private final OsmPrimitive their;
+
+    /** the conflict to resolve */
+    private Conflict<OsmPrimitive> conflict;
 
     /** the list of merge decisions, represented as {@see TagMergeItem}s */
     private final List<TagMergeItem> mergeItems;
+
 
     /**
@@ -60 +57 @@
      */
     public TagConflictResolveCommand(OsmPrimitive my, OsmPrimitive their, List<TagMergeItem> mergeItems) {
-        this.my = my;
-        this.their = their;
+        this.conflict = new Conflict<OsmPrimitive>(my,their);
         this.mergeItems = mergeItems;
     }
@@ -70 +66 @@
         return new DefaultMutableTreeNode(
                 new JLabel(
-                        tr("Resolve {0} tag conflicts in {1} {2}",getNumDecidedConflicts(), OsmPrimitiveType.from(my).getLocalizedDisplayNameSingular(), my.id),
+                        tr("Resolve {0} tag conflicts in {1} {2}",getNumDecidedConflicts(), OsmPrimitiveType.from(conflict.getMy()).getLocalizedDisplayNameSingular(), conflict.getMy().id),
                         ImageProvider.get("data", "object"),
                         JLabel.HORIZONTAL
@@ -88 +84 @@
         for (TagMergeItem item: mergeItems) {
             if (! item.getMergeDecision().equals(MergeDecisionType.UNDECIDED)) {
-                item.applyToMyPrimitive(my);
+                item.applyToMyPrimitive(conflict.getMy());
             }
         }
+        rememberConflict(conflict);
         return true;
     }
@@ -97 +94 @@
     public void fillModifiedData(Collection<OsmPrimitive> modified, Collection<OsmPrimitive> deleted,
             Collection<OsmPrimitive> added) {
-        modified.add(my);
-    }
-
-    @Override
-    public void undoCommand() {
-        // restore former state of modified primitives
-        //
-        super.undoCommand();
-
-        // restore a conflict if necessary
-        //
-        if (!Main.map.conflictDialog.conflicts.containsKey(my)) {
-            Main.map.conflictDialog.addConflict(my, their);
-        }
+        modified.add(conflict.getMy());
     }
 }

trunk/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java

@@ -6 +6 @@
 import java.util.ArrayList;
 import java.util.Collection;
-import java.util.HashMap;
-import java.util.Map;
+import java.util.logging.Logger;
 
 import javax.swing.JLabel;
@@ -15 +14 @@
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
+import org.openstreetmap.josm.gui.layer.OsmDataLayer;
 import org.openstreetmap.josm.tools.ImageProvider;
 
 /**
- * Represents a command for undeleting a node which was deleted on the server.
+ * Represents a command for undeleting an {@see OsmPrimitive} which was deleted on the server.
  * The command remembers the former node id and sets the node id to 0. This turns
  * the node into a new node which can be uploaded to the server.
  *
  */
-public class UndeletePrimitivesCommand extends Command {
+public class UndeletePrimitivesCommand extends ConflictResolveCommand {
+    static private final Logger logger = Logger.getLogger(UndeletePrimitivesCommand.class.getName());
 
     /** the node to undelete */
     private ArrayList<OsmPrimitive> toUndelete;
-    private Map<OsmPrimitive,OsmPrimitive> resolvedConflicts;
 
     protected UndeletePrimitivesCommand() {
         toUndelete = new ArrayList<OsmPrimitive>();
-        resolvedConflicts = new HashMap<OsmPrimitive, OsmPrimitive>();
     }
     /**
@@ -77 +76 @@
     public boolean executeCommand() {
         super.executeCommand();
+
         for(OsmPrimitive primitive: toUndelete) {
-            if (Main.map.conflictDialog.conflicts.containsKey(primitive)) {
-                resolvedConflicts.put(primitive, Main.map.conflictDialog.conflicts.get(primitive));
-                Main.map.conflictDialog.removeConflictForPrimitive(primitive);
+            if(getLayer().getConflicts().hasConflictForMy(primitive)) {
+                rememberConflict(getLayer().getConflicts().getConflictForMy(primitive));
+                getLayer().getConflicts().remove(primitive);
             }
             primitive.id = 0;
@@ -92 +92 @@
         modified.addAll(toUndelete);
     }
-    @Override
-    public void undoCommand() {
-        super.undoCommand();
-
-        for (OsmPrimitive my: resolvedConflicts.keySet()) {
-            if (!Main.map.conflictDialog.conflicts.containsKey(my)) {
-                Main.map.conflictDialog.addConflict(my, resolvedConflicts.get(my));
-            }
-        }
-    }
 }

trunk/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java

@@ -10 +10 @@
 import javax.swing.tree.MutableTreeNode;
 
-import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.data.conflict.Conflict;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.data.osm.OsmPrimitiveType;
@@ -20 +20 @@
  *
  */
-public class VersionConflictResolveCommand extends Command {
+public class VersionConflictResolveCommand extends ConflictResolveCommand {
 
-    private final OsmPrimitive my;
-    private final OsmPrimitive their;
+    /** the conflict to resolve */
+    private Conflict<OsmPrimitive> conflict;
 
     /**
@@ -31 +31 @@
      */
     public VersionConflictResolveCommand(OsmPrimitive my, OsmPrimitive their) {
-        this.my = my;
-        this.their = their;
+        conflict = new Conflict<OsmPrimitive>(my, their);
     }
 
@@ -39 +38 @@
         return new DefaultMutableTreeNode(
                 new JLabel(
-                        tr("Resolve version conflicts for {0} {1}",OsmPrimitiveType.from(my).getLocalizedDisplayNameSingular(), my.id),
+                        tr("Resolve version conflicts for {0} {1}",OsmPrimitiveType.from(conflict.getMy()).getLocalizedDisplayNameSingular(),conflict.getMy().id),
                         ImageProvider.get("data", "object"),
                         JLabel.HORIZONTAL
@@ -49 +48 @@
     public boolean executeCommand() {
         super.executeCommand();
-        my.version = Math.max(my.version, their.version);
-        Main.map.conflictDialog.removeConflictForPrimitive(my);
+        conflict.getMy().version = Math.max(conflict.getMy().version, conflict.getTheir().version);
+        getLayer().getConflicts().remove(conflict);
+        rememberConflict(conflict);
         return true;
     }
@@ -57 +57 @@
     public void fillModifiedData(Collection<OsmPrimitive> modified, Collection<OsmPrimitive> deleted,
             Collection<OsmPrimitive> added) {
-        modified.add(my);
-    }
-
-    @Override
-    public void undoCommand() {
-        super.undoCommand();
-
-        // restore a conflict if necessary
-        //
-        if (!Main.map.conflictDialog.conflicts.containsKey(my)) {
-            Main.map.conflictDialog.addConflict(my, their);
-        }
+        modified.add(conflict.getMy());
     }
 }

trunk/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java

@@ -6 +6 @@
 import java.util.Collection;
 import java.util.List;
+import java.util.logging.Logger;
 
 import javax.swing.JLabel;
@@ -11 +12 @@
 import javax.swing.tree.MutableTreeNode;
 
-import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.data.conflict.Conflict;
 import org.openstreetmap.josm.data.osm.Node;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
@@ -22 +23 @@
  *
  */
-public class WayNodesConflictResolverCommand extends Command {
+public class WayNodesConflictResolverCommand extends ConflictResolveCommand {
 
-    /** my way */
-    private final Way my;
-    /** their way */
-    private final Way their;
+    static private final Logger logger = Logger.getLogger(WayNodesConflictResolverCommand.class.getName());
+
+    /** the conflict to resolve */
+    private Conflict<Way> conflict;
+
     /** the list of merged nodes. This becomes the list of news of my way after the
      *  command is executed
      */
     private final List<Node> mergedNodeList;
+
 
     /**
@@ -40 +43 @@
      */
     public WayNodesConflictResolverCommand(Way my, Way their, List<Node> mergedNodeList) {
-        this.my = my;
-        this.their = their;
+        conflict = new Conflict<Way>(my,their);
         this.mergedNodeList = mergedNodeList;
     }
@@ -50 +52 @@
         return new DefaultMutableTreeNode(
                 new JLabel(
-                        tr("Resolve conflicts in node list of of way {0}", my.id),
+                        tr("Resolve conflicts in node list of of way {0}", conflict.getMy().id),
                         ImageProvider.get("data", "object"),
                         JLabel.HORIZONTAL
@@ -66 +68 @@
         // nodes
         //
-        my.nodes.clear();
+        conflict.getMy().nodes.clear();
         for (int i=0; i<mergedNodeList.size();i++) {
             Node n = mergedNodeList.get(i);
-            my.nodes.add(n);
-            if (! Main.ds.nodes.contains(n)) {
-                System.out.println("Main.ds doesn't include node " + n.toString());
+            conflict.getMy().nodes.add(n);
+            if (! getLayer().data.nodes.contains(n)) {
+                logger.warning(tr("Main.ds doesn't include node {0}", n.toString()));
             }
         }
+        rememberConflict(conflict);
         return true;
     }
@@ -80 +83 @@
     public void fillModifiedData(Collection<OsmPrimitive> modified, Collection<OsmPrimitive> deleted,
             Collection<OsmPrimitive> added) {
-        modified.add(my);
-    }
-
-    @Override
-    public void undoCommand() {
-        // restore the former state
-        //
-        super.undoCommand();
-
-        // restore a conflict if necessary
-        //
-        if (!Main.map.conflictDialog.conflicts.containsKey(my)) {
-            Main.map.conflictDialog.addConflict(my, their);
-        }
+        modified.add(conflict.getMy());
     }
 }

trunk/src/org/openstreetmap/josm/data/osm/Node.java

@@ -5 +5 @@
 
 import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.data.coor.CachedLatLon;
 import org.openstreetmap.josm.data.coor.EastNorth;
-import org.openstreetmap.josm.data.coor.CachedLatLon;
 import org.openstreetmap.josm.data.coor.LatLon;
 import org.openstreetmap.josm.data.coor.LatLon.CoordinateFormat;
-import org.openstreetmap.josm.data.projection.Projection;
 import org.openstreetmap.josm.data.osm.visitor.Visitor;
-import org.openstreetmap.josm.data.osm.Node;
 
 /**
@@ -25 +23 @@
         if(coor != null)
         {
-            if(this.coor == null)
+            if(this.coor == null) {
                 this.coor = new CachedLatLon(coor);
-            else
+            } else {
                 this.coor.setCoor(coor);
+            }
         }
     }
@@ -39 +38 @@
         if(eastNorth != null)
         {
-            if(coor != null)
+            if(coor != null) {
                 coor.setEastNorth(eastNorth);
-            else
+            } else {
                 coor = new CachedLatLon(eastNorth);
+            }
         }
     }

trunk/src/org/openstreetmap/josm/data/osm/visitor/MergeVisitor.java

@@ -10 +10 @@
 import java.util.logging.Logger;
 
+import org.openstreetmap.josm.data.conflict.ConflictCollection;
 import org.openstreetmap.josm.data.osm.DataSet;
 import org.openstreetmap.josm.data.osm.Node;
@@ -31 +32 @@
      * round than merged)
      */
-    private Map<OsmPrimitive, OsmPrimitive> conflicts;
+    private ConflictCollection conflicts;
+
 
     private final DataSet myDataSet;
@@ -68 +70 @@
             relshash.put(r.id, r);
         }
-        conflicts = new HashMap<OsmPrimitive, OsmPrimitive>();
+        conflicts = new ConflictCollection();
         merged = new HashMap<OsmPrimitive, OsmPrimitive>();
     }
@@ -113 +115 @@
                         // differences in deleted state have to be merged manually
                         //
-                        conflicts.put(my, other);
+                        conflicts.add(my, other);
                     } else {
                         // copy the technical attributes from other
@@ -158 +160 @@
             fixRelation(r);
         }
-        for (OsmPrimitive osm : conflicts.values())
+        for (OsmPrimitive osm : conflicts.getMyConflictParties())
             if (osm instanceof Way) {
                 fixWay((Way)osm);
@@ -235 +237 @@
                     // because it was deleted on the server.
                     //
-                    conflicts.put(my,other);
+                    conflicts.add(my,other);
                 } else if (my.incomplete) {
                     // my is incomplete, other completes it
@@ -250 +252 @@
                     // differences in deleted state have to be resolved manually
                     //
-                    conflicts.put(my,other);
+                    conflicts.add(my,other);
                 } else if (! my.modified && other.modified) {
                     // my not modified. We can assume that other is the most recent version.
@@ -278 +280 @@
                     // resolve the differences
                     // =>  create a conflict
-                    conflicts.put(my,other);
+                    conflicts.add(my,other);
                 } else {
                     // clone from other, but keep the modified flag. Clone will mainly copy
@@ -326 +328 @@
      * @return the map of conflicts
      */
-    public Map<OsmPrimitive, OsmPrimitive> getConflicts() {
+    public ConflictCollection getConflicts() {
         return conflicts;
     }

trunk/src/org/openstreetmap/josm/gui/MapView.java

@@ -9 +9 @@
 import java.awt.Graphics2D;
 import java.awt.Point;
+import java.awt.event.ComponentAdapter;
+import java.awt.event.ComponentEvent;
 import java.awt.event.MouseEvent;
 import java.awt.event.MouseMotionListener;
-import java.awt.event.ComponentAdapter;
-import java.awt.event.ComponentEvent;
 import java.awt.image.BufferedImage;
 import java.util.ArrayList;
-import java.util.Enumeration;
 import java.util.Collection;
 import java.util.Collections;
+import java.util.Enumeration;
 import java.util.LinkedList;
 
@@ -27 +27 @@
 import org.openstreetmap.josm.actions.AutoScaleAction;
 import org.openstreetmap.josm.actions.JosmAction;
+import org.openstreetmap.josm.actions.MoveAction;
 import org.openstreetmap.josm.actions.mapmode.MapMode;
-import org.openstreetmap.josm.actions.MoveAction;
-import org.openstreetmap.josm.data.Bounds;
 import org.openstreetmap.josm.data.ProjectionBounds;
 import org.openstreetmap.josm.data.SelectionChangedListener;
-import org.openstreetmap.josm.data.coor.EastNorth;
-import org.openstreetmap.josm.data.coor.LatLon;
 import org.openstreetmap.josm.data.osm.DataSet;
 import org.openstreetmap.josm.data.osm.DataSource;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.data.osm.visitor.BoundingXYVisitor;
-import org.openstreetmap.josm.data.projection.Projection;
 import org.openstreetmap.josm.gui.layer.Layer;
 import org.openstreetmap.josm.gui.layer.MapViewPaintable;
@@ -61 +57 @@
 public class MapView extends NavigatableComponent {
 
+
     /**
      * A list of all layers currently loaded.
@@ -69 +66 @@
      */
     public PlayHeadMarker playHeadMarker = null;
-    /**
-     * Direct link to the edit layer (if any) in the layers list.
-     */
-    public OsmDataLayer editLayer;
+
     /**
      * The layer from the layers list that is currently active.
@@ -100 +94 @@
                 scaler.setLocation(10,30);
 
-                if (!zoomToEditLayerBoundingBox())
+                if (!zoomToEditLayerBoundingBox()) {
                     new AutoScaleAction("data").actionPerformed(null);
+                }
 
                 new MapMover(MapView.this, Main.contentPane);
@@ -152 +147 @@
     public void addLayer(Layer layer) {
         if (layer instanceof OsmDataLayer) {
-            editLayer = (OsmDataLayer)layer;
+            OsmDataLayer editLayer = (OsmDataLayer)layer;
             Main.ds = editLayer.data;
             editLayer.listenerModified.add(new ModifiedChangedListener(){
                 public void modifiedChanged(boolean value, OsmDataLayer source) {
                     JOptionPane.getFrameForComponent(Main.parent).setTitle((value?"*":"")
-                    +tr("Java OpenStreetMap Editor"));
+                            +tr("Java OpenStreetMap Editor"));
                 }
             });
         }
-        if (layer instanceof MarkerLayer && playHeadMarker == null)
+        if (layer instanceof MarkerLayer && playHeadMarker == null) {
             playHeadMarker = PlayHeadMarker.create();
+        }
         int pos = layers.size();
-        while(pos > 0 && layers.get(pos-1).background)
+        while(pos > 0 && layers.get(pos-1).background) {
             --pos;
+        }
         layers.add(pos, layer);
 
-        for (Layer.LayerChangeListener l : Layer.listeners)
+        for (Layer.LayerChangeListener l : Layer.listeners) {
             l.layerAdded(layer);
+        }
         if (layer instanceof OsmDataLayer || activeLayer == null) {
             // autoselect the new layer
             Layer old = activeLayer;
             setActiveLayer(layer);
-            for (Layer.LayerChangeListener l : Layer.listeners)
+            for (Layer.LayerChangeListener l : Layer.listeners) {
                 l.activeLayerChange(old, layer);
+            }
         }
         AudioPlayer.reset();
@@ -182 +181 @@
 
     @Override
-    protected DataSet getData()
-    {
+    protected DataSet getData() {
         if(activeLayer != null && activeLayer instanceof OsmDataLayer)
             return ((OsmDataLayer)activeLayer).data;
@@ -189 +187 @@
     }
 
-    public Boolean isDrawableLayer()
-    {
+    /**
+     * Replies true if the active layer is drawable.
+     * 
+     * @return true if the active layer is drawable, false otherwise
+     */
+    public boolean isActiveLayerDrawable() {
         return activeLayer != null && activeLayer instanceof OsmDataLayer;
     }
 
-    public Boolean isVisibleDrawableLayer() {
-        return isDrawableLayer() && activeLayer.visible;
+    /**
+     * Replies true if the active layer is visible.
+     * 
+     * @return true if the active layer is visible, false otherwise
+     */
+    public boolean isActiveLayerVisible() {
+        return isActiveLayerDrawable() && activeLayer.visible;
     }
 
@@ -204 +211 @@
     public void removeLayer(Layer layer) {
         if (layers.remove(layer)) {
-            for (Layer.LayerChangeListener l : Layer.listeners)
+            for (Layer.LayerChangeListener l : Layer.listeners) {
                 l.layerRemoved(layer);
-        }
-        if (layer == editLayer) {
-            editLayer = null;
-            Main.ds.setSelected();
+            }
+        }
+        if (layer == activeLayer) {
+            if (layer instanceof OsmDataLayer) {
+                Main.ds.setSelected();
+            }
         }
         layer.destroy();
@@ -215 +224 @@
     }
 
-    private Boolean virtualnodes = false;
-    public void enableVirtualNodes(Boolean state)
-    {
-        if(virtualnodes != state)
-        {
-            virtualnodes = state;
+    private boolean virtualNodesEnabled = false;
+    public void setVirtualNodesEnabled(boolean enabled) {
+        if(virtualNodesEnabled != enabled) {
+            virtualNodesEnabled = enabled;
             repaint();
         }
     }
-    public Boolean useVirtualNodes()
-    {
-        return virtualnodes;
+    public boolean isVirtualNodesEnabled() {
+        return virtualNodesEnabled;
     }
 
@@ -241 +247 @@
             return; // already in place.
         layers.remove(curLayerPos);
-        if (pos >= layers.size())
+        if (pos >= layers.size()) {
             layers.add(layer);
-        else
+        } else {
             layers.add(pos, layer);
+        }
         AudioPlayer.reset();
     }
@@ -266 +273 @@
         // just re-use it.
         if (null == offscreenBuffer || offscreenBuffer.getWidth() != getWidth()
-                || offscreenBuffer.getHeight() != getHeight())
+                || offscreenBuffer.getHeight() != getHeight()) {
             offscreenBuffer = new BufferedImage(getWidth(), getHeight(),
                     BufferedImage.TYPE_INT_ARGB);
+        }
 
         Graphics2D tempG = offscreenBuffer.createGraphics();
@@ -276 +284 @@
         for (int i = layers.size()-1; i >= 0; --i) {
             Layer l = layers.get(i);
-            if (l.visible/* && l != getActiveLayer()*/)
+            if (l.visible/* && l != getActiveLayer()*/) {
                 l.paint(tempG, this);
+            }
         }
 
@@ -296 +305 @@
         int x2 = Math.max(min.x, max.x);
         int y2 = Math.max(min.y, max.y);
-        if (x1 > 0 || y1 > 0 || x2 < getWidth() || y2 < getHeight())
+        if (x1 > 0 || y1 > 0 || x2 < getWidth() || y2 < getHeight()) {
             tempG.drawRect(x1, y1, x2-x1+1, y2-y1+1);
-
-        if (playHeadMarker != null)
+        }
+
+        if (playHeadMarker != null) {
             playHeadMarker.paint(tempG, this);
+        }
 
         g.drawImage(offscreenBuffer, 0, 0, null);
@@ -310 +321 @@
      */
     public void recalculateCenterScale(BoundingXYVisitor box) {
-        if(box == null)
+        if(box == null) {
             box = new BoundingXYVisitor();
-        if(box.getBounds() == null)
+        }
+        if(box.getBounds() == null) {
             box.visit(getProjection().getWorldBounds());
-        if(!box.hasExtend())
-             box.enlargeBoundingBox();
+        }
+        if(!box.hasExtend()) {
+            box.enlargeBoundingBox();
+        }
 
         zoomTo(box.getBounds());
@@ -321 +335 @@
 
     /**
-     * @return An unmodificable list of all layers
+     * @return An unmodifiable collection of all layers
      */
     public Collection<Layer> getAllLayers() {
@@ -328 +342 @@
 
     /**
-     * Set the active selection to the given value and raise an layerchange event.
+     * Sets the active layer to <code>layer</code>. If <code>layer</code> is an instance
+     * of {@see OsmDataLayer} also sets {@see #editLayer} to <code>layer</code>.
+     * 
+     * @param layer the layer to be activate; must be one of the layers in the list of layers
+     * @exception IllegalArgumentException thrown if layer is not in the lis of layers
      */
     public void setActiveLayer(Layer layer) {
         if (!layers.contains(layer))
-            throw new IllegalArgumentException("Layer must be in layerlist");
+            throw new IllegalArgumentException(tr("Layer {0} must be in list of layers", layer.toString()));
         if (layer instanceof OsmDataLayer) {
-            editLayer = (OsmDataLayer)layer;
+            OsmDataLayer editLayer = (OsmDataLayer)layer;
             Main.ds = editLayer.data;
-        }
-        else
+        } else {
             Main.ds.setSelected();
+        }
         DataSet.fireSelectionChanged(Main.ds.getSelected());
         Layer old = activeLayer;
         activeLayer = layer;
         if (old != layer) {
-            for (Layer.LayerChangeListener l : Layer.listeners)
+            for (Layer.LayerChangeListener l : Layer.listeners) {
                 l.activeLayerChange(old, layer);
+            }
         }
 
@@ -360 +379 @@
 
     /**
-     * @return The current active layer
+     * Replies the currently active layer
+     * 
+     * @return the currently active layer (may be null)
      */
     public Layer getActiveLayer() {
         return activeLayer;
+    }
+
+    /**
+     * Replies the current edit layer, if any
+     * 
+     * @return the current edit layer. May be null.
+     */
+    public OsmDataLayer getEditLayer() {
+        if (activeLayer instanceof OsmDataLayer)
+            return (OsmDataLayer)activeLayer;
+        return null;
+    }
+
+    /**
+     * replies true if the list of layers managed by this map view contain layer
+     * 
+     * @param layer the layer
+     * @return true if the list of layers managed by this map view contain layer
+     */
+    public boolean hasLayer(Layer layer) {
+        return layers.contains(layer);
     }
 
@@ -377 +419 @@
         // workaround for #1461 (zoom to download bounding box instead of all data)
         // In case we already have an existing data layer ...
-        Collection<DataSource> dataSources = Main.main.editLayer().data.dataSources;
+        Collection<DataSource> dataSources = Main.main.createOrGetEditLayer().data.dataSources;
         // ... with bounding box[es] of data loaded from OSM or a file...
         BoundingXYVisitor bbox = new BoundingXYVisitor();

trunk/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java

@@ -29 +29 @@
     public CommandStackDialog(final MapFrame mapFrame) {
         super(tr("Command Stack"), "commandstack", tr("Open a list of all commands (undo buffer)."),
-        Shortcut.registerShortcut("subwindow:commandstack", tr("Toggle: {0}", tr("Command Stack")), KeyEvent.VK_O, Shortcut.GROUP_LAYER, Shortcut.SHIFT_DEFAULT), 100);
+                Shortcut.registerShortcut("subwindow:commandstack", tr("Toggle: {0}", tr("Command Stack")), KeyEvent.VK_O, Shortcut.GROUP_LAYER, Shortcut.SHIFT_DEFAULT), 100);
         Main.main.undoRedo.listenerCommands.add(this);
 
@@ -52 +52 @@
 
     @Override public void setVisible(boolean v) {
-        if (v)
+        if (v) {
             buildList();
-        else if (tree != null)
+        } else if (tree != null) {
             treeModel.setRoot(new DefaultMutableTreeNode());
+        }
         super.setVisible(v);
     }
@@ -65 +66 @@
             setTitle(tr("Command Stack"), false);
         }
-        if (Main.map == null || Main.map.mapView == null || Main.map.mapView.editLayer == null)
+        if (Main.map == null || Main.map.mapView == null || Main.map.mapView.getEditLayer() == null)
             return;
         Collection<Command> commands = Main.main.undoRedo.commands;
         DefaultMutableTreeNode root = new DefaultMutableTreeNode();
-        for (Command c : commands)
+        for (Command c : commands) {
             root.add(c.description());
+        }
         treeModel.setRoot(root);
         tree.scrollRowToVisible(treeModel.getChildCount(root)-1);

trunk/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java

@@ -11 +11 @@
 import java.awt.Point;
 import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
 import java.awt.event.KeyEvent;
 import java.awt.event.MouseAdapter;
 import java.awt.event.MouseEvent;
 import java.util.Collection;
-import java.util.HashMap;
+import java.util.Iterator;
 import java.util.LinkedList;
-import java.util.Map;
-
-import javax.swing.DefaultListModel;
+import java.util.concurrent.CopyOnWriteArrayList;
+
+import javax.swing.AbstractAction;
+import javax.swing.JButton;
 import javax.swing.JList;
 import javax.swing.JPanel;
 import javax.swing.JScrollPane;
+import javax.swing.ListModel;
 import javax.swing.ListSelectionModel;
+import javax.swing.event.ListDataEvent;
+import javax.swing.event.ListDataListener;
 import javax.swing.event.ListSelectionEvent;
 import javax.swing.event.ListSelectionListener;
@@ -30 +33 @@
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.SelectionChangedListener;
+import org.openstreetmap.josm.data.conflict.Conflict;
+import org.openstreetmap.josm.data.conflict.ConflictCollection;
+import org.openstreetmap.josm.data.conflict.IConflictListener;
 import org.openstreetmap.josm.data.osm.DataSet;
 import org.openstreetmap.josm.data.osm.Node;
@@ -40 +46 @@
 import org.openstreetmap.josm.gui.NavigatableComponent;
 import org.openstreetmap.josm.gui.OsmPrimitivRenderer;
-import org.openstreetmap.josm.gui.SideButton;
+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.ImageProvider;
 import org.openstreetmap.josm.tools.Shortcut;
 
-public final class ConflictDialog extends ToggleDialog {
-
-    public final Map<OsmPrimitive, OsmPrimitive> conflicts = new HashMap<OsmPrimitive, OsmPrimitive>();
-    private final DefaultListModel model = new DefaultListModel();
-    private final JList displaylist = new JList(model);
-
-    private final SideButton sbSelect = new SideButton(marktr("Select"), "select", "Conflict",
-            tr("Set the selected elements on the map to the selected items in the list above."), new ActionListener(){
-        public void actionPerformed(ActionEvent e) {
-            Collection<OsmPrimitive> sel = new LinkedList<OsmPrimitive>();
-            for (Object o : displaylist.getSelectedValues()) {
-                sel.add((OsmPrimitive)o);
-            }
-            Main.ds.setSelected(sel);
-        }
-    });
-    private final SideButton sbResolve = new SideButton(marktr("Resolve"), "conflict", "Conflict",
-            tr("Open a merge dialog of all selected items in the list above."), new ActionListener(){
-        public void actionPerformed(ActionEvent e) {
-            resolve();
-        }
-    });
-
-    public ConflictDialog() {
-        super(tr("Conflict"), "conflict", tr("Merging conflicts."),
-                Shortcut.registerShortcut("subwindow:conflict", tr("Toggle: {0}", tr("Conflict")), KeyEvent.VK_C, Shortcut.GROUP_LAYER), 100);
-        displaylist.setCellRenderer(new OsmPrimitivRenderer());
-        displaylist.setSelectionMode(ListSelectionModel.MULTIPLE_INTERVAL_SELECTION);
-        displaylist.addMouseListener(new MouseAdapter(){
+/**
+ * This dialog displays the {@see ConflictCollection} of the active {@see OsmDataLayer} in a toggle
+ * dialog on the right of the main frame.
+ * 
+ */
+public final class ConflictDialog extends ToggleDialog implements LayerChangeListener, IConflictListener, SelectionChangedListener{
+
+    static public Color getColor() {
+        return Main.pref.getColor(marktr("conflict"), Color.gray);
+    }
+
+    /** the  collection of conflicts displayed by this conflict dialog*/
+    private ConflictCollection conflicts;
+
+    /** the model for the list of conflicts */
+    private ConflictListModel model;
+    /** the list widget for the list of conflicts */
+    private JList lstConflicts;
+
+    private ResolveAction actResolve;
+    private SelectAction actSelect;
+
+    private OsmDataLayer layer = null;
+
+
+    /**
+     * builds the GUI
+     */
+    protected void build() {
+        model = new ConflictListModel();
+
+        lstConflicts = new JList(model);
+        lstConflicts.setSelectionMode(ListSelectionModel.MULTIPLE_INTERVAL_SELECTION);
+        lstConflicts.setCellRenderer(new OsmPrimitivRenderer());
+        lstConflicts.addMouseListener(new MouseAdapter(){
             @Override public void mouseClicked(MouseEvent e) {
                 if (e.getClickCount() >= 2) {
@@ -78 +93 @@
             }
         });
-        add(new JScrollPane(displaylist), BorderLayout.CENTER);
-
-        JPanel buttonPanel = new JPanel(new GridLayout(1,2));
-        buttonPanel.add(sbResolve);
-        buttonPanel.add(sbSelect);
-        add(buttonPanel, BorderLayout.SOUTH);
-
-        DataSet.selListeners.add(new SelectionChangedListener(){
-            public void selectionChanged(Collection<? extends OsmPrimitive> newSelection) {
-                displaylist.clearSelection();
-                for (OsmPrimitive osm : newSelection) {
-                    if (conflicts.containsKey(osm)) {
-                        int pos = model.indexOf(osm);
-                        displaylist.addSelectionInterval(pos, pos);
-                    }
-                }
-            }
-        });
-        displaylist.getSelectionModel().addListSelectionListener(new ListSelectionListener(){
+        lstConflicts.getSelectionModel().addListSelectionListener(new ListSelectionListener(){
             public void valueChanged(ListSelectionEvent e) {
                 Main.map.mapView.repaint();
@@ -102 +99 @@
         });
 
-        rebuildList();
-    }
-
+        add(new JScrollPane(lstConflicts), BorderLayout.CENTER);
+
+        JButton btnResolve = new JButton(actResolve = new ResolveAction());
+        lstConflicts.getSelectionModel().addListSelectionListener(actResolve);
+
+        JButton btnSelect = new JButton(actSelect = new SelectAction());
+        lstConflicts.getSelectionModel().addListSelectionListener(actSelect);
+
+        JPanel buttonPanel = new JPanel(new GridLayout(1,2));
+        buttonPanel.add(btnResolve);
+        buttonPanel.add(btnSelect);
+        add(buttonPanel, BorderLayout.SOUTH);
+    }
+
+    /**
+     * constructor
+     */
+    public ConflictDialog() {
+        super(tr("Conflict"), "conflict", tr("Merging conflicts."),
+                Shortcut.registerShortcut("subwindow:conflict", tr("Toggle: {0}", tr("Conflict")), KeyEvent.VK_C, Shortcut.GROUP_LAYER), 100);
+
+        build();
+        DataSet.selListeners.add(this);
+        Layer.listeners.add(this);
+        refreshView();
+    }
+
+    /**
+     * Launches a conflict resolution dialog for the first selected conflict
+     * 
+     */
     private final void resolve() {
-        if(model.size() == 1) {
-            displaylist.setSelectedIndex(0);
-        }
-
-        if (displaylist.getSelectedIndex() == -1)
+        if (conflicts == null) return;
+        if (conflicts.size() == 1) {
+            lstConflicts.setSelectedIndex(0);
+        }
+
+        if (lstConflicts.getSelectedIndex() == -1)
             return;
 
-        int [] selectedRows = displaylist.getSelectedIndices();
+        int [] selectedRows = lstConflicts.getSelectedIndices();
         if (selectedRows == null || selectedRows.length == 0)
             return;
         int row = selectedRows[0];
-        OsmPrimitive my = (OsmPrimitive)model.get(row);
-        OsmPrimitive their = conflicts.get(my);
+        Conflict c = conflicts.get(row);
+        OsmPrimitive my = c.getMy();
+        OsmPrimitive their = c.getTheir();
         ConflictResolutionDialog dialog = new ConflictResolutionDialog(Main.parent);
         dialog.getConflictResolver().populate(my, their);
@@ -125 +152 @@
     }
 
-    public final void rebuildList() {
-        model.removeAllElements();
-        for (OsmPrimitive osm : this.conflicts.keySet()) {
-            model.addElement(osm);
-        }
-
-        if(model.size() != 0) {
-            setTitle(tr("Conflicts: {0}", model.size()), true);
-        } else {
-            setTitle(tr("Conflicts"), false);
-        }
-
-        sbSelect.setEnabled(model.size() > 0);
-        sbResolve.setEnabled(model.size() > 0);
-    }
-
-    public final void add(Map<OsmPrimitive, OsmPrimitive> conflicts) {
-        this.conflicts.putAll(conflicts);
-        rebuildList();
-    }
-
-
-    /**
-     * removes a conflict registered for {@see OsmPrimitive} <code>my</code>
-     *
-     * @param my the {@see OsmPrimitive} for which a conflict is registered
-     *   with this dialog
-     */
-    public void removeConflictForPrimitive(OsmPrimitive my) {
-        if (! conflicts.keySet().contains(my))
-            return;
-        conflicts.remove(my);
-        rebuildList();
-        repaint();
-    }
-
-    /**
-     * registers a conflict with this dialog. The conflict is represented
-     * by a pair of {@see OsmPrimitive} with differences in their tag sets,
-     * their node lists (for {@see Way}s) or their member lists (for {@see Relation}s)
-     *
-     * @param my  my version of the {@see OsmPrimitive}
-     * @param their their version of the {@see OsmPrimitive}
-     */
-    public void addConflict(OsmPrimitive my, OsmPrimitive their) {
-        conflicts.put(my, their);
-        rebuildList();
-        repaint();
-    }
-
-    static public Color getColor()
-    {
-        return Main.pref.getColor(marktr("conflict"), Color.gray);
+
+    /**
+     * refreshes the view of this dialog
+     */
+    public final void refreshView() {
+        model.fireContentChanged();
     }
 
@@ -215 +195 @@
             }
         };
-        for (Object o : displaylist.getSelectedValues()) {
-            if (conflicts.get(o) == null) {
+        for (Object o : lstConflicts.getSelectedValues()) {
+            if (!conflicts.hasConflictForMy((OsmPrimitive)o)) {
                 continue;
             }
-            conflicts.get(o).visit(conflictPainter);
+            conflicts.getConflictForMy((OsmPrimitive)o).getTheir().visit(conflictPainter);
+        }
+    }
+
+
+    /**
+     * replies the conflict collection currently held by this dialog; may be null
+     * 
+     * @return the conflict collection currently held by this dialog; may be null
+     */
+    public ConflictCollection getConflicts() {
+        return conflicts;
+    }
+
+    /**
+     * invoked if the active {@see Layer} changes
+     */
+    public void activeLayerChange(Layer oldLayer, Layer newLayer) {
+        if (oldLayer instanceof OsmDataLayer) {
+            this.layer = (OsmDataLayer)oldLayer;
+            this.layer.getConflicts().removeConflictListener(this);
+        }
+        this.layer = null;
+        if (newLayer instanceof OsmDataLayer) {
+            this.layer = (OsmDataLayer)newLayer;
+            layer.getConflicts().addConflictListener(this);
+            this.conflicts = layer.getConflicts();
+        }
+        refreshView();
+    }
+
+    public void layerAdded(Layer newLayer) {
+        // ignore
+    }
+
+    public void layerRemoved(Layer oldLayer) {
+        if (this.layer == oldLayer) {
+            this.layer = null;
+            refreshView();
+        }
+    }
+
+    public void onConflictsAdded(ConflictCollection conflicts) {
+        refreshView();
+    }
+
+    public void onConflictsRemoved(ConflictCollection conflicts) {
+        refreshView();
+    }
+
+    public void selectionChanged(Collection<? extends OsmPrimitive> newSelection) {
+        lstConflicts.clearSelection();
+        for (OsmPrimitive osm : newSelection) {
+            if (conflicts.hasConflictForMy(osm)) {
+                int pos = model.indexOf(osm);
+                if (pos >= 0) {
+                    lstConflicts.addSelectionInterval(pos, pos);
+                }
+            }
+        }
+    }
+
+    /**
+     * The {@see ListModel} for conflicts
+     *
+     */
+    class ConflictListModel implements ListModel {
+
+        private CopyOnWriteArrayList<ListDataListener> listeners;
+
+        public ConflictListModel() {
+            listeners = new CopyOnWriteArrayList<ListDataListener>();
+        }
+
+        public void addListDataListener(ListDataListener l) {
+            if (l != null && ! listeners.contains(l)) {
+                listeners.add(l);
+            }
+        }
+
+        public void removeListDataListener(ListDataListener l) {
+            listeners.remove(l);
+        }
+
+        protected void fireContentChanged() {
+            ListDataEvent evt = new ListDataEvent(
+                    this,
+                    ListDataEvent.CONTENTS_CHANGED,
+                    0,
+                    getSize()
+            );
+            Iterator<ListDataListener> it = listeners.iterator();
+            while(it.hasNext()) {
+                it.next().contentsChanged(evt);
+            }
+        }
+
+        public Object getElementAt(int index) {
+            if (index < 0) return null;
+            if (index >= getSize()) return null;
+            return conflicts.get(index).getMy();
+        }
+
+        public int getSize() {
+            if (conflicts == null) return 0;
+            return conflicts.size();
+        }
+
+        public int indexOf(OsmPrimitive my) {
+            if (conflicts == null) return -1;
+            for (int i=0; i < conflicts.size();i++) {
+                if (conflicts.get(i).isMatchingMy(my))
+                    return i;
+            }
+            return -1;
+        }
+
+        public OsmPrimitive get(int idx) {
+            if (conflicts == null) return null;
+            return conflicts.get(idx).getMy();
+        }
+    }
+
+    class ResolveAction extends AbstractAction implements ListSelectionListener {
+        public ResolveAction() {
+            putValue(NAME, tr("Resolve"));
+            putValue(SHORT_DESCRIPTION,  tr("Open a merge dialog of all selected items in the list above."));
+            putValue(SMALL_ICON, ImageProvider.get("dialogs", "conflict"));
+        }
+
+        public void actionPerformed(ActionEvent e) {
+            resolve();
+        }
+
+        public void valueChanged(ListSelectionEvent e) {
+            ListSelectionModel model = (ListSelectionModel)e.getSource();
+            boolean enabled = model.getMinSelectionIndex() >= 0
+            && model.getMaxSelectionIndex() >= model.getMinSelectionIndex();
+            setEnabled(enabled);
+        }
+    }
+
+    class SelectAction extends AbstractAction implements ListSelectionListener {
+        public SelectAction() {
+            putValue(NAME, tr("Select"));
+            putValue(SHORT_DESCRIPTION,  tr("Set the selected elements on the map to the selected items in the list above."));
+            putValue(SMALL_ICON, ImageProvider.get("dialogs", "select"));
+        }
+
+        public void actionPerformed(ActionEvent e) {
+            Collection<OsmPrimitive> sel = new LinkedList<OsmPrimitive>();
+            for (Object o : lstConflicts.getSelectedValues()) {
+                sel.add((OsmPrimitive)o);
+            }
+            Main.ds.setSelected(sel);
+        }
+
+        public void valueChanged(ListSelectionEvent e) {
+            ListSelectionModel model = (ListSelectionModel)e.getSource();
+            boolean enabled = model.getMinSelectionIndex() >= 0
+            && model.getMaxSelectionIndex() >= model.getMinSelectionIndex();
+            setEnabled(enabled);
         }
     }

trunk/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java

@@ -48 +48 @@
 import org.openstreetmap.josm.gui.history.HistoryBrowserDialog;
 import org.openstreetmap.josm.io.OsmApi;
+import org.openstreetmap.josm.io.OsmApiException;
 import org.openstreetmap.josm.io.OsmServerHistoryReader;
 import org.openstreetmap.josm.io.OsmTransferException;
@@ -233 +234 @@
         if (task.getLastException() != null) {
             task.getLastException().printStackTrace();
-            String msg = task.getLastException().getMessage();
+            String msg = null;
+            if (task.getLastException() instanceof OsmApiException) {
+                msg = ((OsmApiException)task.getLastException()).getErrorBody();
+                if (msg == null) {
+                    msg = ((OsmApiException)task.getLastException()).getErrorHeader();
+                }
+            }
+            if (msg == null) {
+                msg = task.getLastException().getMessage();
+            }
             if (msg == null) {
                 msg = task.getLastException().toString();
@@ -452 +462 @@
             } catch(OsmTransferException e) {
                 lastException = e;
-                throw e;
+                return;
             } finally {
                 setInterminateEnabled(false);

trunk/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java

@@ -53 +53 @@
 
         public void actionPerformed(ActionEvent e) {
-            if (e != null && !(e.getSource() instanceof AbstractButton))
+            if (e != null && !(e.getSource() instanceof AbstractButton)) {
                 button.setSelected(!button.isSelected());
+            }
             Boolean selected = button.isSelected();
             setVisible(selected);
             Main.pref.put(prefname+".visible", selected);
-            if(!selected && winadapter != null)
+            if(!selected && winadapter != null) {
                 winadapter.windowClosing(null);
-            else if (!Main.pref.getBoolean(action.prefname+".docked", true)) {
+            } else if (!Main.pref.getBoolean(action.prefname+".docked", true)) {
                 EventQueue.invokeLater(new Runnable(){
                     public void run() {
@@ -174 +175 @@
                         setVisible(false);
                         parent.add(ToggleDialog.this);
-                        if(Main.pref.getBoolean(action.prefname+".visible"))
+                        if(Main.pref.getBoolean(action.prefname+".visible")) {
                             setVisible(true);
+                        }
                         titleBar.setVisible(true);
-                        if(e != null)
+                        if(e != null) {
                             Main.pref.put(action.prefname+".docked", true);
+                        }
                     }
                 }));
@@ -190 +193 @@
                     String[] b = bounds.split(",");
                     f.setBounds(Integer.parseInt(b[0]),Integer.parseInt(b[1]),Integer.parseInt(b[2]),Integer.parseInt(b[3]));
-                } else
+                } else {
                     f.pack();
+                }
                 Main.pref.put(action.prefname+".docked", false);
                 f.setVisible(true);
@@ -241 +245 @@
     public void close()
     {
-        if(winadapter != null)
+        if(winadapter != null) {
             winadapter.windowClosing(null);
+        }
     }
 

trunk/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java

@@ -367 +367 @@
             RelationMember  m = clone.members.get(i);
             if (m.member.incomplete)
-            {
                 // TODO: emit some message that sorting failed
                 return;
-            }
             try
             {
@@ -765 +763 @@
                 DataSet dataSet = reader.parseOsm();
                 if (dataSet != null) {
-                    final MergeVisitor visitor = new MergeVisitor(Main.main
-                            .editLayer().data, dataSet);
+                    final MergeVisitor visitor = new MergeVisitor(Main.main.map.mapView.getEditLayer()
+                            .data, dataSet);
                     visitor.merge();
 
                     // copy the merged layer's data source info
                     for (DataSource src : dataSet.dataSources) {
-                        Main.main.editLayer().data.dataSources.add(src);
-                    }
-                    Main.main.editLayer().fireDataChange();
+                        Main.main.map.mapView.getEditLayer().data.dataSources.add(src);
+                    }
+                    Main.main.map.mapView.getEditLayer().fireDataChange();
 
                     if (visitor.getConflicts().isEmpty())
                         return;
                     final ConflictDialog dlg = Main.map.conflictDialog;
-                    dlg.add(visitor.getConflicts());
+                    dlg.getConflicts().add(visitor.getConflicts());
                     JOptionPane.showMessageDialog(Main.parent,
                             tr("There were conflicts during import."));

trunk/src/org/openstreetmap/josm/gui/history/PointInTimeType.java

@@ -2 +2 @@
 package org.openstreetmap.josm.gui.history;
 
-import org.openstreetmap.josm.data.osm.OsmPrimitive;
 
 /**

trunk/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java

@@ -19 +19 @@
 import java.awt.event.ActionEvent;
 import java.awt.geom.Area;
-import java.awt.geom.Rectangle2D;
 import java.awt.image.BufferedImage;
 import java.io.File;
@@ -42 +41 @@
 import org.openstreetmap.josm.actions.SaveAction;
 import org.openstreetmap.josm.actions.SaveAsAction;
+import org.openstreetmap.josm.data.conflict.Conflict;
+import org.openstreetmap.josm.data.conflict.ConflictCollection;
 import org.openstreetmap.josm.data.coor.EastNorth;
 import org.openstreetmap.josm.data.coor.LatLon;
@@ -60 +61 @@
 import org.openstreetmap.josm.data.osm.visitor.SimplePaintVisitor;
 import org.openstreetmap.josm.gui.MapView;
-import org.openstreetmap.josm.gui.dialogs.ConflictDialog;
 import org.openstreetmap.josm.gui.dialogs.LayerListDialog;
 import org.openstreetmap.josm.gui.dialogs.LayerListPopup;
@@ -74 +74 @@
  */
 public class OsmDataLayer extends Layer {
+
+    /** the global counter for created data layers */
+    static private int dataLayerCounter = 0;
+
+    /**
+     * Replies a new unique name for a data layer
+     * 
+     * @return a new unique name for a data layer
+     */
+    static public String createNewName() {
+        dataLayerCounter++;
+        return tr("Data Layer {0}", dataLayerCounter);
+    }
 
     public final static class DataCountVisitor extends AbstractVisitor {
@@ -114 +127 @@
      */
     public final DataSet data;
+
+    /**
+     * the collection of conflicts detected in this layer
+     */
+    private ConflictCollection conflicts;
 
     /**
@@ -159 +177 @@
         this.data = data;
         this.setAssociatedFile(associatedFile);
+        conflicts = new ConflictCollection();
     }
 
@@ -177 +196 @@
         boolean active = Main.map.mapView.getActiveLayer() == this;
         boolean inactive = !active && Main.pref.getBoolean("draw.data.inactive_color", true);
-        boolean virtual = !inactive && Main.map.mapView.useVirtualNodes();
+        boolean virtual = !inactive && Main.map.mapView.isVirtualNodesEnabled();
 
         // draw the hatched area for non-downloaded region. only draw if we're the active
@@ -271 +290 @@
         Main.map.mapView.repaint();
 
-        if (visitor.getConflicts().isEmpty())
-            return;
-        final ConflictDialog dlg = Main.map.conflictDialog;
-        dlg.add(visitor.getConflicts());
-        JOptionPane.showMessageDialog(Main.parent,tr("There were {0} conflicts during import.", visitor.getConflicts().size()));
-        if (!dlg.isVisible()) {
-            dlg.action.actionPerformed(new ActionEvent(this, 0, ""));
+        int numNewConflicts = 0;
+        for (Conflict c : visitor.getConflicts()) {
+            if (!conflicts.hasConflict(c)) {
+                numNewConflicts++;
+                conflicts.add(c);
+            }
+        }
+        if (numNewConflicts > 0) {
+            JOptionPane.showMessageDialog(Main.parent,tr("There were {0} conflicts during import.", numNewConflicts));
         }
     }
@@ -510 +531 @@
         return layer_bounds_point;
     }
+
+    /**
+     * replies the set of conflicts currently managed in this layer
+     * 
+     * @return the set of conflicts currently managed in this layer
+     */
+    public ConflictCollection getConflicts() {
+        return conflicts;
+    }
 }

trunk/src/org/openstreetmap/josm/io/OsmApi.java

@@ -330 +330 @@
             String diffresult = sendRequest("POST", "changeset/" + changeset.id + "/upload", diff);
             DiffResultReader.parseDiffResult(diffresult, list, processed, duv.getNewIdMap(), Main.pleaseWaitDlg);
+        } catch(OsmTransferException e) {
+            throw e;
         } catch(Exception e) {
             throw new OsmTransferException(e);
@@ -443 +445 @@
 
                 if (retCode != 200)
-                    throw new OsmApiException(retCode,errorHeader,responseBody.toString());
+                    throw new OsmApiException(retCode,errorHeader.trim(),responseBody.toString().trim());
 
                 return responseBody.toString();

trunk/src/org/openstreetmap/josm/io/OsmServerWriter.java

@@ -94 +94 @@
         boolean useChangeset = Main.pref.getBoolean("osm-server.atomic-upload", apiVersion.compareTo("0.6")>=0);
         if (useChangeset && ! canUseChangeset) {
-            System.out.println(tr("WARNING: preference ''{0}'' or api version ''{1}'' of dataset requires to use changesets, but API is not handle them. Ignoring changesets.", "osm-server.atomic-upload", apiVersion));
+            System.out.println(tr("WARNING: preference ''{0}'' or api version ''{1}'' of dataset requires to use changesets, but API is not able to handle them. Ignoring changesets.", "osm-server.atomic-upload", apiVersion));
             useChangeset = false;
         }