Changeset 14153 in josm for trunk/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java

Timestamp:

2018-08-13T02:18:54+02:00 (6 years ago)

Author:

Don-vip

Message:

see #15229 - deprecate Main.parent and Main itself

File:

• trunk/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java

@@ -30 +30 @@
 import javax.swing.tree.TreePath;
 
-import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.osm.DataSet;
 import org.openstreetmap.josm.data.osm.DataSetMerger;
@@ -335 +334 @@
             if (conflictsCount > 0) {
                 JOptionPane.showMessageDialog(
-                        Main.parent,
+                        MainApplication.getMainFrame(),
                         trn("There was {0} conflict during import.",
                                 "There were {0} conflicts during import.",
@@ -374 +373 @@
 
             JOptionPane.showMessageDialog(
-                    Main.parent,
+                    MainApplication.getMainFrame(),
                     message,
                     tr("Relation is deleted"),