jdk-sandbox: comparison jdk/src/java.xml.crypto/share/classes/javax/xml/crypto/dsig/XMLSignatureFactory.java

equal deleted inserted replaced

-:8c9bd4be4a86
+:3a271dc8b758
 /*
-* Copyright (c) 2005, 2013, Oracle and/or its affiliates. All rights reserved.
+* Copyright (c) 2005, 2014, Oracle and/or its affiliates. All rights reserved.
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 *
 * This code is free software; you can redistribute it and/or modify it
 * under the terms of the GNU General Public License version 2 only, as
 * published by the Free Software Foundation.  Oracle designates this
 * @return an <code>XMLSignature</code>
 * @throws NullPointerException if <code>si</code> is <code>null</code>
 * @throws ClassCastException if any of the <code>objects</code> are not of
 *    type <code>XMLObject</code>
 */
-@SuppressWarnings("rawtypes")
 public abstract XMLSignature newXMLSignature(SignedInfo si, KeyInfo ki,
-List objects, String id, String signatureValueId);
+List<? extends XMLObject> objects, String id, String signatureValueId);
 /**
 * Creates a <code>Reference</code> with the specified URI and digest
 * method.
 *
 *    not of type <code>Transform</code>
 * @throws IllegalArgumentException if <code>uri</code> is not RFC 2396
 *    compliant
 * @throws NullPointerException if <code>dm</code> is <code>null</code>
 */
-@SuppressWarnings("rawtypes")
 public abstract Reference newReference(String uri, DigestMethod dm,
-List transforms, String type, String id);
+List<? extends Transform> transforms, String type, String id);
 /**
 * Creates a <code>Reference</code> with the specified parameters and
 * pre-calculated digest value.
 *
 * @throws IllegalArgumentException if <code>uri</code> is not RFC 2396
 *    compliant
 * @throws NullPointerException if <code>dm</code> or
 *    <code>digestValue</code> is <code>null</code>
 */
-@SuppressWarnings("rawtypes")
 public abstract Reference newReference(String uri, DigestMethod dm,
-List transforms, String type, String id, byte[] digestValue);
+List<? extends Transform> transforms, String type, String id,
+byte[] digestValue);
 /**
 * Creates a <code>Reference</code> with the specified parameters.
 *
 * <p>This method is useful when a list of transforms have already been
 *    compliant or <code>appliedTransforms</code> is empty
 * @throws NullPointerException if <code>dm</code>,
 *    <code>appliedTransforms</code> or <code>result</code> is
 *    <code>null</code>
 */
-@SuppressWarnings("rawtypes")
 public abstract Reference newReference(String uri, DigestMethod dm,
-List appliedTransforms, Data result, List transforms, String type,
+List<? extends Transform> appliedTransforms, Data result,
-String id);
+List<? extends Transform> transforms, String type, String id);
 /**
 * Creates a <code>SignedInfo</code> with the specified canonicalization
 * and signature methods, and list of one or more references.
 *
 *    type <code>Reference</code>
 * @throws IllegalArgumentException if <code>references</code> is empty
 * @throws NullPointerException if any of the parameters
 *    are <code>null</code>
 */
-@SuppressWarnings("rawtypes")
 public abstract SignedInfo newSignedInfo(CanonicalizationMethod cm,
-SignatureMethod sm, List references);
+SignatureMethod sm, List<? extends Reference> references);
 /**
 * Creates a <code>SignedInfo</code> with the specified parameters.
 *
 * @param cm the canonicalization method
 *    type <code>Reference</code>
 * @throws IllegalArgumentException if <code>references</code> is empty
 * @throws NullPointerException if <code>cm</code>, <code>sm</code>, or
 *    <code>references</code> are <code>null</code>
 */
-@SuppressWarnings("rawtypes")
 public abstract SignedInfo newSignedInfo(CanonicalizationMethod cm,
-SignatureMethod sm, List references, String id);
+SignatureMethod sm, List<? extends Reference> references, String id);
 // Object factory methods
 /**
 * Creates an <code>XMLObject</code> from the specified parameters.
 *
 * @param encoding the encoding (may be <code>null</code>)
 * @return an <code>XMLObject</code>
 * @throws ClassCastException if <code>content</code> contains any
 *    entries that are not of type {@link XMLStructure}
 */
-@SuppressWarnings("rawtypes")
+public abstract XMLObject newXMLObject(List<? extends XMLStructure> content,
-public abstract XMLObject newXMLObject(List content, String id,
+String id, String mimeType, String encoding);
-String mimeType, String encoding);
 /**
 * Creates a <code>Manifest</code> containing the specified
 * list of {@link Reference}s.
 *
 *    <code>null</code>
 * @throws IllegalArgumentException if <code>references</code> is empty
 * @throws ClassCastException if <code>references</code> contains any
 *    entries that are not of type {@link Reference}
 */
-@SuppressWarnings("rawtypes")
+public abstract Manifest newManifest(List<? extends Reference> references);
-public abstract Manifest newManifest(List references);
 /**
 * Creates a <code>Manifest</code> containing the specified
 * list of {@link Reference}s and optional id.
 *
 *    <code>null</code>
 * @throws IllegalArgumentException if <code>references</code> is empty
 * @throws ClassCastException if <code>references</code> contains any
 *    entries that are not of type {@link Reference}
 */
-@SuppressWarnings("rawtypes")
+public abstract Manifest newManifest(List<? extends Reference> references,
-public abstract Manifest newManifest(List references, String id);
+String id);
 /**
 * Creates a <code>SignatureProperty</code> containing the specified
 * list of {@link XMLStructure}s, target URI and optional id.
 *
 *    <code>target</code> is <code>null</code>
 * @throws IllegalArgumentException if <code>content</code> is empty
 * @throws ClassCastException if <code>content</code> contains any
 *    entries that are not of type {@link XMLStructure}
 */
-@SuppressWarnings("rawtypes")
 public abstract SignatureProperty newSignatureProperty
-(List content, String target, String id);
+(List<? extends XMLStructure> content, String target, String id);
 /**
 * Creates a <code>SignatureProperties</code> containing the specified
 * list of {@link SignatureProperty}s and optional id.
 *
 *    is <code>null</code>
 * @throws IllegalArgumentException if <code>properties</code> is empty
 * @throws ClassCastException if <code>properties</code> contains any
 *    entries that are not of type {@link SignatureProperty}
 */
-@SuppressWarnings("rawtypes")
 public abstract SignatureProperties newSignatureProperties
-(List properties, String id);
+(List<? extends SignatureProperty> properties, String id);
 // Algorithm factory methods
 /**
 * Creates a <code>DigestMethod</code> for the specified algorithm URI
 * and parameters.

changeset 27747	3a271dc8b758
parent 25859	3317bb8137f4
child 33241	27eb2d6abda9