[Htmlparser-cvs] htmlparser/src/org/htmlparser/tests ParserTest.java,1.30,1.31 ParserTestCase.java,1.14,1.15

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

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

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

Index: ParserTest.java
===================================================================
RCS file: /cvsroot/htmlparser/htmlparser/src/org/htmlparser/tests/ParserTest.java,v
retrieving revision 1.30
retrieving revision 1.31
diff -C2 -d -r1.30 -r1.31
*** ParserTest.java	1 Jun 2003 20:50:14 -0000	1.30
--- ParserTest.java	13 Jun 2003 20:27:04 -0000	1.31
***************
*** 37,40 ****
--- 37,41 ----
  import java.util.Map;
  
+ import org.htmlparser.AbstractNode;
  import org.htmlparser.Node;
  import org.htmlparser.Parser;
***************
*** 90,94 ****
  		parser.getReader().mark(5000);
  
! 		Node [] node = new Node[500];
  		int i = 0;
  		for (NodeIterator e = parser.elements();e.hasMoreNodes();)
--- 91,95 ----
  		parser.getReader().mark(5000);
  
! 		Node [] node = new AbstractNode[500];
  		int i = 0;
  		for (NodeIterator e = parser.elements();e.hasMoreNodes();)
***************
*** 341,345 ****
              out.close ();
              parser = new Parser (file.getAbsolutePath ());
!             nodes = new Node[30];
              i = 0;
              for (enumeration = parser.elements (); enumeration.hasMoreNodes ();)
--- 342,346 ----
              out.close ();
              parser = new Parser (file.getAbsolutePath ());
!             nodes = new AbstractNode[30];
              i = 0;
              for (enumeration = parser.elements (); enumeration.hasMoreNodes ();)
***************
*** 417,421 ****
  		parser = new Parser(url);
          i = 0;
!         nodes = new Node[30];
  		for (NodeIterator e = parser.elements(); e.hasMoreNodes();)
  			nodes[i++] = e.nextNode();
--- 418,422 ----
  		parser = new Parser(url);
          i = 0;
!         nodes = new AbstractNode[30];
  		for (NodeIterator e = parser.elements(); e.hasMoreNodes();)
  			nodes[i++] = e.nextNode();
***************
*** 551,555 ****
  		
  		parser = new Parser(url);
! 		Node node [] = new Node[30];
  		int i = 0;
  		for (NodeIterator e = parser.elements();e.hasMoreNodes();) {
--- 552,556 ----
  		
  		parser = new Parser(url);
! 		Node node [] = new AbstractNode[30];
  		int i = 0;
  		for (NodeIterator e = parser.elements();e.hasMoreNodes();) {

Index: ParserTestCase.java
===================================================================
RCS file: /cvsroot/htmlparser/htmlparser/src/org/htmlparser/tests/ParserTestCase.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** ParserTestCase.java	24 May 2003 02:05:50 -0000	1.14
--- ParserTestCase.java	13 Jun 2003 20:27:04 -0000	1.15
***************
*** 7,10 ****
--- 7,11 ----
  import junit.framework.TestCase;
  
+ import org.htmlparser.AbstractNode;
  import org.htmlparser.Node;
  import org.htmlparser.NodeReader;
***************
*** 41,45 ****
  		reader =  new NodeReader(new BufferedReader(sr),5000);
  		parser = new Parser(reader,new DefaultParserFeedback());
! 		node = new Node[40];
  	}
  
--- 42,46 ----
  		reader =  new NodeReader(new BufferedReader(sr),5000);
  		parser = new Parser(reader,new DefaultParserFeedback());
! 		node = new AbstractNode[40];
  	}
  
***************
*** 49,53 ****
  		reader =  new NodeReader(new BufferedReader(sr),5000);
  		parser = new Parser(reader,new DefaultParserFeedback());
! 		node = new Node[numNodes];
  	}
  
--- 50,54 ----
  		reader =  new NodeReader(new BufferedReader(sr),5000);
  		parser = new Parser(reader,new DefaultParserFeedback());
! 		node = new AbstractNode[numNodes];
  	}
  
***************
*** 57,61 ****
  		reader =  new NodeReader(new BufferedReader(sr),url);
  		parser = new Parser(reader,new DefaultParserFeedback());
! 		node = new Node[40];
  	}
  
--- 58,62 ----
  		reader =  new NodeReader(new BufferedReader(sr),url);
  		parser = new Parser(reader,new DefaultParserFeedback());
! 		node = new AbstractNode[40];
  	}
  
***************
*** 65,69 ****
  		reader =  new NodeReader(new BufferedReader(sr),url);
  		parser = new Parser(reader,new DefaultParserFeedback());
! 		node = new Node[numNodes];
  	}
  	
--- 66,70 ----
  		reader =  new NodeReader(new BufferedReader(sr),url);
  		parser = new Parser(reader,new DefaultParserFeedback());
! 		node = new AbstractNode[numNodes];
  	}