Changeset 30766 in osm

Timestamp:

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

Author:

donvip

Message:

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

Location:

applications/editors/josm/plugins/merge-overlap

Files:

• build.xml (modified) (1 diff)
• src/mergeoverlap/MergeOverlapAction.java (modified) (1 diff)
• src/mergeoverlap/hack/MyCombinePrimitiveResolverDialog.java (modified) (18 diffs)
• src/mergeoverlap/hack/MyRelationMemberConflictResolver.java (deleted)
• src/mergeoverlap/hack/MyRelationMemberConflictResolverModel.java (modified) (9 diffs)
• src/mergeoverlap/hack/MyRelationMemberConflictResolverTable.java (deleted)

applications/editors/josm/plugins/merge-overlap/build.xml

@@ -4 +4 @@
     <property name="commit.message" value="MergeOverlap: help shortcut parser, rebuild"/>
     <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
-    <property name="plugin.main.version" value="7610"/>
+    <property name="plugin.main.version" value="7661"/>
     
     <!-- Configure these properties (replace "..." accordingly).

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

@@ -602 +602 @@
                 if (askForMergeTag(ways) || duplicateParentRelations(ways)) {
                         dialog.setVisible(true);
-                        if (dialog.isCancelled())
+                        if (dialog.isCanceled())
                                 throw new UserCancelException();
                 }

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

@@ -43 +43 @@
 import org.openstreetmap.josm.gui.conflict.tags.RelationMemberConflictDecision;
 import org.openstreetmap.josm.gui.conflict.tags.RelationMemberConflictDecisionType;
+import org.openstreetmap.josm.gui.conflict.tags.RelationMemberConflictResolver;
 import org.openstreetmap.josm.gui.conflict.tags.TagConflictResolver;
 import org.openstreetmap.josm.gui.conflict.tags.TagConflictResolverModel;
 import org.openstreetmap.josm.gui.help.ContextSensitiveHelpAction;
 import org.openstreetmap.josm.gui.help.HelpUtil;
+import org.openstreetmap.josm.gui.util.GuiHelper;
 import org.openstreetmap.josm.tools.ImageProvider;
 import org.openstreetmap.josm.tools.WindowGeometry;
@@ -55 +57 @@
  *
  * There is a singleton instance of this dialog which can be retrieved using
