Changeset 34056 in osm for applications/editors

Timestamp:

2018-02-09T22:53:52+01:00 (8 years ago)

Author:

donvip

Message:

fix #14971 - NPE

Location:

applications/editors/josm/plugins/merge-overlap/src/mergeoverlap

Files:

• MergeOverlapAction.java (modified) (1 diff)
• hack/MyCombinePrimitiveResolverDialog.java (modified) (4 diffs)

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

@@ -389 +389 @@
         deletes.remove(targetWay);
 
-        cmds.add(new ChangeCommand(targetWay, modifiedTargetWay));
+        cmds.add(new ChangeCommand(getLayerManager().getEditDataSet(), targetWay, modifiedTargetWay));
         cmds.addAll(dialog.buildWayResolutionCommands());
         dialog.buildRelationCorrespondance(newRelations, oldWays);

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

@@ -8 +8 @@
 import java.util.Map;
 
-import javax.swing.JPanel;
-
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.command.ChangePropertyCommand;
@@ -18 +16 @@
 import org.openstreetmap.josm.data.osm.Way;
 import org.openstreetmap.josm.gui.conflict.tags.CombinePrimitiveResolverDialog;
-import org.openstreetmap.josm.gui.conflict.tags.RelationMemberConflictResolver;
+import org.openstreetmap.josm.gui.conflict.tags.TagConflictResolverModel;
 import org.openstreetmap.josm.gui.util.GuiHelper;
 
@@ -58 +56 @@
      */
     public MyCombinePrimitiveResolverDialog(Component parent) {
-        super(parent);
+        super(parent, new TagConflictResolverModel(), new MyRelationMemberConflictResolverModel());
     }
 
@@ -71 +69 @@
         }
         return instance;
-    }
-
-    @Override
-    protected JPanel buildRelationMemberConflictResolverPanel() {
-        pnlRelationMemberConflictResolver = new RelationMemberConflictResolver(new MyRelationMemberConflictResolverModel());
-        return pnlRelationMemberConflictResolver;
     }