[Htmlparser-cvs] htmlparser/src/org/htmlparser/scanners CompositeTagScanner.java,1.85,1.86 ScriptScanner.java,1.56,1.57 StyleScanner.java,1.33,1.34

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

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

Modified Files:
	CompositeTagScanner.java ScriptScanner.java StyleScanner.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: StyleScanner.java
===================================================================
RCS file: /cvsroot/htmlparser/htmlparser/src/org/htmlparser/scanners/StyleScanner.java,v
retrieving revision 1.33
retrieving revision 1.34
diff -C2 -d -r1.33 -r1.34
*** StyleScanner.java	29 Feb 2004 14:16:27 -0000	1.33
--- StyleScanner.java	24 May 2004 16:18:30 -0000	1.34
***************
*** 30,39 ****
  
  import org.htmlparser.Node;
  import org.htmlparser.PrototypicalNodeFactory;
! import org.htmlparser.RemarkNode;
! import org.htmlparser.StringNode;
  import org.htmlparser.lexer.Cursor;
  import org.htmlparser.lexer.Lexer;
- import org.htmlparser.lexer.nodes.NodeFactory;
  import org.htmlparser.tags.CompositeTag;
  import org.htmlparser.tags.Tag;
--- 30,39 ----
  
  import org.htmlparser.Node;
+ import org.htmlparser.NodeFactory;
  import org.htmlparser.PrototypicalNodeFactory;
! import org.htmlparser.Remark;
! import org.htmlparser.Text;
  import org.htmlparser.lexer.Cursor;
  import org.htmlparser.lexer.Lexer;
  import org.htmlparser.tags.CompositeTag;
  import org.htmlparser.tags.Tag;
***************
*** 70,74 ****
          boolean done;
          int position;
!         StringNode last;
          Tag end;
          NodeFactory factory;
--- 70,74 ----
          boolean done;
          int position;
!         Text last;
          Tag end;
          NodeFactory factory;
***************
*** 108,115 ****
                                  last.setEndPosition (node.elementEnd ());
                              else
!                                 // TODO: need to remove this cast
!                                 last = (StringNode)factory.createStringNode (lexer.getPage (), node.elementBegin (), node.elementEnd ());
                          }
!                     else if (node instanceof RemarkNode)
                      {
                          if (null != last)
--- 108,114 ----
                                  last.setEndPosition (node.elementEnd ());
                              else
!                                 last = factory.createStringNode (lexer.getPage (), node.elementBegin (), node.elementEnd ());
                          }
!                     else if (node instanceof Remark)
                      {
                          if (null != last)
***************
*** 117,132 ****
                          else
                          {
!                             // TODO: need to remove this cast
!                             // last = (StringNode)factory.createStringNode (lexer, node.elementBegin (), node.elementEnd ());
!                             last = (StringNode)factory.createStringNode (lexer.getPage (), node.elementBegin (), node.elementEnd ());
                          }
                      }
!                     else // StringNode
                      {
                          if (null != last)
                              last.setEndPosition (node.getEndPosition ());
                          else
!                             // TODO: need to remove this cast
!                             last = (StringNode)node;
                      }
  
--- 116,129 ----
                          else
                          {
!                             // last = factory.createStringNode (lexer, node.elementBegin (), node.elementEnd ());
!                             last = factory.createStringNode (lexer.getPage (), node.elementBegin (), node.elementEnd ());
                          }
                      }
!                     else // Text
                      {
                          if (null != last)
                              last.setEndPosition (node.getEndPosition ());
                          else
!                             last = (Text)node;
                      }
  
***************
*** 136,141 ****
              // build new string tag if required
              if (null == last)
!                 // TODO: need to remove this cast
!                 last = (StringNode)factory.createStringNode (lexer.getPage (), position, position);
              // build new end tag if required
              if (null == end)
--- 133,137 ----
              // build new string tag if required
              if (null == last)
!                 last = factory.createStringNode (lexer.getPage (), position, position);
              // build new end tag if required
              if (null == end)

Index: CompositeTagScanner.java
===================================================================
RCS file: /cvsroot/htmlparser/htmlparser/src/org/htmlparser/scanners/CompositeTagScanner.java,v
retrieving revision 1.85
retrieving revision 1.86
diff -C2 -d -r1.85 -r1.86
*** CompositeTagScanner.java	14 Jan 2004 02:53:46 -0000	1.85
--- CompositeTagScanner.java	24 May 2004 16:18:20 -0000	1.86
***************
*** 29,36 ****
  import java.util.Vector;
  
  import org.htmlparser.Node;
  import org.htmlparser.lexer.Lexer;
  import org.htmlparser.lexer.Page;
