[Htmlparser-cvs] htmlparser/src/org/htmlparser/tags OptionTag.java,1.19,1.20 EndTag.java,1.19,1.20 T
Brought to you by:
derrickoswald
|
From: <jke...@us...> - 2003-06-13 20:27:09
|
Update of /cvsroot/htmlparser/htmlparser/src/org/htmlparser/tags
In directory sc8-pr-cvs1:/tmp/cvs-serv17851/src/org/htmlparser/tags
Modified Files:
OptionTag.java EndTag.java Tag.java CompositeTag.java
Log Message:
Renamed Node to AbstractNode, extracted the new interface, Node, and moved line separator code from AbstractNode to Parser.
Index: OptionTag.java
===================================================================
RCS file: /cvsroot/htmlparser/htmlparser/src/org/htmlparser/tags/OptionTag.java,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** OptionTag.java 1 Jun 2003 20:50:13 -0000 1.19
--- OptionTag.java 13 Jun 2003 20:27:05 -0000 1.20
***************
*** 31,35 ****
import org.htmlparser.tags.data.CompositeTagData;
import org.htmlparser.tags.data.TagData;
- import org.htmlparser.util.ParserUtils;
public class OptionTag extends CompositeTag
--- 31,34 ----
Index: EndTag.java
===================================================================
RCS file: /cvsroot/htmlparser/htmlparser/src/org/htmlparser/tags/EndTag.java,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** EndTag.java 1 Jun 2003 20:50:13 -0000 1.19
--- EndTag.java 13 Jun 2003 20:27:05 -0000 1.20
***************
*** 29,33 ****
package org.htmlparser.tags;
! import org.htmlparser.Node;
import org.htmlparser.tags.data.TagData;
import org.htmlparser.visitors.NodeVisitor;
--- 29,33 ----
package org.htmlparser.tags;
! import org.htmlparser.AbstractNode;
import org.htmlparser.tags.data.TagData;
import org.htmlparser.visitors.NodeVisitor;
***************
*** 58,62 ****
* @param position Position to start parsing from
*/
! public static Node find(String input,int position)
{
int state = ENDTAG_BEFORE_PARSING_STATE;
--- 58,62 ----
* @param position Position to start parsing from
*/
! public static AbstractNode find(String input,int position)
{
int state = ENDTAG_BEFORE_PARSING_STATE;
Index: Tag.java
===================================================================
RCS file: /cvsroot/htmlparser/htmlparser/src/org/htmlparser/tags/Tag.java,v
retrieving revision 1.30
retrieving revision 1.31
diff -C2 -d -r1.30 -r1.31
*** Tag.java 1 Jun 2003 20:50:13 -0000 1.30
--- Tag.java 13 Jun 2003 20:27:05 -0000 1.31
***************
*** 34,38 ****
import java.util.Map;
! import org.htmlparser.Node;
import org.htmlparser.NodeReader;
import org.htmlparser.parserHelper.AttributeParser;
--- 34,38 ----
import java.util.Map;
! import org.htmlparser.AbstractNode;
import org.htmlparser.NodeReader;
import org.htmlparser.parserHelper.AttributeParser;
***************
*** 50,54 ****
* @author Kaarle Kaila 23.10.2001
*/
! public class Tag extends Node
{
public static final String TYPE = "TAG";
--- 50,54 ----
* @author Kaarle Kaila 23.10.2001
*/
! public class Tag extends AbstractNode
{
public static final String TYPE = "TAG";
***************
*** 291,300 ****
* @param reader The NodeReader that is to be used for reading the url
*/
! public Node scan(Map scanners,String url,NodeReader reader) throws ParserException
{
if (tagContents.length()==0) return this;
try {
boolean found=false;
! Node retVal=null;
// Find the first word in the scanners
String firstWord = extractWord(tagContents.toString());
--- 291,300 ----
* @param reader The NodeReader that is to be used for reading the url
*/
! public AbstractNode scan(Map scanners,String url,NodeReader reader) throws ParserException
{
if (tagContents.length()==0) return this;
try {
boolean found=false;
! AbstractNode retVal=null;
// Find the first word in the scanners
String firstWord = extractWord(tagContents.toString());
Index: CompositeTag.java
===================================================================
RCS file: /cvsroot/htmlparser/htmlparser/src/org/htmlparser/tags/CompositeTag.java,v
retrieving revision 1.42
retrieving revision 1.43
diff -C2 -d -r1.42 -r1.43
*** CompositeTag.java 1 Jun 2003 20:50:13 -0000 1.42
--- CompositeTag.java 13 Jun 2003 20:27:05 -0000 1.43
***************
*** 30,34 ****
import org.htmlparser.*;
! import org.htmlparser.Node;
import org.htmlparser.tags.data.CompositeTagData;
import org.htmlparser.tags.data.TagData;
--- 30,34 ----
import org.htmlparser.*;
! import org.htmlparser.AbstractNode;
import org.htmlparser.tags.data.CompositeTagData;
import org.htmlparser.tags.data.TagData;
***************
*** 93,97 ****
if (prevNode.elementEnd()>node.elementBegin()) {
// Its a new line
! sb.append(lineSeparator);
}
}
--- 93,97 ----
if (prevNode.elementEnd()>node.elementBegin()) {
// Its a new line
! sb.append(Parser.getLineSeparator());
}
}
***************
*** 100,104 ****
}
if (prevNode.elementEnd()>endTag.elementBegin()) {
! sb.append(lineSeparator);
}
}
--- 100,104 ----
}
if (prevNode.elementEnd()>endTag.elementBegin()) {
! sb.append(Parser.getLineSeparator());
}
}
***************
*** 269,273 ****
StringBuffer buff = new StringBuffer();
for (SimpleNodeIterator e = children();e.hasMoreNodes();) {
! Node node = (Node)e.nextNode();
buff.append(node.toHtml());
}
--- 269,273 ----
StringBuffer buff = new StringBuffer();
for (SimpleNodeIterator e = children();e.hasMoreNodes();) {
! AbstractNode node = (AbstractNode)e.nextNode();
buff.append(node.toHtml());
}
|