diff --git a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/dataprovider/BuildEntryStorage.java b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/dataprovider/BuildEntryStorage.java index f5956ba7bdc..fb505a9569a 100644 --- a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/dataprovider/BuildEntryStorage.java +++ b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/dataprovider/BuildEntryStorage.java @@ -70,12 +70,12 @@ public class BuildEntryStorage extends AbstractEntryStorage { private OptionStringValue fBsResolvedValue; private List fSequense; - UserEntryInfo(ICLanguageSettingEntry entry, OptionStringValue originalValue, OptionStringValue bsResolvedValue, List sequense){ + UserEntryInfo(ICLanguageSettingEntry entry, OptionStringValue originalValue, OptionStringValue bsResolvedValue, List sequense) { fEntry = entry; fOriginalValue = originalValue; fBsResolvedValue = bsResolvedValue; fSequense = sequense; - if(sequense != null) + if (sequense != null) sequense.add(this); } } @@ -84,7 +84,7 @@ public class BuildEntryStorage extends AbstractEntryStorage { private OptionStringValue fOriginalValue; private int fPosition; - EmptyEntryInfo(OptionStringValue value, int position){ + EmptyEntryInfo(OptionStringValue value, int position) { fOriginalValue = value; fPosition = position; } @@ -121,12 +121,12 @@ public class BuildEntryStorage extends AbstractEntryStorage { return settings; } - private boolean isDiscoveredEntriesOverridable(){ + private boolean isDiscoveredEntriesOverridable() { return fLangData.getUndefOptionsForKind(getKind()).length != 0; } - private String getBuildDitName(){ - if(fBuildDirName == null){ + private String getBuildDitName() { + if (fBuildDirName == null) { fBuildDirName = fLangData.getConfiguration().getName(); } return fBuildDirName; @@ -134,16 +134,16 @@ public class BuildEntryStorage extends AbstractEntryStorage { @Override protected void obtainEntriesFromLevel(int levelNum, SettingLevel level) { - switch(levelNum){ + switch(levelNum) { case USER_ENTRIES_LEVEL: - if(level == null) + if (level == null) { restoreDefaults(); - else { + } else { EntryInfo infos[] = level.getInfos(); UserEntryInfo[] userInfos = new UserEntryInfo[infos.length]; - for(int i = 0; i < infos.length; i++){ + for (int i = 0; i < infos.length; i++) { UserEntryInfo uei = (UserEntryInfo)infos[i].getCustomInfo(); - if(uei == null) + if (uei == null) uei = new UserEntryInfo(infos[i].getEntry(), null, null, null); userInfos[i] = uei; } @@ -156,16 +156,16 @@ public class BuildEntryStorage extends AbstractEntryStorage { } } - private void restoreDefaults(){ + private void restoreDefaults() { ITool tool = fLangData.getTool(); for (IOption option : fLangData.getOptionsForKind(getKind())) { - if(option.getParent() == tool){ + if (option.getParent() == tool) { tool.removeOption(option); } } for (IOption option : fLangData.getUndefOptionsForKind(getKind())) { - if(option.getParent() == tool){ + if (option.getParent() == tool) { tool.removeOption(option); } } @@ -173,14 +173,14 @@ public class BuildEntryStorage extends AbstractEntryStorage { @Override protected void putEntriesToLevel(int levelNum, SettingLevel level) { - switch(levelNum){ + switch(levelNum) { case USER_ENTRIES_LEVEL: List emptyEntryInfos = new ArrayList(); for (UserEntryInfo userEntry : getUserEntries(level.getFlags(0), true, emptyEntryInfos)) { level.addEntry(userEntry.fEntry, userEntry); } level.addOverrideNameSet(getUserUndefinedStringSet()); - if(emptyEntryInfos.size() != 0) + if (emptyEntryInfos.size() != 0) level.setContext(emptyEntryInfos); break; case ENV_ENTRIES_LEVEL: @@ -197,13 +197,13 @@ public class BuildEntryStorage extends AbstractEntryStorage { /** * @return scanner discovered entries (level 2) */ - private ICLanguageSettingEntry[] getDiscoveredEntries(int flags){ + private ICLanguageSettingEntry[] getDiscoveredEntries(int flags) { ICLanguageSettingEntry[] entries = ProfileInfoProvider.getInstance().getEntryValues(fLangData, getKind(), flags); - if(entries == null || entries.length == 0){ + if (entries == null || entries.length == 0) { UserEntryInfo[] infos = getUserEntries(flags, false, null); - if(infos.length != 0){ + if (infos.length != 0) { entries = new ICLanguageSettingEntry[infos.length]; - for(int i = 0; i < entries.length; i++){ + for (int i = 0; i < entries.length; i++) { entries[i] = infos[i].fEntry; } } @@ -211,13 +211,13 @@ public class BuildEntryStorage extends AbstractEntryStorage { return entries; } - private SupplierBasedCdtVariableSubstitutor createSubstitutor(IOption option, boolean bsVarsOnly){ + private SupplierBasedCdtVariableSubstitutor createSubstitutor(IOption option, boolean bsVarsOnly) { OptionContextData ocd = new OptionContextData(option, fLangData.getTool()); DefaultMacroContextInfo ci = new DefaultMacroContextInfo(IBuildMacroProvider.CONTEXT_OPTION, ocd); return bsVarsOnly ? - new BuildSystemSpecificVariableSubstitutor(ci) - : new SupplierBasedCdtVariableSubstitutor(ci, "", " "); //$NON-NLS-1$ //$NON-NLS-2$ + new BuildSystemSpecificVariableSubstitutor(ci) : + new SupplierBasedCdtVariableSubstitutor(ci, "", " "); //$NON-NLS-1$ //$NON-NLS-2$ } /** @@ -228,23 +228,23 @@ public class BuildEntryStorage extends AbstractEntryStorage { * @param emptyValuesInfos list to which unresolved entries are added * @return UserEntryInfo[] (never null) */ - private UserEntryInfo[] getUserEntries(int flags, boolean usr, List emptyValuesInfos){ + private UserEntryInfo[] getUserEntries(int flags, boolean usr, List emptyValuesInfos) { IOption options[] = fLangData.getOptionsForKind(getKind()); - if(options.length > 0){ + if (options.length > 0) { List entryList = new ArrayList(); for (IOption opt : options) { Option option = (Option)opt; @SuppressWarnings("unchecked") List list = usr ? (List)option.getExactValue() : (List)option.getExactBuiltinsList(); - if(list != null){ + if (list != null) { SupplierBasedCdtVariableSubstitutor subst = createSubstitutor(option, false); SupplierBasedCdtVariableSubstitutor bSVarsSubst = createSubstitutor(option, true); - for(int j = 0; j < list.size(); j++){ + for (int j = 0; j < list.size(); j++) { OptionStringValue ve = list.get(j); OptionStringValue[] rVes = resolve(ve, option, bSVarsSubst); - if(rVes.length == 0){ + if (rVes.length == 0) { // If not resolved, add EmptyEntryInfo based off the value entry - if(emptyValuesInfos != null){ + if (emptyValuesInfos != null) { emptyValuesInfos.add(new EmptyEntryInfo(ve, j)); } } else { @@ -265,35 +265,35 @@ public class BuildEntryStorage extends AbstractEntryStorage { return new UserEntryInfo[0]; } -// private static OptionStringValue stripQuotes(OptionStringValue ov){ +// private static OptionStringValue stripQuotes(OptionStringValue ov) { // String value = ov.getValue(); // value = stripQuotes(value, true); -// if(value != null){ +// if (value != null) { // value = value.substring(1, value.length() - 1); // ov = substituteValue(ov, value); // } // return ov; // } - private static String stripQuotes(String value, boolean nullIfNone){ - if(value.indexOf('"') == 0 && value.lastIndexOf('"') == value.length() - 1 && value.length() != 1){ + private static String stripQuotes(String value, boolean nullIfNone) { + if (value.indexOf('"') == 0 && value.lastIndexOf('"') == value.length() - 1 && value.length() != 1) { return value.substring(1, value.length() - 1); } return nullIfNone ? null : value; } - private static OptionStringValue substituteValue(OptionStringValue ov, String value){ + private static OptionStringValue substituteValue(OptionStringValue ov, String value) { return new OptionStringValue(value, ov.isBuiltIn(), ov.getSourceAttachmentPath(), ov.getSourceAttachmentRootPath(), ov.getSourceAttachmentPrefixMapping()); } - private HashSet getUserUndefinedStringSet(){ + private HashSet getUserUndefinedStringSet() { HashSet set = null; for (IOption option : fLangData.getUndefOptionsForKind(getKind())) { @SuppressWarnings("unchecked") List list = (List)option.getValue(); - if(list.size() != 0){ - if(set == null) + if (list.size() != 0) { + if (set == null) set = new HashSet(); set.addAll(list); } @@ -304,13 +304,13 @@ public class BuildEntryStorage extends AbstractEntryStorage { /** * Makes non-absolute paths relative to the build directory */ - private PathInfo fromBuildToProj(PathInfo info){ - if(info.isAbsolute()) + private PathInfo fromBuildToProj(PathInfo info) { + if (info.isAbsolute()) return info; Path path = new Path(info.getUnresolvedPath()); String projPath; - if(path.segmentCount() != 0 && "..".equals(path.segment(0))){ //$NON-NLS-1$ + if (path.segmentCount() != 0 && "..".equals(path.segment(0))) { //$NON-NLS-1$ projPath = path.removeFirstSegments(1).toString(); } else { StringBuffer buf = new StringBuffer(); @@ -320,13 +320,13 @@ public class BuildEntryStorage extends AbstractEntryStorage { return new PathInfo(projPath, info.isWorkspacePath(), info.getSubstitutor()); } - private PathInfo fromProjToBuild(PathInfo info){ - if(info.isAbsolute()) + private PathInfo fromProjToBuild(PathInfo info) { + if (info.isAbsolute()) return info; Path path = new Path(info.getUnresolvedPath()); String projPath; - if(path.segmentCount() != 0 && getBuildDitName().equals(path.segment(0))){ + if (path.segmentCount() != 0 && getBuildDitName().equals(path.segment(0))) { projPath = path.removeFirstSegments(1).toString(); } else { StringBuffer buf = new StringBuffer(); @@ -336,11 +336,11 @@ public class BuildEntryStorage extends AbstractEntryStorage { return new PathInfo(projPath, info.isWorkspacePath(), info.getSubstitutor()); } -// private String[] resolve(String v, IOption option, IPath[] buildLocation){ +// private String[] resolve(String v, IOption option, IPath[] buildLocation) { // // } - private String[] resolve(String v, IOption option, SupplierBasedCdtVariableSubstitutor sub){ + private String[] resolve(String v, IOption option, SupplierBasedCdtVariableSubstitutor sub) { try { return CdtVariableResolver.resolveToStringList(v, sub); } catch (CdtVariableException e) { @@ -349,12 +349,12 @@ public class BuildEntryStorage extends AbstractEntryStorage { return new String[0]; } - private OptionStringValue[] resolve(OptionStringValue ov, IOption option, SupplierBasedCdtVariableSubstitutor sub){ + private OptionStringValue[] resolve(OptionStringValue ov, IOption option, SupplierBasedCdtVariableSubstitutor sub) { String value = ov.getValue(); value = stripQuotes(value, false); String[] rValues = resolve(value, option, sub); OptionStringValue[] result = new OptionStringValue[rValues.length]; - for(int i = 0; i < result.length; i++){ + for (int i = 0; i < result.length; i++) { result[i] = substituteValue(ov, stripQuotes(rValues[i], false)); } return result; @@ -363,10 +363,10 @@ public class BuildEntryStorage extends AbstractEntryStorage { /** * @return env entries (level 1) */ - private ICLanguageSettingEntry[] getEnvEntries(int flags){ + private ICLanguageSettingEntry[] getEnvEntries(int flags) { String paths[] = null; int kind = getKind(); - switch(kind){ + switch(kind) { case ICSettingEntry.INCLUDE_PATH:{ IEnvironmentVariableProvider provider = ManagedBuildManager.getEnvironmentVariableProvider(); paths = provider.getBuildPaths(fLangData.getConfiguration(), IEnvVarBuildPath.BUILDPATH_INCLUDE); @@ -379,9 +379,9 @@ public class BuildEntryStorage extends AbstractEntryStorage { break; } - if(paths != null && paths.length != 0){ + if (paths != null && paths.length != 0) { ICLanguageSettingEntry entries[] = new ICLanguageSettingEntry[paths.length]; - for(int i = 0; i < paths.length; i++){ + for (int i = 0; i < paths.length; i++) { entries[i] = (ICLanguageSettingEntry)CDataUtil.createEntry(kind, paths[i].toString(), null, null, flags); } @@ -393,7 +393,7 @@ public class BuildEntryStorage extends AbstractEntryStorage { /** * Create an ICLanguageSettingEntry based on the passed in Option */ - private ICLanguageSettingEntry createUserEntry(Option option, OptionStringValue optionValue, int flags, SupplierBasedCdtVariableSubstitutor subst){ + private ICLanguageSettingEntry createUserEntry(Option option, OptionStringValue optionValue, int flags, SupplierBasedCdtVariableSubstitutor subst) { final int kind = getKind(); if (kind == ICSettingEntry.MACRO) { @@ -407,19 +407,19 @@ public class BuildEntryStorage extends AbstractEntryStorage { // Create a PathInfo entry representing the optionValue PathInfo pInfo = optionPathValueToEntry(optionValue.getValue(), subst); - if(pInfo.isWorkspacePath()){ + if (pInfo.isWorkspacePath()) { flags |= ICSettingEntry.VALUE_WORKSPACE_PATH; - } else if (optionPathConverter != null){ + } else if (optionPathConverter != null) { IPath path = optionPathConverter.convertToPlatformLocation(pInfo.getUnresolvedPath(), option, fLangData.getTool()); - if(path != null){ + if (path != null) { pInfo = new PathInfo(path.toString(), false, subst); } } // make non absolute paths relative to the build directory - if (getOptionType(option) != IOption.LIBRARIES) + if (getOptionType(option) != IOption.LIBRARIES) { pInfo = fromBuildToProj(pInfo); - else { + } else { // The IOption.LIBRARIES type is morphed to => ICSettingEntyr#LIBRARY_FILE // It *isn't* a workspace path! flags &= ~ICSettingEntry.VALUE_WORKSPACE_PATH; @@ -433,29 +433,29 @@ public class BuildEntryStorage extends AbstractEntryStorage { if (kind == ICSettingEntry.LIBRARY_FILE) { // Handle source types String tmp = optionValue.getSourceAttachmentPath(); - if(tmp != null) + if (tmp != null) srcPath = new Path(tmp); tmp = optionValue.getSourceAttachmentRootPath(); - if(tmp != null) + if (tmp != null) srcRootPath = new Path(tmp); tmp = optionValue.getSourceAttachmentPrefixMapping(); - if(tmp != null) + if (tmp != null) srcPrefixMapping = new Path(tmp); } return (ICLanguageSettingEntry)CDataUtil.createEntry(kind, pInfo.getUnresolvedPath(), null, null, flags, srcPath, srcRootPath, srcPrefixMapping); } - private OptionStringValue createOptionValue(IOption option, UserEntryInfo info, SupplierBasedCdtVariableSubstitutor subst){ - if(info.fOriginalValue != null) + private OptionStringValue createOptionValue(IOption option, UserEntryInfo info, SupplierBasedCdtVariableSubstitutor subst) { + if (info.fOriginalValue != null) return info.fOriginalValue; return entryValueToOption(option, info.fEntry, subst); } - private OptionStringValue entryValueToOption(IOption option, ICLanguageSettingEntry entry, SupplierBasedCdtVariableSubstitutor subst){ + private OptionStringValue entryValueToOption(IOption option, ICLanguageSettingEntry entry, SupplierBasedCdtVariableSubstitutor subst) { String optionValue = entryValueToOptionStringValue(option, entry, subst); - if(entry.getKind() == ICSettingEntry.LIBRARY_FILE){ + if (entry.getKind() == ICSettingEntry.LIBRARY_FILE) { ICLibraryFileEntry libFile = (ICLibraryFileEntry)entry; return new OptionStringValue(optionValue, false, @@ -466,18 +466,18 @@ public class BuildEntryStorage extends AbstractEntryStorage { return new OptionStringValue(optionValue); } - private static String pathToString(IPath path){ + private static String pathToString(IPath path) { return path != null ? path.toString() : null; } - private String entryValueToOptionStringValue(IOption option, ICLanguageSettingEntry entry, SupplierBasedCdtVariableSubstitutor subst){ + private String entryValueToOptionStringValue(IOption option, ICLanguageSettingEntry entry, SupplierBasedCdtVariableSubstitutor subst) { String result; boolean checkQuote = true; - if(entry.getKind() == ICSettingEntry.MACRO && entry.getValue().length() > 0){ + if (entry.getKind() == ICSettingEntry.MACRO && entry.getValue().length() > 0) { result = new StringBuffer(entry.getName()).append('=').append(entry.getValue()).toString(); - } else if(entry instanceof ICLanguageSettingPathEntry){ + } else if (entry instanceof ICLanguageSettingPathEntry) { IOptionPathConverter converter = fLangData.getTool().getOptionPathConverter(); - if(converter instanceof IReverseOptionPathConverter){ + if (converter instanceof IReverseOptionPathConverter) { result = ((IReverseOptionPathConverter)converter).convertToOptionValue(entry, option, fLangData.getTool()); checkQuote = false; } else { @@ -488,21 +488,21 @@ public class BuildEntryStorage extends AbstractEntryStorage { result = entry.getName(); } - if(checkQuote){ + if (checkQuote) { result = doubleQuotePath(result, false); } return result; } - private String doConvertToOptionValue(IOption option, ICLanguageSettingPathEntry pathEntry, SupplierBasedCdtVariableSubstitutor subst){ + private String doConvertToOptionValue(IOption option, ICLanguageSettingPathEntry pathEntry, SupplierBasedCdtVariableSubstitutor subst) { boolean isWsp = pathEntry.isValueWorkspacePath(); PathInfo pInfo = new PathInfo(pathEntry.getName(), isWsp, subst); String result; - if(isWsp){ - if(!pInfo.isAbsolute()){ + if (isWsp) { + if (!pInfo.isAbsolute()) { IConfiguration cfg = fLangData.getConfiguration(); IResource rc = cfg.getOwner(); - if(rc != null){ + if (rc != null) { IProject proj = rc.getProject(); String path = pInfo.getUnresolvedPath(); IPath p = proj.getFullPath().append(path); @@ -554,25 +554,25 @@ public class BuildEntryStorage extends AbstractEntryStorage { /* If indexof didn't fail all three times, double-quote path */ if (i != -3) { - if (!bStartsWithQuote){ + if (!bStartsWithQuote) { pathName = "\"" + pathName; //$NON-NLS-1$ quoted = true; } - if (!bEndsWithQuote){ + if (!bEndsWithQuote) { pathName = pathName + "\""; //$NON-NLS-1$ quoted = true; } } - if(quoted) + if (quoted) return pathName; return nullIfNone ? null : pathName; } - public static String[] macroNameValueFromValue(String value){ + public static String[] macroNameValueFromValue(String value) { String nv[] = new String[2]; int index = value.indexOf('='); - if(index > 0){ + if (index > 0) { nv[0] = value.substring(0, index); nv[1] = value.substring(index + 1); } else { @@ -582,17 +582,17 @@ public class BuildEntryStorage extends AbstractEntryStorage { return nv; } -// private static Object[] optionPathValueToEntry(String value){ +// private static Object[] optionPathValueToEntry(String value) { // String wspPath = ManagedBuildManager.locationToFullPath(value); -// if(wspPath != null) +// if (wspPath != null) // return new Object[]{wspPath, Boolean.valueOf(true)}; // return new Object[]{value, Boolean.valueOf(false)}; // } - private static PathInfo optionPathValueToEntry(String str, SupplierBasedCdtVariableSubstitutor subst){ + private static PathInfo optionPathValueToEntry(String str, SupplierBasedCdtVariableSubstitutor subst) { String unresolvedStr = ManagedBuildManager.locationToFullPath(str); boolean isWorkspacePath; - if(unresolvedStr != null){ + if (unresolvedStr != null) { isWorkspacePath = true; } else { unresolvedStr = str; @@ -601,17 +601,17 @@ public class BuildEntryStorage extends AbstractEntryStorage { return new PathInfo(unresolvedStr, isWorkspacePath, subst); } - private void setUserEntries(UserEntryInfo[] entries, List emptyEntryInfos){ + private void setUserEntries(UserEntryInfo[] entries, List emptyEntryInfos) { int kind = getKind(); IOption options[] = fLangData.getOptionsForKind(kind); // We don't expect more than one option to manage a particular entry kind, though it // is theoretically possible... Add a trace for Toolchain developers if (options.length > 1) ManagedBuilderCorePlugin.error("Unexpected error: Warning more than one options found for kind " + getKind()); //$NON-NLS-1$ - if(options.length != 0) { + if (options.length != 0) { IOption option = options[0]; OptionStringValue[] optValue; - if(entries.length != 0){ + if (entries.length != 0) { entries = combineSequenses(entries); entries = addEmptyEntries(entries, emptyEntryInfos); @@ -619,7 +619,7 @@ public class BuildEntryStorage extends AbstractEntryStorage { optValue = new OptionStringValue[entries.length]; SupplierBasedCdtVariableSubstitutor subst = createSubstitutor(option, false); - for(int i = 0; i < entries.length; i++){ + for (int i = 0; i < entries.length; i++) { optValue[i] = createOptionValue(option, entries[i], subst); } } else { @@ -630,22 +630,22 @@ public class BuildEntryStorage extends AbstractEntryStorage { IResourceInfo rcInfo = tool.getParentResourceInfo(); IOption newOption = ManagedBuildManager.setOption(rcInfo, tool, option, optValue); for (IOption opt : fLangData.getOptionsForKind(kind)) { - if(opt != newOption) + if (opt != newOption) ManagedBuildManager.setOption(rcInfo, tool, opt, new String[0]); } } } - private UserEntryInfo[] addEmptyEntries(UserEntryInfo infos[], List emptyEntryInfos){ - if(emptyEntryInfos == null || emptyEntryInfos.size() == 0) + private UserEntryInfo[] addEmptyEntries(UserEntryInfo infos[], List emptyEntryInfos) { + if (emptyEntryInfos == null || emptyEntryInfos.size() == 0) return infos; LinkedList list = new LinkedList(); list.addAll(Arrays.asList(infos)); - for(int i = 0; i < emptyEntryInfos.size(); i++){ + for (int i = 0; i < emptyEntryInfos.size(); i++) { EmptyEntryInfo ei = emptyEntryInfos.get(i); int index = ei.fPosition; - if(index > list.size()) + if (index > list.size()) index = list.size(); list.add(index, new UserEntryInfo(null, ei.fOriginalValue, ei.fOriginalValue, null)); @@ -662,34 +662,34 @@ public class BuildEntryStorage extends AbstractEntryStorage { * FIXME: As far as I can see info.fSequense only ever has a single entry in it... * see UserEntryInfo constructor => this method doesn't accomplish anything useful */ - private UserEntryInfo[] combineSequenses(UserEntryInfo infos[]){ - if(infos.length == 0) + private UserEntryInfo[] combineSequenses(UserEntryInfo infos[]) { + if (infos.length == 0) return infos; List list = new ArrayList(infos.length); - for(int i = 0; i < infos.length; i++){ + for (int i = 0; i < infos.length; i++) { UserEntryInfo info = infos[i]; - if(info.fSequense != null) { + if (info.fSequense != null) { boolean match = true; int seqSize = info.fSequense.size(); - if(seqSize > infos.length - i) + if (seqSize > infos.length - i) { match = false; - else { - for(int k = 0; k < seqSize; k++){ - if(info.fSequense.get(k) != infos[i + k]){ + } else { + for (int k = 0; k < seqSize; k++) { + if (info.fSequense.get(k) != infos[i + k]) { match = false; break; } } } - if(match){ + if (match) { i = i + seqSize - 1; } else { infos[i] = createDesequencedEntry(info); - for(int k = i + 1; k < infos.length; k++){ - if(infos[k].fSequense == info.fSequense) + for (int k = i + 1; k < infos.length; k++) { + if (infos[k].fSequense == info.fSequense) infos[k] = createDesequencedEntry(infos[k]); } info = infos[i]; @@ -701,21 +701,21 @@ public class BuildEntryStorage extends AbstractEntryStorage { return list.toArray(new UserEntryInfo[list.size()]); } - private static UserEntryInfo createDesequencedEntry(UserEntryInfo info){ + private static UserEntryInfo createDesequencedEntry(UserEntryInfo info) { OptionStringValue resolvedValue = info.fBsResolvedValue; - if(resolvedValue != null){ + if (resolvedValue != null) { String v = doubleQuotePath(resolvedValue.getValue(), true); - if(v != null) + if (v != null) resolvedValue = substituteValue(resolvedValue, v); } return new UserEntryInfo(info.fEntry, resolvedValue, resolvedValue, null); } - private void setUserUndefinedStringSet(Set set){ + private void setUserUndefinedStringSet(Set set) { int kind = getKind(); IOption[] options = fLangData.getUndefOptionsForKind(kind); - if(options.length != 0){ - if(set != null && set.size() == 0) + if (options.length != 0) { + if (set != null && set.size() == 0) set = null; String[] optValue = set != null ? (String[])set.toArray(new String[set.size()]) : new String[0]; @@ -725,14 +725,12 @@ public class BuildEntryStorage extends AbstractEntryStorage { IOption newOption = ManagedBuildManager.setOption(rcInfo, tool, option, optValue); options = fLangData.getUndefOptionsForKind(kind); for (IOption opt : options) { - if(opt != newOption) + if (opt != newOption) ManagedBuildManager.setOption(rcInfo, tool, option, new String[0]); } - } - } - void optionsChanged(){ + void optionsChanged() { } }