[Htmlparser-cvs] htmlparser/src/org/htmlparser/scanners AppletScanner.java,1.34,1.35 BodyScanner.jav
Brought to you by:
derrickoswald
Menu
▾
▴
[Htmlparser-cvs] htmlparser/src/org/htmlparser/scanners AppletScanner.java,1.34,1.35 BodyScanner.java,1.21,1.22 BulletListScanner.java,1.20,1.21 BulletScanner.java,1.26,1.27 CompositeTagScanner.java,1.76,1.77 DivScanner.java,1.32,1.33 FormScanner.java,1.52,1.53 FrameSetScanner.java,1.30,1.31 HeadScanner.java,1.18,1.19 HtmlScanner.java,1.32,1.33 LabelScanner.java,1.36,1.37 LinkScanner.java,1.59,1.60 OptionTagScanner.java,1.37,1.38 ScriptScanner.java,1.46,1.47 SelectTagScanner.java,1.35,1.36 SpanScanner.java,1.34,1.35 StyleScanner.java,1.29,1.30 TableColumnScanner.java,1.38,1.39 TableRowScanner.java,1.41,1.42 TableScanner.java,1.40,1.41 TextareaTagScanner.java,1.32,1.33 TitleScanner.java,1.34,1.35
Update of /cvsroot/htmlparser/htmlparser/src/org/htmlparser/scanners
In directory sc8-pr-cvs1:/tmp/cvs-serv6096/scanners
Modified Files:
AppletScanner.java BodyScanner.java BulletListScanner.java
BulletScanner.java CompositeTagScanner.java DivScanner.java
FormScanner.java FrameSetScanner.java HeadScanner.java
HtmlScanner.java LabelScanner.java LinkScanner.java
OptionTagScanner.java ScriptScanner.java SelectTagScanner.java
SpanScanner.java StyleScanner.java TableColumnScanner.java
TableRowScanner.java TableScanner.java TextareaTagScanner.java
TitleScanner.java
Log Message:
Remove unused nameOfTagToMatch member in CompositeTag.
This is the job of getID() on superclass TagScanner.
Index: AppletScanner.java
===================================================================
RCS file: /cvsroot/htmlparser/htmlparser/src/org/htmlparser/scanners/AppletScanner.java,v
retrieving revision 1.34
retrieving revision 1.35
diff -C2 -d -r1.34 -r1.35
*** AppletScanner.java 26 Oct 2003 19:46:19 -0000 1.34
--- AppletScanner.java 31 Oct 2003 12:56:08 -0000 1.35
***************
*** 45,53 ****
public AppletScanner() {
- super(MATCH_STRING);
}
public AppletScanner(String filter) {
! super(filter,MATCH_STRING);
}
--- 45,52 ----
public AppletScanner() {
}
public AppletScanner(String filter) {
! super(filter);
}
Index: BodyScanner.java
===================================================================
RCS file: /cvsroot/htmlparser/htmlparser/src/org/htmlparser/scanners/BodyScanner.java,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** BodyScanner.java 28 Oct 2003 10:31:02 -0000 1.21
--- BodyScanner.java 31 Oct 2003 12:56:08 -0000 1.22
***************
*** 52,56 ****
public BodyScanner(String filter)
{
! super(filter,MATCH_NAME,MATCH_NAME,END_TAG_ENDERS);
}
--- 52,56 ----
public BodyScanner(String filter)
{
! super(filter,MATCH_NAME,END_TAG_ENDERS);
}
Index: BulletListScanner.java
===================================================================
RCS file: /cvsroot/htmlparser/htmlparser/src/org/htmlparser/scanners/BulletListScanner.java,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** BulletListScanner.java 28 Oct 2003 03:04:18 -0000 1.20
--- BulletListScanner.java 31 Oct 2003 12:56:08 -0000 1.21
***************
*** 54,58 ****
public BulletListScanner(String filter, Parser parser)
{
! super(filter, MATCH_STRING, ENDERS);
parser.addScanner(new BulletScanner("-bullet"));
}
--- 54,58 ----
public BulletListScanner(String filter, Parser parser)
{
! super(filter, ENDERS);
parser.addScanner(new BulletScanner("-bullet"));
}
Index: BulletScanner.java
===================================================================
RCS file: /cvsroot/htmlparser/htmlparser/src/org/htmlparser/scanners/BulletScanner.java,v
retrieving revision 1.26
retrieving revision 1.27
diff -C2 -d -r1.26 -r1.27
*** BulletScanner.java 28 Oct 2003 10:31:02 -0000 1.26
--- BulletScanner.java 31 Oct 2003 12:56:08 -0000 1.27
***************
*** 54,58 ****
public BulletScanner(String filter)
{
! super(filter, MATCH_STRING, ENDERS, END_TAG_ENDERS);
}
--- 54,58 ----
public BulletScanner(String filter)
{
! super(filter, ENDERS, END_TAG_ENDERS);
}
Index: CompositeTagScanner.java
===================================================================
RCS file: /cvsroot/htmlparser/htmlparser/src/org/htmlparser/scanners/CompositeTagScanner.java,v
retrieving revision 1.76
retrieving revision 1.77
diff -C2 -d -r1.76 -r1.77
*** CompositeTagScanner.java 28 Oct 2003 12:54:21 -0000 1.76
--- CompositeTagScanner.java 31 Oct 2003 12:56:08 -0000 1.77
***************
*** 93,131 ****
public abstract class CompositeTagScanner extends TagScanner
{
- protected String [] nameOfTagToMatch;
protected Set tagEnderSet;
private Set endTagEnderSet;
private boolean balance_quotes;
! public CompositeTagScanner(String [] nameOfTagToMatch)
{
! this(nameOfTagToMatch,new String[] {});
}
! public CompositeTagScanner(String [] nameOfTagToMatch, String [] tagEnders)
{
! this("",nameOfTagToMatch,tagEnders);
}
! public CompositeTagScanner(String filter, String [] nameOfTagToMatch)
{
! this(filter,nameOfTagToMatch,new String [] {});
}
public CompositeTagScanner(
String filter,
- String [] nameOfTagToMatch,
String [] tagEnders)
{
! this(filter,nameOfTagToMatch,tagEnders,new String[] {});
}
public CompositeTagScanner(
String filter,
- String [] nameOfTagToMatch,
String [] tagEnders,
String [] endTagEnders)
{
! this(filter,nameOfTagToMatch,tagEnders,endTagEnders, false);
}
--- 93,128 ----
public abstract class CompositeTagScanner extends TagScanner
{
protected Set tagEnderSet;
private Set endTagEnderSet;
private boolean balance_quotes;
! public CompositeTagScanner()
{
! this(new String[] {});
}
! public CompositeTagScanner(String [] tagEnders)
{
! this("",tagEnders);
}
! public CompositeTagScanner(String filter)
{
! this(filter,new String [] {});
}
public CompositeTagScanner(
String filter,
String [] tagEnders)
{
! this(filter,tagEnders,new String[] {});
}
public CompositeTagScanner(
String filter,
String [] tagEnders,
String [] endTagEnders)
{
! this(filter,tagEnders,endTagEnders, false);
}
***************
*** 135,139 ****
* to pass through. This can be useful when one wishes to dynamically filter
* out all tags except one type which may be programmed later than the parser.
- * @param nameOfTagToMatch The tag names recognized by this scanner.
* @param tagEnders The non-endtag tag names which signal that no closing
* end tag was found. For example, encountering <FORM> while
--- 132,135 ----
***************
*** 153,157 ****
public CompositeTagScanner(
String filter,
- String [] nameOfTagToMatch,
String [] tagEnders,
String [] endTagEnders,
--- 149,152 ----
***************
*** 159,163 ****
{
super(filter);
- this.nameOfTagToMatch = nameOfTagToMatch;
this.balance_quotes = balance_quotes;
this.tagEnderSet = new HashSet();
--- 154,157 ----
Index: DivScanner.java
===================================================================
RCS file: /cvsroot/htmlparser/htmlparser/src/org/htmlparser/scanners/DivScanner.java,v
retrieving revision 1.32
retrieving revision 1.33
diff -C2 -d -r1.32 -r1.33
*** DivScanner.java 26 Oct 2003 19:46:19 -0000 1.32
--- DivScanner.java 31 Oct 2003 12:56:08 -0000 1.33
***************
*** 50,54 ****
public DivScanner(String filter)
{
! super(filter, MATCH_STRING);
}
--- 50,54 ----
public DivScanner(String filter)
{
! super(filter);
}
Index: FormScanner.java
===================================================================
RCS file: /cvsroot/htmlparser/htmlparser/src/org/htmlparser/scanners/FormScanner.java,v
retrieving revision 1.52
retrieving revision 1.53
diff -C2 -d -r1.52 -r1.53
*** FormScanner.java 29 Oct 2003 03:31:17 -0000 1.52
--- FormScanner.java 31 Oct 2003 12:56:08 -0000 1.53
***************
*** 62,66 ****
public FormScanner(String filter, Parser parser)
{
! super(filter,MATCH_ID,formTagEnders);
parser.addScanner(new InputTagScanner("-i"));
parser.addScanner(new TextareaTagScanner("-t"));
--- 62,66 ----
public FormScanner(String filter, Parser parser)
{
! super(filter,formTagEnders);
parser.addScanner(new InputTagScanner("-i"));
parser.addScanner(new TextareaTagScanner("-t"));
Index: FrameSetScanner.java
===================================================================
RCS file: /cvsroot/htmlparser/htmlparser/src/org/htmlparser/scanners/FrameSetScanner.java,v
retrieving revision 1.30
retrieving revision 1.31
diff -C2 -d -r1.30 -r1.31
*** FrameSetScanner.java 26 Oct 2003 19:46:19 -0000 1.30
--- FrameSetScanner.java 31 Oct 2003 12:56:08 -0000 1.31
***************
*** 46,55 ****
public FrameSetScanner()
{
- super(MATCH_NAME);
}
public FrameSetScanner(String filter)
{
! super(filter,MATCH_NAME);
}
--- 46,54 ----
public FrameSetScanner()
{
}
public FrameSetScanner(String filter)
{
! super(filter);
}
Index: HeadScanner.java
===================================================================
RCS file: /cvsroot/htmlparser/htmlparser/src/org/htmlparser/scanners/HeadScanner.java,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** HeadScanner.java 28 Oct 2003 10:31:02 -0000 1.18
--- HeadScanner.java 31 Oct 2003 12:56:08 -0000 1.19
***************
*** 55,59 ****
public HeadScanner(String filter)
{
! super(filter,MATCH_NAME,ENDERS,END_TAG_ENDERS);
}
--- 55,59 ----
public HeadScanner(String filter)
{
! super(filter,ENDERS,END_TAG_ENDERS);
}
Index: HtmlScanner.java
===================================================================
RCS file: /cvsroot/htmlparser/htmlparser/src/org/htmlparser/scanners/HtmlScanner.java,v
retrieving revision 1.32
retrieving revision 1.33
diff -C2 -d -r1.32 -r1.33
*** HtmlScanner.java 26 Oct 2003 19:46:19 -0000 1.32
--- HtmlScanner.java 31 Oct 2003 12:56:08 -0000 1.33
***************
*** 47,51 ****
public HtmlScanner(String filter) {
! super(filter, MATCH_STRING);
}
--- 47,51 ----
public HtmlScanner(String filter) {
! super(filter);
}
Index: LabelScanner.java
===================================================================
RCS file: /cvsroot/htmlparser/htmlparser/src/org/htmlparser/scanners/LabelScanner.java,v
retrieving revision 1.36
retrieving revision 1.37
diff -C2 -d -r1.36 -r1.37
*** LabelScanner.java 28 Oct 2003 10:31:02 -0000 1.36
--- LabelScanner.java 31 Oct 2003 12:56:08 -0000 1.37
***************
*** 43,51 ****
public LabelScanner() {
! super(MATCH_NAME,MATCH_NAME);
}
public LabelScanner(String filter) {
! super(filter,MATCH_NAME,MATCH_NAME);
}
--- 43,51 ----
public LabelScanner() {
! super(MATCH_NAME);
}
public LabelScanner(String filter) {
! super(filter,MATCH_NAME);
}
Index: LinkScanner.java
===================================================================
RCS file: /cvsroot/htmlparser/htmlparser/src/org/htmlparser/scanners/LinkScanner.java,v
retrieving revision 1.59
retrieving revision 1.60
diff -C2 -d -r1.59 -r1.60
*** LinkScanner.java 29 Oct 2003 03:31:17 -0000 1.59
--- LinkScanner.java 31 Oct 2003 12:56:08 -0000 1.60
***************
*** 67,71 ****
*/
public LinkScanner(String filter) {
! super(filter,MATCH_NAME,ENDERS,ENDTAG_ENDERS);
}
--- 67,71 ----
*/
public LinkScanner(String filter) {
! super(filter,ENDERS,ENDTAG_ENDERS);
}
Index: OptionTagScanner.java
===================================================================
RCS file: /cvsroot/htmlparser/htmlparser/src/org/htmlparser/scanners/OptionTagScanner.java,v
retrieving revision 1.37
retrieving revision 1.38
diff -C2 -d -r1.37 -r1.38
*** OptionTagScanner.java 28 Oct 2003 10:31:02 -0000 1.37
--- OptionTagScanner.java 31 Oct 2003 12:56:08 -0000 1.38
***************
*** 44,48 ****
public OptionTagScanner(String filter) {
! super(filter, MATCH_NAME, ENDERS, END_TAG_ENDERS);
}
--- 44,48 ----
public OptionTagScanner(String filter) {
! super(filter, ENDERS, END_TAG_ENDERS);
}
Index: ScriptScanner.java
===================================================================
RCS file: /cvsroot/htmlparser/htmlparser/src/org/htmlparser/scanners/ScriptScanner.java,v
retrieving revision 1.46
retrieving revision 1.47
diff -C2 -d -r1.46 -r1.47
*** ScriptScanner.java 28 Oct 2003 12:54:21 -0000 1.46
--- ScriptScanner.java 31 Oct 2003 12:56:08 -0000 1.47
***************
*** 52,64 ****
public ScriptScanner() {
! super("",MATCH_NAME,ENDERS);
}
public ScriptScanner(String filter) {
! super(filter,MATCH_NAME,ENDERS);
! }
!
! public ScriptScanner(String filter, String[] nameOfTagToMatch) {
! super(filter,nameOfTagToMatch,ENDERS);
}
--- 52,60 ----
public ScriptScanner() {
! super("",ENDERS);
}
public ScriptScanner(String filter) {
! super(filter,ENDERS);
}
Index: SelectTagScanner.java
===================================================================
RCS file: /cvsroot/htmlparser/htmlparser/src/org/htmlparser/scanners/SelectTagScanner.java,v
retrieving revision 1.35
retrieving revision 1.36
diff -C2 -d -r1.35 -r1.36
*** SelectTagScanner.java 28 Oct 2003 10:31:02 -0000 1.35
--- SelectTagScanner.java 31 Oct 2003 12:56:08 -0000 1.36
***************
*** 48,52 ****
public SelectTagScanner(String filter)
{
! super(filter, MATCH_NAME, ENDERS, END_TAG_ENDERS);
}
--- 48,52 ----
public SelectTagScanner(String filter)
{
! super(filter, ENDERS, END_TAG_ENDERS);
}
Index: SpanScanner.java
===================================================================
RCS file: /cvsroot/htmlparser/htmlparser/src/org/htmlparser/scanners/SpanScanner.java,v
retrieving revision 1.34
retrieving revision 1.35
diff -C2 -d -r1.34 -r1.35
*** SpanScanner.java 26 Oct 2003 19:46:21 -0000 1.34
--- SpanScanner.java 31 Oct 2003 12:56:08 -0000 1.35
***************
*** 44,48 ****
public SpanScanner(String filter) {
! super(filter, MATCH_ID);
}
--- 44,48 ----
public SpanScanner(String filter) {
! super(filter);
}
Index: StyleScanner.java
===================================================================
RCS file: /cvsroot/htmlparser/htmlparser/src/org/htmlparser/scanners/StyleScanner.java,v
retrieving revision 1.29
retrieving revision 1.30
diff -C2 -d -r1.29 -r1.30
*** StyleScanner.java 26 Oct 2003 19:46:21 -0000 1.29
--- StyleScanner.java 31 Oct 2003 12:56:08 -0000 1.30
***************
*** 47,55 ****
public StyleScanner() {
- super(MATCH_NAME);
}
public StyleScanner(String filter) {
! super(filter,MATCH_NAME);
}
--- 47,54 ----
public StyleScanner() {
}
public StyleScanner(String filter) {
! super(filter);
}
Index: TableColumnScanner.java
===================================================================
RCS file: /cvsroot/htmlparser/htmlparser/src/org/htmlparser/scanners/TableColumnScanner.java,v
retrieving revision 1.38
retrieving revision 1.39
diff -C2 -d -r1.38 -r1.39
*** TableColumnScanner.java 28 Oct 2003 10:31:02 -0000 1.38
--- TableColumnScanner.java 31 Oct 2003 12:56:08 -0000 1.39
***************
*** 44,58 ****
public TableColumnScanner(String filter) {
! this(filter, MATCH_STRING, MATCH_STRING, new String[] {});
}
public TableColumnScanner(
String filter,
- String[] nameOfTagToMatch,
String [] tagEnders,
String [] endTagEnders) {
super(
filter,
- nameOfTagToMatch,
tagEnders,
endTagEnders);
--- 44,56 ----
public TableColumnScanner(String filter) {
! this(filter, MATCH_STRING, new String[] {});
}
public TableColumnScanner(
String filter,
String [] tagEnders,
String [] endTagEnders) {
super(
filter,
tagEnders,
endTagEnders);
Index: TableRowScanner.java
===================================================================
RCS file: /cvsroot/htmlparser/htmlparser/src/org/htmlparser/scanners/TableRowScanner.java,v
retrieving revision 1.41
retrieving revision 1.42
diff -C2 -d -r1.41 -r1.42
*** TableRowScanner.java 28 Oct 2003 10:31:02 -0000 1.41
--- TableRowScanner.java 31 Oct 2003 12:56:08 -0000 1.42
***************
*** 46,50 ****
public TableRowScanner(String filter,Parser parser) {
! this(filter, parser, MATCH_STRING, MATCH_STRING, new String[] {});
}
--- 46,50 ----
public TableRowScanner(String filter,Parser parser) {
! this(filter, parser, MATCH_STRING, new String[] {});
}
***************
*** 52,61 ****
String filter,
Parser parser,
- String[] nameOfTagToMatch,
String [] tagEnders,
String [] endTagEnders) {
super(
filter,
- nameOfTagToMatch,
tagEnders,
endTagEnders);
--- 52,59 ----
Index: TableScanner.java
===================================================================
RCS file: /cvsroot/htmlparser/htmlparser/src/org/htmlparser/scanners/TableScanner.java,v
retrieving revision 1.40
retrieving revision 1.41
diff -C2 -d -r1.40 -r1.41
*** TableScanner.java 28 Oct 2003 10:31:02 -0000 1.40
--- TableScanner.java 31 Oct 2003 12:56:08 -0000 1.41
***************
*** 48,52 ****
public TableScanner(Parser parser,String filter) {
! super(filter, MATCH_STRING, ENDERS, ENDTAG_ENDERS);
parser.addScanner(new TableRowScanner(parser));
}
--- 48,52 ----
public TableScanner(Parser parser,String filter) {
! super(filter, ENDERS, ENDTAG_ENDERS);
parser.addScanner(new TableRowScanner(parser));
}
Index: TextareaTagScanner.java
===================================================================
RCS file: /cvsroot/htmlparser/htmlparser/src/org/htmlparser/scanners/TextareaTagScanner.java,v
retrieving revision 1.32
retrieving revision 1.33
diff -C2 -d -r1.32 -r1.33
*** TextareaTagScanner.java 28 Oct 2003 10:31:02 -0000 1.32
--- TextareaTagScanner.java 31 Oct 2003 12:56:08 -0000 1.33
***************
*** 45,49 ****
public TextareaTagScanner(String filter)
{
! super(filter, MATCH_NAME, ENDERS, END_TAG_ENDERS);
}
--- 45,49 ----
public TextareaTagScanner(String filter)
{
! super(filter, ENDERS, END_TAG_ENDERS);
}
Index: TitleScanner.java
===================================================================
RCS file: /cvsroot/htmlparser/htmlparser/src/org/htmlparser/scanners/TitleScanner.java,v
retrieving revision 1.34
retrieving revision 1.35
diff -C2 -d -r1.34 -r1.35
*** TitleScanner.java 28 Oct 2003 10:31:02 -0000 1.34
--- TitleScanner.java 31 Oct 2003 12:56:09 -0000 1.35
***************
*** 46,50 ****
public TitleScanner(String filter) {
! super(filter,MATCH_NAME,ENDERS,END_TAG_ENDERS);
}
--- 46,50 ----
public TitleScanner(String filter) {
! super(filter,ENDERS,END_TAG_ENDERS);
}
|
