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

Timestamp:

2014-10-12T12:37:13+02:00 (10 years ago)

Author:

donvip

Message:

[josm_merge_overlap] fix #josm10626 - fix ClassCastException

File:

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

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.TagConflictResolver;
+import org.openstreetmap.josm.gui.conflict.tags.TagConflictResolverModel;
 import org.openstreetmap.josm.gui.help.ContextSensitiveHelpAction;
 import org.openstreetmap.josm.gui.help.HelpUtil;
@@ -95 +97 @@
 
     private AutoAdjustingSplitPane spTagConflictTypes;
-    private MyTagConflictResolver pnlTagConflictResolver;
+    private TagConflictResolver pnlTagConflictResolver;
     private MyRelationMemberConflictResolver pnlRelationMemberConflictResolver;
     private boolean cancelled;
@@ -162 +164 @@
 
     protected JPanel buildTagConflictResolverPanel() {
-        pnlTagConflictResolver = new MyTagConflictResolver();
+        pnlTagConflictResolver = new TagConflictResolver();
         return pnlTagConflictResolver;
     }
@@ -199 +201 @@
     }
 
-    public MyTagConflictResolverModel getTagConflictResolverModel() {
+    public TagConflictResolverModel getTagConflictResolverModel() {
         return pnlTagConflictResolver.getModel();
     }
@@ -208 +210 @@
 
     protected List<Command> buildTagChangeCommand(OsmPrimitive primitive, TagCollection tc) {
-        LinkedList<Command> cmds = new LinkedList<Command>();
+        LinkedList<Command> cmds = new LinkedList<>();
         for (String key : tc.getKeys()) {
             if (tc.hasUniqueEmptyValue(key)) {
@@ -225 +227 @@
 
     public List<Command> buildWayResolutionCommands() {
-        List<Command> cmds = new LinkedList<Command>();
+        List<Command> cmds = new LinkedList<>();
 
         TagCollection allResolutions = getTagConflictResolverModel().getAllResolutions();
@@ -248 +250 @@
     
     protected void prepareDefaultTagDecisions() {
-        MyTagConflictResolverModel model = getTagConflictResolverModel();
+        TagConflictResolverModel model = getTagConflictResolverModel();
         for (int i = 0; i < model.getRowCount(); i++) {
             MultiValueResolutionDecision decision = model.getDecision(i);
@@ -264 +266 @@
     protected void prepareDefaultRelationDecisions() {
         MyRelationMemberConflictResolverModel model = getRelationMemberConflictResolverModel();
-        Set<Relation> relations = new HashSet<Relation>();
+        Set<Relation> relations = new HashSet<>();
         for (int i = 0; i < model.getNumDecisions(); i++) {
             RelationMemberConflictDecision decision = model.getDecision(i);
@@ -291 +293 @@
     protected void prepareGUIBeforeConflictResolutionStarts() {
         MyRelationMemberConflictResolverModel relModel = getRelationMemberConflictResolverModel();
-        MyTagConflictResolverModel tagModel = getTagConflictResolverModel();
+        TagConflictResolverModel tagModel = getTagConflictResolverModel();
         getContentPane().removeAll();
 
@@ -382 +384 @@
         @Override
         public void propertyChange(PropertyChangeEvent evt) {
-            if (evt.getPropertyName().equals(MyTagConflictResolverModel.NUM_CONFLICTS_PROP)) {
+            if (evt.getPropertyName().equals(TagConflictResolverModel.NUM_CONFLICTS_PROP)) {
                 updateEnabledState();
             }