[java-opensaml COMMIT] in /trunk: opensaml-xacml-api/src/main/java/org/opensaml/xacml/policy/VariableDefinitionType.j...

[noreply at shibboleth.net]

Author: rdw
Date: Sun Jul  8 12:03:17 2012
New Revision: 3081

URL: http://svn.shibboleth.net/view/java-opensaml?rev=3081&view=rev
Log:
Add #setExpression method to VariableDefinitionType

Modified:
    trunk/opensaml-xacml-api/src/main/java/org/opensaml/xacml/policy/VariableDefinitionType.java
    trunk/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/VariableDefinitionTypeImpl.java
    trunk/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/VariableDefinitionTypeUnmarshaller.java

Modified: trunk/opensaml-xacml-api/src/main/java/org/opensaml/xacml/policy/VariableDefinitionType.java
URL: http://svn.shibboleth.net/view/java-opensaml/trunk/opensaml-xacml-api/src/main/java/org/opensaml/xacml/policy/VariableDefinitionType.java?rev=3081&r1=3080&r2=3081&view=diff
==============================================================================
--- trunk/opensaml-xacml-api/src/main/java/org/opensaml/xacml/policy/VariableDefinitionType.java (original)
+++ trunk/opensaml-xacml-api/src/main/java/org/opensaml/xacml/policy/VariableDefinitionType.java Sun Jul  8 12:03:17 2012
@@ -48,6 +48,13 @@
      * @return expression for this definition
      */
     public ExpressionType getExpression();
+    
+    /**
+     * Sets the expression for this definition.
+     * 
+     * @param expression what to set.
+     */
+    public void setExpression(ExpressionType expression);
 
     /**
      * Gets the ID of this defined variable.

Modified: trunk/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/VariableDefinitionTypeImpl.java
URL: http://svn.shibboleth.net/view/java-opensaml/trunk/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/VariableDefinitionTypeImpl.java?rev=3081&r1=3080&r2=3081&view=diff
==============================================================================
--- trunk/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/VariableDefinitionTypeImpl.java (original)
+++ trunk/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/VariableDefinitionTypeImpl.java Sun Jul  8 12:03:17 2012
@@ -54,6 +54,11 @@
     }
 
     /** {@inheritDoc} */
+    public void setExpression(ExpressionType newExpression) {
+        expression = prepareForAssignment(expression, newExpression);
+    }
+
+    /** {@inheritDoc} */
     public String getVariableId() {
         return variableId;
     }

Modified: trunk/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/VariableDefinitionTypeUnmarshaller.java
URL: http://svn.shibboleth.net/view/java-opensaml/trunk/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/VariableDefinitionTypeUnmarshaller.java?rev=3081&r1=3080&r2=3081&view=diff
==============================================================================
--- trunk/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/VariableDefinitionTypeUnmarshaller.java (original)
+++ trunk/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/VariableDefinitionTypeUnmarshaller.java Sun Jul  8 12:03:17 2012
@@ -22,7 +22,9 @@
 import org.opensaml.core.xml.XMLObject;
 import org.opensaml.core.xml.io.UnmarshallingException;
 import org.opensaml.xacml.impl.AbstractXACMLObjectUnmarshaller;
+import org.opensaml.xacml.policy.ExpressionType;
 import org.opensaml.xacml.policy.VariableDefinitionType;
+import org.opensaml.xacml.policy.VariableReferenceType;
 import org.w3c.dom.Attr;
 
 /**
@@ -48,4 +50,18 @@
 
     }
     
+    /** {@inheritDoc} */
+    protected void processChildElement(XMLObject parentXMLObject, XMLObject childXMLObject)
+            throws UnmarshallingException {
+        
+        if(childXMLObject instanceof ExpressionType){
+            VariableDefinitionType variableDefinition= (VariableDefinitionType) parentXMLObject;
+            variableDefinition.setExpression((ExpressionType)childXMLObject);
+        } else {
+            super.processChildElement(parentXMLObject, childXMLObject);
+        }
+
+    }
+
+    
 }