Update of /cvsroot/sunxacml/sunxacml/com/sun/xacml/cond/cluster In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8671/com/sun/xacml/cond/cluster Modified Files: AbsFunctionCluster.java AddFunctionCluster.java ComparisonFunctionCluster.java ConditionBagFunctionCluster.java ConditionSetFunctionCluster.java DateMathFunctionCluster.java DivideFunctionCluster.java EqualFunctionCluster.java FloorFunctionCluster.java GeneralBagFunctionCluster.java GeneralSetFunctionCluster.java HigherOrderFunctionCluster.java LogicalFunctionCluster.java MatchFunctionCluster.java ModFunctionCluster.java MultiplyFunctionCluster.java NOfFunctionCluster.java NotFunctionCluster.java NumericConvertFunctionCluster.java RoundFunctionCluster.java StringNormalizeFunctionCluster.java SubtractFunctionCluster.java Log Message: functions report supported identifiers and clusters use these sets Index: MatchFunctionCluster.java =================================================================== RCS file: /cvsroot/sunxacml/sunxacml/com/sun/xacml/cond/cluster/MatchFunctionCluster.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** MatchFunctionCluster.java 17 Mar 2004 18:03:39 -0000 1.2 --- MatchFunctionCluster.java 18 Mar 2004 21:13:09 -0000 1.3 *************** *** 40,43 **** --- 40,44 ---- import java.util.HashSet; + import java.util.Iterator; import java.util.Set; *************** *** 54,61 **** public Set getSupportedFunctions() { Set set = new HashSet(); ! set.add(new MatchFunction(MatchFunction.NAME_REGEXP_STRING_MATCH)); ! set.add(new MatchFunction(MatchFunction.NAME_X500NAME_MATCH)); ! set.add(new MatchFunction(MatchFunction.NAME_RFC822NAME_MATCH)); return set; --- 55,62 ---- public Set getSupportedFunctions() { Set set = new HashSet(); + Iterator it = MatchFunction.getSupportedIdentifiers().iterator(); ! while (it.hasNext()) ! set.add(new MatchFunction((String)(it.next()))); return set; Index: DivideFunctionCluster.java =================================================================== RCS file: /cvsroot/sunxacml/sunxacml/com/sun/xacml/cond/cluster/DivideFunctionCluster.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** DivideFunctionCluster.java 17 Mar 2004 18:03:39 -0000 1.2 --- DivideFunctionCluster.java 18 Mar 2004 21:13:09 -0000 1.3 *************** *** 40,43 **** --- 40,44 ---- import java.util.HashSet; + import java.util.Iterator; import java.util.Set; *************** *** 54,60 **** public Set getSupportedFunctions() { Set set = new HashSet(); ! ! set.add(new DivideFunction(DivideFunction.NAME_INTEGER_DIVIDE)); ! set.add(new DivideFunction(DivideFunction.NAME_DOUBLE_DIVIDE)); return set; --- 55,62 ---- public Set getSupportedFunctions() { Set set = new HashSet(); ! Iterator it = DivideFunction.getSupportedIdentifiers().iterator(); ! ! while (it.hasNext()) ! set.add(new DivideFunction((String)(it.next()))); return set; Index: NOfFunctionCluster.java =================================================================== RCS file: /cvsroot/sunxacml/sunxacml/com/sun/xacml/cond/cluster/NOfFunctionCluster.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** NOfFunctionCluster.java 17 Mar 2004 18:03:39 -0000 1.2 --- NOfFunctionCluster.java 18 Mar 2004 21:13:09 -0000 1.3 *************** *** 40,43 **** --- 40,44 ---- import java.util.HashSet; + import java.util.Iterator; import java.util.Set; *************** *** 54,59 **** public Set getSupportedFunctions() { Set set = new HashSet(); ! set.add(new NOfFunction(NOfFunction.NAME_N_OF)); return set; --- 55,62 ---- public Set getSupportedFunctions() { Set set = new HashSet(); + Iterator it = NOfFunction.getSupportedIdentifiers().iterator(); ! while (it.hasNext()) ! set.add(new NOfFunction((String)(it.next()))); return set; Index: AddFunctionCluster.java =================================================================== RCS file: /cvsroot/sunxacml/sunxacml/com/sun/xacml/cond/cluster/AddFunctionCluster.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** AddFunctionCluster.java 17 Mar 2004 18:03:39 -0000 1.2 --- AddFunctionCluster.java 18 Mar 2004 21:13:09 -0000 1.3 *************** *** 40,43 **** --- 40,44 ---- import java.util.HashSet; + import java.util.Iterator; import java.util.Set; *************** *** 54,60 **** public Set getSupportedFunctions() { Set set = new HashSet(); ! ! set.add(new AddFunction(AddFunction.NAME_INTEGER_ADD)); ! set.add(new AddFunction(AddFunction.NAME_DOUBLE_ADD)); return set; --- 55,62 ---- public Set getSupportedFunctions() { Set set = new HashSet(); ! Iterator it = AddFunction.getSupportedIdentifiers().iterator(); ! ! while (it.hasNext()) ! set.add(new AddFunction((String)(it.next()))); return set; Index: EqualFunctionCluster.java =================================================================== RCS file: /cvsroot/sunxacml/sunxacml/com/sun/xacml/cond/cluster/EqualFunctionCluster.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** EqualFunctionCluster.java 17 Mar 2004 18:03:39 -0000 1.2 --- EqualFunctionCluster.java 18 Mar 2004 21:13:09 -0000 1.3 *************** *** 40,43 **** --- 40,44 ---- import java.util.HashSet; + import java.util.Iterator; import java.util.Set; *************** *** 54,73 **** public Set getSupportedFunctions() { Set set = new HashSet(); ! set.add(new EqualFunction(EqualFunction.NAME_STRING_EQUAL)); ! set.add(new EqualFunction(EqualFunction.NAME_BOOLEAN_EQUAL)); ! set.add(new EqualFunction(EqualFunction.NAME_INTEGER_EQUAL)); ! set.add(new EqualFunction(EqualFunction.NAME_DOUBLE_EQUAL)); ! set.add(new EqualFunction(EqualFunction.NAME_DATE_EQUAL)); ! set.add(new EqualFunction(EqualFunction.NAME_TIME_EQUAL)); ! set.add(new EqualFunction(EqualFunction.NAME_DATETIME_EQUAL)); ! set.add(new EqualFunction(EqualFunction.NAME_DAYTIME_DURATION_EQUAL)); ! set.add(new EqualFunction(EqualFunction. ! NAME_YEARMONTH_DURATION_EQUAL)); ! set.add(new EqualFunction(EqualFunction.NAME_ANYURI_EQUAL)); ! set.add(new EqualFunction(EqualFunction.NAME_X500NAME_EQUAL)); ! set.add(new EqualFunction(EqualFunction.NAME_RFC822NAME_EQUAL)); ! set.add(new EqualFunction(EqualFunction.NAME_HEXBINARY_EQUAL)); ! set.add(new EqualFunction(EqualFunction.NAME_BASE64BINARY_EQUAL)); return set; --- 55,62 ---- public Set getSupportedFunctions() { Set set = new HashSet(); + Iterator it = EqualFunction.getSupportedIdentifiers().iterator(); ! while (it.hasNext()) ! set.add(new EqualFunction((String)(it.next()))); return set; Index: MultiplyFunctionCluster.java =================================================================== RCS file: /cvsroot/sunxacml/sunxacml/com/sun/xacml/cond/cluster/MultiplyFunctionCluster.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** MultiplyFunctionCluster.java 17 Mar 2004 18:03:39 -0000 1.2 --- MultiplyFunctionCluster.java 18 Mar 2004 21:13:09 -0000 1.3 *************** *** 40,43 **** --- 40,44 ---- import java.util.HashSet; + import java.util.Iterator; import java.util.Set; *************** *** 54,60 **** public Set getSupportedFunctions() { Set set = new HashSet(); ! set.add(new MultiplyFunction(MultiplyFunction.NAME_INTEGER_MULTIPLY)); ! set.add(new MultiplyFunction(MultiplyFunction.NAME_DOUBLE_MULTIPLY)); return set; --- 55,62 ---- public Set getSupportedFunctions() { Set set = new HashSet(); + Iterator it = MultiplyFunction.getSupportedIdentifiers().iterator(); ! while (it.hasNext()) ! set.add(new MultiplyFunction((String)(it.next()))); return set; Index: GeneralSetFunctionCluster.java =================================================================== RCS file: /cvsroot/sunxacml/sunxacml/com/sun/xacml/cond/cluster/GeneralSetFunctionCluster.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** GeneralSetFunctionCluster.java 17 Mar 2004 18:03:39 -0000 1.2 --- GeneralSetFunctionCluster.java 18 Mar 2004 21:13:09 -0000 1.3 *************** *** 41,44 **** --- 41,45 ---- import java.util.HashSet; + import java.util.Iterator; import java.util.Set; *************** *** 53,78 **** { - /** - * A complete list of all the XACML datatypes supported by the Set - * functions, using the "simple" form of the names (eg, string - * instead of http://www.w3.org/2001/XMLSchema#string) - */ - private static String simpleTypes [] = { - "string", "boolean", "integer", "double", "date", "dateTime", - "time", "anyURI", "hexBinary", "base64Binary", "dayTimeDuration", - "yearMonthDuration", "x500Name", "rfc822Name" - }; - public Set getSupportedFunctions() { Set set = new HashSet(); ! for (int i = 0; i < simpleTypes.length; i++) { ! String baseName = FunctionBase.FUNCTION_NS + simpleTypes[i]; ! ! set.add(new GeneralSetFunction(baseName + GeneralSetFunction. ! NAME_BASE_INTERSECTION)); ! set.add(new GeneralSetFunction(baseName + GeneralSetFunction. ! NAME_BASE_UNION)); ! } return set; --- 54,63 ---- { public Set getSupportedFunctions() { Set set = new HashSet(); + Iterator it = GeneralSetFunction.getSupportedIdentifiers().iterator(); ! while (it.hasNext()) ! set.add(new GeneralSetFunction((String)(it.next()))); return set; Index: StringNormalizeFunctionCluster.java =================================================================== RCS file: /cvsroot/sunxacml/sunxacml/com/sun/xacml/cond/cluster/StringNormalizeFunctionCluster.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** StringNormalizeFunctionCluster.java 17 Mar 2004 18:03:39 -0000 1.2 --- StringNormalizeFunctionCluster.java 18 Mar 2004 21:13:09 -0000 1.3 *************** *** 40,43 **** --- 40,44 ---- import java.util.HashSet; + import java.util.Iterator; import java.util.Set; *************** *** 55,64 **** public Set getSupportedFunctions() { Set set = new HashSet(); ! ! set.add(new StringNormalizeFunction(StringNormalizeFunction. ! NAME_STRING_NORMALIZE_SPACE)); ! set.add(new ! StringNormalizeFunction(StringNormalizeFunction. ! NAME_STRING_NORMALIZE_TO_LOWER_CASE)); return set; --- 56,64 ---- public Set getSupportedFunctions() { Set set = new HashSet(); ! Iterator it = StringNormalizeFunction.getSupportedIdentifiers(). ! iterator(); ! ! while (it.hasNext()) ! set.add(new StringNormalizeFunction((String)(it.next()))); return set; Index: RoundFunctionCluster.java =================================================================== RCS file: /cvsroot/sunxacml/sunxacml/com/sun/xacml/cond/cluster/RoundFunctionCluster.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** RoundFunctionCluster.java 17 Mar 2004 18:03:39 -0000 1.2 --- RoundFunctionCluster.java 18 Mar 2004 21:13:09 -0000 1.3 *************** *** 40,43 **** --- 40,44 ---- import java.util.HashSet; + import java.util.Iterator; import java.util.Set; *************** *** 54,59 **** public Set getSupportedFunctions() { Set set = new HashSet(); ! set.add(new RoundFunction(RoundFunction.NAME_ROUND)); return set; --- 55,62 ---- public Set getSupportedFunctions() { Set set = new HashSet(); + Iterator it = RoundFunction.getSupportedIdentifiers().iterator(); ! while (it.hasNext()) ! set.add(new RoundFunction((String)(it.next()))); return set; Index: ConditionBagFunctionCluster.java =================================================================== RCS file: /cvsroot/sunxacml/sunxacml/com/sun/xacml/cond/cluster/ConditionBagFunctionCluster.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** ConditionBagFunctionCluster.java 17 Mar 2004 18:03:39 -0000 1.2 --- ConditionBagFunctionCluster.java 18 Mar 2004 21:13:09 -0000 1.3 *************** *** 41,44 **** --- 41,45 ---- import java.util.HashSet; + import java.util.Iterator; import java.util.Set; *************** *** 53,76 **** { - /** - * A complete list of all the XACML datatypes supported by the Set - * functions, using the "simple" form of the names (eg, string - * instead of http://www.w3.org/2001/XMLSchema#string) - */ - private static String simpleTypes [] = { - "string", "boolean", "integer", "double", "date", "dateTime", - "time", "anyURI", "hexBinary", "base64Binary", "dayTimeDuration", - "yearMonthDuration", "x500Name", "rfc822Name" - }; - public Set getSupportedFunctions() { Set set = new HashSet(); ! for (int i = 0; i < simpleTypes.length; i++) { ! set.add(new ConditionBagFunction(FunctionBase.FUNCTION_NS + ! simpleTypes[i] + ! ConditionBagFunction. ! NAME_BASE_IS_IN)); ! } return set; --- 54,64 ---- { public Set getSupportedFunctions() { Set set = new HashSet(); + Iterator it = ConditionBagFunction.getSupportedIdentifiers(). + iterator(); ! while (it.hasNext()) ! set.add(new ConditionBagFunction((String)(it.next()))); return set; Index: ConditionSetFunctionCluster.java =================================================================== RCS file: /cvsroot/sunxacml/sunxacml/com/sun/xacml/cond/cluster/ConditionSetFunctionCluster.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** ConditionSetFunctionCluster.java 17 Mar 2004 18:03:39 -0000 1.2 --- ConditionSetFunctionCluster.java 18 Mar 2004 21:13:09 -0000 1.3 *************** *** 41,44 **** --- 41,45 ---- import java.util.HashSet; + import java.util.Iterator; import java.util.Set; *************** *** 53,80 **** { - /** - * A complete list of all the XACML datatypes supported by the Set - * functions, using the "simple" form of the names (eg, string - * instead of http://www.w3.org/2001/XMLSchema#string) - */ - private static String simpleTypes [] = { - "string", "boolean", "integer", "double", "date", "dateTime", - "time", "anyURI", "hexBinary", "base64Binary", "dayTimeDuration", - "yearMonthDuration", "x500Name", "rfc822Name" - }; - public Set getSupportedFunctions() { Set set = new HashSet(); ! for (int i = 0; i < simpleTypes.length; i++) { ! String baseName = FunctionBase.FUNCTION_NS + simpleTypes[i]; ! ! set.add(new ConditionSetFunction(baseName + ConditionSetFunction. ! NAME_BASE_AT_LEAST_ONE_MEMBER_OF)); ! set.add(new ConditionSetFunction(baseName + ConditionSetFunction. ! NAME_BASE_SUBSET)); ! set.add(new ConditionSetFunction(baseName + ConditionSetFunction. ! NAME_BASE_SET_EQUALS)); ! } return set; --- 54,64 ---- { public Set getSupportedFunctions() { Set set = new HashSet(); + Iterator it = ConditionSetFunction.getSupportedIdentifiers(). + iterator(); ! while (it.hasNext()) ! set.add(new ConditionSetFunction((String)(it.next()))); return set; Index: LogicalFunctionCluster.java =================================================================== RCS file: /cvsroot/sunxacml/sunxacml/com/sun/xacml/cond/cluster/LogicalFunctionCluster.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** LogicalFunctionCluster.java 17 Mar 2004 18:03:39 -0000 1.2 --- LogicalFunctionCluster.java 18 Mar 2004 21:13:09 -0000 1.3 *************** *** 40,43 **** --- 40,44 ---- import java.util.HashSet; + import java.util.Iterator; import java.util.Set; *************** *** 54,60 **** public Set getSupportedFunctions() { Set set = new HashSet(); ! ! set.add(new LogicalFunction(LogicalFunction.NAME_OR)); ! set.add(new LogicalFunction(LogicalFunction.NAME_AND)); return set; --- 55,62 ---- public Set getSupportedFunctions() { Set set = new HashSet(); ! Iterator it = LogicalFunction.getSupportedIdentifiers().iterator(); ! ! while (it.hasNext()) ! set.add(new LogicalFunction((String)(it.next()))); return set; Index: SubtractFunctionCluster.java =================================================================== RCS file: /cvsroot/sunxacml/sunxacml/com/sun/xacml/cond/cluster/SubtractFunctionCluster.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** SubtractFunctionCluster.java 17 Mar 2004 18:03:39 -0000 1.2 --- SubtractFunctionCluster.java 18 Mar 2004 21:13:09 -0000 1.3 *************** *** 40,43 **** --- 40,44 ---- import java.util.HashSet; + import java.util.Iterator; import java.util.Set; *************** *** 54,60 **** public Set getSupportedFunctions() { Set set = new HashSet(); ! set.add(new SubtractFunction(SubtractFunction.NAME_INTEGER_SUBTRACT)); ! set.add(new SubtractFunction(SubtractFunction.NAME_DOUBLE_SUBTRACT)); return set; --- 55,62 ---- public Set getSupportedFunctions() { Set set = new HashSet(); + Iterator it = SubtractFunction.getSupportedIdentifiers().iterator(); ! while (it.hasNext()) ! set.add(new SubtractFunction((String)(it.next()))); return set; Index: NotFunctionCluster.java =================================================================== RCS file: /cvsroot/sunxacml/sunxacml/com/sun/xacml/cond/cluster/NotFunctionCluster.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** NotFunctionCluster.java 17 Mar 2004 18:03:39 -0000 1.2 --- NotFunctionCluster.java 18 Mar 2004 21:13:09 -0000 1.3 *************** *** 40,43 **** --- 40,44 ---- import java.util.HashSet; + import java.util.Iterator; import java.util.Set; *************** *** 54,59 **** public Set getSupportedFunctions() { Set set = new HashSet(); ! set.add(new NotFunction(NotFunction.NAME_NOT)); return set; --- 55,62 ---- public Set getSupportedFunctions() { Set set = new HashSet(); + Iterator it = NotFunction.getSupportedIdentifiers().iterator(); ! while (it.hasNext()) ! set.add(new NotFunction((String)(it.next()))); return set; Index: DateMathFunctionCluster.java =================================================================== RCS file: /cvsroot/sunxacml/sunxacml/com/sun/xacml/cond/cluster/DateMathFunctionCluster.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** DateMathFunctionCluster.java 17 Mar 2004 18:03:39 -0000 1.2 --- DateMathFunctionCluster.java 18 Mar 2004 21:13:09 -0000 1.3 *************** *** 40,43 **** --- 40,44 ---- import java.util.HashSet; + import java.util.Iterator; import java.util.Set; *************** *** 54,71 **** public Set getSupportedFunctions() { Set set = new HashSet(); ! ! set.add(new DateMathFunction(DateMathFunction. ! NAME_DATETIME_ADD_DAYTIMEDURATION)); ! set.add(new DateMathFunction(DateMathFunction. ! NAME_DATETIME_SUBTRACT_DAYTIMEDURATION)); ! set.add(new DateMathFunction(DateMathFunction. ! NAME_DATETIME_ADD_YEARMONTHDURATION)); ! set.add(new ! DateMathFunction(DateMathFunction. ! NAME_DATETIME_SUBTRACT_YEARMONTHDURATION)); ! set.add(new DateMathFunction(DateMathFunction. ! NAME_DATE_ADD_YEARMONTHDURATION)); ! set.add(new DateMathFunction(DateMathFunction. ! NAME_DATE_SUBTRACT_YEARMONTHDURATION)); return set; --- 55,62 ---- public Set getSupportedFunctions() { Set set = new HashSet(); ! Iterator it = DateMathFunction.getSupportedIdentifiers().iterator(); ! ! while (it.hasNext()) ! set.add(new DateMathFunction((String)(it.next()))); return set; Index: ModFunctionCluster.java =================================================================== RCS file: /cvsroot/sunxacml/sunxacml/com/sun/xacml/cond/cluster/ModFunctionCluster.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** ModFunctionCluster.java 17 Mar 2004 18:03:39 -0000 1.2 --- ModFunctionCluster.java 18 Mar 2004 21:13:09 -0000 1.3 *************** *** 40,43 **** --- 40,44 ---- import java.util.HashSet; + import java.util.Iterator; import java.util.Set; *************** *** 54,59 **** public Set getSupportedFunctions() { Set set = new HashSet(); ! set.add(new ModFunction(ModFunction.NAME_INTEGER_MOD)); return set; --- 55,62 ---- public Set getSupportedFunctions() { Set set = new HashSet(); + Iterator it = ModFunction.getSupportedIdentifiers().iterator(); ! while (it.hasNext()) ! set.add(new ModFunction((String)(it.next()))); return set; Index: HigherOrderFunctionCluster.java =================================================================== RCS file: /cvsroot/sunxacml/sunxacml/com/sun/xacml/cond/cluster/HigherOrderFunctionCluster.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** HigherOrderFunctionCluster.java 17 Mar 2004 18:03:39 -0000 1.2 --- HigherOrderFunctionCluster.java 18 Mar 2004 21:13:09 -0000 1.3 *************** *** 40,43 **** --- 40,44 ---- import java.util.HashSet; + import java.util.Iterator; import java.util.Set; *************** *** 54,64 **** public Set getSupportedFunctions() { Set set = new HashSet(); ! set.add(new HigherOrderFunction(HigherOrderFunction.NAME_ANY_OF)); ! set.add(new HigherOrderFunction(HigherOrderFunction.NAME_ALL_OF)); ! set.add(new HigherOrderFunction(HigherOrderFunction.NAME_ANY_OF_ANY)); ! set.add(new HigherOrderFunction(HigherOrderFunction.NAME_ALL_OF_ANY)); ! set.add(new HigherOrderFunction(HigherOrderFunction.NAME_ANY_OF_ALL)); ! set.add(new HigherOrderFunction(HigherOrderFunction.NAME_ALL_OF_ALL)); return set; --- 55,62 ---- public Set getSupportedFunctions() { Set set = new HashSet(); + Iterator it = HigherOrderFunction.getSupportedIdentifiers().iterator(); ! while (it.hasNext()) ! set.add(new HigherOrderFunction((String)(it.next()))); return set; Index: FloorFunctionCluster.java =================================================================== RCS file: /cvsroot/sunxacml/sunxacml/com/sun/xacml/cond/cluster/FloorFunctionCluster.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** FloorFunctionCluster.java 17 Mar 2004 18:03:39 -0000 1.2 --- FloorFunctionCluster.java 18 Mar 2004 21:13:09 -0000 1.3 *************** *** 40,43 **** --- 40,44 ---- import java.util.HashSet; + import java.util.Iterator; import java.util.Set; *************** *** 54,59 **** public Set getSupportedFunctions() { Set set = new HashSet(); ! set.add(new FloorFunction(FloorFunction.NAME_FLOOR)); return set; --- 55,62 ---- public Set getSupportedFunctions() { Set set = new HashSet(); + Iterator it = FloorFunction.getSupportedIdentifiers().iterator(); ! while (it.hasNext()) ! set.add(new FloorFunction((String)(it.next()))); return set; Index: ComparisonFunctionCluster.java =================================================================== RCS file: /cvsroot/sunxacml/sunxacml/com/sun/xacml/cond/cluster/ComparisonFunctionCluster.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** ComparisonFunctionCluster.java 17 Mar 2004 18:03:39 -0000 1.2 --- ComparisonFunctionCluster.java 18 Mar 2004 21:13:09 -0000 1.3 *************** *** 40,43 **** --- 40,44 ---- import java.util.HashSet; + import java.util.Iterator; import java.util.Set; *************** *** 54,106 **** public Set getSupportedFunctions() { Set set = new HashSet(); ! set.add(new ComparisonFunction(ComparisonFunction. ! NAME_INTEGER_GREATER_THAN)); ! set.add(new ComparisonFunction(ComparisonFunction. ! NAME_INTEGER_GREATER_THAN_OR_EQUAL)); ! set.add(new ComparisonFunction(ComparisonFunction. ! NAME_INTEGER_LESS_THAN)); ! set.add(new ComparisonFunction(ComparisonFunction. ! NAME_INTEGER_LESS_THAN_OR_EQUAL)); ! set.add(new ComparisonFunction(ComparisonFunction. ! NAME_DOUBLE_GREATER_THAN)); ! set.add(new ComparisonFunction(ComparisonFunction. ! NAME_DOUBLE_GREATER_THAN_OR_EQUAL)); ! set.add(new ComparisonFunction(ComparisonFunction. ! NAME_DOUBLE_LESS_THAN)); ! set.add(new ComparisonFunction(ComparisonFunction. ! NAME_DOUBLE_LESS_THAN_OR_EQUAL)); ! set.add(new ComparisonFunction(ComparisonFunction. ! NAME_STRING_GREATER_THAN)); ! set.add(new ComparisonFunction(ComparisonFunction. ! NAME_STRING_GREATER_THAN_OR_EQUAL)); ! set.add(new ComparisonFunction(ComparisonFunction. ! NAME_STRING_LESS_THAN)); ! set.add(new ComparisonFunction(ComparisonFunction. ! NAME_STRING_LESS_THAN_OR_EQUAL)); ! set.add(new ComparisonFunction(ComparisonFunction. ! NAME_TIME_GREATER_THAN)); ! set.add(new ComparisonFunction(ComparisonFunction. ! NAME_TIME_GREATER_THAN_OR_EQUAL)); ! set.add(new ComparisonFunction(ComparisonFunction. ! NAME_TIME_LESS_THAN)); ! set.add(new ComparisonFunction(ComparisonFunction. ! NAME_TIME_LESS_THAN_OR_EQUAL)); ! set.add(new ComparisonFunction(ComparisonFunction. ! NAME_DATETIME_GREATER_THAN)); ! set.add(new ComparisonFunction(ComparisonFunction. ! NAME_DATETIME_GREATER_THAN_OR_EQUAL)); ! set.add(new ComparisonFunction(ComparisonFunction. ! NAME_DATETIME_LESS_THAN)); ! set.add(new ComparisonFunction(ComparisonFunction. ! NAME_DATETIME_LESS_THAN_OR_EQUAL)); ! set.add(new ComparisonFunction(ComparisonFunction. ! NAME_DATE_GREATER_THAN)); ! set.add(new ComparisonFunction(ComparisonFunction. ! NAME_DATE_GREATER_THAN_OR_EQUAL)); ! set.add(new ComparisonFunction(ComparisonFunction. ! NAME_DATE_LESS_THAN)); ! set.add(new ComparisonFunction(ComparisonFunction. ! NAME_DATE_LESS_THAN_OR_EQUAL)); return set; --- 55,62 ---- public Set getSupportedFunctions() { Set set = new HashSet(); + Iterator it = ComparisonFunction.getSupportedIdentifiers().iterator(); ! while (it.hasNext()) ! set.add(new ComparisonFunction((String)(it.next()))); return set; Index: NumericConvertFunctionCluster.java =================================================================== RCS file: /cvsroot/sunxacml/sunxacml/com/sun/xacml/cond/cluster/NumericConvertFunctionCluster.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** NumericConvertFunctionCluster.java 17 Mar 2004 18:03:39 -0000 1.2 --- NumericConvertFunctionCluster.java 18 Mar 2004 21:13:09 -0000 1.3 *************** *** 40,43 **** --- 40,44 ---- import java.util.HashSet; + import java.util.Iterator; import java.util.Set; *************** *** 54,62 **** public Set getSupportedFunctions() { Set set = new HashSet(); ! ! set.add(new NumericConvertFunction(NumericConvertFunction. ! NAME_DOUBLE_TO_INTEGER)); ! set.add(new NumericConvertFunction(NumericConvertFunction. ! NAME_INTEGER_TO_DOUBLE)); return set; --- 55,63 ---- public Set getSupportedFunctions() { Set set = new HashSet(); ! Iterator it = NumericConvertFunction.getSupportedIdentifiers(). ! iterator(); ! ! while (it.hasNext()) ! set.add(new NumericConvertFunction((String)(it.next()))); return set; Index: AbsFunctionCluster.java =================================================================== RCS file: /cvsroot/sunxacml/sunxacml/com/sun/xacml/cond/cluster/AbsFunctionCluster.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** AbsFunctionCluster.java 17 Mar 2004 18:03:39 -0000 1.2 --- AbsFunctionCluster.java 18 Mar 2004 21:13:09 -0000 1.3 *************** *** 40,43 **** --- 40,44 ---- import java.util.HashSet; + import java.util.Iterator; import java.util.Set; *************** *** 54,60 **** public Set getSupportedFunctions() { Set set = new HashSet(); ! set.add(new AbsFunction(AbsFunction.NAME_INTEGER_ABS)); ! set.add(new AbsFunction(AbsFunction.NAME_DOUBLE_ABS)); return set; --- 55,62 ---- public Set getSupportedFunctions() { Set set = new HashSet(); + Iterator it = AbsFunction.getSupportedIdentifiers().iterator(); ! while (it.hasNext()) ! set.add(new AbsFunction((String)(it.next()))); return set; Index: GeneralBagFunctionCluster.java =================================================================== RCS file: /cvsroot/sunxacml/sunxacml/com/sun/xacml/cond/cluster/GeneralBagFunctionCluster.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** GeneralBagFunctionCluster.java 17 Mar 2004 18:03:39 -0000 1.2 --- GeneralBagFunctionCluster.java 18 Mar 2004 21:13:09 -0000 1.3 *************** *** 41,44 **** --- 41,45 ---- import java.util.HashSet; + import java.util.Iterator; import java.util.Set; *************** *** 53,80 **** { - /** - * A complete list of all the XACML datatypes supported by the Set - * functions, using the "simple" form of the names (eg, string - * instead of http://www.w3.org/2001/XMLSchema#string) - */ - private static String simpleTypes [] = { - "string", "boolean", "integer", "double", "date", "dateTime", - "time", "anyURI", "hexBinary", "base64Binary", "dayTimeDuration", - "yearMonthDuration", "x500Name", "rfc822Name" - }; - public Set getSupportedFunctions() { Set set = new HashSet(); ! for (int i = 0; i < simpleTypes.length; i++) { ! String baseName = FunctionBase.FUNCTION_NS + simpleTypes[i]; ! ! set.add(new GeneralBagFunction(baseName + GeneralBagFunction. ! NAME_BASE_ONE_AND_ONLY)); ! set.add(new GeneralBagFunction(baseName + GeneralBagFunction. ! NAME_BASE_BAG_SIZE)); ! set.add(new GeneralBagFunction(baseName + GeneralBagFunction. ! NAME_BASE_BAG)); ! } return set; --- 54,63 ---- { public Set getSupportedFunctions() { Set set = new HashSet(); + Iterator it = GeneralBagFunction.getSupportedIdentifiers().iterator(); ! while (it.hasNext()) ! set.add(new GeneralBagFunction((String)(it.next()))); return set; |
