Changeset 127
- Timestamp:
- 08/10/08 01:30:10 (5 months ago)
- Files:
-
- axdt/trunk/org.axdt.as3/plugin.xml (modified) (1 diff)
- axdt/trunk/org.axdt.as3/src/org/axdt/as3/preferences/AS3ProjectProperties.java (added)
- axdt/trunk/org.axdt.common/src/org/axdt/preferences/AbstractPreferencePage.java (modified) (4 diffs)
- axdt/trunk/org.axdt.common/src/org/axdt/preferences/AbstractPreferences.java (modified) (3 diffs)
- axdt/trunk/org.axdt.common/src/org/axdt/preferences/ScopedPreferenceStore.java (added)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
axdt/trunk/org.axdt.as3/plugin.xml
r88 r127 233 233 </extension> 234 234 <extension 235 point="org.eclipse.ui.propertyPages"> 236 <page 237 class="org.axdt.as3.preferences.AS3ProjectProperties" 238 id="org.axdt.as3.preferences.AS3ProjectProperties" 239 name="AXDT ActionScript3"> 240 <enabledWhen> 241 <adapt type="org.eclipse.core.resources.IProject"/> 242 </enabledWhen> 243 <filter 244 name="nature" 245 value="org.axdt.as3.imp.nature"> 246 </filter> 247 </page> 248 </extension> 249 <extension 235 250 point="org.eclipse.ui.preferencePages"> 236 251 <page axdt/trunk/org.axdt.common/src/org/axdt/preferences/AbstractPreferencePage.java
r124 r127 1 1 package org.axdt.preferences; 2 2 3 import org.eclipse.core.runtime.IAdaptable; 3 4 import org.eclipse.jface.preference.FieldEditor; 4 5 import org.eclipse.jface.preference.FieldEditorPreferencePage; 6 import org.eclipse.jface.preference.IPreferenceStore; 5 7 import org.eclipse.swt.SWT; 6 8 import org.eclipse.swt.layout.GridData; … … 10 12 import org.eclipse.ui.IWorkbench; 11 13 import org.eclipse.ui.IWorkbenchPreferencePage; 14 import org.eclipse.ui.IWorkbenchPropertyPage; 12 15 16 /** 17 * @author mb0 18 * 19 */ 13 20 public abstract class AbstractPreferencePage extends FieldEditorPreferencePage implements 14 IWorkbenchPreferencePage {21 IWorkbenchPreferencePage, IWorkbenchPropertyPage { 15 22 16 23 private final PrefPage page; 17 24 private Composite content; 25 26 /** 27 * only when used as property page 28 */ 29 private IAdaptable element; 18 30 19 31 public AbstractPreferencePage(PrefPage page) { 20 32 super(GRID); 21 33 this.page = page; 22 setPreferenceStore(page.getPreferences().getStore());23 34 setDescription(page.getDescription()); 24 35 } … … 32 43 } 33 44 45 protected IPreferenceStore retrievePreferenceStore(AbstractPreferences prefs) { 46 return prefs.getStore(); 47 } 48 34 49 @Override 35 50 protected void createFieldEditors() { 51 setPreferenceStore(retrievePreferenceStore(page.getPreferences())); 36 52 content = new Composite(getFieldEditorParent(), SWT.NONE); 37 53 content.setLayout(new GridLayout(1, true)); … … 74 90 public void init(IWorkbench workbench) { 75 91 } 92 93 /** 94 * only when used as property page 95 * @see org.eclipse.ui.IWorkbenchPropertyPage#getElement() 96 */ 97 public IAdaptable getElement() { 98 return element; 99 } 100 101 /** 102 * only when used as property page 103 * @see org.eclipse.ui.IWorkbenchPropertyPage#setElement(org.eclipse.core.runtime.IAdaptable) 104 */ 105 public void setElement(IAdaptable element) { 106 this.element = element; 107 } 76 108 } axdt/trunk/org.axdt.common/src/org/axdt/preferences/AbstractPreferences.java
r124 r127 14 14 import org.eclipse.core.runtime.preferences.InstanceScope; 15 15 import org.eclipse.jface.preference.IPreferenceStore; 16 import org.eclipse.ui.preferences.ScopedPreferenceStore;17 16 import org.eclipse.ui.texteditor.ChainedPreferenceStore; 18 17 … … 129 128 130 129 public IPreferenceStore getStore() { 131 if (store == null) store = new ScopedPreferenceStore(new InstanceScope(), getQualifier()); 130 if (store == null) { 131 IScopeContext[] search = new IScopeContext[] { 132 new InstanceScope(), 133 new ConfigurationScope() 134 }; 135 store = new ScopedPreferenceStore(search[0], search, getQualifier()); 136 } 132 137 return store; 133 138 } … … 144 149 return new ChainedPreferenceStore(new IPreferenceStore[] {getStore()}); 145 150 } 146 ProjectScope projectScope = new ProjectScope(res.getProject()); 147 ScopedPreferenceStore store = new ScopedPreferenceStore(projectScope, getQualifier()); 148 store 149 .setSearchContexts(new IScopeContext[] {new InstanceScope(), 150 new ConfigurationScope()}); 151 IScopeContext[] search = new IScopeContext[] { 152 new ProjectScope(res.getProject()), 153 new InstanceScope(), 154 new ConfigurationScope() 155 }; 156 ScopedPreferenceStore store = new ScopedPreferenceStore(search[0], search, getQualifier()); 151 157 return store; 152 158 }
