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

Timestamp:

2010-02-04T21:04:02+01:00 (14 years ago)

Author:

jttt

Message:

Fixed #4408 confict manager: do not have to solve tag- and element-conficts when deleting

File:

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

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

@@ -9 +9 @@
 import java.beans.PropertyChangeListener;
 import java.util.ArrayList;
-import java.util.logging.Logger;
+import java.util.List;
 
 import javax.swing.ImageIcon;
@@ -67 +67 @@
     static public final String THEIR_PRIMITIVE_PROP = ConflictResolver.class.getName() + ".theirPrimitive";
 
-    private static final Logger logger = Logger.getLogger(ConflictResolver.class.getName());
+    //private static final Logger logger = Logger.getLogger(ConflictResolver.class.getName());
 
     private JTabbedPane tabbedPane = null;
@@ -74 +74 @@
     private RelationMemberMerger relationMemberMerger;
     private PropertiesMerger propertiesMerger;
+    private final List<IConflictResolver> conflictResolvers = new ArrayList<IConflictResolver>();
     private OsmPrimitive my;
     private OsmPrimitive their;
@@ -119 +120 @@
         setLayout(new BorderLayout());
         add(tabbedPane, BorderLayout.CENTER);
+
+        conflictResolvers.add(propertiesMerger);
+        conflictResolvers.add(tagMerger);
+        conflictResolvers.add(nodeListMerger);
+        conflictResolvers.add(relationMemberMerger);
     }
 
@@ -174 +180 @@
         } else if (evt.getPropertyName().equals(ListMergeModel.FROZEN_PROP)) {
             boolean frozen = (Boolean)evt.getNewValue();
-            if (frozen && evt.getSource() == nodeListMerger.getModel()) {
-                tabbedPane.setTitleAt(2, tr("Nodes(resolved)"));
-                tabbedPane.setToolTipTextAt(2, tr("Merged node list frozen. No pending conflicts in the node list of this way"));
-                tabbedPane.setIconAt(2, mergeComplete);
-            } else {
-                tabbedPane.setTitleAt(2, tr("Nodes(with conflicts)"));
-                tabbedPane.setToolTipTextAt(2,tr("Pending conflicts in the node list of this way"));
-                tabbedPane.setIconAt(2, mergeIncomplete);
-            }
-            if (frozen && evt.getSource() == relationMemberMerger.getModel()) {
-                tabbedPane.setTitleAt(3, tr("Members(resolved)"));
-                tabbedPane.setToolTipTextAt(3, tr("Merged member list frozen. No pending conflicts in the member list of this relation"));
-                tabbedPane.setIconAt(3, mergeComplete);
-            } else {
-                tabbedPane.setTitleAt(3, tr("Members(with conflicts)"));
-                tabbedPane.setToolTipTextAt(3, tr("Pending conflicts in the member list of this relation"));
-                tabbedPane.setIconAt(3, mergeIncomplete);
+            if (evt.getSource() == nodeListMerger.getModel() && my instanceof Way) {
+                if (frozen) {
+                    tabbedPane.setTitleAt(2, tr("Nodes(resolved)"));
+                    tabbedPane.setToolTipTextAt(2, tr("Merged node list frozen. No pending conflicts in the node list of this way"));
+                    tabbedPane.setIconAt(2, mergeComplete);
+                } else {
+                    tabbedPane.setTitleAt(2, tr("Nodes(with conflicts)"));
+                    tabbedPane.setToolTipTextAt(2,tr("Pending conflicts in the node list of this way"));
+                    tabbedPane.setIconAt(2, mergeIncomplete);
+                }
+            } else if (evt.getSource() == relationMemberMerger.getModel() && my instanceof Relation) {
+                if (frozen) {
+                    tabbedPane.setTitleAt(3, tr("Members(resolved)"));
+                    tabbedPane.setToolTipTextAt(3, tr("Merged member list frozen. No pending conflicts in the member list of this relation"));
+                    tabbedPane.setIconAt(3, mergeComplete);
+                } else {
+                    tabbedPane.setTitleAt(3, tr("Members(with conflicts)"));
+                    tabbedPane.setToolTipTextAt(3, tr("Pending conflicts in the member list of this relation"));
+                    tabbedPane.setIconAt(3, mergeIncomplete);
+                }
             }
             updateResolvedCompletely();
@@ -205 +214 @@
             }
             updateResolvedCompletely();
+        } else if (PropertiesMergeModel.DELETE_PRIMITIVE_PROP.equals(evt.getPropertyName())) {
+            for (IConflictResolver resolver: conflictResolvers) {
+                resolver.deletePrimitive((Boolean) evt.getNewValue());
+            }
         }
     }