[Htmlparser-cvs] htmlparser/src/org/htmlparser/scanners ScriptScanner.java,1.51,1.52 AppletScanner.java,1.36,NONE BaseHrefScanner.java,1.31,NONE BodyScanner.java,1.23,NONE BulletListScanner.java,1.22,NONE BulletScanner.java,1.28,NONE DivScanner.java,1.34,NONE DoctypeScanner.java,1.32,NONE FormScanner.java,1.54,NONE FrameScanner.java,1.33,NONE FrameSetScanner.java,1.32,NONE HeadScanner.java,1.20,NONE HtmlScanner.java,1.34,NONE ImageScanner.java,1.35,NONE InputTagScanner.java,1.30,NONE LabelScanner.java,1.38,NONE LinkScanner.java,1.62,NONE MetaTagScanner.java,1.30,NONE OptionTagScanner.java,1.39,NONE SelectTagScanner.java,1.37,NONE SpanScanner.java,1.36,NONE StyleScanner.java,1.31,NONE TableColumnScanner.java,1.40,NONE TableRowScanner.java,1.43,NONE TableScanner.java,1.42,NONE TextareaTagScanner.java,1.34,NONE TitleScanner.java,1.36,NONE

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

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

Modified Files:
	ScriptScanner.java 
Removed Files:
	AppletScanner.java BaseHrefScanner.java BodyScanner.java 
	BulletListScanner.java BulletScanner.java DivScanner.java 
	DoctypeScanner.java FormScanner.java FrameScanner.java 
	FrameSetScanner.java HeadScanner.java HtmlScanner.java 
	ImageScanner.java InputTagScanner.java LabelScanner.java 
	LinkScanner.java MetaTagScanner.java OptionTagScanner.java 
	SelectTagScanner.java SpanScanner.java StyleScanner.java 
	TableColumnScanner.java TableRowScanner.java TableScanner.java 
	TextareaTagScanner.java TitleScanner.java 
Log Message:
Remove most of the scanners.
The only scanners left are ones that really do something different (script and jsp).
Instead of registering a scanner to enable returning a specific tag you now add a 
tag to the a PrototypicalNodeFactory. All known tags are 'registered' by default
in a new Parser which is similar to having called the old 'registerDOMScanners()',
so tags are fully nested. This is different behaviour, and specifically,
you will need to recurse into returned nodes to get at what you want.
I've tried to adjust the applications accordingly, but worked examples are still scarce.
If you want to return only some of the derived tags while keeping most as generic tags,
there are various constructors and manipulators on the factory. See the javadocs
and examples in the tests package.
Nearly all the old scanner tests are folded into the tag tests.

toString() has been revamped.
This means that the default Parser mainline now returns an indented listing of tags,
making it easy to see the structure of a page. The downside is the text of the page
had to have newlines, tabs etc. turned into escape sequences. But if you were really
interested in content you would be using toHtml() or toPlainTextString().



Index: ScriptScanner.java
===================================================================
RCS file: /cvsroot/htmlparser/htmlparser/src/org/htmlparser/scanners/ScriptScanner.java,v
retrieving revision 1.51
retrieving revision 1.52
diff -C2 -d -r1.51 -r1.52
*** ScriptScanner.java	9 Nov 2003 17:07:10 -0000	1.51
--- ScriptScanner.java	7 Dec 2003 23:41:40 -0000	1.52
***************
*** 30,35 ****
--- 30,37 ----
  
  import java.util.Vector;
+ 
  import org.htmlparser.Node;
  import org.htmlparser.Parser;
+ import org.htmlparser.PrototypicalNodeFactory;
  import org.htmlparser.RemarkNode;
  import org.htmlparser.StringNode;
***************
*** 47,51 ****
   * It gathers all interior nodes into one undifferentiated string node.
   */
! public class ScriptScanner extends CompositeTagScanner {
      private static final String SCRIPT_END_TAG = "</SCRIPT>";
      private static final String MATCH_NAME [] = {"SCRIPT"};
--- 49,56 ----
   * It gathers all interior nodes into one undifferentiated string node.
   */
! public class ScriptScanner
!     extends
!         CompositeTagScanner
! {
      private static final String SCRIPT_END_TAG = "</SCRIPT>";
      private static final String MATCH_NAME [] = {"SCRIPT"};
***************
*** 101,105 ****
          end = null;
          factory = lexer.getNodeFactory ();
!         lexer.setNodeFactory (new Parser ()); // no scanners on a new Parser right?
          try
          {
--- 106,110 ----
          end = null;
          factory = lexer.getNodeFactory ();
!         lexer.setNodeFactory (new PrototypicalNodeFactory (true));
          try
          {

--- AppletScanner.java DELETED ---

--- BaseHrefScanner.java DELETED ---

--- BodyScanner.java DELETED ---

--- BulletListScanner.java DELETED ---

--- BulletScanner.java DELETED ---

--- DivScanner.java DELETED ---

--- DoctypeScanner.java DELETED ---

--- FormScanner.java DELETED ---

--- FrameScanner.java DELETED ---

--- FrameSetScanner.java DELETED ---

--- HeadScanner.java DELETED ---

--- HtmlScanner.java DELETED ---

--- ImageScanner.java DELETED ---

--- InputTagScanner.java DELETED ---

--- LabelScanner.java DELETED ---

--- LinkScanner.java DELETED ---

--- MetaTagScanner.java DELETED ---

--- OptionTagScanner.java DELETED ---

--- SelectTagScanner.java DELETED ---

--- SpanScanner.java DELETED ---

--- StyleScanner.java DELETED ---

--- TableColumnScanner.java DELETED ---

--- TableRowScanner.java DELETED ---

--- TableScanner.java DELETED ---

--- TextareaTagScanner.java DELETED ---

--- TitleScanner.java DELETED ---