[Htmlparser-cvs] htmlparser/src/org/htmlparser/tags CompositeTag.java,1.57,1.58 FrameSetTag.java,1.26,1.27 SelectTag.java,1.28,1.29

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

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

Modified Files:
	CompositeTag.java FrameSetTag.java SelectTag.java 
Log Message:
Fix all testcases generating exceptions. Still 160 failures.



Index: CompositeTag.java
===================================================================
RCS file: /cvsroot/htmlparser/htmlparser/src/org/htmlparser/tags/CompositeTag.java,v
retrieving revision 1.57
retrieving revision 1.58
diff -C2 -d -r1.57 -r1.58
*** CompositeTag.java	28 Sep 2003 19:30:04 -0000	1.57
--- CompositeTag.java	3 Oct 2003 02:15:19 -0000	1.58
***************
*** 119,137 ****
      }
  
!     protected void putChildrenInto(StringBuffer sb) {
!         Node node,prevNode=startTag;
!         for (SimpleNodeIterator e=children();e.hasMoreNodes();) {
!             node = e.nextNode();
!             if (prevNode!=null) {
!                 if (prevNode.elementEnd()>node.elementBegin()) {
!                     // Its a new line
!                     sb.append(Parser.getLineSeparator());
!                 }
!             }
!             sb.append(node.toHtml());
!             prevNode=node;
!         }
!         if (prevNode.elementEnd()>endTag.elementBegin()) {
!             sb.append(Parser.getLineSeparator());
          }
      }
--- 119,129 ----
      }
  
!     protected void putChildrenInto(StringBuffer sb)
!     {
!         Node node;
!         for (SimpleNodeIterator e = children (); e.hasMoreNodes ();)
!         {
!             node = e.nextNode ();
!             sb.append (node.toHtml ());
          }
      }

Index: FrameSetTag.java
===================================================================
RCS file: /cvsroot/htmlparser/htmlparser/src/org/htmlparser/tags/FrameSetTag.java,v
retrieving revision 1.26
retrieving revision 1.27
diff -C2 -d -r1.26 -r1.27
*** FrameSetTag.java	22 Sep 2003 02:40:01 -0000	1.26
--- FrameSetTag.java	3 Oct 2003 02:15:20 -0000	1.27
***************
*** 29,32 ****
--- 29,33 ----
  package org.htmlparser.tags;
  
+ import org.htmlparser.Node;
  import org.htmlparser.tags.data.CompositeTagData;
  import org.htmlparser.tags.data.TagData;
***************
*** 78,85 ****
      public FrameTag getFrame(String frameName) {
          boolean found = false;
          FrameTag frameTag=null;
!         for (SimpleNodeIterator e=frames.elements();e.hasMoreNodes() && !found;) {
!             frameTag = (FrameTag)e.nextNode();
!             if (frameTag.getFrameName().toUpperCase().equals(frameName.toUpperCase())) found = true;
          }
          if (found)
--- 79,93 ----
      public FrameTag getFrame(String frameName) {
          boolean found = false;
+         Node node;
          FrameTag frameTag=null;
!         for (SimpleNodeIterator e=frames.elements();e.hasMoreNodes() && !found;)
!         {
!             node = e.nextNode();
!             if (node instanceof FrameTag)
!             {
!                 frameTag = (FrameTag)node;
!                 if (frameTag.getFrameName().toUpperCase().equals(frameName.toUpperCase()))
!                     found = true;
!             }
          }
          if (found)

Index: SelectTag.java
===================================================================
RCS file: /cvsroot/htmlparser/htmlparser/src/org/htmlparser/tags/SelectTag.java,v
retrieving revision 1.28
retrieving revision 1.29
diff -C2 -d -r1.28 -r1.29
*** SelectTag.java	22 Sep 2003 02:40:01 -0000	1.28
--- SelectTag.java	3 Oct 2003 02:15:20 -0000	1.29
***************
*** 29,32 ****
--- 29,33 ----
  package org.htmlparser.tags;
  
+ import org.htmlparser.Node;
  
  import org.htmlparser.tags.data.CompositeTagData;
***************
*** 64,67 ****
--- 65,69 ----
          StringBuffer lString;
          NodeList children;
+         Node node;
  
          lString = new StringBuffer(ParserUtils.toString(this));
***************
*** 69,74 ****
          for(int i=0;i<children.size(); i++)
          {
!             OptionTag optionTag = (OptionTag)children.elementAt(i);
!             lString.append(optionTag.toString()).append("\n");
          }
  
--- 71,80 ----
          for(int i=0;i<children.size(); i++)
          {
!             node = children.elementAt(i);
!             if (node instanceof OptionTag)
!             {
!                 OptionTag optionTag = (OptionTag)node;
!                 lString.append(optionTag.toString()).append("\n");
!             }
          }