htmlparser-cvs

[<jke...@us...>]

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

Modified Files:
	StringParser.java TagParser.java 
Log Message:
Renamed Node to AbstractNode, extracted the new interface, Node, and moved line separator code from AbstractNode to Parser.

Index: StringParser.java
===================================================================
RCS file: /cvsroot/htmlparser/htmlparser/src/org/htmlparser/parserHelper/StringParser.java,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -d -r1.24 -r1.25
*** StringParser.java	1 Jun 2003 20:50:10 -0000	1.24
--- StringParser.java	13 Jun 2003 20:27:04 -0000	1.25
***************
*** 29,34 ****
  package org.htmlparser.parserHelper;
  
! import org.htmlparser.Node;
  import org.htmlparser.NodeReader;
  import org.htmlparser.StringNode;
  
--- 29,35 ----
  package org.htmlparser.parserHelper;
  
! import org.htmlparser.AbstractNode;
  import org.htmlparser.NodeReader;
+ import org.htmlparser.Parser;
  import org.htmlparser.StringNode;
  
***************
*** 73,77 ****
       * encountering quotes.
  	 */		
! 	public Node find(NodeReader reader,String input,int position, boolean balance_quotes)
  	{
  		StringBuffer textBuffer = new StringBuffer();
--- 74,78 ----
       * encountering quotes.
  	 */		
! 	public AbstractNode find(NodeReader reader,String input,int position, boolean balance_quotes)
  	{
  		StringBuffer textBuffer = new StringBuffer();
***************
*** 122,126 ****
  					input = reader.getNextLine();
  					if (input!=null && input.length()==0)
! 						textBuffer.append(Node.getLineSeparator());
  				}
  				while (input!=null && input.length()==0);
--- 123,127 ----
  					input = reader.getNextLine();
  					if (input!=null && input.length()==0)
! 						textBuffer.append(Parser.getLineSeparator());
  				}
  				while (input!=null && input.length()==0);
***************
*** 131,135 ****
  					
  				} else {
! 					textBuffer.append(Node.getLineSeparator());
  					inputLen = input.length();
  					i=-1;
--- 132,136 ----
  					
  				} else {
! 					textBuffer.append(Parser.getLineSeparator());
  					inputLen = input.length();
  					i=-1;

Index: TagParser.java
===================================================================
RCS file: /cvsroot/htmlparser/htmlparser/src/org/htmlparser/parserHelper/TagParser.java,v
retrieving revision 1.32
retrieving revision 1.33
diff -C2 -d -r1.32 -r1.33
*** TagParser.java	1 Jun 2003 20:50:11 -0000	1.32
--- TagParser.java	13 Jun 2003 20:27:04 -0000	1.33
***************
*** 31,36 ****
  import java.util.StringTokenizer;
  
- import org.htmlparser.Node;
  import org.htmlparser.NodeReader;
  import org.htmlparser.tags.Tag;
  import org.htmlparser.tags.data.TagData;
--- 31,36 ----
  import java.util.StringTokenizer;
  
  import org.htmlparser.NodeReader;
+ import org.htmlparser.Parser;
  import org.htmlparser.tags.Tag;
  import org.htmlparser.tags.data.TagData;
***************
*** 289,293 ****
  			} else {
  				// This means this is just a new line, hence add the new line character
! 				tag.append(Node.getLineSeparator());
  			}
  			
--- 289,293 ----
  			} else {
  				// This means this is just a new line, hence add the new line character
! 				tag.append(Parser.getLineSeparator());
  			}