diff options
author | Andrew John Hughes <gnu_andrew@member.fsf.org> | 2008-06-22 14:56:25 +0000 |
---|---|---|
committer | Andrew John Hughes <gnu_andrew@member.fsf.org> | 2008-06-22 14:56:25 +0000 |
commit | ece8fc725851e15b0383e0567126c2d8aa7d50c2 (patch) | |
tree | 778f5f73d3a82995f294ff6afc78a21534ae5ed5 /gnu | |
parent | 0f94535f1ca722f2f5fc2090d2dab2a666bff59c (diff) | |
download | classpath-ece8fc725851e15b0383e0567126c2d8aa7d50c2.tar.gz |
2008-06-22 Andrew John Hughes <gnu_andrew@member.fsf.org>
PR classpath/36220:
* gnu/xml/transform/ParameterNode.java:
(clone()): Only clone select if not null.
(toString()): Always include value of select.
* gnu/xml/transform/Stylesheet.java:
(toString()): Implemented.
* gnu/xml/transform/Template.java:
(toString()): Add value of node.
* gnu/xml/transform/TemplatesImpl.java:
(toString()): Implemented.
Diffstat (limited to 'gnu')
-rw-r--r-- | gnu/xml/transform/ParameterNode.java | 9 | ||||
-rw-r--r-- | gnu/xml/transform/Stylesheet.java | 11 | ||||
-rw-r--r-- | gnu/xml/transform/Template.java | 2 | ||||
-rw-r--r-- | gnu/xml/transform/TemplatesImpl.java | 17 |
4 files changed, 32 insertions, 7 deletions
diff --git a/gnu/xml/transform/ParameterNode.java b/gnu/xml/transform/ParameterNode.java index 5feaf3225..dd03fa4cd 100644 --- a/gnu/xml/transform/ParameterNode.java +++ b/gnu/xml/transform/ParameterNode.java @@ -72,7 +72,7 @@ final class ParameterNode TemplateNode clone(Stylesheet stylesheet) { TemplateNode ret = new ParameterNode(name, - select.clone(stylesheet), + select == null ? null : select.clone(stylesheet), type); if (children != null) ret.children = children.clone(stylesheet); @@ -166,11 +166,8 @@ final class ParameterNode buf.append('['); buf.append("name="); buf.append(name); - if (select != null) - { - buf.append(",select="); - buf.append(select); - } + buf.append(",select="); + buf.append(select); buf.append(']'); return buf.toString(); } diff --git a/gnu/xml/transform/Stylesheet.java b/gnu/xml/transform/Stylesheet.java index 41562c3c6..f75956269 100644 --- a/gnu/xml/transform/Stylesheet.java +++ b/gnu/xml/transform/Stylesheet.java @@ -37,6 +37,8 @@ exception statement from your version. */ package gnu.xml.transform; +import gnu.java.lang.CPStringBuilder; + import java.text.DecimalFormat; import java.text.DecimalFormatSymbols; import java.util.ArrayList; @@ -1768,5 +1770,14 @@ class Stylesheet dst.setUserData(key, data, this); } + public String toString() + { + CPStringBuilder b = new CPStringBuilder(getClass().getName()); + b.append("[templates="); + b.append(templates); + b.append("]"); + return b.toString(); + } + } diff --git a/gnu/xml/transform/Template.java b/gnu/xml/transform/Template.java index c45cc8849..7ddef0ae5 100644 --- a/gnu/xml/transform/Template.java +++ b/gnu/xml/transform/Template.java @@ -245,6 +245,8 @@ class Template buf.append(",mode="); buf.append(mode); } + buf.append(",node="); + buf.append(node); buf.append(']'); return buf.toString(); diff --git a/gnu/xml/transform/TemplatesImpl.java b/gnu/xml/transform/TemplatesImpl.java index 527bd979d..e5395f6fb 100644 --- a/gnu/xml/transform/TemplatesImpl.java +++ b/gnu/xml/transform/TemplatesImpl.java @@ -37,6 +37,8 @@ exception statement from your version. */ package gnu.xml.transform; +import gnu.java.lang.CPStringBuilder; + import java.util.Properties; import javax.xml.transform.Templates; import javax.xml.transform.Transformer; @@ -76,5 +78,18 @@ class TemplatesImpl { return (Properties) outputProperties.clone(); } - + + public String toString() + { + CPStringBuilder b = new CPStringBuilder(getClass().getName()); + b.append("[factory="); + b.append(factory); + b.append(",stylesheet="); + b.append(stylesheet); + b.append(",outputProperties="); + b.append(outputProperties); + b.append("]"); + return b.toString(); + } + } |