--- old/src/share/classes/com/sun/org/apache/xml/internal/security/signature/SignatureProperties.java 2013-06-28 11:34:00.985575268 -0400
+++ new/src/share/classes/com/sun/org/apache/xml/internal/security/signature/SignatureProperties.java 2013-06-28 11:34:00.817580496 -0400
@@ -2,34 +2,34 @@
* reserved comment block
* DO NOT REMOVE OR ALTER!
*/
-/*
- * Copyright 1999-2004 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
*/
package com.sun.org.apache.xml.internal.security.signature;
import com.sun.org.apache.xml.internal.security.exceptions.XMLSecurityException;
import com.sun.org.apache.xml.internal.security.utils.Constants;
-import com.sun.org.apache.xml.internal.security.utils.IdResolver;
import com.sun.org.apache.xml.internal.security.utils.SignatureElementProxy;
import com.sun.org.apache.xml.internal.security.utils.XMLUtils;
import org.w3c.dom.Attr;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
-
/**
* Handles <ds:SignatureProperties> elements
* This Element holds {@link SignatureProperty} that contian additional information items
@@ -37,120 +37,112 @@
* for example, data-time stamp, serial number of cryptographic hardware.
*
* @author Christian Geuer-Pollmann
- *
*/
public class SignatureProperties extends SignatureElementProxy {
- /**
- * Constructor SignatureProperties
- *
- * @param doc
- */
- public SignatureProperties(Document doc) {
-
- super(doc);
-
- XMLUtils.addReturnToElement(this._constructionElement);
- }
-
- /**
- * Constructs {@link SignatureProperties} from {@link Element}
- * @param element SignatureProperties elementt
- * @param BaseURI the URI of the resource where the XML instance was stored
- * @throws XMLSecurityException
- */
- public SignatureProperties(Element element, String BaseURI)
- throws XMLSecurityException {
- super(element, BaseURI);
-
- Attr attr = element.getAttributeNodeNS(null, "Id");
- if (attr != null) {
- element.setIdAttributeNode(attr, true);
- }
-
- int length = getLength();
- for (int i = 0; i < length; i++) {
- Element propertyElem =
- XMLUtils.selectDsNode(getElement(), Constants._TAG_SIGNATUREPROPERTY, i);
- Attr propertyAttr = propertyElem.getAttributeNodeNS(null, "Id");
- if (propertyAttr != null) {
- propertyElem.setIdAttributeNode(propertyAttr, true);
- }
- }
- }
-
- /**
- * Return the nonnegative number of added SignatureProperty elements.
- *
- * @return the number of SignatureProperty elements
- */
- public int getLength() {
-
- Element[] propertyElems =
- XMLUtils.selectDsNodes(this._constructionElement,
- Constants._TAG_SIGNATUREPROPERTY
- );
-
- return propertyElems.length;
- }
-
- /**
- * Return the ith SignatureProperty. Valid i
- * values are 0 to {link@ getSize}-1.
- *
- * @param i Index of the requested {@link SignatureProperty}
- * @return the ith SignatureProperty
- * @throws XMLSignatureException
- */
- public SignatureProperty item(int i) throws XMLSignatureException {
- try {
- Element propertyElem =
- XMLUtils.selectDsNode(this._constructionElement,
- Constants._TAG_SIGNATUREPROPERTY,
- i );
-
- if (propertyElem == null) {
- return null;
- }
- return new SignatureProperty(propertyElem, this._baseURI);
- } catch (XMLSecurityException ex) {
- throw new XMLSignatureException("empty", ex);
- }
- }
-
- /**
- * Sets the Id attribute
- *
- * @param Id the Id attribute
- */
- public void setId(String Id) {
-
- if (Id != null) {
- setLocalIdAttribute(Constants._ATT_ID, Id);
- }
- }
-
- /**
- * Returns the Id attribute
- *
- * @return the Id attribute
- */
- public String getId() {
- return this._constructionElement.getAttributeNS(null, Constants._ATT_ID);
- }
-
- /**
- * Method addSignatureProperty
- *
- * @param sp
- */
- public void addSignatureProperty(SignatureProperty sp) {
- this._constructionElement.appendChild(sp.getElement());
- XMLUtils.addReturnToElement(this._constructionElement);
- }
-
- /** @inheritDoc */
- public String getBaseLocalName() {
- return Constants._TAG_SIGNATUREPROPERTIES;
- }
+ /**
+ * Constructor SignatureProperties
+ *
+ * @param doc
+ */
+ public SignatureProperties(Document doc) {
+ super(doc);
+
+ XMLUtils.addReturnToElement(this.constructionElement);
+ }
+
+ /**
+ * Constructs {@link SignatureProperties} from {@link Element}
+ * @param element SignatureProperties element
+ * @param BaseURI the URI of the resource where the XML instance was stored
+ * @throws XMLSecurityException
+ */
+ public SignatureProperties(Element element, String BaseURI) throws XMLSecurityException {
+ super(element, BaseURI);
+
+ Attr attr = element.getAttributeNodeNS(null, "Id");
+ if (attr != null) {
+ element.setIdAttributeNode(attr, true);
+ }
+
+ int length = getLength();
+ for (int i = 0; i < length; i++) {
+ Element propertyElem =
+ XMLUtils.selectDsNode(this.constructionElement, Constants._TAG_SIGNATUREPROPERTY, i);
+ Attr propertyAttr = propertyElem.getAttributeNodeNS(null, "Id");
+ if (propertyAttr != null) {
+ propertyElem.setIdAttributeNode(propertyAttr, true);
+ }
+ }
+ }
+
+ /**
+ * Return the nonnegative number of added SignatureProperty elements.
+ *
+ * @return the number of SignatureProperty elements
+ */
+ public int getLength() {
+ Element[] propertyElems =
+ XMLUtils.selectDsNodes(this.constructionElement, Constants._TAG_SIGNATUREPROPERTY);
+
+ return propertyElems.length;
+ }
+
+ /**
+ * Return the ith SignatureProperty. Valid i
+ * values are 0 to {link@ getSize}-1.
+ *
+ * @param i Index of the requested {@link SignatureProperty}
+ * @return the ith SignatureProperty
+ * @throws XMLSignatureException
+ */
+ public SignatureProperty item(int i) throws XMLSignatureException {
+ try {
+ Element propertyElem =
+ XMLUtils.selectDsNode(this.constructionElement, Constants._TAG_SIGNATUREPROPERTY, i);
+
+ if (propertyElem == null) {
+ return null;
+ }
+ return new SignatureProperty(propertyElem, this.baseURI);
+ } catch (XMLSecurityException ex) {
+ throw new XMLSignatureException("empty", ex);
+ }
+ }
+
+ /**
+ * Sets the Id attribute
+ *
+ * @param Id the Id attribute
+ */
+ public void setId(String Id) {
+ if (Id != null) {
+ this.constructionElement.setAttributeNS(null, Constants._ATT_ID, Id);
+ this.constructionElement.setIdAttributeNS(null, Constants._ATT_ID, true);
+ }
+ }
+
+ /**
+ * Returns the Id attribute
+ *
+ * @return the Id attribute
+ */
+ public String getId() {
+ return this.constructionElement.getAttributeNS(null, Constants._ATT_ID);
+ }
+
+ /**
+ * Method addSignatureProperty
+ *
+ * @param sp
+ */
+ public void addSignatureProperty(SignatureProperty sp) {
+ this.constructionElement.appendChild(sp.getElement());
+ XMLUtils.addReturnToElement(this.constructionElement);
+ }
+
+ /** @inheritDoc */
+ public String getBaseLocalName() {
+ return Constants._TAG_SIGNATUREPROPERTIES;
+ }
}