Changeset 4987 in josm

Timestamp:

Feb 18, 2012 5:24:05 PM (15 months ago)

Author:

bastiK

Message:

expose imagery preference tab for plugin

Location:

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

Files:

• PreferenceTabbedPane.java (modified) (9 diffs)
• SubPreferenceSetting.java (modified) (1 diff)
• imagery/ImageryPreference.java (modified) (1 diff)

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

@@ -68 +68 @@
         boolean validatePreferences();
     }
-    
+
     private static interface PreferenceTab {
         public TabPreferenceSetting getTabPreferenceSetting();
         public Component getComponent();
     }
-    
+
     public static class PreferencePanel extends JPanel implements PreferenceTab {
         private final TabPreferenceSetting preferenceSetting;
@@ -83 +83 @@
             buildPanel();
         }
-        
+
         protected void buildPanel() {
             setBorder(BorderFactory.createEmptyBorder(5,5,5,5));
@@ -132 +132 @@
     private final static Collection<PreferenceSettingFactory> settingsFactory = new LinkedList<PreferenceSettingFactory>();
     private final List<PreferenceSetting> settings = new ArrayList<PreferenceSetting>();
-    
+
     // distinct list of tabs that have been initialized (we do not initialize tabs until they are displayed to speed up dialog startup)
     private final List<PreferenceSetting> settingsInitialized = new ArrayList<PreferenceSetting>();
@@ -179 +179 @@
         public boolean identify(TabPreferenceSetting tps, Object param);
     }
-    
+
     private void selectTabBy(TabIdentifier method, Object param) {
         for (int i=0; i<getTabCount(); i++) {
@@ -192 +192 @@
         }
     }
-    
+
     public void selectTabByName(String name) {
         selectTabBy(new TabIdentifier(){
@@ -208 +208 @@
             }}, clazz);
     }
-    
+
     public final DisplayPreference getDisplayPreference() {
         return getSetting(DisplayPreference.class);
     }
-    
+
     public final MapPreference getMapPreference() {
         return getSetting(MapPreference.class);
     }
-    
+
     public final PluginPreference getPluginPreference() {
         return getSetting(PluginPreference.class);
+    }
+
+    public final ImageryPreference getImageryPreference() {
+        return getSetting(ImageryPreference.class);
     }
 
@@ -329 +333 @@
         }
     }
-    
+
     private void insertGUITabsForSetting(Icon icon, TabPreferenceSetting tps, int index) {
         int position = index;
@@ -338 +342 @@
         }
     }
-    
+
     private void addGUITabs(boolean clear) {
         boolean expert = ExpertToggleAction.isExpert();
@@ -369 +373 @@
         } catch (IllegalArgumentException e) {}
     }
-    
+
     @Override
     public void expertChanged(boolean isExpert) {

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

@@ -2 +2 @@
 package org.openstreetmap.josm.gui.preferences;
 
+/**
+ * Preference settings, that do *not* display a top level tab.
+ *
+ * This preference setting's addGui method is called after the user clicked the parent tab
+ * (returned by getTabPreferenceSetting).
+ */
 public interface SubPreferenceSetting extends PreferenceSetting {
-    
+
     /**
      * Returns the preference setting (displayed in the specified preferences tab pane) that contains this preference setting.

trunk/src/org/openstreetmap/josm/gui/preferences/imagery/ImageryPreference.java

@@ -94 +94 @@
         }
     }
-    
+
     private ImageryPreference() {
         super("imagery", tr("Imagery Preferences"), tr("Modify list of imagery layers displayed in the Imagery menu"));
     }
-    
+
     private ImageryProvidersPanel imageryProviders;
     private ImageryLayerInfo layerInfo;