You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@santuario.apache.org by ra...@apache.org on 2004/09/24 23:29:34 UTC

cvs commit: xml-security/src/org/apache/xml/security/algorithms Algorithm.java

raul        2004/09/24 14:29:34

  Modified:    src/org/apache/xml/security/encryption AgreementMethod.java
                        EncryptionProperties.java CipherData.java
                        CipherReference.java EncryptedKey.java
                        Transforms.java EncryptionProperty.java
                        XMLCipherParameters.java XMLCipher.java
                        ReferenceList.java XMLEncryptionException.java
                        Reference.java
               src/org/apache/xml/security/algorithms Algorithm.java
  Log:
  - fixed javadoc warnings
  - and other eclipse gripes
  
  Revision  Changes    Path
  1.3       +3 -0      xml-security/src/org/apache/xml/security/encryption/AgreementMethod.java
  
  Index: AgreementMethod.java
  ===================================================================
  RCS file: /home/cvs/xml-security/src/org/apache/xml/security/encryption/AgreementMethod.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- AgreementMethod.java	8 Feb 2004 06:10:28 -0000	1.2
  +++ AgreementMethod.java	24 Sep 2004 21:29:34 -0000	1.3
  @@ -77,16 +77,19 @@
   public interface AgreementMethod {
       /**
        * Returns an <code>byte</code> array.
  +     * @return
        */
       byte[] getKANonce();
   
       /**
        * Sets the KANonce.jj
  +     * @param kanonce
        */
       void setKANonce(byte[] kanonce);
   
       /**
        * Returns aditional information regarding the <code>AgreementMethod</code>.
  +     * @return
        */
       Iterator getAgreementMethodInformation();
   
  
  
  
  1.8       +1 -1      xml-security/src/org/apache/xml/security/encryption/EncryptionProperties.java
  
  Index: EncryptionProperties.java
  ===================================================================
  RCS file: /home/cvs/xml-security/src/org/apache/xml/security/encryption/EncryptionProperties.java,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- EncryptionProperties.java	8 Feb 2004 06:10:28 -0000	1.7
  +++ EncryptionProperties.java	24 Sep 2004 21:29:34 -0000	1.8
  @@ -52,7 +52,7 @@
       /**
        * Sets the id.
        *
  -     * @param the id.
  +     * @param id the id.
        */
       void setId(String id);
   
  
  
  
  1.9       +4 -0      xml-security/src/org/apache/xml/security/encryption/CipherData.java
  
  Index: CipherData.java
  ===================================================================
  RCS file: /home/cvs/xml-security/src/org/apache/xml/security/encryption/CipherData.java,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- CipherData.java	8 Feb 2004 06:10:28 -0000	1.8
  +++ CipherData.java	24 Sep 2004 21:29:34 -0000	1.9
  @@ -38,7 +38,9 @@
    * @author Axl Mattheus
    */
   public interface CipherData {
  +    /** VALUE_TYPE ASN */
       public static final int VALUE_TYPE = 0x00000001;
  +    /** REFERENCE_TYPE ASN */
       public static final int REFERENCE_TYPE = 0x00000002;
   
       /**
  @@ -62,6 +64,7 @@
        * Sets the <code>CipherData</code>'s value.
        *
        * @param value the value of the <code>CipherData</code>.
  +     * @throws XMLEncryptionException
        */
       void setCipherValue(CipherValue value) throws XMLEncryptionException;
   
  @@ -79,6 +82,7 @@
        *
        * @param reference an external location containing the enctrypted octet
        *   sequence.
  +     * @throws XMLEncryptionException
        */
       void setCipherReference(CipherReference reference) throws
           XMLEncryptionException;
  
  
  
  1.10      +2 -1      xml-security/src/org/apache/xml/security/encryption/CipherReference.java
  
  Index: CipherReference.java
  ===================================================================
  RCS file: /home/cvs/xml-security/src/org/apache/xml/security/encryption/CipherReference.java,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- CipherReference.java	8 Feb 2004 06:10:28 -0000	1.9
  +++ CipherReference.java	24 Sep 2004 21:29:34 -0000	1.10
  @@ -58,14 +58,15 @@
       /**
        * Returns an <code>URI</code> that contains an identifier that should be
        * dereferenced.
  +     * @return
        */
       String getURI();
   
   	/**
   	 * Gets the URI as an Attribute node.  Used to meld the CipherREference
   	 * with the XMLSignature ResourceResolvers
  +     * @return
   	 */
  -
   	public Attr getURIAsAttr();
   
       /**
  
  
  
  1.11      +1 -1      xml-security/src/org/apache/xml/security/encryption/EncryptedKey.java
  
  Index: EncryptedKey.java
  ===================================================================
  RCS file: /home/cvs/xml-security/src/org/apache/xml/security/encryption/EncryptedKey.java,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- EncryptedKey.java	8 Feb 2004 06:10:28 -0000	1.10
  +++ EncryptedKey.java	24 Sep 2004 21:29:34 -0000	1.11
  @@ -94,7 +94,7 @@
        * the <code>ds:KeyName</code> element, whitespace is also significant in
        * the value of the <code>CarriedKeyName</code> element.
        *
  -     * @param an <code>Iterator</code> over all the carried names contained in
  +     * @return over all the carried names contained in
        *   this <code>EncryptedKey</code>.
        */
       String getCarriedName();
  
  
  
  1.9       +2 -1      xml-security/src/org/apache/xml/security/encryption/Transforms.java
  
  Index: Transforms.java
  ===================================================================
  RCS file: /home/cvs/xml-security/src/org/apache/xml/security/encryption/Transforms.java,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- Transforms.java	8 Feb 2004 06:10:28 -0000	1.8
  +++ Transforms.java	24 Sep 2004 21:29:34 -0000	1.9
  @@ -32,7 +32,7 @@
    * </xmp>
    *
    * @author Axl Mattheus
  - * @see CipherReference.
  + * @see org.apache.xml.security.encryption.CipherReference
    */
   public interface Transforms {
       /**
  @@ -63,6 +63,7 @@
   	 * DS class, so we need to get to get the base class.
   	 * <p>
   	 * <b>Note</b> This will be removed in future versions
  +     * @return
   	 */
   
   	org.apache.xml.security.transforms.Transforms getDSTransforms();
  
  
  
  1.8       +1 -0      xml-security/src/org/apache/xml/security/encryption/EncryptionProperty.java
  
  Index: EncryptionProperty.java
  ===================================================================
  RCS file: /home/cvs/xml-security/src/org/apache/xml/security/encryption/EncryptionProperty.java,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- EncryptionProperty.java	8 Feb 2004 06:10:28 -0000	1.7
  +++ EncryptionProperty.java	24 Sep 2004 21:29:34 -0000	1.8
  @@ -78,6 +78,7 @@
       /**
        * Returns the attribute's value in the <code>xml</code> namespace.
        *
  +     * @param attribute
        * @return the attribute's value.
        */
       String getAttribute(String attribute);
  
  
  
  1.3       +3 -0      xml-security/src/org/apache/xml/security/encryption/XMLCipherParameters.java
  
  Index: XMLCipherParameters.java
  ===================================================================
  RCS file: /home/cvs/xml-security/src/org/apache/xml/security/encryption/XMLCipherParameters.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- XMLCipherParameters.java	8 Feb 2004 06:10:28 -0000	1.2
  +++ XMLCipherParameters.java	24 Sep 2004 21:29:34 -0000	1.3
  @@ -18,6 +18,9 @@
   package org.apache.xml.security.encryption;
   
   
  +/**
  + * Constants
  + */
   public interface XMLCipherParameters {
   
       /** */
  
  
  
  1.27      +158 -61   xml-security/src/org/apache/xml/security/encryption/XMLCipher.java
  
  Index: XMLCipher.java
  ===================================================================
  RCS file: /home/cvs/xml-security/src/org/apache/xml/security/encryption/XMLCipher.java,v
  retrieving revision 1.26
  retrieving revision 1.27
  diff -u -r1.26 -r1.27
  --- XMLCipher.java	24 Sep 2004 20:54:30 -0000	1.26
  +++ XMLCipher.java	24 Sep 2004 21:29:34 -0000	1.27
  @@ -85,51 +85,75 @@
   	/** Triple DES EDE (192 bit key) in CBC mode */
       public static final String TRIPLEDES =                   
           EncryptionConstants.ALGO_ID_BLOCKCIPHER_TRIPLEDES;
  +    /** AES 128 Cipher */
       public static final String AES_128 =                     
           EncryptionConstants.ALGO_ID_BLOCKCIPHER_AES128;
  +    /** AES 256 Cipher */
       public static final String AES_256 =                     
           EncryptionConstants.ALGO_ID_BLOCKCIPHER_AES256;
  +    /** AES 192 Cipher */
       public static final String AES_192 =                     
           EncryptionConstants.ALGO_ID_BLOCKCIPHER_AES192;
  +    /** RSA 1.5 Cipher */
       public static final String RSA_v1dot5 =                  
           EncryptionConstants.ALGO_ID_KEYTRANSPORT_RSA15;
  +    /** RSA OAEP Cipher */
       public static final String RSA_OAEP =                    
           EncryptionConstants.ALGO_ID_KEYTRANSPORT_RSAOAEP;
  +    /** DIFFIE_HELLMAN Cipher */
       public static final String DIFFIE_HELLMAN =              
           EncryptionConstants.ALGO_ID_KEYAGREEMENT_DH;
  +    /** Triple DES EDE (192 bit key) in CBC mode KEYWRAP*/
       public static final String TRIPLEDES_KeyWrap =           
           EncryptionConstants.ALGO_ID_KEYWRAP_TRIPLEDES;
  +    /** AES 128 Cipher KeyWrap */
       public static final String AES_128_KeyWrap =             
           EncryptionConstants.ALGO_ID_KEYWRAP_AES128;
  +    /** AES 256 Cipher KeyWrap */
       public static final String AES_256_KeyWrap =             
           EncryptionConstants.ALGO_ID_KEYWRAP_AES256;
  +    /** AES 192 Cipher KeyWrap */
       public static final String AES_192_KeyWrap =             
           EncryptionConstants.ALGO_ID_KEYWRAP_AES192;
  +    /** SHA1 Cipher */
       public static final String SHA1 =                        
           Constants.ALGO_ID_DIGEST_SHA1;
  +    /** SHA256 Cipher */
       public static final String SHA256 =                      
           MessageDigestAlgorithm.ALGO_ID_DIGEST_SHA256;
  +    /** SHA512 Cipher */
       public static final String SHA512 =                      
           MessageDigestAlgorithm.ALGO_ID_DIGEST_SHA512;
  +    /** RIPEMD Cipher */
       public static final String RIPEMD_160 =                  
           MessageDigestAlgorithm.ALGO_ID_DIGEST_RIPEMD160;
  +    /** XML Signature NS */
       public static final String XML_DSIG =                    
           Constants.SignatureSpecNS;
  +    /** N14C_XML */
       public static final String N14C_XML =                    
           Canonicalizer.ALGO_ID_C14N_OMIT_COMMENTS;
  +    /** N14C_XML with comments*/
       public static final String N14C_XML_WITH_COMMENTS =      
           Canonicalizer.ALGO_ID_C14N_WITH_COMMENTS;
  +    /** N14C_XML excluisve */
       public static final String EXCL_XML_N14C =               
           Canonicalizer.ALGO_ID_C14N_EXCL_OMIT_COMMENTS;
  +    /** N14C_XML exclusive with commetns*/
       public static final String EXCL_XML_N14C_WITH_COMMENTS = 
           Canonicalizer.ALGO_ID_C14N_EXCL_WITH_COMMENTS;
  +    /** Base64 encoding */
       public static final String BASE64_ENCODING =             
           org.apache.xml.security.transforms.Transforms.TRANSFORM_BASE64_DECODE;
   	//J+
  -
  +    
  +    /** ENCRYPT Mode */
       public static final int ENCRYPT_MODE = Cipher.ENCRYPT_MODE;
  +    /** DECRYPT Mode */
       public static final int DECRYPT_MODE = Cipher.DECRYPT_MODE;
  +    /** UNWRAP Mode */
       public static final int UNWRAP_MODE  = Cipher.UNWRAP_MODE;
  +    /** WRAP Mode */
       public static final int WRAP_MODE    = Cipher.WRAP_MODE;
   	
       private static final String ENC_ALGORITHMS = TRIPLEDES + "\n" +
  @@ -1660,8 +1684,7 @@
   	 * Create a CipherReference object
   	 *
        * @return
  -	 * @param uri The URI that the reference will refer to
  -     * @throws XMLEncryptionException
  +	 * @param uri The URI that the reference will refer 
   	 */
   
   	public CipherReference createCipherReference(String uri) {
  @@ -3293,19 +3316,31 @@
               protected EncryptedTypeImpl(CipherData data) {
                   cipherData = data;
               }
  -
  +            /** 
  +             * 
  +             * @return
  +             */
               public String getId() {
                   return (id);
               }
  -
  +            /**
  +             * 
  +             * @param id
  +             */
               public void setId(String id) {
                   this.id = id;
               }
  -
  +            /**
  +             * 
  +             * @return
  +             */
               public String getType() {
                   return (type);
               }
  -
  +            /**
  +             * 
  +             * @param type
  +             */
               public void setType(String type) {
                   URI tmpType = null;
                   try {
  @@ -3315,19 +3350,31 @@
                   }
                   this.type = tmpType.toString();
               }
  -
  +            /**
  +             * 
  +             * @return
  +             */
               public String getMimeType() {
                   return (mimeType);
               }
  -
  +            /**
  +             * 
  +             * @param type
  +             */
               public void setMimeType(String type) {
                   mimeType = type;
               }
  -
  +            /**
  +             * 
  +             * @return
  +             */
               public String getEncoding() {
                   return (encoding);
               }
  -
  +            /**
  +             * 
  +             * @param encoding
  +             */
               public void setEncoding(String encoding) {
                   URI tmpEncoding = null;
                   try {
  @@ -3337,31 +3384,52 @@
                   }
                   this.encoding = tmpEncoding.toString();
               }
  -
  +            /**
  +             * 
  +             * @return
  +             */
               public EncryptionMethod getEncryptionMethod() {
                   return (encryptionMethod);
               }
  -
  +            /**
  +             * 
  +             * @param method
  +             */
               public void setEncryptionMethod(EncryptionMethod method) {
                   encryptionMethod = method;
               }
  -
  +            /**
  +             * 
  +             * @return
  +             */
               public KeyInfo getKeyInfo() {
                   return (keyInfo);
               }
  -
  +            /**
  +             * 
  +             * @param info
  +             */
               public void setKeyInfo(KeyInfo info) {
                   keyInfo = info;
               }
  -
  +            /**
  +             * 
  +             * @return
  +             */
               public CipherData getCipherData() {
                   return (cipherData);
               }
  -
  +            /**
  +             * 
  +             * @return
  +             */
               public EncryptionProperties getEncryptionProperties() {
                   return (encryptionProperties);
               }
  -
  +            /**
  +             * 
  +             * @param properties
  +             */
               public void setEncryptionProperties(
                       EncryptionProperties properties) {
                   encryptionProperties = properties;
  @@ -3381,7 +3449,10 @@
               private int keySize = Integer.MIN_VALUE;
               private byte[] oaepParams = null;
               private List encryptionMethodInformation = null;
  -
  +            /**
  +             * 
  +             * @param algorithm
  +             */
               public EncryptionMethodImpl(String algorithm) {
                   URI tmpAlgorithm = null;
                   try {
  @@ -3392,35 +3463,35 @@
                   this.algorithm = tmpAlgorithm.toString();
                   encryptionMethodInformation = new LinkedList();
               }
  -
  +            /** @inheritDoc */
               public String getAlgorithm() {
                   return (algorithm);
               }
  -
  +            /** @inheritDoc */
               public int getKeySize() {
                   return (keySize);
               }
  -
  +            /** @inheritDoc */
               public void setKeySize(int size) {
                   keySize = size;
               }
  -
  +            /** @inheritDoc */
               public byte[] getOAEPparams() {
                   return (oaepParams);
               }
  -
  +            /** @inheritDoc */
               public void setOAEPparams(byte[] params) {
                   oaepParams = params;
               }
  -
  +            /** @inheritDoc */
               public Iterator getEncryptionMethodInformation() {
                   return (encryptionMethodInformation.iterator());
               }
  -
  +            /** @inheritDoc */
               public void addEncryptionMethodInformation(Element info) {
                   encryptionMethodInformation.add(info);
               }
  -
  +            /** @inheritDoc */
               public void removeEncryptionMethodInformation(Element info) {
                   encryptionMethodInformation.remove(info);
               }
  @@ -3474,27 +3545,30 @@
           private class EncryptionPropertiesImpl implements EncryptionProperties {
               private String id = null;
               private List encryptionProperties = null;
  -
  +            /**
  +             * 
  +             *
  +             */
               public EncryptionPropertiesImpl() {
                   encryptionProperties = new LinkedList();
               }
  -
  +            /** @inheritDoc */
               public String getId() {
                   return (id);
               }
  -
  +            /** @inheritDoc */
               public void setId(String id) {
                   this.id = id;
               }
  -
  +            /** @inheritDoc */
               public Iterator getEncryptionProperties() {
                   return (encryptionProperties.iterator());
               }
  -
  +            /** @inheritDoc */
               public void addEncryptionProperty(EncryptionProperty property) {
                   encryptionProperties.add(property);
               }
  -
  +            /** @inheritDoc */
               public void removeEncryptionProperty(EncryptionProperty property) {
                   encryptionProperties.remove(property);
               }
  @@ -3539,14 +3613,18 @@
               private String attributeValue = null;
               private List encryptionInformation = null;
   
  +            /**
  +             * 
  +             *
  +             */
               public EncryptionPropertyImpl() {
                   encryptionInformation = new LinkedList();
               }
  -
  +            /** @inheritDoc */
               public String getTarget() {
                   return (target);
               }
  -
  +            /** @inheritDoc */
               public void setTarget(String target) {
                   URI tmpTarget = null;
                   try {
  @@ -3556,32 +3634,32 @@
                   }
                   this.target = tmpTarget.toString();
               }
  -
  +            /** @inheritDoc */
               public String getId() {
                   return (id);
               }
  -
  +            /** @inheritDoc */
               public void setId(String id) {
                   this.id = id;
               }
  -
  +            /** @inheritDoc */
               public String getAttribute(String attribute) {
                   return (attributeValue);
               }
  -
  +            /** @inheritDoc */
               public void setAttribute(String attribute, String value) {
                   attributeName = attribute;
                   attributeValue = value;
               }
  -
  +            /** @inheritDoc */
               public Iterator getEncryptionInformation() {
                   return (encryptionInformation.iterator());
               }
  -
  +            /** @inheritDoc */
               public void addEncryptionInformation(Element info) {
                   encryptionInformation.add(info);
               }
  -
  +            /** @inheritDoc */
               public void removeEncryptionInformation(Element info) {
                   encryptionInformation.remove(info);
               }
  @@ -3630,11 +3708,21 @@
   			public TransformsImpl() {
   				super(_contextDocument);
   			}
  -
  +			/**
  +             * 
  +			 * @param doc
  +			 */
   			public TransformsImpl(Document doc) {
   				super(doc);
   			}
  -
  +			/**
  +             * 
  +			 * @param element
  +			 * @throws XMLSignatureException
  +			 * @throws InvalidTransformException
  +			 * @throws XMLSecurityException
  +			 * @throws TransformationException
  +			 */
   			public TransformsImpl(Element element) 
   				throws XMLSignatureException,
   			           InvalidTransformException,
  @@ -3645,7 +3733,10 @@
   				
   			}
   
  -            /** @inheritDoc */
  +            /** 
  +             * 
  +             * @return
  +             */
   			public Element toElement() {
   
   				if (_doc == null)
  @@ -3679,7 +3770,10 @@
           private class ReferenceListImpl implements ReferenceList {
               private Class sentry;
               private List references;
  -
  +            /**
  +             * 
  +             * @param type
  +             */
               public ReferenceListImpl(int type) {
                   if (type == ReferenceList.DATA_REFERENCE) {
                       sentry = DataReference.class;
  @@ -3690,29 +3784,29 @@
                   }
                   references = new LinkedList();
               }
  -
  +            /** @inheritDoc */
               public void add(Reference reference) {
                   if (!reference.getClass().equals(sentry)) {
                       throw new IllegalArgumentException();     
                   }
                    references.add(reference);                
               }
  -
  +            /** @inheritDoc */
               public void remove(Reference reference) {
                   if (!reference.getClass().equals(sentry)) {
                       throw new IllegalArgumentException();
                   }
                   references.remove(reference);
               }
  -
  +            /** @inheritDoc */
               public int size() {
                   return (references.size());
               }
  -
  +            /** @inheritDoc */
               public boolean isEmpty() {
                   return (references.isEmpty());
               }
  -
  +            /** @inheritDoc */
               public Iterator getReferences() {
                   return (references.iterator());
               }
  @@ -3730,11 +3824,11 @@
                   }
                   return (result);
               }
  -
  +            /** @inheritDoc */
               public Reference newDataReference(String uri) {
                   return (new DataReference(uri));
               }
  -
  +            /** @inheritDoc */
               public Reference newKeyReference(String uri) {
                   return (new KeyReference(uri));
               }
  @@ -3753,27 +3847,30 @@
                       this.uri = _uri;
                       referenceInformation = new LinkedList();
                   }
  -            
  +                /** @inheritDoc */
                   public String getURI() {
                       return (uri);
                   }
  -
  +                /** @inheritDoc */
                   public Iterator getElementRetrievalInformation() {
                       return (referenceInformation.iterator());
                   }
  -
  +                /** @inheritDoc */
                   public void setURI(String _uri) {
                   	this.uri = _uri;
                   }
  -
  +                /** @inheritDoc */
                   public void removeElementRetrievalInformation(Element node) {
                       referenceInformation.remove(node);
                   }
  -
  +                /** @inheritDoc */
                   public void addElementRetrievalInformation(Element node) {
                       referenceInformation.add(node);
                   }
  -
  +                /**
  +                 * 
  +                 * @return
  +                 */
                   public abstract Element toElement();
   
                   Element toElement(String tagName) {
  @@ -3795,7 +3892,7 @@
                   DataReference(String uri) {
                       super(uri);
                   }
  -
  +                /** @inheritDoc */
                   public Element toElement() {
                       return super.toElement(EncryptionConstants._TAG_DATAREFERENCE);
                   }
  @@ -3805,7 +3902,7 @@
                   KeyReference(String uri) {
                       super (uri);
                   }
  -
  +                /** @inheritDoc */
                   public Element toElement() {
                       return super.toElement(EncryptionConstants._TAG_KEYREFERENCE);
                   }
  
  
  
  1.12      +8 -4      xml-security/src/org/apache/xml/security/encryption/ReferenceList.java
  
  Index: ReferenceList.java
  ===================================================================
  RCS file: /home/cvs/xml-security/src/org/apache/xml/security/encryption/ReferenceList.java,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- ReferenceList.java	20 Feb 2004 09:28:13 -0000	1.11
  +++ ReferenceList.java	24 Sep 2004 21:29:34 -0000	1.12
  @@ -38,19 +38,19 @@
    * </xmp>
    *
    * @author Axl Mattheus
  - * @see Reference.
  + * @see Reference
    */
   public interface ReferenceList {
  -
  +	/** DATA TAG */
       public static final int DATA_REFERENCE = 0x00000001;
  -
  +    /** KEY TAG */
       public static final int KEY_REFERENCE  = 0x00000002;
   
       /**
        * Adds a reference to this reference list.
        *
        * @param reference the reference to add.
  -     * @throws IllegalArgurmentException if the <code>Reference</code> is not an
  +     * @throws IllegalAccessException if the <code>Reference</code> is not an
        *   instance of <code>DataReference</code> or <code>KeyReference</code>.
        */
       public void add(Reference reference);
  @@ -88,12 +88,16 @@
       /**
        * <code>DataReference</code> factory method. Returns a
        * <code>DataReference</code>.
  +     * @param uri
  +     * @return
        */
       public Reference newDataReference(String uri);
   
       /**
        * <code>KeyReference</code> factory method. Returns a
        * <code>KeyReference</code>.
  +     * @param uri
  +     * @return
        */
       public Reference newKeyReference(String uri);
   }
  
  
  
  1.4       +27 -5     xml-security/src/org/apache/xml/security/encryption/XMLEncryptionException.java
  
  Index: XMLEncryptionException.java
  ===================================================================
  RCS file: /home/cvs/xml-security/src/org/apache/xml/security/encryption/XMLEncryptionException.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- XMLEncryptionException.java	8 Feb 2004 06:10:28 -0000	1.3
  +++ XMLEncryptionException.java	24 Sep 2004 21:29:34 -0000	1.4
  @@ -18,25 +18,47 @@
   
   import org.apache.xml.security.exceptions.XMLSecurityException;
   
  +/**
  + * 
  + */
   public class XMLEncryptionException extends XMLSecurityException {
  -
  +	/**
  +     * 
  +	 *
  +	 */
      public XMLEncryptionException() {
         super();
      }
  -
  +   /**
  +    * 
  +    * @param _msgID
  +    */
      public XMLEncryptionException(String _msgID) {
         super(_msgID);
      }
  -
  +   /**
  +    * 
  +    * @param _msgID
  +    * @param exArgs
  +    */
      public XMLEncryptionException(String _msgID, Object exArgs[]) {
         super(_msgID, exArgs);
      }
  -
  +   /**
  +    * 
  +    * @param _msgID
  +    * @param _originalException
  +    */
      public XMLEncryptionException(String _msgID,
                                                 Exception _originalException) {
         super(_msgID, _originalException);
      }
  -
  +   /**
  +    * 
  +    * @param _msgID
  +    * @param exArgs
  +    * @param _originalException
  +    */
      public XMLEncryptionException(String _msgID, Object exArgs[],
                                                 Exception _originalException) {
         super(_msgID, exArgs, _originalException);
  
  
  
  1.3       +2 -2      xml-security/src/org/apache/xml/security/encryption/Reference.java
  
  Index: Reference.java
  ===================================================================
  RCS file: /home/cvs/xml-security/src/org/apache/xml/security/encryption/Reference.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- Reference.java	8 Feb 2004 06:10:28 -0000	1.2
  +++ Reference.java	24 Sep 2004 21:29:34 -0000	1.3
  @@ -75,14 +75,14 @@
       /**
        * Adds retrieval information.
        *
  -     * @param node.
  +     * @param info.
        */
       void addElementRetrievalInformation(Element info);
   
       /**
        * Removes the specified retrieval information.
        *
  -     * @param node.
  +     * @param info.
        */
       void removeElementRetrievalInformation(Element info);
   }
  
  
  
  1.13      +1 -1      xml-security/src/org/apache/xml/security/algorithms/Algorithm.java
  
  Index: Algorithm.java
  ===================================================================
  RCS file: /home/cvs/xml-security/src/org/apache/xml/security/algorithms/Algorithm.java,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- Algorithm.java	8 Feb 2004 06:09:55 -0000	1.12
  +++ Algorithm.java	24 Sep 2004 21:29:34 -0000	1.13
  @@ -62,7 +62,7 @@
      /**
       * Method getAlgorithmURI
       *
  -    *
  +    * @return
       */
      public String getAlgorithmURI() {
         return this._constructionElement.getAttributeNS(null, Constants._ATT_ALGORITHM);