diff --git a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/buildproperties/BuildPropertyManager.java b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/buildproperties/BuildPropertyManager.java index bd2ed623e57..fb4614d8861 100644 --- a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/buildproperties/BuildPropertyManager.java +++ b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/buildproperties/BuildPropertyManager.java @@ -40,8 +40,8 @@ public class BuildPropertyManager implements IBuildPropertyManager{ private static BuildPropertyManager fInstance; - private List fTypeCfgElements; - private List fValueCfgElements; + private List fTypeCfgElements; + private List fValueCfgElements; private BuildPropertyManager(){ loadExtensions(); @@ -61,10 +61,10 @@ public class BuildPropertyManager implements IBuildPropertyManager{ return properties.toString(); } - private Map fPropertyTypeMap = new HashMap(); + private Map fPropertyTypeMap = new HashMap(); public IBuildPropertyType getPropertyType(String id){ - return (BuildPropertyType)fPropertyTypeMap.get(id); + return fPropertyTypeMap.get(id); } public IBuildPropertyType createPropertyType(String id, String name) throws CoreException{ @@ -108,7 +108,7 @@ public class BuildPropertyManager implements IBuildPropertyManager{ } public IBuildPropertyType[] getPropertyTypes(){ - return (BuildPropertyType[])fPropertyTypeMap.values().toArray(new BuildPropertyType[fPropertyTypeMap.size()]); + return fPropertyTypeMap.values().toArray(new BuildPropertyType[fPropertyTypeMap.size()]); } public IBuildProperty createProperty(String id, String value) throws CoreException { @@ -134,15 +134,15 @@ public class BuildPropertyManager implements IBuildPropertyManager{ return false; } - private List getTypeElList(boolean create){ + private List getTypeElList(boolean create){ if(fTypeCfgElements == null && create) - fTypeCfgElements = new ArrayList(); + fTypeCfgElements = new ArrayList(); return fTypeCfgElements; } - private List getValueElList(boolean create){ + private List getValueElList(boolean create){ if(fValueCfgElements == null && create) - fValueCfgElements = new ArrayList(); + fValueCfgElements = new ArrayList(); return fValueCfgElements; } @@ -164,10 +164,9 @@ public class BuildPropertyManager implements IBuildPropertyManager{ private void resolveConfigElements(){ - List typeEls = getTypeElList(false); + List typeEls = getTypeElList(false); if(typeEls != null){ - for(int i = 0; i < typeEls.size(); i++){ - IConfigurationElement el = (IConfigurationElement)typeEls.get(i); + for (IConfigurationElement el : typeEls) { try { createPropertyType(el); } catch (CoreException e) { @@ -175,10 +174,9 @@ public class BuildPropertyManager implements IBuildPropertyManager{ } } - List valEls = getValueElList(false); + List valEls = getValueElList(false); if(valEls != null){ - for(int i = 0; i < valEls.size(); i++){ - IConfigurationElement el = (IConfigurationElement)valEls.get(i); + for (IConfigurationElement el : valEls) { try { createPropertyValue(el); } catch (CoreException e) { diff --git a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/buildproperties/BuildPropertyType.java b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/buildproperties/BuildPropertyType.java index c2368e48027..be74a9b46f8 100644 --- a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/buildproperties/BuildPropertyType.java +++ b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/buildproperties/BuildPropertyType.java @@ -18,7 +18,7 @@ import org.eclipse.cdt.managedbuilder.buildproperties.IBuildPropertyValue; public class BuildPropertyType extends PropertyBase implements IBuildPropertyType{ - private Map fValuesMap = new HashMap(); + private Map fValuesMap = new HashMap(); BuildPropertyType(String id, String name){ super(id, name); @@ -29,10 +29,10 @@ public class BuildPropertyType extends PropertyBase implements IBuildPropertyTyp } public IBuildPropertyValue[] getSupportedValues(){ - return (BuildPropertyValue[])fValuesMap.values().toArray(new BuildPropertyValue[fValuesMap.size()]); + return fValuesMap.values().toArray(new BuildPropertyValue[fValuesMap.size()]); } public IBuildPropertyValue getSupportedValue(String id){ - return (BuildPropertyValue)fValuesMap.get(id); + return fValuesMap.get(id); } } diff --git a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/envvar/EnvironmentVariableProvider.java b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/envvar/EnvironmentVariableProvider.java index fb49f14afaa..c148a1223bd 100644 --- a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/envvar/EnvironmentVariableProvider.java +++ b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/envvar/EnvironmentVariableProvider.java @@ -12,7 +12,6 @@ package org.eclipse.cdt.managedbuilder.internal.envvar; import java.util.ArrayList; import java.util.Arrays; -import java.util.Iterator; import java.util.List; import org.eclipse.cdt.core.CCorePlugin; @@ -33,7 +32,7 @@ import org.eclipse.cdt.utils.envvar.EnvVarOperationProcessor; /** * This class implements the IEnvironmentVariableProvider interface and provides all - * build environment funvtionality to the MBS + * build environment functionality to the MBS * * @since 3.0 * @@ -46,7 +45,7 @@ public class EnvironmentVariableProvider implements // private static final String DELIMITER_UNIX = ":"; //$NON-NLS-1$ private static EnvironmentVariableProvider fInstance = null; - private List fListeners = null; + private List fListeners = null; private IEnvironmentVariableManager fMngr; private boolean fBuildPathVarCheckAllowed; @@ -74,8 +73,8 @@ public class EnvironmentVariableProvider implements if(fDelimiter == null || "".equals(fDelimiter)) //$NON-NLS-1$ return new String[]{variableValue}; - List list = EnvVarOperationProcessor.convertToList(variableValue,fDelimiter); - return (String[]) list.toArray(new String[list.size()]); + List list = EnvVarOperationProcessor.convertToList(variableValue,fDelimiter); + return list.toArray(new String[list.size()]); } } @@ -208,7 +207,7 @@ public class EnvironmentVariableProvider implements public String[] getBuildPaths(IConfiguration configuration, int buildPathType) { ITool tools[] = configuration.getFilteredTools(); - List list = new ArrayList(); + List list = new ArrayList(); for(int i = 0; i < tools.length; i++){ IEnvVarBuildPath pathDescriptors[] = tools[i].getEnvVarBuildPaths(); @@ -248,15 +247,15 @@ public class EnvironmentVariableProvider implements } } - return (String[])list.toArray(new String[list.size()]); + return list.toArray(new String[list.size()]); } /* * returns a list of registered listeners */ - private List getListeners(){ + private List getListeners(){ if(fListeners == null) - fListeners = new ArrayList(); + fListeners = new ArrayList(); return fListeners; } @@ -264,10 +263,10 @@ public class EnvironmentVariableProvider implements * notifies registered listeners */ private void notifyListeners(IConfiguration configuration, int buildPathType){ - List listeners = getListeners(); - Iterator iterator = listeners.iterator(); - while(iterator.hasNext()) - ((IEnvironmentBuildPathsChangeListener)iterator.next()).buildPathsChanged(configuration,buildPathType); + List listeners = getListeners(); + for (IEnvironmentBuildPathsChangeListener listener : listeners) { + listener.buildPathsChanged(configuration,buildPathType); + } } /* (non-Javadoc) @@ -277,7 +276,7 @@ public class EnvironmentVariableProvider implements if(listener == null) return; - List listeners = getListeners(); + List listeners = getListeners(); if(!listeners.contains(listener)) listeners.add(listener); @@ -290,7 +289,7 @@ public class EnvironmentVariableProvider implements if(listener == null) return; - List listeners = getListeners(); + List listeners = getListeners(); listeners.remove(listener); } diff --git a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/envvar/MbsEnvironmentSupplier.java b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/envvar/MbsEnvironmentSupplier.java index 9a5c0c2b56c..cbac67c2370 100644 --- a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/envvar/MbsEnvironmentSupplier.java +++ b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/envvar/MbsEnvironmentSupplier.java @@ -78,7 +78,7 @@ public class MbsEnvironmentSupplier implements IEnvironmentVariableSupplier { */ public IEnvironmentVariable[] getVariables(Object context) { if(context instanceof IConfiguration){ - List variables = new ArrayList(2); + List variables = new ArrayList(2); IBuildEnvironmentVariable var = getConfigurationVariable("CWD",(IConfiguration)context); //$NON-NLS-1$ if(var != null){ variables.add(var); @@ -86,7 +86,7 @@ public class MbsEnvironmentSupplier implements IEnvironmentVariableSupplier { } else { return null; } - return (IEnvironmentVariable[])variables.toArray(new IBuildEnvironmentVariable[variables.size()]); + return variables.toArray(new IBuildEnvironmentVariable[variables.size()]); } return null; } diff --git a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/envvar/StoredBuildPathEnvironmentContainer.java b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/envvar/StoredBuildPathEnvironmentContainer.java index 849d974d583..2637c5d0827 100644 --- a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/envvar/StoredBuildPathEnvironmentContainer.java +++ b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/envvar/StoredBuildPathEnvironmentContainer.java @@ -251,7 +251,7 @@ public class StoredBuildPathEnvironmentContainer extends private String[] getBuildPathVarNames(IConfiguration configuration,int buildPathType){ ITool tools[] = configuration.getFilteredTools(); - List list = new ArrayList(); + List list = new ArrayList(); for(int i = 0; i < tools.length; i++){ IEnvVarBuildPath pathDescriptors[] = tools[i].getEnvVarBuildPaths(); @@ -272,6 +272,6 @@ public class StoredBuildPathEnvironmentContainer extends } } - 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/macros/BuildMacroProvider.java b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/macros/BuildMacroProvider.java index 1882efc5c44..17a817f6c77 100644 --- a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/macros/BuildMacroProvider.java +++ b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/macros/BuildMacroProvider.java @@ -116,12 +116,12 @@ public class BuildMacroProvider implements IBuildMacroProvider, IMacroContextInf } private static IBuildMacroSupplier[] filterMacroSuppliers(ICdtVariableSupplier suppliers[]){ - List list = new ArrayList(suppliers.length); + List list = new ArrayList(suppliers.length); for(int i = 0; i < suppliers.length; i++){ if(suppliers[i] instanceof IBuildMacroSupplier) list.add(suppliers[i]); } - return (IBuildMacroSupplier[])list.toArray(new IBuildMacroSupplier[list.size()]); + return list.toArray(new IBuildMacroSupplier[list.size()]); } public IMacroContextInfo getMacroContextInfo( @@ -150,9 +150,9 @@ public class BuildMacroProvider implements IBuildMacroProvider, IMacroContextInf fVariable = var; } - public ICdtVariable getVariable(){ - return fVariable; - } +// public ICdtVariable getVariable(){ +// return fVariable; +// } public int getMacroValueType() { return fVariable.getValueType(); diff --git a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/macros/BuildfileMacroSubstitutor.java b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/macros/BuildfileMacroSubstitutor.java index f4567f4c629..e5853d7d9f6 100644 --- a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/macros/BuildfileMacroSubstitutor.java +++ b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/macros/BuildfileMacroSubstitutor.java @@ -50,7 +50,7 @@ public class BuildfileMacroSubstitutor extends SupplierBasedCdtVariableSubstitut private static final String PATTERN_MACRO_NAME = "="; //$NON-NLS-1$ private IConfiguration fConfiguration; private IBuilder fBuilder; - private HashSet fCaseInsensitiveReferencedNames; + private HashSet fCaseInsensitiveReferencedNames; private ICdtVariableManager fVarMngr; private ICConfigurationDescription fCfgDes; @@ -91,7 +91,7 @@ public class BuildfileMacroSubstitutor extends SupplierBasedCdtVariableSubstitut protected String[] getConfigurationReservedNames(IConfiguration configuration){ ITool tools[] = configuration.getFilteredTools(); if(tools != null){ - Set set = new HashSet(); + Set set = new HashSet(); for(int i = 0; i < tools.length; i++){ IOutputType ots[] = tools[i].getOutputTypes(); if(ots != null){ @@ -115,7 +115,7 @@ public class BuildfileMacroSubstitutor extends SupplierBasedCdtVariableSubstitut } - return (String[])set.toArray(new String[set.size()]); + return set.toArray(new String[set.size()]); } return null; } @@ -268,9 +268,9 @@ public class BuildfileMacroSubstitutor extends SupplierBasedCdtVariableSubstitut return ref; } - protected Set getCaseInsensitiveReferencedNames(){ + protected Set getCaseInsensitiveReferencedNames(){ if(fCaseInsensitiveReferencedNames == null) - fCaseInsensitiveReferencedNames = new HashSet(); + fCaseInsensitiveReferencedNames = new HashSet(); return fCaseInsensitiveReferencedNames; } diff --git a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/macros/ExplicitFileMacroCollector.java b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/macros/ExplicitFileMacroCollector.java index 59e6d833b67..2d660965d5e 100644 --- a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/macros/ExplicitFileMacroCollector.java +++ b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/macros/ExplicitFileMacroCollector.java @@ -27,7 +27,7 @@ import org.eclipse.cdt.utils.cdtvariables.SupplierBasedCdtVariableSubstitutor; public class ExplicitFileMacroCollector extends SupplierBasedCdtVariableSubstitutor { private static final String EMPTY_STRING = ""; //$NON-NLS-1$ - private List fMacrosList = new ArrayList(); + private List fMacrosList = new ArrayList(); /* public ExplicitFileMacroCollector(int contextType, Object contextData){ super(contextType, contextData, EMPTY_STRING, EMPTY_STRING); @@ -65,7 +65,7 @@ public class ExplicitFileMacroCollector extends SupplierBasedCdtVariableSubstitu } public IBuildMacro[] getExplicisFileMacros(){ - return (IBuildMacro[])fMacrosList.toArray(new IBuildMacro[fMacrosList.size()]); + return fMacrosList.toArray(new IBuildMacro[fMacrosList.size()]); } } diff --git a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/macros/FileContextBuildMacroValues.java b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/macros/FileContextBuildMacroValues.java index 62fb2093c3d..92573045663 100644 --- a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/macros/FileContextBuildMacroValues.java +++ b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/macros/FileContextBuildMacroValues.java @@ -11,8 +11,7 @@ package org.eclipse.cdt.managedbuilder.internal.macros; import java.util.HashMap; -import java.util.Iterator; -import java.util.Map; +import java.util.Map.Entry; import java.util.Set; import org.eclipse.cdt.managedbuilder.core.IBuilder; @@ -30,8 +29,8 @@ public class FileContextBuildMacroValues implements private IBuilder fBuilder; private IFileContextBuildMacroValues fSupperClassValues; - private HashMap fValues = new HashMap(); - private HashMap fAllValues = new HashMap(); + private HashMap fValues = new HashMap(); + private HashMap fAllValues = new HashMap(); private boolean fInitialized; public FileContextBuildMacroValues(IBuilder builder, IManagedConfigElement element){ @@ -56,17 +55,16 @@ public class FileContextBuildMacroValues implements if(supperValues != null) { String names[] = MbsMacroSupplier.getInstance().getMacroNames(IBuildMacroProvider.CONTEXT_FILE); for(int i = 0; i < names.length; i++){ - String value = (String)fValues.get(names[i]); + String value = fValues.get(names[i]); if(value == null) value = supperValues.getMacroValue(names[i]); if(value != null && value.length() > 0) fAllValues.put(names[i],value); } } else { - Iterator iter = fValues.entrySet().iterator(); - while(iter.hasNext()){ - Map.Entry entry = (Map.Entry)iter.next(); - String value = (String)entry.getValue(); + Set> entrySet = fValues.entrySet(); + for (Entry entry : entrySet) { + String value = entry.getValue(); if(value != null && value.length() > 0) fAllValues.put(entry.getKey(),value); } @@ -80,11 +78,8 @@ public class FileContextBuildMacroValues implements */ public String[] getSupportedMacros() { load(); - Set set = fAllValues.keySet(); - String names[] = new String[set.size()]; - Iterator iter = set.iterator(); - for(int i = 0; i < names.length; i++) - names[i] = (String)iter.next(); + Set set = fAllValues.keySet(); + String names[] = set.toArray(new String[set.size()]); return names; } @@ -93,7 +88,7 @@ public class FileContextBuildMacroValues implements */ public String getMacroValue(String macroName) { load(); - return (String)fAllValues.get(macroName); + return fAllValues.get(macroName); } public IFileContextBuildMacroValues getSupperClassValues(){ @@ -113,13 +108,14 @@ public class FileContextBuildMacroValues implements /* (non-Javadoc) * @see java.lang.Object#clone() */ + @SuppressWarnings("unchecked") @Override public Object clone(){ FileContextBuildMacroValues cloned = null; try{ cloned = (FileContextBuildMacroValues)super.clone(); - cloned.fValues = (HashMap)fValues.clone(); - cloned.fAllValues = (HashMap)fAllValues.clone(); + cloned.fValues = (HashMap)fValues.clone(); + cloned.fAllValues = (HashMap)fAllValues.clone(); } catch (CloneNotSupportedException e){ }