Changeset 350 in josm for trunk/src

Timestamp:

2007-10-07T19:52:59+02:00 (17 years ago)

Author:

framm

Message:

• auto-disable any plugin that does not load successfully.

Location:

trunk/src/org/openstreetmap/josm

Files:

• Main.java (modified) (1 diff)
• gui/MainApplication.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/Main.java

@@ -238 +238 @@
                                                 Main.plugins.add(info.load(klass));
                                         }
-                                } catch (PluginException e) {
+                                } catch (Throwable e) {
                                         e.printStackTrace();
                                         if (early)
-                                                System.out.println("Could not load plugin: "+info.name); // do not translate
+                                                System.out.println("Could not load plugin: "+info.name+" - deleted from preferences"); // do not translate
                                         else
-                                                JOptionPane.showMessageDialog(Main.parent, tr("Could not load plugin {0}.", info.name));
+                                                JOptionPane.showMessageDialog(Main.parent, tr("Could not load plugin {0}. Deleted from preferences.", info.name));
+                                        plugins.remove(info.name);
+                                        String plist = null;
+                                        for (String pn : plugins) { 
+                                                if (plist==null) plist=""; else plist=plist+",";
+                                                plist=plist+pn;
+                                        }
+                                        Main.pref.put("plugins", plist);
                                 }
                         }

trunk/src/org/openstreetmap/josm/gui/MainApplication.java

@@ -112 +112 @@
                         Main.pref.resetToDefault();
                 }
-                
-                if (!Main.pref.getBoolean("plugins-0.5", false)) {
-                        Main.pref.put("plugins", null);
-                        Main.pref.put("plugins-0.5", "true");
-                        System.out.println("disabled plugins setting. re-enable the plugins you need.");
-                }
 
                 // load the early plugins