From bbe979278f30d2646d699507c4ef7d56fc14999d Mon Sep 17 00:00:00 2001 From: Andrew Gvozdev Date: Sun, 22 Aug 2010 02:58:21 +0000 Subject: [PATCH] bug 319512: Compilation warnings --- ...CDependencyCalculatorPreBuildCommands.java | 14 +- .../makegen/gnu/GnuDependencyGroupInfo.java | 7 +- .../makegen/gnu/GnuMakefileGenerator.java | 11 +- .../makegen/gnu/IManagedBuildGnuToolInfo.java | 18 +- .../makegen/gnu/ManagedBuildGnuToolInfo.java | 228 +++++++++--------- 5 files changed, 139 insertions(+), 139 deletions(-) diff --git a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/makegen/gnu/DefaultGCCDependencyCalculatorPreBuildCommands.java b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/makegen/gnu/DefaultGCCDependencyCalculatorPreBuildCommands.java index 31810dfcd83..c5875856516 100755 --- a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/makegen/gnu/DefaultGCCDependencyCalculatorPreBuildCommands.java +++ b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/makegen/gnu/DefaultGCCDependencyCalculatorPreBuildCommands.java @@ -212,7 +212,7 @@ public class DefaultGCCDependencyCalculatorPreBuildCommands implements IManagedD IManagedCommandLineInfo cmdLInfo = null; // Set up the command line options that will generate the dependency file - Vector options = new Vector(); + Vector options = new Vector(); // -w options.add("-w"); //$NON-NLS-1$ // -MM @@ -249,11 +249,11 @@ public class DefaultGCCDependencyCalculatorPreBuildCommands implements IManagedD // Save the -I, -D, -U options and discard the rest try { String[] allFlags = tool.getToolCommandFlags(sourceLocation, outputLocation); - for (int i=0; i)option.getValue(); + @SuppressWarnings("unchecked") + List value = (List)option.getValue(); + outputList = value; ((Tool)tool).filterValues(optType, outputList); // Add outputPrefix to each if necessary if (outputPrefix.length() > 0) { @@ -3866,13 +3867,13 @@ public class GnuMakefileGenerator implements IManagedBuilderMakefileGenerator2 { /** * Write all macro addition entries in a map to the buffer */ - protected StringBuffer writeTopAdditionMacros(List varList, HashMap varMap) { + protected StringBuffer writeTopAdditionMacros(List varList, HashMap varMap) { StringBuffer buffer = new StringBuffer(); // Add the comment buffer.append(COMMENT_SYMBOL + WHITESPACE + ManagedMakeMessages.getResourceString(MOD_VARS) + NEWLINE); for (int i=0; i getTopBuildOutputVars() { return topBuildOutVars; } diff --git a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/makegen/gnu/IManagedBuildGnuToolInfo.java b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/makegen/gnu/IManagedBuildGnuToolInfo.java index fc45b5ea431..20faabedd5f 100644 --- a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/makegen/gnu/IManagedBuildGnuToolInfo.java +++ b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/makegen/gnu/IManagedBuildGnuToolInfo.java @@ -36,14 +36,14 @@ public interface IManagedBuildGnuToolInfo { * * @return Vector */ - public Vector getCommandInputs(); + public Vector getCommandInputs(); /** * Returns the raw list of tool's input file names. * * @return Vector */ - public Vector getEnumeratedInputs(); + public Vector getEnumeratedInputs(); /** * Returns true if the tool's outputs have been calculated, @@ -59,28 +59,28 @@ public interface IManagedBuildGnuToolInfo { * * @return Vector */ - public Vector getCommandOutputs(); + public Vector getCommandOutputs(); /** * Returns the raw list of tool's primary output file names. * * @return Vector */ - public Vector getEnumeratedPrimaryOutputs(); + public Vector getEnumeratedPrimaryOutputs(); /** * Returns the raw list of tool's secondary output file names. * * @return Vector */ - public Vector getEnumeratedSecondaryOutputs(); + public Vector getEnumeratedSecondaryOutputs(); /** * Returns the raw list of tool's output variable names. * * @return Vector */ - public Vector getOutputVariables(); + public Vector getOutputVariables(); /** * Returns true if the tool's dependencies have been calculated, @@ -97,7 +97,7 @@ public interface IManagedBuildGnuToolInfo { * * @return Vector */ - public Vector getCommandDependencies(); + public Vector getCommandDependencies(); /** * Returns the tool's additional targets as determined by the @@ -106,14 +106,14 @@ public interface IManagedBuildGnuToolInfo { * * @return Vector */ - public Vector getAdditionalTargets(); + public Vector getAdditionalTargets(); /** * Returns the raw list of tool's input dependencies. * * @return Vector */ - //public Vector getEnumeratedDependencies(); + //public Vector getEnumeratedDependencies(); /** * Returns true if this is the target tool diff --git a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/makegen/gnu/ManagedBuildGnuToolInfo.java b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/makegen/gnu/ManagedBuildGnuToolInfo.java index 9e74a5fa6db..25009d270ac 100644 --- a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/makegen/gnu/ManagedBuildGnuToolInfo.java +++ b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/makegen/gnu/ManagedBuildGnuToolInfo.java @@ -11,36 +11,35 @@ *******************************************************************************/ package org.eclipse.cdt.managedbuilder.makegen.gnu; -import java.util.Iterator; -import java.util.List; -import java.util.Arrays; import java.util.ArrayList; -import java.util.Vector; -import java.util.Map; +import java.util.Arrays; import java.util.HashMap; import java.util.HashSet; +import java.util.List; +import java.util.Map.Entry; +import java.util.Set; +import java.util.Vector; +import org.eclipse.cdt.managedbuilder.core.BuildException; import org.eclipse.cdt.managedbuilder.core.IAdditionalInput; import org.eclipse.cdt.managedbuilder.core.IConfiguration; import org.eclipse.cdt.managedbuilder.core.IInputType; +import org.eclipse.cdt.managedbuilder.core.IManagedOutputNameProvider; +import org.eclipse.cdt.managedbuilder.core.IOption; import org.eclipse.cdt.managedbuilder.core.IOutputType; import org.eclipse.cdt.managedbuilder.core.ITool; -import org.eclipse.cdt.managedbuilder.core.IOption; -import org.eclipse.cdt.managedbuilder.core.IManagedOutputNameProvider; -import org.eclipse.cdt.managedbuilder.core.BuildException; import org.eclipse.cdt.managedbuilder.core.ManagedBuildManager; -import org.eclipse.cdt.managedbuilder.macros.BuildMacroException; -import org.eclipse.cdt.managedbuilder.macros.IBuildMacroProvider; -import org.eclipse.cdt.managedbuilder.makegen.IManagedBuilderMakefileGenerator; -import org.eclipse.cdt.managedbuilder.makegen.IManagedDependencyGenerator2; -import org.eclipse.cdt.managedbuilder.makegen.IManagedDependencyGeneratorType; -import org.eclipse.cdt.managedbuilder.makegen.IManagedDependencyGenerator; -import org.eclipse.cdt.managedbuilder.makegen.IManagedDependencyCalculator; -import org.eclipse.cdt.managedbuilder.makegen.IManagedDependencyInfo; import org.eclipse.cdt.managedbuilder.internal.core.ManagedMakeMessages; import org.eclipse.cdt.managedbuilder.internal.core.Tool; import org.eclipse.cdt.managedbuilder.internal.macros.OptionContextData; -import org.eclipse.cdt.managedbuilder.makegen.gnu.GnuMakefileGenerator; +import org.eclipse.cdt.managedbuilder.macros.BuildMacroException; +import org.eclipse.cdt.managedbuilder.macros.IBuildMacroProvider; +import org.eclipse.cdt.managedbuilder.makegen.IManagedBuilderMakefileGenerator; +import org.eclipse.cdt.managedbuilder.makegen.IManagedDependencyCalculator; +import org.eclipse.cdt.managedbuilder.makegen.IManagedDependencyGenerator; +import org.eclipse.cdt.managedbuilder.makegen.IManagedDependencyGenerator2; +import org.eclipse.cdt.managedbuilder.makegen.IManagedDependencyGeneratorType; +import org.eclipse.cdt.managedbuilder.makegen.IManagedDependencyInfo; import org.eclipse.cdt.managedbuilder.makegen.gnu.GnuMakefileGenerator.ToolInfoHolder; import org.eclipse.core.resources.IProject; import org.eclipse.core.resources.IResource; @@ -67,14 +66,14 @@ public class ManagedBuildGnuToolInfo implements IManagedBuildGnuToolInfo { private boolean outputsCalculated = false; private boolean outputVariablesCalculated = false; private boolean dependenciesCalculated = false; - private Vector commandInputs = new Vector(); - private Vector enumeratedInputs = new Vector(); - private Vector commandOutputs = new Vector(); - private Vector enumeratedPrimaryOutputs = new Vector(); - private Vector enumeratedSecondaryOutputs = new Vector(); - private Vector outputVariables = new Vector(); - private Vector commandDependencies = new Vector(); - private Vector additionalTargets = new Vector(); + private Vector commandInputs = new Vector(); + private Vector enumeratedInputs = new Vector(); + private Vector commandOutputs = new Vector(); + private Vector enumeratedPrimaryOutputs = new Vector(); + private Vector enumeratedSecondaryOutputs = new Vector(); + private Vector outputVariables = new Vector(); + private Vector commandDependencies = new Vector(); + private Vector additionalTargets = new Vector(); //private Vector enumeratedDependencies = new Vector(); // Map of macro names (String) to values (List) @@ -99,12 +98,12 @@ public class ManagedBuildGnuToolInfo implements IManagedBuildGnuToolInfo { } // Command inputs are top build directory relative - public Vector getCommandInputs() { + public Vector getCommandInputs() { return commandInputs; } // Enumerated inputs are project relative - public Vector getEnumeratedInputs() { + public Vector getEnumeratedInputs() { return enumeratedInputs; } @@ -113,19 +112,19 @@ public class ManagedBuildGnuToolInfo implements IManagedBuildGnuToolInfo { } // Command outputs are top build directory relative - public Vector getCommandOutputs() { + public Vector getCommandOutputs() { return commandOutputs; } - public Vector getEnumeratedPrimaryOutputs() { + public Vector getEnumeratedPrimaryOutputs() { return enumeratedPrimaryOutputs; } - public Vector getEnumeratedSecondaryOutputs() { + public Vector getEnumeratedSecondaryOutputs() { return enumeratedSecondaryOutputs; } - public Vector getOutputVariables() { + public Vector getOutputVariables() { return outputVariables; } @@ -138,12 +137,12 @@ public class ManagedBuildGnuToolInfo implements IManagedBuildGnuToolInfo { } // Command dependencies are top build directory relative - public Vector getCommandDependencies() { + public Vector getCommandDependencies() { return commandDependencies; } // Additional targets are top build directory relative - public Vector getAdditionalTargets() { + public Vector getAdditionalTargets() { return additionalTargets; } @@ -170,17 +169,16 @@ public class ManagedBuildGnuToolInfo implements IManagedBuildGnuToolInfo { * 3. Use the file extensions and the resources in the project */ boolean done = true; - Vector myCommandInputs = new Vector(); // Inputs for the tool command line - Vector myCommandDependencies = new Vector(); // Dependencies for the make rule - Vector myEnumeratedInputs = new Vector(); // Complete list of individual inputs + Vector myCommandInputs = new Vector(); // Inputs for the tool command line + Vector myCommandDependencies = new Vector(); // Dependencies for the make rule + Vector myEnumeratedInputs = new Vector(); // Complete list of individual inputs IInputType[] inTypes = tool.getInputTypes(); - if (inTypes != null && inTypes.length > 0) { - for (int i=0; i itCommandInputs = new Vector(); // Inputs for the tool command line for this input-type + Vector itCommandDependencies = new Vector(); // Dependencies for the make rule for this input-type + Vector itEnumeratedInputs = new Vector(); // Complete list of individual inputs for this input-type String variable = type.getBuildVariable(); boolean primaryInput = type.getPrimaryInput(); boolean useFileExts = false; @@ -190,7 +188,7 @@ public class ManagedBuildGnuToolInfo implements IManagedBuildGnuToolInfo { // Option? if (option != null) { try { - List inputs = new ArrayList(); + List inputs = new ArrayList(); int optType = option.getValueType(); if (optType == IOption.STRING) { inputs.add(option.getStringValue()); @@ -202,11 +200,14 @@ public class ManagedBuildGnuToolInfo implements IManagedBuildGnuToolInfo { optType == IOption.LIBRARY_PATHS || optType == IOption.LIBRARY_FILES || optType == IOption.MACRO_FILES) { - inputs = (List)option.getValue(); + @SuppressWarnings("unchecked") + List valueList = (List)option.getValue(); + inputs = valueList; + tool.filterValues(optType, inputs); tool.filterValues(optType, inputs); } for (int j=0; j outMacroList = makeGen.getBuildVariableList(h, variable, GnuMakefileGenerator.PROJECT_RELATIVE, null, true); if (outMacroList != null) { itEnumeratedInputs.addAll(outMacroList); @@ -296,12 +297,12 @@ public class ManagedBuildGnuToolInfo implements IManagedBuildGnuToolInfo { // Note: This is only correct for tools with multipleOfType == true, but for other tools // it gives us an input resource for generating default names // Determine the set of source input macros to use - HashSet handledInputExtensions = new HashSet(); + HashSet handledInputExtensions = new HashSet(); String[] exts = type.getSourceExtensions(tool); if (projResources != null) { - for (int j=0; j 0) { - ManagedBuildManager.setOption(config, tool, assignToOption, (String)itCommandInputs.firstElement()); + ManagedBuildManager.setOption(config, tool, assignToOption, itCommandInputs.firstElement()); } } itCommandInputs.removeAllElements(); @@ -466,22 +467,22 @@ public class ManagedBuildGnuToolInfo implements IManagedBuildGnuToolInfo { * NOTE: If an option is not specified and this is not the primary output type, the outputs * from the type are not added to the command line */ - public boolean calculateOutputs(GnuMakefileGenerator makeGen, IConfiguration config, HashSet handledInputExtensions, boolean lastChance) { + public boolean calculateOutputs(GnuMakefileGenerator makeGen, IConfiguration config, HashSet handledInputExtensions, boolean lastChance) { boolean done = true; - Vector myCommandOutputs = new Vector(); - Vector myEnumeratedPrimaryOutputs = new Vector(); - Vector myEnumeratedSecondaryOutputs = new Vector(); - HashMap myOutputMacros = new HashMap(); + Vector myCommandOutputs = new Vector(); + Vector myEnumeratedPrimaryOutputs = new Vector(); + Vector myEnumeratedSecondaryOutputs = new Vector(); + HashMap> myOutputMacros = new HashMap>(); // The next two fields are used together - Vector myBuildVars = new Vector(); - Vector myBuildVarsValues = new Vector(); + Vector myBuildVars = new Vector(); + Vector> myBuildVarsValues = new Vector>(); // Get the outputs for this tool invocation IOutputType[] outTypes = tool.getOutputTypes(); if (outTypes != null && outTypes.length > 0) { for (int i=0; i typeEnumeratedOutputs = new Vector(); IOutputType type = outTypes[i]; String outputPrefix = type.getOutputPrefix(); @@ -530,7 +531,7 @@ public class ManagedBuildGnuToolInfo implements IManagedBuildGnuToolInfo { // 2. If an option is specified, use the value of the option if (option != null) { try { - List outputs = new ArrayList(); + List outputs = new ArrayList(); int optType = option.getValueType(); if (optType == IOption.STRING) { outputs.add(outputPrefix + option.getStringValue()); @@ -542,7 +543,9 @@ public class ManagedBuildGnuToolInfo implements IManagedBuildGnuToolInfo { optType == IOption.LIBRARY_PATHS || optType == IOption.LIBRARY_FILES || optType == IOption.MACRO_FILES) { - outputs = (List)option.getValue(); + @SuppressWarnings("unchecked") + List value = (List)option.getValue(); + outputs = value; tool.filterValues(optType, outputs); // Add outputPrefix to each if necessary if (outputPrefix.length() > 0) { @@ -552,7 +555,7 @@ public class ManagedBuildGnuToolInfo implements IManagedBuildGnuToolInfo { } } for (int j=0; j 0) { - List outputPaths = new ArrayList(); + List outputPaths = new ArrayList(); for (int j=0; j currList = myOutputMacros.get(variable); currList.addAll(outputPaths); myOutputMacros.put(variable, currList); } else { @@ -592,10 +595,10 @@ public class ManagedBuildGnuToolInfo implements IManagedBuildGnuToolInfo { if (!inputsCalculated) { done = false; } else { - Vector inputs = getEnumeratedInputs(); + Vector inputs = getEnumeratedInputs(); IPath[] inputPaths = new IPath[inputs.size()]; for (int j=0; j 0 && outNames != null) { if (myOutputMacros.containsKey(variable)) { - List currList = (List)myOutputMacros.get(variable); + List currList = myOutputMacros.get(variable); currList.addAll(Arrays.asList(outNames)); myOutputMacros.put(variable, currList); } else { - myOutputMacros.put(variable, new ArrayList(Arrays.asList(outNames))); + myOutputMacros.put(variable, new ArrayList(Arrays.asList(outNames))); } } } else @@ -651,18 +654,18 @@ public class ManagedBuildGnuToolInfo implements IManagedBuildGnuToolInfo { } catch (BuildMacroException e){ } } - List namesList = Arrays.asList(outputNames); + List namesList = Arrays.asList(outputNames); if (primaryOutput) { myCommandOutputs.addAll(namesList); } typeEnumeratedOutputs.addAll(namesList); if (variable.length() > 0) { - List outputPaths = new ArrayList(); + List outputPaths = new ArrayList(); for (int j=0; j currList = myOutputMacros.get(variable); currList.addAll(outputPaths); myOutputMacros.put(variable, currList); } else { @@ -676,9 +679,9 @@ public class ManagedBuildGnuToolInfo implements IManagedBuildGnuToolInfo { // using the built-in string substitution functions of make. if (multOfType) { // This case is not handled - a nameProvider or outputNames must be specified - List errList = new ArrayList(); + List errList = new ArrayList(); errList.add(ManagedMakeMessages.getResourceString("MakefileGenerator.error.no.nameprovider")); //$NON-NLS-1$ - myCommandOutputs.add(errList); + myCommandOutputs.addAll(errList); } else { String namePattern = type.getNamePattern(); if (namePattern == null || namePattern.length() == 0) { @@ -697,11 +700,11 @@ public class ManagedBuildGnuToolInfo implements IManagedBuildGnuToolInfo { if (!inputsCalculated) { done = false; } else { - Vector inputs = getEnumeratedInputs(); + Vector inputs = getEnumeratedInputs(); String fileName; if (inputs.size() > 0) { // Get the input file name - fileName = (Path.fromOSString((String)inputs.get(0))).removeFileExtension().lastSegment(); + fileName = (Path.fromOSString(inputs.get(0))).removeFileExtension().lastSegment(); // Check if this is a build macro. If so, use the raw macro name. if (fileName.startsWith("$(") && fileName.endsWith(")")) { //$NON-NLS-1$ //$NON-NLS-2$ fileName = fileName.substring(2,fileName.length()-1); @@ -715,10 +718,10 @@ public class ManagedBuildGnuToolInfo implements IManagedBuildGnuToolInfo { } typeEnumeratedOutputs.add(namePattern.replaceAll("%", fileName)); //$NON-NLS-1$ if (variable.length() > 0) { - List outputs = new ArrayList(); + List outputs = new ArrayList(); outputs.add(Path.fromOSString(fileName)); if (myOutputMacros.containsKey(variable)) { - List currList = (List)myOutputMacros.get(variable); + List currList = myOutputMacros.get(variable); currList.addAll(outputs); myOutputMacros.put(variable, currList); } else { @@ -756,14 +759,13 @@ public class ManagedBuildGnuToolInfo implements IManagedBuildGnuToolInfo { } // Add the output macros of this tool to the buildOutVars map - Iterator iterator = myOutputMacros.entrySet().iterator(); - while (iterator.hasNext()) { - Map.Entry entry = (Map.Entry)iterator.next(); - String macroName = (String)entry.getKey(); - List newMacroValue = (List)entry.getValue(); - HashMap map = makeGen.getBuildOutputVars(); + Set>> entrySet = myOutputMacros.entrySet(); + for (Entry> entry : entrySet) { + String macroName = entry.getKey(); + List newMacroValue = entry.getValue(); + HashMap> map = makeGen.getBuildOutputVars(); if (map.containsKey(macroName)) { - List macroValue = (List)map.get(macroName); + List macroValue = map.get(macroName); macroValue.addAll(newMacroValue); map.put(macroName, macroValue); } else { @@ -779,7 +781,7 @@ public class ManagedBuildGnuToolInfo implements IManagedBuildGnuToolInfo { outputVariables.addAll(myOutputMacros.keySet()); outputsCalculated = true; for (int i=0; i handledInputExtensions, + IManagedDependencyGeneratorType depGen, String[] extensionsList, Vector myCommandDependencies, HashMap> myOutputMacros, + Vector myAdditionalTargets, ToolInfoHolder h, boolean done) { int calcType = depGen.getCalculatorType(); switch (calcType) { @@ -811,11 +813,11 @@ public class ManagedBuildGnuToolInfo implements IManagedBuildGnuToolInfo { String depsMacroEntry = calculateSourceMacro(makeGen, extensionName, depExt, IManagedBuilderMakefileGenerator.WILDCARD); - List depsList = new ArrayList(); + List depsList = new ArrayList(); depsList.add(Path.fromOSString(depsMacroEntry)); String depsMacro = makeGen.getDepMacroName(extensionName).toString(); if (myOutputMacros.containsKey(depsMacro)) { - List currList = (List)myOutputMacros.get(depsMacro); + List currList = myOutputMacros.get(depsMacro); currList.addAll(depsList); myOutputMacros.put(depsMacro, currList); } else { @@ -832,7 +834,7 @@ public class ManagedBuildGnuToolInfo implements IManagedBuildGnuToolInfo { if (!inputsCalculated) { done = false; } else { - Vector inputs = getEnumeratedInputs(); + Vector inputs = getEnumeratedInputs(); if (calcType == IManagedDependencyGeneratorType.TYPE_CUSTOM) { IManagedDependencyGenerator2 depGen2 = (IManagedDependencyGenerator2)depGen; @@ -840,7 +842,7 @@ public class ManagedBuildGnuToolInfo implements IManagedBuildGnuToolInfo { for (int i=0; i handledInputExtensions, ToolInfoHolder h, boolean lastChance) { // Get the dependencies for this tool invocation boolean done = true; - Vector myCommandDependencies = new Vector(); - Vector myAdditionalTargets = new Vector(); + Vector myCommandDependencies = new Vector(); + Vector myAdditionalTargets = new Vector(); //Vector myEnumeratedDependencies = new Vector(); - HashMap myOutputMacros = new HashMap(); + HashMap> myOutputMacros = new HashMap>(); IInputType[] inTypes = tool.getInputTypes(); if (inTypes != null && inTypes.length > 0) { @@ -965,14 +966,13 @@ public class ManagedBuildGnuToolInfo implements IManagedBuildGnuToolInfo { } // Add the output macros of this tool to the buildOutVars map - Iterator iterator = myOutputMacros.entrySet().iterator(); - while (iterator.hasNext()) { - Map.Entry entry = (Map.Entry)iterator.next(); - String macroName = (String)entry.getKey(); - List newMacroValue = (List)entry.getValue(); - HashMap map = makeGen.getBuildOutputVars(); + Set>> entrySet = myOutputMacros.entrySet(); + for (Entry> entry : entrySet) { + String macroName = entry.getKey(); + List newMacroValue = entry.getValue(); + HashMap> map = makeGen.getBuildOutputVars(); if (map.containsKey(macroName)) { - List macroValue = (List)map.get(macroName); + List macroValue = map.get(macroName); macroValue.addAll(newMacroValue); map.put(macroName, macroValue); } else { @@ -1008,7 +1008,7 @@ public class ManagedBuildGnuToolInfo implements IManagedBuildGnuToolInfo { // OBJS = $(macroName1: ../%.input1=%.output1) ... $(macroNameN: ../%.inputN=%.outputN) StringBuffer objectsBuffer = new StringBuffer(); objectsBuffer.append(IManagedBuilderMakefileGenerator.WHITESPACE + "$(" + macroName + //$NON-NLS-1$ - IManagedBuilderMakefileGenerator.COLON + IManagedBuilderMakefileGenerator.ROOT + //$NON-NLS-1$ + IManagedBuilderMakefileGenerator.COLON + IManagedBuilderMakefileGenerator.ROOT + IManagedBuilderMakefileGenerator.SEPARATOR + IManagedBuilderMakefileGenerator.WILDCARD + DOT + srcExtensionName + "=" + wildcard + OptDotExt + ")" ); //$NON-NLS-1$ //$NON-NLS-2$ return objectsBuffer.toString();