[Htmlparser-cvs] htmlparser/src/org/htmlparser/nodeDecorators AbstractNodeDecorator.java,NONE,1.1 EscapeCharacterRemovingNode.java,1.1,1.2 NonBreakingSpaceConvertingNode.java,1.1,1.2 DecodingNode.java,1.1,1.2

[<jke...@us...>]

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

Modified Files:
	EscapeCharacterRemovingNode.java 
	NonBreakingSpaceConvertingNode.java DecodingNode.java 
Added Files:
	AbstractNodeDecorator.java 
Log Message:
made an abstract class for the StringNode decorators


--- NEW FILE: AbstractNodeDecorator.java ---
package org.htmlparser.nodeDecorators;

import org.htmlparser.Node;
import org.htmlparser.tags.CompositeTag;
import org.htmlparser.util.NodeList;
import org.htmlparser.visitors.NodeVisitor;


public abstract class AbstractNodeDecorator implements Node {
	protected Node delegate;
	
	protected AbstractNodeDecorator(Node delegate) {
		this.delegate = delegate;
	}
	

	public void accept(NodeVisitor visitor) {
		delegate.accept(visitor);
	}

	public void collectInto(NodeList collectionList, Class nodeType) {
		delegate.collectInto(collectionList, nodeType);
	}

	public void collectInto(NodeList collectionList, String filter) {
		delegate.collectInto(collectionList, filter);
	}

	public int elementBegin() {
		return delegate.elementBegin();
	}

	public int elementEnd() {
		return delegate.elementEnd();
	}

	public boolean equals(Object arg0) {
		return delegate.equals(arg0);
	}

	public CompositeTag getParent() {
		return delegate.getParent();
	}

	public String getText() {
		return delegate.getText();
	}

	public void setParent(CompositeTag tag) {
		delegate.setParent(tag);
	}

	public void setText(String text) {
		delegate.setText(text);
	}

	public String toHtml() {
		return delegate.toHtml();
	}

	public String toPlainTextString() {
		return delegate.toPlainTextString();
	}

	public String toString() {
		return delegate.toString();
	}

}

Index: EscapeCharacterRemovingNode.java
===================================================================
RCS file: /cvsroot/htmlparser/htmlparser/src/org/htmlparser/nodeDecorators/EscapeCharacterRemovingNode.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** EscapeCharacterRemovingNode.java	25 Jun 2003 03:56:20 -0000	1.1
--- EscapeCharacterRemovingNode.java	26 Jun 2003 21:55:32 -0000	1.2
***************
*** 2,59 ****
  
  import org.htmlparser.Node;
- import org.htmlparser.tags.CompositeTag;
- import org.htmlparser.util.NodeList;
  import org.htmlparser.util.ParserUtils;
- import org.htmlparser.visitors.NodeVisitor;
- 
- public class EscapeCharacterRemovingNode implements Node {
- 	private Node delegate; 	
  
  	public EscapeCharacterRemovingNode(Node newDelegate) {
! 		this.delegate = newDelegate;
! 	}
! 
! 	public void accept(NodeVisitor visitor) {
! 		delegate.accept(visitor);
! 	}
! 
! 	public void collectInto(NodeList collectionList, Class nodeType) {
! 		delegate.collectInto(collectionList, nodeType);
! 	}
! 
! 	public void collectInto(NodeList collectionList, String filter) {
! 		delegate.collectInto(collectionList, filter);
! 	}
! 
! 	public int elementBegin() {
! 		return delegate.elementBegin();
! 	}
! 
! 	public int elementEnd() {
! 		return delegate.elementEnd();
! 	}
! 
! 	public boolean equals(Object arg0) {
! 		return delegate.equals(arg0);
! 	}
! 
! 	public CompositeTag getParent() {
! 		return delegate.getParent();
! 	}
! 
! 	public String getText() {
! 		return delegate.getText();
! 	}
! 
! 	public void setParent(CompositeTag tag) {
! 		delegate.setParent(tag);
! 	}
! 
! 	public void setText(String text) {
! 		delegate.setText(text);
! 	}
! 
! 	public String toHtml() {
! 		return delegate.toHtml();
  	}
  
--- 2,10 ----
  
  import org.htmlparser.Node;
  import org.htmlparser.util.ParserUtils;
  
+ public class EscapeCharacterRemovingNode extends AbstractNodeDecorator {
  	public EscapeCharacterRemovingNode(Node newDelegate) {
! 		super(newDelegate);
  	}
  
***************
*** 61,68 ****
  		return ParserUtils.removeEscapeCharacters(delegate.toPlainTextString());
  	}
- 
- 	public String toString() {
- 		return delegate.toString();
- 	}
- 
  }
--- 12,14 ----

