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

Timestamp:

2009-07-07T09:04:00+02:00 (15 years ago)

Author:

stoecker

Message:

fixed #2849 - patch by jttt - fix memory leak

File:

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

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

@@ -7 +7 @@
 import java.awt.GridBagLayout;
 import java.awt.ScrollPane;
+import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Iterator;
 import java.util.LinkedList;
+import java.util.List;
 
 import javax.swing.BorderFactory;
@@ -33 +35 @@
 public class PreferenceDialog extends JTabbedPane {
 
-    public final static Collection<PreferenceSetting> settings = new LinkedList<PreferenceSetting>();
+    private final static Collection<PreferenceSettingFactory> settingsFactory = new LinkedList<PreferenceSettingFactory>();
+    private final List<PreferenceSetting> settings = new ArrayList<PreferenceSetting>();
 
     // some common tabs
@@ -41 +44 @@
     public final JPanel audio = createPreferenceTab("audio", I18n.tr("Audio Settings"), I18n.tr("Settings for the audio player and audio markers."));
 
-  public final javax.swing.JTabbedPane displaycontent = new javax.swing.JTabbedPane();
+    public final javax.swing.JTabbedPane displaycontent = new javax.swing.JTabbedPane();
 
     /**
@@ -105 +108 @@
     public PreferenceDialog() {
         super(JTabbedPane.LEFT, JTabbedPane.SCROLL_TAB_LAYOUT);
+
+        for (PreferenceSettingFactory factory:settingsFactory) {
+
+            PreferenceSetting setting = factory.createPreferenceSetting();
+            if (setting != null) {
+                settings.add(factory.createPreferenceSetting());
+            }
+        }
+
         display.add(displaycontent, GBC.eol().fill(GBC.BOTH));
         for (Iterator<PreferenceSetting> it = settings.iterator(); it.hasNext();) {
@@ -118 +130 @@
     }
 
+    public List<PreferenceSetting> getSettings() {
+        return settings;
+    }
+
+    @SuppressWarnings("unchecked")
+    public <T>  T getSetting(Class<? extends T> clazz) {
+        for (PreferenceSetting setting:settings) {
+            if (clazz.isAssignableFrom(setting.getClass())) {
+                return (T)setting;
+            }
+        }
+        return null;
+    }
+
     static {
         // order is important!
-        settings.add(new DrawingPreference());
-        settings.add(new ColorPreference());
-        settings.add(new LafPreference());
-        settings.add(new LanguagePreference());
-        settings.add(new MapPaintPreference());
-        settings.add(new ServerAccessPreference());
-        settings.add(new FilePreferences());
-        settings.add(new ProxyPreferences());
-        settings.add(new ProjectionPreference());
-        settings.add(new TaggingPresetPreference());
-        settings.add(new PluginPreference());
-        settings.add(Main.toolbar);
-        settings.add(new AudioPreference());
-        settings.add(new ShortcutPreference());
+        settingsFactory.add(new DrawingPreference.Factory());
+        settingsFactory.add(new ColorPreference.Factory());
+        settingsFactory.add(new LafPreference.Factory());
+        settingsFactory.add(new LanguagePreference.Factory());
+        settingsFactory.add(new MapPaintPreference.Factory());
+        settingsFactory.add(new ServerAccessPreference.Factory());
+        settingsFactory.add(new FilePreferences.Factory());
+        settingsFactory.add(new ProxyPreferences.Factory());
+        settingsFactory.add(new ProjectionPreference.Factory());
+        settingsFactory.add(new TaggingPresetPreference.Factory());
+        settingsFactory.add(new PluginPreference.Factory());
+        settingsFactory.add(Main.toolbar);
+        settingsFactory.add(new AudioPreference.Factory());
+        settingsFactory.add(new ShortcutPreference.Factory());
 
-        PluginHandler.getPreferenceSetting(settings);
+        PluginHandler.getPreferenceSetting(settingsFactory);
 
         // always the last: advanced tab
-        settings.add(new AdvancedPreference());
+        settingsFactory.add(new AdvancedPreference.Factory());
     }
 }