jdk-sandbox: comparison jdk/src/share/classes/com/sun/org/apache/xml/internal/security/signature/Manifest.java

equal deleted inserted replaced

-:6e9ebed2e783
+:cf59e2badd14
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Set;
+import java.util.Map;
 import javax.xml.parsers.ParserConfigurationException;
 import com.sun.org.apache.xml.internal.security.c14n.CanonicalizationException;
 import com.sun.org.apache.xml.internal.security.c14n.InvalidCanonicalizerException;
 /** {@link java.util.logging} logging facility */
 static java.util.logging.Logger log =
 java.util.logging.Logger.getLogger(Manifest.class.getName());
 /** Field _references */
-List _references;
+List<Reference> _references;
 Element[] _referencesEl;
 /** Field verificationResults[] */
 private boolean verificationResults[] = null;
 /** Field _resolverProperties */
-HashMap _resolverProperties = null;
+Map<String,String> _resolverProperties = null;
 /** Field _perManifestResolvers */
-List _perManifestResolvers = null;
+List<ResourceResolver> _perManifestResolvers = null;
 /**
 * Consturts {@link Manifest}
 *
 * @param doc the {@link Document} in which <code>XMLsignature</code> is placed
 super(doc);
 XMLUtils.addReturnToElement(this._constructionElement);
-this._references = new ArrayList();
+this._references = new ArrayList<Reference>();
 }
 /**
 * Constructor Manifest
 *
 I18n.translate("xml.WrongContent", exArgs));
 }
 }
 // create Vector
-this._references = new ArrayList(le);
+this._references = new ArrayList<Reference>(le);
 for (int i = 0; i < le; i++) {
 this._references.add(null);
 }
 }
 throws XMLSignatureException, ReferenceNotInitializedException {
 for (int i = 0; i < this.getLength(); i++) {
 // update the cached Reference object, the Element content is automatically updated
-Reference currentRef = (Reference) this._references.get(i);
+Reference currentRef = this._references.get(i);
 currentRef.generateDigestValue();
 }
 }
 Reference ref = new Reference(_referencesEl[i], this._baseURI, this);
 this._references.set(i, ref);
 }
-return (Reference) this._references.get(i);
+return this._references.get(i);
 }
 /**
 * Sets the <code>Id</code> attribute
 log.log(java.util.logging.Level.FINE, "We have to follow a nested Manifest");
 try {
 XMLSignatureInput signedManifestNodes =
 currentRef.dereferenceURIandPerformTransforms(null);
-Set nl = signedManifestNodes.getNodeSet();
+Set<Node> nl = signedManifestNodes.getNodeSet();
 Manifest referencedManifest = null;
-Iterator nlIterator = nl.iterator();
+Iterator<Node> nlIterator = nl.iterator();
 findManifest: while (nlIterator.hasNext()) {
-Node n = (Node) nlIterator.next();
+Node n =  nlIterator.next();
 if ((n.getNodeType() == Node.ELEMENT_NODE) && ((Element) n)
 .getNamespaceURI()
 .equals(Constants.SignatureSpecNS) && ((Element) n)
 .getLocalName().equals(Constants._TAG_MANIFEST)) {
 if (resolver == null) {
 return;
 }
 if (_perManifestResolvers==null)
-_perManifestResolvers = new ArrayList();
+_perManifestResolvers = new ArrayList<ResourceResolver>();
 this._perManifestResolvers.add(resolver);
 }
 /**
 if (resolverSpi == null) {
 return;
 }
 if (_perManifestResolvers==null)
-_perManifestResolvers = new ArrayList();
+_perManifestResolvers = new ArrayList<ResourceResolver>();
 this._perManifestResolvers.add(new ResourceResolver(resolverSpi));
 }
 /**
 * @param key the key
 * @param value the value
 */
 public void setResolverProperty(String key, String value) {
 if (_resolverProperties==null) {
-_resolverProperties=new HashMap(10);
+_resolverProperties=new HashMap<String, String>(10);
 }
 this._resolverProperties.put(key, value);
 }
 /**
 *
 * @param key the key
 * @return the value
 */
 public String getResolverProperty(String key) {
-return (String) this._resolverProperties.get(key);
+return this._resolverProperties.get(key);
 }
 /**
 * Method getSignedContentItem
 *

changeset 10694	cf59e2badd14
parent 1337	e8d6cef36199
child 18266	26e69da689b9