Changeset 30766 in osm for applications/editors/josm/plugins/merge-overlap/src/mergeoverlap/hack/MyRelationMemberConflictResolverModel.java

Timestamp:

2014-10-27T23:30:49+01:00 (11 years ago)

Author:

donvip

Message:

[josm-merge_overlap] fix #josm10668 - ClassCastException while merging ways

File:

• applications/editors/josm/plugins/merge-overlap/src/mergeoverlap/hack/MyRelationMemberConflictResolverModel.java (modified) (9 diffs)

applications/editors/josm/plugins/merge-overlap/src/mergeoverlap/hack/MyRelationMemberConflictResolverModel.java

@@ -2 +2 @@
 package mergeoverlap.hack;
 
-import java.beans.PropertyChangeListener;
-import java.beans.PropertyChangeSupport;
-import java.util.ArrayList;
 import java.util.Collection;
-import java.util.HashSet;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
-import java.util.Set;
-
-import javax.swing.table.DefaultTableModel;
 
 import mergeoverlap.MergeOverlapAction;
 
+import org.openstreetmap.josm.command.Command;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.data.osm.Relation;
 import org.openstreetmap.josm.data.osm.RelationMember;
-import org.openstreetmap.josm.data.osm.RelationToChildReference;
 import org.openstreetmap.josm.data.osm.Way;
 import org.openstreetmap.josm.gui.conflict.tags.RelationMemberConflictDecision;
-import org.openstreetmap.josm.gui.conflict.tags.RelationMemberConflictDecisionType;
-import org.openstreetmap.josm.gui.util.GuiHelper;
+import org.openstreetmap.josm.gui.conflict.tags.RelationMemberConflictResolverModel;
 
 /**
@@ -30 +22 @@
  * It can be used as {@link javax.swing.table.TableModel}.
  */
-public class MyRelationMemberConflictResolverModel extends DefaultTableModel {
+public class MyRelationMemberConflictResolverModel extends RelationMemberConflictResolverModel {
     /** the property name for the number conflicts managed by this model */
     public static final String NUM_CONFLICTS_PROP = MyRelationMemberConflictResolverModel.class.getName() + ".numConflicts";
 
-    /** the list of conflict decisions */
-    private List<RelationMemberConflictDecision> decisions;
-    /** the collection of relations for which we manage conflicts */
-    private Collection<Relation> relations;
-    /** the number of conflicts */
-    private int numConflicts;
-    private PropertyChangeSupport support;
-
-    /**
-     * Replies true if each {@link MultiValueResolutionDecision} is decided.
-     *
-     * @return true if each {@link MultiValueResolutionDecision} is decided; false
-     * otherwise
-     */
-    public boolean isResolvedCompletely() {
-        return numConflicts == 0;
+    @Override
+    protected String getProperty() {
+        return NUM_CONFLICTS_PROP;
     }
-
-    /**
-     * Replies the current number of conflicts
-     *
-     * @return the current number of conflicts
-     */
-    public int getNumConflicts() {
-        return numConflicts;
-    }
-
-    /**
-     * Updates the current number of conflicts from list of decisions and emits
-     * a property change event if necessary.
-     *
-     */
-    protected void updateNumConflicts() {
-        int count = 0;
-        for (RelationMemberConflictDecision decision: decisions) {
-            if (!decision.isDecided()) {
-                count++;
-            }
-        }
-        int oldValue = numConflicts;
-        numConflicts = count;
-        if (numConflicts != oldValue) {
-            support.firePropertyChange(NUM_CONFLICTS_PROP, oldValue, numConflicts);
-        }
-    }
-
-    public void addPropertyChangeListener(PropertyChangeListener l) {
-        support.addPropertyChangeListener(l);
-    }
-
-    public void removePropertyChangeListener(PropertyChangeListener l) {
-        support.removePropertyChangeListener(l);
-    }
-
-    public MyRelationMemberConflictResolverModel() {
-        decisions = new ArrayList<>();
-        support = new PropertyChangeSupport(this);
-    }
-
+    
     @Override
-    public int getRowCount() {
-        return getNumDecisions();
-    }
-
-    @Override
-    public Object getValueAt(int row, int column) {
-        if (decisions == null) return null;
-
-        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();
-        }
-        return null;
-    }
-
-    @Override
-    public void setValueAt(Object value, int row, int column) {
-        RelationMemberConflictDecision d = decisions.get(row);
-        switch(column) {
-        case 2: /* role */
-            d.setRole((String)value);
-            break;
-        case 4: /* decision */
-            d.decide((RelationMemberConflictDecisionType)value);
-            refresh();
-            break;
-        }
-        fireTableDataChanged();
+    protected void populate(Relation relation, OsmPrimitive primitive) {
+        throw new UnsupportedOperationException("Use populate(Relation, OsmPrimitive, Map<Way, Way>) instead");
     }
 
@@ -141 +49 @@
             }
         }
+    }
+
+    @Override
+    public void populate(Collection<Relation> relations, Collection<? extends OsmPrimitive> memberPrimitives) {
+        throw new UnsupportedOperationException("Use populate(Collection<Relation>, Collection<? extends OsmPrimitive>, Map<Way, Way>) instead");
     }
 
@@ -163 +76 @@
     }
 
