Changeset 14153 in josm for trunk/src/org/openstreetmap/josm/corrector

Timestamp:

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

Author:

Don-vip

Message:

see #15229 - deprecate Main.parent and Main itself

Location:

trunk/src/org/openstreetmap/josm/corrector

Files:

• ReverseWayNoTagCorrector.java (modified) (3 diffs)
• TagCorrector.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/corrector/ReverseWayNoTagCorrector.java

@@ -10 +10 @@
 import javax.swing.JOptionPane;
 
-import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.osm.DefaultNameFormatter;
 import org.openstreetmap.josm.data.osm.Tag;
@@ -17 +16 @@
 import org.openstreetmap.josm.data.osm.Way;
 import org.openstreetmap.josm.gui.ConditionalOptionPaneUtil;
+import org.openstreetmap.josm.gui.MainApplication;
 import org.openstreetmap.josm.tools.UserCancelException;
 import org.openstreetmap.josm.tools.Utils;
@@ -91 +91 @@
         int ret = ConditionalOptionPaneUtil.showOptionDialog(
                 "reverse_directional_way",
-                Main.parent,
+                MainApplication.getMainFrame(),
                 msg,
                 tr("Reverse directional way."),

trunk/src/org/openstreetmap/josm/corrector/TagCorrector.java

@@ -20 +20 @@
 import javax.swing.JScrollPane;
 
-import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.command.ChangeCommand;
 import org.openstreetmap.josm.command.ChangeRelationMemberRoleCommand;
@@ -32 +31 @@
 import org.openstreetmap.josm.data.osm.Relation;
 import org.openstreetmap.josm.data.osm.Way;
+import org.openstreetmap.josm.gui.MainApplication;
 import org.openstreetmap.josm.gui.correction.RoleCorrectionTable;
 import org.openstreetmap.josm.gui.correction.TagCorrectionTable;
@@ -150 +150 @@
 
             int answer = JOptionPane.showOptionDialog(
-                    Main.parent,
+                    MainApplication.getMainFrame(),
                     p,
                     tr("Automatic tag correction"),