[Htmlparser-cvs] htmlparser/src/org/htmlparser/tags AppletTag.java,1.39,1.40 CompositeTag.java,1.76,1.77 ImageTag.java,1.45,1.46 MetaTag.java,1.35,1.36 Tag.java,1.63,1.64

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

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

Modified Files:
	AppletTag.java CompositeTag.java ImageTag.java MetaTag.java 
	Tag.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: ImageTag.java
===================================================================
RCS file: /cvsroot/htmlparser/htmlparser/src/org/htmlparser/tags/ImageTag.java,v
retrieving revision 1.45
retrieving revision 1.46
diff -C2 -d -r1.45 -r1.46
*** ImageTag.java	24 May 2004 00:38:17 -0000	1.45
--- ImageTag.java	24 May 2004 16:18:30 -0000	1.46
***************
*** 30,34 ****
  import java.util.Vector;
  
! import org.htmlparser.lexer.nodes.Attribute;
  import org.htmlparser.util.ParserUtils;
  import org.htmlparser.visitors.NodeVisitor;
--- 30,34 ----
  import java.util.Vector;
  
! import org.htmlparser.Attribute;
  import org.htmlparser.util.ParserUtils;
  import org.htmlparser.visitors.NodeVisitor;
***************
*** 37,41 ****
   * Identifies an image tag.
   */
