Changeset 90 in josm for src/org/openstreetmap/josm/command/ConflictResolveCommand.java

Timestamp:

2006-04-21T20:05:14+02:00 (18 years ago)

Author:

imi

Message:

• fixed that toggle dialog buttons are sync with the dialogs
• added search for timestamp (e.g. timestamp:06-3-25)

File:

• src/org/openstreetmap/josm/command/ConflictResolveCommand.java (modified) (4 diffs)

src/org/openstreetmap/josm/command/ConflictResolveCommand.java

@@ -9 +9 @@
 import java.util.Map.Entry;
 
-import javax.swing.DefaultListModel;
-
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.conflict.ConflictItem;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.gui.ConflictResolver;
+import org.openstreetmap.josm.gui.dialogs.ConflictDialog;
 
 public class ConflictResolveCommand extends Command {
@@ -21 +20 @@
         private final Map<OsmPrimitive, OsmPrimitive> resolved;
         private Map<OsmPrimitive, OsmPrimitive> origAllConflicts;
+        private final ConflictDialog conflictDialog;
 
         public ConflictResolveCommand(List<ConflictItem> conflicts, Map<OsmPrimitive, OsmPrimitive> resolved) {
                 this.conflicts = conflicts;
                 this.resolved = resolved;
+                conflictDialog = Main.main.getMapFrame().conflictDialog;
         }
 
@@ -30 +31 @@
                 super.executeCommand();
 
-                origAllConflicts = new HashMap<OsmPrimitive, OsmPrimitive>(Main.main.getMapFrame().conflictDialog.conflicts);
-
+                origAllConflicts = new HashMap<OsmPrimitive, OsmPrimitive>(conflictDialog.conflicts);
                 
                 Set<OsmPrimitive> completed = new HashSet<OsmPrimitive>(resolved.keySet());
@@ -44 +44 @@
                         }
                 }
-                for (OsmPrimitive k : completed) {
-                        Main.main.getMapFrame().conflictDialog.conflicts.remove(k);
-                        Main.main.getMapFrame().conflictDialog.model.removeElement(k);
-                }
+                for (OsmPrimitive k : completed)
+                        conflictDialog.conflicts.remove(k);
+                if (!completed.isEmpty())
+                        conflictDialog.rebuildList();
         }
 
         @Override public void undoCommand() {
                 super.undoCommand();
-                Map<OsmPrimitive, OsmPrimitive> c = Main.main.getMapFrame().conflictDialog.conflicts;
-                DefaultListModel m = Main.main.getMapFrame().conflictDialog.model;
-
-                c.clear();
-                c.putAll(origAllConflicts);
-                m.removeAllElements();
-                for (Entry<OsmPrimitive, OsmPrimitive> e : c.entrySet())
-                        m.addElement(e.getKey());
+                Main.main.getMapFrame().conflictDialog.conflicts.clear();
+                Main.main.getMapFrame().conflictDialog.conflicts.putAll(origAllConflicts);
+                Main.main.getMapFrame().conflictDialog.rebuildList();
         }