Changeset 34530 in osm for applications/editors/josm/plugins/merge-overlap/src/mergeoverlap/hack/MyCombinePrimitiveResolverDialog.java
- Timestamp:
- 2018-08-18T18:48:33+02:00 (6 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
applications/editors/josm/plugins/merge-overlap/src/mergeoverlap/hack/MyCombinePrimitiveResolverDialog.java
r34056 r34530 8 8 import java.util.Map; 9 9 10 import org.openstreetmap.josm.Main;11 10 import org.openstreetmap.josm.command.ChangePropertyCommand; 12 11 import org.openstreetmap.josm.command.Command; … … 15 14 import org.openstreetmap.josm.data.osm.TagCollection; 16 15 import org.openstreetmap.josm.data.osm.Way; 16 import org.openstreetmap.josm.gui.MainApplication; 17 17 import org.openstreetmap.josm.gui.conflict.tags.CombinePrimitiveResolverDialog; 18 18 import org.openstreetmap.josm.gui.conflict.tags.TagConflictResolverModel; … … 66 66 public static MyCombinePrimitiveResolverDialog getInstance() { 67 67 if (instance == null) { 68 GuiHelper.runInEDTAndWait(() -> instance = new MyCombinePrimitiveResolverDialog(Main .parent));68 GuiHelper.runInEDTAndWait(() -> instance = new MyCombinePrimitiveResolverDialog(MainApplication.getMainFrame())); 69 69 } 70 70 return instance;
Note:
See TracChangeset
for help on using the changeset viewer.