[java-opensaml COMMIT] in /trunk/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl: AttributeAssignmen...

[noreply at shibboleth.net]

Author: rdw
Date: Tue Jul 10 13:07:57 2012
New Revision: 3085

URL: http://svn.shibboleth.net/view/java-opensaml?rev=3085&view=rev
Log:
Fix various inheritance issues.  Strip out methods which does nothing but call the super.method(), add comments where methods change the visibilty of parent methods and make classes inherit from the parent classes indicated by the schema (this removing a whole bunch of work for themselves)

Modified:
    trunk/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/AttributeAssignmentTypeImpl.java
    trunk/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/CombinerParametersTypeMarshaller.java
    trunk/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/CombinerParametersTypeUnmarshaller.java
    trunk/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/PolicyCombinerParametersTypeImpl.java
    trunk/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/RuleCombinerParametersTypeImpl.java

Modified: trunk/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/AttributeAssignmentTypeImpl.java
URL: http://svn.shibboleth.net/view/java-opensaml/trunk/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/AttributeAssignmentTypeImpl.java?rev=3085&r1=3084&r2=3085&view=diff
==============================================================================
--- trunk/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/AttributeAssignmentTypeImpl.java (original)
+++ trunk/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/AttributeAssignmentTypeImpl.java Tue Jul 10 13:07:57 2012
@@ -17,11 +17,6 @@
 
 package org.opensaml.xacml.policy.impl;
 
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-
-import org.opensaml.core.xml.XMLObject;
 import org.opensaml.xacml.policy.AttributeAssignmentType;
 
 /** Implementation for {@link AttributeAssignmentType}. */
@@ -51,13 +46,4 @@
         attributeId = prepareForAssignment(this.attributeId, newAttributeID);
     }
 
-    /** {@inheritDoc} */
-    public List<XMLObject> getOrderedChildren() {
-        ArrayList<XMLObject> children = new ArrayList<XMLObject>();
-
-        if (!super.getOrderedChildren().isEmpty()) {
-            children.addAll(super.getOrderedChildren());
-        }
-        return Collections.unmodifiableList(children);
-    }
 }

Modified: trunk/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/CombinerParametersTypeMarshaller.java
URL: http://svn.shibboleth.net/view/java-opensaml/trunk/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/CombinerParametersTypeMarshaller.java?rev=3085&r1=3084&r2=3085&view=diff
==============================================================================
--- trunk/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/CombinerParametersTypeMarshaller.java (original)
+++ trunk/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/CombinerParametersTypeMarshaller.java Tue Jul 10 13:07:57 2012
@@ -31,7 +31,7 @@
     }
     
     /**
-     * Constructor.
+     * Constructor. <em>Note</em> changes visibility of super constructor.
      * 
      * @param targetNamespaceURI the namespace URI of either the schema type QName or element QName of the elements this
      *            marshaller operates on

Modified: trunk/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/CombinerParametersTypeUnmarshaller.java
URL: http://svn.shibboleth.net/view/java-opensaml/trunk/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/CombinerParametersTypeUnmarshaller.java?rev=3085&r1=3084&r2=3085&view=diff
==============================================================================
--- trunk/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/CombinerParametersTypeUnmarshaller.java (original)
+++ trunk/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/CombinerParametersTypeUnmarshaller.java Tue Jul 10 13:07:57 2012
@@ -34,7 +34,7 @@
     }
     
     /**
-     * Constructor.
+     * Constructor. <em>Note</em> changes visibility of super constructor.
      * 
      * @param targetNamespaceURI the namespace URI of either the schema type QName or element QName of the elements this
      *            marshaller operates on

Modified: trunk/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/PolicyCombinerParametersTypeImpl.java
URL: http://svn.shibboleth.net/view/java-opensaml/trunk/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/PolicyCombinerParametersTypeImpl.java?rev=3085&r1=3084&r2=3085&view=diff
==============================================================================
--- trunk/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/PolicyCombinerParametersTypeImpl.java (original)
+++ trunk/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/policy/impl/PolicyCombinerParametersTypeImpl.java Tue Jul 10 13:07:57 2012
@@ -17,38 +17,27 @@
 
 package org.opensaml.xacml.policy.impl;
 
-import java.util.ArrayList;
-import java.util.Collections;

[... 129 lines stripped ...]