htmlparser-cvs Mailing List for HTML Parser (Page 48)
Brought to you by:
derrickoswald
Menu
▾
▴
htmlparser-cvs — syncmail email notification of CVS commits
You can subscribe to this list here.
| 2003 |
Jan
|
Feb
|
Mar
|
Apr
|
May
(141) |
Jun
(108) |
Jul
(66) |
Aug
(127) |
Sep
(155) |
Oct
(149) |
Nov
(72) |
Dec
(72) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2004 |
Jan
(100) |
Feb
(36) |
Mar
(21) |
Apr
(3) |
May
(87) |
Jun
(28) |
Jul
(84) |
Aug
(5) |
Sep
(14) |
Oct
|
Nov
|
Dec
|
| 2005 |
Jan
(1) |
Feb
(39) |
Mar
(26) |
Apr
(38) |
May
(14) |
Jun
(10) |
Jul
|
Aug
|
Sep
(13) |
Oct
(8) |
Nov
(10) |
Dec
|
| 2006 |
Jan
|
Feb
(1) |
Mar
(17) |
Apr
(20) |
May
(28) |
Jun
(24) |
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2015 |
Jan
|
Feb
|
Mar
(1) |
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: <der...@us...> - 2003-08-11 00:38:02
|
Update of /cvsroot/htmlparser/htmlparser/src/org/htmlparser/tests/utilTests
In directory sc8-pr-cvs1:/tmp/cvs-serv7155/src/org/htmlparser/tests/utilTests
Modified Files:
AllTests.java BeanTest.java CharacterTranslationTest.java
HTMLLinkProcessorTest.java HTMLParserUtilsTest.java
HTMLTagParserTest.java NodeListTest.java SortTest.java
package.html
Log Message:
Update version headers to 1.4-20030810 and update changelog.
Index: AllTests.java
===================================================================
RCS file: /cvsroot/htmlparser/htmlparser/src/org/htmlparser/tests/utilTests/AllTests.java,v
retrieving revision 1.42
retrieving revision 1.43
diff -C2 -d -r1.42 -r1.43
*** AllTests.java 10 Aug 2003 23:33:37 -0000 1.42
--- AllTests.java 11 Aug 2003 00:18:34 -0000 1.43
***************
*** 1,3 ****
! // HTMLParser Library v1_4_20030727 - A java-based parser for HTML
// Copyright (C) Dec 31, 2000 Somik Raha
//
--- 1,3 ----
! // HTMLParser Library v1_4_20030810 - A java-based parser for HTML
// Copyright (C) Dec 31, 2000 Somik Raha
//
Index: BeanTest.java
===================================================================
RCS file: /cvsroot/htmlparser/htmlparser/src/org/htmlparser/tests/utilTests/BeanTest.java,v
retrieving revision 1.34
retrieving revision 1.35
diff -C2 -d -r1.34 -r1.35
*** BeanTest.java 27 Jul 2003 19:19:23 -0000 1.34
--- BeanTest.java 11 Aug 2003 00:18:34 -0000 1.35
***************
*** 1,3 ****
! // HTMLParser Library v1_4_20030727 - A java-based parser for HTML
// Copyright (C) Dec 31, 2000 Somik Raha
//
--- 1,3 ----
! // HTMLParser Library v1_4_20030810 - A java-based parser for HTML
// Copyright (C) Dec 31, 2000 Somik Raha
//
Index: CharacterTranslationTest.java
===================================================================
RCS file: /cvsroot/htmlparser/htmlparser/src/org/htmlparser/tests/utilTests/CharacterTranslationTest.java,v
retrieving revision 1.26
retrieving revision 1.27
diff -C2 -d -r1.26 -r1.27
*** CharacterTranslationTest.java 27 Jul 2003 19:19:23 -0000 1.26
--- CharacterTranslationTest.java 11 Aug 2003 00:18:34 -0000 1.27
***************
*** 1,3 ****
! // HTMLParser Library v1_4_20030727 - A java-based parser for HTML
// Copyright (C) Dec 31, 2000 Somik Raha
//
--- 1,3 ----
! // HTMLParser Library v1_4_20030810 - A java-based parser for HTML
// Copyright (C) Dec 31, 2000 Somik Raha
//
Index: HTMLLinkProcessorTest.java
===================================================================
RCS file: /cvsroot/htmlparser/htmlparser/src/org/htmlparser/tests/utilTests/HTMLLinkProcessorTest.java,v
retrieving revision 1.39
retrieving revision 1.40
diff -C2 -d -r1.39 -r1.40
*** HTMLLinkProcessorTest.java 27 Jul 2003 19:19:23 -0000 1.39
--- HTMLLinkProcessorTest.java 11 Aug 2003 00:18:34 -0000 1.40
***************
*** 1,3 ****
! // HTMLParser Library v1_4_20030727 - A java-based parser for HTML
// Copyright (C) Dec 31, 2000 Somik Raha
//
--- 1,3 ----
! // HTMLParser Library v1_4_20030810 - A java-based parser for HTML
// Copyright (C) Dec 31, 2000 Somik Raha
//
Index: HTMLParserUtilsTest.java
===================================================================
RCS file: /cvsroot/htmlparser/htmlparser/src/org/htmlparser/tests/utilTests/HTMLParserUtilsTest.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** HTMLParserUtilsTest.java 27 Jul 2003 19:19:23 -0000 1.4
--- HTMLParserUtilsTest.java 11 Aug 2003 00:18:34 -0000 1.5
***************
*** 1,3 ****
! // HTMLParser Library v1_3_20030727 - A java-based parser for HTML
// Copyright (C) Dec 31, 2000 Somik Raha
//
--- 1,3 ----
! // HTMLParser Library v1_4_20030810 - A java-based parser for HTML
// Copyright (C) Dec 31, 2000 Somik Raha
//
Index: HTMLTagParserTest.java
===================================================================
RCS file: /cvsroot/htmlparser/htmlparser/src/org/htmlparser/tests/utilTests/HTMLTagParserTest.java,v
retrieving revision 1.39
retrieving revision 1.40
diff -C2 -d -r1.39 -r1.40
*** HTMLTagParserTest.java 27 Jul 2003 19:19:23 -0000 1.39
--- HTMLTagParserTest.java 11 Aug 2003 00:18:34 -0000 1.40
***************
*** 1,3 ****
! // HTMLParser Library v1_4_20030727 - A java-based parser for HTML
// Copyright (C) Dec 31, 2000 Somik Raha
//
--- 1,3 ----
! // HTMLParser Library v1_4_20030810 - A java-based parser for HTML
// Copyright (C) Dec 31, 2000 Somik Raha
//
Index: NodeListTest.java
===================================================================
RCS file: /cvsroot/htmlparser/htmlparser/src/org/htmlparser/tests/utilTests/NodeListTest.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** NodeListTest.java 27 Jul 2003 19:19:23 -0000 1.10
--- NodeListTest.java 11 Aug 2003 00:18:34 -0000 1.11
***************
*** 1,3 ****
! // HTMLParser Library v1_3_20030727 - A java-based parser for HTML
// Copyright (C) Dec 31, 2000 Somik Raha
//
--- 1,3 ----
! // HTMLParser Library v1_4_20030810 - A java-based parser for HTML
// Copyright (C) Dec 31, 2000 Somik Raha
//
Index: SortTest.java
===================================================================
RCS file: /cvsroot/htmlparser/htmlparser/src/org/htmlparser/tests/utilTests/SortTest.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** SortTest.java 10 Aug 2003 23:33:37 -0000 1.1
--- SortTest.java 11 Aug 2003 00:18:34 -0000 1.2
***************
*** 1,3 ****
! // HTMLParser Library v1_3_20030727 - A java-based parser for HTML
// Copyright (C) Dec 31, 2000 Somik Raha
//
--- 1,3 ----
! // HTMLParser Library v1_4_20030810 - A java-based parser for HTML
// Copyright (C) Dec 31, 2000 Somik Raha
//
Index: package.html
===================================================================
RCS file: /cvsroot/htmlparser/htmlparser/src/org/htmlparser/tests/utilTests/package.html,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** package.html 27 Jul 2003 19:19:23 -0000 1.10
--- package.html 11 Aug 2003 00:18:34 -0000 1.11
***************
*** 6,10 ****
@(#)package.html 1.60 98/01/27
! HTMLParser Library v1_4_20030727 - A java-based parser for HTML
Copyright (C) Dec 31, 2000 Somik Raha
--- 6,10 ----
@(#)package.html 1.60 98/01/27
! HTMLParser Library v1_4_20030810 - A java-based parser for HTML
Copyright (C) Dec 31, 2000 Somik Raha
|
Update of /cvsroot/htmlparser/htmlparser/src/org/htmlparser/tags
In directory sc8-pr-cvs1:/tmp/cvs-serv7155/src/org/htmlparser/tags
Modified Files:
AppletTag.java BaseHrefTag.java BodyTag.java Bullet.java
BulletList.java CompositeTag.java Div.java DoctypeTag.java
EndTag.java FormTag.java FrameSetTag.java FrameTag.java
HeadTag.java Html.java ImageTag.java InputTag.java JspTag.java
LabelTag.java LinkTag.java MetaTag.java OptionTag.java
ScriptTag.java SelectTag.java Span.java StyleTag.java
TableColumn.java TableRow.java TableTag.java Tag.java
TextareaTag.java TitleTag.java package.html
Log Message:
Update version headers to 1.4-20030810 and update changelog.
Index: AppletTag.java
===================================================================
RCS file: /cvsroot/htmlparser/htmlparser/src/org/htmlparser/tags/AppletTag.java,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** AppletTag.java 27 Jul 2003 19:19:19 -0000 1.21
--- AppletTag.java 11 Aug 2003 00:18:30 -0000 1.22
***************
*** 1,3 ****
! // HTMLParser Library v1_4_20030727 - A java-based parser for HTML
// Copyright (C) Dec 31, 2000 Somik Raha
//
--- 1,3 ----
! // HTMLParser Library v1_4_20030810 - A java-based parser for HTML
// Copyright (C) Dec 31, 2000 Somik Raha
//
Index: BaseHrefTag.java
===================================================================
RCS file: /cvsroot/htmlparser/htmlparser/src/org/htmlparser/tags/BaseHrefTag.java,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** BaseHrefTag.java 27 Jul 2003 19:19:19 -0000 1.20
--- BaseHrefTag.java 11 Aug 2003 00:18:30 -0000 1.21
***************
*** 1,3 ****
! // HTMLParser Library v1_4_20030727 - A java-based parser for HTML
// Copyright (C) Dec 31, 2000 Somik Raha
//
--- 1,3 ----
! // HTMLParser Library v1_4_20030810 - A java-based parser for HTML
// Copyright (C) Dec 31, 2000 Somik Raha
//
Index: BodyTag.java
===================================================================
RCS file: /cvsroot/htmlparser/htmlparser/src/org/htmlparser/tags/BodyTag.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** BodyTag.java 27 Jul 2003 19:19:19 -0000 1.9
--- BodyTag.java 11 Aug 2003 00:18:30 -0000 1.10
***************
*** 1,3 ****
! // HTMLParser Library v1_4_20030727 - A java-based parser for HTML
// Copyright (C) Dec 31, 2000 Somik Raha
//
--- 1,3 ----
! // HTMLParser Library v1_4_20030810 - A java-based parser for HTML
// Copyright (C) Dec 31, 2000 Somik Raha
//
Index: Bullet.java
===================================================================
RCS file: /cvsroot/htmlparser/htmlparser/src/org/htmlparser/tags/Bullet.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** Bullet.java 27 Jul 2003 19:19:19 -0000 1.9
--- Bullet.java 11 Aug 2003 00:18:30 -0000 1.10
***************
*** 1,3 ****
! // HTMLParser Library v1_4_20030727 - A java-based parser for HTML
// Copyright (C) Dec 31, 2000 Somik Raha
//
--- 1,3 ----
! // HTMLParser Library v1_4_20030810 - A java-based parser for HTML
// Copyright (C) Dec 31, 2000 Somik Raha
//
Index: BulletList.java
===================================================================
RCS file: /cvsroot/htmlparser/htmlparser/src/org/htmlparser/tags/BulletList.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** BulletList.java 27 Jul 2003 19:19:19 -0000 1.9
--- BulletList.java 11 Aug 2003 00:18:30 -0000 1.10
***************
*** 1,3 ****
! // HTMLParser Library v1_4_20030727 - A java-based parser for HTML
// Copyright (C) Dec 31, 2000 Somik Raha
//
--- 1,3 ----
! // HTMLParser Library v1_4_20030810 - A java-based parser for HTML
// Copyright (C) Dec 31, 2000 Somik Raha
//
Index: CompositeTag.java
===================================================================
RCS file: /cvsroot/htmlparser/htmlparser/src/org/htmlparser/tags/CompositeTag.java,v
retrieving revision 1.47
retrieving revision 1.48
diff -C2 -d -r1.47 -r1.48
*** CompositeTag.java 27 Jul 2003 19:19:19 -0000 1.47
--- CompositeTag.java 11 Aug 2003 00:18:30 -0000 1.48
***************
*** 1,3 ****
! // HTMLParser Library v1_4_20030727 - A java-based parser for HTML
// Copyright (C) Dec 31, 2000 Somik Raha
//
--- 1,3 ----
! // HTMLParser Library v1_4_20030810 - A java-based parser for HTML
// Copyright (C) Dec 31, 2000 Somik Raha
//
Index: Div.java
===================================================================
RCS file: /cvsroot/htmlparser/htmlparser/src/org/htmlparser/tags/Div.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** Div.java 27 Jul 2003 19:19:19 -0000 1.9
--- Div.java 11 Aug 2003 00:18:30 -0000 1.10
***************
*** 1,3 ****
! // HTMLParser Library v1_4_20030727 - A java-based parser for HTML
// Copyright (C) Dec 31, 2000 Somik Raha
//
--- 1,3 ----
! // HTMLParser Library v1_4_20030810 - A java-based parser for HTML
// Copyright (C) Dec 31, 2000 Somik Raha
//
Index: DoctypeTag.java
===================================================================
RCS file: /cvsroot/htmlparser/htmlparser/src/org/htmlparser/tags/DoctypeTag.java,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** DoctypeTag.java 27 Jul 2003 19:19:19 -0000 1.21
--- DoctypeTag.java 11 Aug 2003 00:18:30 -0000 1.22
***************
*** 1,3 ****
! // HTMLParser Library v1_4_20030727 - A java-based parser for HTML
// Copyright (C) Dec 31, 2000 Somik Raha
//
--- 1,3 ----
! // HTMLParser Library v1_4_20030810 - A java-based parser for HTML
// Copyright (C) Dec 31, 2000 Somik Raha
//
Index: EndTag.java
===================================================================
RCS file: /cvsroot/htmlparser/htmlparser/src/org/htmlparser/tags/EndTag.java,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -d -r1.24 -r1.25
*** EndTag.java 27 Jul 2003 19:19:19 -0000 1.24
--- EndTag.java 11 Aug 2003 00:18:30 -0000 1.25
***************
*** 1,3 ****
! // HTMLParser Library v1_4_20030727 - A java-based parser for HTML
// Copyright (C) Dec 31, 2000 Somik Raha
//
--- 1,3 ----
! // HTMLParser Library v1_4_20030810 - A java-based parser for HTML
// Copyright (C) Dec 31, 2000 Somik Raha
//
Index: FormTag.java
===================================================================
RCS file: /cvsroot/htmlparser/htmlparser/src/org/htmlparser/tags/FormTag.java,v
retrieving revision 1.27
retrieving revision 1.28
diff -C2 -d -r1.27 -r1.28
*** FormTag.java 2 Aug 2003 13:07:29 -0000 1.27
--- FormTag.java 11 Aug 2003 00:18:30 -0000 1.28
***************
*** 1,3 ****
! // HTMLParser Library v1_4_20030727 - A java-based parser for HTML
// Copyright (C) Dec 31, 2000 Somik Raha
//
--- 1,3 ----
! // HTMLParser Library v1_4_20030810 - A java-based parser for HTML
// Copyright (C) Dec 31, 2000 Somik Raha
//
Index: FrameSetTag.java
===================================================================
RCS file: /cvsroot/htmlparser/htmlparser/src/org/htmlparser/tags/FrameSetTag.java,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** FrameSetTag.java 27 Jul 2003 19:19:19 -0000 1.20
--- FrameSetTag.java 11 Aug 2003 00:18:30 -0000 1.21
***************
*** 1,3 ****
! // HTMLParser Library v1_4_20030727 - A java-based parser for HTML
// Copyright (C) Dec 31, 2000 Somik Raha
//
--- 1,3 ----
! // HTMLParser Library v1_4_20030810 - A java-based parser for HTML
// Copyright (C) Dec 31, 2000 Somik Raha
//
Index: FrameTag.java
===================================================================
RCS file: /cvsroot/htmlparser/htmlparser/src/org/htmlparser/tags/FrameTag.java,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** FrameTag.java 27 Jul 2003 19:19:19 -0000 1.20
--- FrameTag.java 11 Aug 2003 00:18:30 -0000 1.21
***************
*** 1,3 ****
! // HTMLParser Library v1_4_20030727 - A java-based parser for HTML
// Copyright (C) Dec 31, 2000 Somik Raha
//
--- 1,3 ----
! // HTMLParser Library v1_4_20030810 - A java-based parser for HTML
// Copyright (C) Dec 31, 2000 Somik Raha
//
Index: HeadTag.java
===================================================================
RCS file: /cvsroot/htmlparser/htmlparser/src/org/htmlparser/tags/HeadTag.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** HeadTag.java 27 Jul 2003 19:19:19 -0000 1.9
--- HeadTag.java 11 Aug 2003 00:18:30 -0000 1.10
***************
*** 1,3 ****
! // HTMLParser Library v1_4_20030727 - A java-based parser for HTML
// Copyright (C) Dec 31, 2000 Somik Raha
//
--- 1,3 ----
! // HTMLParser Library v1_4_20030810 - A java-based parser for HTML
// Copyright (C) Dec 31, 2000 Somik Raha
//
Index: Html.java
===================================================================
RCS file: /cvsroot/htmlparser/htmlparser/src/org/htmlparser/tags/Html.java,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** Html.java 27 Jul 2003 19:19:19 -0000 1.21
--- Html.java 11 Aug 2003 00:18:30 -0000 1.22
***************
*** 1,3 ****
! // HTMLParser Library v1_4_20030727 - A java-based parser for HTML
// Copyright (C) Dec 31, 2000 Somik Raha
//
--- 1,3 ----
! // HTMLParser Library v1_4_20030810 - A java-based parser for HTML
// Copyright (C) Dec 31, 2000 Somik Raha
//
Index: ImageTag.java
===================================================================
RCS file: /cvsroot/htmlparser/htmlparser/src/org/htmlparser/tags/ImageTag.java,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** ImageTag.java 27 Jul 2003 19:19:19 -0000 1.20
--- ImageTag.java 11 Aug 2003 00:18:30 -0000 1.21
***************
*** 1,3 ****
! // HTMLParser Library v1_4_20030727 - A java-based parser for HTML
// Copyright (C) Dec 31, 2000 Somik Raha
//
--- 1,3 ----
! // HTMLParser Library v1_4_20030810 - A java-based parser for HTML
// Copyright (C) Dec 31, 2000 Somik Raha
//
Index: InputTag.java
===================================================================
RCS file: /cvsroot/htmlparser/htmlparser/src/org/htmlparser/tags/InputTag.java,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** InputTag.java 27 Jul 2003 19:19:19 -0000 1.21
--- InputTag.java 11 Aug 2003 00:18:30 -0000 1.22
***************
*** 1,3 ****
! // HTMLParser Library v1_4_20030727 - A java-based parser for HTML
// Copyright (C) Dec 31, 2000 Somik Raha
//
--- 1,3 ----
! // HTMLParser Library v1_4_20030810 - A java-based parser for HTML
// Copyright (C) Dec 31, 2000 Somik Raha
//
Index: JspTag.java
===================================================================
RCS file: /cvsroot/htmlparser/htmlparser/src/org/htmlparser/tags/JspTag.java,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -d -r1.22 -r1.23
*** JspTag.java 27 Jul 2003 19:19:19 -0000 1.22
--- JspTag.java 11 Aug 2003 00:18:30 -0000 1.23
***************
*** 1,3 ****
! // HTMLParser Library v1_4_20030727 - A java-based parser for HTML
// Copyright (C) Dec 31, 2000 Somik Raha
//
--- 1,3 ----
! // HTMLParser Library v1_4_20030810 - A java-based parser for HTML
// Copyright (C) Dec 31, 2000 Somik Raha
//
Index: LabelTag.java
===================================================================
RCS file: /cvsroot/htmlparser/htmlparser/src/org/htmlparser/tags/LabelTag.java,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -d -r1.22 -r1.23
*** LabelTag.java 27 Jul 2003 19:19:19 -0000 1.22
--- LabelTag.java 11 Aug 2003 00:18:30 -0000 1.23
***************
*** 1,3 ****
! // HTMLParser Library v1_4_20030727 - A java-based parser for HTML
// Copyright (C) Dec 31, 2000 Somik Raha
//
--- 1,3 ----
! // HTMLParser Library v1_4_20030810 - A java-based parser for HTML
// Copyright (C) Dec 31, 2000 Somik Raha
//
Index: LinkTag.java
===================================================================
RCS file: /cvsroot/htmlparser/htmlparser/src/org/htmlparser/tags/LinkTag.java,v
retrieving revision 1.27
retrieving revision 1.28
diff -C2 -d -r1.27 -r1.28
*** LinkTag.java 27 Jul 2003 19:19:19 -0000 1.27
--- LinkTag.java 11 Aug 2003 00:18:30 -0000 1.28
***************
*** 1,3 ****
! // HTMLParser Library v1_4_20030727 - A java-based parser for HTML
// Copyright (C) Dec 31, 2000 Somik Raha
//
--- 1,3 ----
! // HTMLParser Library v1_4_20030810 - A java-based parser for HTML
// Copyright (C) Dec 31, 2000 Somik Raha
//
Index: MetaTag.java
===================================================================
RCS file: /cvsroot/htmlparser/htmlparser/src/org/htmlparser/tags/MetaTag.java,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** MetaTag.java 27 Jul 2003 19:19:19 -0000 1.21
--- MetaTag.java 11 Aug 2003 00:18:30 -0000 1.22
***************
*** 1,3 ****
! // HTMLParser Library v1_4_20030727 - A java-based parser for HTML
// Copyright (C) Dec 31, 2000 Somik Raha
//
--- 1,3 ----
! // HTMLParser Library v1_4_20030810 - A java-based parser for HTML
// Copyright (C) Dec 31, 2000 Somik Raha
//
Index: OptionTag.java
===================================================================
RCS file: /cvsroot/htmlparser/htmlparser/src/org/htmlparser/tags/OptionTag.java,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -d -r1.24 -r1.25
*** OptionTag.java 27 Jul 2003 19:19:19 -0000 1.24
--- OptionTag.java 11 Aug 2003 00:18:30 -0000 1.25
***************
*** 1,3 ****
! // HTMLParser Library v1_4_20030727 - A java-based parser for HTML
// Copyright (C) Dec 31, 2000 Somik Raha
//
--- 1,3 ----
! // HTMLParser Library v1_4_20030810 - A java-based parser for HTML
// Copyright (C) Dec 31, 2000 Somik Raha
//
Index: ScriptTag.java
===================================================================
RCS file: /cvsroot/htmlparser/htmlparser/src/org/htmlparser/tags/ScriptTag.java,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** ScriptTag.java 27 Jul 2003 19:19:19 -0000 1.21
--- ScriptTag.java 11 Aug 2003 00:18:30 -0000 1.22
***************
*** 1,3 ****
! // HTMLParser Library v1_4_20030727 - A java-based parser for HTML
// Copyright (C) Dec 31, 2000 Somik Raha
//
--- 1,3 ----
! // HTMLParser Library v1_4_20030810 - A java-based parser for HTML
// Copyright (C) Dec 31, 2000 Somik Raha
//
Index: SelectTag.java
===================================================================
RCS file: /cvsroot/htmlparser/htmlparser/src/org/htmlparser/tags/SelectTag.java,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** SelectTag.java 27 Jul 2003 19:19:19 -0000 1.21
--- SelectTag.java 11 Aug 2003 00:18:30 -0000 1.22
***************
*** 1,3 ****
! // HTMLParser Library v1_4_20030727 - A java-based parser for HTML
// Copyright (C) Dec 31, 2000 Somik Raha
//
--- 1,3 ----
! // HTMLParser Library v1_4_20030810 - A java-based parser for HTML
// Copyright (C) Dec 31, 2000 Somik Raha
//
Index: Span.java
===================================================================
RCS file: /cvsroot/htmlparser/htmlparser/src/org/htmlparser/tags/Span.java,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -d -r1.23 -r1.24
*** Span.java 27 Jul 2003 19:19:19 -0000 1.23
--- Span.java 11 Aug 2003 00:18:30 -0000 1.24
***************
*** 1,3 ****
! // HTMLParser Library v1_4_20030727 - A java-based parser for HTML
// Copyright (C) Dec 31, 2000 Somik Raha
//
--- 1,3 ----
! // HTMLParser Library v1_4_20030810 - A java-based parser for HTML
// Copyright (C) Dec 31, 2000 Somik Raha
//
Index: StyleTag.java
===================================================================
RCS file: /cvsroot/htmlparser/htmlparser/src/org/htmlparser/tags/StyleTag.java,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** StyleTag.java 27 Jul 2003 19:19:19 -0000 1.20
--- StyleTag.java 11 Aug 2003 00:18:30 -0000 1.21
***************
*** 1,3 ****
! // HTMLParser Library v1_4_20030727 - A java-based parser for HTML
// Copyright (C) Dec 31, 2000 Somik Raha
//
--- 1,3 ----
! // HTMLParser Library v1_4_20030810 - A java-based parser for HTML
// Copyright (C) Dec 31, 2000 Somik Raha
//
Index: TableColumn.java
===================================================================
RCS file: /cvsroot/htmlparser/htmlparser/src/org/htmlparser/tags/TableColumn.java,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -d -r1.23 -r1.24
*** TableColumn.java 27 Jul 2003 19:19:19 -0000 1.23
--- TableColumn.java 11 Aug 2003 00:18:30 -0000 1.24
***************
*** 1,3 ****
! // HTMLParser Library v1_4_20030727 - A java-based parser for HTML
// Copyright (C) Dec 31, 2000 Somik Raha
//
--- 1,3 ----
! // HTMLParser Library v1_4_20030810 - A java-based parser for HTML
// Copyright (C) Dec 31, 2000 Somik Raha
//
Index: TableRow.java
===================================================================
RCS file: /cvsroot/htmlparser/htmlparser/src/org/htmlparser/tags/TableRow.java,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -d -r1.25 -r1.26
*** TableRow.java 27 Jul 2003 19:19:19 -0000 1.25
--- TableRow.java 11 Aug 2003 00:18:30 -0000 1.26
***************
*** 1,3 ****
! // HTMLParser Library v1_4_20030727 - A java-based parser for HTML
// Copyright (C) Dec 31, 2000 Somik Raha
//
--- 1,3 ----
! // HTMLParser Library v1_4_20030810 - A java-based parser for HTML
// Copyright (C) Dec 31, 2000 Somik Raha
//
Index: TableTag.java
===================================================================
RCS file: /cvsroot/htmlparser/htmlparser/src/org/htmlparser/tags/TableTag.java,v
retrieving revision 1.26
retrieving revision 1.27
diff -C2 -d -r1.26 -r1.27
*** TableTag.java 27 Jul 2003 19:19:19 -0000 1.26
--- TableTag.java 11 Aug 2003 00:18:30 -0000 1.27
***************
*** 1,3 ****
! // HTMLParser Library v1_4_20030727 - A java-based parser for HTML
// Copyright (C) Dec 31, 2000 Somik Raha
//
--- 1,3 ----
! // HTMLParser Library v1_4_20030810 - A java-based parser for HTML
// Copyright (C) Dec 31, 2000 Somik Raha
//
Index: Tag.java
===================================================================
RCS file: /cvsroot/htmlparser/htmlparser/src/org/htmlparser/tags/Tag.java,v
retrieving revision 1.38
retrieving revision 1.39
diff -C2 -d -r1.38 -r1.39
*** Tag.java 2 Aug 2003 16:22:57 -0000 1.38
--- Tag.java 11 Aug 2003 00:18:30 -0000 1.39
***************
*** 1,3 ****
! // HTMLParser Library v1_4_20030727 - A java-based parser for HTML
// Copyright (C) Dec 31, 2000 Somik Raha
//
--- 1,3 ----
! // HTMLParser Library v1_4_20030810 - A java-based parser for HTML
// Copyright (C) Dec 31, 2000 Somik Raha
//
Index: TextareaTag.java
===================================================================
RCS file: /cvsroot/htmlparser/htmlparser/src/org/htmlparser/tags/TextareaTag.java,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** TextareaTag.java 27 Jul 2003 19:19:19 -0000 1.20
--- TextareaTag.java 11 Aug 2003 00:18:30 -0000 1.21
***************
*** 1,3 ****
! // HTMLParser Library v1_4_20030727 - A java-based parser for HTML
// Copyright (C) Dec 31, 2000 Somik Raha
//
--- 1,3 ----
! // HTMLParser Library v1_4_20030810 - A java-based parser for HTML
// Copyright (C) Dec 31, 2000 Somik Raha
//
Index: TitleTag.java
===================================================================
RCS file: /cvsroot/htmlparser/htmlparser/src/org/htmlparser/tags/TitleTag.java,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** TitleTag.java 27 Jul 2003 19:19:19 -0000 1.20
--- TitleTag.java 11 Aug 2003 00:18:30 -0000 1.21
***************
*** 1,3 ****
! // HTMLParser Library v1_4_20030727 - A java-based parser for HTML
// Copyright (C) Dec 31, 2000 Somik Raha
//
--- 1,3 ----
! // HTMLParser Library v1_4_20030810 - A java-based parser for HTML
// Copyright (C) Dec 31, 2000 Somik Raha
//
Index: package.html
===================================================================
RCS file: /cvsroot/htmlparser/htmlparser/src/org/htmlparser/tags/package.html,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** package.html 27 Jul 2003 19:19:19 -0000 1.10
--- package.html 11 Aug 2003 00:18:30 -0000 1.11
***************
*** 6,10 ****
@(#)package.html 1.60 98/01/27
! HTMLParser Library v1_4_20030727 - A java-based parser for HTML
Copyright (C) Dec 31, 2000 Somik Raha
--- 6,10 ----
@(#)package.html 1.60 98/01/27
! HTMLParser Library v1_4_20030810 - A java-based parser for HTML
Copyright (C) Dec 31, 2000 Somik Raha
|
|
From: <der...@us...> - 2003-08-11 00:19:07
|
Update of /cvsroot/htmlparser/htmlparser/src/org/htmlparser/tests/codeMetrics In directory sc8-pr-cvs1:/tmp/cvs-serv7155/src/org/htmlparser/tests/codeMetrics Modified Files: LineCounter.java Log Message: Update version headers to 1.4-20030810 and update changelog. Index: LineCounter.java =================================================================== RCS file: /cvsroot/htmlparser/htmlparser/src/org/htmlparser/tests/codeMetrics/LineCounter.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** LineCounter.java 27 Jul 2003 19:19:20 -0000 1.2 --- LineCounter.java 11 Aug 2003 00:18:31 -0000 1.3 *************** *** 1,3 **** ! // HTMLParser Library v1_4_20030727 - A java-based parser for HTML // Copyright (C) Dec 31, 2000 Somik Raha // --- 1,3 ---- ! // HTMLParser Library v1_4_20030810 - A java-based parser for HTML // Copyright (C) Dec 31, 2000 Somik Raha // |
Update of /cvsroot/htmlparser/htmlparser/src/org/htmlparser/tests/parserHelperTests In directory sc8-pr-cvs1:/tmp/cvs-serv7155/src/org/htmlparser/tests/parserHelperTests Modified Files: AllTests.java CompositeTagScannerHelperTest.java RemarkNodeParserTest.java StringParserTest.java Log Message: Update version headers to 1.4-20030810 and update changelog. Index: AllTests.java =================================================================== RCS file: /cvsroot/htmlparser/htmlparser/src/org/htmlparser/tests/parserHelperTests/AllTests.java,v retrieving revision 1.22 retrieving revision 1.23 diff -C2 -d -r1.22 -r1.23 *** AllTests.java 27 Jul 2003 19:19:20 -0000 1.22 --- AllTests.java 11 Aug 2003 00:18:32 -0000 1.23 *************** *** 1,3 **** ! // HTMLParser Library v1_4_20030727 - A java-based parser for HTML // Copyright (C) Dec 31, 2000 Somik Raha // --- 1,3 ---- ! // HTMLParser Library v1_4_20030810 - A java-based parser for HTML // Copyright (C) Dec 31, 2000 Somik Raha // Index: CompositeTagScannerHelperTest.java =================================================================== RCS file: /cvsroot/htmlparser/htmlparser/src/org/htmlparser/tests/parserHelperTests/CompositeTagScannerHelperTest.java,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** CompositeTagScannerHelperTest.java 27 Jul 2003 19:19:20 -0000 1.15 --- CompositeTagScannerHelperTest.java 11 Aug 2003 00:18:32 -0000 1.16 *************** *** 1,3 **** ! // HTMLParser Library v1_4_20030727 - A java-based parser for HTML // Copyright (C) Dec 31, 2000 Somik Raha // --- 1,3 ---- ! // HTMLParser Library v1_4_20030810 - A java-based parser for HTML // Copyright (C) Dec 31, 2000 Somik Raha // Index: RemarkNodeParserTest.java =================================================================== RCS file: /cvsroot/htmlparser/htmlparser/src/org/htmlparser/tests/parserHelperTests/RemarkNodeParserTest.java,v retrieving revision 1.30 retrieving revision 1.31 diff -C2 -d -r1.30 -r1.31 *** RemarkNodeParserTest.java 27 Jul 2003 19:19:20 -0000 1.30 --- RemarkNodeParserTest.java 11 Aug 2003 00:18:32 -0000 1.31 *************** *** 1,3 **** ! // HTMLParser Library v1_4_20030727 - A java-based parser for HTML // Copyright (C) Dec 31, 2000 Somik Raha // --- 1,3 ---- ! // HTMLParser Library v1_4_20030810 - A java-based parser for HTML // Copyright (C) Dec 31, 2000 Somik Raha // Index: StringParserTest.java =================================================================== RCS file: /cvsroot/htmlparser/htmlparser/src/org/htmlparser/tests/parserHelperTests/StringParserTest.java,v retrieving revision 1.32 retrieving revision 1.33 diff -C2 -d -r1.32 -r1.33 *** StringParserTest.java 27 Jul 2003 19:19:20 -0000 1.32 --- StringParserTest.java 11 Aug 2003 00:18:32 -0000 1.33 *************** *** 1,3 **** ! // HTMLParser Library v1_4_20030727 - A java-based parser for HTML // Copyright (C) Dec 31, 2000 Somik Raha // --- 1,3 ---- ! // HTMLParser Library v1_4_20030810 - A java-based parser for HTML // Copyright (C) Dec 31, 2000 Somik Raha // |
|
From: <der...@us...> - 2003-08-11 00:19:07
|
Update of /cvsroot/htmlparser/htmlparser/src/org/htmlparser/tags/data In directory sc8-pr-cvs1:/tmp/cvs-serv7155/src/org/htmlparser/tags/data Modified Files: CompositeTagData.java FormData.java LinkData.java TagData.java Log Message: Update version headers to 1.4-20030810 and update changelog. Index: CompositeTagData.java =================================================================== RCS file: /cvsroot/htmlparser/htmlparser/src/org/htmlparser/tags/data/CompositeTagData.java,v retrieving revision 1.27 retrieving revision 1.28 diff -C2 -d -r1.27 -r1.28 *** CompositeTagData.java 27 Jul 2003 19:19:19 -0000 1.27 --- CompositeTagData.java 11 Aug 2003 00:18:30 -0000 1.28 *************** *** 1,3 **** ! // HTMLParser Library v1_4_20030727 - A java-based parser for HTML // Copyright (C) Dec 31, 2000 Somik Raha // --- 1,3 ---- ! // HTMLParser Library v1_4_20030810 - A java-based parser for HTML // Copyright (C) Dec 31, 2000 Somik Raha // Index: FormData.java =================================================================== RCS file: /cvsroot/htmlparser/htmlparser/src/org/htmlparser/tags/data/FormData.java,v retrieving revision 1.22 retrieving revision 1.23 diff -C2 -d -r1.22 -r1.23 *** FormData.java 27 Jul 2003 19:19:19 -0000 1.22 --- FormData.java 11 Aug 2003 00:18:30 -0000 1.23 *************** *** 1,3 **** ! // HTMLParser Library v1_4_20030727 - A java-based parser for HTML // Copyright (C) Dec 31, 2000 Somik Raha // --- 1,3 ---- ! // HTMLParser Library v1_4_20030810 - A java-based parser for HTML // Copyright (C) Dec 31, 2000 Somik Raha // Index: LinkData.java =================================================================== RCS file: /cvsroot/htmlparser/htmlparser/src/org/htmlparser/tags/data/LinkData.java,v retrieving revision 1.24 retrieving revision 1.25 diff -C2 -d -r1.24 -r1.25 *** LinkData.java 27 Jul 2003 19:19:19 -0000 1.24 --- LinkData.java 11 Aug 2003 00:18:30 -0000 1.25 *************** *** 1,3 **** ! // HTMLParser Library v1_4_20030727 - A java-based parser for HTML // Copyright (C) Dec 31, 2000 Somik Raha // --- 1,3 ---- ! // HTMLParser Library v1_4_20030810 - A java-based parser for HTML // Copyright (C) Dec 31, 2000 Somik Raha // Index: TagData.java =================================================================== RCS file: /cvsroot/htmlparser/htmlparser/src/org/htmlparser/tags/data/TagData.java,v retrieving revision 1.25 retrieving revision 1.26 diff -C2 -d -r1.25 -r1.26 *** TagData.java 27 Jul 2003 19:19:19 -0000 1.25 --- TagData.java 11 Aug 2003 00:18:30 -0000 1.26 *************** *** 1,3 **** ! // HTMLParser Library v1_4_20030727 - A java-based parser for HTML // Copyright (C) Dec 31, 2000 Somik Raha // --- 1,3 ---- ! // HTMLParser Library v1_4_20030810 - A java-based parser for HTML // Copyright (C) Dec 31, 2000 Somik Raha // |
Update of /cvsroot/htmlparser/htmlparser/src/org/htmlparser/scanners
In directory sc8-pr-cvs1:/tmp/cvs-serv7155/src/org/htmlparser/scanners
Modified Files:
AppletScanner.java BaseHrefScanner.java BodyScanner.java
BulletListScanner.java BulletScanner.java
CompositeTagScanner.java DivScanner.java DoctypeScanner.java
FormScanner.java FrameScanner.java FrameSetScanner.java
HeadScanner.java HtmlScanner.java ImageScanner.java
InputTagScanner.java JspScanner.java LabelScanner.java
LinkScanner.java MetaTagScanner.java OptionTagScanner.java
ScriptScanner.java SelectTagScanner.java SpanScanner.java
StyleScanner.java TableColumnScanner.java TableRowScanner.java
TableScanner.java TagScanner.java TextareaTagScanner.java
TitleScanner.java package.html
Log Message:
Update version headers to 1.4-20030810 and update changelog.
Index: AppletScanner.java
===================================================================
RCS file: /cvsroot/htmlparser/htmlparser/src/org/htmlparser/scanners/AppletScanner.java,v
retrieving revision 1.26
retrieving revision 1.27
diff -C2 -d -r1.26 -r1.27
*** AppletScanner.java 27 Jul 2003 19:19:17 -0000 1.26
--- AppletScanner.java 11 Aug 2003 00:18:30 -0000 1.27
***************
*** 1,3 ****
! // HTMLParser Library v1_4_20030727 - A java-based parser for HTML
// Copyright (C) Dec 31, 2000 Somik Raha
//
--- 1,3 ----
! // HTMLParser Library v1_4_20030810 - A java-based parser for HTML
// Copyright (C) Dec 31, 2000 Somik Raha
//
Index: BaseHrefScanner.java
===================================================================
RCS file: /cvsroot/htmlparser/htmlparser/src/org/htmlparser/scanners/BaseHrefScanner.java,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** BaseHrefScanner.java 27 Jul 2003 19:19:18 -0000 1.20
--- BaseHrefScanner.java 11 Aug 2003 00:18:30 -0000 1.21
***************
*** 1,3 ****
! // HTMLParser Library v1_4_20030727 - A java-based parser for HTML
// Copyright (C) Dec 31, 2000 Somik Raha
//
--- 1,3 ----
! // HTMLParser Library v1_4_20030810 - A java-based parser for HTML
// Copyright (C) Dec 31, 2000 Somik Raha
//
Index: BodyScanner.java
===================================================================
RCS file: /cvsroot/htmlparser/htmlparser/src/org/htmlparser/scanners/BodyScanner.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** BodyScanner.java 27 Jul 2003 19:19:18 -0000 1.12
--- BodyScanner.java 11 Aug 2003 00:18:30 -0000 1.13
***************
*** 1,3 ****
! // HTMLParser Library v1_4_20030727 - A java-based parser for HTML
// Copyright (C) Dec 31, 2000 Somik Raha
//
--- 1,3 ----
! // HTMLParser Library v1_4_20030810 - A java-based parser for HTML
// Copyright (C) Dec 31, 2000 Somik Raha
//
Index: BulletListScanner.java
===================================================================
RCS file: /cvsroot/htmlparser/htmlparser/src/org/htmlparser/scanners/BulletListScanner.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** BulletListScanner.java 27 Jul 2003 19:19:18 -0000 1.11
--- BulletListScanner.java 11 Aug 2003 00:18:30 -0000 1.12
***************
*** 1,3 ****
! // HTMLParser Library v1_4_20030727 - A java-based parser for HTML
// Copyright (C) Dec 31, 2000 Somik Raha
//
--- 1,3 ----
! // HTMLParser Library v1_4_20030810 - A java-based parser for HTML
// Copyright (C) Dec 31, 2000 Somik Raha
//
Index: BulletScanner.java
===================================================================
RCS file: /cvsroot/htmlparser/htmlparser/src/org/htmlparser/scanners/BulletScanner.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** BulletScanner.java 27 Jul 2003 19:19:18 -0000 1.16
--- BulletScanner.java 11 Aug 2003 00:18:30 -0000 1.17
***************
*** 1,3 ****
! // HTMLParser Library v1_4_20030727 - A java-based parser for HTML
// Copyright (C) Dec 31, 2000 Somik Raha
//
--- 1,3 ----
! // HTMLParser Library v1_4_20030810 - A java-based parser for HTML
// Copyright (C) Dec 31, 2000 Somik Raha
//
Index: CompositeTagScanner.java
===================================================================
RCS file: /cvsroot/htmlparser/htmlparser/src/org/htmlparser/scanners/CompositeTagScanner.java,v
retrieving revision 1.61
retrieving revision 1.62
diff -C2 -d -r1.61 -r1.62
*** CompositeTagScanner.java 27 Jul 2003 19:19:18 -0000 1.61
--- CompositeTagScanner.java 11 Aug 2003 00:18:30 -0000 1.62
***************
*** 1,3 ****
! // HTMLParser Library v1_4_20030727 - A java-based parser for HTML
// Copyright (C) Dec 31, 2000 Somik Raha
//
--- 1,3 ----
! // HTMLParser Library v1_4_20030810 - A java-based parser for HTML
// Copyright (C) Dec 31, 2000 Somik Raha
//
Index: DivScanner.java
===================================================================
RCS file: /cvsroot/htmlparser/htmlparser/src/org/htmlparser/scanners/DivScanner.java,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -d -r1.24 -r1.25
*** DivScanner.java 27 Jul 2003 19:19:18 -0000 1.24
--- DivScanner.java 11 Aug 2003 00:18:30 -0000 1.25
***************
*** 1,3 ****
! // HTMLParser Library v1_4_20030727 - A java-based parser for HTML
// Copyright (C) Dec 31, 2000 Somik Raha
//
--- 1,3 ----
! // HTMLParser Library v1_4_20030810 - A java-based parser for HTML
// Copyright (C) Dec 31, 2000 Somik Raha
//
Index: DoctypeScanner.java
===================================================================
RCS file: /cvsroot/htmlparser/htmlparser/src/org/htmlparser/scanners/DoctypeScanner.java,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** DoctypeScanner.java 27 Jul 2003 19:19:18 -0000 1.21
--- DoctypeScanner.java 11 Aug 2003 00:18:30 -0000 1.22
***************
*** 1,3 ****
! // HTMLParser Library v1_4_20030727 - A java-based parser for HTML
// Copyright (C) Dec 31, 2000 Somik Raha
//
--- 1,3 ----
! // HTMLParser Library v1_4_20030810 - A java-based parser for HTML
// Copyright (C) Dec 31, 2000 Somik Raha
//
Index: FormScanner.java
===================================================================
RCS file: /cvsroot/htmlparser/htmlparser/src/org/htmlparser/scanners/FormScanner.java,v
retrieving revision 1.38
retrieving revision 1.39
diff -C2 -d -r1.38 -r1.39
*** FormScanner.java 27 Jul 2003 19:19:18 -0000 1.38
--- FormScanner.java 11 Aug 2003 00:18:30 -0000 1.39
***************
*** 1,3 ****
! // HTMLParser Library v1_4_20030727 - A java-based parser for HTML
// Copyright (C) Dec 31, 2000 Somik Raha
//
--- 1,3 ----
! // HTMLParser Library v1_4_20030810 - A java-based parser for HTML
// Copyright (C) Dec 31, 2000 Somik Raha
//
Index: FrameScanner.java
===================================================================
RCS file: /cvsroot/htmlparser/htmlparser/src/org/htmlparser/scanners/FrameScanner.java,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** FrameScanner.java 27 Jul 2003 19:19:18 -0000 1.21
--- FrameScanner.java 11 Aug 2003 00:18:30 -0000 1.22
***************
*** 1,3 ****
! // HTMLParser Library v1_4_20030727 - A java-based parser for HTML
// Copyright (C) Dec 31, 2000 Somik Raha
//
--- 1,3 ----
! // HTMLParser Library v1_4_20030810 - A java-based parser for HTML
// Copyright (C) Dec 31, 2000 Somik Raha
//
Index: FrameSetScanner.java
===================================================================
RCS file: /cvsroot/htmlparser/htmlparser/src/org/htmlparser/scanners/FrameSetScanner.java,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -d -r1.22 -r1.23
*** FrameSetScanner.java 27 Jul 2003 19:19:18 -0000 1.22
--- FrameSetScanner.java 11 Aug 2003 00:18:30 -0000 1.23
***************
*** 1,3 ****
! // HTMLParser Library v1_4_20030727 - A java-based parser for HTML
// Copyright (C) Dec 31, 2000 Somik Raha
//
--- 1,3 ----
! // HTMLParser Library v1_4_20030810 - A java-based parser for HTML
// Copyright (C) Dec 31, 2000 Somik Raha
//
Index: HeadScanner.java
===================================================================
RCS file: /cvsroot/htmlparser/htmlparser/src/org/htmlparser/scanners/HeadScanner.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** HeadScanner.java 27 Jul 2003 19:19:18 -0000 1.9
--- HeadScanner.java 11 Aug 2003 00:18:30 -0000 1.10
***************
*** 1,3 ****
! // HTMLParser Library v1_4_20030727 - A java-based parser for HTML
// Copyright (C) Dec 31, 2000 Somik Raha
//
--- 1,3 ----
! // HTMLParser Library v1_4_20030810 - A java-based parser for HTML
// Copyright (C) Dec 31, 2000 Somik Raha
//
Index: HtmlScanner.java
===================================================================
RCS file: /cvsroot/htmlparser/htmlparser/src/org/htmlparser/scanners/HtmlScanner.java,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -d -r1.24 -r1.25
*** HtmlScanner.java 27 Jul 2003 19:19:18 -0000 1.24
--- HtmlScanner.java 11 Aug 2003 00:18:30 -0000 1.25
***************
*** 1,3 ****
! // HTMLParser Library v1_4_20030727 - A java-based parser for HTML
// Copyright (C) Dec 31, 2000 Somik Raha
//
--- 1,3 ----
! // HTMLParser Library v1_4_20030810 - A java-based parser for HTML
// Copyright (C) Dec 31, 2000 Somik Raha
//
Index: ImageScanner.java
===================================================================
RCS file: /cvsroot/htmlparser/htmlparser/src/org/htmlparser/scanners/ImageScanner.java,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** ImageScanner.java 27 Jul 2003 19:19:18 -0000 1.21
--- ImageScanner.java 11 Aug 2003 00:18:30 -0000 1.22
***************
*** 1,3 ****
! // HTMLParser Library v1_4_20030727 - A java-based parser for HTML
// Copyright (C) Dec 31, 2000 Somik Raha
//
--- 1,3 ----
! // HTMLParser Library v1_4_20030810 - A java-based parser for HTML
// Copyright (C) Dec 31, 2000 Somik Raha
//
Index: InputTagScanner.java
===================================================================
RCS file: /cvsroot/htmlparser/htmlparser/src/org/htmlparser/scanners/InputTagScanner.java,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** InputTagScanner.java 27 Jul 2003 19:19:18 -0000 1.20
--- InputTagScanner.java 11 Aug 2003 00:18:30 -0000 1.21
***************
*** 1,3 ****
! // HTMLParser Library v1_4_20030727 - A java-based parser for HTML
// Copyright (C) Dec 31, 2000 Somik Raha
//
--- 1,3 ----
! // HTMLParser Library v1_4_20030810 - A java-based parser for HTML
// Copyright (C) Dec 31, 2000 Somik Raha
//
Index: JspScanner.java
===================================================================
RCS file: /cvsroot/htmlparser/htmlparser/src/org/htmlparser/scanners/JspScanner.java,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** JspScanner.java 27 Jul 2003 19:19:18 -0000 1.21
--- JspScanner.java 11 Aug 2003 00:18:30 -0000 1.22
***************
*** 1,3 ****
! // HTMLParser Library v1_4_20030727 - A java-based parser for HTML
// Copyright (C) Dec 31, 2000 Somik Raha
//
--- 1,3 ----
! // HTMLParser Library v1_4_20030810 - A java-based parser for HTML
// Copyright (C) Dec 31, 2000 Somik Raha
//
Index: LabelScanner.java
===================================================================
RCS file: /cvsroot/htmlparser/htmlparser/src/org/htmlparser/scanners/LabelScanner.java,v
retrieving revision 1.27
retrieving revision 1.28
diff -C2 -d -r1.27 -r1.28
*** LabelScanner.java 27 Jul 2003 19:19:18 -0000 1.27
--- LabelScanner.java 11 Aug 2003 00:18:30 -0000 1.28
***************
*** 1,3 ****
! // HTMLParser Library v1_4_20030727 - A java-based parser for HTML
// Copyright (C) Dec 31, 2000 Somik Raha
//
--- 1,3 ----
! // HTMLParser Library v1_4_20030810 - A java-based parser for HTML
// Copyright (C) Dec 31, 2000 Somik Raha
//
Index: LinkScanner.java
===================================================================
RCS file: /cvsroot/htmlparser/htmlparser/src/org/htmlparser/scanners/LinkScanner.java,v
retrieving revision 1.47
retrieving revision 1.48
diff -C2 -d -r1.47 -r1.48
*** LinkScanner.java 27 Jul 2003 19:19:18 -0000 1.47
--- LinkScanner.java 11 Aug 2003 00:18:30 -0000 1.48
***************
*** 1,3 ****
! // HTMLParser Library v1_4_20030727 - A java-based parser for HTML
// Copyright (C) Dec 31, 2000 Somik Raha
//
--- 1,3 ----
! // HTMLParser Library v1_4_20030810 - A java-based parser for HTML
// Copyright (C) Dec 31, 2000 Somik Raha
//
Index: MetaTagScanner.java
===================================================================
RCS file: /cvsroot/htmlparser/htmlparser/src/org/htmlparser/scanners/MetaTagScanner.java,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** MetaTagScanner.java 27 Jul 2003 19:19:18 -0000 1.20
--- MetaTagScanner.java 11 Aug 2003 00:18:30 -0000 1.21
***************
*** 1,3 ****
! // HTMLParser Library v1_4_20030727 - A java-based parser for HTML
// Copyright (C) Dec 31, 2000 Somik Raha
//
--- 1,3 ----
! // HTMLParser Library v1_4_20030810 - A java-based parser for HTML
// Copyright (C) Dec 31, 2000 Somik Raha
//
Index: OptionTagScanner.java
===================================================================
RCS file: /cvsroot/htmlparser/htmlparser/src/org/htmlparser/scanners/OptionTagScanner.java,v
retrieving revision 1.27
retrieving revision 1.28
diff -C2 -d -r1.27 -r1.28
*** OptionTagScanner.java 27 Jul 2003 19:19:18 -0000 1.27
--- OptionTagScanner.java 11 Aug 2003 00:18:30 -0000 1.28
***************
*** 1,3 ****
! // HTMLParser Library v1_4_20030727 - A java-based parser for HTML
// Copyright (C) Dec 31, 2000 Somik Raha
//
--- 1,3 ----
! // HTMLParser Library v1_4_20030810 - A java-based parser for HTML
// Copyright (C) Dec 31, 2000 Somik Raha
//
Index: ScriptScanner.java
===================================================================
RCS file: /cvsroot/htmlparser/htmlparser/src/org/htmlparser/scanners/ScriptScanner.java,v
retrieving revision 1.33
retrieving revision 1.34
diff -C2 -d -r1.33 -r1.34
*** ScriptScanner.java 27 Jul 2003 19:19:18 -0000 1.33
--- ScriptScanner.java 11 Aug 2003 00:18:30 -0000 1.34
***************
*** 1,3 ****
! // HTMLParser Library v1_4_20030727 - A java-based parser for HTML
// Copyright (C) Dec 31, 2000 Somik Raha
//
--- 1,3 ----
! // HTMLParser Library v1_4_20030810 - A java-based parser for HTML
// Copyright (C) Dec 31, 2000 Somik Raha
//
Index: SelectTagScanner.java
===================================================================
RCS file: /cvsroot/htmlparser/htmlparser/src/org/htmlparser/scanners/SelectTagScanner.java,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -d -r1.25 -r1.26
*** SelectTagScanner.java 27 Jul 2003 19:19:18 -0000 1.25
--- SelectTagScanner.java 11 Aug 2003 00:18:30 -0000 1.26
***************
*** 1,3 ****
! // HTMLParser Library v1_4_20030727 - A java-based parser for HTML
// Copyright (C) Dec 31, 2000 Somik Raha
//
--- 1,3 ----
! // HTMLParser Library v1_4_20030810 - A java-based parser for HTML
// Copyright (C) Dec 31, 2000 Somik Raha
//
Index: SpanScanner.java
===================================================================
RCS file: /cvsroot/htmlparser/htmlparser/src/org/htmlparser/scanners/SpanScanner.java,v
retrieving revision 1.26
retrieving revision 1.27
diff -C2 -d -r1.26 -r1.27
*** SpanScanner.java 27 Jul 2003 19:19:18 -0000 1.26
--- SpanScanner.java 11 Aug 2003 00:18:30 -0000 1.27
***************
*** 1,3 ****
! // HTMLParser Library v1_4_20030727 - A java-based parser for HTML
// Copyright (C) Dec 31, 2000 Somik Raha
//
--- 1,3 ----
! // HTMLParser Library v1_4_20030810 - A java-based parser for HTML
// Copyright (C) Dec 31, 2000 Somik Raha
//
Index: StyleScanner.java
===================================================================
RCS file: /cvsroot/htmlparser/htmlparser/src/org/htmlparser/scanners/StyleScanner.java,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** StyleScanner.java 27 Jul 2003 19:19:18 -0000 1.21
--- StyleScanner.java 11 Aug 2003 00:18:30 -0000 1.22
***************
*** 1,3 ****
! // HTMLParser Library v1_4_20030727 - A java-based parser for HTML
// Copyright (C) Dec 31, 2000 Somik Raha
//
--- 1,3 ----
! // HTMLParser Library v1_4_20030810 - A java-based parser for HTML
// Copyright (C) Dec 31, 2000 Somik Raha
//
Index: TableColumnScanner.java
===================================================================
RCS file: /cvsroot/htmlparser/htmlparser/src/org/htmlparser/scanners/TableColumnScanner.java,v
retrieving revision 1.29
retrieving revision 1.30
diff -C2 -d -r1.29 -r1.30
*** TableColumnScanner.java 27 Jul 2003 19:19:18 -0000 1.29
--- TableColumnScanner.java 11 Aug 2003 00:18:30 -0000 1.30
***************
*** 1,3 ****
! // HTMLParser Library v1_4_20030727 - A java-based parser for HTML
// Copyright (C) Dec 31, 2000 Somik Raha
//
--- 1,3 ----
! // HTMLParser Library v1_4_20030810 - A java-based parser for HTML
// Copyright (C) Dec 31, 2000 Somik Raha
//
Index: TableRowScanner.java
===================================================================
RCS file: /cvsroot/htmlparser/htmlparser/src/org/htmlparser/scanners/TableRowScanner.java,v
retrieving revision 1.32
retrieving revision 1.33
diff -C2 -d -r1.32 -r1.33
*** TableRowScanner.java 27 Jul 2003 19:19:18 -0000 1.32
--- TableRowScanner.java 11 Aug 2003 00:18:30 -0000 1.33
***************
*** 1,3 ****
! // HTMLParser Library v1_4_20030727 - A java-based parser for HTML
// Copyright (C) Dec 31, 2000 Somik Raha
//
--- 1,3 ----
! // HTMLParser Library v1_4_20030810 - A java-based parser for HTML
// Copyright (C) Dec 31, 2000 Somik Raha
//
Index: TableScanner.java
===================================================================
RCS file: /cvsroot/htmlparser/htmlparser/src/org/htmlparser/scanners/TableScanner.java,v
retrieving revision 1.31
retrieving revision 1.32
diff -C2 -d -r1.31 -r1.32
*** TableScanner.java 27 Jul 2003 19:19:18 -0000 1.31
--- TableScanner.java 11 Aug 2003 00:18:30 -0000 1.32
***************
*** 1,3 ****
! // HTMLParser Library v1_4_20030727 - A java-based parser for HTML
// Copyright (C) Dec 31, 2000 Somik Raha
//
--- 1,3 ----
! // HTMLParser Library v1_4_20030810 - A java-based parser for HTML
// Copyright (C) Dec 31, 2000 Somik Raha
//
Index: TagScanner.java
===================================================================
RCS file: /cvsroot/htmlparser/htmlparser/src/org/htmlparser/scanners/TagScanner.java,v
retrieving revision 1.31
retrieving revision 1.32
diff -C2 -d -r1.31 -r1.32
*** TagScanner.java 27 Jul 2003 19:19:18 -0000 1.31
--- TagScanner.java 11 Aug 2003 00:18:30 -0000 1.32
***************
*** 1,3 ****
! // HTMLParser Library v1_4_20030727 - A java-based parser for HTML
// Copyright (C) Dec 31, 2000 Somik Raha
//
--- 1,3 ----
! // HTMLParser Library v1_4_20030810 - A java-based parser for HTML
// Copyright (C) Dec 31, 2000 Somik Raha
//
Index: TextareaTagScanner.java
===================================================================
RCS file: /cvsroot/htmlparser/htmlparser/src/org/htmlparser/scanners/TextareaTagScanner.java,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -d -r1.22 -r1.23
*** TextareaTagScanner.java 27 Jul 2003 19:19:18 -0000 1.22
--- TextareaTagScanner.java 11 Aug 2003 00:18:30 -0000 1.23
***************
*** 1,3 ****
! // HTMLParser Library v1_4_20030727 - A java-based parser for HTML
// Copyright (C) Dec 31, 2000 Somik Raha
//
--- 1,3 ----
! // HTMLParser Library v1_4_20030810 - A java-based parser for HTML
// Copyright (C) Dec 31, 2000 Somik Raha
//
Index: TitleScanner.java
===================================================================
RCS file: /cvsroot/htmlparser/htmlparser/src/org/htmlparser/scanners/TitleScanner.java,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -d -r1.23 -r1.24
*** TitleScanner.java 27 Jul 2003 19:19:18 -0000 1.23
--- TitleScanner.java 11 Aug 2003 00:18:30 -0000 1.24
***************
*** 1,3 ****
! // HTMLParser Library v1_4_20030727 - A java-based parser for HTML
// Copyright (C) Dec 31, 2000 Somik Raha
//
--- 1,3 ----
! // HTMLParser Library v1_4_20030810 - A java-based parser for HTML
// Copyright (C) Dec 31, 2000 Somik Raha
//
Index: package.html
===================================================================
RCS file: /cvsroot/htmlparser/htmlparser/src/org/htmlparser/scanners/package.html,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** package.html 27 Jul 2003 19:19:18 -0000 1.10
--- package.html 11 Aug 2003 00:18:30 -0000 1.11
***************
*** 6,10 ****
@(#)package.html 1.60 98/01/27
! HTMLParser Library v1_4_20030727 - A java-based parser for HTML
Copyright (C) Dec 31, 2000 Somik Raha
--- 6,10 ----
@(#)package.html 1.60 98/01/27
! HTMLParser Library v1_4_20030810 - A java-based parser for HTML
Copyright (C) Dec 31, 2000 Somik Raha
|
|
From: <der...@us...> - 2003-08-11 00:19:07
|
Update of /cvsroot/htmlparser/htmlparser/src/org/htmlparser/tests
In directory sc8-pr-cvs1:/tmp/cvs-serv7155/src/org/htmlparser/tests
Modified Files:
AllTests.java AssertXmlEqualsTest.java BadTagIdentifier.java
FunctionalTests.java InstanceofPerformanceTest.java
LineNumberAssignedByNodeReaderTest.java ParserTest.java
ParserTestCase.java PerformanceTest.java package.html
Log Message:
Update version headers to 1.4-20030810 and update changelog.
Index: AllTests.java
===================================================================
RCS file: /cvsroot/htmlparser/htmlparser/src/org/htmlparser/tests/AllTests.java,v
retrieving revision 1.45
retrieving revision 1.46
diff -C2 -d -r1.45 -r1.46
*** AllTests.java 27 Jul 2003 19:19:19 -0000 1.45
--- AllTests.java 11 Aug 2003 00:18:31 -0000 1.46
***************
*** 1,3 ****
! // HTMLParser Library v1_4_20030727 - A java-based parser for HTML
// Copyright (C) Dec 31, 2000 Somik Raha
//
--- 1,3 ----
! // HTMLParser Library v1_4_20030810 - A java-based parser for HTML
// Copyright (C) Dec 31, 2000 Somik Raha
//
Index: AssertXmlEqualsTest.java
===================================================================
RCS file: /cvsroot/htmlparser/htmlparser/src/org/htmlparser/tests/AssertXmlEqualsTest.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** AssertXmlEqualsTest.java 27 Jul 2003 19:19:20 -0000 1.7
--- AssertXmlEqualsTest.java 11 Aug 2003 00:18:31 -0000 1.8
***************
*** 1,3 ****
! // HTMLParser Library v1_4_20030727 - A java-based parser for HTML
// Copyright (C) Dec 31, 2000 Somik Raha
//
--- 1,3 ----
! // HTMLParser Library v1_4_20030810 - A java-based parser for HTML
// Copyright (C) Dec 31, 2000 Somik Raha
//
Index: BadTagIdentifier.java
===================================================================
RCS file: /cvsroot/htmlparser/htmlparser/src/org/htmlparser/tests/BadTagIdentifier.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** BadTagIdentifier.java 27 Jul 2003 19:19:20 -0000 1.6
--- BadTagIdentifier.java 11 Aug 2003 00:18:31 -0000 1.7
***************
*** 1,3 ****
! // HTMLParser Library v1_4_20030727 - A java-based parser for HTML
// Copyright (C) Dec 31, 2000 Somik Raha
//
--- 1,3 ----
! // HTMLParser Library v1_4_20030810 - A java-based parser for HTML
// Copyright (C) Dec 31, 2000 Somik Raha
//
Index: FunctionalTests.java
===================================================================
RCS file: /cvsroot/htmlparser/htmlparser/src/org/htmlparser/tests/FunctionalTests.java,v
retrieving revision 1.38
retrieving revision 1.39
diff -C2 -d -r1.38 -r1.39
*** FunctionalTests.java 27 Jul 2003 19:19:20 -0000 1.38
--- FunctionalTests.java 11 Aug 2003 00:18:31 -0000 1.39
***************
*** 1,3 ****
! // HTMLParser Library v1_4_20030727 - A java-based parser for HTML
// Copyright (C) Dec 31, 2000 Somik Raha
//
--- 1,3 ----
! // HTMLParser Library v1_4_20030810 - A java-based parser for HTML
// Copyright (C) Dec 31, 2000 Somik Raha
//
Index: InstanceofPerformanceTest.java
===================================================================
RCS file: /cvsroot/htmlparser/htmlparser/src/org/htmlparser/tests/InstanceofPerformanceTest.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** InstanceofPerformanceTest.java 27 Jul 2003 19:19:20 -0000 1.9
--- InstanceofPerformanceTest.java 11 Aug 2003 00:18:31 -0000 1.10
***************
*** 1,3 ****
! // HTMLParser Library v1_4_20030727 - A java-based parser for HTML
// Copyright (C) Dec 31, 2000 Somik Raha
//
--- 1,3 ----
! // HTMLParser Library v1_4_20030810 - A java-based parser for HTML
// Copyright (C) Dec 31, 2000 Somik Raha
//
Index: LineNumberAssignedByNodeReaderTest.java
===================================================================
RCS file: /cvsroot/htmlparser/htmlparser/src/org/htmlparser/tests/LineNumberAssignedByNodeReaderTest.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** LineNumberAssignedByNodeReaderTest.java 27 Jul 2003 19:19:20 -0000 1.16
--- LineNumberAssignedByNodeReaderTest.java 11 Aug 2003 00:18:31 -0000 1.17
***************
*** 1,3 ****
! // HTMLParser Library v1_4_20030727 - A java-based parser for HTML
// Copyright (C) Dec 31, 2000 Somik Raha
//
--- 1,3 ----
! // HTMLParser Library v1_4_20030810 - A java-based parser for HTML
// Copyright (C) Dec 31, 2000 Somik Raha
//
Index: ParserTest.java
===================================================================
RCS file: /cvsroot/htmlparser/htmlparser/src/org/htmlparser/tests/ParserTest.java,v
retrieving revision 1.35
retrieving revision 1.36
diff -C2 -d -r1.35 -r1.36
*** ParserTest.java 27 Jul 2003 19:19:20 -0000 1.35
--- ParserTest.java 11 Aug 2003 00:18:31 -0000 1.36
***************
*** 1,3 ****
! // HTMLParser Library v1_4_20030727 - A java-based parser for HTML
// Copyright (C) Dec 31, 2000 Somik Raha
//
--- 1,3 ----
! // HTMLParser Library v1_4_20030810 - A java-based parser for HTML
// Copyright (C) Dec 31, 2000 Somik Raha
//
Index: ParserTestCase.java
===================================================================
RCS file: /cvsroot/htmlparser/htmlparser/src/org/htmlparser/tests/ParserTestCase.java,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** ParserTestCase.java 27 Jul 2003 19:19:20 -0000 1.20
--- ParserTestCase.java 11 Aug 2003 00:18:31 -0000 1.21
***************
*** 1,3 ****
! // HTMLParser Library v1_4_20030727 - A java-based parser for HTML
// Copyright (C) Dec 31, 2000 Somik Raha
//
--- 1,3 ----
! // HTMLParser Library v1_4_20030810 - A java-based parser for HTML
// Copyright (C) Dec 31, 2000 Somik Raha
//
Index: PerformanceTest.java
===================================================================
RCS file: /cvsroot/htmlparser/htmlparser/src/org/htmlparser/tests/PerformanceTest.java,v
retrieving revision 1.36
retrieving revision 1.37
diff -C2 -d -r1.36 -r1.37
*** PerformanceTest.java 27 Jul 2003 19:19:20 -0000 1.36
--- PerformanceTest.java 11 Aug 2003 00:18:31 -0000 1.37
***************
*** 1,3 ****
! // HTMLParser Library v1_4_20030727 - A java-based parser for HTML
// Copyright (C) Dec 31, 2000 Somik Raha
//
--- 1,3 ----
! // HTMLParser Library v1_4_20030810 - A java-based parser for HTML
// Copyright (C) Dec 31, 2000 Somik Raha
//
Index: package.html
===================================================================
RCS file: /cvsroot/htmlparser/htmlparser/src/org/htmlparser/tests/package.html,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** package.html 27 Jul 2003 19:19:20 -0000 1.10
--- package.html 11 Aug 2003 00:18:31 -0000 1.11
***************
*** 6,10 ****
@(#)package.html 1.60 98/01/27
! HTMLParser Library v1_4_20030727 - A java-based parser for HTML
Copyright (C) Dec 31, 2000 Somik Raha
--- 6,10 ----
@(#)package.html 1.60 98/01/27
! HTMLParser Library v1_4_20030810 - A java-based parser for HTML
Copyright (C) Dec 31, 2000 Somik Raha
|
Update of /cvsroot/htmlparser/htmlparser/src/org/htmlparser/tests/lexerTests In directory sc8-pr-cvs1:/tmp/cvs-serv7155/src/org/htmlparser/tests/lexerTests Modified Files: AllTests.java PageIndexTests.java PageTests.java SourceTests.java StreamTests.java Log Message: Update version headers to 1.4-20030810 and update changelog. Index: AllTests.java =================================================================== RCS file: /cvsroot/htmlparser/htmlparser/src/org/htmlparser/tests/lexerTests/AllTests.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** AllTests.java 10 Aug 2003 23:36:18 -0000 1.3 --- AllTests.java 11 Aug 2003 00:18:31 -0000 1.4 *************** *** 1,3 **** ! // HTMLParser Library v1_4_20030727 - A java-based parser for HTML // Copyright (C) Dec 31, 2000 Somik Raha // --- 1,3 ---- ! // HTMLParser Library v1_4_20030810 - A java-based parser for HTML // Copyright (C) Dec 31, 2000 Somik Raha // Index: PageIndexTests.java =================================================================== RCS file: /cvsroot/htmlparser/htmlparser/src/org/htmlparser/tests/lexerTests/PageIndexTests.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** PageIndexTests.java 10 Aug 2003 23:36:18 -0000 1.1 --- PageIndexTests.java 11 Aug 2003 00:18:31 -0000 1.2 *************** *** 1,3 **** ! // HTMLParser Library v1_4_20030727 - A java-based parser for HTML // Copyright (C) Dec 31, 2000 Somik Raha // --- 1,3 ---- ! // HTMLParser Library v1_4_20030810 - A java-based parser for HTML // Copyright (C) Dec 31, 2000 Somik Raha // Index: PageTests.java =================================================================== RCS file: /cvsroot/htmlparser/htmlparser/src/org/htmlparser/tests/lexerTests/PageTests.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** PageTests.java 10 Aug 2003 23:36:18 -0000 1.3 --- PageTests.java 11 Aug 2003 00:18:31 -0000 1.4 *************** *** 1,3 **** ! // HTMLParser Library v1_4_20030727 - A java-based parser for HTML // Copyright (C) Dec 31, 2000 Somik Raha // --- 1,3 ---- ! // HTMLParser Library v1_4_20030810 - A java-based parser for HTML // Copyright (C) Dec 31, 2000 Somik Raha // Index: SourceTests.java =================================================================== RCS file: /cvsroot/htmlparser/htmlparser/src/org/htmlparser/tests/lexerTests/SourceTests.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** SourceTests.java 27 Jul 2003 19:19:20 -0000 1.2 --- SourceTests.java 11 Aug 2003 00:18:31 -0000 1.3 *************** *** 1,3 **** ! // HTMLParser Library v1_4_20030727 - A java-based parser for HTML // Copyright (C) Dec 31, 2000 Somik Raha // --- 1,3 ---- ! // HTMLParser Library v1_4_20030810 - A java-based parser for HTML // Copyright (C) Dec 31, 2000 Somik Raha // Index: StreamTests.java =================================================================== RCS file: /cvsroot/htmlparser/htmlparser/src/org/htmlparser/tests/lexerTests/StreamTests.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** StreamTests.java 27 Jul 2003 19:19:20 -0000 1.2 --- StreamTests.java 11 Aug 2003 00:18:31 -0000 1.3 *************** *** 1,3 **** ! // HTMLParser Library v1_4_20030727 - A java-based parser for HTML // Copyright (C) Dec 31, 2000 Somik Raha // --- 1,3 ---- ! // HTMLParser Library v1_4_20030810 - A java-based parser for HTML // Copyright (C) Dec 31, 2000 Somik Raha // |
Update of /cvsroot/htmlparser/htmlparser/src/org/htmlparser/tests/nodeDecoratorTests In directory sc8-pr-cvs1:/tmp/cvs-serv7155/src/org/htmlparser/tests/nodeDecoratorTests Modified Files: AllTests.java DecodingNodeTest.java EscapeCharacterRemovingNodeTest.java NonBreakingSpaceConvertingNodeTest.java Log Message: Update version headers to 1.4-20030810 and update changelog. Index: AllTests.java =================================================================== RCS file: /cvsroot/htmlparser/htmlparser/src/org/htmlparser/tests/nodeDecoratorTests/AllTests.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** AllTests.java 27 Jul 2003 19:19:20 -0000 1.5 --- AllTests.java 11 Aug 2003 00:18:31 -0000 1.6 *************** *** 1,3 **** ! // HTMLParser Library v1_4_20030727 - A java-based parser for HTML // Copyright (C) Dec 31, 2000 Somik Raha // --- 1,3 ---- ! // HTMLParser Library v1_4_20030810 - A java-based parser for HTML // Copyright (C) Dec 31, 2000 Somik Raha // Index: DecodingNodeTest.java =================================================================== RCS file: /cvsroot/htmlparser/htmlparser/src/org/htmlparser/tests/nodeDecoratorTests/DecodingNodeTest.java,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** DecodingNodeTest.java 27 Jul 2003 19:19:20 -0000 1.6 --- DecodingNodeTest.java 11 Aug 2003 00:18:32 -0000 1.7 *************** *** 1,3 **** ! // HTMLParser Library v1_4_20030727 - A java-based parser for HTML // Copyright (C) Dec 31, 2000 Somik Raha // --- 1,3 ---- ! // HTMLParser Library v1_4_20030810 - A java-based parser for HTML // Copyright (C) Dec 31, 2000 Somik Raha // Index: EscapeCharacterRemovingNodeTest.java =================================================================== RCS file: /cvsroot/htmlparser/htmlparser/src/org/htmlparser/tests/nodeDecoratorTests/EscapeCharacterRemovingNodeTest.java,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** EscapeCharacterRemovingNodeTest.java 27 Jul 2003 19:19:20 -0000 1.6 --- EscapeCharacterRemovingNodeTest.java 11 Aug 2003 00:18:32 -0000 1.7 *************** *** 1,3 **** ! // HTMLParser Library v1_4_20030727 - A java-based parser for HTML // Copyright (C) Dec 31, 2000 Somik Raha // --- 1,3 ---- ! // HTMLParser Library v1_4_20030810 - A java-based parser for HTML // Copyright (C) Dec 31, 2000 Somik Raha // Index: NonBreakingSpaceConvertingNodeTest.java =================================================================== RCS file: /cvsroot/htmlparser/htmlparser/src/org/htmlparser/tests/nodeDecoratorTests/NonBreakingSpaceConvertingNodeTest.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** NonBreakingSpaceConvertingNodeTest.java 27 Jul 2003 19:19:20 -0000 1.5 --- NonBreakingSpaceConvertingNodeTest.java 11 Aug 2003 00:18:32 -0000 1.6 *************** *** 1,3 **** ! // HTMLParser Library v1_4_20030727 - A java-based parser for HTML // Copyright (C) Dec 31, 2000 Somik Raha // --- 1,3 ---- ! // HTMLParser Library v1_4_20030810 - A java-based parser for HTML // Copyright (C) Dec 31, 2000 Somik Raha // |
Update of /cvsroot/htmlparser/htmlparser/src/org/htmlparser/parserapplications
In directory sc8-pr-cvs1:/tmp/cvs-serv7155/src/org/htmlparser/parserapplications
Modified Files:
LinkExtractor.java MailRipper.java Robot.java
StringExtractor.java package.html
Log Message:
Update version headers to 1.4-20030810 and update changelog.
Index: LinkExtractor.java
===================================================================
RCS file: /cvsroot/htmlparser/htmlparser/src/org/htmlparser/parserapplications/LinkExtractor.java,v
retrieving revision 1.39
retrieving revision 1.40
diff -C2 -d -r1.39 -r1.40
*** LinkExtractor.java 27 Jul 2003 19:19:17 -0000 1.39
--- LinkExtractor.java 11 Aug 2003 00:18:29 -0000 1.40
***************
*** 1,3 ****
! // HTMLParser Library v1_4_20030727 - A java-based parser for HTML
// Copyright (C) Dec 31, 2000 Somik Raha
//
--- 1,3 ----
! // HTMLParser Library v1_4_20030810 - A java-based parser for HTML
// Copyright (C) Dec 31, 2000 Somik Raha
//
Index: MailRipper.java
===================================================================
RCS file: /cvsroot/htmlparser/htmlparser/src/org/htmlparser/parserapplications/MailRipper.java,v
retrieving revision 1.40
retrieving revision 1.41
diff -C2 -d -r1.40 -r1.41
*** MailRipper.java 27 Jul 2003 19:19:17 -0000 1.40
--- MailRipper.java 11 Aug 2003 00:18:29 -0000 1.41
***************
*** 1,3 ****
! // HTMLParser Library v1_4_20030727 - A java-based parser for HTML
// Copyright (C) Dec 31, 2000 Somik Raha
//
--- 1,3 ----
! // HTMLParser Library v1_4_20030810 - A java-based parser for HTML
// Copyright (C) Dec 31, 2000 Somik Raha
//
Index: Robot.java
===================================================================
RCS file: /cvsroot/htmlparser/htmlparser/src/org/htmlparser/parserapplications/Robot.java,v
retrieving revision 1.42
retrieving revision 1.43
diff -C2 -d -r1.42 -r1.43
*** Robot.java 27 Jul 2003 19:19:17 -0000 1.42
--- Robot.java 11 Aug 2003 00:18:29 -0000 1.43
***************
*** 1,3 ****
! // HTMLParser Library v1_4_20030727 - A java-based parser for HTML
// Copyright (C) Dec 31, 2000 Somik Raha
//
--- 1,3 ----
! // HTMLParser Library v1_4_20030810 - A java-based parser for HTML
// Copyright (C) Dec 31, 2000 Somik Raha
//
Index: StringExtractor.java
===================================================================
RCS file: /cvsroot/htmlparser/htmlparser/src/org/htmlparser/parserapplications/StringExtractor.java,v
retrieving revision 1.37
retrieving revision 1.38
diff -C2 -d -r1.37 -r1.38
*** StringExtractor.java 27 Jul 2003 19:19:17 -0000 1.37
--- StringExtractor.java 11 Aug 2003 00:18:29 -0000 1.38
***************
*** 1,3 ****
! // HTMLParser Library v1_4_20030727 - A java-based parser for HTML
// Copyright (C) Dec 31, 2000 Somik Raha
//
--- 1,3 ----
! // HTMLParser Library v1_4_20030810 - A java-based parser for HTML
// Copyright (C) Dec 31, 2000 Somik Raha
//
Index: package.html
===================================================================
RCS file: /cvsroot/htmlparser/htmlparser/src/org/htmlparser/parserapplications/package.html,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** package.html 27 Jul 2003 19:19:17 -0000 1.10
--- package.html 11 Aug 2003 00:18:30 -0000 1.11
***************
*** 5,9 ****
@(#)package.html 1.60 98/01/27
! HTMLParser Library v1_4_20030727 - A java-based parser for HTML
Copyright (C) Dec 31, 2000 Somik Raha
--- 5,9 ----
@(#)package.html 1.60 98/01/27
! HTMLParser Library v1_4_20030810 - A java-based parser for HTML
Copyright (C) Dec 31, 2000 Somik Raha
|
Update of /cvsroot/htmlparser/htmlparser/src/org/htmlparser
In directory sc8-pr-cvs1:/tmp/cvs-serv7155/src/org/htmlparser
Modified Files:
AbstractNode.java Node.java NodeReader.java Parser.java
RemarkNode.java RemarkNodeParser.java StringNode.java
package.html
Log Message:
Update version headers to 1.4-20030810 and update changelog.
Index: AbstractNode.java
===================================================================
RCS file: /cvsroot/htmlparser/htmlparser/src/org/htmlparser/AbstractNode.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** AbstractNode.java 27 Jul 2003 19:19:16 -0000 1.6
--- AbstractNode.java 11 Aug 2003 00:18:28 -0000 1.7
***************
*** 1,3 ****
! // HTMLParser Library v1_4_20030727 - A java-based parser for HTML
// Copyright (C) Dec 31, 2000 Somik Raha
//
--- 1,3 ----
! // HTMLParser Library v1_4_20030810 - A java-based parser for HTML
// Copyright (C) Dec 31, 2000 Somik Raha
//
Index: Node.java
===================================================================
RCS file: /cvsroot/htmlparser/htmlparser/src/org/htmlparser/Node.java,v
retrieving revision 1.32
retrieving revision 1.33
diff -C2 -d -r1.32 -r1.33
*** Node.java 27 Jul 2003 19:19:17 -0000 1.32
--- Node.java 11 Aug 2003 00:18:28 -0000 1.33
***************
*** 1,3 ****
! // HTMLParser Library v1_4_20030727 - A java-based parser for HTML
// Copyright (C) Dec 31, 2000 Somik Raha
//
--- 1,3 ----
! // HTMLParser Library v1_4_20030810 - A java-based parser for HTML
// Copyright (C) Dec 31, 2000 Somik Raha
//
Index: NodeReader.java
===================================================================
RCS file: /cvsroot/htmlparser/htmlparser/src/org/htmlparser/NodeReader.java,v
retrieving revision 1.38
retrieving revision 1.39
diff -C2 -d -r1.38 -r1.39
*** NodeReader.java 27 Jul 2003 19:19:17 -0000 1.38
--- NodeReader.java 11 Aug 2003 00:18:28 -0000 1.39
***************
*** 1,3 ****
! // HTMLParser Library v1_4_20030727 - A java-based parser for HTML
// Copyright (C) Dec 31, 2000 Somik Raha
//
--- 1,3 ----
! // HTMLParser Library v1_4_20030810 - A java-based parser for HTML
// Copyright (C) Dec 31, 2000 Somik Raha
//
Index: Parser.java
===================================================================
RCS file: /cvsroot/htmlparser/htmlparser/src/org/htmlparser/Parser.java,v
retrieving revision 1.52
retrieving revision 1.53
diff -C2 -d -r1.52 -r1.53
*** Parser.java 27 Jul 2003 19:19:17 -0000 1.52
--- Parser.java 11 Aug 2003 00:18:28 -0000 1.53
***************
*** 1,3 ****
! // HTMLParser Library v1_4_20030727 - A java-based parser for HTML
// Copyright (C) Dec 31, 2000 Somik Raha
//
--- 1,3 ----
! // HTMLParser Library v1_4_20030810 - A java-based parser for HTML
// Copyright (C) Dec 31, 2000 Somik Raha
//
***************
*** 157,161 ****
*/
public final static String
! VERSION_DATE = "Jul 27, 2003"
;
--- 157,161 ----
*/
public final static String
! VERSION_DATE = "Aug 10, 2003"
;
Index: RemarkNode.java
===================================================================
RCS file: /cvsroot/htmlparser/htmlparser/src/org/htmlparser/RemarkNode.java,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -d -r1.23 -r1.24
*** RemarkNode.java 27 Jul 2003 19:19:17 -0000 1.23
--- RemarkNode.java 11 Aug 2003 00:18:28 -0000 1.24
***************
*** 1,3 ****
! // HTMLParser Library v1_4_20030727 - A java-based parser for HTML
// Copyright (C) Dec 31, 2000 Somik Raha
//
--- 1,3 ----
! // HTMLParser Library v1_4_20030810 - A java-based parser for HTML
// Copyright (C) Dec 31, 2000 Somik Raha
//
Index: RemarkNodeParser.java
===================================================================
RCS file: /cvsroot/htmlparser/htmlparser/src/org/htmlparser/RemarkNodeParser.java,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -d -r1.25 -r1.26
*** RemarkNodeParser.java 27 Jul 2003 19:19:17 -0000 1.25
--- RemarkNodeParser.java 11 Aug 2003 00:18:28 -0000 1.26
***************
*** 1,3 ****
! // HTMLParser Library v1_4_20030727 - A java-based parser for HTML
// Copyright (C) Dec 31, 2000 Somik Raha
//
--- 1,3 ----
! // HTMLParser Library v1_4_20030810 - A java-based parser for HTML
// Copyright (C) Dec 31, 2000 Somik Raha
//
Index: StringNode.java
===================================================================
RCS file: /cvsroot/htmlparser/htmlparser/src/org/htmlparser/StringNode.java,v
retrieving revision 1.31
retrieving revision 1.32
diff -C2 -d -r1.31 -r1.32
*** StringNode.java 27 Jul 2003 19:19:17 -0000 1.31
--- StringNode.java 11 Aug 2003 00:18:28 -0000 1.32
***************
*** 1,3 ****
! // HTMLParser Library v1_4_20030727 - A java-based parser for HTML
// Copyright (C) Dec 31, 2000 Somik Raha
//
--- 1,3 ----
! // HTMLParser Library v1_4_20030810 - A java-based parser for HTML
// Copyright (C) Dec 31, 2000 Somik Raha
//
Index: package.html
===================================================================
RCS file: /cvsroot/htmlparser/htmlparser/src/org/htmlparser/package.html,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** package.html 27 Jul 2003 19:19:17 -0000 1.11
--- package.html 11 Aug 2003 00:18:28 -0000 1.12
***************
*** 6,10 ****
@(#)package.html 1.60 98/01/27
! HTMLParser Library v1_4_20030727 - A java-based parser for HTML
Copyright (C) Dec 31, 2000 Somik Raha
--- 6,10 ----
@(#)package.html 1.60 98/01/27
! HTMLParser Library v1_4_20030810 - A java-based parser for HTML
Copyright (C) Dec 31, 2000 Somik Raha
|
|
From: <der...@us...> - 2003-08-11 00:19:03
|
Update of /cvsroot/htmlparser/htmlparser/src/org/htmlparser/parserHelper In directory sc8-pr-cvs1:/tmp/cvs-serv7155/src/org/htmlparser/parserHelper Modified Files: AttributeParser.java CompositeTagScannerHelper.java ParserHelper.java ScriptScannerHelper.java SpecialHashtable.java StringParser.java TagParser.java Log Message: Update version headers to 1.4-20030810 and update changelog. Index: AttributeParser.java =================================================================== RCS file: /cvsroot/htmlparser/htmlparser/src/org/htmlparser/parserHelper/AttributeParser.java,v retrieving revision 1.32 retrieving revision 1.33 diff -C2 -d -r1.32 -r1.33 *** AttributeParser.java 2 Aug 2003 16:22:57 -0000 1.32 --- AttributeParser.java 11 Aug 2003 00:18:29 -0000 1.33 *************** *** 1,3 **** ! // HTMLParser Library v1_4_20030727 - A java-based parser for HTML // Copyright (C) Dec 31, 2000 Somik Raha // --- 1,3 ---- ! // HTMLParser Library v1_4_20030810 - A java-based parser for HTML // Copyright (C) Dec 31, 2000 Somik Raha // Index: CompositeTagScannerHelper.java =================================================================== RCS file: /cvsroot/htmlparser/htmlparser/src/org/htmlparser/parserHelper/CompositeTagScannerHelper.java,v retrieving revision 1.41 retrieving revision 1.42 diff -C2 -d -r1.41 -r1.42 *** CompositeTagScannerHelper.java 27 Jul 2003 19:19:17 -0000 1.41 --- CompositeTagScannerHelper.java 11 Aug 2003 00:18:29 -0000 1.42 *************** *** 1,3 **** ! // HTMLParser Library v1_4_20030727 - A java-based parser for HTML // Copyright (C) Dec 31, 2000 Somik Raha // --- 1,3 ---- ! // HTMLParser Library v1_4_20030810 - A java-based parser for HTML // Copyright (C) Dec 31, 2000 Somik Raha // Index: ParserHelper.java =================================================================== RCS file: /cvsroot/htmlparser/htmlparser/src/org/htmlparser/parserHelper/ParserHelper.java,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** ParserHelper.java 27 Jul 2003 19:19:17 -0000 1.11 --- ParserHelper.java 11 Aug 2003 00:18:29 -0000 1.12 *************** *** 1,3 **** ! // HTMLParser Library v1_4_20030727 - A java-based parser for HTML // Copyright (C) Dec 31, 2000 Somik Raha // --- 1,3 ---- ! // HTMLParser Library v1_4_20030810 - A java-based parser for HTML // Copyright (C) Dec 31, 2000 Somik Raha // Index: ScriptScannerHelper.java =================================================================== RCS file: /cvsroot/htmlparser/htmlparser/src/org/htmlparser/parserHelper/ScriptScannerHelper.java,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** ScriptScannerHelper.java 27 Jul 2003 19:19:17 -0000 1.6 --- ScriptScannerHelper.java 11 Aug 2003 00:18:29 -0000 1.7 *************** *** 1,3 **** ! //HTMLParser Library v1_4_20030727 - A java-based parser for HTML //Copyright (C) Dec 31, 2000 Somik Raha // --- 1,3 ---- ! //HTMLParser Library v1_4_20030810 - A java-based parser for HTML //Copyright (C) Dec 31, 2000 Somik Raha // Index: SpecialHashtable.java =================================================================== RCS file: /cvsroot/htmlparser/htmlparser/src/org/htmlparser/parserHelper/SpecialHashtable.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** SpecialHashtable.java 2 Aug 2003 16:22:57 -0000 1.1 --- SpecialHashtable.java 11 Aug 2003 00:18:29 -0000 1.2 *************** *** 1,3 **** ! // HTMLParser Library v1_4_20030727 - A java-based parser for HTML // Copyright (C) Dec 31, 2000 Somik Raha // --- 1,3 ---- ! // HTMLParser Library v1_4_20030810 - A java-based parser for HTML // Copyright (C) Dec 31, 2000 Somik Raha // Index: StringParser.java =================================================================== RCS file: /cvsroot/htmlparser/htmlparser/src/org/htmlparser/parserHelper/StringParser.java,v retrieving revision 1.34 retrieving revision 1.35 diff -C2 -d -r1.34 -r1.35 *** StringParser.java 27 Jul 2003 19:19:17 -0000 1.34 --- StringParser.java 11 Aug 2003 00:18:29 -0000 1.35 *************** *** 1,3 **** ! // HTMLParser Library v1_4_20030727 - A java-based parser for HTML // Copyright (C) Dec 31, 2000 Somik Raha // --- 1,3 ---- ! // HTMLParser Library v1_4_20030810 - A java-based parser for HTML // Copyright (C) Dec 31, 2000 Somik Raha // Index: TagParser.java =================================================================== RCS file: /cvsroot/htmlparser/htmlparser/src/org/htmlparser/parserHelper/TagParser.java,v retrieving revision 1.37 retrieving revision 1.38 diff -C2 -d -r1.37 -r1.38 *** TagParser.java 27 Jul 2003 19:19:17 -0000 1.37 --- TagParser.java 11 Aug 2003 00:18:29 -0000 1.38 *************** *** 1,3 **** ! // HTMLParser Library v1_4_20030727 - A java-based parser for HTML // Copyright (C) Dec 31, 2000 Somik Raha // --- 1,3 ---- ! // HTMLParser Library v1_4_20030810 - A java-based parser for HTML // Copyright (C) Dec 31, 2000 Somik Raha // |
Update of /cvsroot/htmlparser/htmlparser/src/org/htmlparser/nodeDecorators In directory sc8-pr-cvs1:/tmp/cvs-serv7155/src/org/htmlparser/nodeDecorators Modified Files: AbstractNodeDecorator.java DecodingNode.java EscapeCharacterRemovingNode.java NonBreakingSpaceConvertingNode.java Log Message: Update version headers to 1.4-20030810 and update changelog. Index: AbstractNodeDecorator.java =================================================================== RCS file: /cvsroot/htmlparser/htmlparser/src/org/htmlparser/nodeDecorators/AbstractNodeDecorator.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** AbstractNodeDecorator.java 27 Jul 2003 19:19:17 -0000 1.3 --- AbstractNodeDecorator.java 11 Aug 2003 00:18:28 -0000 1.4 *************** *** 1,3 **** ! // HTMLParser Library v1_4_20030727 - A java-based parser for HTML // Copyright (C) Dec 31, 2000 Somik Raha // --- 1,3 ---- ! // HTMLParser Library v1_4_20030810 - A java-based parser for HTML // Copyright (C) Dec 31, 2000 Somik Raha // Index: DecodingNode.java =================================================================== RCS file: /cvsroot/htmlparser/htmlparser/src/org/htmlparser/nodeDecorators/DecodingNode.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** DecodingNode.java 27 Jul 2003 19:19:17 -0000 1.5 --- DecodingNode.java 11 Aug 2003 00:18:29 -0000 1.6 *************** *** 1,3 **** ! // HTMLParser Library v1_4_20030727 - A java-based parser for HTML // Copyright (C) Dec 31, 2000 Somik Raha // --- 1,3 ---- ! // HTMLParser Library v1_4_20030810 - A java-based parser for HTML // Copyright (C) Dec 31, 2000 Somik Raha // Index: EscapeCharacterRemovingNode.java =================================================================== RCS file: /cvsroot/htmlparser/htmlparser/src/org/htmlparser/nodeDecorators/EscapeCharacterRemovingNode.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** EscapeCharacterRemovingNode.java 27 Jul 2003 19:19:17 -0000 1.3 --- EscapeCharacterRemovingNode.java 11 Aug 2003 00:18:29 -0000 1.4 *************** *** 1,3 **** ! // HTMLParser Library v1_4_20030727 - A java-based parser for HTML // Copyright (C) Dec 31, 2000 Somik Raha // --- 1,3 ---- ! // HTMLParser Library v1_4_20030810 - A java-based parser for HTML // Copyright (C) Dec 31, 2000 Somik Raha // Index: NonBreakingSpaceConvertingNode.java =================================================================== RCS file: /cvsroot/htmlparser/htmlparser/src/org/htmlparser/nodeDecorators/NonBreakingSpaceConvertingNode.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** NonBreakingSpaceConvertingNode.java 27 Jul 2003 19:19:17 -0000 1.3 --- NonBreakingSpaceConvertingNode.java 11 Aug 2003 00:18:29 -0000 1.4 *************** *** 1,3 **** ! // HTMLParser Library v1_4_20030727 - A java-based parser for HTML // Copyright (C) Dec 31, 2000 Somik Raha // --- 1,3 ---- ! // HTMLParser Library v1_4_20030810 - A java-based parser for HTML // Copyright (C) Dec 31, 2000 Somik Raha // |
Update of /cvsroot/htmlparser/htmlparser/src/org/htmlparser/lexer
In directory sc8-pr-cvs1:/tmp/cvs-serv7155/src/org/htmlparser/lexer
Modified Files:
Cursor.java Page.java PageIndex.java Source.java Stream.java
package.html
Log Message:
Update version headers to 1.4-20030810 and update changelog.
Index: Cursor.java
===================================================================
RCS file: /cvsroot/htmlparser/htmlparser/src/org/htmlparser/lexer/Cursor.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Cursor.java 10 Aug 2003 23:33:37 -0000 1.1
--- Cursor.java 11 Aug 2003 00:18:28 -0000 1.2
***************
*** 1,3 ****
! // HTMLParser Library v1_4_20030727 - A java-based parser for HTML
// Copyright (C) Dec 31, 2000 Somik Raha
//
--- 1,3 ----
! // HTMLParser Library v1_4_20030810 - A java-based parser for HTML
// Copyright (C) Dec 31, 2000 Somik Raha
//
Index: Page.java
===================================================================
RCS file: /cvsroot/htmlparser/htmlparser/src/org/htmlparser/lexer/Page.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** Page.java 10 Aug 2003 23:33:36 -0000 1.3
--- Page.java 11 Aug 2003 00:18:28 -0000 1.4
***************
*** 1,3 ****
! // HTMLParser Library v1_4_20030727 - A java-based parser for HTML
// Copyright (C) Dec 31, 2000 Somik Raha
//
--- 1,3 ----
! // HTMLParser Library v1_4_20030810 - A java-based parser for HTML
// Copyright (C) Dec 31, 2000 Somik Raha
//
Index: PageIndex.java
===================================================================
RCS file: /cvsroot/htmlparser/htmlparser/src/org/htmlparser/lexer/PageIndex.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** PageIndex.java 10 Aug 2003 23:33:37 -0000 1.1
--- PageIndex.java 11 Aug 2003 00:18:28 -0000 1.2
***************
*** 1,3 ****
! // HTMLParser Library v1_4_20030727 - A java-based parser for HTML
// Copyright (C) Dec 31, 2000 Somik Raha
//
--- 1,3 ----
! // HTMLParser Library v1_4_20030810 - A java-based parser for HTML
// Copyright (C) Dec 31, 2000 Somik Raha
//
Index: Source.java
===================================================================
RCS file: /cvsroot/htmlparser/htmlparser/src/org/htmlparser/lexer/Source.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Source.java 27 Jul 2003 19:19:17 -0000 1.2
--- Source.java 11 Aug 2003 00:18:28 -0000 1.3
***************
*** 1,3 ****
! // HTMLParser Library v1_4_20030727 - A java-based parser for HTML
// Copyright (C) Dec 31, 2000 Somik Raha
//
--- 1,3 ----
! // HTMLParser Library v1_4_20030810 - A java-based parser for HTML
// Copyright (C) Dec 31, 2000 Somik Raha
//
Index: Stream.java
===================================================================
RCS file: /cvsroot/htmlparser/htmlparser/src/org/htmlparser/lexer/Stream.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Stream.java 27 Jul 2003 19:19:17 -0000 1.2
--- Stream.java 11 Aug 2003 00:18:28 -0000 1.3
***************
*** 1,3 ****
! // HTMLParser Library v1_4_20030727 - A java-based parser for HTML
// Copyright (C) Dec 31, 2000 Somik Raha
//
--- 1,3 ----
! // HTMLParser Library v1_4_20030810 - A java-based parser for HTML
// Copyright (C) Dec 31, 2000 Somik Raha
//
Index: package.html
===================================================================
RCS file: /cvsroot/htmlparser/htmlparser/src/org/htmlparser/lexer/package.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** package.html 10 Aug 2003 23:33:37 -0000 1.1
--- package.html 11 Aug 2003 00:18:28 -0000 1.2
***************
*** 7,11 ****
@(#)package.html 1.60 98/01/27
! HTMLParser Library v1_4_20030727 - A java-based parser for HTML
Copyright (C) Dec 31, 2000 Somik Raha
--- 7,11 ----
@(#)package.html 1.60 98/01/27
! HTMLParser Library v1_4_20030810 - A java-based parser for HTML
Copyright (C) Dec 31, 2000 Somik Raha
|
|
From: <der...@us...> - 2003-08-11 00:19:03
|
Update of /cvsroot/htmlparser/htmlparser/docs In directory sc8-pr-cvs1:/tmp/cvs-serv7155/docs Modified Files: changes.txt Log Message: Update version headers to 1.4-20030810 and update changelog. Index: changes.txt =================================================================== RCS file: /cvsroot/htmlparser/htmlparser/docs/changes.txt,v retrieving revision 1.186 retrieving revision 1.187 diff -C2 -d -r1.186 -r1.187 *** changes.txt 27 Jul 2003 19:19:16 -0000 1.186 --- changes.txt 11 Aug 2003 00:18:28 -0000 1.187 *************** *** 13,16 **** --- 13,88 ---- ******************************************************************************* + Integration Build 1.4 - 20030810 + -------------------------------- + + 2003-08-10 19:36 derrickoswald + + * src/org/htmlparser/tests/lexerTests/: AllTests.java, + PageIndexTests.java, PageTests.java: + + Unit tests for second drop of new io subsystem. + + 2003-08-10 19:33 derrickoswald + + * src/org/htmlparser/: lexer/Page.java, lexer/Cursor.java, + lexer/PageIndex.java, lexer/package.html, + tests/utilTests/AllTests.java, tests/utilTests/SortTest.java, + util/sort/Ordered.java, util/sort/Sort.java, + util/sort/Sortable.java, util/sort/package.html: + + Second drop for new io subsystem. + + 2003-08-02 12:22 derrickoswald + + * src/org/htmlparser/: parserHelper/AttributeParser.java, + parserHelper/SpecialHashtable.java, tags/Tag.java, + tests/scannersTests/LabelScannerTest.java, + tests/tagTests/FrameSetTagTest.java, + tests/tagTests/FrameTagTest.java, tests/tagTests/InputTagTest.java, + tests/tagTests/TagTest.java, + tests/temporaryFailures/AttributeParserTest.java, + tests/temporaryFailures/TagParserTest.java: + + Fixed bug #757337 Standalone attributes should remain standalone + + Changing to a HashMap was not adopted for two reasons. The first is that it would break Java 1.1.x + compatibility (which I believe we still maintain, although I haven't checked lately), and using a HashMap + would return the attributes in a different order, leading to a *lot* of broken tests that rely on toHTML() + returning a specific string with attributes in a certain order (if I'm going to fix a bunch of tests I would + like the attributes to come out in the order they were originally, so this will need an AttributeStorage class + when the attribute parser is rewritten). + + The solution adopted is to subclass HashTable and store two special values, which are new constants in + the Tag class. For naive programs, and for backward compatibility, this SpecialHashtable class translates + these constants into null and "" respectively, so the old behavior is the same. + + However, savvy programs, and the toHTML() method in the Tag class can call getRaw() on this hashtable + to get at these special constants and behave appropriately. For this specific bug, toHTML returns the + stand-alone attribute as is, but the missing value case is also handled. + + 2003-08-02 09:07 derrickoswald + + * src/org/htmlparser/tags/FormTag.java: + + Change name back to getFormTextareas. + + 2003-07-29 23:09 derrickoswald + + * src/org/htmlparser/tags/FormTag.java: + + Change name to getFormTextAreas for consistency. + + 2003-07-29 23:06 derrickoswald + + * src/org/htmlparser/: tags/FormTag.java, util/NodeList.java: + + Added recursive input and textarea harvesting to FormTag. + + 2003-07-29 19:24 derrickoswald + + * build.xml: + + Exclude lexer package, include third party libraries, don't build doc tars. + Integration Build 1.4 - 20030727 -------------------------------- |
Update of /cvsroot/htmlparser/htmlparser/src/org/htmlparser/beans
In directory sc8-pr-cvs1:/tmp/cvs-serv7155/src/org/htmlparser/beans
Modified Files:
BeanyBaby.java HTMLLinkBean.java HTMLTextBean.java
LinkBean.java StringBean.java package.html
Log Message:
Update version headers to 1.4-20030810 and update changelog.
Index: BeanyBaby.java
===================================================================
RCS file: /cvsroot/htmlparser/htmlparser/src/org/htmlparser/beans/BeanyBaby.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** BeanyBaby.java 27 Jul 2003 19:19:17 -0000 1.11
--- BeanyBaby.java 11 Aug 2003 00:18:28 -0000 1.12
***************
*** 1,3 ****
! // HTMLParser Library v1_4_20030727 - A java-based parser for HTML
// Copyright (C) Dec 31, 2000 Somik Raha
//
--- 1,3 ----
! // HTMLParser Library v1_4_20030810 - A java-based parser for HTML
// Copyright (C) Dec 31, 2000 Somik Raha
//
Index: HTMLLinkBean.java
===================================================================
RCS file: /cvsroot/htmlparser/htmlparser/src/org/htmlparser/beans/HTMLLinkBean.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** HTMLLinkBean.java 27 Jul 2003 19:19:17 -0000 1.11
--- HTMLLinkBean.java 11 Aug 2003 00:18:28 -0000 1.12
***************
*** 1,3 ****
! // HTMLParser Library v1_4_20030727 - A java-based parser for HTML
// Copyright (C) Dec 31, 2000 Somik Raha
//
--- 1,3 ----
! // HTMLParser Library v1_4_20030810 - A java-based parser for HTML
// Copyright (C) Dec 31, 2000 Somik Raha
//
Index: HTMLTextBean.java
===================================================================
RCS file: /cvsroot/htmlparser/htmlparser/src/org/htmlparser/beans/HTMLTextBean.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** HTMLTextBean.java 27 Jul 2003 19:19:17 -0000 1.12
--- HTMLTextBean.java 11 Aug 2003 00:18:28 -0000 1.13
***************
*** 1,3 ****
! /// HTMLParser Library v1_4_20030727 - A java-based parser for HTML
// Copyright (C) Dec 31, 2000 Somik Raha
//
--- 1,3 ----
! /// HTMLParser Library v1_4_20030810 - A java-based parser for HTML
// Copyright (C) Dec 31, 2000 Somik Raha
//
Index: LinkBean.java
===================================================================
RCS file: /cvsroot/htmlparser/htmlparser/src/org/htmlparser/beans/LinkBean.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** LinkBean.java 27 Jul 2003 19:19:17 -0000 1.14
--- LinkBean.java 11 Aug 2003 00:18:28 -0000 1.15
***************
*** 1,3 ****
! // HTMLParser Library v1_4_20030727 - A java-based parser for HTML
// Copyright (C) Dec 31, 2000 Somik Raha
//
--- 1,3 ----
! // HTMLParser Library v1_4_20030810 - A java-based parser for HTML
// Copyright (C) Dec 31, 2000 Somik Raha
//
Index: StringBean.java
===================================================================
RCS file: /cvsroot/htmlparser/htmlparser/src/org/htmlparser/beans/StringBean.java,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** StringBean.java 27 Jul 2003 19:19:17 -0000 1.19
--- StringBean.java 11 Aug 2003 00:18:28 -0000 1.20
***************
*** 1,3 ****
! // HTMLParser Library v1_4_20030727 - A java-based parser for HTML
// Copyright (C) Dec 31, 2000 Somik Raha
//
--- 1,3 ----
! // HTMLParser Library v1_4_20030810 - A java-based parser for HTML
// Copyright (C) Dec 31, 2000 Somik Raha
//
Index: package.html
===================================================================
RCS file: /cvsroot/htmlparser/htmlparser/src/org/htmlparser/beans/package.html,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** package.html 27 Jul 2003 19:19:17 -0000 1.10
--- package.html 11 Aug 2003 00:18:28 -0000 1.11
***************
*** 6,10 ****
@(#)package.html 1.60 98/01/27
! HTMLParser Library v1_4_20030727 - A java-based parser for HTML
Copyright (C) Dec 31, 2000 Somik Raha
--- 6,10 ----
@(#)package.html 1.60 98/01/27
! HTMLParser Library v1_4_20030810 - A java-based parser for HTML
Copyright (C) Dec 31, 2000 Somik Raha
|
|
From: <der...@us...> - 2003-08-10 23:36:21
|
Update of /cvsroot/htmlparser/htmlparser/src/org/htmlparser/tests/lexerTests In directory sc8-pr-cvs1:/tmp/cvs-serv1881 Modified Files: AllTests.java PageTests.java Added Files: PageIndexTests.java Log Message: Unit tests for second drop of new io subsystem. --- NEW FILE: PageIndexTests.java --- // HTMLParser Library v1_4_20030727 - A java-based parser for HTML // Copyright (C) Dec 31, 2000 Somik Raha // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public // License as published by the Free Software Foundation; either // version 2.1 of the License, or (at your option) any later version. // // This library is distributed in the hope that it will be useful, // but WITHOUT ANY WARRANTY; without even the implied warranty of // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU // Lesser General Public License for more details. // // You should have received a copy of the GNU Lesser General Public // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // // For any questions or suggestions, you can write to me at : // Email :so...@in... // // Postal Address : // Somik Raha // Extreme Programmer & Coach // Industrial Logic Corporation // 2583 Cedar Street, Berkeley, // CA 94708, USA // Website : http://www.industriallogic.com package org.htmlparser.tests.lexerTests; import junit.framework.TestCase; import org.htmlparser.lexer.PageIndex; public class PageIndexTests extends TestCase { /** * Test the end-of-line index class. */ public PageIndexTests (String name) { super (name); } public void testAppend1 () { PageIndex index; int pos; int[] list; index = new PageIndex (null); for (int i = 0; i < 10000; i++) { pos = index.row (i); assertTrue ("append not at end", pos == i); assertTrue ("wrong position", pos == index.add (i)); } list = index.get (); for (int i = 0; i < 10000; i++) assertTrue ("wrong value", list[i] == i); } public void testAppend2 () { PageIndex index; int pos; int[] list; index = new PageIndex (null); for (int i = 0; i < 10000; i++) { pos = index.row (i + 42); assertTrue ("append not at end", pos == i); assertTrue ("wrong position", pos == index.add (i + 42)); } list = index.get (); for (int i = 0; i < 10000; i++) assertTrue ("wrong value", list[i] == i + 42); } public void testAppend3 () { PageIndex index; int pos; int[] list; index = new PageIndex (null); for (int i = 0; i < 10000; i++) { pos = index.row (i * 42); assertTrue ("append not at end", pos == i); assertTrue ("wrong position", pos == index.add (i * 42)); } list = index.get (); for (int i = 0; i < 10000; i++) assertTrue ("wrong value", list[i] == i * 42); } public void testInsert () { PageIndex index; double d; int n; int pos; int[] list; index = new PageIndex (null); for (int i = 0; i < 10000; i++) { d = Math.random (); d -= 0.5; n = (int)(d * 100838); pos = index.row (n); // test for correct position if (0 <= pos - 1) assertTrue ("search error less " + pos + " " + index.elementAt (pos - 1) + " " + n, index.elementAt (pos - 1) < n); if (pos + 1 < index.size ()) assertTrue ("search error greater " + pos + " " + index.elementAt (pos + 1) + " " + n, index.elementAt (pos + 1) > n); assertTrue ("wrong position", pos == index.add (n)); } list = index.get (); n = Integer.MIN_VALUE; for (int i = 0; i < list.length; i++) { assertTrue ("wrong order", list[i] > n); n = list[i]; } } } Index: AllTests.java =================================================================== RCS file: /cvsroot/htmlparser/htmlparser/src/org/htmlparser/tests/lexerTests/AllTests.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** AllTests.java 27 Jul 2003 19:19:20 -0000 1.2 --- AllTests.java 10 Aug 2003 23:36:18 -0000 1.3 *************** *** 45,49 **** suite.addTestSuite (SourceTests.class); suite.addTestSuite (PageTests.class); ! return suite; } --- 45,50 ---- suite.addTestSuite (SourceTests.class); suite.addTestSuite (PageTests.class); ! suite.addTestSuite (PageIndexTests.class); ! return suite; } Index: PageTests.java =================================================================== RCS file: /cvsroot/htmlparser/htmlparser/src/org/htmlparser/tests/lexerTests/PageTests.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** PageTests.java 27 Jul 2003 19:19:20 -0000 1.2 --- PageTests.java 10 Aug 2003 23:36:18 -0000 1.3 *************** *** 37,40 **** --- 37,41 ---- import org.htmlparser.lexer.Page; + import org.htmlparser.util.ParserException; public class PageTests extends TestCase *************** *** 59,66 **** * Test initialization with a null value. */ ! public void testNull () ! throws ! IOException, ! UnsupportedEncodingException { Page page; --- 60,64 ---- * Test initialization with a null value. */ ! public void testNull () throws ParserException { Page page; *************** *** 80,87 **** * Test initialization with a real value. */ ! public void testURLConnection () ! throws ! IOException, ! UnsupportedEncodingException { String link; --- 78,82 ---- * Test initialization with a real value. */ ! public void testURLConnection () throws ParserException, IOException { String link; *************** *** 92,95 **** --- 87,111 ---- url = new URL (link); page = new Page (url.openConnection ()); + } + + /** + * Test initialization with non-existant URL. + */ + public void testBadURLConnection () throws IOException + { + String link; + URL url; + Page page; + + link = "http://www.bigbogosity.org/"; + url = new URL (link); + try + { + page = new Page (url.openConnection ()); + } + catch (ParserException pe) + { + // expected response + } } } |
|
From: <der...@us...> - 2003-08-10 23:33:40
|
Update of /cvsroot/htmlparser/htmlparser/src/org/htmlparser/util/sort In directory sc8-pr-cvs1:/tmp/cvs-serv1528/util/sort Added Files: Ordered.java Sort.java Sortable.java package.html Log Message: Second drop for new io subsystem. --- NEW FILE: Ordered.java --- // HTMLParser Library v1_4_20030727 - A java-based parser for HTML // Copyright (C) Dec 31, 2000 Somik Raha // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public // License as published by the Free Software Foundation; either // version 2.1 of the License, or (at your option) any later version. // // This library is distributed in the hope that it will be useful, // but WITHOUT ANY WARRANTY; without even the implied warranty of // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU // Lesser General Public License for more details. // // You should have received a copy of the GNU Lesser General Public // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // // For any questions or suggestions, you can write to me at : // Email :so...@in... // // Postal Address : // Somik Raha // Extreme Programmer & Coach // Industrial Logic Corporation // 2583 Cedar Street, Berkeley, // CA 94708, USA // Website : http://www.industriallogic.com // // This class was contributed by // Derrick Oswald // package org.htmlparser.util.sort; /** * Describes an object that knows about ordering. * Implementors must have a comparison function, * which imposes a partial ordering on some * collection of objects. Ordered objects can be passed to a * sort method (such as org.htmlparser.util.sort.Sort) to allow precise control * over the sort order. * <p> * An set of elements S is partially ordered * if and only if <code>e1.compare(e2)==0</code> implies that * <code>e1.equals(e2)</code> for every e1 and e2 in S. * <p> * This all goes away in JDK 1.2. * <p> * For use with java.lang.Comparable from JDK 1.2: * <pre> * public int compare (Object o1, Object o2) * { * return (((Ordered)o1).compare (o2)); * } * </pre> * @see Sort */ public interface Ordered { /** * Compares this object with another for order. * Returns a negative integer, zero, or a positive integer * as this object is less than, equal to, or greater * than the second. * <p> * The implementor must ensure that * <code>sgn(x.compare(y)) == -sgn(y.compare(x))</code> * for all x and y. (This implies that <code>x.compare(y)</code> * must throw an exception if and only if <code>y.compare(x)</code> * throws an exception.) * <p> * The implementor must also ensure that the relation is transitive: * <code>((x.compare(y)>0) && (y.compare(z)>0))</code> * implies <code>x.compare(z)>0</code>. * <p> * Finally, the implementer must ensure that * <code>x.compare(y)==0</code> implies that * <code>sgn(x.compare(z))==sgn(y.compare(z))</code> * for all z. * @param that The object to compare this object against. * @return A negative integer, zero, or a positive * integer as this object is less than, equal to, * or greater than the second. * @exception ClassCastException The arguments type prevents it * from being compared by this Ordered. */ public int compare (Object that); } --- NEW FILE: Sort.java --- // HTMLParser Library v1_4_20030727 - A java-based parser for HTML // Copyright (C) Dec 31, 2000 Somik Raha // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public // License as published by the Free Software Foundation; either // version 2.1 of the License, or (at your option) any later version. // // This library is distributed in the hope that it will be useful, // but WITHOUT ANY WARRANTY; without even the implied warranty of // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU // Lesser General Public License for more details. // // You should have received a copy of the GNU Lesser General Public // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // // For any questions or suggestions, you can write to me at : // Email :so...@in... // // Postal Address : // Somik Raha // Extreme Programmer & Coach // Industrial Logic Corporation // 2583 Cedar Street, Berkeley, // CA 94708, USA // Website : http://www.industriallogic.com // // This class was contributed by // Derrick Oswald // package org.htmlparser.util.sort; import java.util.*; /** * A quick sort algorithm to sort Vectors or arrays. * Provides sort and binary search capabilities. *<p> * This all goes away in JDK 1.2. * <p> * @author James Gosling * @author Kevin A. Smith * @author Derrick Oswald * @version 1.4, 11 June, 1997 */ public class Sort { /** * No object of this class need ever be instantiated. * All methods are static. */ private Sort () { } /** * This is a generic version of C.A.R Hoare's Quick Sort algorithm. * This will handle vectors that are already * sorted, and vectors with duplicate keys. * Equivalent to: * <pre> * QuickSort (v, 0, v.size () - 1); * </pre> * @param v A <code>Vector</code> of <code>Ordered</code> items. * @exception ClassCastException If the vector contains objects that * are not <code>Ordered</code>. */ public static void QuickSort (Vector v) throws ClassCastException { QuickSort (v, 0, v.size () - 1); } /** * This is a generic version of C.A.R Hoare's Quick Sort algorithm. * This will handle vectors that are already * sorted, and vectors with duplicate keys. * <p> * If you think of a one dimensional vector as going from * the lowest index on the left to the highest index on the right * then the parameters to this function are lowest index or * left and highest index or right. * @param v A <code>Vector</code> of <code>Ordered</code> items. * @param lo0 Left boundary of vector partition. * @param hi0 Right boundary of vector partition. * @exception ClassCastException If the vector contains objects that * are not <code>Ordered</code>. */ public static void QuickSort (Vector v, int lo0, int hi0) throws ClassCastException { int lo = lo0; int hi = hi0; Ordered mid; if ( hi0 > lo0) { // arbitrarily establish partition element as the midpoint of the vector mid = (Ordered)v.elementAt((lo0 + hi0) / 2); // loop through the vector until indices cross while (lo <= hi) { // find the first element that is greater than or equal to // the partition element starting from the left index while ((lo < hi0) && (0 > ((Ordered)v.elementAt (lo)).compare (mid))) ++lo; // find an element that is smaller than or equal to // the partition element starting from the right index while ((hi > lo0) && (0 < ((Ordered)v.elementAt (hi)).compare (mid))) --hi; // if the indexes have not crossed, swap if (lo <= hi) swap (v, lo++, hi--); } // if the right index has not reached the left side of array // must now sort the left partition if (lo0 < hi) QuickSort (v, lo0, hi); // if the left index has not reached the right side of array // must now sort the right partition if (lo < hi0) QuickSort (v, lo, hi0); } } private static void swap (Vector v, int i, int j) { Object o; o = v.elementAt (i); v.setElementAt (v.elementAt (j), i); v.setElementAt (o, j); } /** * This is a generic version of C.A.R Hoare's Quick Sort algorithm. * This will handle arrays that are already sorted, * and arrays with duplicate keys. * <p> * Equivalent to: * <pre> * QuickSort (a, 0, a.length - 1); * </pre> * @param a An array of <code>Ordered</code> items. */ public static void QuickSort (Ordered[] a) { QuickSort (a, 0, a.length - 1); } /** * This is a generic version of C.A.R Hoare's Quick Sort algorithm. * This will handle arrays that are already sorted, * and arrays with duplicate keys. * <p> * If you think of a one dimensional array as going from * the lowest index on the left to the highest index on the right * then the parameters to this function are lowest index or * left and highest index or right. * @param a An array of <code>Ordered</code> items. * @param lo0 Left boundary of array partition. * @param hi0 Right boundary of array partition. */ public static void QuickSort (Ordered[] a, int lo0, int hi0) { int lo = lo0; int hi = hi0; Ordered mid; if ( hi0 > lo0) { // arbitrarily establish partition element as the midpoint of the array mid = a[(lo0 + hi0) / 2]; // loop through the vector until indices cross while (lo <= hi) { // find the first element that is greater than or equal to // the partition element starting from the left index while ((lo < hi0) && (0 > a[lo].compare (mid))) ++lo; // find an element that is smaller than or equal to // the partition element starting from the right Index. while ((hi > lo0) && (0 < a[hi].compare (mid))) --hi; // if the indexes have not crossed, swap if (lo <= hi) swap (a, lo++, hi--); } // if the right index has not reached the left side of array // must now sort the left partition if (lo0 < hi) QuickSort (a, lo0, hi); // if the left index has not reached the right side of array // must now sort the right partition if (lo < hi0) QuickSort (a, lo, hi0); } } /** * Swaps two elements of an array. * @param a The array of elements. * @param i The index of one item to swap. * @param j The index of the other item to swap. */ private static void swap (Object[] a, int i, int j) { Object o; o = a[i]; a[i] = a[j]; a[j] = o; } /** * This is a string version of C.A.R Hoare's Quick Sort algorithm. * This will handle arrays that are already sorted, * and arrays with duplicate keys. * <p> * Equivalent to: * <pre> * QuickSort (a, 0, a.length - 1); * </pre> * @param a An array of <code>String</code> items. */ public static void QuickSort (String[] a) { QuickSort (a, 0, a.length - 1); } /** * This is a string version of C.A.R Hoare's Quick Sort algorithm. * This will handle arrays that are already sorted, * and arrays with duplicate keys. * <p> * If you think of a one dimensional array as going from * the lowest index on the left to the highest index on the right * then the parameters to this function are lowest index or * left and highest index or right. * @param a An array of <code>String</code> items. * @param lo0 Left boundary of array partition. * @param hi0 Right boundary of array partition. */ public static void QuickSort (String[] a, int lo0, int hi0) { int lo = lo0; int hi = hi0; String mid; if ( hi0 > lo0) { // arbitrarily establish partition element as the midpoint of the array mid = a[(lo0 + hi0) / 2]; // loop through the vector until indices cross while (lo <= hi) { // find the first element that is greater than or equal to // the partition element starting from the left index while ((lo < hi0) && (0 > a[lo].compareTo (mid))) ++lo; // find an element that is smaller than or equal to // the partition element starting from the right Index. while ((hi > lo0) && (0 < a[hi].compareTo (mid))) --hi; // if the indexes have not crossed, swap if (lo <= hi) swap (a, lo++, hi--); } // if the right index has not reached the left side of array // must now sort the left partition if (lo0 < hi) QuickSort (a, lo0, hi); // if the left index has not reached the right side of array // must now sort the right partition if (lo < hi0) QuickSort (a, lo, hi0); } } /** * This is a generic version of C.A.R Hoare's Quick Sort algorithm. * This will handle Sortable objects that are already * sorted, and Sortable objects with duplicate keys. * <p> * @param sortable A <code>Sortable</code> object. * @param lo0 Left boundary of partition. * @param hi0 Right boundary of partition. */ public static void QuickSort (Sortable sortable, int lo0, int hi0) { int lo = lo0; int hi = hi0; Ordered mid; Ordered test; if ( hi0 > lo0) { // arbitrarily establish partition element as the midpoint of the vector mid = sortable.fetch ((lo0 + hi0) / 2, null); test = null; // loop through the vector until indices cross while (lo <= hi) { // find the first element that is greater than or equal to // the partition element starting from the left index while ((lo < hi0) && (0 > (test = sortable.fetch (lo, test)).compare (mid))) ++lo; // find an element that is smaller than or equal to // the partition element starting from the right index while ((hi > lo0) && (0 < (test = sortable.fetch (hi, test)).compare (mid))) --hi; // if the indexes have not crossed, swap if (lo <= hi) sortable.swap (lo++, hi--); } // if the right index has not reached the left side of array // must now sort the left partition if (lo0 < hi) QuickSort (sortable, lo0, hi); // if the left index has not reached the right side of array // must now sort the right partition if (lo < hi0) QuickSort (sortable, lo, hi0); } } /** * This is a generic version of C.A.R Hoare's Quick Sort algorithm. * This will handle Sortable objects that are already * sorted, and Sortable objects with duplicate keys. * <p> * Equivalent to: * <pre> * QuickSort (sortable, sortable.first (), sortable.last ()); * </pre> * @param sortable A <code>Sortable</code> object. */ public static void QuickSort (Sortable sortable) { QuickSort (sortable, sortable.first (), sortable.last ()); } /** * Sort a Hashtable. * @param h A Hashtable with String or Ordered keys. * @return A sorted array of the keys. * @exception ClassCastException If the keys of the hashtable * are not <code>Ordered</code>. */ public static Object[] QuickSort (Hashtable h) throws ClassCastException { Enumeration e; boolean are_strings; Object[] ret; // make the array ret = new Ordered[h.size ()]; e = h.keys (); are_strings = true; // until proven otherwise for (int i = 0; i < ret.length; i++) { ret[i] = e.nextElement (); if (are_strings && !(ret[i] instanceof String)) are_strings = false; } // sort it if (are_strings) QuickSort ((String[])ret); else QuickSort ((Ordered[])ret); return (ret); } /** * Binary search for an object * @param set The collection of <code>Ordered</code> objects. * @param ref The name to search for. * @param lo The lower index within which to look. * @param hi The upper index within which to look. * @return The index at which reference was found or is to be inserted. */ public static int bsearch (Sortable set, Ordered ref, int lo, int hi) { int num; int mid; Ordered ordered; int half; int result; int ret; ret = -1; num = (hi - lo) + 1; ordered = null; while ((-1 == ret) && (lo <= hi)) { half = num / 2; mid = lo + ((0 != (num & 1)) ? half : half - 1); ordered = set.fetch (mid, ordered); result = ref.compare (ordered); if (0 == result) ret = mid; else if (0 > result) { hi = mid - 1; num = ((0 != (num & 1)) ? half : half - 1); } else { lo = mid + 1; num = half; } } if (-1 == ret) ret = lo; return (ret); } /** * Binary search for an object * @param set The collection of <code>Ordered</code> objects. * @param ref The name to search for. * @return The index at which reference was found or is to be inserted. */ public static int bsearch (Sortable set, Ordered ref) { return (bsearch (set, ref, set.first (), set.last ())); } /** * Binary search for an object * @param vector The vector of <code>Ordered</code> objects. * @param ref The name to search for. * @param lo The lower index within which to look. * @param hi The upper index within which to look. * @return The index at which reference was found or is to be inserted. */ public static int bsearch (Vector vector, Ordered ref, int lo, int hi) { int num; int mid; int half; int result; int ret; ret = -1; num = (hi - lo) + 1; while ((-1 == ret) && (lo <= hi)) { half = num / 2; mid = lo + ((0 != (num & 1)) ? half : half - 1); result = ref.compare (vector.elementAt (mid)); if (0 == result) ret = mid; else if (0 > result) { hi = mid - 1; num = ((0 != (num & 1)) ? half : half - 1); } else { lo = mid + 1; num = half; } } if (-1 == ret) ret = lo; return (ret); } /** * Binary search for an object * @param ref The name to search for. * @return The index at which reference was found or is to be inserted. */ public static int bsearch (Vector vector, Ordered ref) { return (bsearch (vector, ref, 0, vector.size () - 1)); } } --- NEW FILE: Sortable.java --- // HTMLParser Library v1_4_20030727 - A java-based parser for HTML // Copyright (C) Dec 31, 2000 Somik Raha // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public // License as published by the Free Software Foundation; either // version 2.1 of the License, or (at your option) any later version. // // This library is distributed in the hope that it will be useful, // but WITHOUT ANY WARRANTY; without even the implied warranty of // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU // Lesser General Public License for more details. // // You should have received a copy of the GNU Lesser General Public // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // // For any questions or suggestions, you can write to me at : // Email :so...@in... // // Postal Address : // Somik Raha // Extreme Programmer & Coach // Industrial Logic Corporation // 2583 Cedar Street, Berkeley, // CA 94708, USA // Website : http://www.industriallogic.com // // This class was contributed by // Derrick Oswald // package org.htmlparser.util.sort; /** * Provides a mechanism to abstract the sort process. * Classes implementing this interface are collections of Ordered objects * that are to be sorted by the Sort class and are * not necessarily Vectors or Arrays of Ordered objects. * @see Sort */ public interface Sortable { /** * Returns the first index of the Sortable. * @return The index of the first element. */ public int first (); /** * Returns the last index of the Sortable. * @return The index of the last element. * If this were an array object this would be (object.length - 1). */ public int last (); /** * Fetch the object at the given index. * @param index The item number to get. * @param reuse If this argument is not null, it is an object * acquired from a previous fetch that is no longer needed and * may be returned as the result if it makes mores sense to alter * and return it than to fetch or create a new element. That is, the * reuse object is garbage and may be used to avoid allocating a new * object if that would normally be the strategy. * @return The Ordered object at that index. */ public Ordered fetch (int index, Ordered reuse); /** * Swaps the elements at the given indicies. * @param i One index. * @param j The other index. */ public void swap (int i, int j); } --- NEW FILE: package.html --- <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> <HTML> <HEAD> <!-- @(#)package.html 1.60 98/01/27 HTMLParser Library v1_4_20030727 - A java-based parser for HTML Copyright (C) Dec 31, 2000 Somik Raha This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software Foundation; either version 2.1 of the License, or (at your option) any later version. This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. You should have received a copy of the GNU Lesser General Public License along with this library; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA For any questions or suggestions, you can write to me at : Email :so...@in... Postal Address : Somik Raha Extreme Programmer & Coach Industrial Logic Corporation 2583 Cedar Street, Berkeley, CA 94708, USA Website : http://www.industriallogic.com --> <TITLE>Sort Package</TITLE> </HEAD> <BODY> Provides generic sorting and searching. The two interfaces <CODE>Ordered</CODE> and <CODE>Sortable</CODE> are used by the static methods in <CODE>Sort</CODE> to perform binary searches and quick sorting of generic objects. </BODY> </HTML> |
|
From: <der...@us...> - 2003-08-10 23:33:40
|
Update of /cvsroot/htmlparser/htmlparser/src/org/htmlparser/tests/utilTests In directory sc8-pr-cvs1:/tmp/cvs-serv1528/tests/utilTests Modified Files: AllTests.java Added Files: SortTest.java Log Message: Second drop for new io subsystem. --- NEW FILE: SortTest.java --- // HTMLParser Library v1_3_20030727 - A java-based parser for HTML // Copyright (C) Dec 31, 2000 Somik Raha // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public // License as published by the Free Software Foundation; either // version 2.1 of the License, or (at your option) any later version. // // This library is distributed in the hope that it will be useful, // but WITHOUT ANY WARRANTY; without even the implied warranty of // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU // Lesser General Public License for more details. // // You should have received a copy of the GNU Lesser General Public // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // // For any questions or suggestions, you can write to me at : // Email :so...@in... // // Postal Address : // Somik Raha // Extreme Programmer & Coach // Industrial Logic Corporation // 2583 Cedar Street, Berkeley, // CA 94708, USA // Website : http://www.industriallogic.com package org.htmlparser.tests.utilTests; import java.io.File; import java.util.StringTokenizer; import java.util.Date; import java.util.Enumeration; import java.util.Vector; import junit.framework.TestCase; import org.htmlparser.util.sort.Ordered; import org.htmlparser.util.sort.Sort; import org.htmlparser.util.sort.Sortable; /** * Sort testing. */ public class SortTest extends TestCase { /** * Creates a new instance of SortTest */ public SortTest (String name) { super (name); } /** * A class implementing the Ordered interface. */ class Item implements Ordered { String mData; public Item (String data) { mData = data; } public int compare (Object o) { return (mData.compareTo (((Item)o).mData)); } public String toString () { return (mData); } } /** * A class implementing the Sortable interface. */ class List extends Vector implements Sortable { List (String words) { StringTokenizer toks; toks = new StringTokenizer (words); outer: while (toks.hasMoreTokens ()) addElement (new Item (toks.nextToken ())); Sort.QuickSort ((Sortable)this); } // // Sortable interface // public int first () { return (0); } public int last () { return (size () - 1); } public Ordered fetch (int index, Ordered reuse) { return ((Ordered)elementAt (index)); } public void swap (int i, int j) { Object o = elementAt (i); setElementAt (elementAt (j), i); setElementAt (o, j); } } /** * A subclass implementing the Ordered interface. */ class SortableFile extends File implements Ordered { public SortableFile (String name) { super (name); } public SortableFile (File dir, String name) { super (dir, name); } public int compare (Object o) { long ret; File f = (File)o; ret = lastModified () - f.lastModified (); if (ret < (long)Integer.MIN_VALUE) ret = Integer.MIN_VALUE; if (ret > (long)Integer.MAX_VALUE) ret = Integer.MAX_VALUE; return ((int)ret); } } /** * Test the operation of the static quicksort algorithm. */ public void testQuickSort () { Item[] words = { new Item ("gazelle"), new Item ("infant"), new Item ("toenail"), new Item ("breast"), new Item ("Derrick"), new Item ("toast"), new Item ("caretaker"), }; Sort.QuickSort (words); assertEquals ("element 0 wrong ", "Derrick", words[0].mData); assertEquals ("element 1 wrong ", "breast", words[1].mData); assertEquals ("element 2 wrong ", "caretaker", words[2].mData); assertEquals ("element 3 wrong ", "gazelle", words[3].mData); assertEquals ("element 4 wrong ", "infant", words[4].mData); assertEquals ("element 5 wrong ", "toast", words[5].mData); assertEquals ("element 6 wrong ", "toenail", words[6].mData); } /** * Test the operation of quicksort on a sortable list. */ public void testSortList () { List list = new List ( "'Twas brillig and the slithy toves " + "Did gyre and gimble in the wabe " + "All mimsy were the borogroves " + "And the mome raths outgrabe."); StringBuffer b = new StringBuffer (); for (Enumeration e = list.elements (); e.hasMoreElements ();) { if (0 != b.length ()) b.append (' '); b.append (e.nextElement ()); } assertEquals ("wrong ordering", "'Twas All And Did and and borogroves " + "brillig gimble gyre in mimsy mome outgrabe. " + "raths slithy the the the the toves wabe were", b.toString ()); } /** * Test the operation of quicksort on a vector of ordered items. */ public void testSortVector () { // sort a directory by date (oldest first) Vector directory = new Vector (); File dir = new File ("."); String[] listing = dir.list (); for (int i = 0; i < listing.length; i++) { File f = new SortableFile (dir, listing[i]); if (f.isFile ()) directory.addElement (f); } Sort.QuickSort (directory); // pull one out and test it's insertion ordinal int index = directory.size () * 2 / 3; SortableFile test = (SortableFile)directory.elementAt (index); directory.removeElementAt (index); int ordinal = Sort.bsearch (directory, test); assertEquals ("ordinal not correct value", index, ordinal); // test the ordering of the objects directory.insertElementAt (test, ordinal); Date last = null; for (int i = 0; i < directory.size (); i++) { File f = (File)directory.elementAt (i); String name = f.getName (); Date date = new Date (f.lastModified ()); if (null != last) assertTrue ("file " + name + " has a date before", !date.before (last)); last = date; } } } Index: AllTests.java =================================================================== RCS file: /cvsroot/htmlparser/htmlparser/src/org/htmlparser/tests/utilTests/AllTests.java,v retrieving revision 1.41 retrieving revision 1.42 diff -C2 -d -r1.41 -r1.42 *** AllTests.java 27 Jul 2003 19:19:23 -0000 1.41 --- AllTests.java 10 Aug 2003 23:33:37 -0000 1.42 *************** *** 110,129 **** } ! /** ! * Insert the method's description here. ! * Creation date: (6/17/2001 6:07:15 PM) ! * @return junit.framework.TestSuite ! */ ! public static TestSuite suite() { ! TestSuite suite = new TestSuite("Utility Tests"); ! ! suite.addTestSuite(BeanTest.class); ! suite.addTestSuite(CharacterTranslationTest.class); ! suite.addTestSuite(HTMLLinkProcessorTest.class); ! suite.addTestSuite(HTMLParserUtilsTest.class); ! suite.addTestSuite(HTMLTagParserTest.class); ! suite.addTestSuite(NodeListTest.class); ! return suite; ! } } --- 110,131 ---- } ! /** ! * Insert the method's description here. ! * Creation date: (6/17/2001 6:07:15 PM) ! * @return junit.framework.TestSuite ! */ ! public static TestSuite suite() ! { ! TestSuite suite = new TestSuite("Utility Tests"); ! suite.addTestSuite(BeanTest.class); ! suite.addTestSuite(CharacterTranslationTest.class); ! suite.addTestSuite(HTMLLinkProcessorTest.class); ! suite.addTestSuite(HTMLParserUtilsTest.class); ! suite.addTestSuite(HTMLTagParserTest.class); ! suite.addTestSuite(NodeListTest.class); ! suite.addTestSuite(SortTest.class); ! ! return suite; ! } } |
|
From: <der...@us...> - 2003-08-10 23:33:40
|
Update of /cvsroot/htmlparser/htmlparser/src/org/htmlparser/lexer In directory sc8-pr-cvs1:/tmp/cvs-serv1528/lexer Modified Files: Page.java Added Files: Cursor.java PageIndex.java package.html Log Message: Second drop for new io subsystem. --- NEW FILE: Cursor.java --- // HTMLParser Library v1_4_20030727 - A java-based parser for HTML // Copyright (C) Dec 31, 2000 Somik Raha // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public // License as published by the Free Software Foundation; either // version 2.1 of the License, or (at your option) any later version. // // This library is distributed in the hope that it will be useful, // but WITHOUT ANY WARRANTY; without even the implied warranty of // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU // Lesser General Public License for more details. // // You should have received a copy of the GNU Lesser General Public // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // // For any questions or suggestions, you can write to me at : // Email :so...@in... // // Postal Address : // Somik Raha // Extreme Programmer & Coach // Industrial Logic Corporation // 2583 Cedar Street, Berkeley, // CA 94708, USA // Website : http://www.industriallogic.com // // This class was contributed by // Derrick Oswald // package org.htmlparser.lexer; import org.htmlparser.util.sort.Ordered; /** * A bookmark in a page. * This class remembers the page it came from and its position within the page. */ public class Cursor implements Ordered { /** * This cursor's position. */ protected int mPosition; /** * This cursor's page. */ protected Page mPage; /** * Construct a <code>Cursor</code> from the page and position given. * @param page The page this cursor is on. * @param offset The character offset within the page. */ public Cursor (Page page, int offset) { mPage = page; mPosition = offset; } /** * Get this cursor's page. * @return The page associated with this cursor. */ public Page getPage () { return (mPage); } /** * Get the position of this cursor. * @return The cursor position. */ public int getPosition () { return (mPosition); } // // Ordered interface // /** * Compare one reference to another. * @see org.htmlparser.util.sort.Ordered */ public int compare (Object that) { Cursor r = (Cursor)that; return (getPosition () - r.getPosition ()); } } --- NEW FILE: PageIndex.java --- // HTMLParser Library v1_4_20030727 - A java-based parser for HTML // Copyright (C) Dec 31, 2000 Somik Raha // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public // License as published by the Free Software Foundation; either // version 2.1 of the License, or (at your option) any later version. // // This library is distributed in the hope that it will be useful, // but WITHOUT ANY WARRANTY; without even the implied warranty of // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU // Lesser General Public License for more details. // // You should have received a copy of the GNU Lesser General Public // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // // For any questions or suggestions, you can write to me at : // Email :so...@in... // // Postal Address : // Somik Raha // Extreme Programmer & Coach // Industrial Logic Corporation // 2583 Cedar Street, Berkeley, // CA 94708, USA // Website : http://www.industriallogic.com // // This class was contributed by // Derrick Oswald // package org.htmlparser.lexer; import org.htmlparser.util.sort.Ordered; import org.htmlparser.util.sort.Sort; import org.htmlparser.util.sort.Sortable; /** * A sorted array of integers which are the positions of end of line characters. * Maintains a list of integers which are (the positions of the first * characters of each line. * To facilitate processing the first element should be maintained at position 0. * Facilities to add, remove, search and determine row and column are provided. * This class provides similar functionality to a Vector but * does not incur the overhead of an <code>Integer</code> object per element. */ public class PageIndex implements Sortable { /** * Increment for allocations. */ protected static final int mIncrement = 10; /** * The number of valid elements. */ protected int mCount; /** * The elements. */ protected int[] mIndices; /** * The page associated with this index. */ protected Page mPage; /** * Create an empty index. * @param page The page associated with this index. */ public PageIndex (Page page) { mPage = page; mIndices = new int[mIncrement]; mCount = 0; } /** * Create an index with the one element given. * @param page The page associated with this index. * @param cursor The single element for the new index. */ public PageIndex (Page page, int cursor) { this (page); mIndices[0] = cursor; mCount = 1; } /** * Create an index with the elements given. * @param page The page associated with this index. * @param cursors The initial elements of the index. * NOTE: The list must be sorted in ascending order. */ public PageIndex (Page page, int[] cursors) { mPage = page; mIndices = cursors; mCount = cursors.length; } /** * Get this index's page. * @return The page associated with this index. */ public Page getPage () { return (mPage); } /** * Get the count of elements. * @return The number of valid elements. */ public int size () { return (mCount); } /** * Get the capacity for elements without reallocation. * @return The number of spaces for elements. */ public int capacity () { return (mIndices.length); } /** * Add an element to the list * @param cursor The element to add. * @return The position at which the element was inserted or * the index of the existing element if it is a duplicate. */ public int add (Cursor cursor) { int position; int ret; // find where it goes ret = Sort.bsearch (this, cursor); // insert, but not twice position = cursor.getPosition (); if (!((ret < size ()) && (position == mIndices[ret]))) insertElementAt (position, ret); return (ret); } /** * Add an element to the list * @param cursor The element to add. * @return The position at which the element was inserted or * the index of the existing element if it is a duplicate. */ public int add (int cursor) { return (add (new Cursor (getPage (), cursor))); } /** * Remove an element from the list * @param cursor The element to remove. */ public void remove (Cursor cursor) { int i; // find it i = Sort.bsearch (this, cursor); // remove if ((i < size ()) && (cursor.getPosition () == mIndices[i])) removeElementAt (i); } /** * Remove an element from the list * @param cursor The element to remove. */ public void remove (int cursor) { remove (new Cursor (getPage (), cursor)); } /** * Get an element from the list. * @param index The index of the element to get. * @return The element. */ public int elementAt (int index) { return (mIndices[index]); } /** * Get the line number for a cursor. * @param cursor The character offset into the page. * @return The line number the character is in. */ public int row (Cursor cursor) { return (Sort.bsearch (this, cursor)); } /** * Get the line number for a position. * @param cursor The character offset into the page. * @return The line number the character is in. */ public int row (int cursor) { return (row (new Cursor (getPage (), cursor))); } /** * Get the column number for a cursor. * @param cursor The character offset into the page. * @return The character offset into the line this cursor is on. */ public int column (Cursor cursor) { int row; int previous; row = Sort.bsearch (this, cursor); // note, this shouldn't be zero if the first element of each index is offset zero if (0 != row) previous = this.elementAt (row - 1); else previous = this.elementAt (0); return (cursor.getPosition () - previous); } /** * Get the column number for a position. * @param cursor The character offset into the page. * @return The character offset into the line this cursor is on. */ public int column (int cursor) { return (column (new Cursor (getPage (), cursor))); } /** * Get the elements as an array of int. * @return A new array containing the elements, * i.e. a snapshot of the index. */ public int[] get () { int[] ret = new int[size ()]; System.arraycopy (mIndices, 0, ret, 0, size ()); return (ret); } /** * Binary search for the element. * @param cursor The element to search for. * @return The index at which the element was found or is to be inserted. */ protected int bsearch (int cursor) { return (Sort.bsearch (this, new Cursor (getPage (), cursor))); } /** * Binary search for the element. * @param cursor The element to search for. * @param first The index to start at. * @param last The index to stop at. * @return The index at which the element was found or is to be inserted. */ protected int bsearch (int cursor, int first, int last) { return (Sort.bsearch (this, new Cursor (getPage (), cursor), first, last)); } /** * Inserts an element into the list. * The index must be a value greater than or equal to 0 and less than * or equal to the current size of the array. * @param cursor The element to insert. * @param index The index in the list to insert it at. */ protected void insertElementAt (int cursor, int index) { if ((index >= capacity ()) || (size () == capacity ())) { // allocate more space int new_values[] = new int[Math.max (capacity () + mIncrement, index + 1)]; if (index < capacity ()) { // copy and shift up in two pieces System.arraycopy (mIndices, 0, new_values, 0, index); System.arraycopy (mIndices, index, new_values, index + 1, capacity () - index); } else System.arraycopy (mIndices, 0, new_values, 0, capacity ()); mIndices = new_values; } else if (index < size ()) // shift up System.arraycopy (mIndices, index, mIndices, index + 1, capacity () - (index + 1)); mIndices[index] = cursor; mCount++; } /** * Remove an element from the list. * @param index The index of the item to remove. */ protected void removeElementAt (int index) { // shift System.arraycopy (mIndices, index + 1, mIndices, index, capacity () - (index + 1)); mIndices[capacity() - 1] = 0; mCount--; } // // Sortable interface // /** * Returns the first index of the Sortable. * @return The index of the first element. */ public int first () { return (0); } /** * Returns the last index of the Sortable. * @return The index of the last element. * If this were an array object this would be (object.length - 1). */ public int last () { return (mCount - 1); } /** * Fetch the object at the given index. * @param index The item number to get. * @param reuse If this argument is not null, it is an object * acquired from a previous fetch that is no longer needed and * may be returned as the result if it makes mores sense to alter * and return it than to fetch or create a new element. That is, the * reuse object is garbage and may be used to avoid allocating a new * object if that would normally be the strategy. * @return The Ordered object at that index. */ public Ordered fetch (int index, Ordered reuse) { Cursor ret; if (null != reuse) { ret = (Cursor)reuse; ret.mPosition = mIndices[index]; ret.mPage = getPage (); // redundant } else ret = new Cursor (getPage (), mIndices[index]); return (ret); } /** * Swaps the elements at the given indicies. * @param i One index. * @param j The other index. */ public void swap (int i, int j) { int temp = mIndices[i]; mIndices[i] = mIndices[j]; mIndices[j] = temp; } } --- NEW FILE: package.html --- <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> <HTML> <HEAD> <!-- @(#)package.html 1.60 98/01/27 HTMLParser Library v1_4_20030727 - A java-based parser for HTML Copyright (C) Dec 31, 2000 Somik Raha This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software Foundation; either version 2.1 of the License, or (at your option) any later version. This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. You should have received a copy of the GNU Lesser General Public License along with this library; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA For any questions or suggestions, you can write to me at : Email :so...@in... Postal Address : Somik Raha Extreme Programmer & Coach Industrial Logic Corporation 2583 Cedar Street, Berkeley, CA 94708, USA Website : http://www.industriallogic.com --> <TITLE>Lexer Package</TITLE> </HEAD> <BODY> The lexer package will eventually be the base level I/O subsystem. <EM>It is currently under development.</EM> <P>The lexer package is responsible for reading characters from the HTML source and identifying the node lexemes. For example, the HTML code below would return the list of nodes shown:</P> <PRE> <html><head><title>Humoresque</title></head> <body bgcolor='silver'> Passengers will please refrain from flushing toilets while the train is standing in the station. I love you! <p> We encourage constipation while the train is in the station If the train can't go then why should you. </body> </html> </PRE> <OL> <LI>line 0, offset 0, to line 0, offset 6, html tag</LI> <LI>line 0, offset 6, to line 0, offset 12, head tag</LI> <LI>line 0, offset 12, to line 0, offset 19, title tag</LI> <LI>line 0, offset 19, to line 0, offset 29, string node "Humoresque"</LI> <LI>line 0, offset 29, to line 0, offset 37, end title tag</LI> <LI>line 0, offset 37, to line 0, offset 44, end head tag</LI> <LI>line 0, offset 44, to line 0, offset 45, string node "\n"</LI> <LI>line 1, offset 0, to line 1, offset 23, body tag</LI> <LI>line 1, offset 23, to line 4, offset 40, string node "\nPassengers...you!\n"</LI> <LI>line 5, offset 0, to line 5, offset 2, paragraph tag</LI> <LI>line 5, offset 3, to line 9, offset 21, string node "\nWe...you.\n"</LI> <LI>line 10, offset 0, to line 10, offset 7, end body tag</LI> <LI>line 10, offset 8, to line 10, offset 9, string "\n"</LI> <LI>line 11, offset 0, to line 11, offset 7, html tag</LI> <LI>line 11, offset 7, to line 11, offset 8, string node "\n"</LI> </OL> The following are some design goals and 'invariants' within the package, if you are attempting to understand or modify it. Things that differ substantially from previous implementations are highlighted in <B>bold</B>. <DL> <DT>Contiguous Nodes <DD><B>Adjacent nodes have no characters between them.</B> The list of nodes forms an uninterrupted chain that, by start and end definitions, completely covers the characters that were read from the HTML source. Despite this, the nodes are not stored in a linked list, but rather an array to ease any editing tasks that may be performed. <DT>Text Fidelity <DD>Besides complete coverage, the <B>nodes do not contain copies of the text</B>, but instead simply contain offsets into a single large buffer that contains the text read from the HTML source. Thus there is no lost whitespace or text formatting elements either outside or within tags. Upper and lower case text is preserved. <DT>Line Endings <DD><B>End of line characters are just whitespace.</B> There is no distinction made between end of line characters (or pairs of characters on Windows) and other whitespace. The text is not read in line by line so nodes (tags) can easily span multiple lines with no special processing. Line endings are not transformed between platforms, i.e. Unix line endings are not converted to Windows line endings by this level. Each node will have a starting and ending <CODE>Cursor</CODE>, from which you can get the line number and offset within the HTML source, for error messages for example, but in general ignore line breaks in the source if at all possible. <DT>Stream, Source and Page <DD>The package is arranged in three levels, <CODE>Stream</CODE>, <CODE>Source</CODE> and <CODE>Page</CODE> in the order of lowest to highest. A <CODE>Stream</CODE> is raw bytes from the URLConnection or file. It has no intelligence. A <CODE>Source</CODE> is raw characters, hence it knows about the encoding scheme used and can be reset if a different encoding is detected after partially reading in the text. A <CODE>Page</CODE> is the highest level and contains the actual lexeme parsing code. It reads from the source and creates the array of nodes (<CODE>NodeList</CODE>) using a state machine. <DT>One Parser, One Scan <DD>The major lexeme state machine has the following minor state machines corresponding (roughly) to the <B>four parsers it replaces</B> (StringParser, RemarkNodeParser, AttributeParser. TagParser): <LI>in text</LI> <LI>in comment</LI> <LI>in quote</LI> <LI>in tag</LI> By integrating the four state machines into one, a single pass over the text is all that's needed for a low level parse of the HTML source. In previous implementations, the attributes were parsed on a second scan after the initial tag was extracted. <DT>Two Jars <DD>For elementary operations at the node level, a minimalist jar file containing <B>only the lexer and base tag classes</B> is split out from the larger <CODE>htmlparser.jar</CODE>. In this way, simple parsing and output is handled with a jar file that is under 40 kilobytes, but anything beyond peephole manipulation, i.e. closing tag detection and other semantic reasoning will need the full set of scanners, nodes and ancillary classes, which now stands at 160 kilobytes. </DL> </BODY> </HTML> Index: Page.java =================================================================== RCS file: /cvsroot/htmlparser/htmlparser/src/org/htmlparser/lexer/Page.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** Page.java 27 Jul 2003 19:19:17 -0000 1.2 --- Page.java 10 Aug 2003 23:33:36 -0000 1.3 *************** *** 35,42 **** --- 35,45 ---- import java.lang.reflect.Method; import java.net.URLConnection; + import java.net.UnknownHostException; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; + import org.htmlparser.util.ParserException; + /** * Represents the contents of an HTML page. *************** *** 79,88 **** * Character positions of the first character in each line. */ ! protected int mIndex[]; ! ! /** ! * The index position to be used next. ! */ ! protected int mIndexLength; /** --- 82,86 ---- * Character positions of the first character in each line. */ ! protected PageIndex mIndex; /** *************** *** 109,128 **** * @exception IOException If an i/o exception occurs creating the * source. ! * @exception UnsupportedEncodingException if the character set specified in the * HTTP header is not supported. */ ! public Page (URLConnection connection) ! throws ! IOException, ! UnsupportedEncodingException { if (null == connection) throw new IllegalArgumentException ("connection cannot be null"); ! connection.connect (); ! mSource = new Source (new Stream (connection.getInputStream ()), getCharacterSet (connection)); mCharacters = null; mString = null; ! mIndex = null; ! mIndexLength = 0; } --- 107,145 ---- * @exception IOException If an i/o exception occurs creating the * source. ! * @exception ParserException An exception object wrapping a number of ! * possible error conditions, some of which are outlined below. ! * UnsupportedEncodingException if the character set specified in the * HTTP header is not supported. */ ! public Page (URLConnection connection) throws ParserException ! // throws ! // IOException, ! // UnsupportedEncodingException { if (null == connection) throw new IllegalArgumentException ("connection cannot be null"); ! try ! { ! connection.connect (); ! } ! catch (UnknownHostException uhe) ! { ! throw new ParserException ("the host (" + connection.getURL ().getHost () + ") was not found", uhe); ! } ! catch (IOException ioe) ! { ! throw new ParserException ("oops", ioe); ! } ! try ! { ! mSource = new Source (new Stream (connection.getInputStream ()), getCharacterSet (connection)); ! } ! catch (IOException ioe) ! { ! throw new ParserException ("oops2", ioe); ! } mCharacters = null; mString = null; ! mIndex = new PageIndex (this); } *************** *** 168,172 **** * If the charset parameter is not found in the given string, the default * character set is returned. ! * @see ParserHelper#findCharset * @see #DEFAULT_CHARSET */ --- 185,189 ---- * If the charset parameter is not found in the given string, the default * character set is returned. ! * @see #findCharset * @see #DEFAULT_CHARSET */ |
|
From: <der...@us...> - 2003-08-10 23:29:07
|
Update of /cvsroot/htmlparser/htmlparser/src/org/htmlparser/util/sort In directory sc8-pr-cvs1:/tmp/cvs-serv888/sort Log Message: Directory /cvsroot/htmlparser/htmlparser/src/org/htmlparser/util/sort added to the repository |
|
From: <der...@us...> - 2003-08-02 16:23:01
|
Update of /cvsroot/htmlparser/htmlparser/src/org/htmlparser/tests/temporaryFailures
In directory sc8-pr-cvs1:/tmp/cvs-serv9188/org/htmlparser/tests/temporaryFailures
Modified Files:
AttributeParserTest.java TagParserTest.java
Log Message:
Fixed bug #757337 Standalone attributes should remain standalone
Changing to a HashMap was not adopted for two reasons. The first is that it would break Java 1.1.x
compatibility (which I believe we still maintain, although I haven't checked lately), and using a HashMap
would return the attributes in a different order, leading to a *lot* of broken tests that rely on toHTML()
returning a specific string with attributes in a certain order (if I'm going to fix a bunch of tests I would
like the attributes to come out in the order they were originally, so this will need an AttributeStorage class
when the attribute parser is rewritten).
The solution adopted is to subclass HashTable and store two special values, which are new constants in
the Tag class. For naive programs, and for backward compatibility, this SpecialHashtable class translates
these constants into null and "" respectively, so the old behavior is the same.
However, savvy programs, and the toHTML() method in the Tag class can call getRaw() on this hashtable
to get at these special constants and behave appropriately. For this specific bug, toHTML returns the
stand-alone attribute as is, but the missing value case is also handled.
Index: AttributeParserTest.java
===================================================================
RCS file: /cvsroot/htmlparser/htmlparser/src/org/htmlparser/tests/temporaryFailures/AttributeParserTest.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** AttributeParserTest.java 27 Jul 2003 19:19:23 -0000 1.5
--- AttributeParserTest.java 2 Aug 2003 16:22:58 -0000 1.6
***************
*** 79,83 ****
public void testParseMissingEqual() {
getParameterTableFor("a b\"c\"");
! assertEquals("ValueB","",table.get("B"));
}
--- 79,83 ----
public void testParseMissingEqual() {
getParameterTableFor("a b\"c\"");
! assertEquals("ValueB",null,table.get("B"));
}
***************
*** 101,105 ****
assertEquals("Name","Authorize",table.get("NAME"));
assertEquals("Value","Y",table.get("VALUE"));
! assertEquals("Checked","",table.get("CHECKED"));
}
--- 101,105 ----
assertEquals("Name","Authorize",table.get("NAME"));
assertEquals("Value","Y",table.get("VALUE"));
! assertEquals("Checked",null,table.get("CHECKED"));
}
***************
*** 209,212 ****
--- 209,234 ----
assertStringEquals ("parameter parsed incorrectly", "defaultStatus=''", value);
}
+ }
+
+ /**
+ * Test that stand-alone attributes are kept that way, rather than being
+ * given empty values.
+ * -Joe Robins, 6/19/03
+ */
+ public void testStandaloneAttribute ()
+ {
+ getParameterTableFor ("INPUT DISABLED");
+ assertTrue ("Standalone attribue has no entry in table keyset",table.containsKey("DISABLED"));
+ assertNull ("Standalone attribute has non-null value",(String)table.get("DISABLED"));
+ }
+
+ /**
+ * Test missing value.
+ */
+ public void testMissingAttribute ()
+ {
+ getParameterTableFor ("INPUT DISABLED=");
+ assertTrue ("Attribue has no entry in table keyset",table.containsKey("DISABLED"));
+ assertEquals ("Attribute has non-blank value","",(String)table.get("DISABLED"));
}
}
Index: TagParserTest.java
===================================================================
RCS file: /cvsroot/htmlparser/htmlparser/src/org/htmlparser/tests/temporaryFailures/TagParserTest.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** TagParserTest.java 27 Jul 2003 19:19:23 -0000 1.5
--- TagParserTest.java 2 Aug 2003 16:22:58 -0000 1.6
***************
*** 410,413 ****
return result;
}
! }
}
--- 410,440 ----
return result;
}
! }
!
! /**
! * Test the toHTML method for a standalone attribute.
! */
! public void testStandAloneToHTML () throws ParserException
! {
! createParser("<input disabled>");
! parseAndAssertNodeCount (1);
! assertType ("should be Tag", Tag.class, node[0]);
! Tag tag = (Tag)node[0];
! String html = tag.toHtml ();
! assertStringEquals ("html","<INPUT DISABLED>", html);
! }
!
! /**
! * Test the toHTML method for a missing value attribute.
! */
! public void testMissingValueToHTML () throws ParserException
! {
! createParser("<input disabled=>");
! parseAndAssertNodeCount (1);
! assertType ("should be Tag", Tag.class, node[0]);
! Tag tag = (Tag)node[0];
! String html = tag.toHtml ();
! assertStringEquals ("html","<INPUT DISABLED=>", html);
! }
!
}
|
|
From: <der...@us...> - 2003-08-02 16:23:01
|
Update of /cvsroot/htmlparser/htmlparser/src/org/htmlparser/tests/tagTests
In directory sc8-pr-cvs1:/tmp/cvs-serv9188/org/htmlparser/tests/tagTests
Modified Files:
FrameSetTagTest.java FrameTagTest.java InputTagTest.java
TagTest.java
Log Message:
Fixed bug #757337 Standalone attributes should remain standalone
Changing to a HashMap was not adopted for two reasons. The first is that it would break Java 1.1.x
compatibility (which I believe we still maintain, although I haven't checked lately), and using a HashMap
would return the attributes in a different order, leading to a *lot* of broken tests that rely on toHTML()
returning a specific string with attributes in a certain order (if I'm going to fix a bunch of tests I would
like the attributes to come out in the order they were originally, so this will need an AttributeStorage class
when the attribute parser is rewritten).
The solution adopted is to subclass HashTable and store two special values, which are new constants in
the Tag class. For naive programs, and for backward compatibility, this SpecialHashtable class translates
these constants into null and "" respectively, so the old behavior is the same.
However, savvy programs, and the toHTML() method in the Tag class can call getRaw() on this hashtable
to get at these special constants and behave appropriately. For this specific bug, toHTML returns the
stand-alone attribute as is, but the missing value case is also handled.
Index: FrameSetTagTest.java
===================================================================
RCS file: /cvsroot/htmlparser/htmlparser/src/org/htmlparser/tests/tagTests/FrameSetTagTest.java,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -d -r1.22 -r1.23
*** FrameSetTagTest.java 27 Jul 2003 19:19:23 -0000 1.22
--- FrameSetTagTest.java 2 Aug 2003 16:22:58 -0000 1.23
***************
*** 56,60 ****
assertStringEquals("HTML Contents",
"<FRAMESET BORDER=\"0\" ROWS=\"115,*\" FRAMESPACING=\"0\" FRAMEBORDER=\"NO\">\r\n"+
! "<FRAME SCROLLING=\"NO\" FRAMEBORDER=\"NO\" SRC=\"demo_bc_top.html\" NAME=\"topFrame\" NORESIZE=\"\">\r\n"+
"<FRAME SCROLLING=\"AUTO\" SRC=\"http://www.kizna.com/web_e/\" NAME=\"mainFrame\">\r\n"+
"</FRAMESET>",
--- 56,60 ----
assertStringEquals("HTML Contents",
"<FRAMESET BORDER=\"0\" ROWS=\"115,*\" FRAMESPACING=\"0\" FRAMEBORDER=\"NO\">\r\n"+
! "<FRAME SCROLLING=\"NO\" FRAMEBORDER=\"NO\" SRC=\"demo_bc_top.html\" NAME=\"topFrame\" NORESIZE>\r\n"+
"<FRAME SCROLLING=\"AUTO\" SRC=\"http://www.kizna.com/web_e/\" NAME=\"mainFrame\">\r\n"+
"</FRAMESET>",
Index: FrameTagTest.java
===================================================================
RCS file: /cvsroot/htmlparser/htmlparser/src/org/htmlparser/tests/tagTests/FrameTagTest.java,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -d -r1.22 -r1.23
*** FrameTagTest.java 27 Jul 2003 19:19:23 -0000 1.22
--- FrameTagTest.java 2 Aug 2003 16:22:58 -0000 1.23
***************
*** 55,59 ****
FrameTag frameTag2 = (FrameTag)node[2];
! assertStringEquals("Frame 1 toHTML()","<FRAME SCROLLING=\"NO\" FRAMEBORDER=\"NO\" SRC=\"demo_bc_top.html\" NAME=\"topFrame\" NORESIZE=\"\">",frameTag1.toHtml());
assertStringEquals("Frame 2 toHTML()","<FRAME SCROLLING=\"AUTO\" SRC=\"http://www.kizna.com/web_e/\" NAME=\"mainFrame\">",frameTag2.toHtml());
}
--- 55,59 ----
FrameTag frameTag2 = (FrameTag)node[2];
! assertStringEquals("Frame 1 toHTML()","<FRAME SCROLLING=\"NO\" FRAMEBORDER=\"NO\" SRC=\"demo_bc_top.html\" NAME=\"topFrame\" NORESIZE>",frameTag1.toHtml());
assertStringEquals("Frame 2 toHTML()","<FRAME SCROLLING=\"AUTO\" SRC=\"http://www.kizna.com/web_e/\" NAME=\"mainFrame\">",frameTag2.toHtml());
}
Index: InputTagTest.java
===================================================================
RCS file: /cvsroot/htmlparser/htmlparser/src/org/htmlparser/tests/tagTests/InputTagTest.java,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -d -r1.23 -r1.24
*** InputTagTest.java 27 Jul 2003 19:19:23 -0000 1.23
--- InputTagTest.java 2 Aug 2003 16:22:58 -0000 1.24
***************
*** 87,91 ****
InputTag = (InputTag) node[0];
assertStringEquals("HTML String",
! "<INPUT CHECKED=\"\" NAME=\"cbCheck\" TYPE=\"checkbox\">",
InputTag.toHtml());
}
--- 87,91 ----
InputTag = (InputTag) node[0];
assertStringEquals("HTML String",
! "<INPUT CHECKED NAME=\"cbCheck\" TYPE=\"checkbox\">",
InputTag.toHtml());
}
Index: TagTest.java
===================================================================
RCS file: /cvsroot/htmlparser/htmlparser/src/org/htmlparser/tests/tagTests/TagTest.java,v
retrieving revision 1.34
retrieving revision 1.35
diff -C2 -d -r1.34 -r1.35
*** TagTest.java 27 Jul 2003 19:19:23 -0000 1.34
--- TagTest.java 2 Aug 2003 16:22:58 -0000 1.35
***************
*** 165,169 ****
assertEquals ("Link tag (A)","A",a);
assertEquals ("href value","http://www.iki.fi/kaila",href);
! assertEquals ("myparameter value","",myValue);
assertEquals ("yourparameter value","Kaarle Kaaila",nice);
}
--- 165,169 ----
assertEquals ("Link tag (A)","A",a);
assertEquals ("href value","http://www.iki.fi/kaila",href);
! assertEquals ("myparameter value",null,myValue);
assertEquals ("yourparameter value","Kaarle Kaaila",nice);
}
***************
*** 236,240 ****
assertEquals ("The tagname should be G",a,"G");
assertEquals ("Check the http address",href,"http://www.iki.fi/kaila");
! assertEquals ("myValue is empty",myValue,"");
assertEquals ("The second parameter value",nice,"Kaila");
}
--- 236,240 ----
assertEquals ("The tagname should be G",a,"G");
assertEquals ("Check the http address",href,"http://www.iki.fi/kaila");
! assertEquals ("myValue is not null",myValue,null);
assertEquals ("The second parameter value",nice,"Kaila");
}
***************
*** 376,380 ****
assertTrue("1st Node should be a Tag",node[0] instanceof Tag);
Tag tag = (Tag)node[0];
! assertStringEquals("toHTML()","<MYTAG EFGH=\"\" ABCD=\"\" MNOP=\"\" IJKL=\"\">",tag.toHtml());
assertTrue("2nd Node should be a Tag",node[1] instanceof Tag);
assertTrue("5th Node should be a Tag",node[4] instanceof Tag);
--- 376,380 ----
assertTrue("1st Node should be a Tag",node[0] instanceof Tag);
Tag tag = (Tag)node[0];
! assertStringEquals("toHTML()","<MYTAG EFGH ABCD MNOP IJKL>",tag.toHtml());
assertTrue("2nd Node should be a Tag",node[1] instanceof Tag);
assertTrue("5th Node should be a Tag",node[4] instanceof Tag);
***************
*** 405,409 ****
result += node.toHtml();
}
! String expected = "<A YOURPARAMETER=\"Kaarle\" MYPARAMETER=\"\" HREF=\"http://www.iki.fi/kaila\">Kaarle's homepage</A><P>Paragraph</P>";
assertStringEquals("Check collected contents to original", expected, result);
} catch (ClassCastException ce) {
--- 405,409 ----
result += node.toHtml();
}
! String expected = "<A YOURPARAMETER=\"Kaarle\" MYPARAMETER HREF=\"http://www.iki.fi/kaila\">Kaarle's homepage</A><P>Paragraph</P>";
assertStringEquals("Check collected contents to original", expected, result);
} catch (ClassCastException ce) {
***************
*** 627,641 ****
public void testSetText() throws ParserException
{
! String testHTML = "<LABEL ID=\"JohnDoe\" >John Doe</LABEL>";
createParser(testHTML);
parser.addScanner(new org.htmlparser.scanners.LabelScanner("-l"));
parseAndAssertNodeCount(1);
org.htmlparser.tags.LabelTag htmlTag = (org.htmlparser.tags.LabelTag)node[0];
! String expectedHTML = "<LABEL ID=\"JohnDoe\" >John Doe</LABEL>";
assertStringEquals("Expected HTML",expectedHTML,htmlTag.toHtml());
assertStringEquals("Expected HTML","John Doe",htmlTag.getLabel());
((org.htmlparser.StringNode)((org.htmlparser.tags.CompositeTag)htmlTag).getChild(0)).setText("Jane Doe");
! expectedHTML = "<LABEL ID=\"JohnDoe\" >Jane Doe</LABEL>";
assertStringEquals("Expected HTML",expectedHTML,htmlTag.toHtml());
assertStringEquals("Expected HTML","Jane Doe",htmlTag.getLabel());
--- 627,641 ----
public void testSetText() throws ParserException
{
! String testHTML = "<LABEL ID=\"JohnDoe\">John Doe</LABEL>";
createParser(testHTML);
parser.addScanner(new org.htmlparser.scanners.LabelScanner("-l"));
parseAndAssertNodeCount(1);
org.htmlparser.tags.LabelTag htmlTag = (org.htmlparser.tags.LabelTag)node[0];
! String expectedHTML = "<LABEL ID=\"JohnDoe\">John Doe</LABEL>";
assertStringEquals("Expected HTML",expectedHTML,htmlTag.toHtml());
assertStringEquals("Expected HTML","John Doe",htmlTag.getLabel());
((org.htmlparser.StringNode)((org.htmlparser.tags.CompositeTag)htmlTag).getChild(0)).setText("Jane Doe");
! expectedHTML = "<LABEL ID=\"JohnDoe\">Jane Doe</LABEL>";
assertStringEquals("Expected HTML",expectedHTML,htmlTag.toHtml());
assertStringEquals("Expected HTML","Jane Doe",htmlTag.getLabel());
***************
*** 695,699 ****
String s = tag.toHtml ();
! assertEquals("HTML should be","<TABLE BORDER=\"1\" >", s);
}
}
--- 695,699 ----
String s = tag.toHtml ();
! assertEquals("HTML should be","<TABLE BORDER=\"1\">", s);
}
}
|
|
From: <der...@us...> - 2003-08-02 16:23:00
|
Update of /cvsroot/htmlparser/htmlparser/src/org/htmlparser/tags
In directory sc8-pr-cvs1:/tmp/cvs-serv9188/org/htmlparser/tags
Modified Files:
Tag.java
Log Message:
Fixed bug #757337 Standalone attributes should remain standalone
Changing to a HashMap was not adopted for two reasons. The first is that it would break Java 1.1.x
compatibility (which I believe we still maintain, although I haven't checked lately), and using a HashMap
would return the attributes in a different order, leading to a *lot* of broken tests that rely on toHTML()
returning a specific string with attributes in a certain order (if I'm going to fix a bunch of tests I would
like the attributes to come out in the order they were originally, so this will need an AttributeStorage class
when the attribute parser is rewritten).
The solution adopted is to subclass HashTable and store two special values, which are new constants in
the Tag class. For naive programs, and for backward compatibility, this SpecialHashtable class translates
these constants into null and "" respectively, so the old behavior is the same.
However, savvy programs, and the toHTML() method in the Tag class can call getRaw() on this hashtable
to get at these special constants and behave appropriately. For this specific bug, toHTML returns the
stand-alone attribute as is, but the missing value case is also handled.
Index: Tag.java
===================================================================
RCS file: /cvsroot/htmlparser/htmlparser/src/org/htmlparser/tags/Tag.java,v
retrieving revision 1.37
retrieving revision 1.38
diff -C2 -d -r1.37 -r1.38
*** Tag.java 27 Jul 2003 19:19:19 -0000 1.37
--- Tag.java 2 Aug 2003 16:22:57 -0000 1.38
***************
*** 37,40 ****
--- 37,41 ----
import org.htmlparser.NodeReader;
import org.htmlparser.parserHelper.AttributeParser;
+ import org.htmlparser.parserHelper.SpecialHashtable;
import org.htmlparser.parserHelper.TagParser;
import org.htmlparser.scanners.TagScanner;
***************
*** 59,62 ****
--- 60,65 ----
public final static String TAGNAME = "$<TAGNAME>$";
public final static String EMPTYTAG = "$<EMPTYTAG>$";
+ public final static String NULLVALUE = "$<NULL>$";
+ public final static String NOTHING = "$<NOTHING>$";
private final static String EMPTY_STRING="";
***************
*** 413,446 ****
* @see org.htmlparser.Node#toHTML()
*/
! public String toHtml() {
! StringBuffer sb = new StringBuffer();
! sb.append("<");
! sb.append(getTagName());
! if (containsMoreThanOneKey()) sb.append(" ");
! String key,value;
! String empty=null;
! int i=0;
! for (Enumeration e = attributes.keys();e.hasMoreElements();) {
! key = (String)e.nextElement();
! i++;
! if (!key.equals(TAGNAME)) {
! if (key.equals(EMPTYTAG)){
! empty="/";
! } else {
! value = getAttribute(key);
! sb.append(key+"=\""+value+"\"");
! if (i<attributes.size()) sb.append(" ");
! }
}
}
! if (empty != null) sb.append(empty);
! if (isEmptyXmlTag()) sb.append("/");
! sb.append(">");
! return sb.toString();
! }
! private boolean containsMoreThanOneKey() {
! return attributes.keySet().size()>1;
! }
/**
--- 416,465 ----
* @see org.htmlparser.Node#toHTML()
*/
! public String toHtml()
! {
! StringBuffer ret;
! String key;
! String value;
! String empty;
!
! ret = new StringBuffer ();
! ret.append ("<");
! ret.append (getTagName ());
! empty = null;
! for (Enumeration e = attributes.keys(); e.hasMoreElements(); )
! {
! key = (String)e.nextElement ();
! if (!key.equals (TAGNAME))
! {
! if (key.equals (EMPTYTAG))
! empty="/";
! else
! {
! ret.append (" ");
! ret.append (key);
! value = (String)(((SpecialHashtable)getAttributes()).getRaw (key.toUpperCase ()));
! if (Tag.NULLVALUE != value)
! {
! ret.append ("=");
! if (!(Tag.NOTHING == value))
! {
! ret.append ("\"");
! ret.append (value);
! ret.append ("\"");
! }
! else
! ret.append ("");
! }
! }
}
}
! if (null != empty)
! ret.append (empty);
! if (isEmptyXmlTag ())
! ret.append ("/");
! ret.append (">");
! return (ret.toString ());
! }
/**
|
|
From: <der...@us...> - 2003-08-02 16:23:00
|
Update of /cvsroot/htmlparser/htmlparser/src/org/htmlparser/parserHelper In directory sc8-pr-cvs1:/tmp/cvs-serv9188/org/htmlparser/parserHelper Modified Files: AttributeParser.java Added Files: SpecialHashtable.java Log Message: Fixed bug #757337 Standalone attributes should remain standalone Changing to a HashMap was not adopted for two reasons. The first is that it would break Java 1.1.x compatibility (which I believe we still maintain, although I haven't checked lately), and using a HashMap would return the attributes in a different order, leading to a *lot* of broken tests that rely on toHTML() returning a specific string with attributes in a certain order (if I'm going to fix a bunch of tests I would like the attributes to come out in the order they were originally, so this will need an AttributeStorage class when the attribute parser is rewritten). The solution adopted is to subclass HashTable and store two special values, which are new constants in the Tag class. For naive programs, and for backward compatibility, this SpecialHashtable class translates these constants into null and "" respectively, so the old behavior is the same. However, savvy programs, and the toHTML() method in the Tag class can call getRaw() on this hashtable to get at these special constants and behave appropriately. For this specific bug, toHTML returns the stand-alone attribute as is, but the missing value case is also handled. --- NEW FILE: SpecialHashtable.java --- // HTMLParser Library v1_4_20030727 - A java-based parser for HTML // Copyright (C) Dec 31, 2000 Somik Raha // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public // License as published by the Free Software Foundation; either // version 2.1 of the License, or (at your option) any later version. // // This library is distributed in the hope that it will be useful, // but WITHOUT ANY WARRANTY; without even the implied warranty of // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU // Lesser General Public License for more details. // // You should have received a copy of the GNU Lesser General Public // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // // For any questions or suggestions, you can write to me at : // Email :so...@in... // // Postal Address : // Somik Raha // Extreme Programmer & Coach // Industrial Logic Corporation // 2583 Cedar Street, Berkeley, // CA 94708, USA // Website : http://www.industriallogic.com package org.htmlparser.parserHelper; import java.util.Hashtable; import org.htmlparser.tags.Tag; /** * Acts like a regular HashTable, except some values are translated in get(String). * Specifically, <code>Tag.NULLVALUE</code> is translated to <code>null</code> and * <code>Tag.NOTHING</code> is translated to <code>""</code>. * This is done for backwards compatibility, users are expecting a HashTable, * but Tag.toHTML needs to know when there is no attribute value (<<TAG ATTRIBUTE>) * and when the value was not present (<<TAG ATTRIBUTE=>). */ public class SpecialHashtable extends Hashtable { /** * Constructs a new, empty hashtable with a default initial capacity (11) and load factor, which is 0.75. */ public SpecialHashtable () { super (); } /** * Constructs a new, empty hashtable with the specified initial capacity and default load factor, which is 0.75. */ public SpecialHashtable (int initialCapacity) { super (initialCapacity); } /** * Constructs a new, empty hashtable with the specified initial capacity and the specified load factor. */ public SpecialHashtable (int initialCapacity, float loadFactor) { super (initialCapacity, loadFactor); } /** * Returns the value to which the specified key is mapped in this hashtable. * This is translated to provide backwards compatibility. */ public Object get (Object key) { Object ret; ret = getRaw (key); if (Tag.NULLVALUE == ret) ret = null; else if (Tag.NOTHING == ret) ret = ""; return (ret); } /** * Returns the raw value to which the specified key is mapped in this hashtable. */ public Object getRaw (Object key) { return (super.get (key)); } } Index: AttributeParser.java =================================================================== RCS file: /cvsroot/htmlparser/htmlparser/src/org/htmlparser/parserHelper/AttributeParser.java,v retrieving revision 1.31 retrieving revision 1.32 diff -C2 -d -r1.31 -r1.32 *** AttributeParser.java 27 Jul 2003 19:19:17 -0000 1.31 --- AttributeParser.java 2 Aug 2003 16:22:57 -0000 1.32 *************** *** 105,109 **** */ public Hashtable parseAttributes(Tag tag) { ! attributeTable = new Hashtable(); part = null; empty = null; --- 105,109 ---- */ public Hashtable parseAttributes(Tag tag) { ! attributeTable = new SpecialHashtable(); part = null; empty = null; *************** *** 137,151 **** } ! private void processInvalidPart() { ! if (name != null) { ! if (name.equals("/")) { ! putDataIntoTable(attributeTable,Tag.EMPTYTAG,"",false); ! } else { ! putDataIntoTable(attributeTable,name,"",false); ! } ! name=null; ! value=null; ! } ! } private boolean isValid(String part) { --- 137,161 ---- } ! private void processInvalidPart () ! { ! if (name != null) ! { ! if (name.equals ("/")) ! putDataIntoTable (attributeTable,Tag.EMPTYTAG,"",false); ! else ! { ! if (null == part) ! if ((null != value) && value == Tag.NOTHING) ! putDataIntoTable (attributeTable,name,Tag.NOTHING,false); ! else ! putDataIntoTable (attributeTable,name,Tag.NULLVALUE,false); ! else ! putDataIntoTable (attributeTable,name,"",false); ! } ! name=null; ! value=null; ! equal=false; ! } ! } private boolean isValid(String part) { *************** *** 165,171 **** equal=false; delim=DELIMETERS_WITHOUT_EQUALS; } else { ! putDataIntoTable(attributeTable,name,"",false); name=part; value=null; --- 175,182 ---- equal=false; delim=DELIMETERS_WITHOUT_EQUALS; + value=Tag.NOTHING; } else { ! putDataIntoTable(attributeTable,name,Tag.NULLVALUE,false); name=part; value=null; |
1 message has been excluded from this view by a project administrator.
