[Htmlparser-cvs] htmlparser/src/org/htmlparser/nodeDecorators AbstractNodeDecorator.java,1.19,1.20 DecodingNode.java,1.15,1.16 EscapeCharacterRemovingNode.java,1.13,1.14 NonBreakingSpaceConvertingNode.java,1.13,1.14

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

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

Modified Files:
	AbstractNodeDecorator.java DecodingNode.java 
	EscapeCharacterRemovingNode.java 
	NonBreakingSpaceConvertingNode.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: NonBreakingSpaceConvertingNode.java
===================================================================
RCS file: /cvsroot/htmlparser/htmlparser/src/org/htmlparser/nodeDecorators/NonBreakingSpaceConvertingNode.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** NonBreakingSpaceConvertingNode.java	2 Jan 2004 16:24:54 -0000	1.13
--- NonBreakingSpaceConvertingNode.java	24 May 2004 16:18:18 -0000	1.14
***************
*** 27,34 ****
  package org.htmlparser.nodeDecorators;
  
! import org.htmlparser.Node;
  
  public class NonBreakingSpaceConvertingNode extends AbstractNodeDecorator {
!     public NonBreakingSpaceConvertingNode(Node newDelegate) {
          super(newDelegate);
      }
--- 27,34 ----
  package org.htmlparser.nodeDecorators;
  
! import org.htmlparser.Text;
  
  public class NonBreakingSpaceConvertingNode extends AbstractNodeDecorator {
!     public NonBreakingSpaceConvertingNode(Text newDelegate) {
          super(newDelegate);
      }

Index: DecodingNode.java
===================================================================
RCS file: /cvsroot/htmlparser/htmlparser/src/org/htmlparser/nodeDecorators/DecodingNode.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** DecodingNode.java	2 Jan 2004 16:24:54 -0000	1.15
--- DecodingNode.java	24 May 2004 16:18:18 -0000	1.16
***************
*** 27,35 ****
  package org.htmlparser.nodeDecorators;
  
! import org.htmlparser.Node;
  import org.htmlparser.util.Translate;
  
  public class DecodingNode extends AbstractNodeDecorator {
!     public DecodingNode(Node node) {
          super(node);
      }
--- 27,35 ----
  package org.htmlparser.nodeDecorators;
  
! import org.htmlparser.Text;
  import org.htmlparser.util.Translate;
  
  public class DecodingNode extends AbstractNodeDecorator {
!     public DecodingNode(Text node) {
          super(node);
      }

Index: AbstractNodeDecorator.java
===================================================================
RCS file: /cvsroot/htmlparser/htmlparser/src/org/htmlparser/nodeDecorators/AbstractNodeDecorator.java,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** AbstractNodeDecorator.java	24 May 2004 00:38:17 -0000	1.19
--- AbstractNodeDecorator.java	24 May 2004 16:18:18 -0000	1.20
***************
*** 28,31 ****
--- 28,32 ----
  
  import org.htmlparser.Node;
+ import org.htmlparser.Text;
  import org.htmlparser.NodeFilter;
  import org.htmlparser.util.NodeList;
***************
*** 33,40 ****
  import org.htmlparser.visitors.NodeVisitor;
  
! public abstract class AbstractNodeDecorator implements Node {
!     protected Node delegate;
  
!     protected AbstractNodeDecorator(Node delegate) {
          this.delegate = delegate;
      }
--- 34,43 ----
  import org.htmlparser.visitors.NodeVisitor;
  
! public abstract class AbstractNodeDecorator implements Text
! {
!     protected Text delegate;
  
!     protected AbstractNodeDecorator(Text delegate)
!     {
          this.delegate = delegate;
      }

Index: EscapeCharacterRemovingNode.java
===================================================================
RCS file: /cvsroot/htmlparser/htmlparser/src/org/htmlparser/nodeDecorators/EscapeCharacterRemovingNode.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** EscapeCharacterRemovingNode.java	2 Jan 2004 16:24:54 -0000	1.13
--- EscapeCharacterRemovingNode.java	24 May 2004 16:18:18 -0000	1.14
***************
*** 27,35 ****
  package org.htmlparser.nodeDecorators;
  
! import org.htmlparser.Node;
  import org.htmlparser.util.ParserUtils;
  
  public class EscapeCharacterRemovingNode extends AbstractNodeDecorator {
!     public EscapeCharacterRemovingNode(Node newDelegate) {
          super(newDelegate);
      }
--- 27,35 ----
  package org.htmlparser.nodeDecorators;
  
! import org.htmlparser.Text;
  import org.htmlparser.util.ParserUtils;
  
  public class EscapeCharacterRemovingNode extends AbstractNodeDecorator {
!     public EscapeCharacterRemovingNode(Text newDelegate) {
          super(newDelegate);
      }