Changeset 1326 in josm for trunk/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java

Timestamp:

2009-01-23T22:22:10+01:00 (16 years ago)

Author:

stoecker

Message:

reworked plugin handling a lot, more to come

File:

• trunk/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java

@@ -22 +22 @@
 
 import org.openstreetmap.josm.Main;
-import org.openstreetmap.josm.plugins.PluginProxy;
+import org.openstreetmap.josm.plugins.PluginHandler;
+import org.openstreetmap.josm.tools.BugReportExceptionHandler;
 import org.openstreetmap.josm.tools.GBC;
 import org.openstreetmap.josm.tools.I18n;
@@ -112 +113 @@
             } catch (SecurityException e) {
                 it.remove();
+            } catch (Throwable e) {
+                /* allow to change most settings even if e.g. a plugin fails */
+                BugReportExceptionHandler.handleException(e);
             }
         }
@@ -133 +137 @@
         settings.add(new ShortcutPreference());
 
-        for (PluginProxy plugin : Main.plugins) {
-            PreferenceSetting p = plugin.getPreferenceSetting();
-            if (p != null)
-                settings.add(p);
-        }
+        PluginHandler.getPreferenceSetting(settings);
 
         // always the last: advanced tab