Changeset 2945 in josm

Timestamp:

Feb 6, 2010 9:37:48 AM (3 years ago)

Author:

jttt

Message:

Improvements in conflicts gui

Location:

trunk

Files:

• images/dialogs/conflict/useallleft.png (added)
• images/dialogs/conflict/useallright.png (added)
• src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java (modified) (1 diff)
• src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java (modified) (4 diffs)
• src/org/openstreetmap/josm/gui/conflict/pair/IConflictResolver.java (modified) (1 diff)
• src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java (modified) (1 diff)
• src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java (modified) (6 diffs)
• src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMerger.java (modified) (2 diffs)
• src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java (modified) (1 diff)
• src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberMerger.java (modified) (2 diffs)
• src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeModel.java (modified) (3 diffs)
• src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java (modified) (5 diffs)
• src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java (modified) (2 diffs)

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

@@ -72 +72 @@
                 conflict.getMy().setDeleted(true);
             } else {
-                conflict.getMy().setDeleted(conflict.getTheir().isDeleted());
+                conflict.getMy().setDeleted(false);
             }
         } else

trunk/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java

@@ -231 +231 @@
         setMy(my);
         setTheir(their);
-        propertiesMerger.getModel().populate(my, their);
+        propertiesMerger.populate(my, their);
         if (propertiesMerger.getModel().hasVisibleStateConflict()) {
             tabbedPane.setEnabledAt(1, false);
@@ -239 +239 @@
         }
         tabbedPane.setEnabledAt(0, true);
-        tagMerger.getModel().populate(my, their);
+        tagMerger.populate(my, their);
         tabbedPane.setEnabledAt(1, true);
 
@@ -246 +246 @@
             tabbedPane.setEnabledAt(3,false);
         } else if (my instanceof Way) {
-            nodeListMerger.populate((Way)my, (Way)their);
+            nodeListMerger.populate(my, their);
             tabbedPane.setEnabledAt(2, true);
             tabbedPane.setEnabledAt(3, false);
@@ -252 +252 @@
             tabbedPane.setIconAt(3, null);
         } else if (my instanceof Relation) {
-            relationMemberMerger.populate((Relation)my, (Relation)their);
+            relationMemberMerger.populate(my, their);
             tabbedPane.setEnabledAt(2, false);
             tabbedPane.setTitleAt(2,tr("Nodes"));

trunk/src/org/openstreetmap/josm/gui/conflict/pair/IConflictResolver.java

@@ -1 +1 @@
 // License: GPL. For details, see LICENSE file.
 package org.openstreetmap.josm.gui.conflict.pair;
+
+import org.openstreetmap.josm.data.osm.OsmPrimitive;
 
 public interface IConflictResolver {
 
     void deletePrimitive(boolean deleted);
+    void populate(OsmPrimitive my, OsmPrimitive their);
 
 }

trunk/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java

@@ -310 +310 @@
     }
 
+    public void copyAll(ListRole source) {
+        getMergedEntries().clear();
+        getMergedEntries().addAll(entries.get(source));
+        fireModelDataChanged();
+    }
+
     /**
      * Copies the nodes given by indices in rows from the list of  nodes <code>source</code> to the

trunk/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java

@@ -57 +57 @@
     private CopyAfterCurrentLeftAction copyAfterCurrentLeftAction;
     private CopyEndLeftAction copyEndLeftAction;
+    private CopyAllLeft copyAllLeft;
 
     private CopyStartRightAction copyStartRightAction;
@@ -62 +63 @@
     private CopyAfterCurrentRightAction copyAfterCurrentRightAction;
     private CopyEndRightAction copyEndRightAction;
+    private CopyAllRight copyAllRight;
 
     private MoveUpMergedAction moveUpMergedAction;
@@ -118 +120 @@
         mergedEntriesTable.getSelectionModel().addListSelectionListener(moveDownMergedAction);
         mergedEntriesTable.getSelectionModel().addListSelectionListener(removeMergedAction);
+
+        model.addObserver(copyAllLeft);
+        model.addObserver(copyAllRight);
+        model.addPropertyChangeListener(copyAllLeft);
+        model.addPropertyChangeListener(copyAllRight);
     }
 
@@ -153 +160 @@
         pnl.add(btn, gc);
 
+        gc.gridx = 0;
+        gc.gridy = 4;
+        copyAllLeft = new CopyAllLeft();
+        btn = new JButton(copyAllLeft);
+        btn.setName("button.copyallleft");
+        pnl.add(btn, gc);
+
         return pnl;
     }
@@ -180 +194 @@
         copyEndRightAction = new CopyEndRightAction();
         pnl.add(new JButton(copyEndRightAction), gc);
+
+        gc.gridx = 0;
+        gc.gridy = 4;
+        copyAllRight = new CopyAllRight();
+        pnl.add(new JButton(copyAllRight), gc);
 
         return pnl;
@@ -614 +633 @@
                     && ! mergedEntriesTable.getSelectionModel().isSelectionEmpty()
             );
+        }
+    }
+
+    class CopyAllLeft extends AbstractAction implements Observer, PropertyChangeListener {
+
+        public CopyAllLeft() {
+            ImageIcon icon = ImageProvider.get("dialogs/conflict", "useallleft.png");
+            putValue(Action.SMALL_ICON, icon);
+            putValue(Action.SHORT_DESCRIPTION, tr("Use all mine elements"));
+        }
+
+        public void actionPerformed(ActionEvent arg0) {
+            model.copyAll(ListRole.MY_ENTRIES);
+            model.setFrozen(true);
+        }
+
+        private void updateEnabledState() {
+            setEnabled(model.getMergedEntries().isEmpty() && !model.isFrozen());
+        }
+
+        public void update(Observable o, Object arg) {
+            updateEnabledState();
+        }
+
+        public void propertyChange(PropertyChangeEvent evt) {
+            updateEnabledState();
+        }
+    }
+
+    class CopyAllRight extends AbstractAction implements Observer, PropertyChangeListener {
+
+        public CopyAllRight() {
+            ImageIcon icon = ImageProvider.get("dialogs/conflict", "useallright.png");
+            putValue(Action.SMALL_ICON, icon);
+            putValue(Action.SHORT_DESCRIPTION, tr("Use all their elements"));
+        }
+
+        public void actionPerformed(ActionEvent arg0) {
+            model.copyAll(ListRole.THEIR_ENTRIES);
+            model.setFrozen(true);
+        }
+
+        private void updateEnabledState() {
+            setEnabled(model.getMergedEntries().isEmpty() && !model.isFrozen());
+        }
+
+        public void update(Observable o, Object arg) {
+            updateEnabledState();
+        }
+
+        public void propertyChange(PropertyChangeEvent evt) {
+            updateEnabledState();
         }
     }

trunk/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMerger.java

@@ -5 +5 @@
 
 import org.openstreetmap.josm.data.osm.Node;
+import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.data.osm.Way;
 import org.openstreetmap.josm.gui.conflict.pair.IConflictResolver;
@@ -62 +63 @@
     }
 
-    public void populate(Way my, Way their) {
-        ((NodeListMergeModel)model).populate(my, their);
+    public void populate(OsmPrimitive my, OsmPrimitive their) {
+        ((NodeListMergeModel)model).populate((Way)my, (Way)their);
     }
 

trunk/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java

@@ -717 +717 @@
         }
     }
+
+    public void populate(OsmPrimitive my, OsmPrimitive their) {
+        model.populate(my, their);
+    }
 }

trunk/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberMerger.java

@@ -5 +5 @@
 import javax.swing.JTable;
 
+import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.data.osm.Relation;
 import org.openstreetmap.josm.data.osm.RelationMember;
@@ -53 +54 @@
     }
 
-    public void populate(Relation my, Relation their) {
+    public void populate(OsmPrimitive my, OsmPrimitive their) {
         RelationMemberListMergeModel model = (RelationMemberListMergeModel)getModel();
-        model.populate(my,their);
+        model.populate((Relation)my, (Relation)their);
     }
 

trunk/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeModel.java

@@ -6 +6 @@
 import java.util.ArrayList;
 import java.util.HashSet;
+import java.util.List;
 import java.util.Set;
 
@@ -33 +34 @@
 
     /** the list of tag merge items */