- import org.htmlparser.lexer.nodes.Attribute;
  import org.htmlparser.scanners.Scanner;
  import org.htmlparser.tags.CompositeTag;
--- 29,36 ----
  import java.util.Vector;
  
+ import org.htmlparser.Attribute;
  import org.htmlparser.Node;
  import org.htmlparser.lexer.Lexer;
  import org.htmlparser.lexer.Page;
  import org.htmlparser.scanners.Scanner;
  import org.htmlparser.tags.CompositeTag;

Index: ScriptScanner.java
===================================================================
RCS file: /cvsroot/htmlparser/htmlparser/src/org/htmlparser/scanners/ScriptScanner.java,v
retrieving revision 1.56
retrieving revision 1.57
diff -C2 -d -r1.56 -r1.57
*** ScriptScanner.java	28 Feb 2004 15:52:43 -0000	1.56
--- ScriptScanner.java	24 May 2004 16:18:30 -0000	1.57
***************
*** 30,39 ****
  
  import org.htmlparser.Node;
  import org.htmlparser.PrototypicalNodeFactory;
! import org.htmlparser.RemarkNode;
! import org.htmlparser.StringNode;
  import org.htmlparser.lexer.Cursor;
  import org.htmlparser.lexer.Lexer;
- import org.htmlparser.lexer.nodes.NodeFactory;
  import org.htmlparser.scanners.ScriptDecoder;
  import org.htmlparser.tags.CompositeTag;
--- 30,39 ----
  
  import org.htmlparser.Node;
+ import org.htmlparser.NodeFactory;
  import org.htmlparser.PrototypicalNodeFactory;
! import org.htmlparser.Remark;
! import org.htmlparser.Text;
  import org.htmlparser.lexer.Cursor;
  import org.htmlparser.lexer.Lexer;
  import org.htmlparser.scanners.ScriptDecoder;
  import org.htmlparser.tags.CompositeTag;
***************
*** 75,79 ****
          boolean done;
          int position;
!         StringNode last;
          Tag end;
          NodeFactory factory;
--- 75,79 ----
          boolean done;
          int position;
!         Text last;
          Tag end;
          NodeFactory factory;
***************
*** 94,98 ****
                  String code = ScriptDecoder.Decode (lexer.getPage (), lexer.getCursor ());
                  ((ScriptTag)tag).setScriptCode (code);
!                 last = (StringNode)factory.createStringNode (lexer.getPage (), start, lexer.getPosition ());
              }
          }
--- 94,98 ----
                  String code = ScriptDecoder.Decode (lexer.getPage (), lexer.getCursor ());
                  ((ScriptTag)tag).setScriptCode (code);
!                 last = factory.createStringNode (lexer.getPage (), start, lexer.getPosition ());
              }
          }
***************
*** 126,133 ****
                                  last.setEndPosition (node.elementEnd ());
                              else
!                                 // TODO: need to remove this cast
!                                 last = (StringNode)factory.createStringNode (lexer.getPage (), node.elementBegin (), node.elementEnd ());
                          }
!                     else if (node instanceof RemarkNode)
                      {
                          if (null != last)
--- 126,132 ----
                                  last.setEndPosition (node.elementEnd ());
                              else
!                                 last = factory.createStringNode (lexer.getPage (), node.elementBegin (), node.elementEnd ());
                          }
!                     else if (node instanceof Remark)
                      {
                          if (null != last)
***************
*** 135,150 ****
                          else
                          {
!                             // TODO: need to remove this cast
!                             // last = (StringNode)factory.createStringNode (lexer, node.elementBegin (), node.elementEnd ());
!                             last = (StringNode)factory.createStringNode (lexer.getPage (), node.elementBegin (), node.elementEnd ());
                          }
                      }
!                     else // StringNode
                      {
                          if (null != last)
                              last.setEndPosition (node.getEndPosition ());
                          else
!                             // TODO: need to remove this cast
!                             last = (StringNode)node;
                      }
  
--- 134,147 ----
                          else
                          {
!                             // last = factory.createStringNode (lexer, node.elementBegin (), node.elementEnd ());
!                             last = factory.createStringNode (lexer.getPage (), node.elementBegin (), node.elementEnd ());
                          }
                      }
!                     else // Text
                      {
                          if (null != last)
                              last.setEndPosition (node.getEndPosition ());
                          else
!                             last = (Text)node;
                      }
  
***************
*** 154,159 ****
              // build new string tag if required
              if (null == last)
!                 // TODO: need to remove this cast
!                 last = (StringNode)factory.createStringNode (lexer.getPage (), position, position);
              // build new end tag if required
              if (null == end)
--- 151,155 ----
              // build new string tag if required
              if (null == last)
!                 last = factory.createStringNode (lexer.getPage (), position, position);
              // build new end tag if required
              if (null == end)