--- old/src/share/classes/com/sun/org/apache/xml/internal/security/transforms/Transform.java 2013-06-28 11:34:06.397406811 -0400 +++ new/src/share/classes/com/sun/org/apache/xml/internal/security/transforms/Transform.java 2013-06-28 11:34:06.213412538 -0400 @@ -69,48 +69,48 @@ public final class Transform extends SignatureElementProxy { /** {@link org.apache.commons.logging} logging facility */ - private static java.util.logging.Logger log = + private static java.util.logging.Logger log = java.util.logging.Logger.getLogger(Transform.class.getName()); /** All available Transform classes are registered here */ - private static Map> transformSpiHash = + private static Map> transformSpiHash = new ConcurrentHashMap>(); - + private final TransformSpi transformSpi; - + /** - * Generates a Transform object that implements the specified + * Generates a Transform object that implements the specified * Transform algorithm URI. * * @param doc the proxy {@link Document} - * @param algorithmURI Transform algorithm URI representation, - * such as specified in + * @param algorithmURI Transform algorithm URI representation, + * such as specified in * Transform algorithm * @throws InvalidTransformException */ public Transform(Document doc, String algorithmURI) throws InvalidTransformException { this(doc, algorithmURI, (NodeList)null); } - + /** - * Generates a Transform object that implements the specified + * Generates a Transform object that implements the specified * Transform algorithm URI. * - * @param algorithmURI Transform algorithm URI representation, - * such as specified in + * @param algorithmURI Transform algorithm URI representation, + * such as specified in * Transform algorithm * @param contextChild the child element of Transform element * @param doc the proxy {@link Document} * @throws InvalidTransformException */ - public Transform(Document doc, String algorithmURI, Element contextChild) + public Transform(Document doc, String algorithmURI, Element contextChild) throws InvalidTransformException { super(doc); HelperNodeList contextNodes = null; - + if (contextChild != null) { contextNodes = new HelperNodeList(); - + XMLUtils.addReturnToElement(doc, contextNodes); contextNodes.appendChild(contextChild); XMLUtils.addReturnToElement(doc, contextNodes); @@ -122,7 +122,7 @@ /** * Constructs {@link Transform} * - * @param doc the {@link Document} in which Transform will be + * @param doc the {@link Document} in which Transform will be * placed * @param algorithmURI URI representation of Transform algorithm * @param contextNodes the child node list of Transform element @@ -152,7 +152,7 @@ Object exArgs[] = { Constants._ATT_ALGORITHM, Constants._TAG_TRANSFORM }; throw new TransformationException("xml.WrongContent", exArgs); } - + Class transformSpiClass = transformSpiHash.get(algorithmURI); if (transformSpiClass == null) { Object exArgs[] = { algorithmURI }; @@ -172,19 +172,19 @@ ); } } - + /** * Registers implementing class of the Transform algorithm with algorithmURI * * @param algorithmURI algorithmURI URI representation of Transform algorithm - * @param implementingClass implementingClass the implementing + * @param implementingClass implementingClass the implementing * class of {@link TransformSpi} - * @throws AlgorithmAlreadyRegisteredException if specified algorithmURI + * @throws AlgorithmAlreadyRegisteredException if specified algorithmURI * is already registered */ @SuppressWarnings("unchecked") public static void register(String algorithmURI, String implementingClass) - throws AlgorithmAlreadyRegisteredException, ClassNotFoundException, + throws AlgorithmAlreadyRegisteredException, ClassNotFoundException, InvalidTransformException { // are we already registered? Class transformSpi = transformSpiHash.get(algorithmURI); @@ -192,19 +192,19 @@ Object exArgs[] = { algorithmURI, transformSpi }; throw new AlgorithmAlreadyRegisteredException("algorithm.alreadyRegistered", exArgs); } - Class transformSpiClass = + Class transformSpiClass = (Class) ClassLoaderUtils.loadClass(implementingClass, Transform.class); transformSpiHash.put(algorithmURI, transformSpiClass); } - + /** * Registers implementing class of the Transform algorithm with algorithmURI * * @param algorithmURI algorithmURI URI representation of Transform algorithm - * @param implementingClass implementingClass the implementing + * @param implementingClass implementingClass the implementing * class of {@link TransformSpi} - * @throws AlgorithmAlreadyRegisteredException if specified algorithmURI + * @throws AlgorithmAlreadyRegisteredException if specified algorithmURI * is already registered */ public static void register(String algorithmURI, Class implementingClass) @@ -256,22 +256,22 @@ Transforms.TRANSFORM_XPATH2FILTER, TransformXPath2Filter.class ); } - + /** * Returns the URI representation of Transformation algorithm * * @return the URI representation of Transformation algorithm */ public String getURI() { - return this._constructionElement.getAttributeNS(null, Constants._ATT_ALGORITHM); + return this.constructionElement.getAttributeNS(null, Constants._ATT_ALGORITHM); } /** * Transforms the input, and generates {@link XMLSignatureInput} as output. * - * @param input input {@link XMLSignatureInput} which can supplied Octet + * @param input input {@link XMLSignatureInput} which can supplied Octet * Stream and NodeSet as Input of Transformation - * @return the {@link XMLSignatureInput} class as the result of + * @return the {@link XMLSignatureInput} class as the result of * transformation * @throws CanonicalizationException * @throws IOException @@ -283,14 +283,14 @@ InvalidCanonicalizerException, TransformationException { return performTransform(input, null); } - + /** * Transforms the input, and generates {@link XMLSignatureInput} as output. * - * @param input input {@link XMLSignatureInput} which can supplied Octect + * @param input input {@link XMLSignatureInput} which can supplied Octect * Stream and NodeSet as Input of Transformation * @param os where to output the result of the last transformation - * @return the {@link XMLSignatureInput} class as the result of + * @return the {@link XMLSignatureInput} class as the result of * transformation * @throws CanonicalizationException * @throws IOException @@ -322,14 +322,14 @@ public String getBaseLocalName() { return Constants._TAG_TRANSFORM; } - + /** * Initialize the transform object. */ private TransformSpi initializeTransform(String algorithmURI, NodeList contextNodes) throws InvalidTransformException { - this._constructionElement.setAttributeNS(null, Constants._ATT_ALGORITHM, algorithmURI); + this.constructionElement.setAttributeNS(null, Constants._ATT_ALGORITHM, algorithmURI); Class transformSpiClass = transformSpiHash.get(algorithmURI); if (transformSpiClass == null) { @@ -360,7 +360,7 @@ // give it to the current document if (contextNodes != null) { for (int i = 0; i < contextNodes.getLength(); i++) { - this._constructionElement.appendChild(contextNodes.item(i).cloneNode(true)); + this.constructionElement.appendChild(contextNodes.item(i).cloneNode(true)); } } return newTransformSpi;