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

Timestamp:

2009-12-03T20:26:00+01:00 (14 years ago)

Author:

Gubaer

Message:

Removed BackReferenceDataSet and CollectBackReferenceVisitor because we now have referrer support in OsmPrimitive.
This could cause some problems in the next few days. I'm sure I didn't test every possibly affected feature.

File:

• trunk/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverModel.java (modified) (5 diffs)

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

@@ -18 +18 @@
 import org.openstreetmap.josm.data.osm.Relation;
 import org.openstreetmap.josm.data.osm.RelationMember;
-import org.openstreetmap.josm.data.osm.BackreferencedDataSet.RelationToChildReference;
+import org.openstreetmap.josm.data.osm.RelationToChildReference;
 
 /**
@@ -92 +92 @@
         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;
@@ -105 +105 @@
         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();
@@ -233 +233 @@
             } else {
                 switch(decision.getDecision()) {
-                    case KEEP:
-                        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 KEEP:
+                    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;
                 }
             }
@@ -278 +278 @@
             }
             switch(decision.getDecision()) {
-                case REMOVE: return true;
-                case KEEP:
-                    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 KEEP:
+                if (!relation.getMember(i).getRole().equals(decision.getRole()))
+                    return true;
+                if (relation.getMember(i).getMember() != newPrimitive)
+                    return true;
+            case UNDECIDED:
+                // FIXME: handle error
             }
         }