Index: NonBreakingSpaceConvertingNode.java
===================================================================
RCS file: /cvsroot/htmlparser/htmlparser/src/org/htmlparser/nodeDecorators/NonBreakingSpaceConvertingNode.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** NonBreakingSpaceConvertingNode.java	25 Jun 2003 05:03:08 -0000	1.1
--- NonBreakingSpaceConvertingNode.java	26 Jun 2003 21:55:32 -0000	1.2
***************
*** 2,58 ****
  
  import org.htmlparser.Node;
- import org.htmlparser.tags.CompositeTag;
- import org.htmlparser.util.NodeList;
- import org.htmlparser.visitors.NodeVisitor;
- 
- public class NonBreakingSpaceConvertingNode implements Node {
- 	private Node delegate; 	
  
  	public NonBreakingSpaceConvertingNode(Node newDelegate) {
! 		this.delegate = newDelegate;
! 	}
! 
! 	public void accept(NodeVisitor visitor) {
! 		delegate.accept(visitor);
! 	}
! 
! 	public void collectInto(NodeList collectionList, Class nodeType) {
! 		delegate.collectInto(collectionList, nodeType);
! 	}
! 
! 	public void collectInto(NodeList collectionList, String filter) {
! 		delegate.collectInto(collectionList, filter);
! 	}
! 
! 	public int elementBegin() {
! 		return delegate.elementBegin();
! 	}
! 
! 	public int elementEnd() {
! 		return delegate.elementEnd();
! 	}
! 
! 	public boolean equals(Object arg0) {
! 		return delegate.equals(arg0);
! 	}
! 
! 	public CompositeTag getParent() {
! 		return delegate.getParent();
! 	}
! 
! 	public String getText() {
! 		return delegate.getText();
! 	}
! 
! 	public void setParent(CompositeTag tag) {
! 		delegate.setParent(tag);
! 	}
! 
! 	public void setText(String text) {
! 		delegate.setText(text);
! 	}
! 
! 	public String toHtml() {
! 		return delegate.toHtml();
  	}
  
--- 2,9 ----
  
  import org.htmlparser.Node;
  
+ public class NonBreakingSpaceConvertingNode extends AbstractNodeDecorator {
  	public NonBreakingSpaceConvertingNode(Node newDelegate) {
! 		super(newDelegate);
  	}
  
***************
*** 61,68 ****
  		return result.replace ('\u00a0',' ');
  	}
- 
- 	public String toString() {
- 		return delegate.toString();
- 	}
- 
  }
--- 12,14 ----

Index: DecodingNode.java
===================================================================
RCS file: /cvsroot/htmlparser/htmlparser/src/org/htmlparser/nodeDecorators/DecodingNode.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** DecodingNode.java	25 Jun 2003 03:56:20 -0000	1.1
--- DecodingNode.java	26 Jun 2003 21:55:32 -0000	1.2
***************
*** 32,90 ****
  
  import org.htmlparser.Node;
- import org.htmlparser.tags.CompositeTag;
- import org.htmlparser.util.NodeList;
  import org.htmlparser.util.Translate;
- import org.htmlparser.visitors.NodeVisitor;
- 
- 
- public class DecodingNode implements Node {
- 	private Node delegate; 
  
  	public DecodingNode(Node node) {
! 		delegate = node;
  	}
  
  	public String toPlainTextString() {
  		return Translate.decode(delegate.toPlainTextString());
- 	}
- 	
- 	public void accept(NodeVisitor visitor) {
- 		delegate.accept(visitor);
- 	}
- 
- 	public void collectInto(NodeList collectionList, Class nodeType) {
- 		delegate.collectInto(collectionList, nodeType);
- 	}
- 
- 	public void collectInto(NodeList collectionList, String filter) {
- 		delegate.collectInto(collectionList, filter);
- 	}
- 
- 	public int elementBegin() {
- 		return delegate.elementBegin();
- 	}
- 
- 	public int elementEnd() {
- 		return delegate.elementEnd();
- 	}
- 
- 	public CompositeTag getParent() {
- 		return delegate.getParent();
- 	}
- 
- 	public String getText() {
- 		return delegate.getText();
- 	}
- 
- 	public void setParent(CompositeTag tag) {
- 		delegate.setParent(tag);
- 	}
- 
- 	public void setText(String text) {
- 		delegate.setText(text);
- 	}
- 
- 	public String toHtml() {
- 		return delegate.toHtml();
  	}
  }
--- 32,44 ----
  
  import org.htmlparser.Node;
  import org.htmlparser.util.Translate;
  
+ public class DecodingNode extends AbstractNodeDecorator {
  	public DecodingNode(Node node) {
! 		super(node);
  	}
  
  	public String toPlainTextString() {
  		return Translate.decode(delegate.toPlainTextString());
  	}
  }