Changeset 3362 in josm for trunk/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java

Timestamp:

2010-07-03T22:08:57+02:00 (14 years ago)

Author:

stoecker

Message:

fix #5182 - Conflict system simplification - patch by Upliner

File:

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

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

@@ -26 +26 @@
 import org.openstreetmap.josm.gui.conflict.pair.nodes.NodeListMergeModel;
 import org.openstreetmap.josm.gui.conflict.pair.nodes.NodeListMerger;
-import org.openstreetmap.josm.gui.conflict.pair.properties.OperationCancelledException;
 import org.openstreetmap.josm.gui.conflict.pair.properties.PropertiesMergeModel;
 import org.openstreetmap.josm.gui.conflict.pair.properties.PropertiesMerger;
@@ -235 +234 @@
         this.conflict = conflict;
         propertiesMerger.populate(conflict);
-        if (propertiesMerger.getModel().hasVisibleStateConflict()) {
-            tabbedPane.setEnabledAt(1, false);
-            tabbedPane.setEnabledAt(2, false);
-            tabbedPane.setEnabledAt(3, false);
-            return;
-        }
+
         tabbedPane.setEnabledAt(0, true);
         tagMerger.populate(conflict);
@@ -270 +264 @@
      * @return the resolution command
      */
-    public Command buildResolveCommand() throws OperationCancelledException {
+    public Command buildResolveCommand() {
         ArrayList<Command> commands = new ArrayList<Command>();
-        if (propertiesMerger.getModel().hasVisibleStateConflict()) {
-            if (propertiesMerger.getModel().isDecidedVisibleState()) {
-                commands.addAll(propertiesMerger.getModel().buildResolveCommand(conflict));
-            }
-        } else {
-            if (tagMerger.getModel().getNumResolvedConflicts() > 0) {
-                commands.add(tagMerger.getModel().buildResolveCommand(conflict));
-            }
-            commands.addAll(propertiesMerger.getModel().buildResolveCommand(conflict));
-            if (my instanceof Way && nodeListMerger.getModel().isFrozen()) {
-                NodeListMergeModel model  =(NodeListMergeModel)nodeListMerger.getModel();
-                commands.add(model.buildResolveCommand(conflict));
-            } else if (my instanceof Relation && relationMemberMerger.getModel().isFrozen()) {
-                RelationMemberListMergeModel model  =(RelationMemberListMergeModel)relationMemberMerger.getModel();
-                commands.add(model.buildResolveCommand((Relation)my, (Relation)their));
-            }
-            if (isResolvedCompletely()) {
-                commands.add(new VersionConflictResolveCommand(conflict));
-                commands.add(new ModifiedConflictResolveCommand(conflict));
-            }
+
+        if (tagMerger.getModel().getNumResolvedConflicts() > 0) {
+            commands.add(tagMerger.getModel().buildResolveCommand(conflict));
+        }
+        commands.addAll(propertiesMerger.getModel().buildResolveCommand(conflict));
+        if (my instanceof Way && nodeListMerger.getModel().isFrozen()) {
+            NodeListMergeModel model = (NodeListMergeModel) nodeListMerger.getModel();
+            commands.add(model.buildResolveCommand(conflict));
+        } else if (my instanceof Relation && relationMemberMerger.getModel().isFrozen()) {
+            RelationMemberListMergeModel model = (RelationMemberListMergeModel) relationMemberMerger.getModel();
+            commands.add(model.buildResolveCommand((Relation) my, (Relation) their));
+        }
+        if (isResolvedCompletely()) {
+            commands.add(new VersionConflictResolveCommand(conflict));
+            commands.add(new ModifiedConflictResolveCommand(conflict));
         }
         return new SequenceCommand(tr("Conflict Resolution"), commands);