diff --git a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/dataprovider/BuildSystemSpecificVariableSubstitutor.java b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/dataprovider/BuildSystemSpecificVariableSubstitutor.java index 45e36552a29..88962614be2 100644 --- a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/dataprovider/BuildSystemSpecificVariableSubstitutor.java +++ b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/dataprovider/BuildSystemSpecificVariableSubstitutor.java @@ -23,13 +23,13 @@ import org.eclipse.cdt.utils.cdtvariables.IVariableContextInfo; import org.eclipse.cdt.utils.cdtvariables.SupplierBasedCdtVariableSubstitutor; public class BuildSystemSpecificVariableSubstitutor extends SupplierBasedCdtVariableSubstitutor{ - private static final Set fFileVarsSet = new HashSet(Arrays.asList(MbsMacroSupplier.getInstance().getMacroNames(IBuildMacroProvider.CONTEXT_FILE))); - private static final Set fOptionVarsSet = new HashSet(Arrays.asList(MbsMacroSupplier.getInstance().getMacroNames(IBuildMacroProvider.CONTEXT_OPTION))); - private static final Set fToolVarsSet = new HashSet(Arrays.asList(MbsMacroSupplier.getInstance().getMacroNames(IBuildMacroProvider.CONTEXT_TOOL))); + private static final Set fFileVarsSet = new HashSet(Arrays.asList(MbsMacroSupplier.getInstance().getMacroNames(IBuildMacroProvider.CONTEXT_FILE))); + private static final Set fOptionVarsSet = new HashSet(Arrays.asList(MbsMacroSupplier.getInstance().getMacroNames(IBuildMacroProvider.CONTEXT_OPTION))); + private static final Set fToolVarsSet = new HashSet(Arrays.asList(MbsMacroSupplier.getInstance().getMacroNames(IBuildMacroProvider.CONTEXT_TOOL))); public BuildSystemSpecificVariableSubstitutor( IVariableContextInfo contextInfo, String inexistentMacroValue, - String listDelimiter, Map delimiterMap, + String listDelimiter, Map delimiterMap, String incorrectlyReferencedMacroValue) { super(contextInfo, inexistentMacroValue, listDelimiter, delimiterMap, incorrectlyReferencedMacroValue); diff --git a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/dataprovider/ProfileInfoProvider.java b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/dataprovider/ProfileInfoProvider.java index 9d57dbff061..8d8b3293e26 100644 --- a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/dataprovider/ProfileInfoProvider.java +++ b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/dataprovider/ProfileInfoProvider.java @@ -10,9 +10,9 @@ *******************************************************************************/ package org.eclipse.cdt.managedbuilder.internal.dataprovider; -import java.util.Iterator; -import java.util.List; import java.util.Map; +import java.util.Map.Entry; +import java.util.Set; import org.eclipse.cdt.build.core.scannerconfig.CfgInfoContext; import org.eclipse.cdt.build.internal.core.scannerconfig.CfgDiscoveredPathManager; @@ -100,26 +100,26 @@ public class ProfileInfoProvider { return new ICLanguageSettingEntry[0]; } - private ICLanguageSettingEntry[] calculateEntries(int kind, int flags, Map map){ + private ICLanguageSettingEntry[] calculateEntries(int kind, int flags, Map map){ ICLanguageSettingEntry entries[] = new ICLanguageSettingEntry[map.size()]; int num = 0; - for(Iterator iter = map.entrySet().iterator(); iter.hasNext();){ - Map.Entry entry = (Map.Entry)iter.next(); - String name = (String)entry.getKey(); - String value = (String)entry.getValue(); + Set> entrySet = map.entrySet(); + for (Entry entry : entrySet) { + String name = entry.getKey(); + String value = entry.getValue(); entries[num++] = (ICLanguageSettingEntry)CDataUtil.createEntry(kind, name, value, null, flags); } return entries; } - private ICLanguageSettingEntry[] calculateEntries(int kind, int flags, String[] values){ - ICLanguageSettingEntry entries[] = new ICLanguageSettingEntry[values.length]; - for(int i = 0; i < values.length; i++){ - String name = values[i]; - entries[i] = (ICLanguageSettingEntry)CDataUtil.createEntry(kind, name, null, null, flags); - } - return entries; - } +// private ICLanguageSettingEntry[] calculateEntries(int kind, int flags, String[] values){ +// ICLanguageSettingEntry entries[] = new ICLanguageSettingEntry[values.length]; +// for(int i = 0; i < values.length; i++){ +// String name = values[i]; +// entries[i] = (ICLanguageSettingEntry)CDataUtil.createEntry(kind, name, null, null, flags); +// } +// return entries; +// } private ICLanguageSettingEntry[] calculateEntries(int kind, int flags, IPath[] values){ ICLanguageSettingEntry entries[] = new ICLanguageSettingEntry[values.length]; @@ -130,13 +130,13 @@ public class ProfileInfoProvider { return entries; } - private ICLanguageSettingEntry[] calculateEntries(int kind, int flags, List list){ - ICLanguageSettingEntry entries[] = new ICLanguageSettingEntry[list.size()]; - int num = 0; - for(Iterator iter = list.iterator(); iter.hasNext();){ - String name = (String)iter.next(); - entries[num++] = (ICLanguageSettingEntry)CDataUtil.createEntry(kind, name, null, null, flags); - } - return entries; - } +// private ICLanguageSettingEntry[] calculateEntries(int kind, int flags, List list){ +// ICLanguageSettingEntry entries[] = new ICLanguageSettingEntry[list.size()]; +// int num = 0; +// for(Iterator iter = list.iterator(); iter.hasNext();){ +// String name = (String)iter.next(); +// entries[num++] = (ICLanguageSettingEntry)CDataUtil.createEntry(kind, name, null, null, flags); +// } +// return entries; +// } } diff --git a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/dataprovider/ProjectConverter.java b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/dataprovider/ProjectConverter.java index 0d227e57868..38a2e33416a 100644 --- a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/dataprovider/ProjectConverter.java +++ b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/dataprovider/ProjectConverter.java @@ -96,7 +96,7 @@ public class ProjectConverter implements ICProjectConverter { return false; IProjectDescription eDes = project.getDescription(); - Set natureSet = new HashSet(Arrays.asList(eDes.getNatureIds())); + Set natureSet = new HashSet(Arrays.asList(eDes.getNatureIds())); if(natureSet.contains(OLD_MAKE_NATURE_ID)) return true; @@ -112,7 +112,7 @@ public class ProjectConverter implements ICProjectConverter { public ICProjectDescription convertProject(IProject project, IProjectDescription eDes, String oldOwnerId, ICProjectDescription oldDes) throws CoreException { - Set natureSet = new HashSet(Arrays.asList(eDes.getNatureIds())); + Set natureSet = new HashSet(Arrays.asList(eDes.getNatureIds())); CoreModel model = CoreModel.getDefault(); ICProjectDescription newDes = null; IManagedBuildInfo info = null; @@ -161,14 +161,14 @@ public class ProjectConverter implements ICProjectConverter { changeEDes = true; if(changeEDes) - eDes.setNatureIds((String[])natureSet.toArray(new String[natureSet.size()])); + eDes.setNatureIds(natureSet.toArray(new String[natureSet.size()])); changeEDes = false; ICommand[] cmds = eDes.getBuildSpec(); - List list = new ArrayList(Arrays.asList(cmds)); + List list = new ArrayList(Arrays.asList(cmds)); ICommand makeBuilderCmd = null; - for(Iterator iter = list.iterator(); iter.hasNext();){ - ICommand cmd = (ICommand)iter.next(); + for(Iterator iter = list.iterator(); iter.hasNext();){ + ICommand cmd = iter.next(); if(OLD_MAKE_BUILDER_ID.equals(cmd.getBuilderName())){ makeBuilderCmd = cmd; iter.remove(); @@ -220,7 +220,7 @@ public class ProjectConverter implements ICProjectConverter { // } if(changeEDes){ - cmds = (ICommand[])list.toArray(new ICommand[list.size()]); + cmds = list.toArray(new ICommand[list.size()]); eDes.setBuildSpec(cmds); } @@ -346,9 +346,9 @@ public class ProjectConverter implements ICProjectConverter { toTarget.setBuildAttribute(IMakeTarget.BUILD_ARGUMENTS, fromTarget.getBuildAttribute(IMakeTarget.BUILD_ARGUMENTS, null)); toTarget.setBuildAttribute(IMakeTarget.BUILD_TARGET, fromTarget.getBuildAttribute(IMakeTarget.BUILD_TARGET, null)); - Map fromMap = fromTarget.getEnvironment(); + Map fromMap = fromTarget.getEnvironment(); if(fromMap != null) - toTarget.setEnvironment(new HashMap(fromMap)); + toTarget.setEnvironment(new HashMap(fromMap)); // toTarget.setErrorParsers(fromTarget.getErrorParsers()); @@ -368,9 +368,9 @@ public class ProjectConverter implements ICProjectConverter { if(el != null){ IPathEntry[] entries = PathEntryTranslator.decodePathEntries(project, el); if(entries.length != 0){ - List list = new ArrayList(Arrays.asList(entries)); - for(Iterator iter = list.iterator(); iter.hasNext();){ - IPathEntry entry = (IPathEntry)iter.next(); + List list = new ArrayList(Arrays.asList(entries)); + for(Iterator iter = list.iterator(); iter.hasNext();){ + IPathEntry entry = iter.next(); if(entry.getEntryKind() == IPathEntry.CDT_CONTAINER){ iter.remove(); continue; @@ -379,7 +379,7 @@ public class ProjectConverter implements ICProjectConverter { if(list.size() != 0){ PathEntryTranslator tr = new PathEntryTranslator(project, data); - entries = (IPathEntry[])list.toArray(new IPathEntry[list.size()]); + entries = list.toArray(new IPathEntry[list.size()]); ReferenceSettingsInfo refInfo = tr.applyPathEntries(entries, null, PathEntryTranslator.OP_REPLACE); ICExternalSetting extSettings[] = refInfo.getExternalSettings(); des.removeExternalSettings(); @@ -396,7 +396,7 @@ public class ProjectConverter implements ICProjectConverter { IPath projPaths[] = refInfo.getReferencedProjectsPaths(); if(projPaths.length != 0){ - Map map = new HashMap(projPaths.length); + Map map = new HashMap(projPaths.length); for(int i = 0; i < projPaths.length; i++){ map.put(projPaths[i].segment(0), ""); //$NON-NLS-1$ } @@ -411,13 +411,13 @@ public class ProjectConverter implements ICProjectConverter { } } - private String[] idsFromRefs(ICConfigExtensionReference refs[]){ - String ids[] = new String[refs.length]; - for(int i = 0; i < ids.length; i++){ - ids[i] = refs[i].getID(); - } - return ids; - } +// private String[] idsFromRefs(ICConfigExtensionReference refs[]){ +// String ids[] = new String[refs.length]; +// for(int i = 0; i < ids.length; i++){ +// ids[i] = refs[i].getID(); +// } +// return ids; +// } // private void loadDiscoveryOptions(ICConfigurationDescription des, IConfiguration cfg){ // try { @@ -496,7 +496,7 @@ public class ProjectConverter implements ICProjectConverter { final IProjectDescription eDes = project.getDescription(); String natureIds[] = eDes.getNatureIds(); - Set set = new HashSet(Arrays.asList(natureIds)); + Set set = new HashSet(Arrays.asList(natureIds)); if(!set.contains(OLD_MAKE_NATURE_ID)){ if(throwExceptions) throw new CoreException(new Status(IStatus.ERROR,