[Htmlparser-cvs] htmlparser/src/org/htmlparser/util IteratorImpl.java,1.40,1.41 ParserUtils.java,1.41,1.42 PeekingIterator.java,1.21,NONE PeekingIteratorImpl.java,1.2,NONE

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

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

Modified Files:
	IteratorImpl.java ParserUtils.java 
Removed Files:
	PeekingIterator.java PeekingIteratorImpl.java 
Log Message:
Part four of a multiphase refactoring.
Most internals now use the Tag interface.
This interface has been broadened to add set/get scanner and set/get endtag.
Removed the org.htmlparser.tags.Tag class and moved the remaining (minor) functionality
to the TagNode class. So now tags inherit directly from TagNode or CompositeTag.
** NOTE: If you have subclassed org.htmlparser.tags.Tag, use org.htmlparser.nodes.TagNode now.**
Removed deprecated methods getTagBegin/getTagEnd and deleted unused classes:
PeekingIterator and it's Implementation.



--- PeekingIterator.java DELETED ---

--- PeekingIteratorImpl.java DELETED ---

Index: ParserUtils.java
===================================================================
RCS file: /cvsroot/htmlparser/htmlparser/src/org/htmlparser/util/ParserUtils.java,v
retrieving revision 1.41
retrieving revision 1.42
diff -C2 -d -r1.41 -r1.42
*** ParserUtils.java	24 May 2004 16:18:35 -0000	1.41
--- ParserUtils.java	2 Jul 2004 00:49:32 -0000	1.42
***************
*** 34,37 ****
--- 34,38 ----
  import org.htmlparser.NodeFilter;
  import org.htmlparser.Parser;
+ import org.htmlparser.Tag;
  import org.htmlparser.filters.NodeClassFilter;
  import org.htmlparser.filters.TagNameFilter;
***************
*** 40,44 ****
  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;
--- 41,44 ----
***************
*** 722,729 ****
  
                  // positions of begin and end tags
!                 int beginTagBegin = beginTag.getTagBegin();
!                 int endTagBegin = beginTag.getTagEnd();
!                 int beginTagEnd = endTag.getTagBegin();
!                 int endTagEnd = endTag.getTagEnd();
  
                  if (insideTag)
--- 722,729 ----
  
                  // positions of begin and end tags
!                 int beginTagBegin = beginTag.getStartPosition ();
!                 int endTagBegin = beginTag.getEndPosition ();
!                 int beginTagEnd = endTag.getStartPosition ();
!                 int endTagEnd = endTag.getEndPosition ();
  
                  if (insideTag)
***************
*** 847,854 ****
  
              // positions of begin and end tags
!             int beginTagBegin = beginTag.getTagBegin();
!             int endTagBegin = beginTag.getTagEnd();
!             int beginTagEnd = endTag.getTagBegin();
!             int endTagEnd = endTag.getTagEnd();
  
              if (insideTag)
--- 847,854 ----
  
              // positions of begin and end tags
!             int beginTagBegin = beginTag.getStartPosition ();
!             int endTagBegin = beginTag.getEndPosition ();
!             int beginTagEnd = endTag.getStartPosition ();
!             int endTagEnd = endTag.getEndPosition ();
  
              if (insideTag)
***************
*** 951,958 ****
  
                  // positions of begin and end tags
!                 int beginTagBegin = beginTag.getTagBegin();
!                 int endTagBegin = beginTag.getTagEnd();
!                 int beginTagEnd = endTag.getTagBegin();
!                 int endTagEnd = endTag.getTagEnd();
  
                  if (insideTag)
--- 951,959 ----
  
                  // positions of begin and end tags
!                 int beginTagBegin = beginTag.getStartPosition ();
!                 int endTagBegin = beginTag.getEndPosition ();
!                 int beginTagEnd = endTag.getStartPosition ();
!                 int endTagEnd = endTag.getEndPosition ();
! 
  
                  if (insideTag)
***************
*** 1050,1057 ****
  
              // positions of begin and end tags
!             int beginTagBegin = beginTag.getTagBegin();
!             int endTagBegin = beginTag.getTagEnd();
!             int beginTagEnd = endTag.getTagBegin();
!             int endTagEnd = endTag.getTagEnd();
  
              if (insideTag)
--- 1051,1058 ----
  
              // positions of begin and end tags
!             int beginTagBegin = beginTag.getStartPosition ();
!             int endTagBegin = beginTag.getEndPosition ();
!             int beginTagEnd = endTag.getStartPosition ();
!             int endTagEnd = endTag.getEndPosition ();
  
              if (insideTag)
