[Htmlparser-cvs] htmlparser/src/org/htmlparser/visitors NodeVisitor.java,1.37,1.38 StringFindingVisitor.java,1.39,1.40 TextExtractingVisitor.java,1.41,1.42 UrlModifyingVisitor.java,1.44,1.45

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

Update of /cvsroot/htmlparser/htmlparser/src/org/htmlparser/visitors
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19028/src/org/htmlparser/visitors

Modified Files:
	NodeVisitor.java StringFindingVisitor.java 
	TextExtractingVisitor.java UrlModifyingVisitor.java 
Log Message:
Part three of a multiphase refactoring.
The three node types are now fronted by interfaces (program to the interface paradigm)
with concrete implementations in the new htmlparser.nodes package. Classes from the
lexer.nodes package are moved to this package, and obvious references to the concrete
classes that got broken by this have been changed to use the interfaces where possible.



Index: NodeVisitor.java
===================================================================
RCS file: /cvsroot/htmlparser/htmlparser/src/org/htmlparser/visitors/NodeVisitor.java,v
retrieving revision 1.37
retrieving revision 1.38
diff -C2 -d -r1.37 -r1.38
*** NodeVisitor.java	24 May 2004 00:38:19 -0000	1.37
--- NodeVisitor.java	24 May 2004 16:18:36 -0000	1.38
***************
*** 27,32 ****
  package org.htmlparser.visitors;
  
! import org.htmlparser.RemarkNode;
! import org.htmlparser.StringNode;
  import org.htmlparser.Tag;
  
--- 27,32 ----
  package org.htmlparser.visitors;
  
! import org.htmlparser.Remark;
! import org.htmlparser.Text;
  import org.htmlparser.Tag;
  
***************
*** 133,137 ****
       * @param string The string node being visited.
       */
!     public void visitStringNode (StringNode string)
      {
      }
--- 133,137 ----
       * @param string The string node being visited.
       */
!     public void visitStringNode (Text string)
      {
      }
***************
*** 141,145 ****
       * @param remark The remark node being visited.
       */
!     public void visitRemarkNode (RemarkNode remark)
      {
      }
--- 141,145 ----
       * @param remark The remark node being visited.
       */
!     public void visitRemarkNode (Remark remark)
      {
      }

Index: TextExtractingVisitor.java
===================================================================
RCS file: /cvsroot/htmlparser/htmlparser/src/org/htmlparser/visitors/TextExtractingVisitor.java,v
retrieving revision 1.41
retrieving revision 1.42
diff -C2 -d -r1.41 -r1.42
*** TextExtractingVisitor.java	24 May 2004 00:38:19 -0000	1.41
--- TextExtractingVisitor.java	24 May 2004 16:18:36 -0000	1.42
***************
*** 27,31 ****
  package org.htmlparser.visitors;
  
! import org.htmlparser.StringNode;
  import org.htmlparser.Tag;
  import org.htmlparser.util.Translate;
--- 27,31 ----
  package org.htmlparser.visitors;
  
! import org.htmlparser.Text;
  import org.htmlparser.Tag;
  import org.htmlparser.util.Translate;
***************
*** 55,59 ****
      }
  
!     public void visitStringNode(StringNode stringNode) {
          String text = stringNode.getText();
          if (!preTagBeingProcessed) {
--- 55,59 ----
      }
  
!     public void visitStringNode(Text stringNode) {
          String text = stringNode.getText();
          if (!preTagBeingProcessed) {

Index: UrlModifyingVisitor.java
===================================================================
RCS file: /cvsroot/htmlparser/htmlparser/src/org/htmlparser/visitors/UrlModifyingVisitor.java,v
retrieving revision 1.44
retrieving revision 1.45
diff -C2 -d -r1.44 -r1.45
*** UrlModifyingVisitor.java	24 May 2004 00:38:19 -0000	1.44
--- UrlModifyingVisitor.java	24 May 2004 16:18:36 -0000	1.45
***************
*** 29,34 ****
  import org.htmlparser.Node;
  import org.htmlparser.Parser;
! import org.htmlparser.RemarkNode;
! import org.htmlparser.StringNode;
  import org.htmlparser.tags.CompositeTag;
  import org.htmlparser.tags.ImageTag;
--- 29,34 ----
  import org.htmlparser.Node;
  import org.htmlparser.Parser;
! import org.htmlparser.Remark;
! import org.htmlparser.Text;
  import org.htmlparser.tags.CompositeTag;
  import org.htmlparser.tags.ImageTag;
***************
*** 48,57 ****
      }
  
!     public void visitRemarkNode (RemarkNode remarkNode)
      {
          modifiedResult.append (remarkNode.toHtml());
      }
  
!     public void visitStringNode(StringNode stringNode)
      {
          modifiedResult.append (stringNode.toHtml());
--- 48,57 ----
      }
  
!     public void visitRemarkNode (Remark remarkNode)
      {
          modifiedResult.append (remarkNode.toHtml());
      }
  
!     public void visitStringNode(Text stringNode)
      {
          modifiedResult.append (stringNode.toHtml());

Index: StringFindingVisitor.java
===================================================================
RCS file: /cvsroot/htmlparser/htmlparser/src/org/htmlparser/visitors/StringFindingVisitor.java,v
retrieving revision 1.39
retrieving revision 1.40
diff -C2 -d -r1.39 -r1.40
*** StringFindingVisitor.java	25 Jan 2004 21:33:14 -0000	1.39
--- StringFindingVisitor.java	24 May 2004 16:18:36 -0000	1.40
***************
*** 29,33 ****
  import java.util.Locale;
  
! import org.htmlparser.StringNode;
  
  public class StringFindingVisitor extends NodeVisitor
--- 29,33 ----
  import java.util.Locale;
  
! import org.htmlparser.Text;
  
  public class StringFindingVisitor extends NodeVisitor
***************
*** 56,60 ****
      }
  
!     public void visitStringNode(StringNode stringNode)
      {
          String stringToBeSearched = stringNode.getText().toUpperCase(locale);
--- 56,60 ----
      }
  
!     public void visitStringNode(Text stringNode)
      {
          String stringToBeSearched = stringNode.getText().toUpperCase(locale);