Changeset 4970 in josm for trunk/src/org/openstreetmap

Timestamp:

2012-02-17T22:57:46+01:00 (13 years ago)

Author:

Don-vip

Message:

see #7386 - call ok() only on initialized settings + fix NPE in plugins management

Location:

trunk/src/org/openstreetmap/josm/gui/preferences

Files:

• PluginPreference.java (modified) (1 diff)
• PreferenceTabbedPane.java (modified) (4 diffs)

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

@@ -228 +228 @@
      */
     public List<PluginInformation> getPluginsScheduledForUpdateOrDownload() {
-        return model.getPluginsScheduledForUpdateOrDownload();
+        return model != null ? model.getPluginsScheduledForUpdateOrDownload() : null;
     }
 

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

@@ -230 +230 @@
         final List<PluginInformation> toDownload = preference.getPluginsScheduledForUpdateOrDownload();
         final PluginDownloadTask task;
-        if (! toDownload.isEmpty()) {
+        if (toDownload != null && ! toDownload.isEmpty()) {
             task = new PluginDownloadTask(this, toDownload, tr("Download plugins"));
         } else {
@@ -247 +247 @@
                 }
 
-                for (PreferenceSetting setting : settings) {
+                for (PreferenceSetting setting : settingsInitialized) {
                     if (setting.ok()) {
                         requiresRestart = true;
@@ -463 +463 @@
             PreferenceTab tab = (PreferenceTab) sel;
             TabPreferenceSetting preferenceSettings = tab.getTabPreferenceSetting();
-            //System.out.println(preferenceSettings);
             if (!settingsInitialized.contains(preferenceSettings)) {
                 try {
-                    //System.out.println("adding GUI for "+preferenceSettings);
                     getModel().removeChangeListener(this);
                     preferenceSettings.addGui(this);
@@ -474 +472 @@
                             SubPreferenceSetting sps = (SubPreferenceSetting) setting;
                             if (sps.getTabPreferenceSetting(this) == preferenceSettings) {
-                                //System.out.println("adding GUI for "+sps);
-                                sps.addGui(this);
+                                try {
+                                    sps.addGui(this);
+                                } catch (SecurityException ex) {
+                                    ex.printStackTrace();
+                                } catch (Throwable ex) {
+                                    BugReportExceptionHandler.handleException(ex);
+                                } finally {
+                                    settingsInitialized.add(sps);
+                                }
                             }
                         }