diff options
Diffstat (limited to 'libjava/classpath/gnu/xml/validation/relaxng')
26 files changed, 52 insertions, 74 deletions
diff --git a/libjava/classpath/gnu/xml/validation/relaxng/AnyNameNameClass.java b/libjava/classpath/gnu/xml/validation/relaxng/AnyNameNameClass.java index ecc016d4bd4..7b27a3c9835 100644 --- a/libjava/classpath/gnu/xml/validation/relaxng/AnyNameNameClass.java +++ b/libjava/classpath/gnu/xml/validation/relaxng/AnyNameNameClass.java @@ -1,4 +1,4 @@ -/* AnyNameNameClass.java -- +/* AnyNameNameClass.java -- Copyright (C) 2006 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -47,7 +47,7 @@ class AnyNameNameClass { NameClass exceptNameClass; - + boolean matchesName(String uri, String localName) { return (exceptNameClass == null) ? true : @@ -55,4 +55,3 @@ class AnyNameNameClass } } - diff --git a/libjava/classpath/gnu/xml/validation/relaxng/AttributePattern.java b/libjava/classpath/gnu/xml/validation/relaxng/AttributePattern.java index 48443d61b11..54e414dc5c4 100644 --- a/libjava/classpath/gnu/xml/validation/relaxng/AttributePattern.java +++ b/libjava/classpath/gnu/xml/validation/relaxng/AttributePattern.java @@ -1,4 +1,4 @@ -/* AttributePattern.java -- +/* AttributePattern.java -- Copyright (C) 2006 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -50,4 +50,3 @@ class AttributePattern Pattern pattern; } - diff --git a/libjava/classpath/gnu/xml/validation/relaxng/ChoiceNameClass.java b/libjava/classpath/gnu/xml/validation/relaxng/ChoiceNameClass.java index e196cd4eee3..9c762b92627 100644 --- a/libjava/classpath/gnu/xml/validation/relaxng/ChoiceNameClass.java +++ b/libjava/classpath/gnu/xml/validation/relaxng/ChoiceNameClass.java @@ -1,4 +1,4 @@ -/* ChoiceNameClass.java -- +/* ChoiceNameClass.java -- Copyright (C) 2006 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -54,6 +54,5 @@ class ChoiceNameClass return name1.matchesName(uri, localName) || name2.matchesName(uri, localName); } - -} +} diff --git a/libjava/classpath/gnu/xml/validation/relaxng/ChoicePattern.java b/libjava/classpath/gnu/xml/validation/relaxng/ChoicePattern.java index 54739b27008..48c96b2fb68 100644 --- a/libjava/classpath/gnu/xml/validation/relaxng/ChoicePattern.java +++ b/libjava/classpath/gnu/xml/validation/relaxng/ChoicePattern.java @@ -1,4 +1,4 @@ -/* ChoicePattern.java -- +/* ChoicePattern.java -- Copyright (C) 2006 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -50,4 +50,3 @@ class ChoicePattern Pattern pattern2; } - diff --git a/libjava/classpath/gnu/xml/validation/relaxng/DataPattern.java b/libjava/classpath/gnu/xml/validation/relaxng/DataPattern.java index 2315b2ce609..f4e36c7266d 100644 --- a/libjava/classpath/gnu/xml/validation/relaxng/DataPattern.java +++ b/libjava/classpath/gnu/xml/validation/relaxng/DataPattern.java @@ -1,4 +1,4 @@ -/* DataPattern.java -- +/* DataPattern.java -- Copyright (C) 2006 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -55,6 +55,5 @@ class DataPattern DatatypeLibrary datatypeLibrary; List params = new LinkedList(); Pattern exceptPattern; - -} +} diff --git a/libjava/classpath/gnu/xml/validation/relaxng/Define.java b/libjava/classpath/gnu/xml/validation/relaxng/Define.java index 8801d581e28..ffb1d41ee03 100644 --- a/libjava/classpath/gnu/xml/validation/relaxng/Define.java +++ b/libjava/classpath/gnu/xml/validation/relaxng/Define.java @@ -1,4 +1,4 @@ -/* Define.java -- +/* Define.java -- Copyright (C) 2006 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -47,6 +47,5 @@ class Define String name; ElementPattern element; - -} +} diff --git a/libjava/classpath/gnu/xml/validation/relaxng/ElementPattern.java b/libjava/classpath/gnu/xml/validation/relaxng/ElementPattern.java index 9ff3570755a..e02731968e5 100644 --- a/libjava/classpath/gnu/xml/validation/relaxng/ElementPattern.java +++ b/libjava/classpath/gnu/xml/validation/relaxng/ElementPattern.java @@ -1,4 +1,4 @@ -/* ElementPattern.java -- +/* ElementPattern.java -- Copyright (C) 2006 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -50,4 +50,3 @@ class ElementPattern Pattern pattern; } - diff --git a/libjava/classpath/gnu/xml/validation/relaxng/EmptyPattern.java b/libjava/classpath/gnu/xml/validation/relaxng/EmptyPattern.java index ce568f84b34..13c2d3f6131 100644 --- a/libjava/classpath/gnu/xml/validation/relaxng/EmptyPattern.java +++ b/libjava/classpath/gnu/xml/validation/relaxng/EmptyPattern.java @@ -1,4 +1,4 @@ -/* EmptyPattern.java -- +/* EmptyPattern.java -- Copyright (C) 2006 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -49,4 +49,3 @@ class EmptyPattern static final EmptyPattern INSTANCE = new EmptyPattern(); } - diff --git a/libjava/classpath/gnu/xml/validation/relaxng/FullSyntaxBuilder.java b/libjava/classpath/gnu/xml/validation/relaxng/FullSyntaxBuilder.java index 78e9f853327..bb73c4f38a4 100644 --- a/libjava/classpath/gnu/xml/validation/relaxng/FullSyntaxBuilder.java +++ b/libjava/classpath/gnu/xml/validation/relaxng/FullSyntaxBuilder.java @@ -1,4 +1,4 @@ -/* FullSyntaxBuilder.java -- +/* FullSyntaxBuilder.java -- Copyright (C) 2006 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -97,7 +97,7 @@ class FullSyntaxBuilder defineAttrs.add("name"); defineAttrs.add("combine"); Set nsAttrs = Collections.singleton("ns"); - + VOCABULARY.put("element", elementAttrs); VOCABULARY.put("attribute", elementAttrs); VOCABULARY.put("group", Collections.EMPTY_SET); @@ -164,10 +164,10 @@ class FullSyntaxBuilder { urls = new HashSet(); refCount = 1; - + doc.normalizeDocument(); // Normalize XML document transform(doc); // Apply transformation rules to provide simple syntax - + // 4.18. grammar element Element p = doc.getDocumentElement(); Element grammar = @@ -248,7 +248,7 @@ class FullSyntaxBuilder } transform2(p); // Apply second stage transformation rules - + Grammar ret = parseGrammar(grammar); datatypeLibraries = null; // free datatype libraries cache return ret; @@ -463,7 +463,7 @@ class FullSyntaxBuilder !"grammar".equals(eName)) throw new GrammarException("included element is not " + "a grammar"); - + transform(element); urls.remove(href); // handle components @@ -513,9 +513,9 @@ class FullSyntaxBuilder } // transform to div element Document doc = include.getOwnerDocument(); - Element includeDiv = + Element includeDiv = doc.createElementNS(XMLConstants.RELAXNG_NS_URI, "div"); - Element grammarDiv = + Element grammarDiv = doc.createElementNS(XMLConstants.RELAXNG_NS_URI, "div"); // XXX copy include non-href attributes (none defined?) element = (Element) doc.importNode(element, true); @@ -849,7 +849,7 @@ class FullSyntaxBuilder } } } - + break; case Node.TEXT_NODE: case Node.CDATA_SECTION_NODE: @@ -935,7 +935,7 @@ class FullSyntaxBuilder Node grammar = grammar2; if ("parentRef".equals(elementName)) grammar = grammar1; - + String name = ((Element) node).getAttribute("name"); if (name != null) throw new GrammarException("no name attribute on " + @@ -1240,7 +1240,7 @@ class FullSyntaxBuilder } node.appendChild(child); } - + private static Element getFirstChildElement(Node node) { Node ctx = node.getFirstChild(); @@ -1485,7 +1485,7 @@ class FullSyntaxBuilder value.value = node.getTextContent(); return value; } - + ListPattern parseList(Element node) throws GrammarException { diff --git a/libjava/classpath/gnu/xml/validation/relaxng/Grammar.java b/libjava/classpath/gnu/xml/validation/relaxng/Grammar.java index 76eff4f3a10..c2407da2bc4 100644 --- a/libjava/classpath/gnu/xml/validation/relaxng/Grammar.java +++ b/libjava/classpath/gnu/xml/validation/relaxng/Grammar.java @@ -1,4 +1,4 @@ -/* Grammar.java -- +/* Grammar.java -- Copyright (C) 2006 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -65,6 +65,5 @@ class Grammar // TODO return null; } - -} +} diff --git a/libjava/classpath/gnu/xml/validation/relaxng/GrammarException.java b/libjava/classpath/gnu/xml/validation/relaxng/GrammarException.java index 71d03de97c6..167cf6482e5 100644 --- a/libjava/classpath/gnu/xml/validation/relaxng/GrammarException.java +++ b/libjava/classpath/gnu/xml/validation/relaxng/GrammarException.java @@ -1,4 +1,4 @@ -/* GrammarException.java -- +/* GrammarException.java -- Copyright (C) 2006 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -52,5 +52,5 @@ class GrammarException { super(message); } - + } diff --git a/libjava/classpath/gnu/xml/validation/relaxng/GrammarValidator.java b/libjava/classpath/gnu/xml/validation/relaxng/GrammarValidator.java index d811aeec94e..e4ff3dab42a 100644 --- a/libjava/classpath/gnu/xml/validation/relaxng/GrammarValidator.java +++ b/libjava/classpath/gnu/xml/validation/relaxng/GrammarValidator.java @@ -1,4 +1,4 @@ -/* GrammarValidator.java -- +/* GrammarValidator.java -- Copyright (C) 2006 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -93,5 +93,5 @@ class GrammarValidator { // TODO } - + } diff --git a/libjava/classpath/gnu/xml/validation/relaxng/GroupPattern.java b/libjava/classpath/gnu/xml/validation/relaxng/GroupPattern.java index b01090efa4b..b63c7aaa7fb 100644 --- a/libjava/classpath/gnu/xml/validation/relaxng/GroupPattern.java +++ b/libjava/classpath/gnu/xml/validation/relaxng/GroupPattern.java @@ -1,4 +1,4 @@ -/* GroupPattern.java -- +/* GroupPattern.java -- Copyright (C) 2006 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -48,6 +48,5 @@ class GroupPattern Pattern pattern1; Pattern pattern2; - -} +} diff --git a/libjava/classpath/gnu/xml/validation/relaxng/InterleavePattern.java b/libjava/classpath/gnu/xml/validation/relaxng/InterleavePattern.java index aa7c28e5e8a..8a877d7af6e 100644 --- a/libjava/classpath/gnu/xml/validation/relaxng/InterleavePattern.java +++ b/libjava/classpath/gnu/xml/validation/relaxng/InterleavePattern.java @@ -1,4 +1,4 @@ -/* InterleavePattern.java -- +/* InterleavePattern.java -- Copyright (C) 2006 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -48,6 +48,5 @@ class InterleavePattern Pattern pattern1; Pattern pattern2; - -} +} diff --git a/libjava/classpath/gnu/xml/validation/relaxng/ListPattern.java b/libjava/classpath/gnu/xml/validation/relaxng/ListPattern.java index 4c0393ae572..e16d5f6e5db 100644 --- a/libjava/classpath/gnu/xml/validation/relaxng/ListPattern.java +++ b/libjava/classpath/gnu/xml/validation/relaxng/ListPattern.java @@ -1,4 +1,4 @@ -/* ListPattern.java -- +/* ListPattern.java -- Copyright (C) 2006 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -49,4 +49,3 @@ class ListPattern Pattern pattern; } - diff --git a/libjava/classpath/gnu/xml/validation/relaxng/NSNameNameClass.java b/libjava/classpath/gnu/xml/validation/relaxng/NSNameNameClass.java index f485e997016..2f620c1d0e4 100644 --- a/libjava/classpath/gnu/xml/validation/relaxng/NSNameNameClass.java +++ b/libjava/classpath/gnu/xml/validation/relaxng/NSNameNameClass.java @@ -1,4 +1,4 @@ -/* NSNameNameClass.java -- +/* NSNameNameClass.java -- Copyright (C) 2006 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -56,6 +56,5 @@ class NSNameNameClass return (exceptNameClass == null) ? true : !exceptNameClass.matchesName(uri, localName); } - -} +} diff --git a/libjava/classpath/gnu/xml/validation/relaxng/NameClass.java b/libjava/classpath/gnu/xml/validation/relaxng/NameClass.java index 2a3dc83e510..0ef9ef1315d 100644 --- a/libjava/classpath/gnu/xml/validation/relaxng/NameClass.java +++ b/libjava/classpath/gnu/xml/validation/relaxng/NameClass.java @@ -1,4 +1,4 @@ -/* NameClass.java -- +/* NameClass.java -- Copyright (C) 2006 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -46,5 +46,5 @@ abstract class NameClass { abstract boolean matchesName(String uri, String localName); - + } diff --git a/libjava/classpath/gnu/xml/validation/relaxng/NameNameClass.java b/libjava/classpath/gnu/xml/validation/relaxng/NameNameClass.java index d5a0c5f0403..b2d0e04ee3e 100644 --- a/libjava/classpath/gnu/xml/validation/relaxng/NameNameClass.java +++ b/libjava/classpath/gnu/xml/validation/relaxng/NameNameClass.java @@ -1,4 +1,4 @@ -/* NameNameClass.java -- +/* NameNameClass.java -- Copyright (C) 2006 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -57,4 +57,3 @@ class NameNameClass } } - diff --git a/libjava/classpath/gnu/xml/validation/relaxng/NotAllowedPattern.java b/libjava/classpath/gnu/xml/validation/relaxng/NotAllowedPattern.java index 8263a4573fa..d56afb2d768 100644 --- a/libjava/classpath/gnu/xml/validation/relaxng/NotAllowedPattern.java +++ b/libjava/classpath/gnu/xml/validation/relaxng/NotAllowedPattern.java @@ -1,4 +1,4 @@ -/* NotAllowedPattern.java -- +/* NotAllowedPattern.java -- Copyright (C) 2006 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -49,5 +49,3 @@ class NotAllowedPattern static final NotAllowedPattern INSTANCE = new NotAllowedPattern(); } - - diff --git a/libjava/classpath/gnu/xml/validation/relaxng/OneOrMorePattern.java b/libjava/classpath/gnu/xml/validation/relaxng/OneOrMorePattern.java index 99864d72a59..0545130ad8e 100644 --- a/libjava/classpath/gnu/xml/validation/relaxng/OneOrMorePattern.java +++ b/libjava/classpath/gnu/xml/validation/relaxng/OneOrMorePattern.java @@ -1,4 +1,4 @@ -/* OneOrMorePattern.java -- +/* OneOrMorePattern.java -- Copyright (C) 2006 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -49,4 +49,3 @@ class OneOrMorePattern Pattern pattern; } - diff --git a/libjava/classpath/gnu/xml/validation/relaxng/Param.java b/libjava/classpath/gnu/xml/validation/relaxng/Param.java index 246ad20b7c5..65a1b6689bf 100644 --- a/libjava/classpath/gnu/xml/validation/relaxng/Param.java +++ b/libjava/classpath/gnu/xml/validation/relaxng/Param.java @@ -1,4 +1,4 @@ -/* Param.java -- +/* Param.java -- Copyright (C) 2006 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -49,4 +49,3 @@ class Param String value; } - diff --git a/libjava/classpath/gnu/xml/validation/relaxng/Pattern.java b/libjava/classpath/gnu/xml/validation/relaxng/Pattern.java index 3bf9a9919b9..157f22316c7 100644 --- a/libjava/classpath/gnu/xml/validation/relaxng/Pattern.java +++ b/libjava/classpath/gnu/xml/validation/relaxng/Pattern.java @@ -1,4 +1,4 @@ -/* Pattern.java -- +/* Pattern.java -- Copyright (C) 2006 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -45,4 +45,3 @@ package gnu.xml.validation.relaxng; abstract class Pattern { } - diff --git a/libjava/classpath/gnu/xml/validation/relaxng/RELAXNGSchemaFactory.java b/libjava/classpath/gnu/xml/validation/relaxng/RELAXNGSchemaFactory.java index 890ca8eeb89..c0c9bd8876b 100644 --- a/libjava/classpath/gnu/xml/validation/relaxng/RELAXNGSchemaFactory.java +++ b/libjava/classpath/gnu/xml/validation/relaxng/RELAXNGSchemaFactory.java @@ -1,4 +1,4 @@ -/* RelaxNGSchemaFactory.java -- +/* RelaxNGSchemaFactory.java -- Copyright (C) 2006 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -75,7 +75,7 @@ public class RELAXNGSchemaFactory public void setResourceResolver(LSResourceResolver resourceResolver) { this.resourceResolver = resourceResolver; - } + } public ErrorHandler getErrorHandler() { @@ -84,7 +84,7 @@ public class RELAXNGSchemaFactory public void setErrorHandler(ErrorHandler errorHandler) { - this.errorHandler = errorHandler; + this.errorHandler = errorHandler; } public boolean isSchemaLanguageSupported(String schemaLanguage) @@ -159,5 +159,5 @@ public class RELAXNGSchemaFactory throw e2; } } - + } diff --git a/libjava/classpath/gnu/xml/validation/relaxng/RefPattern.java b/libjava/classpath/gnu/xml/validation/relaxng/RefPattern.java index d7de09542da..8c1ff8539e0 100644 --- a/libjava/classpath/gnu/xml/validation/relaxng/RefPattern.java +++ b/libjava/classpath/gnu/xml/validation/relaxng/RefPattern.java @@ -1,4 +1,4 @@ -/* RefPattern.java -- +/* RefPattern.java -- Copyright (C) 2006 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -49,4 +49,3 @@ class RefPattern String name; } - diff --git a/libjava/classpath/gnu/xml/validation/relaxng/TextPattern.java b/libjava/classpath/gnu/xml/validation/relaxng/TextPattern.java index 06af3c34ad9..81c50282025 100644 --- a/libjava/classpath/gnu/xml/validation/relaxng/TextPattern.java +++ b/libjava/classpath/gnu/xml/validation/relaxng/TextPattern.java @@ -1,4 +1,4 @@ -/* TextPattern.java -- +/* TextPattern.java -- Copyright (C) 2006 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -49,4 +49,3 @@ class TextPattern static final TextPattern INSTANCE = new TextPattern(); } - diff --git a/libjava/classpath/gnu/xml/validation/relaxng/ValuePattern.java b/libjava/classpath/gnu/xml/validation/relaxng/ValuePattern.java index 81260b0caf1..8b63d79ae5c 100644 --- a/libjava/classpath/gnu/xml/validation/relaxng/ValuePattern.java +++ b/libjava/classpath/gnu/xml/validation/relaxng/ValuePattern.java @@ -1,4 +1,4 @@ -/* ValuePattern.java -- +/* ValuePattern.java -- Copyright (C) 2006 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -53,6 +53,5 @@ class ValuePattern Datatype type; String ns; String value; - -} +} |
