[Sunxacml-commit] sunxacml/com/sun/xacml/cond Apply.java,1.5,1.6 ComparisonFunction.java,1.1.1.1,1.2 EqualFunction.java,1.1.1.1,1.2

[<se...@us...>]

Update of /cvsroot/sunxacml/sunxacml/com/sun/xacml/cond
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31765/com/sun/xacml/cond

Modified Files:
	Apply.java ComparisonFunction.java EqualFunction.java 
Log Message:
updated to use new factory interfaces


Index: Apply.java
===================================================================
RCS file: /cvsroot/sunxacml/sunxacml/com/sun/xacml/cond/Apply.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** Apply.java	29 Aug 2003 18:58:33 -0000	1.5
--- Apply.java	13 Feb 2004 17:55:32 -0000	1.6
***************
*** 1,7 ****
  
  /*
!  * @(#)Apply.java	1.9 01/30/03
   *
!  * Copyright 2003 Sun Microsystems, Inc. All Rights Reserved.
   *
   * Redistribution and use in source and binary forms, with or without
--- 1,7 ----
  
  /*
!  * @(#)Apply.java
   *
!  * Copyright 2003-2004 Sun Microsystems, Inc. All Rights Reserved.
   *
   * Redistribution and use in source and binary forms, with or without
***************
*** 186,189 ****
--- 186,191 ----
          List evals = new ArrayList();
          
+         AttributeFactory attrFactory = AttributeFactory.getInstance();
+ 
          NodeList nodes = root.getChildNodes();
          for (int i = 0; i < nodes.getLength(); i++) {
***************
*** 195,199 ****
              } else if (name.equals("AttributeValue")) {
                  try {
!                     evals.add(AttributeFactory.createAttribute(node));
                  } catch (UnknownIdentifierException uie) {
                      throw new ParsingException("Unknown DataType", uie);
--- 197,201 ----
              } else if (name.equals("AttributeValue")) {
                  try {
!                     evals.add(attrFactory.createValue(node));
                  } catch (UnknownIdentifierException uie) {
                      throw new ParsingException("Unknown DataType", uie);

Index: ComparisonFunction.java
===================================================================
RCS file: /cvsroot/sunxacml/sunxacml/com/sun/xacml/cond/ComparisonFunction.java,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** ComparisonFunction.java	13 Feb 2003 22:19:10 -0000	1.1.1.1
--- ComparisonFunction.java	13 Feb 2004 17:55:32 -0000	1.2
***************
*** 1,7 ****
  
  /*
!  * @(#)ComparisonFunction.java	1.7 01/30/03
   *
!  * Copyright 2003 Sun Microsystems, Inc. All Rights Reserved.
   *
   * Redistribution and use in source and binary forms, with or without
--- 1,7 ----
  
  /*
!  * @(#)ComparisonFunction.java
   *
!  * Copyright 2003-2004 Sun Microsystems, Inc. All Rights Reserved.
   *
   * Redistribution and use in source and binary forms, with or without
***************
*** 39,43 ****
  import com.sun.xacml.EvaluationCtx;
  
- import com.sun.xacml.attr.AttributeFactory;
  import com.sun.xacml.attr.AttributeValue;
  import com.sun.xacml.attr.BooleanAttribute;
--- 39,42 ----

Index: EqualFunction.java
===================================================================
RCS file: /cvsroot/sunxacml/sunxacml/com/sun/xacml/cond/EqualFunction.java,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** EqualFunction.java	13 Feb 2003 22:19:10 -0000	1.1.1.1
--- EqualFunction.java	13 Feb 2004 17:55:32 -0000	1.2
***************
*** 1,7 ****
  
  /*
!  * @(#)EqualFunction.java	1.20 01/30/03
   *
!  * Copyright 2003 Sun Microsystems, Inc. All Rights Reserved.
   *
   * Redistribution and use in source and binary forms, with or without
--- 1,7 ----
  
  /*
!  * @(#)EqualFunction.java
   *
!  * Copyright 2003-2004 Sun Microsystems, Inc. All Rights Reserved.
   *
   * Redistribution and use in source and binary forms, with or without
***************
*** 40,44 ****
  
  import com.sun.xacml.attr.AnyURIAttribute;
- import com.sun.xacml.attr.AttributeFactory;
  import com.sun.xacml.attr.AttributeValue;
  import com.sun.xacml.attr.Base64BinaryAttribute;
--- 40,43 ----