[Htmlparser-cvs] htmlparser/src/org/htmlparser/scanners TableRowScanner.java,1.24,1.25 TableColumnScanner.java,1.21,1.22

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

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

Modified Files:
	TableRowScanner.java TableColumnScanner.java 
Log Message:
Fixed bug #742254 Nested <TR> &<TD> tags should not be allowed.



Index: TableRowScanner.java
===================================================================
RCS file: /cvsroot/htmlparser/htmlparser/src/org/htmlparser/scanners/TableRowScanner.java,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -d -r1.24 -r1.25
*** TableRowScanner.java	19 May 2003 02:49:57 -0000	1.24
--- TableRowScanner.java	24 May 2003 10:15:05 -0000	1.25
***************
*** 45,62 ****
  
  	public TableRowScanner(String filter,Parser parser) {
! 		super(filter, MATCH_STRING);
! 		parser.addScanner(new TableColumnScanner());
  	}
  
  	public TableRowScanner(
  		String filter,
  		String[] nameOfTagToMatch,
! 		boolean removeScanners,
! 		boolean stringNodeIgnoreMode) {
  		super(
  			filter, 
  			nameOfTagToMatch, 
! 			new String[] {}
  		);
  	}
  
--- 45,66 ----
  
  	public TableRowScanner(String filter,Parser parser) {
! 		this(filter, parser, MATCH_STRING, new String[] {}, new String[] {}, false);
  	}
  
  	public TableRowScanner(
  		String filter,
+         Parser parser,
  		String[] nameOfTagToMatch,
! 		String [] tagEnders, 
! 		String [] endTagEnders,
! 		boolean allowSelfChildren) {
  		super(
  			filter, 
  			nameOfTagToMatch, 
! 			tagEnders,
!             endTagEnders,
!             allowSelfChildren
  		);
+ 		parser.addScanner(new TableColumnScanner());
  	}
  

Index: TableColumnScanner.java
===================================================================
RCS file: /cvsroot/htmlparser/htmlparser/src/org/htmlparser/scanners/TableColumnScanner.java,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** TableColumnScanner.java	19 May 2003 02:49:57 -0000	1.21
--- TableColumnScanner.java	24 May 2003 10:15:05 -0000	1.22
***************
*** 42,46 ****
  
  	public TableColumnScanner(String filter) {
! 		super(filter,MATCH_STRING);
  	}
  
--- 42,46 ----
  
  	public TableColumnScanner(String filter) {
! 		this(filter, MATCH_STRING, new String[] {}, new String[] {}, false);
  	}
  
***************
*** 48,59 ****
  		String filter,
  		String[] nameOfTagToMatch,
! 		boolean removeScanners,
! 		boolean stringNodeIgnoreMode) {
  		super(
  			filter, 
  			nameOfTagToMatch, 
! 			new String[] {} 
  		);
! 	}
  
  	public Tag createTag(
--- 48,62 ----
  		String filter,
  		String[] nameOfTagToMatch,
! 		String [] tagEnders, 
! 		String [] endTagEnders,
! 		boolean allowSelfChildren) {
  		super(
  			filter, 
  			nameOfTagToMatch, 
! 			tagEnders,
!             endTagEnders,
!             allowSelfChildren
  		);
!     }
  
  	public Tag createTag(