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

Timestamp:

23.06.2009 22:03:37 (3 years ago)

Author:

Gubaer

Message:

new: MultiFetchServerObjectReader using APIs Multi Fetch method
update: now uses Multi Fetch to check for deleted primitives on the server
update: now uses Multi Fetch to update the selected primitives with the state from the server
fixed: cleaned up merging in MergeVisitor
new: conflict resolution dialog; now resolves conflicts due to different visibilities
new: replacement for realEqual() on OsmPrimitive and derived classes; realEqual now @deprecated
fixed: cleaning up OsmReader
fixed: progress indication in OsmApi

File:

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

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

@@ -23 +23 @@
 import org.openstreetmap.josm.gui.conflict.nodes.NodeListMergeModel;
 import org.openstreetmap.josm.gui.conflict.nodes.NodeListMerger;
+import org.openstreetmap.josm.gui.conflict.properties.OperationCancelledException;
 import org.openstreetmap.josm.gui.conflict.properties.PropertiesMergeModel;
 import org.openstreetmap.josm.gui.conflict.properties.PropertiesMerger;
@@ -145 +146 @@
         this.their =  their;
         propertiesMerger.getModel().populate(my, their);
+        if (propertiesMerger.getModel().hasVisibleStateConflict()) {
+            tabbedPane.setEnabledAt(1, false);
+            tabbedPane.setEnabledAt(2, false);
+            tabbedPane.setEnabledAt(3, false);
+            return;
+        }
         tabbedPane.setEnabledAt(0, true);
         tagMerger.getModel().populate(my, their);
@@ -165 +172 @@
             tabbedPane.setEnabledAt(3, true);
         }
+
     }
 
@@ -173 +181 @@
      * @return the resolution command
      */
-    public Command buildResolveCommand() {
+    public Command buildResolveCommand() throws OperationCancelledException {
         ArrayList<Command> commands = new ArrayList<Command>();
-        if (tagMerger.getModel().getNumResolvedConflicts() > 0) {
-            commands.add(tagMerger.getModel().buildResolveCommand(my, their));
-        }
-        commands.addAll(propertiesMerger.getModel().buildResolveCommand(my, their));
-        if (my instanceof Way && nodeListMerger.getModel().isFrozen()) {
-            NodeListMergeModel model  =(NodeListMergeModel)nodeListMerger.getModel();
-            commands.add(model.buildResolveCommand((Way)my, (Way)their));
-        } 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(my, their)
-            );
+        if (propertiesMerger.getModel().hasVisibleStateConflict()) {
+            if (propertiesMerger.getModel().isDecidedVisibleState()) {
+                commands.addAll(propertiesMerger.getModel().buildResolveCommand(my, their));
+            }
+        } else {
+            if (tagMerger.getModel().getNumResolvedConflicts() > 0) {
+                commands.add(tagMerger.getModel().buildResolveCommand(my, their));
+            }
+            commands.addAll(propertiesMerger.getModel().buildResolveCommand(my, their));
+            if (my instanceof Way && nodeListMerger.getModel().isFrozen()) {
+                NodeListMergeModel model  =(NodeListMergeModel)nodeListMerger.getModel();
+                commands.add(model.buildResolveCommand((Way)my, (Way)their));
+            } 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(my, their)
+                );
+            }
         }
         return new SequenceCommand(tr("Conflict Resolution"), commands);