***************
*** 1125,1136 ****
                  CompositeTag jStartTag = (CompositeTag)links.elementAt(j);
                  Tag jEndTag = (Tag)jStartTag.getEndTag();
!                 int jStartTagBegin = jStartTag.getTagBegin();
!                 int jEndTagEnd = jEndTag.getTagEnd();
                  for (int k=0; k<links.size(); k++)
                  {
                      CompositeTag kStartTag = (CompositeTag)links.elementAt(k);
                      Tag kEndTag = (Tag)kStartTag.getEndTag();
!                     int kStartTagBegin = kStartTag.getTagBegin();
!                     int kEndTagEnd = kEndTag.getTagEnd();
                      if ((k!=j) && (kStartTagBegin>jStartTagBegin) && (kEndTagEnd<jEndTagEnd))
                      {
--- 1126,1137 ----
                  CompositeTag jStartTag = (CompositeTag)links.elementAt(j);
                  Tag jEndTag = (Tag)jStartTag.getEndTag();
!                 int jStartTagBegin = jStartTag.getStartPosition ();
!                 int jEndTagEnd = jEndTag.getEndPosition ();
                  for (int k=0; k<links.size(); k++)
                  {
                      CompositeTag kStartTag = (CompositeTag)links.elementAt(k);
                      Tag kEndTag = (Tag)kStartTag.getEndTag();
!                     int kStartTagBegin = kStartTag.getStartPosition ();
!                     int kEndTagEnd = kEndTag.getEndPosition ();
                      if ((k!=j) && (kStartTagBegin>jStartTagBegin) && (kEndTagEnd<jEndTagEnd))
                      {
***************
*** 1165,1176 ****
                  CompositeTag jStartTag = (CompositeTag)links.elementAt(j);
                  Tag jEndTag = (Tag)jStartTag.getEndTag();
!                 int jStartTagBegin = jStartTag.getTagBegin();
!                 int jEndTagEnd = jEndTag.getTagEnd();
                  for (int k=0; k<links.size(); k++)
                  {
                      CompositeTag kStartTag = (CompositeTag)links.elementAt(k);
                      Tag kEndTag = (Tag)kStartTag.getEndTag();
!                     int kStartTagBegin = kStartTag.getTagBegin();
!                     int kEndTagEnd = kEndTag.getTagEnd();
                      if ((k!=j) && (kStartTagBegin>jStartTagBegin) && (kEndTagEnd<jEndTagEnd))
                      {
--- 1166,1177 ----
                  CompositeTag jStartTag = (CompositeTag)links.elementAt(j);
                  Tag jEndTag = (Tag)jStartTag.getEndTag();
!                 int jStartTagBegin = jStartTag.getStartPosition ();
!                 int jEndTagEnd = jEndTag.getEndPosition ();
                  for (int k=0; k<links.size(); k++)
                  {
                      CompositeTag kStartTag = (CompositeTag)links.elementAt(k);
                      Tag kEndTag = (Tag)kStartTag.getEndTag();
!                     int kStartTagBegin = kStartTag.getStartPosition ();
!                     int kEndTagEnd = kEndTag.getEndPosition ();
                      if ((k!=j) && (kStartTagBegin>jStartTagBegin) && (kEndTagEnd<jEndTagEnd))
                      {

Index: IteratorImpl.java
===================================================================
RCS file: /cvsroot/htmlparser/htmlparser/src/org/htmlparser/util/IteratorImpl.java,v
retrieving revision 1.40
retrieving revision 1.41
diff -C2 -d -r1.40 -r1.41
*** IteratorImpl.java	10 Jan 2004 15:23:33 -0000	1.40
--- IteratorImpl.java	2 Jul 2004 00:49:32 -0000	1.41
***************
*** 28,35 ****
  
  import org.htmlparser.Node;
  import org.htmlparser.lexer.Cursor;
  import org.htmlparser.lexer.Lexer;
  import org.htmlparser.scanners.Scanner;
- import org.htmlparser.tags.Tag;
  import org.htmlparser.util.NodeIterator;
  
--- 28,35 ----
  
  import org.htmlparser.Node;
+ import org.htmlparser.Tag;
  import org.htmlparser.lexer.Cursor;
  import org.htmlparser.lexer.Lexer;
  import org.htmlparser.scanners.Scanner;
  import org.htmlparser.util.NodeIterator;