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

Timestamp:

2009-07-27T18:36:17+02:00 (15 years ago)

Author:

Gubaer

Message:

partial fix for #3109: window order generally messed up?

File:

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

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

@@ -34 +34 @@
 import org.openstreetmap.josm.gui.ExtendedDialog;
 import org.openstreetmap.josm.gui.MapFrame;
+import org.openstreetmap.josm.gui.OptionPaneUtil;
 import org.openstreetmap.josm.gui.download.DownloadSelection;
 import org.openstreetmap.josm.gui.preferences.PreferenceSettingFactory;
@@ -51 +52 @@
         List<String> plugins = new LinkedList<String>();
         Collection<String> cp = Main.pref.getCollection("plugins", null);
-        if (cp != null)
+        if (cp != null) {
             plugins.addAll(cp);
-        if (System.getProperty("josm.plugins") != null)
+        }
+        if (System.getProperty("josm.plugins") != null) {
             plugins.addAll(Arrays.asList(System.getProperty("josm.plugins").split(",")));
+        }
 
         String [] oldplugins = new String[] {"mappaint", "unglueplugin",
-        "lang-de", "lang-en_GB", "lang-fr", "lang-it", "lang-pl", "lang-ro",
-        "lang-ru", "ewmsplugin", "ywms", "tways-0.2", "geotagged", "landsat",
-        "namefinder", "waypoints", "slippy_map_chooser", "tcx-support"};
+                "lang-de", "lang-en_GB", "lang-fr", "lang-it", "lang-pl", "lang-ro",
+                "lang-ru", "ewmsplugin", "ywms", "tways-0.2", "geotagged", "landsat",
+                "namefinder", "waypoints", "slippy_map_chooser", "tcx-support"};
         for (String p : oldplugins) {
             if (plugins.contains(p)) {
                 plugins.remove(p);
                 Main.pref.removeFromCollection("plugins", p);
-                JOptionPane.showMessageDialog(Main.parent, tr("Warning - loading of {0} plugin was requested. This plugin is no longer required.", p));
+                OptionPaneUtil.showMessageDialog(
+                        Main.parent,
+                        tr("Loading of {0} plugin was requested. This plugin is no longer required.", p),
+                        tr("Warning"),
+                        JOptionPane.WARNING_MESSAGE
+                );
             }
         }
@@ -75 +83 @@
             PluginInformation info = PluginInformation.findPlugin(pluginName);
             if (info != null) {
-                if (info.early != early)
+                if (info.early != early) {
                     continue;
+                }
                 if (info.mainversion > AboutAction.getVersionNumber()) {
-                    JOptionPane.showMessageDialog(Main.parent, tr("Plugin {0} requires JOSM update to version {1}.", pluginName,
-                    info.mainversion));
+                    OptionPaneUtil.showMessageDialog(
+                            Main.parent,
+                            tr("Plugin {0} requires JOSM update to version {1}.", pluginName,
+                                    info.mainversion),
+                                    tr("Warning"),
+                                    JOptionPane.WARNING_MESSAGE
+                    );
                     continue;
                 }
@@ -92 +106 @@
                     if(warn != null)
                     {
-                        JOptionPane.showMessageDialog(Main.parent,
-                        tr("Plugin {0} is required by plugin {1} but was not found.",
-                        warn, pluginName));
+                        OptionPaneUtil.showMessageDialog(Main.parent,
+                                tr("Plugin {0} is required by plugin {1} but was not found.",
+                                        warn, pluginName),
+                                        tr("Error"),
+                                        JOptionPane.ERROR_MESSAGE
+                        );
                         continue;
                     }
                 }
-                if (!p.containsKey(info.stage))
+                if (!p.containsKey(info.stage)) {
                     p.put(info.stage, new LinkedList<PluginInformation>());
+                }
                 p.get(info.stage).add(info);
             } else if(early) {
-                JOptionPane.showMessageDialog(Main.parent, tr("Plugin not found: {0}.", pluginName));
+                OptionPaneUtil.showMessageDialog(
+                        Main.parent,
+                        tr("Plugin not found: {0}.", pluginName),
+                        tr("Error"),
+                        JOptionPane.ERROR_MESSAGE
+                );
             }
         }
