Changeset 34056 in osm for applications/editors/josm/plugins/merge-overlap/src/mergeoverlap/hack/MyCombinePrimitiveResolverDialog.java
- Timestamp:
- 2018-02-09T22:53:52+01:00 (7 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
applications/editors/josm/plugins/merge-overlap/src/mergeoverlap/hack/MyCombinePrimitiveResolverDialog.java
r33154 r34056 8 8 import java.util.Map; 9 9 10 import javax.swing.JPanel;11 12 10 import org.openstreetmap.josm.Main; 13 11 import org.openstreetmap.josm.command.ChangePropertyCommand; … … 18 16 import org.openstreetmap.josm.data.osm.Way; 19 17 import org.openstreetmap.josm.gui.conflict.tags.CombinePrimitiveResolverDialog; 20 import org.openstreetmap.josm.gui.conflict.tags. RelationMemberConflictResolver;18 import org.openstreetmap.josm.gui.conflict.tags.TagConflictResolverModel; 21 19 import org.openstreetmap.josm.gui.util.GuiHelper; 22 20 … … 58 56 */ 59 57 public MyCombinePrimitiveResolverDialog(Component parent) { 60 super(parent); 58 super(parent, new TagConflictResolverModel(), new MyRelationMemberConflictResolverModel()); 61 59 } 62 60 … … 71 69 } 72 70 return instance; 73 }74 75 @Override76 protected JPanel buildRelationMemberConflictResolverPanel() {77 pnlRelationMemberConflictResolver = new RelationMemberConflictResolver(new MyRelationMemberConflictResolverModel());78 return pnlRelationMemberConflictResolver;79 71 } 80 72
Note:
See TracChangeset
for help on using the changeset viewer.