[Htmlparser-cvs] htmlparser/src/org/htmlparser/filters HasAttributeFilter.java,1.3,1.4 StringFilter.java,1.3,1.4 TagNameFilter.java,1.2,1.3

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

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

Modified Files:
	HasAttributeFilter.java StringFilter.java TagNameFilter.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: TagNameFilter.java
===================================================================
RCS file: /cvsroot/htmlparser/htmlparser/src/org/htmlparser/filters/TagNameFilter.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** TagNameFilter.java	25 Jan 2004 21:32:58 -0000	1.2
--- TagNameFilter.java	24 May 2004 16:18:13 -0000	1.3
***************
*** 31,35 ****
  import org.htmlparser.Node;
  import org.htmlparser.NodeFilter;
! import org.htmlparser.lexer.nodes.TagNode;
  
  /**
--- 31,35 ----
  import org.htmlparser.Node;
  import org.htmlparser.NodeFilter;
! import org.htmlparser.Tag;
  
  /**
***************
*** 62,68 ****
      public boolean accept (Node node)
      {
!         return ((node instanceof TagNode) &&
!                 !((TagNode)node).isEndTag () &&
!                 ((TagNode)node).getTagName ().equals (mName));
      }
  }
--- 62,68 ----
      public boolean accept (Node node)
      {
!         return ((node instanceof Tag) &&
!                 !((Tag)node).isEndTag () &&
!                 ((Tag)node).getTagName ().equals (mName));
      }
  }

Index: HasAttributeFilter.java
===================================================================
RCS file: /cvsroot/htmlparser/htmlparser/src/org/htmlparser/filters/HasAttributeFilter.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** HasAttributeFilter.java	25 Jan 2004 21:32:57 -0000	1.3
--- HasAttributeFilter.java	24 May 2004 16:18:13 -0000	1.4
***************
*** 29,36 ****
  import java.util.Locale;
  
  import org.htmlparser.Node;
  import org.htmlparser.NodeFilter;
! import org.htmlparser.lexer.nodes.Attribute;
! import org.htmlparser.lexer.nodes.TagNode;
  
  /**
--- 29,36 ----
  import java.util.Locale;
  
+ import org.htmlparser.Attribute;
  import org.htmlparser.Node;
  import org.htmlparser.NodeFilter;
! import org.htmlparser.Tag;
  
  /**
***************
*** 75,86 ****
      public boolean accept (Node node)
      {
!         TagNode tag;
          Attribute attribute;
          boolean ret;
  
          ret = false;
!         if (node instanceof TagNode)
          {
!             tag = (TagNode)node;
              attribute = tag.getAttributeEx (mAttribute);
              ret = null != attribute;
--- 75,86 ----
      public boolean accept (Node node)
      {
!         Tag tag;
          Attribute attribute;
          boolean ret;
  
          ret = false;
!         if (node instanceof Tag)
          {
!             tag = (Tag)node;
              attribute = tag.getAttributeEx (mAttribute);
              ret = null != attribute;

Index: StringFilter.java
===================================================================
RCS file: /cvsroot/htmlparser/htmlparser/src/org/htmlparser/filters/StringFilter.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** StringFilter.java	24 May 2004 00:38:16 -0000	1.3
--- StringFilter.java	24 May 2004 16:18:13 -0000	1.4
***************
*** 31,35 ****
  import org.htmlparser.Node;
  import org.htmlparser.NodeFilter;
! import org.htmlparser.StringNode;
  
  /**
--- 31,35 ----
  import org.htmlparser.Node;
  import org.htmlparser.NodeFilter;
! import org.htmlparser.Text;
  
  /**
***************
*** 102,108 ****
          
          ret = false;
!         if (node instanceof StringNode)
          {
!             string = ((StringNode)node).getText ();
              if (!mCaseSensitive)
                  string = string.toUpperCase (mLocale);
--- 102,108 ----
          
          ret = false;
!         if (node instanceof Text)
          {
!             string = ((Text)node).getText ();
              if (!mCaseSensitive)
                  string = string.toUpperCase (mLocale);