-    private final ArrayList<TagMergeItem> tagMergeItems;
+    private final List<TagMergeItem> tagMergeItems;
 
     /** the property change listeners */
-    private final ArrayList<PropertyChangeListener> listeners;
+    private final List<PropertyChangeListener> listeners;
 
     private int numUndecidedTags = 0;
@@ -210 +211 @@
 
     }
+
+    public int getFirstUndecided(int startIndex) {
+        for (int i=startIndex; i<tagMergeItems.size(); i++) {
+            if (tagMergeItems.get(i).getMergeDecision() == MergeDecisionType.UNDECIDED)
+                return i;
+        }
+        return -1;
+    }
 }

trunk/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java

@@ -26 +26 @@
 import javax.swing.event.ListSelectionListener;
 
+import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.gui.conflict.pair.IConflictResolver;
 import org.openstreetmap.josm.gui.conflict.pair.MergeDecisionType;
@@ -241 +242 @@
     public TagMergeModel getModel() {
         return model;
+    }
+
+    private void selectNextConflict(int[] rows) {
+        int max = rows[0];
+        for (int row: rows) {
+            if (row > max) {
+                max = row;
+            }
+        }
+        int index = model.getFirstUndecided(max+1);
+        if (index == -1) {
+            index = model.getFirstUndecided(0);
+        }
+        mineTable.getSelectionModel().setSelectionInterval(index, index);
+        theirTable.getSelectionModel().setSelectionInterval(index, index);
     }
 
@@ -265 +281 @@
                 return;
             model.decide(rows, MergeDecisionType.KEEP_MINE);
+            selectNextConflict(rows);
         }
 
@@ -294 +311 @@
                 return;
             model.decide(rows, MergeDecisionType.KEEP_THEIR);
+            selectNextConflict(rows);
         }
 
@@ -402 +420 @@
         }
     }
+
+    public void populate(OsmPrimitive my, OsmPrimitive their) {
+        model.populate(my, their);
+        mineTable.getSelectionModel().setSelectionInterval(0, 0);
+        theirTable.getSelectionModel().setSelectionInterval(0, 0);
+    }
 }

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

@@ -137 +137 @@
      */
     private final void resolve() {
-        if (conflicts == null) return;
-        if (conflicts.size() == 1) {
-            lstConflicts.setSelectedIndex(0);
-        }
-
-        if (lstConflicts.getSelectedIndex() == -1)
-            return;
-
-        int [] selectedRows = lstConflicts.getSelectedIndices();
-        if (selectedRows == null || selectedRows.length == 0)
-            return;
-        int row = selectedRows[0];
-        Conflict<?> c = conflicts.get(row);
+        if (conflicts == null || model.getSize() == 0) return;
+
+        int index = lstConflicts.getSelectedIndex();
+        if (index < 0) {
+            index = 0;
+        }
+
+        Conflict<?> c = conflicts.get(index);
         OsmPrimitive my = c.getMy();
         OsmPrimitive their = c.getTheir();
@@ -155 +150 @@
         dialog.getConflictResolver().populate(my, their);
         dialog.setVisible(true);
+
+        lstConflicts.setSelectedIndex(index);
+
         Main.map.mapView.repaint();
     }