Changeset 14153 in josm for trunk/src/org/openstreetmap/josm/gui/conflict/pair/AbstractListMergeModel.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/conflict/pair/AbstractListMergeModel.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/gui/conflict/pair/AbstractListMergeModel.java

@@ -28 +28 @@
 import javax.swing.table.TableModel;
 
-import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.command.conflict.ConflictResolveCommand;
 import org.openstreetmap.josm.data.conflict.Conflict;
@@ -36 +35 @@
 import org.openstreetmap.josm.data.osm.RelationMember;
 import org.openstreetmap.josm.gui.HelpAwareOptionPane;
+import org.openstreetmap.josm.gui.MainApplication;
 import org.openstreetmap.josm.gui.help.HelpUtil;
 import org.openstreetmap.josm.gui.util.ChangeNotifier;
@@ -382 +382 @@
           .append("</html>");
         HelpAwareOptionPane.showOptionDialog(
-                Main.parent,
+                MainApplication.getMainFrame(),
                 sb.toString(),
                 tr("Merging deleted objects failed"),