@@ -114 +137 @@
                 Main.pref.put("pluginmanager.lastupdate",Long.toString(tim));
             } else if (d > maxTime) {
-                JOptionPane.showMessageDialog(Main.parent,
-                   "<html>" +
-                   tr("Last plugin update more than {0} days ago.", d) +
-                   "<br><em>" +
-                   tr("(You can change the number of days after which this warning appears<br>by setting the config option 'pluginmanager.warntime'.)") +
-                   "</html>");
+                OptionPaneUtil.showMessageDialog(Main.parent,
+                        "<html>" +
+                        tr("Last plugin update more than {0} days ago.", d) +
+                        "<br><em>" +
+                        tr("(You can change the number of days after which this warning appears<br>by setting the config option 'pluginmanager.warntime'.)") +
+                        "</html>",
+                        tr("Warning"),
+                        JOptionPane.WARNING_MESSAGE
+                );
             }
         }
@@ -125 +151 @@
         // iterate all plugins and collect all libraries of all plugins:
         List<URL> allPluginLibraries = new ArrayList<URL>();
-        for (Collection<PluginInformation> c : p.values())
-            for (PluginInformation info : c)
+        for (Collection<PluginInformation> c : p.values()) {
+            for (PluginInformation info : c) {
                 allPluginLibraries.addAll(info.libraries);
+            }
+        }
         // create a classloader for all plugins:
         URL[] jarUrls = new URL[allPluginLibraries.size()];
@@ -146 +174 @@
 
                     int result = new ExtendedDialog(Main.parent,
-                        tr("Disable plugin"),
-                        tr("Could not load plugin {0}. Delete from preferences?", info.name),
-                        new String[] {tr("Disable plugin"), tr("Keep plugin")},
-                        new String[] {"dialogs/delete.png", "cancel.png"}).getValue();
+                            tr("Disable plugin"),
+                            tr("Could not load plugin {0}. Delete from preferences?", info.name),
+                            new String[] {tr("Disable plugin"), tr("Keep plugin")},
+                            new String[] {"dialogs/delete.png", "cancel.png"}).getValue();
 
                     if(result == 1)
@@ -161 +189 @@
     }
     public static void setMapFrame(MapFrame old, MapFrame map) {
-        for (PluginProxy plugin : pluginList)
+        for (PluginProxy plugin : pluginList) {
             plugin.mapFrameInitialized(old, map);
+        }
     }
 
@@ -174 +203 @@
     public static void addDownloadSelection(List<DownloadSelection> downloadSelections)
     {
-        for (PluginProxy p : pluginList)
+        for (PluginProxy p : pluginList) {
             p.addDownloadSelection(downloadSelections);
+        }
     }
     public static void getPreferenceSetting(Collection<PreferenceSettingFactory> settings)
