mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-06-07 17:56:01 +02:00
Code Issues Wiki Activity

Cosmetics.

Browse source
This commit is contained in:
Sergey Prigogin 2011-05-25 03:03:13 +00:00
parent b8e33bce4f
commit df89f7be87
1 changed files with 111 additions and 113 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/dataprovider/BuildEntryStorage.java
View file

@ -136,9 +136,9 @@ public class BuildEntryStorage extends AbstractEntryStorage {
protected void obtainEntriesFromLevel(int levelNum, SettingLevel level) { protected void obtainEntriesFromLevel(int levelNum, SettingLevel level) {
switch(levelNum) { switch(levelNum) {
case USER_ENTRIES_LEVEL: case USER_ENTRIES_LEVEL:
if(level == null) if (level == null) {
restoreDefaults(); restoreDefaults();
else { } else {
EntryInfo infos[] = level.getInfos(); EntryInfo infos[] = level.getInfos();
UserEntryInfo[] userInfos = new UserEntryInfo[infos.length]; UserEntryInfo[] userInfos = new UserEntryInfo[infos.length];
for (int i = 0; i < infos.length; i++) { for (int i = 0; i < infos.length; i++) {
@ -216,8 +216,8 @@ public class BuildEntryStorage extends AbstractEntryStorage {
DefaultMacroContextInfo ci = new DefaultMacroContextInfo(IBuildMacroProvider.CONTEXT_OPTION, ocd); DefaultMacroContextInfo ci = new DefaultMacroContextInfo(IBuildMacroProvider.CONTEXT_OPTION, ocd);
return bsVarsOnly ? return bsVarsOnly ?
new BuildSystemSpecificVariableSubstitutor(ci) new BuildSystemSpecificVariableSubstitutor(ci) :
: new SupplierBasedCdtVariableSubstitutor(ci, "", " "); //$NON-NLS-1$ //$NON-NLS-2$ new SupplierBasedCdtVariableSubstitutor(ci, "", " "); //$NON-NLS-1$ //$NON-NLS-2$
} }
/** /**
@ -417,9 +417,9 @@ public class BuildEntryStorage extends AbstractEntryStorage {
} }
// make non absolute paths relative to the build directory // make non absolute paths relative to the build directory
if (getOptionType(option) != IOption.LIBRARIES) if (getOptionType(option) != IOption.LIBRARIES) {
pInfo = fromBuildToProj(pInfo); pInfo = fromBuildToProj(pInfo);
else { } else {
// The IOption.LIBRARIES type is morphed to => ICSettingEntyr#LIBRARY_FILE // The IOption.LIBRARIES type is morphed to => ICSettingEntyr#LIBRARY_FILE
// It *isn't* a workspace path! // It *isn't* a workspace path!
flags &= ~ICSettingEntry.VALUE_WORKSPACE_PATH; flags &= ~ICSettingEntry.VALUE_WORKSPACE_PATH;
@ -673,9 +673,9 @@ public class BuildEntryStorage extends AbstractEntryStorage {
if (info.fSequense != null) { if (info.fSequense != null) {
boolean match = true; boolean match = true;
int seqSize = info.fSequense.size(); int seqSize = info.fSequense.size();
if(seqSize > infos.length - i) if (seqSize > infos.length - i) {
match = false; match = false;
else { } else {
for (int k = 0; k < seqSize; k++) { for (int k = 0; k < seqSize; k++) {
if (info.fSequense.get(k) != infos[i + k]) { if (info.fSequense.get(k) != infos[i + k]) {
match = false; match = false;
@ -728,9 +728,7 @@ public class BuildEntryStorage extends AbstractEntryStorage {
if (opt != newOption) if (opt != newOption)
ManagedBuildManager.setOption(rcInfo, tool, option, new String[0]); ManagedBuildManager.setOption(rcInfo, tool, option, new String[0]);
} }
} }
} }
void optionsChanged() { void optionsChanged() {