diff --git a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/dataprovider/BuildBuildData.java b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/dataprovider/BuildBuildData.java index 43c96238929..9f539b6a2fb 100644 --- a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/dataprovider/BuildBuildData.java +++ b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/dataprovider/BuildBuildData.java @@ -18,8 +18,6 @@ import org.eclipse.cdt.managedbuilder.internal.core.Builder; import org.eclipse.cdt.managedbuilder.internal.core.Configuration; import org.eclipse.core.runtime.IPath; import org.eclipse.core.runtime.Path; -import org.eclipse.core.variables.IStringVariableManager; -import org.eclipse.core.variables.VariablesPlugin; public class BuildBuildData extends CBuildData { private Builder fBuilder; @@ -35,11 +33,11 @@ public class BuildBuildData extends CBuildData { return new Path(fBuilder.getBuildPath());//ManagedBuildManager.getBuildLocation(fCfg, fBuilder); } - private IPath createAbsolutePathFromWorkspacePath(IPath path){ - IStringVariableManager mngr = VariablesPlugin.getDefault().getStringVariableManager(); - String locationString = mngr.generateVariableExpression("workspace_loc", path.toString()); //$NON-NLS-1$ - return new Path(locationString); - } +// private IPath createAbsolutePathFromWorkspacePath(IPath path){ +// IStringVariableManager mngr = VariablesPlugin.getDefault().getStringVariableManager(); +// String locationString = mngr.generateVariableExpression("workspace_loc", path.toString()); //$NON-NLS-1$ +// return new Path(locationString); +// } @Override public String[] getErrorParserIDs() { 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 8a161eaf4e1..f5956ba7bdc 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 @@ -147,7 +147,9 @@ public class BuildEntryStorage extends AbstractEntryStorage { uei = new UserEntryInfo(infos[i].getEntry(), null, null, null); userInfos[i] = uei; } - setUserEntries(userInfos, (List)level.getContext()); + @SuppressWarnings("unchecked") + List context = (List)level.getContext(); + setUserEntries(userInfos, context); setUserUndefinedStringSet(level.containsOverrideInfo() ? level.getOverrideSet() : null); } break; @@ -193,9 +195,7 @@ public class BuildEntryStorage extends AbstractEntryStorage { } /** - * Return scanner discovered entries (level 2) - * @param flags - * @return + * @return scanner discovered entries (level 2) */ private ICLanguageSettingEntry[] getDiscoveredEntries(int flags){ ICLanguageSettingEntry[] entries = ProfileInfoProvider.getInstance().getEntryValues(fLangData, getKind(), flags); @@ -225,8 +225,6 @@ public class BuildEntryStorage extends AbstractEntryStorage { * * The UserEntryInfo[] is an array of all user entries from all the options * applicable to the language setting entry kind. - * @param flags - * @param usr * @param emptyValuesInfos list to which unresolved entries are added * @return UserEntryInfo[] (never null) */ @@ -236,6 +234,7 @@ public class BuildEntryStorage extends AbstractEntryStorage { 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){ SupplierBasedCdtVariableSubstitutor subst = createSubstitutor(option, false); @@ -291,6 +290,7 @@ public class BuildEntryStorage extends AbstractEntryStorage { 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) @@ -303,8 +303,6 @@ public class BuildEntryStorage extends AbstractEntryStorage { /** * Makes non-absolute paths relative to the build directory - * @param info - * @return */ private PathInfo fromBuildToProj(PathInfo info){ if(info.isAbsolute()) @@ -363,9 +361,7 @@ public class BuildEntryStorage extends AbstractEntryStorage { } /** - * Return env envtries (level 1) - * @param flags - * @return + * @return env entries (level 1) */ private ICLanguageSettingEntry[] getEnvEntries(int flags){ String paths[] = null; @@ -396,11 +392,6 @@ public class BuildEntryStorage extends AbstractEntryStorage { /** * Create an ICLanguageSettingEntry based on the passed in Option - * @param option - * @param optionValue - * @param flags - * @param subst - * @return */ private ICLanguageSettingEntry createUserEntry(Option option, OptionStringValue optionValue, int flags, SupplierBasedCdtVariableSubstitutor subst){ final int kind = getKind(); @@ -536,7 +527,6 @@ public class BuildEntryStorage extends AbstractEntryStorage { } /** - * @param option * @return the option type for the option */ private static int getOptionType(IOption option) { @@ -671,8 +661,6 @@ 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 - * @param infos - * @return */ private UserEntryInfo[] combineSequenses(UserEntryInfo infos[]){ if(infos.length == 0) diff --git a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/dataprovider/BuildEnvironmentContributor.java b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/dataprovider/BuildEnvironmentContributor.java index 4ed638d7ed3..dd2b87849fc 100644 --- a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/dataprovider/BuildEnvironmentContributor.java +++ b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/dataprovider/BuildEnvironmentContributor.java @@ -61,7 +61,7 @@ public class BuildEnvironmentContributor implements IEnvironmentContributor { EnvironmentCollector collector = new EnvironmentCollector(); ExternalExtensionEnvironmentSupplier extSupplier = new ExternalExtensionEnvironmentSupplier(provider); - Set set = null; + Set set = null; IEnvironmentVariable vars[] = extSupplier.getVariables(fCfg.getManagedProject()); set = processVariables(vars, collector, provider, set); @@ -89,11 +89,11 @@ public class BuildEnvironmentContributor implements IEnvironmentContributor { return varFound; } - private Set processVariables(IEnvironmentVariable vars[], EnvironmentCollector collector, IEnvironmentVariableManager provider, Set set){ + private Set processVariables(IEnvironmentVariable vars[], EnvironmentCollector collector, IEnvironmentVariableManager provider, Set set){ boolean checkSet = true; if(vars != null && vars.length != 0){ if(set == null){ - set = new HashSet(); + set = new HashSet(); checkSet = false; } diff --git a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/enablement/AdjustmentContext.java b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/enablement/AdjustmentContext.java index 7ce13d88f18..37bf796f720 100644 --- a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/enablement/AdjustmentContext.java +++ b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/enablement/AdjustmentContext.java @@ -12,8 +12,8 @@ package org.eclipse.cdt.managedbuilder.internal.enablement; import java.util.ArrayList; import java.util.HashMap; -import java.util.Iterator; -import java.util.Map; +import java.util.Map.Entry; +import java.util.Set; public class AdjustmentContext { @@ -49,10 +49,10 @@ public class AdjustmentContext { // return fType; // } - private HashMap fMap = new HashMap(); + private HashMap fMap = new HashMap(); public void addAdjustedState(String attr, boolean adjusted){ - Boolean b = (Boolean)fMap.get(attr); + Boolean b = fMap.get(attr); if(b == null || (adjusted && !b.booleanValue())){ @@ -64,14 +64,14 @@ public class AdjustmentContext { if(fMap.size() == 0) return new String[0]; - ArrayList list = new ArrayList(fMap.size()); - for(Iterator iter = fMap.entrySet().iterator(); iter.hasNext();){ - Map.Entry entry = (Map.Entry)iter.next(); - Boolean b = (Boolean)entry.getValue(); + ArrayList list = new ArrayList(fMap.size()); + Set> entrySet = fMap.entrySet(); + for (Entry entry : entrySet) { + Boolean b = entry.getValue(); if(!b.booleanValue()){ list.add(entry.getKey()); } } - return (String[])list.toArray(new String[list.size()]); + return list.toArray(new String[list.size()]); } } diff --git a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/enablement/CheckOptionExpression.java b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/enablement/CheckOptionExpression.java index ae852ee6a96..1bdcf42d620 100644 --- a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/enablement/CheckOptionExpression.java +++ b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/enablement/CheckOptionExpression.java @@ -123,8 +123,9 @@ public class CheckOptionExpression implements IBooleanExpression { case IOption.UNDEF_LIBRARY_PATHS: case IOption.UNDEF_LIBRARY_FILES: case IOption.UNDEF_MACRO_FILES:{ - List list = (List)option.getValue(); - String listValue = provider.convertStringListToString((String[])list.toArray(new String[list.size()]),delimiter); + @SuppressWarnings("unchecked") + List list = (List)option.getValue(); + String listValue = provider.convertStringListToString(list.toArray(new String[list.size()]),delimiter); listValue = provider.resolveValue(listValue, inexVal, delimiter, IBuildMacroProvider.CONTEXT_OPTION, @@ -188,11 +189,13 @@ public class CheckOptionExpression implements IBooleanExpression { case IOption.UNDEF_LIBRARY_PATHS: case IOption.UNDEF_LIBRARY_FILES: case IOption.UNDEF_MACRO_FILES:{ - List list = (List)option.getValue(); - String listValue[] = (String[])list.toArray(new String[list.size()]); + @SuppressWarnings("unchecked") + List list = (List)option.getValue(); + String listValue[] = list.toArray(new String[list.size()]); - list = (List)otherOption.getValue(); - String otherValue[] = (String[])list.toArray(new String[list.size()]); + @SuppressWarnings("unchecked") + List otherList = (List)otherOption.getValue(); + String otherValue[] = otherList.toArray(new String[otherList.size()]); IMacroContextInfo info = provider.getMacroContextInfo(IBuildMacroProvider.CONTEXT_OPTION, new OptionContextData(option,holder)); diff --git a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/enablement/CompositeExpression.java b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/enablement/CompositeExpression.java index cb57fe33287..e48a0bc1aab 100644 --- a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/enablement/CompositeExpression.java +++ b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/enablement/CompositeExpression.java @@ -64,10 +64,10 @@ public abstract class CompositeExpression implements IBooleanExpression { return fChildren; } - public Map getReferencedProperties(Map map){ + public Map> getReferencedProperties(Map> map){ IBooleanExpression children[] = getChildren(); if(map == null) - map = new HashMap(); + map = new HashMap>(); for(int i = 0; i < children.length; i++){ IBooleanExpression child = children[i]; @@ -79,9 +79,9 @@ public abstract class CompositeExpression implements IBooleanExpression { String val = bp.getValueId(); if(prop != null && prop.length() != 0 && val != null && val.length() != 0){ - Set set = (Set)map.get(prop); + Set set = map.get(prop); if(set == null){ - set = new HashSet(); + set = new HashSet(); map.put(prop, set); } set.add(val); diff --git a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/enablement/OptionEnablementExpression.java b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/enablement/OptionEnablementExpression.java index 48d9bf91bd2..1974450ec9d 100644 --- a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/enablement/OptionEnablementExpression.java +++ b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/enablement/OptionEnablementExpression.java @@ -129,7 +129,7 @@ public class OptionEnablementExpression extends AndExpression{ } public String[] convertToList(String value, String delimiter){ - List list = new ArrayList(); + List list = new ArrayList(); int delLength = delimiter.length(); int valLength = value.length(); @@ -149,7 +149,7 @@ public class OptionEnablementExpression extends AndExpression{ } } - return (String[])list.toArray(new String[list.size()]); + return list.toArray(new String[list.size()]); } protected int calculateFlags(String flagsString){