Changeset 34056 in osm for applications/editors


Ignore:
Timestamp:
2018-02-09T22:53:52+01:00 (7 years ago)
Author:
donvip
Message:

fix #14971 - NPE

Location:
applications/editors/josm/plugins/merge-overlap/src/mergeoverlap
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • applications/editors/josm/plugins/merge-overlap/src/mergeoverlap/MergeOverlapAction.java

    r33848 r34056  
    389389        deletes.remove(targetWay);
    390390
    391         cmds.add(new ChangeCommand(targetWay, modifiedTargetWay));
     391        cmds.add(new ChangeCommand(getLayerManager().getEditDataSet(), targetWay, modifiedTargetWay));
    392392        cmds.addAll(dialog.buildWayResolutionCommands());
    393393        dialog.buildRelationCorrespondance(newRelations, oldWays);
  • applications/editors/josm/plugins/merge-overlap/src/mergeoverlap/hack/MyCombinePrimitiveResolverDialog.java

    r33154 r34056  
    88import java.util.Map;
    99
    10 import javax.swing.JPanel;
    11 
    1210import org.openstreetmap.josm.Main;
    1311import org.openstreetmap.josm.command.ChangePropertyCommand;
     
    1816import org.openstreetmap.josm.data.osm.Way;
    1917import org.openstreetmap.josm.gui.conflict.tags.CombinePrimitiveResolverDialog;
    20 import org.openstreetmap.josm.gui.conflict.tags.RelationMemberConflictResolver;
     18import org.openstreetmap.josm.gui.conflict.tags.TagConflictResolverModel;
    2119import org.openstreetmap.josm.gui.util.GuiHelper;
    2220
     
    5856     */
    5957    public MyCombinePrimitiveResolverDialog(Component parent) {
    60         super(parent);
     58        super(parent, new TagConflictResolverModel(), new MyRelationMemberConflictResolverModel());
    6159    }
    6260
     
    7169        }
    7270        return instance;
    73     }
    74 
    75     @Override
    76     protected JPanel buildRelationMemberConflictResolverPanel() {
    77         pnlRelationMemberConflictResolver = new RelationMemberConflictResolver(new MyRelationMemberConflictResolverModel());
    78         return pnlRelationMemberConflictResolver;
    7971    }
    8072
Note: See TracChangeset for help on using the changeset viewer.