Changeset 2157 in josm for trunk/src/org/openstreetmap/josm/gui/conflict

Timestamp:

2009-09-17T22:38:08+02:00 (15 years ago)

Author:

Gubaer

Message:

fixed #3534: Merge dialog "remembers" old relations

Location:

trunk/src/org/openstreetmap/josm/gui/conflict/tags

Files:

• CombinePrimitiveResolverDialog.java (modified) (1 diff)
• RelationMemberConflictResolverModel.java (modified) (5 diffs)

trunk/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java

@@ -28 +28 @@
 import org.openstreetmap.josm.data.osm.Node;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
-import org.openstreetmap.josm.data.osm.Tag;
 import org.openstreetmap.josm.data.osm.TagCollection;
 import org.openstreetmap.josm.data.osm.Way;

trunk/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverModel.java

@@ -93 +93 @@
         RelationMemberConflictDecision d = decisions.get(row);
         switch(column) {
-        case 0: /* relation */ return d.getRelation();
-        case 1: /* pos */ return Integer.toString(d.getPos() + 1); // position in "user space" starting at 1
-        case 2: /* role */ return d.getRole();
-        case 3: /* original */ return d.getOriginalPrimitive();
-        case 4: /* decision */ return d.getDecision();
+            case 0: /* relation */ return d.getRelation();
+            case 1: /* pos */ return Integer.toString(d.getPos() + 1); // position in "user space" starting at 1
+            case 2: /* role */ return d.getRole();
+            case 3: /* original */ return d.getOriginalPrimitive();
+            case 4: /* decision */ return d.getDecision();
         }
         return null;
@@ -106 +106 @@
         RelationMemberConflictDecision d = decisions.get(row);
         switch(column) {
-        case 2: /* role */
-            d.setRole((String)value);
-            break;
-        case 4: /* decision */
-            d.decide((RelationMemberConflictDecisionType)value);
-            refresh();
-            break;
+            case 2: /* role */
+                d.setRole((String)value);
+                break;
+            case 4: /* decision */
+                d.decide((RelationMemberConflictDecisionType)value);
+                refresh();
+                break;
         }
         fireTableDataChanged();
@@ -160 +160 @@
     public void populate(Collection<RelationToChildReference> references) {
         references = references == null ? new LinkedList<RelationToChildReference>() : references;
+        decisions.clear();
         if (references.isEmpty()) {
             this.relations = new HashSet<Relation>(references.size());
-            return;
-        }
-        decisions.clear();
-        this.relations = new HashSet<Relation>(references.size());
+        } else {
+            this.relations = new HashSet<Relation>(references.size());
+        }
         for (RelationToChildReference reference: references) {
             decisions.add(new RelationMemberConflictDecision(reference.getParent(), reference.getPosition()));
@@ -234 +234 @@
             } else {
                 switch(decision.getDecision()) {
-                case REPLACE:
-                    rmNew = new RelationMember(decision.getRole(),newPrimitive);
-                    modifiedRelation.addMember(rmNew);
-                    isChanged |= ! rm.equals(rmNew);
-                    break;
-                case REMOVE:
-                    isChanged = true;
-                    // do nothing
-                    break;
-                case UNDECIDED:
-                    // FIXME: this is an error
-                    break;
+                    case REPLACE:
+                        rmNew = new RelationMember(decision.getRole(),newPrimitive);
+                        modifiedRelation.addMember(rmNew);
+                        isChanged |= ! rm.equals(rmNew);
+                        break;
+                    case REMOVE:
+                        isChanged = true;
+                        // do nothing
+                        break;
+                    case UNDECIDED:
+                        // FIXME: this is an error
+                        break;
                 }
             }
@@ -279 +279 @@
             }
             switch(decision.getDecision()) {
-            case REMOVE: return true;
-            case REPLACE:
-                if (!relation.getMember(i).getRole().equals(decision.getRole()))
-                    return true;
-                if (relation.getMember(i).getMember() != newPrimitive)
-                    return true;
-            case UNDECIDED:
-                // FIXME: handle error
+                case REMOVE: return true;
+                case REPLACE:
+                    if (!relation.getMember(i).getRole().equals(decision.getRole()))
+                        return true;
+                    if (relation.getMember(i).getMember() != newPrimitive)
+                        return true;
+                case UNDECIDED:
+                    // FIXME: handle error
             }
         }