! public class ImageTag extends Tag
  {
      /**
--- 37,43 ----
   * Identifies an image tag.
   */
! public class ImageTag
!     extends
!         Tag
  {
      /**

Index: MetaTag.java
===================================================================
RCS file: /cvsroot/htmlparser/htmlparser/src/org/htmlparser/tags/MetaTag.java,v
retrieving revision 1.35
retrieving revision 1.36
diff -C2 -d -r1.35 -r1.36
*** MetaTag.java	2 Jan 2004 16:24:55 -0000	1.35
--- MetaTag.java	24 May 2004 16:18:30 -0000	1.36
***************
*** 27,31 ****
  package org.htmlparser.tags;
  
! import org.htmlparser.lexer.nodes.Attribute;
  import org.htmlparser.util.ParserException;
  
--- 27,31 ----
  package org.htmlparser.tags;
  
! import org.htmlparser.Attribute;
  import org.htmlparser.util.ParserException;
  
***************
*** 33,37 ****
   * A Meta Tag
   */
! public class MetaTag extends Tag
  {
      /**
--- 33,39 ----
   * A Meta Tag
   */
! public class MetaTag
!     extends
!         Tag
  {
      /**

Index: AppletTag.java
===================================================================
RCS file: /cvsroot/htmlparser/htmlparser/src/org/htmlparser/tags/AppletTag.java,v
retrieving revision 1.39
retrieving revision 1.40
diff -C2 -d -r1.39 -r1.40
*** AppletTag.java	24 Jan 2004 23:57:52 -0000	1.39
--- AppletTag.java	24 May 2004 16:18:30 -0000	1.40
***************
*** 31,37 ****
  import java.util.Vector;
  
  import org.htmlparser.Node;
! import org.htmlparser.StringNode;
! import org.htmlparser.lexer.nodes.Attribute;
  import org.htmlparser.util.NodeList;
  import org.htmlparser.util.SimpleNodeIterator;
--- 31,37 ----
  import java.util.Vector;
  
+ import org.htmlparser.Attribute;
  import org.htmlparser.Node;
! import org.htmlparser.Text;
  import org.htmlparser.util.NodeList;
  import org.htmlparser.util.SimpleNodeIterator;
***************
*** 42,46 ****
   * archive and parameters.
   */
! public class AppletTag extends CompositeTag
  {
      /**
--- 42,48 ----
   * archive and parameters.
   */
! public class AppletTag
!     extends
!         CompositeTag
  {
      /**
***************
*** 193,197 ****
          String paramValue;
          Vector attributes;
!         StringNode string;
  
          kids = getChildren ();
--- 195,199 ----
          String paramValue;
          Vector attributes;
!         Text string;
  
          kids = getChildren ();
***************
*** 211,217 ****
                          {
                              node = kids.elementAt (i);
!                             if (node instanceof StringNode)
                              {
!                                 string = (StringNode)node;
                                  if (0 == string.getText ().trim ().length ())
                                      kids.remove (i);
--- 213,219 ----
                          {
                              node = kids.elementAt (i);
!                             if (node instanceof Text)
                              {
!                                 string = (Text)node;
                                  if (0 == string.getText ().trim ().length ())
                                      kids.remove (i);

Index: CompositeTag.java
===================================================================
RCS file: /cvsroot/htmlparser/htmlparser/src/org/htmlparser/tags/CompositeTag.java,v
retrieving revision 1.76
retrieving revision 1.77
diff -C2 -d -r1.76 -r1.77
*** CompositeTag.java	29 Feb 2004 15:09:57 -0000	1.76
--- CompositeTag.java	24 May 2004 16:18:30 -0000	1.77
***************
*** 31,37 ****
  import org.htmlparser.Node;
  import org.htmlparser.NodeFilter;
! import org.htmlparser.StringNode;
! import org.htmlparser.AbstractNode;
! import org.htmlparser.lexer.nodes.TagNode;
  import org.htmlparser.scanners.CompositeTagScanner;
  import org.htmlparser.util.NodeList;
--- 31,37 ----
  import org.htmlparser.Node;
  import org.htmlparser.NodeFilter;
! import org.htmlparser.Text;
! import org.htmlparser.nodes.AbstractNode;
! import org.htmlparser.nodes.TagNode;
  import org.htmlparser.scanners.CompositeTagScanner;
  import org.htmlparser.util.NodeList;
***************
*** 476,496 ****
  
      /**
!      * Finds a string node, however embedded it might be, and returns
!      * it. The string node will retain links to its parents, so
       * further navigation is possible.
       * @param searchText
!      * @return The list of string nodes (recursively) found.
       */
!     public StringNode [] digupStringNode(String searchText) {
          NodeList nodeList = searchFor(searchText);
          NodeList stringNodes = new NodeList();
          for (int i=0;i<nodeList.size();i++) {
              Node node = nodeList.elementAt(i);
!             if (node instanceof StringNode) {
                  stringNodes.add(node);
              } else {
                  if (node instanceof CompositeTag) {
                      CompositeTag ctag = (CompositeTag)node;
!                     StringNode [] nodes = ctag.digupStringNode(searchText);
                      for (int j=0;j<nodes.length;j++)
                          stringNodes.add(nodes[j]);
--- 476,496 ----
  
      /**
!      * Finds a text node, however embedded it might be, and returns
!      * it. The text node will retain links to its parents, so
       * further navigation is possible.
       * @param searchText
!      * @return The list of text nodes (recursively) found.
       */
!     public Text[] digupStringNode(String searchText) {
          NodeList nodeList = searchFor(searchText);
          NodeList stringNodes = new NodeList();
          for (int i=0;i<nodeList.size();i++) {
              Node node = nodeList.elementAt(i);
!             if (node instanceof Text) {
                  stringNodes.add(node);
              } else {
                  if (node instanceof CompositeTag) {
                      CompositeTag ctag = (CompositeTag)node;
!                     Text[] nodes = ctag.digupStringNode(searchText);
                      for (int j=0;j<nodes.length;j++)
                          stringNodes.add(nodes[j]);
***************
*** 498,504 ****
              }
          }
!         StringNode [] stringNode = new StringNode[stringNodes.size()];
          for (int i=0;i<stringNode.length;i++) {
!             stringNode[i] = (StringNode)stringNodes.elementAt(i);
          }
          return stringNode;
--- 498,504 ----
              }
          }
!         Text[] stringNode = new Text[stringNodes.size()];
          for (int i=0;i<stringNode.length;i++) {
!             stringNode[i] = (Text)stringNodes.elementAt(i);
          }
          return stringNode;

Index: Tag.java
===================================================================
RCS file: /cvsroot/htmlparser/htmlparser/src/org/htmlparser/tags/Tag.java,v
retrieving revision 1.63
retrieving revision 1.64
diff -C2 -d -r1.63 -r1.64
*** Tag.java	24 May 2004 00:38:18 -0000	1.63
--- Tag.java	24 May 2004 16:18:30 -0000	1.64
***************
*** 30,36 ****
  
  import org.htmlparser.lexer.Page;
! import org.htmlparser.lexer.nodes.TagNode;
  import org.htmlparser.scanners.TagScanner;
- import org.htmlparser.visitors.NodeVisitor;
  
  /**
--- 30,35 ----
  
  import org.htmlparser.lexer.Page;
! import org.htmlparser.nodes.TagNode;
  import org.htmlparser.scanners.TagScanner;
  
  /**
***************
*** 40,44 ****
   * lexer which has nodes).
   */
! public class Tag extends TagNode implements Cloneable
  {
      /**
--- 39,47 ----
   * lexer which has nodes).
   */
! public class Tag
!     extends
!         TagNode
!     implements
!         Cloneable
  {
      /**