[java-opensaml COMMIT] in /trunk: opensaml-xacml-api/src/main/java/org/opensaml/xacml/ctx/AttributeType.java opensaml...

[noreply at shibboleth.net]

Author: rdw
Date: Thu Jul 12 12:33:57 2012
New Revision: 3089

URL: http://svn.shibboleth.net/view/java-opensaml?rev=3089&view=rev
Log:
change method name #getAttributeID() to #getAttributeId() (for consistency across the system)

Modified:
    trunk/opensaml-xacml-api/src/main/java/org/opensaml/xacml/ctx/AttributeType.java
    trunk/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/ctx/impl/AttributeTypeImpl.java
    trunk/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/ctx/impl/AttributeTypeMarshaller.java

Modified: trunk/opensaml-xacml-api/src/main/java/org/opensaml/xacml/ctx/AttributeType.java
URL: http://svn.shibboleth.net/view/java-opensaml/trunk/opensaml-xacml-api/src/main/java/org/opensaml/xacml/ctx/AttributeType.java?rev=3089&r1=3088&r2=3089&view=diff
==============================================================================
--- trunk/opensaml-xacml-api/src/main/java/org/opensaml/xacml/ctx/AttributeType.java (original)
+++ trunk/opensaml-xacml-api/src/main/java/org/opensaml/xacml/ctx/AttributeType.java Thu Jul 12 12:33:57 2012
@@ -55,7 +55,7 @@
      * 
      * @return the AttributeId
      */
-    public String getAttributeID();
+    public String getAttributeId();
 
     /**
      * Gets the list of attribute values for this attribute.

Modified: trunk/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/ctx/impl/AttributeTypeImpl.java
URL: http://svn.shibboleth.net/view/java-opensaml/trunk/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/ctx/impl/AttributeTypeImpl.java?rev=3089&r1=3088&r2=3089&view=diff
==============================================================================
--- trunk/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/ctx/impl/AttributeTypeImpl.java (original)
+++ trunk/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/ctx/impl/AttributeTypeImpl.java Thu Jul 12 12:33:57 2012
@@ -55,7 +55,7 @@
     }
 
     /** {@inheritDoc} */
-    public String getAttributeID() {
+    public String getAttributeId() {
         return attributeID;
     }
 

Modified: trunk/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/ctx/impl/AttributeTypeMarshaller.java
URL: http://svn.shibboleth.net/view/java-opensaml/trunk/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/ctx/impl/AttributeTypeMarshaller.java?rev=3089&r1=3088&r2=3089&view=diff
==============================================================================
--- trunk/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/ctx/impl/AttributeTypeMarshaller.java (original)
+++ trunk/opensaml-xacml-impl/src/main/java/org/opensaml/xacml/ctx/impl/AttributeTypeMarshaller.java Thu Jul 12 12:33:57 2012
@@ -55,8 +55,8 @@
             domElement.setAttributeNS(null, AttributeType.DATATYPE_ATTRIB_NAME, attribute.getDataType());
         }
 
-        if (attribute.getAttributeID() != null) {
-            domElement.setAttributeNS(null, AttributeType.ATTRIBUTEID_ATTTRIB_NAME, attribute.getAttributeID());
+        if (attribute.getAttributeId() != null) {
+            domElement.setAttributeNS(null, AttributeType.ATTRIBUTEID_ATTTRIB_NAME, attribute.getAttributeId());
         }
     }