Changeset 4968 in josm for trunk/src/org/openstreetmap/josm/gui/preferences/display/LafPreference.java

Timestamp:

2012-02-17T22:27:06+01:00 (12 years ago)

Author:

Don-vip

Message:

fix #7386 - Major rework of preferences GUI settings in order to speed up preferences dialog startup time. The building of each preferences tab is delayed until this tab is selected. Plugins that use preferences will need to make some (minor) changes.

Location:

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

Files:

• . (added)
• LafPreference.java (moved) (moved from trunk/src/org/openstreetmap/josm/gui/preferences/LafPreference.java ) (4 diffs)

trunk/src/org/openstreetmap/josm/gui/preferences/display/LafPreference.java

@@ -1 +1 @@
 // License: GPL. Copyright 2007 by Immanuel Scholz and others
-package org.openstreetmap.josm.gui.preferences;
+package org.openstreetmap.josm.gui.preferences.display;
 
 import static org.openstreetmap.josm.tools.I18n.tr;
@@ -22 +22 @@
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.actions.ExpertToggleAction;
+import org.openstreetmap.josm.gui.preferences.PreferenceSetting;
+import org.openstreetmap.josm.gui.preferences.PreferenceSettingFactory;
+import org.openstreetmap.josm.gui.preferences.PreferenceTabbedPane;
+import org.openstreetmap.josm.gui.preferences.SubPreferenceSetting;
+import org.openstreetmap.josm.gui.preferences.TabPreferenceSetting;
 import org.openstreetmap.josm.tools.GBC;
 
-public class LafPreference implements PreferenceSetting {
+public class LafPreference implements SubPreferenceSetting {
 
     public static class Factory implements PreferenceSettingFactory {
@@ -111 +116 @@
         JScrollPane scrollpane = new JScrollPane(panel);
         scrollpane.setBorder(BorderFactory.createEmptyBorder( 0, 0, 0, 0 ));
-        gui.displaycontent.addTab(tr("Look and Feel"), scrollpane);
+        gui.getDisplayPreference().displaycontent.addTab(tr("Look and Feel"), scrollpane);
     }
 
@@ -124 +129 @@
         return mod;
     }
+
+    @Override
+    public boolean isExpert() {
+        return false;
+    }
+
+    @Override
+    public TabPreferenceSetting getTabPreferenceSetting(final PreferenceTabbedPane gui) {
+        return gui.getDisplayPreference();
+    }
 }