Changeset 14153 in josm for trunk/src/org/openstreetmap/josm/plugins/PluginHandler.java

Timestamp:

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

Author:

Don-vip

Message:

see #15229 - deprecate Main.parent and Main itself

File:

• trunk/src/org/openstreetmap/josm/plugins/PluginHandler.java (modified) (5 diffs)

trunk/src/org/openstreetmap/josm/plugins/PluginHandler.java

@@ -53 +53 @@
 import javax.swing.UIManager;
 
-import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.actions.RestartAction;
 import org.openstreetmap.josm.data.Preferences;
@@ -186 +185 @@
             a.setCaretPosition(0);
             if (!GraphicsEnvironment.isHeadless()) {
-                JOptionPane.showMessageDialog(Main.parent, new JScrollPane(a), tr("Plugin information"),
+                JOptionPane.showMessageDialog(MainApplication.getMainFrame(), new JScrollPane(a), tr("Plugin information"),
                         JOptionPane.INFORMATION_MESSAGE);
             }
@@ -1397 +1396 @@
         try {
             FutureTask<Integer> task = new FutureTask<>(() -> HelpAwareOptionPane.showOptionDialog(
-                    Main.parent,
+                    MainApplication.getMainFrame(),
                     msg.toString(),
                     tr("Update plugins"),
@@ -1480 +1479 @@
         case 0:
             // update the plugin
-            updatePlugins(Main.parent, Collections.singleton(pluginInfo), null, true);
+            updatePlugins(MainApplication.getMainFrame(), Collections.singleton(pluginInfo), null, true);
             return pluginDownloadTask;
         case 1:
@@ -1487 +1486 @@
             Config.getPref().putList("plugins", new ArrayList<>(plugins));
             GuiHelper.runInEDTAndWait(() -> JOptionPane.showMessageDialog(
-                    Main.parent,
+                    MainApplication.getMainFrame(),
                     tr("The plugin has been removed from the configuration. Please restart JOSM to unload the plugin."),
                     tr("Information"),