From bc1f29a4fd369cf69acc7bb1f48909615d2a8e31 Mon Sep 17 00:00:00 2001 From: Andrew Gvozdev Date: Fri, 17 Sep 2010 22:10:57 +0000 Subject: [PATCH] bug 319512: Missing type arguments on managedbuilder.core --- ...leanExpressionApplicabilityCalculator.java | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/BooleanExpressionApplicabilityCalculator.java b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/BooleanExpressionApplicabilityCalculator.java index 6208b03e2c2..a4b3c0369fc 100644 --- a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/BooleanExpressionApplicabilityCalculator.java +++ b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/BooleanExpressionApplicabilityCalculator.java @@ -33,7 +33,7 @@ import org.eclipse.cdt.managedbuilder.internal.enablement.OptionEnablementExpres public class BooleanExpressionApplicabilityCalculator implements IOptionApplicability { private OptionEnablementExpression fExpressions[]; - private Map fRefPropsMap; + private Map> fRefPropsMap; public BooleanExpressionApplicabilityCalculator(IManagedConfigElement optionElement){ this(optionElement.getChildren(OptionEnablementExpression.NAME)); @@ -195,9 +195,9 @@ public class BooleanExpressionApplicabilityCalculator implements IOptionApplicab return adjusted; } - private Map getReferencedProperties(){ + private Map> getReferencedProperties(){ if(fRefPropsMap == null){ - fRefPropsMap = new HashMap(); + fRefPropsMap = new HashMap>(); for(int i = 0; i < fExpressions.length; i++){ fExpressions[i].getReferencedProperties(fRefPropsMap); @@ -207,28 +207,28 @@ public class BooleanExpressionApplicabilityCalculator implements IOptionApplicab } public boolean referesProperty(String id){ - Map map = getReferencedProperties(); + Map> map = getReferencedProperties(); return map.containsKey(id); } public boolean referesPropertyValue(String propertyId, String valueId){ - Map map = getReferencedProperties(); - Set set = (Set)map.get(propertyId); + Map> map = getReferencedProperties(); + Set set = map.get(propertyId); if(set != null) return set.contains(valueId); return false; } public String[] getReferencedPropertyIds(){ - Map map = getReferencedProperties(); - return (String[])map.keySet().toArray(new String[map.size()]); + Map> map = getReferencedProperties(); + return map.keySet().toArray(new String[map.size()]); } public String[] getReferencedValueIds(String propertyId){ - Map map = getReferencedProperties(); - Set set = (Set)map.get(propertyId); - return (String[])set.toArray(new String[set.size()]); + Map> map = getReferencedProperties(); + Set set = map.get(propertyId); + return set.toArray(new String[set.size()]); } }