mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-04-29 19:45:01 +02:00
Code Issues Wiki Activity

cleanup only: using LEVEL constants instead of hardcoded numbers

Browse source
This commit is contained in:
Andrew Gvozdev 2009-09-19 16:16:59 +00:00
parent dbce1da07c
commit f953d3feb9
1 changed files with 15 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
core/org.eclipse.cdt.core/model/org/eclipse/cdt/core/settings/model/util/UserAndDiscoveredEntryStorage.java
View file

@ -18,6 +18,9 @@ import org.eclipse.cdt.core.settings.model.ICSettingEntry;
import org.eclipse.cdt.core.settings.model.util.SettingsSet.SettingLevel; import org.eclipse.cdt.core.settings.model.util.SettingsSet.SettingLevel;
public abstract class UserAndDiscoveredEntryStorage extends AbstractEntryStorage { public abstract class UserAndDiscoveredEntryStorage extends AbstractEntryStorage {
private static final int USER_ENTRIES_LEVEL = 0;
private static final int DISCOVERY_ENTRIES_LEVEL = 1;
public UserAndDiscoveredEntryStorage(int kind) { public UserAndDiscoveredEntryStorage(int kind) {
super(kind); super(kind);
} }
@ -29,15 +32,15 @@ public abstract class UserAndDiscoveredEntryStorage extends AbstractEntryStorage
boolean override = canDisableDiscoveredEntries(); boolean override = canDisableDiscoveredEntries();
int readOnlyFlag = override ? 0 : ICSettingEntry.READONLY; int readOnlyFlag = override ? 0 : ICSettingEntry.READONLY;
levels[0].setFlagsToClear(ICSettingEntry.READONLY | ICSettingEntry.BUILTIN); levels[USER_ENTRIES_LEVEL].setFlagsToClear(ICSettingEntry.READONLY | ICSettingEntry.BUILTIN);
levels[0].setFlagsToSet(0); levels[USER_ENTRIES_LEVEL].setFlagsToSet(0);
levels[0].setReadOnly(false); levels[USER_ENTRIES_LEVEL].setReadOnly(false);
levels[0].setOverrideSupported(false); levels[USER_ENTRIES_LEVEL].setOverrideSupported(false);
levels[1].setFlagsToClear(0); levels[DISCOVERY_ENTRIES_LEVEL].setFlagsToClear(0);
levels[1].setFlagsToSet(readOnlyFlag | ICSettingEntry.BUILTIN | ICSettingEntry.RESOLVED); levels[DISCOVERY_ENTRIES_LEVEL].setFlagsToSet(readOnlyFlag | ICSettingEntry.BUILTIN | ICSettingEntry.RESOLVED);
levels[1].setReadOnly(true); levels[DISCOVERY_ENTRIES_LEVEL].setReadOnly(true);
levels[1].setOverrideSupported(override); levels[DISCOVERY_ENTRIES_LEVEL].setOverrideSupported(override);
return settings; return settings;
} }
@ -45,10 +48,10 @@ public abstract class UserAndDiscoveredEntryStorage extends AbstractEntryStorage
@Override @Override
protected void obtainEntriesFromLevel(int levelNum, SettingLevel level) { protected void obtainEntriesFromLevel(int levelNum, SettingLevel level) {
switch(levelNum){ switch(levelNum){
case 0: case USER_ENTRIES_LEVEL:
setUserEntries(level != null ? level.getEntries() : null); setUserEntries(level != null ? level.getEntries() : null);
break; break;
case 1: case DISCOVERY_ENTRIES_LEVEL:
if(level != null){ if(level != null){
Set set = level.getOverrideSet(); Set set = level.getOverrideSet();
setDisabledDiscoveredNames(set); setDisabledDiscoveredNames(set);
@ -61,10 +64,10 @@ public abstract class UserAndDiscoveredEntryStorage extends AbstractEntryStorage
@Override @Override
protected void putEntriesToLevel(int levelNum, SettingLevel level) { protected void putEntriesToLevel(int levelNum, SettingLevel level) {
switch(levelNum){ switch(levelNum){
case 0: case USER_ENTRIES_LEVEL:
level.addEntries(getUserEntries()); level.addEntries(getUserEntries());
break; break;
case 1: case DISCOVERY_ENTRIES_LEVEL:
HashSet set = new HashSet(); HashSet set = new HashSet();
ICLanguageSettingEntry[] entries = getDiscoveredEntries(set); ICLanguageSettingEntry[] entries = getDiscoveredEntries(set);
level.addEntries(entries); level.addEntries(entries);