-    /**
-     * Populates the model with the relation members represented as a collection of
-     * {@link RelationToChildReference}s.
-     *
-     * @param references the references. Empty list assumed if null.
-     */
-    public void populate(Collection<RelationToChildReference> references) {
-        references = references == null ? new LinkedList<RelationToChildReference>() : references;
-        decisions.clear();
-        this.relations = new HashSet<>(references.size());
-        for (RelationToChildReference reference: references) {
-            decisions.add(new RelationMemberConflictDecision(reference.getParent(), reference.getPosition()));
-            relations.add(reference.getParent());
-        }
-        refresh();
-    }
-
-    /**
-     * Replies the decision at position <code>row</code>
-     *
-     * @param row
-     * @return the decision at position <code>row</code>
-     */
-    public RelationMemberConflictDecision getDecision(int row) {
-        return decisions.get(row);
-    }
-
-    /**
-     * Replies the number of decisions managed by this model
-     *
-     * @return the number of decisions managed by this model
-     */
-    public int getNumDecisions() {
-        return decisions == null ? 0 : decisions.size();
-    }
-
-    /**
-     * Refreshes the model state. Invoke this method to trigger necessary change
-     * events after an update of the model data.
-     *
-     */
-    public void refresh() {
-        updateNumConflicts();
-        GuiHelper.runInEDTAndWait(new Runnable() {
-            @Override public void run() {
-                fireTableDataChanged();
-            }
-        });
-    }
-
-    /**
-     * Apply a role to all member managed by this model.
-     *
-     * @param role the role. Empty string assumed if null.
-     */
-    public void applyRole(String role) {
-        role = role == null ? "" : role;
-        for (RelationMemberConflictDecision decision : decisions) {
-            decision.setRole(role);
-        }
-        refresh();
-    }
-
-    protected RelationMemberConflictDecision getDecision(Relation relation, int pos) {
-        for(RelationMemberConflictDecision decision: decisions) {
-            if (decision.matches(relation, pos)) return decision;
-        }
-        return null;
+    @Override
+    protected Command buildResolveCommand(Relation relation, OsmPrimitive newPrimitive) {
+        throw new UnsupportedOperationException("Use buildResolveCorrespondance(Relation, OsmPrimitive, Map<Relation, Relation>, Map<Way, Way>) instead");
     }
 
@@ -238 +86 @@
         Relation modifiedRelation = MergeOverlapAction.getNew(relation, newRelations);
         modifiedRelation.setMembers(null);
-//      boolean isChanged = false;
         for (int i=0; i < relationsMembers.size(); i++) {
                 RelationMember rm = relationsMembers.get(i);
-//          RelationMember rm = relation.getMember(i);
-//          RelationMember rmNew;
             RelationMemberConflictDecision decision = getDecision(relation, i);
             if (decision == null) {
                 modifiedRelation.addMember(rm);
             } else {
-                System.out.println(modifiedRelation);
-                System.out.println(111);
                 switch(decision.getDecision()) {
                 case KEEP:
-//                  modifiedRelation.removeMembersFor(newPrimitive);
-                        System.out.println(222);
                         if (newPrimitive instanceof Way) {
                         modifiedRelation.addMember(new RelationMember(decision.getRole(), MergeOverlapAction.getOld((Way)newPrimitive, oldWays)));
@@ -259 +100 @@
                                 modifiedRelation.addMember(new RelationMember(decision.getRole(), newPrimitive));
                         }
-//                  modifiedRelation.addMember(new RelationMember(decision.getRole(), newPrimitive));
                     break;
                 case REMOVE:
-                        System.out.println(333);
-//                  modifiedRelation.removeMembersFor(rm.getMember());
-//                  isChanged = true;
                     // do nothing
                     break;
@@ -275 +112 @@
     }
 
+    @Override
+    public List<Command> buildResolutionCommands(OsmPrimitive newPrimitive) {
+        throw new UnsupportedOperationException("Use buildRelationCorrespondance(OsmPrimitive, Map<Relation, Relation>, Map<Way, Way>) instead");
+    }
+
     /**
      * Builds a collection of commands executing the decisions made in this model.
@@ -280 +122 @@
      * @param newPrimitive the primitive which members shall refer to if the
      * decision is {@see RelationMemberConflictDecisionType#REPLACE}
-     * @return a list of commands
      */
     public void buildRelationCorrespondance(OsmPrimitive newPrimitive, Map<Relation, Relation> newRelations, Map<Way, Way> oldWays) {
@@ -287 +128 @@
         }
     }
-
-    protected boolean isChanged(Relation relation, OsmPrimitive newPrimitive) {
-        for (int i=0; i < relation.getMembersCount(); i++) {
-            RelationMemberConflictDecision decision = getDecision(relation, i);
-            if (decision == null) {
-                continue;
-            }
-            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
-            }
-        }
-        return false;
-    }
-
-    /**
-     * Replies the set of relations which have to be modified according
-     * to the decisions managed by this model.
-     *
-     * @param newPrimitive the primitive which members shall refer to if the
-     * decision is {@see RelationMemberConflictDecisionType#REPLACE}
-     *
-     * @return the set of relations which have to be modified according
-     * to the decisions managed by this model
-     */
-    public Set<Relation> getModifiedRelations(OsmPrimitive newPrimitive) {
-        HashSet<Relation> ret = new HashSet<>();
-        for (Relation relation: relations) {
-            if (isChanged(relation, newPrimitive)) {
-                ret.add(relation);
-            }
-        }
-        return ret;
-    }
 }