htmlparser-cvs

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

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

Modified Files:
	CssSelectorNodeFilter.java HasParentFilter.java 
Log Message:
Part four of a multiphase refactoring.
Most internals now use the Tag interface.
This interface has been broadened to add set/get scanner and set/get endtag.
Removed the org.htmlparser.tags.Tag class and moved the remaining (minor) functionality
to the TagNode class. So now tags inherit directly from TagNode or CompositeTag.
** NOTE: If you have subclassed org.htmlparser.tags.Tag, use org.htmlparser.nodes.TagNode now.**
Removed deprecated methods getTagBegin/getTagEnd and deleted unused classes:
PeekingIterator and it's Implementation.



Index: HasParentFilter.java
===================================================================
RCS file: /cvsroot/htmlparser/htmlparser/src/org/htmlparser/filters/HasParentFilter.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** HasParentFilter.java	8 Jun 2004 10:20:19 -0000	1.2
--- HasParentFilter.java	2 Jul 2004 00:49:27 -0000	1.3
***************
*** 29,33 ****
  import org.htmlparser.Node;
  import org.htmlparser.NodeFilter;
! import org.htmlparser.tags.Tag;
  import org.htmlparser.util.NodeList;
  
--- 29,33 ----
  import org.htmlparser.Node;
  import org.htmlparser.NodeFilter;
! import org.htmlparser.Tag;
  import org.htmlparser.util.NodeList;
  

Index: CssSelectorNodeFilter.java
===================================================================
RCS file: /cvsroot/htmlparser/htmlparser/src/org/htmlparser/filters/CssSelectorNodeFilter.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** CssSelectorNodeFilter.java	22 May 2004 12:28:15 -0000	1.2
--- CssSelectorNodeFilter.java	2 Jul 2004 00:49:27 -0000	1.3
***************
*** 27,40 ****
  package org.htmlparser.filters;
  
! import org.htmlparser.*;
  import org.htmlparser.lexer.Lexer;
- import org.htmlparser.tags.Tag;
  import org.htmlparser.util.NodeIterator;
  import org.htmlparser.util.NodeList;
  
- import java.util.regex.Matcher;
- import java.util.regex.Pattern;
- import java.net.URLConnection;
- 
  /**
   * A NodeFilter that accepts nodes based on whether they match a CSS2 selector.
--- 27,41 ----
  package org.htmlparser.filters;
  
! import java.net.URLConnection;
! import java.util.regex.Matcher;
! import java.util.regex.Pattern;
! 
! import org.htmlparser.Node;
! import org.htmlparser.NodeFilter;
! import org.htmlparser.Tag;
  import org.htmlparser.lexer.Lexer;
  import org.htmlparser.util.NodeIterator;
  import org.htmlparser.util.NodeList;
  
  /**
   * A NodeFilter that accepts nodes based on whether they match a CSS2 selector.