[Htmlparser-cvs] htmlparser/src/org/htmlparser/parserHelper CompositeTagScannerHelper.java,1.51,1.52

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

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

Modified Files:
	CompositeTagScannerHelper.java 
Log Message:
Removed lexer level AbstractNode.
Removed data package from parser level tags.
Separated tag creation from recursion in NodeFactory interface.



Index: CompositeTagScannerHelper.java
===================================================================
RCS file: /cvsroot/htmlparser/htmlparser/src/org/htmlparser/parserHelper/CompositeTagScannerHelper.java,v
retrieving revision 1.51
retrieving revision 1.52
diff -C2 -d -r1.51 -r1.52
*** CompositeTagScannerHelper.java	18 Oct 2003 20:50:37 -0000	1.51
--- CompositeTagScannerHelper.java	20 Oct 2003 01:28:02 -0000	1.52
***************
*** 38,43 ****
  import org.htmlparser.tags.CompositeTag;
  import org.htmlparser.tags.Tag;
- import org.htmlparser.tags.data.CompositeTagData;
- import org.htmlparser.tags.data.TagData;
  import org.htmlparser.util.NodeList;
  import org.htmlparser.util.ParserException;
--- 38,41 ----
***************
*** 123,133 ****
          Vector attributes = new Vector ();
          attributes.addElement (new Attribute (endTagName, (String)null));
!         TagData data = new TagData(
!                 endTagName,
!                 position,
!                 attributes,
!                 mLexer.getPage ().getUrl (),
!                 false);
!         endTag = new Tag (data);
      }
  
--- 121,125 ----
          Vector attributes = new Vector ();
          attributes.addElement (new Attribute (endTagName, (String)null));
!         endTag = new Tag (mLexer.getPage (), position, position, attributes);
      }
  
***************
*** 151,174 ****
      private Tag createTag() throws ParserException
      {
!         TagData data;
!         
!         data =  new TagData(
!             mLexer.getPage (),
!             mTag.elementBegin(),
!             endTag.elementEnd(),
!             mTag.getAttributesEx (),
!             mLexer.getPage ().getUrl (),
!             mTag.isEmptyXmlTag ());
  
!         CompositeTag newTag = (CompositeTag)scanner.createTag (data,
!             new CompositeTagData(
!                 mTag,endTag,nodeList
!             )
!         );
!         for (int i=0;i<newTag.getChildCount();i++) {
!             Node child = newTag.childAt(i);
!             child.setParent(newTag);
          }
!         return newTag;
      }
  
--- 143,156 ----
      private Tag createTag() throws ParserException
      {
!         CompositeTag ret;
  
!         ret = (CompositeTag)scanner.createTag (mLexer.getPage (), mTag.elementBegin(), endTag.elementEnd(), mTag.getAttributesEx (), mTag, endTag, nodeList);
!         for (int i=0;i<ret.getChildCount();i++)
!         {
!             Node child = ret.childAt(i);
!             child.setParent(ret);
          }
! 
!         return (ret);
      }