Update of /cvsroot/htmlparser/htmlparser/src/org/htmlparser
In directory sc8-pr-cvs1:/tmp/cvs-serv12839/src/org/htmlparser
Modified Files:
Parser.java
Log Message:
Move LinkProcess out of scanners and into Page, untangling A, IMG and BASE scanners.
Move form action determination to tag.
The scanners have no special actions on behalf of tags anymore.
Index: Parser.java
===================================================================
RCS file: /cvsroot/htmlparser/htmlparser/src/org/htmlparser/Parser.java,v
retrieving revision 1.71
retrieving revision 1.72
diff -C2 -d -r1.71 -r1.72
*** Parser.java 28 Oct 2003 12:54:21 -0000 1.71
--- Parser.java 29 Oct 2003 03:31:17 -0000 1.72
***************
*** 49,52 ****
--- 49,53 ----
import org.htmlparser.nodeDecorators.NonBreakingSpaceConvertingNode;
import org.htmlparser.scanners.AppletScanner;
+ import org.htmlparser.scanners.BaseHrefScanner;
import org.htmlparser.scanners.BodyScanner;
import org.htmlparser.scanners.BulletListScanner;
***************
*** 57,60 ****
--- 58,62 ----
import org.htmlparser.scanners.HeadScanner;
import org.htmlparser.scanners.HtmlScanner;
+ import org.htmlparser.scanners.ImageScanner;
import org.htmlparser.scanners.JspScanner;
import org.htmlparser.scanners.LinkScanner;
***************
*** 686,700 ****
* This method should be invoked in order to register some common scanners. The scanners that get added are : <br>
* LinkScanner (filter key "-l")<br>
! * HTMLImageScanner (filter key "-i")<br>
! * HTMLScriptScanner (filter key "-s") <br>
! * HTMLStyleScanner (filter key "-t") <br>
! * HTMLJspScanner (filter key "-j") <br>
! * HTMLAppletScanner (filter key "-a") <br>
! * HTMLMetaTagScanner (filter key "-m") <br>
! * HTMLTitleScanner (filter key "-t") <br>
! * HTMLDoctypeScanner (filter key "-d") <br>
! * HTMLFormScanner (filter key "-f") <br>
! * HTMLFrameSetScanner(filter key "-r") <br>
! * HTMLBaseHREFScanner(filter key "-b") <br>
* <br>
* Call this method after creating the Parser object. e.g. <BR>
--- 688,704 ----
* This method should be invoked in order to register some common scanners. The scanners that get added are : <br>
* LinkScanner (filter key "-l")<br>
! * ImageScanner (filter key "-i")<br>
! * ScriptScanner (filter key "-s") <br>
! * StyleScanner (filter key "-t") <br>
! * JspScanner (filter key "-j") <br>
! * AppletScanner (filter key "-a") <br>
! * MetaTagScanner (filter key "-m") <br>
! * TitleScanner (filter key "-t") <br>
! * DoctypeScanner (filter key "-d") <br>
! * FormScanner (filter key "-f") <br>
! * FrameSetScanner(filter key "-r") <br>
! * BulletListScanner(filter key "-bulletList") <br>
! * DivScanner(filter key "-div") <br>
! * TableScanner(filter key "") <br>
* <br>
* Call this method after creating the Parser object. e.g. <BR>
***************
*** 710,719 ****
return;
}
! LinkScanner linkScanner = new LinkScanner(LinkTag.LINK_TAG_FILTER);
! // Note - The BaseHREF and Image scanners share the same
! // link processor - internally linked up with the factory
! // method in the link scanner class
! addScanner(linkScanner);
! addScanner(linkScanner.createImageScanner(ImageTag.IMAGE_TAG_FILTER));
addScanner(new ScriptScanner("-s"));
addScanner(new StyleScanner("-t"));
--- 714,719 ----
return;
}
! addScanner(new LinkScanner(LinkTag.LINK_TAG_FILTER));
! addScanner(new ImageScanner(ImageTag.IMAGE_TAG_FILTER));
addScanner(new ScriptScanner("-s"));
addScanner(new StyleScanner("-t"));
***************
*** 725,729 ****
addScanner(new FormScanner("-f",this));
addScanner(new FrameSetScanner("-r"));
! addScanner(linkScanner.createBaseHREFScanner("-b"));
addScanner(new BulletListScanner("-bulletList",this));
// addScanner(new SpanScanner("-p"));
--- 725,729 ----
addScanner(new FormScanner("-f",this));
addScanner(new FrameSetScanner("-r"));
! addScanner(new BaseHrefScanner("-b"));
addScanner(new BulletListScanner("-bulletList",this));
// addScanner(new SpanScanner("-p"));
|
