diff options
Diffstat (limited to 'libjava/classpath/gnu/xml/transform')
54 files changed, 265 insertions, 280 deletions
diff --git a/libjava/classpath/gnu/xml/transform/AbstractNumberNode.java b/libjava/classpath/gnu/xml/transform/AbstractNumberNode.java index fb953e4f66b..6e478bdc477 100644 --- a/libjava/classpath/gnu/xml/transform/AbstractNumberNode.java +++ b/libjava/classpath/gnu/xml/transform/AbstractNumberNode.java @@ -1,4 +1,4 @@ -/* AbstractNumberNode.java -- +/* AbstractNumberNode.java -- Copyright (C) 2004 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -102,7 +102,7 @@ abstract class AbstractNumberNode // xsl:number doesn't process children if (next != null) { - next.apply(stylesheet, mode, + next.apply(stylesheet, mode, context, pos, len, parent, nextSibling); } @@ -148,7 +148,7 @@ abstract class AbstractNumberNode for (int i = 0; i < len; i++) { String token = (i < 0) ? "." : (String) tokens.get(i); - boolean alpha = (i < 0) ? true : + boolean alpha = (i < 0) ? true : ((Boolean) types.get(i)).booleanValue(); if (!alpha) { @@ -304,7 +304,7 @@ abstract class AbstractNumberNode } return upper ? buf.toString().toUpperCase() : buf.toString(); } - + abstract int[] compute(Stylesheet stylesheet, Node context, int pos, int len) throws TransformerException; diff --git a/libjava/classpath/gnu/xml/transform/ApplyImportsNode.java b/libjava/classpath/gnu/xml/transform/ApplyImportsNode.java index 4b06eea1041..298c49da488 100644 --- a/libjava/classpath/gnu/xml/transform/ApplyImportsNode.java +++ b/libjava/classpath/gnu/xml/transform/ApplyImportsNode.java @@ -1,4 +1,4 @@ -/* ApplyImportsNode.java -- +/* ApplyImportsNode.java -- Copyright (C) 2004,2006 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -59,7 +59,7 @@ final class ApplyImportsNode ret.next = next.clone(stylesheet); return ret; } - + void doApply(Stylesheet stylesheet, QName mode, Node context, int pos, int len, Node parent, Node nextSibling) @@ -80,4 +80,3 @@ final class ApplyImportsNode } } - diff --git a/libjava/classpath/gnu/xml/transform/ApplyTemplatesNode.java b/libjava/classpath/gnu/xml/transform/ApplyTemplatesNode.java index 0daaa7aeccd..6aa36954a57 100644 --- a/libjava/classpath/gnu/xml/transform/ApplyTemplatesNode.java +++ b/libjava/classpath/gnu/xml/transform/ApplyTemplatesNode.java @@ -1,4 +1,4 @@ -/* ApplyTemplatesNode.java -- +/* ApplyTemplatesNode.java -- Copyright (C) 2004,2006 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -191,7 +191,7 @@ final class ApplyTemplatesNode } return super.references(var); } - + public String toString() { CPStringBuilder buf = new CPStringBuilder("apply-templates"); @@ -215,5 +215,5 @@ final class ApplyTemplatesNode buf.append(']'); return buf.toString(); } - + } diff --git a/libjava/classpath/gnu/xml/transform/AttributeNode.java b/libjava/classpath/gnu/xml/transform/AttributeNode.java index bbc4e08059e..4c71f6a922e 100644 --- a/libjava/classpath/gnu/xml/transform/AttributeNode.java +++ b/libjava/classpath/gnu/xml/transform/AttributeNode.java @@ -1,4 +1,4 @@ -/* AttributeNode.java -- +/* AttributeNode.java -- Copyright (C) 2004,2006 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -61,7 +61,7 @@ final class AttributeNode final TemplateNode name; final TemplateNode namespace; final Node source; - + AttributeNode(TemplateNode name, TemplateNode namespace, Node source) { @@ -98,10 +98,10 @@ final class AttributeNode fragment, null); // Use XPath string-value of fragment String nameValue = Expr.stringValue(fragment); - + String namespaceValue = null; if (namespace != null) - { + { // Create a document fragment to hold the namespace fragment = doc.createDocumentFragment(); // Apply namespace to the fragment @@ -113,7 +113,7 @@ final class AttributeNode if (namespaceValue.length() == 0) namespaceValue = null; } - + String prefix = getPrefix(nameValue); if (namespaceValue == null) { @@ -230,7 +230,7 @@ final class AttributeNode return true; return super.references(var); } - + public String toString() { CPStringBuilder buf = new CPStringBuilder("attribute"); @@ -240,5 +240,5 @@ final class AttributeNode buf.append(']'); return buf.toString(); } - + } diff --git a/libjava/classpath/gnu/xml/transform/AttributeSet.java b/libjava/classpath/gnu/xml/transform/AttributeSet.java index 3ece9c83f5e..ced50f11c8d 100644 --- a/libjava/classpath/gnu/xml/transform/AttributeSet.java +++ b/libjava/classpath/gnu/xml/transform/AttributeSet.java @@ -1,4 +1,4 @@ -/* AttributeSet.java -- +/* AttributeSet.java -- Copyright (C) 2004 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -62,6 +62,5 @@ final class AttributeSet children.clone(stylesheet), name, uas); } - -} +} diff --git a/libjava/classpath/gnu/xml/transform/Bindings.java b/libjava/classpath/gnu/xml/transform/Bindings.java index ab790523f6d..37d45880c89 100644 --- a/libjava/classpath/gnu/xml/transform/Bindings.java +++ b/libjava/classpath/gnu/xml/transform/Bindings.java @@ -1,4 +1,4 @@ -/* Bindings.java -- +/* Bindings.java -- Copyright (C) 2004 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -202,7 +202,7 @@ public class Bindings if (ret == null) { for (Iterator<Map<QName,Object>> i = variables.iterator(); - i.hasNext() && ret == null; ) + i.hasNext() && ret == null; ) { Map<QName,Object> vctx = i.next(); ret = vctx.get(name); @@ -212,7 +212,7 @@ public class Bindings if (ret == null) { for (Iterator<Map<QName,Object>> i = parameters.iterator(); - i.hasNext() && ret == null; ) + i.hasNext() && ret == null; ) { Map<QName,Object> pctx = i.next(); ret = pctx.get(name); @@ -260,7 +260,7 @@ public class Bindings { return get(qName, null, 1, 1); } - + public String toString() { CPStringBuilder buf = new CPStringBuilder(); @@ -311,7 +311,7 @@ public class Bindings buf.append(entry.getValue()); seen.add(key); } - } + } } buf.append('}'); next = false; @@ -337,7 +337,7 @@ public class Bindings buf.append(entry.getValue()); seen.add(key); } - } + } } buf.append(']'); return buf.toString(); diff --git a/libjava/classpath/gnu/xml/transform/CallTemplateNode.java b/libjava/classpath/gnu/xml/transform/CallTemplateNode.java index fe0eea74eff..cc08d93e35e 100644 --- a/libjava/classpath/gnu/xml/transform/CallTemplateNode.java +++ b/libjava/classpath/gnu/xml/transform/CallTemplateNode.java @@ -1,4 +1,4 @@ -/* CallTemplateNode.java -- +/* CallTemplateNode.java -- Copyright (C) 2004,2006 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -132,17 +132,17 @@ final class CallTemplateNode context, pos, len, parent, nextSibling); } - + public boolean references(QName var) { for (Iterator i = withParams.iterator(); i.hasNext(); ) { - if (((WithParam) i.next()).references(var)) - return true; + if (((WithParam) i.next()).references(var)) + return true; } return super.references(var); } - + public String toString() { CPStringBuilder buf = new CPStringBuilder("call-template"); @@ -152,5 +152,5 @@ final class CallTemplateNode buf.append(']'); return buf.toString(); } - + } diff --git a/libjava/classpath/gnu/xml/transform/ChooseNode.java b/libjava/classpath/gnu/xml/transform/ChooseNode.java index fe2dc0c2f3a..262cde144bd 100644 --- a/libjava/classpath/gnu/xml/transform/ChooseNode.java +++ b/libjava/classpath/gnu/xml/transform/ChooseNode.java @@ -1,4 +1,4 @@ -/* ChooseNode.java -- +/* ChooseNode.java -- Copyright (C) 2004,2006 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -76,7 +76,7 @@ final class ChooseNode context, pos, len, parent, nextSibling); } - + public String toString() { CPStringBuilder buf = new CPStringBuilder("choose"); @@ -84,5 +84,5 @@ final class ChooseNode buf.append(']'); return buf.toString(); } - + } diff --git a/libjava/classpath/gnu/xml/transform/CommentNode.java b/libjava/classpath/gnu/xml/transform/CommentNode.java index 8131fb28650..1c14e5fa8ea 100644 --- a/libjava/classpath/gnu/xml/transform/CommentNode.java +++ b/libjava/classpath/gnu/xml/transform/CommentNode.java @@ -1,4 +1,4 @@ -/* CommentNode.java -- +/* CommentNode.java -- Copyright (C) 2004,2006 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -94,10 +94,10 @@ final class CommentNode context, pos, len, parent, nextSibling); } - + public String toString() { return "comment"; } - + } diff --git a/libjava/classpath/gnu/xml/transform/CopyNode.java b/libjava/classpath/gnu/xml/transform/CopyNode.java index bae628d9632..9cc2fdecdd6 100644 --- a/libjava/classpath/gnu/xml/transform/CopyNode.java +++ b/libjava/classpath/gnu/xml/transform/CopyNode.java @@ -1,4 +1,4 @@ -/* CopyNode.java -- +/* CopyNode.java -- Copyright (C) 2004,2006 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -127,7 +127,7 @@ final class CopyNode context, pos, len, parent, nextSibling); } - + void addAttributeSet(Stylesheet stylesheet, QName mode, Node context, int pos, int len, Node parent, Node nextSibling, String attributeSet) diff --git a/libjava/classpath/gnu/xml/transform/CopyOfNode.java b/libjava/classpath/gnu/xml/transform/CopyOfNode.java index 4ce84329fc0..2b06fed4dce 100644 --- a/libjava/classpath/gnu/xml/transform/CopyOfNode.java +++ b/libjava/classpath/gnu/xml/transform/CopyOfNode.java @@ -1,4 +1,4 @@ -/* CopyOfNode.java -- +/* CopyOfNode.java -- Copyright (C) 2004,2006 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -153,14 +153,14 @@ final class CopyOfNode context, pos, len, parent, nextSibling); } - + public boolean references(QName var) { if (select != null && select.references(var)) return true; return super.references(var); } - + public String toString() { CPStringBuilder buf = new CPStringBuilder("copy-of"); @@ -170,5 +170,5 @@ final class CopyOfNode buf.append(']'); return buf.toString(); } - + } diff --git a/libjava/classpath/gnu/xml/transform/CurrentFunction.java b/libjava/classpath/gnu/xml/transform/CurrentFunction.java index 0395396bc2e..96899679ad3 100644 --- a/libjava/classpath/gnu/xml/transform/CurrentFunction.java +++ b/libjava/classpath/gnu/xml/transform/CurrentFunction.java @@ -1,4 +1,4 @@ -/* CurrentFunction.java -- +/* CurrentFunction.java -- Copyright (C) 2004 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -101,4 +101,3 @@ final class CurrentFunction } } - diff --git a/libjava/classpath/gnu/xml/transform/DOMSourceLocator.java b/libjava/classpath/gnu/xml/transform/DOMSourceLocator.java index 9bc8fb1b6c8..fbf31de55ec 100644 --- a/libjava/classpath/gnu/xml/transform/DOMSourceLocator.java +++ b/libjava/classpath/gnu/xml/transform/DOMSourceLocator.java @@ -1,4 +1,4 @@ -/* DOMSourceLocator.java -- +/* DOMSourceLocator.java -- Copyright (C) 2004 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -80,5 +80,5 @@ class DOMSourceLocator { return -1; } - + } diff --git a/libjava/classpath/gnu/xml/transform/DocumentFunction.java b/libjava/classpath/gnu/xml/transform/DocumentFunction.java index 29f3d4a4598..d0aee25b316 100644 --- a/libjava/classpath/gnu/xml/transform/DocumentFunction.java +++ b/libjava/classpath/gnu/xml/transform/DocumentFunction.java @@ -1,4 +1,4 @@ -/* DocumentFunction.java -- +/* DocumentFunction.java -- Copyright (C) 2004 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -86,7 +86,7 @@ final class DocumentFunction { this.args = args; } - + public Object evaluate(Node context, int pos, int len) { int arity = args.size(); @@ -165,7 +165,7 @@ final class DocumentFunction { if ("".equals(uri) || uri == null) uri = this.base.getBaseURI(); - + // Get fragment Expr fragment = null; int hi = uri.indexOf('#'); @@ -240,5 +240,5 @@ final class DocumentFunction } return false; } - + } diff --git a/libjava/classpath/gnu/xml/transform/ElementAvailableFunction.java b/libjava/classpath/gnu/xml/transform/ElementAvailableFunction.java index aa15981695e..6a9d256be21 100644 --- a/libjava/classpath/gnu/xml/transform/ElementAvailableFunction.java +++ b/libjava/classpath/gnu/xml/transform/ElementAvailableFunction.java @@ -1,4 +1,4 @@ -/* ElementAvailableFunction.java -- +/* ElementAvailableFunction.java -- Copyright (C) 2004 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -148,7 +148,7 @@ class ElementAvailableFunction // TODO extension elements return Boolean.FALSE; } - + public Expr clone(Object context) { NamespaceContext n = nsctx; @@ -179,4 +179,3 @@ class ElementAvailableFunction } } - diff --git a/libjava/classpath/gnu/xml/transform/ElementNode.java b/libjava/classpath/gnu/xml/transform/ElementNode.java index c5a4dd20da4..78a2007b7cf 100644 --- a/libjava/classpath/gnu/xml/transform/ElementNode.java +++ b/libjava/classpath/gnu/xml/transform/ElementNode.java @@ -1,4 +1,4 @@ -/* ElementNode.java -- +/* ElementNode.java -- Copyright (C) 2004,2006 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -68,7 +68,7 @@ final class ElementNode final String uas; final Node source; final Collection elementExcludeResultPrefixes; - + ElementNode(TemplateNode name, TemplateNode namespace, String uas, Node source) { @@ -134,7 +134,7 @@ final class ElementNode namespaceValue = null; } else - { + { String prefix = getPrefix(nameValue); if (XMLConstants.XMLNS_ATTRIBUTE.equals(prefix)) { @@ -169,7 +169,7 @@ final class ElementNode } } } - + // Create element Element element = (namespaceValue != null) ? doc.createElementNS(namespaceValue, nameValue) : @@ -237,7 +237,7 @@ final class ElementNode return true; return super.references(var); } - + public String toString() { CPStringBuilder buf = new CPStringBuilder("element"); @@ -257,5 +257,5 @@ final class ElementNode buf.append(']'); return buf.toString(); } - + } diff --git a/libjava/classpath/gnu/xml/transform/ErrorListenerErrorHandler.java b/libjava/classpath/gnu/xml/transform/ErrorListenerErrorHandler.java index d79bb15467a..8a28795c462 100644 --- a/libjava/classpath/gnu/xml/transform/ErrorListenerErrorHandler.java +++ b/libjava/classpath/gnu/xml/transform/ErrorListenerErrorHandler.java @@ -1,4 +1,4 @@ -/* ErrorListenerErrorHandler.java -- +/* ErrorListenerErrorHandler.java -- Copyright (C) 2004 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -71,7 +71,7 @@ class ErrorListenerErrorHandler throw new SAXException(e2); } } - + public void error(SAXParseException e) throws SAXException { @@ -84,7 +84,7 @@ class ErrorListenerErrorHandler throw new SAXException(e2); } } - + public void fatalError(SAXParseException e) throws SAXException { @@ -97,5 +97,5 @@ class ErrorListenerErrorHandler throw new SAXException(e2); } } - + } diff --git a/libjava/classpath/gnu/xml/transform/ForEachNode.java b/libjava/classpath/gnu/xml/transform/ForEachNode.java index 8908114ccf4..1613f768b92 100644 --- a/libjava/classpath/gnu/xml/transform/ForEachNode.java +++ b/libjava/classpath/gnu/xml/transform/ForEachNode.java @@ -1,4 +1,4 @@ -/* ForEachNode.java -- +/* ForEachNode.java -- Copyright (C) 2004,2006 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -97,25 +97,25 @@ final class ForEachNode //System.err.println(toString() + ": " + context+" -> "+ret); if (ret instanceof Collection) { - /* Suppression is safe, as we know context produces Collection<Node> */ - @SuppressWarnings("unchecked") - Collection<Node> ns = (Collection<Node>) ret; + /* Suppression is safe, as we know context produces Collection<Node> */ + @SuppressWarnings("unchecked") + Collection<Node> ns = (Collection<Node>) ret; List<Node> list = new ArrayList<Node>(ns); - if (!sortKeys.isEmpty()) - { - for (SortKey sortKey : sortKeys) - { - sortKey.init(stylesheet, mode, context, pos, len, parent, - nextSibling); - } - Collections.sort(list, new XSLComparator(sortKeys)); - } - else + if (!sortKeys.isEmpty()) + { + for (SortKey sortKey : sortKeys) + { + sortKey.init(stylesheet, mode, context, pos, len, parent, + nextSibling); + } + Collections.sort(list, new XSLComparator(sortKeys)); + } + else Collections.sort(list, documentOrderComparator); // Perform children for each node int l = list.size(); int p = 1; - for (Node node : list) + for (Node node : list) { stylesheet.current = node; children.apply(stylesheet, mode, @@ -139,8 +139,8 @@ final class ForEachNode return true; for (Iterator<SortKey> i = sortKeys.iterator(); i.hasNext(); ) { - if (i.next().references(var)) - return true; + if (i.next().references(var)) + return true; } return super.references(var); } @@ -155,5 +155,5 @@ final class ForEachNode buf.append(']'); return buf.toString(); } - + } diff --git a/libjava/classpath/gnu/xml/transform/FormatNumberFunction.java b/libjava/classpath/gnu/xml/transform/FormatNumberFunction.java index 34717b39c34..82872be778a 100644 --- a/libjava/classpath/gnu/xml/transform/FormatNumberFunction.java +++ b/libjava/classpath/gnu/xml/transform/FormatNumberFunction.java @@ -1,4 +1,4 @@ -/* FormatNumberFunction.java -- +/* FormatNumberFunction.java -- Copyright (C) 2004 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -143,4 +143,3 @@ final class FormatNumberFunction } } - diff --git a/libjava/classpath/gnu/xml/transform/FunctionAvailableFunction.java b/libjava/classpath/gnu/xml/transform/FunctionAvailableFunction.java index ab86401d0e4..1ac50327ee9 100644 --- a/libjava/classpath/gnu/xml/transform/FunctionAvailableFunction.java +++ b/libjava/classpath/gnu/xml/transform/FunctionAvailableFunction.java @@ -1,4 +1,4 @@ -/* FunctionAvailableFunction.java -- +/* FunctionAvailableFunction.java -- Copyright (C) 2004 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -159,7 +159,7 @@ class FunctionAvailableFunction // TODO extension functions return Boolean.FALSE; } - + public Expr clone(Object context) { NamespaceContext n = nsctx; @@ -190,4 +190,3 @@ class FunctionAvailableFunction } } - diff --git a/libjava/classpath/gnu/xml/transform/GenerateIdFunction.java b/libjava/classpath/gnu/xml/transform/GenerateIdFunction.java index f0d3e6dd9db..efc583cc8a6 100644 --- a/libjava/classpath/gnu/xml/transform/GenerateIdFunction.java +++ b/libjava/classpath/gnu/xml/transform/GenerateIdFunction.java @@ -1,4 +1,4 @@ -/* GenerateIdFunction.java -- +/* GenerateIdFunction.java -- Copyright (C) 2004 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -137,4 +137,3 @@ final class GenerateIdFunction } } - diff --git a/libjava/classpath/gnu/xml/transform/IfNode.java b/libjava/classpath/gnu/xml/transform/IfNode.java index eeb294138ba..f31fed55539 100644 --- a/libjava/classpath/gnu/xml/transform/IfNode.java +++ b/libjava/classpath/gnu/xml/transform/IfNode.java @@ -1,4 +1,4 @@ -/* IfNode.java -- +/* IfNode.java -- Copyright (C) 2004,2006 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -91,14 +91,14 @@ final class IfNode context, pos, len, parent, nextSibling); } - + public boolean references(QName var) { if (test != null && test.references(var)) return true; return super.references(var); } - + public String toString() { CPStringBuilder buf = new CPStringBuilder("if"); @@ -108,5 +108,5 @@ final class IfNode buf.append(']'); return buf.toString(); } - + } diff --git a/libjava/classpath/gnu/xml/transform/Key.java b/libjava/classpath/gnu/xml/transform/Key.java index 72bd90aedb0..18d83394f8f 100644 --- a/libjava/classpath/gnu/xml/transform/Key.java +++ b/libjava/classpath/gnu/xml/transform/Key.java @@ -1,4 +1,4 @@ -/* Key.java -- +/* Key.java -- Copyright (C) 2004 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -66,6 +66,5 @@ class Key (Pattern) match.clone(stylesheet), use.clone(stylesheet)); } - -} +} diff --git a/libjava/classpath/gnu/xml/transform/KeyFunction.java b/libjava/classpath/gnu/xml/transform/KeyFunction.java index a705dc6b009..b962626c9b1 100644 --- a/libjava/classpath/gnu/xml/transform/KeyFunction.java +++ b/libjava/classpath/gnu/xml/transform/KeyFunction.java @@ -1,4 +1,4 @@ -/* KeyFunction.java -- +/* KeyFunction.java -- Copyright (C) 2004 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -104,7 +104,7 @@ final class KeyFunction // Expand qualified name String uri = keyName.getNamespaceURI(); String prefix = keyName.getPrefix(); - if ((uri == null || uri.length() == 0) && + if ((uri == null || uri.length() == 0) && (prefix != null && prefix.length() > 0)) { uri = stylesheet.getNamespaceURI(prefix); @@ -158,7 +158,7 @@ final class KeyFunction addKeyNodes(ctx, keySet, value, acc); } } - + final void addKeyNodeIfMatch(Node node, Collection keySet, String value, Collection acc) { @@ -225,4 +225,3 @@ final class KeyFunction } } - diff --git a/libjava/classpath/gnu/xml/transform/LiteralNode.java b/libjava/classpath/gnu/xml/transform/LiteralNode.java index d4e283a6580..3405b336419 100644 --- a/libjava/classpath/gnu/xml/transform/LiteralNode.java +++ b/libjava/classpath/gnu/xml/transform/LiteralNode.java @@ -1,4 +1,4 @@ -/* LiteralNode.java -- +/* LiteralNode.java -- Copyright (C) 2004,2006 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -198,5 +198,5 @@ final class LiteralNode { return source.toString(); } - + } diff --git a/libjava/classpath/gnu/xml/transform/MessageNode.java b/libjava/classpath/gnu/xml/transform/MessageNode.java index a7eeeeef6ee..3e4899aeb3d 100644 --- a/libjava/classpath/gnu/xml/transform/MessageNode.java +++ b/libjava/classpath/gnu/xml/transform/MessageNode.java @@ -1,4 +1,4 @@ -/* MessageNode.java -- +/* MessageNode.java -- Copyright (C) 2004,2006 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -106,5 +106,5 @@ final class MessageNode } return buf.toString(); } - + } diff --git a/libjava/classpath/gnu/xml/transform/NamespaceProxy.java b/libjava/classpath/gnu/xml/transform/NamespaceProxy.java index b3c233cd7a5..695fbeb5292 100644 --- a/libjava/classpath/gnu/xml/transform/NamespaceProxy.java +++ b/libjava/classpath/gnu/xml/transform/NamespaceProxy.java @@ -1,4 +1,4 @@ -/* NamespaceProxy.java -- +/* NamespaceProxy.java -- Copyright (C) 2006 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -57,7 +57,7 @@ class NamespaceProxy { this.node = node; } - + public String getNamespaceURI(String prefix) { return (node == null) ? null : node.lookupNamespaceURI(prefix); diff --git a/libjava/classpath/gnu/xml/transform/NodeNumberNode.java b/libjava/classpath/gnu/xml/transform/NodeNumberNode.java index 0427686de8c..6663db371fe 100644 --- a/libjava/classpath/gnu/xml/transform/NodeNumberNode.java +++ b/libjava/classpath/gnu/xml/transform/NodeNumberNode.java @@ -1,4 +1,4 @@ -/* NodeNumberNode.java -- +/* NodeNumberNode.java -- Copyright (C) 2004 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -265,5 +265,5 @@ final class NodeNumberNode while (node != null); return index; } - + } diff --git a/libjava/classpath/gnu/xml/transform/NumberNode.java b/libjava/classpath/gnu/xml/transform/NumberNode.java index b19a7b5e9ee..cec594b9939 100644 --- a/libjava/classpath/gnu/xml/transform/NumberNode.java +++ b/libjava/classpath/gnu/xml/transform/NumberNode.java @@ -1,4 +1,4 @@ -/* NumberNode.java -- +/* NumberNode.java -- Copyright (C) 2004 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -84,5 +84,5 @@ final class NumberNode new Double(Expr._number(context, ret)); return new int[] { d.intValue() }; } - + } diff --git a/libjava/classpath/gnu/xml/transform/OtherwiseNode.java b/libjava/classpath/gnu/xml/transform/OtherwiseNode.java index 9d8168ce4f9..09057840d16 100644 --- a/libjava/classpath/gnu/xml/transform/OtherwiseNode.java +++ b/libjava/classpath/gnu/xml/transform/OtherwiseNode.java @@ -1,4 +1,4 @@ -/* OtherwiseNode.java -- +/* OtherwiseNode.java -- Copyright (C) 2004,2006 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -74,10 +74,10 @@ final class OtherwiseNode context, pos, len, parent, nextSibling); } - + public String toString() { return "otherwise"; } - + } diff --git a/libjava/classpath/gnu/xml/transform/ParameterNode.java b/libjava/classpath/gnu/xml/transform/ParameterNode.java index 431fbd3b1ea..4f3dc75695d 100644 --- a/libjava/classpath/gnu/xml/transform/ParameterNode.java +++ b/libjava/classpath/gnu/xml/transform/ParameterNode.java @@ -1,4 +1,4 @@ -/* ParameterNode.java -- +/* ParameterNode.java -- Copyright (C) 2004,2006 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -73,8 +73,8 @@ final class ParameterNode ParameterNode clone(Stylesheet stylesheet) { ParameterNode ret = new ParameterNode(name, - select == null ? null : select.clone(stylesheet), - type); + select == null ? null : select.clone(stylesheet), + type); if (children != null) ret.children = children.clone(stylesheet); if (next != null) @@ -106,7 +106,7 @@ final class ParameterNode // pop the variable context stylesheet.bindings.pop(type); } - + Object getValue(Stylesheet stylesheet, QName mode, Node context, int pos, int len) throws TransformerException @@ -124,7 +124,7 @@ final class ParameterNode else return null; } - + public boolean references(QName var) { if (select != null && select.references(var)) @@ -144,7 +144,7 @@ final class ParameterNode return -1; return 0; } - + public String toString() { CPStringBuilder buf = new CPStringBuilder(); @@ -170,4 +170,3 @@ final class ParameterNode } } - diff --git a/libjava/classpath/gnu/xml/transform/ProcessingInstructionNode.java b/libjava/classpath/gnu/xml/transform/ProcessingInstructionNode.java index 655f51f0130..1e723a8d452 100644 --- a/libjava/classpath/gnu/xml/transform/ProcessingInstructionNode.java +++ b/libjava/classpath/gnu/xml/transform/ProcessingInstructionNode.java @@ -1,4 +1,4 @@ -/* ProcessingInstructionNode.java -- +/* ProcessingInstructionNode.java -- Copyright (C) 2004,2006 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -104,7 +104,7 @@ final class ProcessingInstructionNode context, pos, len, parent, nextSibling); } - + public String toString() { CPStringBuilder buf = new CPStringBuilder("processing-instruction"); @@ -114,5 +114,5 @@ final class ProcessingInstructionNode buf.append(']'); return buf.toString(); } - + } diff --git a/libjava/classpath/gnu/xml/transform/SAXSerializer.java b/libjava/classpath/gnu/xml/transform/SAXSerializer.java index 9650e3e052d..2bd1f97abd2 100644 --- a/libjava/classpath/gnu/xml/transform/SAXSerializer.java +++ b/libjava/classpath/gnu/xml/transform/SAXSerializer.java @@ -1,4 +1,4 @@ -/* SAXSerializer.java -- +/* SAXSerializer.java -- Copyright (C) 2004 Free Software Foundation, Inc. This file is part of GNU Classpath. diff --git a/libjava/classpath/gnu/xml/transform/SAXTemplatesHandler.java b/libjava/classpath/gnu/xml/transform/SAXTemplatesHandler.java index 2c5a4686f10..24464c067c5 100644 --- a/libjava/classpath/gnu/xml/transform/SAXTemplatesHandler.java +++ b/libjava/classpath/gnu/xml/transform/SAXTemplatesHandler.java @@ -1,4 +1,4 @@ -/* SAXTemplatesHandler.java -- +/* SAXTemplatesHandler.java -- Copyright (C) 2006 Free Software Foundation, Inc. This file is part of GNU Classpath. diff --git a/libjava/classpath/gnu/xml/transform/SAXTransformerHandler.java b/libjava/classpath/gnu/xml/transform/SAXTransformerHandler.java index 83cc3754be9..890e1510059 100644 --- a/libjava/classpath/gnu/xml/transform/SAXTransformerHandler.java +++ b/libjava/classpath/gnu/xml/transform/SAXTransformerHandler.java @@ -1,4 +1,4 @@ -/* SAXTransformerHandler.java -- +/* SAXTransformerHandler.java -- Copyright (C) 2006 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -107,5 +107,5 @@ class SAXTransformerHandler throw e2; } } - + } diff --git a/libjava/classpath/gnu/xml/transform/SortKey.java b/libjava/classpath/gnu/xml/transform/SortKey.java index 72934a5b750..dd57df986cb 100644 --- a/libjava/classpath/gnu/xml/transform/SortKey.java +++ b/libjava/classpath/gnu/xml/transform/SortKey.java @@ -1,4 +1,4 @@ -/* SortKey.java -- +/* SortKey.java -- Copyright (C) 2004 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -95,7 +95,7 @@ final class SortKey * @param caseOrder the treatment of case when the data type is a string. This * may be "upper-first", "lower-first" or {@code null} if * unspecified. - */ + */ SortKey(Expr select, TemplateNode lang, TemplateNode dataType, TemplateNode order, TemplateNode caseOrder) { @@ -215,10 +215,10 @@ final class SortKey SortKey clone(Stylesheet stylesheet) { return new SortKey(select.clone(stylesheet), - langTemplate == null ? null : cloneAttributeValueTemplate(langTemplate, stylesheet), - dataTypeTemplate == null ? null : cloneAttributeValueTemplate(dataTypeTemplate, stylesheet), - orderTemplate == null ? null : cloneAttributeValueTemplate(orderTemplate, stylesheet), - caseOrderTemplate == null ? null : cloneAttributeValueTemplate(caseOrderTemplate, stylesheet)); + langTemplate == null ? null : cloneAttributeValueTemplate(langTemplate, stylesheet), + dataTypeTemplate == null ? null : cloneAttributeValueTemplate(dataTypeTemplate, stylesheet), + orderTemplate == null ? null : cloneAttributeValueTemplate(orderTemplate, stylesheet), + caseOrderTemplate == null ? null : cloneAttributeValueTemplate(caseOrderTemplate, stylesheet)); } /** diff --git a/libjava/classpath/gnu/xml/transform/StreamSerializer.java b/libjava/classpath/gnu/xml/transform/StreamSerializer.java index 28996721884..a5705f891c9 100644 --- a/libjava/classpath/gnu/xml/transform/StreamSerializer.java +++ b/libjava/classpath/gnu/xml/transform/StreamSerializer.java @@ -1,4 +1,4 @@ -/* StreamSerializer.java -- +/* StreamSerializer.java -- Copyright (C) 2004,2006 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -67,7 +67,7 @@ import org.w3c.dom.Node; */ public class StreamSerializer { - + static final int SPACE = 0x20; static final int BANG = 0x21; // ! static final int APOS = 0x27; // ' @@ -83,7 +83,7 @@ public class StreamSerializer static { HashSet set; - + set = new HashSet(); set.add("nohref"); HTML_BOOLEAN_ATTRIBUTES.put("area", set); @@ -95,11 +95,11 @@ public class StreamSerializer set = new HashSet(); set.add("declare"); HTML_BOOLEAN_ATTRIBUTES.put("object", set); - + set = new HashSet(); set.add("noshade"); HTML_BOOLEAN_ATTRIBUTES.put("hr", set); - + set = new HashSet(); set.add("compact"); HTML_BOOLEAN_ATTRIBUTES.put("dl", set); @@ -107,46 +107,46 @@ public class StreamSerializer HTML_BOOLEAN_ATTRIBUTES.put("ul", set); HTML_BOOLEAN_ATTRIBUTES.put("dir", set); HTML_BOOLEAN_ATTRIBUTES.put("menu", set); - + set = new HashSet(); set.add("checked"); set.add("disabled"); set.add("readonly"); set.add("ismap"); HTML_BOOLEAN_ATTRIBUTES.put("input", set); - + set = new HashSet(); set.add("multiple"); set.add("disabled"); HTML_BOOLEAN_ATTRIBUTES.put("select", set); - + set = new HashSet(); set.add("disabled"); HTML_BOOLEAN_ATTRIBUTES.put("optgroup", set); - + set = new HashSet(); set.add("selected"); set.add("disabled"); HTML_BOOLEAN_ATTRIBUTES.put("option", set); - + set = new HashSet(); set.add("disabled"); set.add("readonly"); HTML_BOOLEAN_ATTRIBUTES.put("textarea", set); - + set = new HashSet(); set.add("disabled"); HTML_BOOLEAN_ATTRIBUTES.put("button", set); - + set = new HashSet(); set.add("nowrap"); HTML_BOOLEAN_ATTRIBUTES.put("th", set); HTML_BOOLEAN_ATTRIBUTES.put("td", set); - + set = new HashSet(); set.add("noresize"); HTML_BOOLEAN_ATTRIBUTES.put("frame", set); - + set = new HashSet(); set.add("defer"); HTML_BOOLEAN_ATTRIBUTES.put("script", set); @@ -168,7 +168,7 @@ public class StreamSerializer protected boolean discardDefaultContent; protected boolean xmlDeclaration = true; - + // has a META element with the encoding been added? private boolean htmlEncoded; @@ -204,7 +204,7 @@ public class StreamSerializer { serialize(node, out, false); } - + void serialize(Node node, final OutputStream out, boolean convertToCdata) throws IOException diff --git a/libjava/classpath/gnu/xml/transform/StrippingInstruction.java b/libjava/classpath/gnu/xml/transform/StrippingInstruction.java index c6391b9c521..27e9fc8ca78 100644 --- a/libjava/classpath/gnu/xml/transform/StrippingInstruction.java +++ b/libjava/classpath/gnu/xml/transform/StrippingInstruction.java @@ -1,4 +1,4 @@ -/* StrippingInstruction.java -- +/* StrippingInstruction.java -- Copyright (C) 2006 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -49,7 +49,7 @@ class StrippingInstruction final NameTest element; final int precedence; - + StrippingInstruction(NameTest element, int precedence) { this.element = element; @@ -69,5 +69,5 @@ class StrippingInstruction else return 0.0f; } - + } diff --git a/libjava/classpath/gnu/xml/transform/Stylesheet.java b/libjava/classpath/gnu/xml/transform/Stylesheet.java index 30bd953495b..786b258f5ec 100644 --- a/libjava/classpath/gnu/xml/transform/Stylesheet.java +++ b/libjava/classpath/gnu/xml/transform/Stylesheet.java @@ -1,4 +1,4 @@ -/* Stylesheet.java -- +/* Stylesheet.java -- Copyright (C) 2004,2006 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -91,7 +91,7 @@ class Stylesheet static final String XSL_NS = "http://www.w3.org/1999/XSL/Transform"; private static final NameTest STYLESHEET_PRESERVE_TEXT = new NameTest(new QName(XSL_NS, "text"), false, false); - + static final int OUTPUT_XML = 0; static final int OUTPUT_HTML = 1; static final int OUTPUT_TEXT = 2; @@ -147,7 +147,7 @@ class Stylesheet * Decimal formats. */ Map<String,DecimalFormat> decimalFormats; - + /** * Namespace aliases. */ @@ -256,16 +256,16 @@ class Stylesheet builtInTextTemplate = new ValueOfNode(new Selector(Selector.SELF, tests), false); - + parse(doc.getDocumentElement(), true); current = doc; // Alow namespace resolution during processing - + debug = ("yes".equals(System.getProperty("xsl.debug"))); if (debug) { System.err.println("Stylesheet: " + doc.getDocumentURI()); - for (Template t : templates) + for (Template t : templates) { t.list(System.err); System.err.println("--------------------"); @@ -280,7 +280,7 @@ class Stylesheet stylesheet = stylesheet.parent; return stylesheet; } - + void initDefaultDecimalFormat() { DecimalFormat defaultDecimalFormat = new DecimalFormat(); @@ -298,7 +298,7 @@ class Stylesheet defaultDecimalFormat.setDecimalFormatSymbols(symbols); decimalFormats.put(null, defaultDecimalFormat); } - + // -- Cloneable -- public Object clone() @@ -309,33 +309,33 @@ class Stylesheet clone.bindings = (Bindings) bindings.clone(); LinkedList<Template> templates2 = new LinkedList<Template>(); - for (Template t : templates) + for (Template t : templates) { templates2.add(t.clone(clone)); } clone.templates = templates2; LinkedList<AttributeSet> attributeSets2 = new LinkedList<AttributeSet>(); - for (AttributeSet as : attributeSets) + for (AttributeSet as : attributeSets) { attributeSets2.add(as.clone(clone)); } clone.attributeSets = attributeSets2; LinkedList<ParameterNode> variables2 = new LinkedList<ParameterNode>(); - for (ParameterNode var : variables) + for (ParameterNode var : variables) { variables2.add(var.clone(clone)); } clone.variables = variables2; LinkedList<Key> keys2 = new LinkedList<Key>(); - for (Key k : keys) + for (Key k : keys) { keys2.add(k.clone(clone)); } clone.keys = keys2; - + return clone; } catch (CloneNotSupportedException e) @@ -395,9 +395,9 @@ class Stylesheet } return new QName(uri, localName, prefix); } - + // -- Template selection -- - + TemplateNode getTemplate(QName mode, Node context, boolean applyImports) throws TransformerException { @@ -632,7 +632,7 @@ class Stylesheet Node attr = attrs.getNamedItem(name); return (attr == null) ? def : attr.getNodeValue(); } - + /** * namespace-alias */ @@ -777,7 +777,7 @@ class Stylesheet while (st.hasMoreTokens()) { NameTest element = parseNameTest(st.nextToken()); - stripSpace.add(new StrippingInstruction(element, + stripSpace.add(new StrippingInstruction(element, precedence)); } } @@ -923,7 +923,7 @@ class Stylesheet tokens.add(value.substring(off)); types.add(Boolean.FALSE); } - + // Construct template node tree TemplateNode ret = null; Document doc = source.getOwnerDocument(); @@ -983,7 +983,7 @@ class Stylesheet { // Conflict resolution StrippingInstruction ssi = null, psi = null; - for (StrippingInstruction si : stripSpace) + for (StrippingInstruction si : stripSpace) { if (si.element.matches(ctx, 1, 1)) { @@ -998,7 +998,7 @@ class Stylesheet ssi = si; } } - for (StrippingInstruction si : preserveSpace) + for (StrippingInstruction si : preserveSpace) { if (si.element.matches(ctx, 1, 1)) { @@ -1090,7 +1090,7 @@ class Stylesheet } return null; } - + // -- Parsing -- /** @@ -1126,7 +1126,7 @@ class Stylesheet List<WithParam> withParams = parseWithParams(children); return new CallTemplateNode(name, withParams); } - + /** * value-of */ @@ -1140,7 +1140,7 @@ class Stylesheet Expr select = (Expr) xpath.compile(s); return new ValueOfNode(select, d); } - + /** * for-each */ @@ -1156,7 +1156,7 @@ class Stylesheet ret.children = parse(children); return ret; } - + /** * if */ @@ -1171,7 +1171,7 @@ class Stylesheet ret.children = parse(children); return ret; } - + /** * when */ @@ -1186,7 +1186,7 @@ class Stylesheet ret.children = parse(children); return ret; } - + /** * element */ @@ -1223,7 +1223,7 @@ class Stylesheet ret.children = parse(children); return ret; } - + /** * text */ @@ -1238,7 +1238,7 @@ class Stylesheet ret.children = parse(children); return ret; } - + /** * copy */ @@ -1252,7 +1252,7 @@ class Stylesheet ret.children = parse(children); return ret; } - + /** * processing-instruction */ @@ -1266,7 +1266,7 @@ class Stylesheet ret.children = parse(children); return ret; } - + /** * number */ @@ -1340,7 +1340,7 @@ class Stylesheet ret.children = parse(children); return ret; } - + /** * copy-of */ @@ -1355,7 +1355,7 @@ class Stylesheet ret.children = parse(children); return ret; } - + /** * message */ @@ -1370,7 +1370,7 @@ class Stylesheet ret.children = parse(children); return ret; } - + /** * Parse template-level elements. */ @@ -1461,7 +1461,7 @@ class Stylesheet NamedNodeMap attrs = node.getAttributes(); Node children = node.getFirstChild(); TemplateNode content = parse(children); - QName paramName = + QName paramName = getQName(getRequiredAttribute(attrs, "name", node)); String select = getAttribute(attrs, "select"); ParameterNode ret; @@ -1770,4 +1770,3 @@ class Stylesheet } } - diff --git a/libjava/classpath/gnu/xml/transform/SystemPropertyFunction.java b/libjava/classpath/gnu/xml/transform/SystemPropertyFunction.java index 038df0169b9..f314227e6fe 100644 --- a/libjava/classpath/gnu/xml/transform/SystemPropertyFunction.java +++ b/libjava/classpath/gnu/xml/transform/SystemPropertyFunction.java @@ -1,4 +1,4 @@ -/* SystemPropertyFunction.java -- +/* SystemPropertyFunction.java -- Copyright (C) 2004 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -138,4 +138,3 @@ final class SystemPropertyFunction } } - diff --git a/libjava/classpath/gnu/xml/transform/Template.java b/libjava/classpath/gnu/xml/transform/Template.java index 7ddef0ae50e..09d1a997c24 100644 --- a/libjava/classpath/gnu/xml/transform/Template.java +++ b/libjava/classpath/gnu/xml/transform/Template.java @@ -1,4 +1,4 @@ -/* Template.java -- +/* Template.java -- Copyright (C) 2004,2006 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -70,7 +70,7 @@ class Template final QName mode; final boolean isAnyNode; // is the match simply "node()"? - Template(Stylesheet stylesheet, + Template(Stylesheet stylesheet, QName name, Pattern match, TemplateNode node, int precedence, String priorityAttr, QName mode) { @@ -80,7 +80,7 @@ class Template this.node = node; this.precedence = precedence; this.mode = mode; - + double p = DEFAULT_PRIORITY; boolean a = false; if (priorityAttr != null) @@ -126,8 +126,8 @@ class Template this.priority = p; this.isAnyNode = a; } - - private Template(Stylesheet stylesheet, + + private Template(Stylesheet stylesheet, QName name, Pattern match, TemplateNode node, int precedence, double priority, QName mode, boolean isAnyNode) { @@ -155,7 +155,7 @@ class Template mode, isAnyNode); } - + public int compareTo(Object other) { if (other instanceof Template) @@ -249,7 +249,7 @@ class Template buf.append(node); buf.append(']'); return buf.toString(); - + //return (name != null) ? name.toString() : match.toString(); } diff --git a/libjava/classpath/gnu/xml/transform/TemplateNode.java b/libjava/classpath/gnu/xml/transform/TemplateNode.java index ad80c59f922..d4c223e0165 100644 --- a/libjava/classpath/gnu/xml/transform/TemplateNode.java +++ b/libjava/classpath/gnu/xml/transform/TemplateNode.java @@ -1,4 +1,4 @@ -/* TemplateNode.java -- +/* TemplateNode.java -- Copyright (C) 2004 Free Software Foundation, Inc. This file is part of GNU Classpath. diff --git a/libjava/classpath/gnu/xml/transform/TemplatesImpl.java b/libjava/classpath/gnu/xml/transform/TemplatesImpl.java index e5395f6fb22..fc741bc817a 100644 --- a/libjava/classpath/gnu/xml/transform/TemplatesImpl.java +++ b/libjava/classpath/gnu/xml/transform/TemplatesImpl.java @@ -1,4 +1,4 @@ -/* TemplatesImpl.java -- +/* TemplatesImpl.java -- Copyright (C) 2004 Free Software Foundation, Inc. This file is part of GNU Classpath. diff --git a/libjava/classpath/gnu/xml/transform/TextNode.java b/libjava/classpath/gnu/xml/transform/TextNode.java index 93d1d541775..8263ef5bc88 100644 --- a/libjava/classpath/gnu/xml/transform/TextNode.java +++ b/libjava/classpath/gnu/xml/transform/TextNode.java @@ -1,4 +1,4 @@ -/* TextNode.java -- +/* TextNode.java -- Copyright (C) 2004,2006 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -117,5 +117,5 @@ final class TextNode } return buf.toString(); } - + } diff --git a/libjava/classpath/gnu/xml/transform/TransformerFactoryImpl.java b/libjava/classpath/gnu/xml/transform/TransformerFactoryImpl.java index 1e8fea3e3a6..972e8a28260 100644 --- a/libjava/classpath/gnu/xml/transform/TransformerFactoryImpl.java +++ b/libjava/classpath/gnu/xml/transform/TransformerFactoryImpl.java @@ -1,4 +1,4 @@ -/* TransformerFactoryImpl.java -- +/* TransformerFactoryImpl.java -- Copyright (C) 2004,2006 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -148,7 +148,7 @@ public class TransformerFactoryImpl } return new Stylesheet(this, parent, doc, systemId, precedence); } - + public Source getAssociatedStylesheet(Source source, String media, String title, @@ -365,14 +365,14 @@ public class TransformerFactoryImpl Transformer transformer = newTransformer(); return new SAXTransformerHandler(this, transformer); } - + public TransformerHandler newTransformerHandler(Source source) throws TransformerConfigurationException { Transformer transformer = newTransformer(source); return new SAXTransformerHandler(this, transformer); } - + public TransformerHandler newTransformerHandler(Templates templates) throws TransformerConfigurationException { @@ -391,7 +391,7 @@ public class TransformerFactoryImpl { throw new UnsupportedOperationException(); } - + // -- SAXTransformerFactory end -- /** @@ -434,5 +434,5 @@ public class TransformerFactoryImpl out.close(); } } - + } diff --git a/libjava/classpath/gnu/xml/transform/TransformerImpl.java b/libjava/classpath/gnu/xml/transform/TransformerImpl.java index a975c691f29..eb6a5dea197 100644 --- a/libjava/classpath/gnu/xml/transform/TransformerImpl.java +++ b/libjava/classpath/gnu/xml/transform/TransformerImpl.java @@ -1,4 +1,4 @@ -/* TransformerImpl.java -- +/* TransformerImpl.java -- Copyright (C) 2004,2005,2006 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -231,9 +231,9 @@ class TransformerImpl String publicId = outputProperties.getProperty(OutputKeys.DOCTYPE_PUBLIC); String systemId = outputProperties.getProperty(OutputKeys.DOCTYPE_SYSTEM); String version = outputProperties.getProperty(OutputKeys.VERSION); - boolean omitXmlDeclaration = + boolean omitXmlDeclaration = "yes".equals(outputProperties.getProperty(OutputKeys.OMIT_XML_DECLARATION)); - boolean standalone = + boolean standalone = "yes".equals(outputProperties.getProperty(OutputKeys.STANDALONE)); String mediaType = outputProperties.getProperty(OutputKeys.MEDIA_TYPE); String cdataSectionElements = diff --git a/libjava/classpath/gnu/xml/transform/TransformerOutputProperties.java b/libjava/classpath/gnu/xml/transform/TransformerOutputProperties.java index 9ac5cdc0413..ddaa260c46c 100644 --- a/libjava/classpath/gnu/xml/transform/TransformerOutputProperties.java +++ b/libjava/classpath/gnu/xml/transform/TransformerOutputProperties.java @@ -1,4 +1,4 @@ -/* TransformerOutputProperties.java -- +/* TransformerOutputProperties.java -- Copyright (C) 2004 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -54,7 +54,7 @@ import javax.xml.transform.OutputKeys; class TransformerOutputProperties extends Properties { - + final Properties defaultProperties; final Stylesheet stylesheet; boolean dirty; @@ -170,7 +170,7 @@ class TransformerOutputProperties "yes".equals(getProperty(OutputKeys.STANDALONE)); stylesheet.outputPublicId = getProperty(OutputKeys.DOCTYPE_PUBLIC); stylesheet.outputSystemId = getProperty(OutputKeys.DOCTYPE_SYSTEM); - StringTokenizer st = + StringTokenizer st = new StringTokenizer(getProperty(OutputKeys.CDATA_SECTION_ELEMENTS)); Collection acc = new LinkedHashSet(); while (st.hasMoreTokens()) @@ -184,4 +184,3 @@ class TransformerOutputProperties } } - diff --git a/libjava/classpath/gnu/xml/transform/URIResolverEntityResolver.java b/libjava/classpath/gnu/xml/transform/URIResolverEntityResolver.java index 762416fde36..49193a47344 100644 --- a/libjava/classpath/gnu/xml/transform/URIResolverEntityResolver.java +++ b/libjava/classpath/gnu/xml/transform/URIResolverEntityResolver.java @@ -1,4 +1,4 @@ -/* URIResolverEntityResolver.java -- +/* URIResolverEntityResolver.java -- Copyright (C) 2004 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -79,5 +79,5 @@ class URIResolverEntityResolver throw new SAXException(e); } } - + } diff --git a/libjava/classpath/gnu/xml/transform/UnparsedEntityUriFunction.java b/libjava/classpath/gnu/xml/transform/UnparsedEntityUriFunction.java index 7ba0eae21a4..5eae78cb251 100644 --- a/libjava/classpath/gnu/xml/transform/UnparsedEntityUriFunction.java +++ b/libjava/classpath/gnu/xml/transform/UnparsedEntityUriFunction.java @@ -1,4 +1,4 @@ -/* UnparsedEntityUriFunction.java -- +/* UnparsedEntityUriFunction.java -- Copyright (C) 2004 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -130,4 +130,3 @@ final class UnparsedEntityUriFunction } } - diff --git a/libjava/classpath/gnu/xml/transform/ValueOfNode.java b/libjava/classpath/gnu/xml/transform/ValueOfNode.java index 156affa77be..0d9a656e705 100644 --- a/libjava/classpath/gnu/xml/transform/ValueOfNode.java +++ b/libjava/classpath/gnu/xml/transform/ValueOfNode.java @@ -1,4 +1,4 @@ -/* ValueOfNode.java -- +/* ValueOfNode.java -- Copyright (C) 2004,2006 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -76,7 +76,7 @@ final class ValueOfNode ret.next = next.clone(stylesheet); return ret; } - + @Override void doApply(Stylesheet stylesheet, QName mode, Node context, int pos, int len, @@ -125,7 +125,7 @@ final class ValueOfNode return true; return super.references(var); } - + public String toString() { CPStringBuilder buf = new CPStringBuilder("value-of"); @@ -137,5 +137,5 @@ final class ValueOfNode buf.append(']'); return buf.toString(); } - + } diff --git a/libjava/classpath/gnu/xml/transform/WhenNode.java b/libjava/classpath/gnu/xml/transform/WhenNode.java index fc9d5b187ef..abfe796fd40 100644 --- a/libjava/classpath/gnu/xml/transform/WhenNode.java +++ b/libjava/classpath/gnu/xml/transform/WhenNode.java @@ -1,4 +1,4 @@ -/* WhenNode.java -- +/* WhenNode.java -- Copyright (C) 2004,2006 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -94,14 +94,14 @@ final class WhenNode parent, nextSibling); } } - + public boolean references(QName var) { if (test != null && test.references(var)) return true; return super.references(var); } - + public String toString() { CPStringBuilder buf = new CPStringBuilder("when"); @@ -111,5 +111,5 @@ final class WhenNode buf.append(']'); return buf.toString(); } - + } diff --git a/libjava/classpath/gnu/xml/transform/WithParam.java b/libjava/classpath/gnu/xml/transform/WithParam.java index bcfe1e9b7f0..2e726fb8234 100644 --- a/libjava/classpath/gnu/xml/transform/WithParam.java +++ b/libjava/classpath/gnu/xml/transform/WithParam.java @@ -1,4 +1,4 @@ -/* WithParam.java -- +/* WithParam.java -- Copyright (C) 2004 Free Software Foundation, Inc. This file is part of GNU Classpath. diff --git a/libjava/classpath/gnu/xml/transform/XSLComparator.java b/libjava/classpath/gnu/xml/transform/XSLComparator.java index 88243693d7f..1fd0b20e63c 100644 --- a/libjava/classpath/gnu/xml/transform/XSLComparator.java +++ b/libjava/classpath/gnu/xml/transform/XSLComparator.java @@ -1,4 +1,4 @@ -/* XSLComparator.java -- +/* XSLComparator.java -- Copyright (C) 2004 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -65,54 +65,54 @@ class XSLComparator { for (SortKey sortKey : sortKeys) { - String k1 = sortKey.key(n1); - String k2 = sortKey.key(n2); - if ("text".equals(sortKey.dataType)) - { - Locale locale = (sortKey.lang == null) ? Locale.getDefault() : - new Locale(sortKey.lang); - Collator collator = Collator.getInstance(locale); - int d = collator.compare(k1, k2); - if (d != 0) - { - switch (sortKey.caseOrder) - { - case SortKey.UPPER_FIRST: - // TODO - break; - case SortKey.LOWER_FIRST: - // TODO - break; - } - if (sortKey.descending) - { - d = -d; - } - return d; - } - } - else if ("number".equals(sortKey.dataType)) - { - double kn1 = Expr._number(n1, k1); - double kn2 = Expr._number(n2, k2); - int d; - if (Double.isNaN(kn1) || Double.isInfinite(kn2)) - { - d = -1; - } - else if (Double.isNaN(kn2) || Double.isInfinite(kn1)) - { - d = 1; - } - else - { - // conversion to int may give 0 for small numbers - d = (kn1 > kn2) ? 1 : (kn1 < kn2) ? -1 : 0; - } - return (sortKey.descending) ? -d : d; - } + String k1 = sortKey.key(n1); + String k2 = sortKey.key(n2); + if ("text".equals(sortKey.dataType)) + { + Locale locale = (sortKey.lang == null) ? Locale.getDefault() : + new Locale(sortKey.lang); + Collator collator = Collator.getInstance(locale); + int d = collator.compare(k1, k2); + if (d != 0) + { + switch (sortKey.caseOrder) + { + case SortKey.UPPER_FIRST: + // TODO + break; + case SortKey.LOWER_FIRST: + // TODO + break; + } + if (sortKey.descending) + { + d = -d; + } + return d; + } + } + else if ("number".equals(sortKey.dataType)) + { + double kn1 = Expr._number(n1, k1); + double kn2 = Expr._number(n2, k2); + int d; + if (Double.isNaN(kn1) || Double.isInfinite(kn2)) + { + d = -1; + } + else if (Double.isNaN(kn2) || Double.isInfinite(kn1)) + { + d = 1; + } + else + { + // conversion to int may give 0 for small numbers + d = (kn1 > kn2) ? 1 : (kn1 < kn2) ? -1 : 0; + } + return (sortKey.descending) ? -d : d; + } } return 0; } - + } diff --git a/libjava/classpath/gnu/xml/transform/XSLURIResolver.java b/libjava/classpath/gnu/xml/transform/XSLURIResolver.java index c1379211ae5..cf596c1e6d2 100644 --- a/libjava/classpath/gnu/xml/transform/XSLURIResolver.java +++ b/libjava/classpath/gnu/xml/transform/XSLURIResolver.java @@ -1,4 +1,4 @@ -/* XSLURIResolver.java -- +/* XSLURIResolver.java -- Copyright (C) 2004 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -168,7 +168,7 @@ class XSLURIResolver } conn.connect(); lastModified = conn.getLastModified(); - if (node != null && + if (node != null && lastModified > 0L && lastModified <= lastLastModified) { @@ -266,7 +266,7 @@ class XSLURIResolver return (file == null) ? null : file.toURL(); } } - + DocumentBuilder getDocumentBuilder() throws TransformerException { @@ -317,6 +317,5 @@ class XSLURIResolver ((DomDocument) doc).setDocumentURI(systemId); return new DOMSource(doc, systemId); } - -} +} |
