[Htmlparser-cvs] htmlparser/src/org/htmlparser/util ParserUtils.java,1.40,1.41

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

Update of /cvsroot/htmlparser/htmlparser/src/org/htmlparser/util
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19028/src/org/htmlparser/util

Modified Files:
	ParserUtils.java 
Log Message:
Part three of a multiphase refactoring.
The three node types are now fronted by interfaces (program to the interface paradigm)
with concrete implementations in the new htmlparser.nodes package. Classes from the
lexer.nodes package are moved to this package, and obvious references to the concrete
classes that got broken by this have been changed to use the interfaces where possible.



Index: ParserUtils.java
===================================================================
RCS file: /cvsroot/htmlparser/htmlparser/src/org/htmlparser/util/ParserUtils.java,v
retrieving revision 1.40
retrieving revision 1.41
diff -C2 -d -r1.40 -r1.41
*** ParserUtils.java	12 May 2004 14:16:08 -0000	1.40
--- ParserUtils.java	24 May 2004 16:18:35 -0000	1.41
***************
*** 39,44 ****
  import org.htmlparser.lexer.Page;
  import org.htmlparser.lexer.Source;
- import org.htmlparser.lexer.nodes.TagNode;
  import org.htmlparser.tags.CompositeTag;
  import org.htmlparser.util.NodeList;
  import org.htmlparser.util.ParserException;
--- 39,44 ----
  import org.htmlparser.lexer.Page;
  import org.htmlparser.lexer.Source;
  import org.htmlparser.tags.CompositeTag;
+ import org.htmlparser.tags.Tag;
  import org.htmlparser.util.NodeList;
  import org.htmlparser.util.ParserException;
***************
*** 719,723 ****
              {
                  CompositeTag beginTag = (CompositeTag)links.elementAt(j);
!                 TagNode endTag = beginTag.getEndTag();
  
                  // positions of begin and end tags
--- 719,723 ----
              {
                  CompositeTag beginTag = (CompositeTag)links.elementAt(j);
!                 Tag endTag = (Tag)beginTag.getEndTag();
  
                  // positions of begin and end tags
***************
*** 844,848 ****
          {
              CompositeTag beginTag = (CompositeTag)links.elementAt(j);
!             TagNode endTag = beginTag.getEndTag();
  
              // positions of begin and end tags
--- 844,848 ----
          {
              CompositeTag beginTag = (CompositeTag)links.elementAt(j);
!             Tag endTag = (Tag)beginTag.getEndTag();
  
              // positions of begin and end tags
***************
*** 948,952 ****
              {
                  CompositeTag beginTag = (CompositeTag)links.elementAt(j);
!                 TagNode endTag = beginTag.getEndTag();
  
                  // positions of begin and end tags
--- 948,952 ----
              {
                  CompositeTag beginTag = (CompositeTag)links.elementAt(j);
!                 Tag endTag = (Tag)beginTag.getEndTag();
  
                  // positions of begin and end tags
***************
*** 1047,1051 ****
          {
              CompositeTag beginTag = (CompositeTag)links.elementAt(j);
!             TagNode endTag = beginTag.getEndTag();
  
              // positions of begin and end tags
--- 1047,1051 ----
          {
              CompositeTag beginTag = (CompositeTag)links.elementAt(j);
!             Tag endTag = (Tag)beginTag.getEndTag();
  
              // positions of begin and end tags
***************
*** 1124,1128 ****
              {
                  CompositeTag jStartTag = (CompositeTag)links.elementAt(j);
!                 TagNode jEndTag = jStartTag.getEndTag();
                  int jStartTagBegin = jStartTag.getTagBegin();
                  int jEndTagEnd = jEndTag.getTagEnd();
--- 1124,1128 ----
              {
                  CompositeTag jStartTag = (CompositeTag)links.elementAt(j);
!                 Tag jEndTag = (Tag)jStartTag.getEndTag();
                  int jStartTagBegin = jStartTag.getTagBegin();
                  int jEndTagEnd = jEndTag.getTagEnd();
***************
*** 1130,1134 ****
                  {
                      CompositeTag kStartTag = (CompositeTag)links.elementAt(k);
!                     TagNode kEndTag = kStartTag.getEndTag();
                      int kStartTagBegin = kStartTag.getTagBegin();
                      int kEndTagEnd = kEndTag.getTagEnd();
--- 1130,1134 ----
                  {
                      CompositeTag kStartTag = (CompositeTag)links.elementAt(k);
!                     Tag kEndTag = (Tag)kStartTag.getEndTag();
                      int kStartTagBegin = kStartTag.getTagBegin();
                      int kEndTagEnd = kEndTag.getTagEnd();
***************
*** 1164,1168 ****
              {
                  CompositeTag jStartTag = (CompositeTag)links.elementAt(j);
!                 TagNode jEndTag = jStartTag.getEndTag();
                  int jStartTagBegin = jStartTag.getTagBegin();
                  int jEndTagEnd = jEndTag.getTagEnd();
--- 1164,1168 ----
              {
                  CompositeTag jStartTag = (CompositeTag)links.elementAt(j);
!                 Tag jEndTag = (Tag)jStartTag.getEndTag();
                  int jStartTagBegin = jStartTag.getTagBegin();
                  int jEndTagEnd = jEndTag.getTagEnd();
***************
*** 1170,1174 ****
                  {
                      CompositeTag kStartTag = (CompositeTag)links.elementAt(k);
!                     TagNode kEndTag = kStartTag.getEndTag();
                      int kStartTagBegin = kStartTag.getTagBegin();
                      int kEndTagEnd = kEndTag.getTagEnd();
--- 1170,1174 ----
                  {
                      CompositeTag kStartTag = (CompositeTag)links.elementAt(k);
!                     Tag kEndTag = (Tag)kStartTag.getEndTag();
                      int kStartTagBegin = kStartTag.getTagBegin();
                      int kEndTagEnd = kEndTag.getTagEnd();