Changeset 9440 in josm for trunk/src

Timestamp:

2016-01-14T16:42:50+01:00 (8 years ago)

Author:

simon04

Message:

see #12338 - Conflict resolution: add expert actions "Resolve to my/their versions" in popup menu

This resolves all selected conflicts to my/their versions.

Location:

trunk/src/org/openstreetmap/josm/gui

Files:

• conflict/pair/ConflictResolver.java (modified) (1 diff)
• conflict/pair/IConflictResolver.java (modified) (1 diff)
• conflict/pair/ListMerger.java (modified) (1 diff)
• conflict/pair/properties/PropertiesMerger.java (modified) (1 diff)
• conflict/pair/tags/TagMergeModel.java (modified) (1 diff)
• conflict/pair/tags/TagMerger.java (modified) (1 diff)
• dialogs/ConflictDialog.java (modified) (8 diffs)

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

@@ -347 +347 @@
         relationMemberMerger.unlinkAsListener();
     }
+
+    public void decideRemaining(MergeDecisionType decision) {
+        propertiesMerger.decideRemaining(decision);
+        tagMerger.decideRemaining(decision);
+        if (my instanceof Way) {
+            nodeListMerger.decideRemaining(decision);
+        } else if (my instanceof Relation) {
+            relationMemberMerger.decideRemaining(decision);
+        }
+        updateResolvedCompletely();
+        if (!isResolvedCompletely()) {
+            throw new AssertionError();
+        }
+    }
 }

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

@@ -10 +10 @@
 
     void populate(Conflict<? extends OsmPrimitive> conflict);
+
+    void decideRemaining(MergeDecisionType decision);
 }

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

@@ -917 +917 @@
         return null;
     }
+
+    public void decideRemaining(MergeDecisionType decision) {
+        if (!model.isFrozen()) {
+            model.copyAll(MergeDecisionType.KEEP_MINE.equals(decision) ? ListRole.MY_ENTRIES : ListRole.THEIR_ENTRIES);
+        }
+    }
 }

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

@@ -508 +508 @@
         model.populate(conflict);
     }
+
+    @Override
+    public void decideRemaining(MergeDecisionType decision) {
+        if (!model.isDecidedCoord()) {
+            model.decideDeletedStateConflict(decision);
+        }
+        if (!model.isDecidedCoord()) {
+            model.decideCoordsConflict(decision);
+        }
+    }
 }

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

@@ -202 +202 @@
     }
 
+    public void decideRemaining(MergeDecisionType decision) {
+        for (TagMergeItem item: tagMergeItems) {
+            if (item.getMergeDecision().equals(MergeDecisionType.UNDECIDED))
+                item.decide(decision);
+        }
+    }
+
     public int getNumResolvedConflicts() {
         int n = 0;

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

@@ -443 +443 @@
         }
     }
+
+    @Override
+    public void decideRemaining(MergeDecisionType decision) {
+        model.decideRemaining(decision);
+    }
 }

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

@@ -13 +13 @@
 import java.awt.event.KeyEvent;
 import java.awt.event.MouseEvent;
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.HashSet;
 import java.util.LinkedList;
+import java.util.List;
 import java.util.Set;
 import java.util.concurrent.CopyOnWriteArrayList;
@@ -22 +24 @@
 import javax.swing.AbstractAction;
 import javax.swing.JList;
+import javax.swing.JMenuItem;
 import javax.swing.JOptionPane;
 import javax.swing.JPopupMenu;
@@ -30 +33 @@
 import javax.swing.event.ListSelectionEvent;
 import javax.swing.event.ListSelectionListener;
+import javax.swing.event.PopupMenuEvent;
+import javax.swing.event.PopupMenuListener;
 
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.actions.AbstractSelectAction;
+import org.openstreetmap.josm.actions.ExpertToggleAction;
+import org.openstreetmap.josm.command.Command;
+import org.openstreetmap.josm.command.SequenceCommand;
 import org.openstreetmap.josm.data.SelectionChangedListener;
 import org.openstreetmap.josm.data.conflict.Conflict;
@@ -52 +60 @@
 import org.openstreetmap.josm.gui.PopupMenuHandler;
 import org.openstreetmap.josm.gui.SideButton;
