[Htmlparser-cvs] htmlparser/src/org/htmlparser AbstractNode.java,1.22,1.23 Node.java,1.46,1.47 Parser.java,1.77,1.78 PrototypicalNodeFactory.java,1.1,1.2 StringNodeFactory.java,1.9,1.10

[<der...@us...>]

Update of /cvsroot/htmlparser/htmlparser/src/org/htmlparser
In directory sc8-pr-cvs1:/tmp/cvs-serv763

Modified Files:
	AbstractNode.java Node.java Parser.java 
	PrototypicalNodeFactory.java StringNodeFactory.java 
Log Message:
Eliminate deprecation warnings.
Clean up javadoc warnings.



Index: AbstractNode.java
===================================================================
RCS file: /cvsroot/htmlparser/htmlparser/src/org/htmlparser/AbstractNode.java,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -d -r1.22 -r1.23
*** AbstractNode.java	8 Dec 2003 01:31:50 -0000	1.22
--- AbstractNode.java	8 Dec 2003 13:13:58 -0000	1.23
***************
*** 119,123 ****
       * get it at the top-level, as many tags (like form tags), can contain
       * links embedded in them. We could get the links out by checking if the
!      * current node is a {@link CompositeTag}, and going through its children.
       * So this method provides a convenient way to do this.<P>
       *
--- 119,123 ----
       * get it at the top-level, as many tags (like form tags), can contain
       * links embedded in them. We could get the links out by checking if the
!      * current node is a {@link org.htmlparser.tags.CompositeTag}, and going through its children.
       * So this method provides a convenient way to do this.<P>
       *

Index: Node.java
===================================================================
RCS file: /cvsroot/htmlparser/htmlparser/src/org/htmlparser/Node.java,v
retrieving revision 1.46
retrieving revision 1.47
diff -C2 -d -r1.46 -r1.47
*** Node.java	8 Dec 2003 01:31:51 -0000	1.46
--- Node.java	8 Dec 2003 13:13:58 -0000	1.47
***************
*** 74,78 ****
       * get it at the top-level, as many tags (like form tags), can contain
       * links embedded in them. We could get the links out by checking if the
!      * current node is a {@link CompositeTag}, and going through its children.
       * So this method provides a convenient way to do this.<P>
       *
--- 74,78 ----
       * get it at the top-level, as many tags (like form tags), can contain
       * links embedded in them. We could get the links out by checking if the
!      * current node is a {@link org.htmlparser.tags.CompositeTag}, and going through its children.
       * So this method provides a convenient way to do this.<P>
       *

Index: Parser.java
===================================================================
RCS file: /cvsroot/htmlparser/htmlparser/src/org/htmlparser/Parser.java,v
retrieving revision 1.77
retrieving revision 1.78
diff -C2 -d -r1.77 -r1.78
*** Parser.java	8 Dec 2003 01:31:51 -0000	1.77
--- Parser.java	8 Dec 2003 13:13:58 -0000	1.78
***************
*** 202,206 ****
       * </li>
       * </ul>
!      * @param rd The reader to draw characters from.
       * @param fb The object to use when information,
       * warning and error messages are produced. If <em>null</em> no feedback
--- 202,206 ----
       * </li>
       * </ul>
!      * @param lexer The lexer to draw characters from.
       * @param fb The object to use when information,
       * warning and error messages are produced. If <em>null</em> no feedback
***************
*** 267,271 ****
       * </pre>
       * </li>
!      * @param reader The source for HTML to be parsed.
       */
      public Parser (Lexer lexer)
--- 267,271 ----
       * </pre>
       * </li>
!      * @param lexer The source for HTML to be parsed.
       */
      public Parser (Lexer lexer)
***************
*** 346,350 ****
      /**
       * Set the encoding for the page this parser is reading from.
!      * @param The new character set to use.
       */
      public void setEncoding (String encoding)
--- 346,350 ----
      /**
       * Set the encoding for the page this parser is reading from.
!      * @param encoding The new character set to use.
       */
      public void setEncoding (String encoding)
***************
*** 469,473 ****
       * }
       * </pre>
-      * @param filter The filter to apply to the nodes.
       */
      public NodeIterator elements () throws ParserException
--- 469,472 ----
***************
*** 657,661 ****
      /**
       * Extract all nodes matching the given filter.
!      * @see Node#collectInto()
       */
      public NodeList extractAllNodesThatMatch (NodeFilter filter) throws ParserException
--- 656,660 ----
      /**
       * Extract all nodes matching the given filter.
!      * @see Node#collectInto(NodeList, NodeFilter)
       */
      public NodeList extractAllNodesThatMatch (NodeFilter filter) throws ParserException
***************
*** 673,677 ****
      /**
       * Convenience method to extract all nodes of a given class type.
!      * @see Node#collectInto()
       */
      public Node [] extractAllNodesThatAre (Class nodeType) throws ParserException
--- 672,676 ----
      /**
       * Convenience method to extract all nodes of a given class type.
!      * @see Node#collectInto(NodeList, NodeFilter)
       */
      public Node [] extractAllNodesThatAre (Class nodeType) throws ParserException

Index: PrototypicalNodeFactory.java
===================================================================
RCS file: /cvsroot/htmlparser/htmlparser/src/org/htmlparser/PrototypicalNodeFactory.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** PrototypicalNodeFactory.java	7 Dec 2003 23:41:39 -0000	1.1
--- PrototypicalNodeFactory.java	8 Dec 2003 13:13:58 -0000	1.2
***************
*** 108,114 ****
  
      /**
!      * Adds a tag to the registry.
!      * @param id The name under which to register the tag.
!      * @param tag The tag to be returned from a createTag(id) call.
       */
      public Tag get (String id)
--- 108,114 ----
  
      /**
!      * Gets a tag from the registry.
!      * @param id The name of the tag to return.
!      * @return The tag registered under the id name or <code>null</code> if none.
       */
      public Tag get (String id)
***************
*** 119,123 ****
      /**
       * Remove a tag from the registry.
!      * @param id The name under which to register the tag.
       * @return The tag that was registered with that id.
       */
--- 119,123 ----
      /**
       * Remove a tag from the registry.
!      * @param id The name of the tag to remove.
       * @return The tag that was registered with that id.
       */

Index: StringNodeFactory.java
===================================================================
RCS file: /cvsroot/htmlparser/htmlparser/src/org/htmlparser/StringNodeFactory.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** StringNodeFactory.java	8 Dec 2003 01:31:51 -0000	1.9
--- StringNodeFactory.java	8 Dec 2003 13:13:58 -0000	1.10
***************
*** 56,61 ****
  
      /**
!      * Flag to tell the parser to convert non breaking space
!      * (i.e. \u00a0) to a space (" ").  If true, this will happen inside StringNode's toPlainTextString.
       */
      protected boolean mConvertNonBreakingSpaces;
--- 56,61 ----
  
      /**
!      * Flag to tell the parser to convert non breaking space (from \u00a0 to a space " ").
!      * If true, this will happen inside StringNode's toPlainTextString.
       */
      protected boolean mConvertNonBreakingSpaces;
***************
*** 113,117 ****
      /**
       * Set the escape removing state.
!      * @param decode If <code>true</code>, string nodes remove escape characters.
       */
      public void setRemoveEscapes (boolean remove)
--- 113,117 ----
      /**
       * Set the escape removing state.
!      * @param remove If <code>true</code>, string nodes remove escape characters.
       */
      public void setRemoveEscapes (boolean remove)