- * {@see #getInstance()}.
+ * {@link #getInstance()}.
  *
  * The dialog uses two models: one  for resolving tag conflicts, the other
  * for resolving conflicts in relation memberships. For both models there are accessors,
- * i.e {@see #getTagConflictResolverModel()} and {@see #getRelationMemberConflictResolverModel()}.
+ * i.e {@link #getTagConflictResolverModel()} and {@link #getRelationMemberConflictResolverModel()}.
  *
  * Models have to be <strong>populated</strong> before the dialog is launched. Example:
@@ -70 +72 @@
  *
  * You should also set the target primitive which other primitives (ways or nodes) are
- * merged to, see {@see #setTargetPrimitive(OsmPrimitive)}.
+ * merged to, see {@link #setTargetPrimitive(OsmPrimitive)}.
  *
- * After the dialog is closed use {@see #isCancelled()} to check whether the user canceled
- * the dialog. If it wasn't canceled you may build a collection of {@see Command} objects
+ * After the dialog is closed use {@link #isCanceled()} to check whether the user canceled
+ * the dialog. If it wasn't canceled you may build a collection of {@link Command} objects
  * which reflect the conflict resolution decisions the user made in the dialog:
- * see {@see #buildResolutionCommands()}
- *
- *
+ * see {@link #buildResolutionCommands()}
  */
 public class MyCombinePrimitiveResolverDialog extends JDialog {
 
     /** the unique instance of the dialog */
-    static private MyCombinePrimitiveResolverDialog instance;
+    private static MyCombinePrimitiveResolverDialog instance;
 
     /**
@@ -91 +91 @@
     public static MyCombinePrimitiveResolverDialog getInstance() {
         if (instance == null) {
-            instance = new MyCombinePrimitiveResolverDialog(Main.parent);
+            GuiHelper.runInEDTAndWait(new Runnable() {
+                @Override public void run() {
+                    instance = new MyCombinePrimitiveResolverDialog(Main.parent);
+                }
+            });
         }
         return instance;
@@ -98 +102 @@
     private AutoAdjustingSplitPane spTagConflictTypes;
     private TagConflictResolver pnlTagConflictResolver;
-    private MyRelationMemberConflictResolver pnlRelationMemberConflictResolver;
-    private boolean cancelled;
+    private RelationMemberConflictResolver pnlRelationMemberConflictResolver;
+    private boolean canceled;
     private JPanel pnlButtons;
     private OsmPrimitive targetPrimitive;
@@ -119 +123 @@
 
     /**
-     * Sets the primitive the collection of primitives is merged or combined
-     * to.
+     * Sets the primitive the collection of primitives is merged or combined to.
      *
      * @param primitive the target primitive
      */
-    public void setTargetPrimitive(OsmPrimitive primitive) {
+    public void setTargetPrimitive(final OsmPrimitive primitive) {
         this.targetPrimitive = primitive;
-        updateTitle();
-        if (primitive instanceof Way) {
-            pnlRelationMemberConflictResolver.initForWayCombining();
-        } else if (primitive instanceof Node) {
-            pnlRelationMemberConflictResolver.initForNodeMerging();
-        }
+        GuiHelper.runInEDTAndWait(new Runnable() {
+            @Override public void run() {
+                updateTitle();
+                if (primitive instanceof Way) {
+                    pnlRelationMemberConflictResolver.initForWayCombining();
+                } else if (primitive instanceof Node) {
+                    pnlRelationMemberConflictResolver.initForNodeMerging();
+                }
+            }
+        });
     }
 
@@ -152 +159 @@
     }
 
-    protected void build() {
+    protected final void build() {
         getContentPane().setLayout(new BorderLayout());
         updateTitle();
@@ -169 +176 @@
 
     protected JPanel buildRelationMemberConflictResolverPanel() {
-        pnlRelationMemberConflictResolver = new MyRelationMemberConflictResolver();
+        pnlRelationMemberConflictResolver = new RelationMemberConflictResolver(new MyRelationMemberConflictResolverModel());
         return pnlRelationMemberConflictResolver;
     }
 
     protected JPanel buildButtonPanel() {
-        JPanel pnl = new JPanel();
-        pnl.setLayout(new FlowLayout(FlowLayout.CENTER));
+        JPanel pnl = new JPanel(new FlowLayout(FlowLayout.CENTER));
 
         // -- apply button
@@ -196 +202 @@
     }
 
-    public MyCombinePrimitiveResolverDialog(Component owner) {
-        super(JOptionPane.getFrameForComponent(owner), ModalityType.DOCUMENT_MODAL);
+    /**
+     * Constructs a new {@code MyCombinePrimitiveResolverDialog}.
+     * @param parent The parent component in which this dialog will be displayed.
+     */
+    public MyCombinePrimitiveResolverDialog(Component parent) {
+        super(JOptionPane.getFrameForComponent(parent), ModalityType.DOCUMENT_MODAL);
         build();
     }
 
+    /**
+     * Replies the tag conflict resolver model.
+     * @return The tag conflict resolver model.
+     */
     public TagConflictResolverModel getTagConflictResolverModel() {
         return pnlTagConflictResolver.getModel();
     }
 
+    /**
+     * Replies the relation membership conflict resolver model.
+     * @return The relation membership conflict resolver model.
+     */
     public MyRelationMemberConflictResolverModel getRelationMemberConflictResolverModel() {
-        return pnlRelationMemberConflictResolver.getModel();
+        return (MyRelationMemberConflictResolverModel) pnlRelationMemberConflictResolver.getModel();
     }
 
@@ -230 +248 @@
 
         TagCollection allResolutions = getTagConflictResolverModel().getAllResolutions();
-        if (allResolutions.size() > 0) {
+        if (!allResolutions.isEmpty()) {
             cmds.addAll(buildTagChangeCommand(targetPrimitive, allResolutions));
         }
@@ -279 +297 @@
     }
 
+    /**
+     * Prepares the default decisions for populated tag and relation membership conflicts.
+     */
     public void prepareDefaultDecisions() {
         prepareDefaultTagDecisions();
@@ -285 +306 @@
 
     protected JPanel buildEmptyConflictsPanel() {
-        JPanel pnl = new JPanel();
-        pnl.setLayout(new BorderLayout());
+        JPanel pnl = new JPanel(new BorderLayout());
         pnl.add(new JLabel(tr("No conflicts to resolve")));
         return pnl;
@@ -297 +317 @@
 
         if (relModel.getNumDecisions() > 0 && tagModel.getNumDecisions() > 0) {
-            // display both, the dialog for resolving relation conflicts and for resolving
-            // tag conflicts
+            // display both, the dialog for resolving relation conflicts and for resolving tag conflicts
             spTagConflictTypes.setTopComponent(pnlTagConflictResolver);
             spTagConflictTypes.setBottomComponent(pnlRelationMemberConflictResolver);
@@ -304 +323 @@
         } else if (relModel.getNumDecisions() > 0) {
             // relation conflicts only
-            //
             getContentPane().add(pnlRelationMemberConflictResolver, BorderLayout.CENTER);
         } else if (tagModel.getNumDecisions() > 0) {
             // tag conflicts only
-            //
             getContentPane().add(pnlTagConflictResolver, BorderLayout.CENTER);
         } else {
@@ -324 +341 @@
     }
 
-    protected void setCancelled(boolean cancelled) {
-        this.cancelled = cancelled;
-    }
-
-    public boolean isCancelled() {
-        return cancelled;
+    protected void setCanceled(boolean canceled) {
+        this.canceled = canceled;
+    }
+
+    /**
+     * Determines if this dialog has been cancelled.
+     * @return true if this dialog has been cancelled, false otherwise.
+     */
+    public boolean isCanceled() {
+        return canceled;
     }
 
@@ -338 +359 @@
             new WindowGeometry(getClass().getName() + ".geometry", WindowGeometry.centerInWindow(Main.parent,
                     new Dimension(600, 400))).applySafe(this);
-            setCancelled(false);
+            setCanceled(false);
             btnApply.requestFocusInWindow();
         } else if (isShowing()) { // Avoid IllegalComponentStateException like in #8775
@@ -357 +378 @@
         @Override
         public void actionPerformed(ActionEvent arg0) {
-            setCancelled(true);
+            setCanceled(true);
             setVisible(false);
         }
@@ -377 +398 @@
         }
 
-        protected void updateEnabledState() {
+        protected final void updateEnabledState() {
             setEnabled(pnlTagConflictResolver.getModel().getNumConflicts() == 0
                     && pnlRelationMemberConflictResolver.getModel().getNumConflicts() == 0);

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;
-    }
 }