+import org.openstreetmap.josm.gui.conflict.pair.ConflictResolver;
+import org.openstreetmap.josm.gui.conflict.pair.MergeDecisionType;
 import org.openstreetmap.josm.gui.layer.OsmDataLayer;
 import org.openstreetmap.josm.gui.util.GuiHelper;
@@ -118 +128 @@
 
         popupMenuHandler.addAction(Main.main.menu.autoScaleActions.get("conflict"));
+
+        final ResolveTpMyVersionAction resolveTpMyVersionAction = new ResolveTpMyVersionAction();
+        final ResolveToTheirVersionAction resolveToTheirVersionAction = new ResolveToTheirVersionAction();
+        addListSelectionListener(resolveTpMyVersionAction);
+        addListSelectionListener(resolveToTheirVersionAction);
+        final JMenuItem btnResolveMy = popupMenuHandler.addAction(resolveTpMyVersionAction);
+        final JMenuItem btnResolveTheir = popupMenuHandler.addAction(resolveToTheirVersionAction);
+
+        popupMenuHandler.addListener(new PopupMenuListener() {
+            @Override
+            public void popupMenuWillBecomeVisible(PopupMenuEvent e) {
+                btnResolveMy.setVisible(ExpertToggleAction.isExpert());
+                btnResolveTheir.setVisible(ExpertToggleAction.isExpert());
+            }
+
+            @Override
+            public void popupMenuWillBecomeInvisible(PopupMenuEvent e) {
+                // Do nothing
+            }
+
+            @Override
+            public void popupMenuCanceled(PopupMenuEvent e) {
+                // Do nothing
+            }
+        });
     }
 
@@ -319 +354 @@
     }
 
+    private boolean isConflictSelected() {
+        final ListSelectionModel model = lstConflicts.getSelectionModel();
+        return model.getMinSelectionIndex() >= 0 && model.getMaxSelectionIndex() >= model.getMinSelectionIndex();
+    }
+
     @Override
     public void onConflictsAdded(ConflictCollection conflicts) {
@@ -445 +485 @@
         @Override
         public void valueChanged(ListSelectionEvent e) {
-            ListSelectionModel model = (ListSelectionModel) e.getSource();
-            boolean enabled = model.getMinSelectionIndex() >= 0
-            && model.getMaxSelectionIndex() >= model.getMinSelectionIndex();
-            setEnabled(enabled);
+            setEnabled(isConflictSelected());
         }
     }
@@ -471 +508 @@
         @Override
         public void valueChanged(ListSelectionEvent e) {
-            ListSelectionModel model = (ListSelectionModel) e.getSource();
-            boolean enabled = model.getMinSelectionIndex() >= 0
-            && model.getMaxSelectionIndex() >= model.getMinSelectionIndex();
-            setEnabled(enabled);
+            setEnabled(isConflictSelected());
+        }
+    }
+
+    abstract class ResolveToAction extends ResolveAction {
+        private final String name;
+        private final MergeDecisionType type;
+
+        ResolveToAction(String name, String description, MergeDecisionType type) {
+            this.name = name;
+            this.type = type;
+            putValue(NAME, name);
+            putValue(SHORT_DESCRIPTION,  description);
+        }
+
+        @Override
+        public void actionPerformed(ActionEvent e) {
+            final ConflictResolver resolver = new ConflictResolver();
+            final List<Command> commands = new ArrayList<>();
+            for (OsmPrimitive osmPrimitive : lstConflicts.getSelectedValuesList()) {
+                Conflict<? extends OsmPrimitive> c = conflicts.getConflictForMy(osmPrimitive);
+                resolver.populate(c);
+                resolver.decideRemaining(type);
+                commands.add(resolver.buildResolveCommand());
+            }
+            Main.main.undoRedo.add(new SequenceCommand(name, commands));
+            refreshView();
+            Main.map.mapView.repaint();
+        }
+    }
+
+    class ResolveTpMyVersionAction extends ResolveToAction {
+        public ResolveTpMyVersionAction() {
+            super(tr("Resolve to my versions"), tr("Resolves all unresolved conflicts to ''my'' version"),
+                    MergeDecisionType.KEEP_MINE);
+        }
+    }
+
+    class ResolveToTheirVersionAction extends ResolveToAction {
+        public ResolveToTheirVersionAction() {
+            super(tr("Resolve to their versions"), tr("Resolves all unresolved conflicts to ''their'' version"),
+                    MergeDecisionType.KEEP_THEIR);
         }
     }