diff options
Diffstat (limited to 'libjava/classpath/gnu/xml/validation/xmlschema')
16 files changed, 53 insertions, 69 deletions
diff --git a/libjava/classpath/gnu/xml/validation/xmlschema/AnyAttribute.java b/libjava/classpath/gnu/xml/validation/xmlschema/AnyAttribute.java index df90dc626ab..6f94bfe2810 100644 --- a/libjava/classpath/gnu/xml/validation/xmlschema/AnyAttribute.java +++ b/libjava/classpath/gnu/xml/validation/xmlschema/AnyAttribute.java @@ -1,4 +1,4 @@ -/* AnyAttribute.java -- +/* AnyAttribute.java -- Copyright (C) 2006 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -62,6 +62,5 @@ final class AnyAttribute this.namespace = namespace; this.processContents = processContents; } - -} +} diff --git a/libjava/classpath/gnu/xml/validation/xmlschema/AttributeDeclaration.java b/libjava/classpath/gnu/xml/validation/xmlschema/AttributeDeclaration.java index 98b322bee58..c475b368d15 100644 --- a/libjava/classpath/gnu/xml/validation/xmlschema/AttributeDeclaration.java +++ b/libjava/classpath/gnu/xml/validation/xmlschema/AttributeDeclaration.java @@ -1,4 +1,4 @@ -/* AttributeDeclaration.java -- +/* AttributeDeclaration.java -- Copyright (C) 2006 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -63,7 +63,7 @@ class AttributeDeclaration * One of NONE, DEFAULT, FIXED. */ final int type; - + /** * The value constraint. */ @@ -78,7 +78,7 @@ class AttributeDeclaration * The type definition corresponding to this attribute. */ final SimpleType datatype; - + /** * The annotation associated with this attribute declaration, if any. */ @@ -94,6 +94,5 @@ class AttributeDeclaration this.datatype = datatype; this.annotation = annotation; } - -} +} diff --git a/libjava/classpath/gnu/xml/validation/xmlschema/AttributeUse.java b/libjava/classpath/gnu/xml/validation/xmlschema/AttributeUse.java index f8bb11b911c..93707633877 100644 --- a/libjava/classpath/gnu/xml/validation/xmlschema/AttributeUse.java +++ b/libjava/classpath/gnu/xml/validation/xmlschema/AttributeUse.java @@ -1,4 +1,4 @@ -/* AttributeUse.java -- +/* AttributeUse.java -- Copyright (C) 2006 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -55,7 +55,7 @@ class AttributeUse * One of NONE, DEFAULT, FIXED. */ final int type; - + /** * The value constraint. */ @@ -74,6 +74,5 @@ class AttributeUse this.value = value; this.declaration = declaration; } - -} +} diff --git a/libjava/classpath/gnu/xml/validation/xmlschema/ComplexType.java b/libjava/classpath/gnu/xml/validation/xmlschema/ComplexType.java index 2c7acb10a18..826ba32d9e3 100644 --- a/libjava/classpath/gnu/xml/validation/xmlschema/ComplexType.java +++ b/libjava/classpath/gnu/xml/validation/xmlschema/ComplexType.java @@ -1,4 +1,4 @@ -/* ComplexType.java -- +/* ComplexType.java -- Copyright (C) 2006 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -97,6 +97,5 @@ class ComplexType this.finality = finality; attributeUses = new LinkedHashSet(); } - -} +} diff --git a/libjava/classpath/gnu/xml/validation/xmlschema/ElementDeclaration.java b/libjava/classpath/gnu/xml/validation/xmlschema/ElementDeclaration.java index d41f5e536e1..7392ca5965f 100644 --- a/libjava/classpath/gnu/xml/validation/xmlschema/ElementDeclaration.java +++ b/libjava/classpath/gnu/xml/validation/xmlschema/ElementDeclaration.java @@ -1,4 +1,4 @@ -/* ElementDeclaration.java -- +/* ElementDeclaration.java -- Copyright (C) 2006 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -58,7 +58,7 @@ class ElementDeclaration * The type definition corresponding to this element. */ Type datatype; - + /** * The scope of this schema component. * One of GLOBAL, LOCAL, or ABSENT. @@ -75,7 +75,7 @@ class ElementDeclaration * One of NONE, DEFAULT, FIXED. */ final int type; - + /** * The value constraint. */ @@ -84,7 +84,7 @@ class ElementDeclaration final boolean nillable; // TODO identity-constraint definitions - + final QName substitutionGroup; final int substitutionGroupExclusions; @@ -120,6 +120,5 @@ class ElementDeclaration this.disallowedSubstitutions = disallowedSubstitutions; this.isAbstract = isAbstract; } - -} +} diff --git a/libjava/classpath/gnu/xml/validation/xmlschema/Particle.java b/libjava/classpath/gnu/xml/validation/xmlschema/Particle.java index 995c4ff09cf..5fe49203ee3 100644 --- a/libjava/classpath/gnu/xml/validation/xmlschema/Particle.java +++ b/libjava/classpath/gnu/xml/validation/xmlschema/Particle.java @@ -1,4 +1,4 @@ -/* Particle.java -- +/* Particle.java -- Copyright (C) 2006 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -56,6 +56,5 @@ class Particle this.maxOccurs = maxOccurs; this.term = term; } - -} +} diff --git a/libjava/classpath/gnu/xml/validation/xmlschema/ValidationException.java b/libjava/classpath/gnu/xml/validation/xmlschema/ValidationException.java index f2d68430982..716ba8800e0 100644 --- a/libjava/classpath/gnu/xml/validation/xmlschema/ValidationException.java +++ b/libjava/classpath/gnu/xml/validation/xmlschema/ValidationException.java @@ -1,4 +1,4 @@ -/* ValidationException.java -- +/* ValidationException.java -- Copyright (C) 2006 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -53,6 +53,5 @@ class ValidationException { super(message, locator); } - -} +} diff --git a/libjava/classpath/gnu/xml/validation/xmlschema/XMLSchema.java b/libjava/classpath/gnu/xml/validation/xmlschema/XMLSchema.java index 647cbdeffd0..fb8eb88b18d 100644 --- a/libjava/classpath/gnu/xml/validation/xmlschema/XMLSchema.java +++ b/libjava/classpath/gnu/xml/validation/xmlschema/XMLSchema.java @@ -1,4 +1,4 @@ -/* XMLSchema.java -- +/* XMLSchema.java -- Copyright (C) 2006 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -58,7 +58,7 @@ final class XMLSchema static final int FINAL_LIST = 0x04; static final int FINAL_UNION = 0x08; static final int FINAL_ALL = 0x0f; - + static final int BLOCK_NONE = 0x00; static final int BLOCK_EXTENSION = 0x01; static final int BLOCK_RESTRICTION = 0x02; @@ -129,6 +129,5 @@ final class XMLSchema //return new XMLSchemaValidatorHandler(this); return null; } - -} +} diff --git a/libjava/classpath/gnu/xml/validation/xmlschema/XMLSchemaAttributeTypeInfo.java b/libjava/classpath/gnu/xml/validation/xmlschema/XMLSchemaAttributeTypeInfo.java index 45064075a96..ba83973dfaa 100644 --- a/libjava/classpath/gnu/xml/validation/xmlschema/XMLSchemaAttributeTypeInfo.java +++ b/libjava/classpath/gnu/xml/validation/xmlschema/XMLSchemaAttributeTypeInfo.java @@ -1,4 +1,4 @@ -/* XMLSchemaAttributeTypeInfo.java -- +/* XMLSchemaAttributeTypeInfo.java -- Copyright (C) 2006 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -94,6 +94,5 @@ final class XMLSchemaAttributeTypeInfo derivationMethod); } } - -} +} diff --git a/libjava/classpath/gnu/xml/validation/xmlschema/XMLSchemaBuilder.java b/libjava/classpath/gnu/xml/validation/xmlschema/XMLSchemaBuilder.java index ecf3ad3b89f..a7bad31293c 100644 --- a/libjava/classpath/gnu/xml/validation/xmlschema/XMLSchemaBuilder.java +++ b/libjava/classpath/gnu/xml/validation/xmlschema/XMLSchemaBuilder.java @@ -1,4 +1,4 @@ -/* XMLSchemaBuilder.java -- +/* XMLSchemaBuilder.java -- Copyright (C) 2006 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -209,7 +209,7 @@ class XMLSchemaBuilder datatype, annotation); } - else + else { boolean required = "required".equals(use); // TODO ref @@ -427,7 +427,7 @@ class XMLSchemaBuilder String sgNamespace = node.lookupNamespaceURI(sgPrefix); substitutionGroup = new QName(sgNamespace, sgName); } - + String block = getAttribute(attrs, "block"); int substitutionGroupExclusions = (block == null) ? schema.blockDefault : @@ -436,10 +436,10 @@ class XMLSchemaBuilder int disallowedSubstitutions = (final_ == null) ? schema.finalDefault : parseFullDerivationSet(final_); - + boolean nillable = "true".equals(getAttribute(attrs, "nillable")); boolean isAbstract = "true".equals(getAttribute(attrs, "abstract")); - + if (notTopLevel) { minOccurs = getOccurrence(getAttribute(attrs, "minOccurs")); @@ -463,11 +463,11 @@ class XMLSchemaBuilder scope, parent, constraintType, constraintValue, nillable, - substitutionGroup, - substitutionGroupExclusions, + substitutionGroup, + substitutionGroupExclusions, disallowedSubstitutions, isAbstract); - + for (Node child = node.getFirstChild(); child != null; child = child.getNextSibling()) { @@ -623,7 +623,7 @@ class XMLSchemaBuilder if (mixed) { type.contentType = XMLSchema.CONTENT_MIXED; - } + } return type; } @@ -835,6 +835,5 @@ class XMLSchemaBuilder } return name; } - -} +} diff --git a/libjava/classpath/gnu/xml/validation/xmlschema/XMLSchemaElementTypeInfo.java b/libjava/classpath/gnu/xml/validation/xmlschema/XMLSchemaElementTypeInfo.java index a65133c20e4..99a59f39d80 100644 --- a/libjava/classpath/gnu/xml/validation/xmlschema/XMLSchemaElementTypeInfo.java +++ b/libjava/classpath/gnu/xml/validation/xmlschema/XMLSchemaElementTypeInfo.java @@ -1,4 +1,4 @@ -/* XMLSchemaElementTypeInfo.java -- +/* XMLSchemaElementTypeInfo.java -- Copyright (C) 2006 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -87,6 +87,5 @@ final class XMLSchemaElementTypeInfo return false; } } - -} +} diff --git a/libjava/classpath/gnu/xml/validation/xmlschema/XMLSchemaSchemaFactory.java b/libjava/classpath/gnu/xml/validation/xmlschema/XMLSchemaSchemaFactory.java index 2b985a28ccd..18e91f28d02 100644 --- a/libjava/classpath/gnu/xml/validation/xmlschema/XMLSchemaSchemaFactory.java +++ b/libjava/classpath/gnu/xml/validation/xmlschema/XMLSchemaSchemaFactory.java @@ -1,4 +1,4 @@ -/* XMLSchemaSchemaFactory.java -- +/* XMLSchemaSchemaFactory.java -- Copyright (C) 2006 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -77,7 +77,7 @@ public class XMLSchemaSchemaFactory { this.resourceResolver = resourceResolver; } - + public ErrorHandler getErrorHandler() { return this.errorHandler; @@ -85,7 +85,7 @@ public class XMLSchemaSchemaFactory public void setErrorHandler(ErrorHandler errorHandler) { - this.errorHandler = errorHandler; + this.errorHandler = errorHandler; } @@ -167,6 +167,5 @@ public class XMLSchemaSchemaFactory throw e2; } } - -} +} diff --git a/libjava/classpath/gnu/xml/validation/xmlschema/XMLSchemaTypeInfo.java b/libjava/classpath/gnu/xml/validation/xmlschema/XMLSchemaTypeInfo.java index 60cc25fc42b..c1ca95114aa 100644 --- a/libjava/classpath/gnu/xml/validation/xmlschema/XMLSchemaTypeInfo.java +++ b/libjava/classpath/gnu/xml/validation/xmlschema/XMLSchemaTypeInfo.java @@ -1,4 +1,4 @@ -/* XMLSchemaTypeInfo.java -- +/* XMLSchemaTypeInfo.java -- Copyright (C) 2006 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -72,6 +72,5 @@ abstract class XMLSchemaTypeInfo } return false; } - -} +} diff --git a/libjava/classpath/gnu/xml/validation/xmlschema/XMLSchemaTypeInfoProvider.java b/libjava/classpath/gnu/xml/validation/xmlschema/XMLSchemaTypeInfoProvider.java index 9b20c0c8db9..4fc80d34ba8 100644 --- a/libjava/classpath/gnu/xml/validation/xmlschema/XMLSchemaTypeInfoProvider.java +++ b/libjava/classpath/gnu/xml/validation/xmlschema/XMLSchemaTypeInfoProvider.java @@ -1,4 +1,4 @@ -/* XMLSchemaTypeInfoProvider.java -- +/* XMLSchemaTypeInfoProvider.java -- Copyright (C) 2006 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -77,6 +77,5 @@ final class XMLSchemaTypeInfoProvider { return handler.isSpecified(index); } - -} +} diff --git a/libjava/classpath/gnu/xml/validation/xmlschema/XMLSchemaValidator.java b/libjava/classpath/gnu/xml/validation/xmlschema/XMLSchemaValidator.java index 056babf64b5..6239ba6c6d6 100644 --- a/libjava/classpath/gnu/xml/validation/xmlschema/XMLSchemaValidator.java +++ b/libjava/classpath/gnu/xml/validation/xmlschema/XMLSchemaValidator.java @@ -1,4 +1,4 @@ -/* XMLSchemaValidator.java -- +/* XMLSchemaValidator.java -- Copyright (C) 2006 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -58,7 +58,7 @@ final class XMLSchemaValidator ErrorHandler errorHandler; LSResourceResolver resourceResolver; - + XMLSchemaValidator(XMLSchema schema) { this.schema = schema; @@ -93,6 +93,5 @@ final class XMLSchemaValidator { this.resourceResolver = resourceResolver; } - -} +} diff --git a/libjava/classpath/gnu/xml/validation/xmlschema/XMLSchemaValidatorHandler.java b/libjava/classpath/gnu/xml/validation/xmlschema/XMLSchemaValidatorHandler.java index 9e6d8e9a9cb..6c4f1f392c8 100644 --- a/libjava/classpath/gnu/xml/validation/xmlschema/XMLSchemaValidatorHandler.java +++ b/libjava/classpath/gnu/xml/validation/xmlschema/XMLSchemaValidatorHandler.java @@ -1,4 +1,4 @@ -/* XMLSchemaValidatorHandler.java -- +/* XMLSchemaValidatorHandler.java -- Copyright (C) 2006 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -260,7 +260,7 @@ final class XMLSchemaValidatorHandler } } // TODO 5, 6, 7 - + // parent if (!context.isEmpty()) { @@ -300,7 +300,7 @@ final class XMLSchemaValidatorHandler XMLSchemaAttributeTypeInfo attTypeInfo = new XMLSchemaAttributeTypeInfo(schema, attDecl, true); attributes.add(attTypeInfo); - + atts2.addAttribute(attUri, attLocalName, attQName, attType, attValue); atts2.setDeclared(count, declared); atts2.setSpecified(count, true); @@ -363,7 +363,7 @@ final class XMLSchemaValidatorHandler contentHandler.processingInstruction(target, data); } } - + public void skippedEntity(String name) throws SAXException { @@ -389,6 +389,5 @@ final class XMLSchemaValidatorHandler return Type.ANY_TYPE; return (SimpleType) typeLibrary.createDatatype(localName); } - -} +} |
