Changeset 2945 in josm for trunk/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java

Timestamp:

06.02.2010 09:37:48 (2 years ago)

Author:

jttt

Message:

Improvements in conflicts gui

File:

• trunk/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java (modified) (6 diffs)

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();
         }
     }