diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/OptionsConfigurationBlock.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/OptionsConfigurationBlock.java index 1dc9170abc7..bd3d4450434 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/OptionsConfigurationBlock.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/OptionsConfigurationBlock.java @@ -62,20 +62,20 @@ import org.eclipse.cdt.internal.ui.dialogs.IStatusChangeListener; * an options configuration page. */ public abstract class OptionsConfigurationBlock { - + public static final class Key { private String fQualifier; private String fKey; - + public Key(String qualifier, String key) { fQualifier= qualifier; fKey= key; } - + public String getName() { return fKey; } - + private IEclipsePreferences getNode(IScopeContext context, IWorkingCopyManager manager) { IEclipsePreferences node= context.getNode(fQualifier); if (manager != null) { @@ -83,11 +83,11 @@ public abstract class OptionsConfigurationBlock { } return node; } - + public String getStoredValue(IScopeContext context, IWorkingCopyManager manager) { return getNode(context, manager).get(fKey, null); } - + public String getStoredValue(IScopeContext[] lookupOrder, boolean ignoreTopScope, IWorkingCopyManager manager) { for (int i= ignoreTopScope ? 1 : 0; i < lookupOrder.length; i++) { String value= getStoredValue(lookupOrder[i], manager); @@ -97,7 +97,7 @@ public abstract class OptionsConfigurationBlock { } return null; } - + public void setStoredValue(IScopeContext context, String value, IWorkingCopyManager manager) { if (value != null) { getNode(context, manager).put(fKey, value); @@ -105,7 +105,7 @@ public abstract class OptionsConfigurationBlock { getNode(context, manager).remove(fKey); } } - + /* (non-Javadoc) * @see java.lang.Object#toString() */ @@ -122,25 +122,25 @@ public abstract class OptionsConfigurationBlock { protected static class ControlData { private Key fKey; private String[] fValues; - + public ControlData(Key key, String[] values) { fKey= key; fValues= values; } - + public Key getKey() { return fKey; } - + public String getValue(boolean selection) { int index= selection ? 0 : 1; return fValues[index]; } - + public String getValue(int index) { return fValues[index]; - } - + } + public int getSelection(String value) { if (value != null) { for (int i= 0; i < fValues.length; i++) { @@ -152,9 +152,9 @@ public abstract class OptionsConfigurationBlock { return fValues.length -1; // assume the last option is the least severe } } - + private static final String REBUILD_COUNT_KEY= "preferences_build_requested"; //$NON-NLS-1$ - + private static final String SETTINGS_EXPANDED= "expanded"; //$NON-NLS-1$ protected final ArrayList