@@ -187 +217 @@
     {
         if (!PluginDownloader.moveUpdatedPlugins()) {
-            JOptionPane.showMessageDialog(null,
+            OptionPaneUtil.showMessageDialog(
+                    Main.parent,
                     tr("Activating the updated plugins failed. Check if JOSM has the permission to overwrite the existing ones."),
                     tr("Plugins"), JOptionPane.ERROR_MESSAGE);
@@ -197 +228 @@
 
         // Check for an explicit problem when calling a plugin function
-        if (e instanceof PluginException)
+        if (e instanceof PluginException) {
             plugin = ((PluginException)e).plugin;
+        }
 
         if (plugin == null)
@@ -204 +236 @@
             String name = null;
             /**
-            * Analyze the stack of the argument and find a name of a plugin, if
-            * some known problem pattern has been found.
-            *
-            * Note: This heuristic is not meant as discrimination against specific
-            * plugins, but only to stop the flood of similar bug reports about plugins.
-            * Of course, plugin writers are free to install their own version of
-            * an exception handler with their email address listed to receive
-            * bug reports ;-).
-            */
+             * Analyze the stack of the argument and find a name of a plugin, if
+             * some known problem pattern has been found.
+             *
+             * Note: This heuristic is not meant as discrimination against specific
+             * plugins, but only to stop the flood of similar bug reports about plugins.
+             * Of course, plugin writers are free to install their own version of
+             * an exception handler with their email address listed to receive
+             * bug reports ;-).
+             */
             for (StackTraceElement element : e.getStackTrace()) {
                 String c = element.getClassName();
 
-                if (c.contains("wmsplugin.") || c.contains(".WMSLayer"))
+                if (c.contains("wmsplugin.") || c.contains(".WMSLayer")) {
                     name = "wmsplugin";
-                if (c.contains("livegps."))
+                }
+                if (c.contains("livegps.")) {
                     name = "livegps";
-                if (c.startsWith("UtilsPlugin."))
+                }
+                if (c.startsWith("UtilsPlugin.")) {
                     name = "UtilsPlugin";
+                }
 
                 if (c.startsWith("org.openstreetmap.josm.plugins.")) {
@@ -229 +264 @@
                     }
                 }
-                if(name != null)
-                  break;
+                if(name != null) {
+                    break;
+                }
             }
             for (PluginProxy p : pluginList)
@@ -244 +280 @@
         if (plugin != null) {
             int answer = new ExtendedDialog(Main.parent,
-                tr("Disable plugin"),
-                tr("An unexpected exception occurred that may have come from the ''{0}'' plugin.", plugin.info.name)
+                    tr("Disable plugin"),
+                    tr("An unexpected exception occurred that may have come from the ''{0}'' plugin.", plugin.info.name)
                     + "\n"
                     + (plugin.info.author != null
-                        ? tr("According to the information within the plugin, the author is {0}.", plugin.info.author)
-                        : "")
-                    + "\n"
-                    + tr("Try updating to the newest version of this plugin before reporting a bug.")
-                    + "\n"
-                    + tr("Should the plugin be disabled?"),
-                new String[] {tr("Disable plugin"), tr("Cancel")},
-                new String[] {"dialogs/delete.png", "cancel.png"}).getValue();
+                            ? tr("According to the information within the plugin, the author is {0}.", plugin.info.author)
+                                    : "")
+                                    + "\n"
+                                    + tr("Try updating to the newest version of this plugin before reporting a bug.")
+                                    + "\n"
+                                    + tr("Should the plugin be disabled?"),
+                                    new String[] {tr("Disable plugin"), tr("Cancel")},
+                                    new String[] {"dialogs/delete.png", "cancel.png"}).getValue();
             if (answer == 1) {
                 List<String> plugins = new ArrayList<String>(Main.pref.getCollection("plugins", Collections.<String>emptyList()));
@@ -261 +297 @@
                     while (plugins.remove(plugin.info.name)) {}
                     Main.pref.putCollection("plugins", plugins);
-                    JOptionPane.showMessageDialog(Main.parent,
-                    tr("The plugin has been removed from the configuration. Please restart JOSM to unload the plugin."));
+                    OptionPaneUtil.showMessageDialog(Main.parent,
+                            tr("The plugin has been removed from the configuration. Please restart JOSM to unload the plugin."),
+                            tr("Information"),
+                            JOptionPane.INFORMATION_MESSAGE);
                 } else {
-                    JOptionPane.showMessageDialog(Main.parent,
-                    tr("The plugin could not be removed. Probably it was already disabled"));
+                    OptionPaneUtil.showMessageDialog(
+                            Main.parent,
+                            tr("The plugin could not be removed. Probably it was already disabled"),
+                            tr("Error"),
+                            JOptionPane.ERROR_MESSAGE
+                    );
                 }
                 return true;
@@ -276 +318 @@
         String text = "";
         String pl = Main.pref.get("plugins");
-        if(pl != null && pl.length() != 0)
+        if(pl != null && pl.length() != 0) {
             text += "Plugins: "+pl+"\n";
+        }
         for (final PluginProxy pp : pluginList) {
             text += "Plugin " + pp.info.name + (pp.info.version != null && !pp.info.version.equals("") ? " Version: "+pp.info.version+"\n" : "\n");
@@ -302 +345 @@
                     a.setEditable(false);
                     a.setText(b.toString());
-                    JOptionPane.showMessageDialog(Main.parent, new JScrollPane(a));
+                    OptionPaneUtil.showMessageDialog(
+                            Main.parent,
+                            new JScrollPane(a),
+                            tr("Plugin information"),
+                            JOptionPane.INFORMATION_MESSAGE
+                    );
                 }
             }), GBC.eol());