[Htmlparser-cvs] htmlparser/src/org/htmlparser/nodeDecorators AbstractNodeDecorator.java,1.14,1.15

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

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

Modified Files:
	AbstractNodeDecorator.java 
Log Message:
Implement generic node filtering.
Added the NodeFilter interface and the filter package.
Sideline tag specific scanners; tags now use only one scanner of each type,
TagScanner or CompositeTagScanner (except for ScriptScanner).
Obviated PeekingIterator by moving the META tag semantics to doSemanticAction,
much simpler, old IteratorImpl is now PeekingIteratorImpl but deprecated.



Index: AbstractNodeDecorator.java
===================================================================
RCS file: /cvsroot/htmlparser/htmlparser/src/org/htmlparser/nodeDecorators/AbstractNodeDecorator.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** AbstractNodeDecorator.java	1 Nov 2003 21:55:42 -0000	1.14
--- AbstractNodeDecorator.java	8 Nov 2003 21:30:56 -0000	1.15
***************
*** 32,36 ****
--- 32,38 ----
  
  import org.htmlparser.Node;
+ import org.htmlparser.NodeFilter;
  import org.htmlparser.util.NodeList;
+ import org.htmlparser.util.ParserException;
  
  public abstract class AbstractNodeDecorator implements Node {
***************
*** 45,54 ****
      }
  
!     public void collectInto(NodeList collectionList, Class nodeType) {
!         delegate.collectInto(collectionList, nodeType);
!     }
! 
!     public void collectInto(NodeList collectionList, String filter) {
!         delegate.collectInto(collectionList, filter);
      }
  
--- 47,52 ----
      }
  
!     public void collectInto(NodeList list, NodeFilter filter) {
!         delegate.collectInto(list, filter);
      }
  
***************
*** 147,151 ****
      }
  
!     public void doSemanticAction () {
          delegate.doSemanticAction ();
      }
--- 145,149 ----
      }
  
!     public void doSemanticAction () throws ParserException {
          delegate.doSemanticAction ();
      }