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 2005/04/02 20:53:27 UTC

cvs commit: xml-security/src/org/apache/xml/security/signature XMLSignatureInput.java XMLSignatureInputDebugger.java

raul        2005/04/02 10:53:27

  Modified:    src/org/apache/xml/security/signature XMLSignatureInput.java
                        XMLSignatureInputDebugger.java
  Log:
  Fixed eclipse javadocs warning. And remove unneeded params in xmlsingatureinputdebuging
  
  Revision  Changes    Path
  1.40      +4 -7      xml-security/src/org/apache/xml/security/signature/XMLSignatureInput.java
  
  Index: XMLSignatureInput.java
  ===================================================================
  RCS file: /home/cvs/xml-security/src/org/apache/xml/security/signature/XMLSignatureInput.java,v
  retrieving revision 1.39
  retrieving revision 1.40
  diff -u -r1.39 -r1.40
  --- XMLSignatureInput.java	23 Mar 2005 18:14:54 -0000	1.39
  +++ XMLSignatureInput.java	2 Apr 2005 18:53:27 -0000	1.40
  @@ -159,7 +159,6 @@
       * method included the node and <I>all</I> his descendants in the output.
       *
       * @param rootNode
  -    * @param usedXPathAPI
       */
      public XMLSignatureInput(Node rootNode)
      {
  @@ -171,7 +170,6 @@
       * Constructor XMLSignatureInput
       *
       * @param inputNodeSet
  -    * @param usedXPathAPI
       */
      public XMLSignatureInput(Set inputNodeSet) {
      	    this._inputNodeSet = inputNodeSet;
  @@ -286,17 +284,16 @@
       * Returns the Octect stream(byte Stream) from input which was specified as the parameter of {@link XMLSignatureInput} constructor
       *
       * @return the Octect stream(byte Stream) from input which was specified as the parameter of {@link XMLSignatureInput} constructor
  -    * @throws CanonicalizationException
       * @throws IOException
       */
      public InputStream getOctetStream()
  -           throws IOException, CanonicalizationException {
  +           throws IOException  {
            	  
         return getResetableInputStream();                 
   
      }
      /**
  -     * @return
  +     * @return real octect stream
        */
       public InputStream getOctetStreamReal () {
          return this._inputOctetStreamProxy;
  @@ -470,7 +467,7 @@
       */
      public String getHTMLRepresentation() throws XMLSignatureException {
   
  -      XMLSignatureInputDebugger db = new XMLSignatureInputDebugger(this, this);
  +      XMLSignatureInputDebugger db = new XMLSignatureInputDebugger(this);
   
         return db.getHTMLRepresentation();
      }
  @@ -485,7 +482,7 @@
      public String getHTMLRepresentation(Set inclusiveNamespaces)
              throws XMLSignatureException {
   
  -      XMLSignatureInputDebugger db = new XMLSignatureInputDebugger(this, this,
  +      XMLSignatureInputDebugger db = new XMLSignatureInputDebugger( this,
                                           inclusiveNamespaces);
   
         return db.getHTMLRepresentation();
  
  
  
  1.3       +8 -15     xml-security/src/org/apache/xml/security/signature/XMLSignatureInputDebugger.java
  
  Index: XMLSignatureInputDebugger.java
  ===================================================================
  RCS file: /home/cvs/xml-security/src/org/apache/xml/security/signature/XMLSignatureInputDebugger.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- XMLSignatureInputDebugger.java	7 Mar 2005 20:39:33 -0000	1.2
  +++ XMLSignatureInputDebugger.java	2 Apr 2005 18:53:27 -0000	1.3
  @@ -40,10 +40,7 @@
    */
   public class XMLSignatureInputDebugger {
   
  -	/**
  -	 * 
  -	 */
  -	private final XMLSignatureInput input;
  +
   
   	/** Field _xmlSignatureInput */
   	private Set _xpathNodeSet;
  @@ -132,21 +129,18 @@
   	static final AttrCompare ATTR_COMPARE = new AttrCompare();
   
   	// J+
  -	private XMLSignatureInputDebugger(XMLSignatureInput input) {
  -		this.input = input;
  +	private XMLSignatureInputDebugger() {
   		// do nothing
   	}
   
   	/**
   	 * Constructor XMLSignatureInputDebugger
   	 * 
  -	 * @param xmlSignatureInput
  -	 * @param input the signatur to pretty print
  +	 * @param xmlSignatureInput the signatur to pretty print
   	 */
  -	public XMLSignatureInputDebugger(XMLSignatureInput input,
  +	public XMLSignatureInputDebugger(
   			XMLSignatureInput xmlSignatureInput) {
   
  -		this.input = input;
   		if (!xmlSignatureInput.isNodeSet()) {
   			this._xpathNodeSet = null;
   		} else {
  @@ -157,14 +151,13 @@
   	/**
   	 * Constructor XMLSignatureInputDebugger
   	 * 
  -	 * @param xmlSignatureInput
  +	 * @param xmlSignatureInput the signatur to pretty print
   	 * @param inclusiveNamespace
  -	 * @param input the signatur to pretty print
   	 */
  -	public XMLSignatureInputDebugger(XMLSignatureInput input,
  +	public XMLSignatureInputDebugger(
   			XMLSignatureInput xmlSignatureInput, Set inclusiveNamespace) {
   
  -		this(input, xmlSignatureInput);
  +		this(xmlSignatureInput);
   
   		this._inclusiveNamespaces = inclusiveNamespace;
   	}