diff options
Diffstat (limited to 'libjava/classpath/gnu/xml/validation')
110 files changed, 312 insertions, 415 deletions
diff --git a/libjava/classpath/gnu/xml/validation/datatype/Annotation.java b/libjava/classpath/gnu/xml/validation/datatype/Annotation.java index cba6954b624..6438e2ebb28 100644 --- a/libjava/classpath/gnu/xml/validation/datatype/Annotation.java +++ b/libjava/classpath/gnu/xml/validation/datatype/Annotation.java @@ -1,4 +1,4 @@ -/* Annotation.java -- +/* Annotation.java -- Copyright (C) 2006 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -56,6 +56,5 @@ public class Annotation { return documentation; } - -} +} diff --git a/libjava/classpath/gnu/xml/validation/datatype/AnySimpleType.java b/libjava/classpath/gnu/xml/validation/datatype/AnySimpleType.java index 63441c70a1d..36fb98daa3d 100644 --- a/libjava/classpath/gnu/xml/validation/datatype/AnySimpleType.java +++ b/libjava/classpath/gnu/xml/validation/datatype/AnySimpleType.java @@ -1,4 +1,4 @@ -/* AnySimpleType.java -- +/* AnySimpleType.java -- Copyright (C) 2006 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -44,7 +44,7 @@ import javax.xml.namespace.QName; final class AnySimpleType extends SimpleType { - + AnySimpleType() { super(new QName(XMLConstants.W3C_XML_SCHEMA_NS_URI, "anySimpleType"), @@ -56,4 +56,3 @@ final class AnySimpleType } } - diff --git a/libjava/classpath/gnu/xml/validation/datatype/AnyType.java b/libjava/classpath/gnu/xml/validation/datatype/AnyType.java index f26a0756d8b..2a3f116dd1c 100644 --- a/libjava/classpath/gnu/xml/validation/datatype/AnyType.java +++ b/libjava/classpath/gnu/xml/validation/datatype/AnyType.java @@ -1,4 +1,4 @@ -/* AnyType.java -- +/* AnyType.java -- Copyright (C) 2006 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -43,7 +43,7 @@ import javax.xml.namespace.QName; final class AnyType extends SimpleType { - + AnyType() { super(new QName(XMLConstants.W3C_XML_SCHEMA_NS_URI, "anyType"), @@ -55,4 +55,3 @@ final class AnyType } } - diff --git a/libjava/classpath/gnu/xml/validation/datatype/AnyURIType.java b/libjava/classpath/gnu/xml/validation/datatype/AnyURIType.java index 56c0a0658ea..ef409b99cb1 100644 --- a/libjava/classpath/gnu/xml/validation/datatype/AnyURIType.java +++ b/libjava/classpath/gnu/xml/validation/datatype/AnyURIType.java @@ -1,4 +1,4 @@ -/* AnyURIType.java -- +/* AnyURIType.java -- Copyright (C) 2006 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -89,6 +89,5 @@ final class AnyURIType throw e2; } } - -} +} diff --git a/libjava/classpath/gnu/xml/validation/datatype/AtomicSimpleType.java b/libjava/classpath/gnu/xml/validation/datatype/AtomicSimpleType.java index d685e5cf00e..38528eecf8a 100644 --- a/libjava/classpath/gnu/xml/validation/datatype/AtomicSimpleType.java +++ b/libjava/classpath/gnu/xml/validation/datatype/AtomicSimpleType.java @@ -1,4 +1,4 @@ -/* AtomicSimpleType.java -- +/* AtomicSimpleType.java -- Copyright (C) 2006 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -50,7 +50,7 @@ import org.relaxng.datatype.ValidationContext; public class AtomicSimpleType extends SimpleType { - + public AtomicSimpleType(QName name, Set facets, int fundamentalFacets, @@ -73,6 +73,5 @@ public class AtomicSimpleType if (baseType != null) baseType.checkValid(value, context); } - -} +} diff --git a/libjava/classpath/gnu/xml/validation/datatype/Base64BinaryType.java b/libjava/classpath/gnu/xml/validation/datatype/Base64BinaryType.java index 2fc4c33b91e..3f3442f8c71 100644 --- a/libjava/classpath/gnu/xml/validation/datatype/Base64BinaryType.java +++ b/libjava/classpath/gnu/xml/validation/datatype/Base64BinaryType.java @@ -1,4 +1,4 @@ -/* Base64BinaryType.java -- +/* Base64BinaryType.java -- Copyright (C) 2006 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -98,7 +98,7 @@ final class Base64BinaryType char c1 = value.charAt(i--); if (c1 == ' ') c1 = value.charAt(i--); - + if (c4 == '=') { if (c3 == '=') @@ -124,6 +124,5 @@ final class Base64BinaryType throw new DatatypeException("illegal BASE64"); } } - -} +} diff --git a/libjava/classpath/gnu/xml/validation/datatype/BooleanType.java b/libjava/classpath/gnu/xml/validation/datatype/BooleanType.java index 25e488a05fd..5d98d241282 100644 --- a/libjava/classpath/gnu/xml/validation/datatype/BooleanType.java +++ b/libjava/classpath/gnu/xml/validation/datatype/BooleanType.java @@ -1,4 +1,4 @@ -/* BooleanType.java -- +/* BooleanType.java -- Copyright (C) 2006 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -80,11 +80,10 @@ final class BooleanType if (!VALUE_SPACE.contains(value)) throw new DatatypeException("invalid boolean value"); } - + public Object createValue(String literal, ValidationContext context) { return ("1".equals(literal) || "true".equals(literal)) ? Boolean.TRUE : Boolean.FALSE; } - -} +} diff --git a/libjava/classpath/gnu/xml/validation/datatype/ByteType.java b/libjava/classpath/gnu/xml/validation/datatype/ByteType.java index 539dba29a99..9bce45bf9a3 100644 --- a/libjava/classpath/gnu/xml/validation/datatype/ByteType.java +++ b/libjava/classpath/gnu/xml/validation/datatype/ByteType.java @@ -1,4 +1,4 @@ -/* ByteType.java -- +/* ByteType.java -- Copyright (C) 2006 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -117,7 +117,7 @@ final class ByteType throw new DatatypeException(i, "invalid byte value"); } } - + public Object createValue(String literal, ValidationContext context) { try { @@ -128,6 +128,5 @@ final class ByteType return null; } } - -} +} diff --git a/libjava/classpath/gnu/xml/validation/datatype/DateTimeType.java b/libjava/classpath/gnu/xml/validation/datatype/DateTimeType.java index 749ba8106c1..81d2785bc59 100644 --- a/libjava/classpath/gnu/xml/validation/datatype/DateTimeType.java +++ b/libjava/classpath/gnu/xml/validation/datatype/DateTimeType.java @@ -1,4 +1,4 @@ -/* DateTimeType.java -- +/* DateTimeType.java -- Copyright (C) 2006 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -213,7 +213,7 @@ final class DateTimeType throw new DatatypeException(len, "invalid dateTime value"); } } - + public Object createValue(String value, ValidationContext context) { int len = value.length(); int state = 0; @@ -330,6 +330,5 @@ final class DateTimeType return null; } } - -} +} diff --git a/libjava/classpath/gnu/xml/validation/datatype/DateType.java b/libjava/classpath/gnu/xml/validation/datatype/DateType.java index 6a4e1d771a7..8e6e3c35a67 100644 --- a/libjava/classpath/gnu/xml/validation/datatype/DateType.java +++ b/libjava/classpath/gnu/xml/validation/datatype/DateType.java @@ -1,4 +1,4 @@ -/* DateType.java -- +/* DateType.java -- Copyright (C) 2006 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -128,7 +128,7 @@ final class DateType throw new DatatypeException("invalid date value"); } } - + public Object createValue(String value, ValidationContext context) { int len = value.length(); int state = 0; @@ -217,6 +217,5 @@ final class DateType return null; } } - -} +} diff --git a/libjava/classpath/gnu/xml/validation/datatype/DecimalType.java b/libjava/classpath/gnu/xml/validation/datatype/DecimalType.java index b895c44b213..43a26a39958 100644 --- a/libjava/classpath/gnu/xml/validation/datatype/DecimalType.java +++ b/libjava/classpath/gnu/xml/validation/datatype/DecimalType.java @@ -1,4 +1,4 @@ -/* DecimalType.java -- +/* DecimalType.java -- Copyright (C) 2006 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -103,7 +103,7 @@ final class DecimalType throw new DatatypeException(i, "invalid decimal value"); } } - + public Object createValue(String literal, ValidationContext context) { try { @@ -114,6 +114,5 @@ final class DecimalType return null; } } - -} +} diff --git a/libjava/classpath/gnu/xml/validation/datatype/DoubleType.java b/libjava/classpath/gnu/xml/validation/datatype/DoubleType.java index 5d2d8662d56..dfaa7c8cb77 100644 --- a/libjava/classpath/gnu/xml/validation/datatype/DoubleType.java +++ b/libjava/classpath/gnu/xml/validation/datatype/DoubleType.java @@ -1,4 +1,4 @@ -/* DoubleType.java -- +/* DoubleType.java -- Copyright (C) 2006 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -95,7 +95,7 @@ final class DoubleType throw e2; } } - + public Object createValue(String literal, ValidationContext context) { try { @@ -106,6 +106,5 @@ final class DoubleType return null; } } - -} +} diff --git a/libjava/classpath/gnu/xml/validation/datatype/DurationType.java b/libjava/classpath/gnu/xml/validation/datatype/DurationType.java index 2cb92baae61..6c0f7b889e9 100644 --- a/libjava/classpath/gnu/xml/validation/datatype/DurationType.java +++ b/libjava/classpath/gnu/xml/validation/datatype/DurationType.java @@ -1,4 +1,4 @@ -/* DurationType.java -- +/* DurationType.java -- Copyright (C) 2006 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -103,7 +103,7 @@ final class DurationType } return 0; } - + } static final int[] CONSTRAINING_FACETS = { @@ -170,7 +170,7 @@ final class DurationType throw new DatatypeException(i, "illegal duration value"); } } - + public Object createValue(String value, ValidationContext context) { boolean negative = false; int days = 0, months = 0, years = 0; @@ -236,4 +236,3 @@ final class DurationType } } - diff --git a/libjava/classpath/gnu/xml/validation/datatype/EntitiesType.java b/libjava/classpath/gnu/xml/validation/datatype/EntitiesType.java index d16106e0044..5415e88e243 100644 --- a/libjava/classpath/gnu/xml/validation/datatype/EntitiesType.java +++ b/libjava/classpath/gnu/xml/validation/datatype/EntitiesType.java @@ -1,4 +1,4 @@ -/* EntitiesType.java -- +/* EntitiesType.java -- Copyright (C) 2006 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -104,6 +104,5 @@ final class EntitiesType { return true; } - -} +} diff --git a/libjava/classpath/gnu/xml/validation/datatype/EntityType.java b/libjava/classpath/gnu/xml/validation/datatype/EntityType.java index f1443bcb983..f4a10bd507f 100644 --- a/libjava/classpath/gnu/xml/validation/datatype/EntityType.java +++ b/libjava/classpath/gnu/xml/validation/datatype/EntityType.java @@ -1,4 +1,4 @@ -/* EntityType.java -- +/* EntityType.java -- Copyright (C) 2006 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -83,6 +83,5 @@ final class EntityType { return true; } - -} +} diff --git a/libjava/classpath/gnu/xml/validation/datatype/EnumerationFacet.java b/libjava/classpath/gnu/xml/validation/datatype/EnumerationFacet.java index 0ad3d3fa4d3..45b9c23785b 100644 --- a/libjava/classpath/gnu/xml/validation/datatype/EnumerationFacet.java +++ b/libjava/classpath/gnu/xml/validation/datatype/EnumerationFacet.java @@ -1,4 +1,4 @@ -/* EnumerationFacet.java -- +/* EnumerationFacet.java -- Copyright (C) 2006 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -45,7 +45,7 @@ package gnu.xml.validation.datatype; public final class EnumerationFacet extends Facet { - + public final String value; public EnumerationFacet(String value, Annotation annotation) @@ -64,6 +64,5 @@ public final class EnumerationFacet return (other instanceof EnumerationFacet && ((EnumerationFacet) other).value.equals(value)); } - -} +} diff --git a/libjava/classpath/gnu/xml/validation/datatype/Facet.java b/libjava/classpath/gnu/xml/validation/datatype/Facet.java index 490abf8eeb7..9f18bedc86f 100644 --- a/libjava/classpath/gnu/xml/validation/datatype/Facet.java +++ b/libjava/classpath/gnu/xml/validation/datatype/Facet.java @@ -1,4 +1,4 @@ -/* Facet.java -- +/* Facet.java -- Copyright (C) 2006 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -73,6 +73,5 @@ public abstract class Facet this.type = type; this.annotation = annotation; } - -} +} diff --git a/libjava/classpath/gnu/xml/validation/datatype/FloatType.java b/libjava/classpath/gnu/xml/validation/datatype/FloatType.java index 372e38871ae..8dbb4aa56fa 100644 --- a/libjava/classpath/gnu/xml/validation/datatype/FloatType.java +++ b/libjava/classpath/gnu/xml/validation/datatype/FloatType.java @@ -1,4 +1,4 @@ -/* FloatType.java -- +/* FloatType.java -- Copyright (C) 2006 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -95,7 +95,7 @@ final class FloatType throw e2; } } - + public Object createValue(String literal, ValidationContext context) { try { @@ -106,6 +106,5 @@ final class FloatType return null; } } - -} +} diff --git a/libjava/classpath/gnu/xml/validation/datatype/FractionDigitsFacet.java b/libjava/classpath/gnu/xml/validation/datatype/FractionDigitsFacet.java index efd986200e5..c0d714578e5 100644 --- a/libjava/classpath/gnu/xml/validation/datatype/FractionDigitsFacet.java +++ b/libjava/classpath/gnu/xml/validation/datatype/FractionDigitsFacet.java @@ -1,4 +1,4 @@ -/* FractionDigitsFacet.java -- +/* FractionDigitsFacet.java -- Copyright (C) 2006 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -45,7 +45,7 @@ package gnu.xml.validation.datatype; public final class FractionDigitsFacet extends Facet { - + public final int value; public final boolean fixed; @@ -56,7 +56,7 @@ public final class FractionDigitsFacet this.value = value; this.fixed = fixed; } - + public int hashCode() { return value; @@ -67,6 +67,5 @@ public final class FractionDigitsFacet return (other instanceof FractionDigitsFacet && ((FractionDigitsFacet) other).value == value); } - -} +} diff --git a/libjava/classpath/gnu/xml/validation/datatype/GDayType.java b/libjava/classpath/gnu/xml/validation/datatype/GDayType.java index 009af35850b..cc6b8e3d47b 100644 --- a/libjava/classpath/gnu/xml/validation/datatype/GDayType.java +++ b/libjava/classpath/gnu/xml/validation/datatype/GDayType.java @@ -1,4 +1,4 @@ -/* GDayType.java -- +/* GDayType.java -- Copyright (C) 2006 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -80,7 +80,7 @@ final class GDayType } return 0; } - + } static final int[] CONSTRAINING_FACETS = { @@ -157,7 +157,7 @@ final class GDayType throw new DatatypeException("invalid GDay value"); } } - + public Object createValue(String literal, ValidationContext context) { try { @@ -170,6 +170,5 @@ final class GDayType return null; } } - -} +} diff --git a/libjava/classpath/gnu/xml/validation/datatype/GMonthDayType.java b/libjava/classpath/gnu/xml/validation/datatype/GMonthDayType.java index a39a1cc4370..d293d9b572d 100644 --- a/libjava/classpath/gnu/xml/validation/datatype/GMonthDayType.java +++ b/libjava/classpath/gnu/xml/validation/datatype/GMonthDayType.java @@ -1,4 +1,4 @@ -/* GMonthDayType.java -- +/* GMonthDayType.java -- Copyright (C) 2006 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -88,7 +88,7 @@ final class GMonthDayType } return 0; } - + } static final int[] CONSTRAINING_FACETS = { @@ -165,7 +165,7 @@ final class GMonthDayType throw new DatatypeException("illegal GMonthDay type"); } } - + public Object createValue(String literal, ValidationContext context) { try { @@ -179,6 +179,5 @@ final class GMonthDayType return null; } } - -} +} diff --git a/libjava/classpath/gnu/xml/validation/datatype/GMonthType.java b/libjava/classpath/gnu/xml/validation/datatype/GMonthType.java index 5a08af2876a..9450874b90e 100644 --- a/libjava/classpath/gnu/xml/validation/datatype/GMonthType.java +++ b/libjava/classpath/gnu/xml/validation/datatype/GMonthType.java @@ -1,4 +1,4 @@ -/* GMonthType.java -- +/* GMonthType.java -- Copyright (C) 2006 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -80,7 +80,7 @@ final class GMonthType } return 0; } - + } static final int[] CONSTRAINING_FACETS = { @@ -146,7 +146,7 @@ final class GMonthType throw new DatatypeException("illegal GMonth value"); } } - + public Object createValue(String literal, ValidationContext context) { try { @@ -159,6 +159,5 @@ final class GMonthType return null; } } - -} +} diff --git a/libjava/classpath/gnu/xml/validation/datatype/GYearMonthType.java b/libjava/classpath/gnu/xml/validation/datatype/GYearMonthType.java index 9ec38c0e7bc..9aabfb61cde 100644 --- a/libjava/classpath/gnu/xml/validation/datatype/GYearMonthType.java +++ b/libjava/classpath/gnu/xml/validation/datatype/GYearMonthType.java @@ -1,4 +1,4 @@ -/* GYearMonthType.java -- +/* GYearMonthType.java -- Copyright (C) 2006 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -88,7 +88,7 @@ final class GYearMonthType } return 0; } - + } static final int[] CONSTRAINING_FACETS = { @@ -155,7 +155,7 @@ final class GYearMonthType throw new DatatypeException("illegal GYear value"); } } - + public Object createValue(String literal, ValidationContext context) { try { @@ -172,6 +172,5 @@ final class GYearMonthType return null; } } - -} +} diff --git a/libjava/classpath/gnu/xml/validation/datatype/GYearType.java b/libjava/classpath/gnu/xml/validation/datatype/GYearType.java index 6dea89b76a5..5b1e0323237 100644 --- a/libjava/classpath/gnu/xml/validation/datatype/GYearType.java +++ b/libjava/classpath/gnu/xml/validation/datatype/GYearType.java @@ -1,4 +1,4 @@ -/* GYearType.java -- +/* GYearType.java -- Copyright (C) 2006 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -80,7 +80,7 @@ final class GYearType } return 0; } - + } static final int[] CONSTRAINING_FACETS = { @@ -134,7 +134,7 @@ final class GYearType throw new DatatypeException("invalid GYear value"); } } - + public Object createValue(String literal, ValidationContext context) { try { @@ -147,6 +147,5 @@ final class GYearType return null; } } - -} +} diff --git a/libjava/classpath/gnu/xml/validation/datatype/HexBinaryType.java b/libjava/classpath/gnu/xml/validation/datatype/HexBinaryType.java index 8a92b15f634..5f133e322b6 100644 --- a/libjava/classpath/gnu/xml/validation/datatype/HexBinaryType.java +++ b/libjava/classpath/gnu/xml/validation/datatype/HexBinaryType.java @@ -1,4 +1,4 @@ -/* HexBinaryType.java -- +/* HexBinaryType.java -- Copyright (C) 2006 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -85,6 +85,5 @@ final class HexBinaryType throw new DatatypeException(i, "invalid hexBinary value"); } } - -} +} diff --git a/libjava/classpath/gnu/xml/validation/datatype/IDRefType.java b/libjava/classpath/gnu/xml/validation/datatype/IDRefType.java index 8ea9805b074..93208954979 100644 --- a/libjava/classpath/gnu/xml/validation/datatype/IDRefType.java +++ b/libjava/classpath/gnu/xml/validation/datatype/IDRefType.java @@ -1,4 +1,4 @@ -/* IDRefType.java -- +/* IDRefType.java -- Copyright (C) 2006 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -82,6 +82,5 @@ final class IDRefType { return ID_TYPE_IDREF; } - -} +} diff --git a/libjava/classpath/gnu/xml/validation/datatype/IDRefsType.java b/libjava/classpath/gnu/xml/validation/datatype/IDRefsType.java index 57f7e56d7ce..6adaed13bc7 100644 --- a/libjava/classpath/gnu/xml/validation/datatype/IDRefsType.java +++ b/libjava/classpath/gnu/xml/validation/datatype/IDRefsType.java @@ -1,4 +1,4 @@ -/* IDRefsType.java -- +/* IDRefsType.java -- Copyright (C) 2006 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -82,6 +82,5 @@ final class IDRefsType { return ID_TYPE_IDREFS; } - -} +} diff --git a/libjava/classpath/gnu/xml/validation/datatype/IDType.java b/libjava/classpath/gnu/xml/validation/datatype/IDType.java index c55601aaf8f..792601d78b3 100644 --- a/libjava/classpath/gnu/xml/validation/datatype/IDType.java +++ b/libjava/classpath/gnu/xml/validation/datatype/IDType.java @@ -1,4 +1,4 @@ -/* IDType.java -- +/* IDType.java -- Copyright (C) 2006 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -82,6 +82,5 @@ final class IDType { return ID_TYPE_ID; } - -} +} diff --git a/libjava/classpath/gnu/xml/validation/datatype/IntType.java b/libjava/classpath/gnu/xml/validation/datatype/IntType.java index 6bf78660459..c8f756832b7 100644 --- a/libjava/classpath/gnu/xml/validation/datatype/IntType.java +++ b/libjava/classpath/gnu/xml/validation/datatype/IntType.java @@ -1,4 +1,4 @@ -/* IntType.java -- +/* IntType.java -- Copyright (C) 2006 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -117,7 +117,7 @@ final class IntType throw new DatatypeException(i, "invalid int value"); } } - + public Object createValue(String literal, ValidationContext context) { try { @@ -128,6 +128,5 @@ final class IntType return null; } } - -} +} diff --git a/libjava/classpath/gnu/xml/validation/datatype/IntegerType.java b/libjava/classpath/gnu/xml/validation/datatype/IntegerType.java index 2098a7d8db8..b9a2a564a85 100644 --- a/libjava/classpath/gnu/xml/validation/datatype/IntegerType.java +++ b/libjava/classpath/gnu/xml/validation/datatype/IntegerType.java @@ -1,4 +1,4 @@ -/* IntegerType.java -- +/* IntegerType.java -- Copyright (C) 2006 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -94,7 +94,7 @@ final class IntegerType throw new DatatypeException(i, "invalid integer value"); } } - + public Object createValue(String literal, ValidationContext context) { try { @@ -105,6 +105,5 @@ final class IntegerType return null; } } - -} +} diff --git a/libjava/classpath/gnu/xml/validation/datatype/LanguageType.java b/libjava/classpath/gnu/xml/validation/datatype/LanguageType.java index 3df903c48c6..d30cc538f1a 100644 --- a/libjava/classpath/gnu/xml/validation/datatype/LanguageType.java +++ b/libjava/classpath/gnu/xml/validation/datatype/LanguageType.java @@ -1,4 +1,4 @@ -/* LanguageType.java -- +/* LanguageType.java -- Copyright (C) 2006 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -82,6 +82,5 @@ final class LanguageType if (!PATTERN.matcher(value).matches()) throw new DatatypeException("invalid language value"); } - -} +} diff --git a/libjava/classpath/gnu/xml/validation/datatype/LengthFacet.java b/libjava/classpath/gnu/xml/validation/datatype/LengthFacet.java index cab4496b12a..d6eaacd71c0 100644 --- a/libjava/classpath/gnu/xml/validation/datatype/LengthFacet.java +++ b/libjava/classpath/gnu/xml/validation/datatype/LengthFacet.java @@ -1,4 +1,4 @@ -/* LengthFacet.java -- +/* LengthFacet.java -- Copyright (C) 2006 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -45,7 +45,7 @@ package gnu.xml.validation.datatype; public final class LengthFacet extends Facet { - + public final int value; public final boolean fixed; @@ -56,7 +56,7 @@ public final class LengthFacet this.value = value; this.fixed = fixed; } - + public int hashCode() { return value; @@ -67,6 +67,5 @@ public final class LengthFacet return (other instanceof LengthFacet && ((LengthFacet) other).value == value); } - -} +} diff --git a/libjava/classpath/gnu/xml/validation/datatype/ListSimpleType.java b/libjava/classpath/gnu/xml/validation/datatype/ListSimpleType.java index 1f0cb76fac6..1e0d41d01bf 100644 --- a/libjava/classpath/gnu/xml/validation/datatype/ListSimpleType.java +++ b/libjava/classpath/gnu/xml/validation/datatype/ListSimpleType.java @@ -1,4 +1,4 @@ -/* ListSimpleType.java -- +/* ListSimpleType.java -- Copyright (C) 2006 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -56,7 +56,7 @@ public class ListSimpleType * The type of the items in this list (atomic or union). */ public final SimpleType itemType; - + public ListSimpleType(QName name, Set facets, int fundamentalFacets, SimpleType baseType, Annotation annotation, SimpleType itemType) @@ -64,7 +64,7 @@ public class ListSimpleType super(name, LIST, facets, fundamentalFacets, baseType, annotation); this.itemType = itemType; } - + public void checkValid(String value, ValidationContext context) throws DatatypeException { @@ -78,6 +78,5 @@ public class ListSimpleType itemType.checkValid(token, context); } } - -} +} diff --git a/libjava/classpath/gnu/xml/validation/datatype/LongType.java b/libjava/classpath/gnu/xml/validation/datatype/LongType.java index eaf69df38fa..781b17f62f6 100644 --- a/libjava/classpath/gnu/xml/validation/datatype/LongType.java +++ b/libjava/classpath/gnu/xml/validation/datatype/LongType.java @@ -1,4 +1,4 @@ -/* LongType.java -- +/* LongType.java -- Copyright (C) 2006 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -117,7 +117,7 @@ final class LongType throw new DatatypeException(i, "invalid long value"); } } - + public Object createValue(String literal, ValidationContext context) { try { @@ -128,6 +128,5 @@ final class LongType return null; } } - -} +} diff --git a/libjava/classpath/gnu/xml/validation/datatype/MaxExclusiveFacet.java b/libjava/classpath/gnu/xml/validation/datatype/MaxExclusiveFacet.java index 7aac1f743b1..90e940371e9 100644 --- a/libjava/classpath/gnu/xml/validation/datatype/MaxExclusiveFacet.java +++ b/libjava/classpath/gnu/xml/validation/datatype/MaxExclusiveFacet.java @@ -1,4 +1,4 @@ -/* MaxExclusiveFacet.java -- +/* MaxExclusiveFacet.java -- Copyright (C) 2006 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -49,7 +49,7 @@ import java.util.Date; public final class MaxExclusiveFacet extends Facet { - + public final Object value; // date or number public final boolean fixed; @@ -60,7 +60,7 @@ public final class MaxExclusiveFacet this.value = value; this.fixed = fixed; } - + public int hashCode() { return value.hashCode(); @@ -106,6 +106,5 @@ public final class MaxExclusiveFacet return false; return ((Number) test).doubleValue() < nvalue.doubleValue(); } - -} +} diff --git a/libjava/classpath/gnu/xml/validation/datatype/MaxInclusiveFacet.java b/libjava/classpath/gnu/xml/validation/datatype/MaxInclusiveFacet.java index bb145ed4115..c260113da71 100644 --- a/libjava/classpath/gnu/xml/validation/datatype/MaxInclusiveFacet.java +++ b/libjava/classpath/gnu/xml/validation/datatype/MaxInclusiveFacet.java @@ -1,4 +1,4 @@ -/* MaxInclusiveFacet.java -- +/* MaxInclusiveFacet.java -- Copyright (C) 2006 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -49,7 +49,7 @@ import java.util.Date; public final class MaxInclusiveFacet extends Facet { - + public final Object value; public final boolean fixed; @@ -60,7 +60,7 @@ public final class MaxInclusiveFacet this.value = value; this.fixed = fixed; } - + public int hashCode() { return value.hashCode(); @@ -71,7 +71,7 @@ public final class MaxInclusiveFacet return (other instanceof MaxInclusiveFacet && ((MaxInclusiveFacet) other).value.equals(value)); } - + boolean matches(Object test) { if (value instanceof Date) @@ -107,6 +107,5 @@ public final class MaxInclusiveFacet return false; return ((Number) test).doubleValue() <= nvalue.doubleValue(); } - -} +} diff --git a/libjava/classpath/gnu/xml/validation/datatype/MaxLengthFacet.java b/libjava/classpath/gnu/xml/validation/datatype/MaxLengthFacet.java index d0332631152..ba77ff2dfe7 100644 --- a/libjava/classpath/gnu/xml/validation/datatype/MaxLengthFacet.java +++ b/libjava/classpath/gnu/xml/validation/datatype/MaxLengthFacet.java @@ -1,4 +1,4 @@ -/* MaxLengthFacet.java -- +/* MaxLengthFacet.java -- Copyright (C) 2006 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -67,6 +67,5 @@ public final class MaxLengthFacet return (other instanceof MaxLengthFacet && ((MaxLengthFacet) other).value == value); } - -} +} diff --git a/libjava/classpath/gnu/xml/validation/datatype/MinExclusiveFacet.java b/libjava/classpath/gnu/xml/validation/datatype/MinExclusiveFacet.java index 2289bb11c61..a779d09d86d 100644 --- a/libjava/classpath/gnu/xml/validation/datatype/MinExclusiveFacet.java +++ b/libjava/classpath/gnu/xml/validation/datatype/MinExclusiveFacet.java @@ -1,4 +1,4 @@ -/* MinExclusiveFacet.java -- +/* MinExclusiveFacet.java -- Copyright (C) 2006 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -49,7 +49,7 @@ import java.util.Date; public final class MinExclusiveFacet extends Facet { - + public final Object value; public final boolean fixed; @@ -60,7 +60,7 @@ public final class MinExclusiveFacet this.value = value; this.fixed = fixed; } - + public int hashCode() { return value.hashCode(); @@ -71,7 +71,7 @@ public final class MinExclusiveFacet return (other instanceof MinExclusiveFacet && ((MinExclusiveFacet) other).value.equals(value)); } - + boolean matches(Object test) { if (value instanceof Date) @@ -106,6 +106,5 @@ public final class MinExclusiveFacet return false; return ((Number) test).doubleValue() > nvalue.doubleValue(); } - -} +} diff --git a/libjava/classpath/gnu/xml/validation/datatype/MinInclusiveFacet.java b/libjava/classpath/gnu/xml/validation/datatype/MinInclusiveFacet.java index 6c07c3644a8..6138c9af876 100644 --- a/libjava/classpath/gnu/xml/validation/datatype/MinInclusiveFacet.java +++ b/libjava/classpath/gnu/xml/validation/datatype/MinInclusiveFacet.java @@ -1,4 +1,4 @@ -/* MinInclusiveFacet.java -- +/* MinInclusiveFacet.java -- Copyright (C) 2006 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -49,7 +49,7 @@ import java.util.Date; public final class MinInclusiveFacet extends Facet { - + public final Object value; public final boolean fixed; @@ -60,7 +60,7 @@ public final class MinInclusiveFacet this.value = value; this.fixed = fixed; } - + public int hashCode() { return value.hashCode(); @@ -71,7 +71,7 @@ public final class MinInclusiveFacet return (other instanceof MinInclusiveFacet && ((MinInclusiveFacet) other).value.equals(value)); } - + boolean matches(Object test) { if (value instanceof Date) @@ -107,6 +107,5 @@ public final class MinInclusiveFacet return false; return ((Number) test).doubleValue() >= nvalue.doubleValue(); } - -} +} diff --git a/libjava/classpath/gnu/xml/validation/datatype/MinLengthFacet.java b/libjava/classpath/gnu/xml/validation/datatype/MinLengthFacet.java index c7dee200bad..f13e80b62d8 100644 --- a/libjava/classpath/gnu/xml/validation/datatype/MinLengthFacet.java +++ b/libjava/classpath/gnu/xml/validation/datatype/MinLengthFacet.java @@ -1,4 +1,4 @@ -/* MinLengthFacet.java -- +/* MinLengthFacet.java -- Copyright (C) 2006 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -67,6 +67,5 @@ public final class MinLengthFacet return (other instanceof MinLengthFacet && ((MinLengthFacet) other).value == value); } - -} +} diff --git a/libjava/classpath/gnu/xml/validation/datatype/NCNameType.java b/libjava/classpath/gnu/xml/validation/datatype/NCNameType.java index 4188d886af7..3f2088f9b30 100644 --- a/libjava/classpath/gnu/xml/validation/datatype/NCNameType.java +++ b/libjava/classpath/gnu/xml/validation/datatype/NCNameType.java @@ -1,4 +1,4 @@ -/* NCNameType.java -- +/* NCNameType.java -- Copyright (C) 2006 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -106,6 +106,5 @@ final class NCNameType throw e2; } } - -} +} diff --git a/libjava/classpath/gnu/xml/validation/datatype/NMTokenType.java b/libjava/classpath/gnu/xml/validation/datatype/NMTokenType.java index 4498fecfa1b..ca3271fefb0 100644 --- a/libjava/classpath/gnu/xml/validation/datatype/NMTokenType.java +++ b/libjava/classpath/gnu/xml/validation/datatype/NMTokenType.java @@ -1,4 +1,4 @@ -/* NMTokenType.java -- +/* NMTokenType.java -- Copyright (C) 2006 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -97,6 +97,5 @@ final class NMTokenType throw e2; } } - -} +} diff --git a/libjava/classpath/gnu/xml/validation/datatype/NMTokensType.java b/libjava/classpath/gnu/xml/validation/datatype/NMTokensType.java index d49964561a6..388b451db86 100644 --- a/libjava/classpath/gnu/xml/validation/datatype/NMTokensType.java +++ b/libjava/classpath/gnu/xml/validation/datatype/NMTokensType.java @@ -1,4 +1,4 @@ -/* NMTokensType.java -- +/* NMTokensType.java -- Copyright (C) 2006 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -120,7 +120,6 @@ final class NMTokensType throw e2; } } - - -} + +} diff --git a/libjava/classpath/gnu/xml/validation/datatype/NameType.java b/libjava/classpath/gnu/xml/validation/datatype/NameType.java index a2fbb9d5bb5..70349aed81b 100644 --- a/libjava/classpath/gnu/xml/validation/datatype/NameType.java +++ b/libjava/classpath/gnu/xml/validation/datatype/NameType.java @@ -1,4 +1,4 @@ -/* NameType.java -- +/* NameType.java -- Copyright (C) 2006 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -99,6 +99,5 @@ final class NameType throw e2; } } - -} +} diff --git a/libjava/classpath/gnu/xml/validation/datatype/NegativeIntegerType.java b/libjava/classpath/gnu/xml/validation/datatype/NegativeIntegerType.java index fd436cb55b2..1e6439c993f 100644 --- a/libjava/classpath/gnu/xml/validation/datatype/NegativeIntegerType.java +++ b/libjava/classpath/gnu/xml/validation/datatype/NegativeIntegerType.java @@ -1,4 +1,4 @@ -/* NegativeIntegerType.java -- +/* NegativeIntegerType.java -- Copyright (C) 2006 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -95,7 +95,7 @@ final class NegativeIntegerType throw new DatatypeException(i, "invalid negative integer value"); } } - + public Object createValue(String literal, ValidationContext context) { try { @@ -106,6 +106,5 @@ final class NegativeIntegerType return null; } } - -} +} diff --git a/libjava/classpath/gnu/xml/validation/datatype/NonNegativeIntegerType.java b/libjava/classpath/gnu/xml/validation/datatype/NonNegativeIntegerType.java index 8577785829c..c5192f34648 100644 --- a/libjava/classpath/gnu/xml/validation/datatype/NonNegativeIntegerType.java +++ b/libjava/classpath/gnu/xml/validation/datatype/NonNegativeIntegerType.java @@ -1,4 +1,4 @@ -/* NonNegativeIntegerType.java -- +/* NonNegativeIntegerType.java -- Copyright (C) 2006 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -105,7 +105,7 @@ final class NonNegativeIntegerType throw new DatatypeException(i, "invalid non-negative integer value"); } } - + public Object createValue(String literal, ValidationContext context) { try { @@ -116,6 +116,5 @@ final class NonNegativeIntegerType return null; } } - -} +} diff --git a/libjava/classpath/gnu/xml/validation/datatype/NonPositiveIntegerType.java b/libjava/classpath/gnu/xml/validation/datatype/NonPositiveIntegerType.java index 0b43d5227d6..e418c061556 100644 --- a/libjava/classpath/gnu/xml/validation/datatype/NonPositiveIntegerType.java +++ b/libjava/classpath/gnu/xml/validation/datatype/NonPositiveIntegerType.java @@ -1,4 +1,4 @@ -/* NonPositiveIntegerType.java -- +/* NonPositiveIntegerType.java -- Copyright (C) 2006 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -105,7 +105,7 @@ final class NonPositiveIntegerType throw new DatatypeException(i, "invalid non-positive integer value"); } } - + public Object createValue(String literal, ValidationContext context) { try { @@ -116,6 +116,5 @@ final class NonPositiveIntegerType return null; } } - -} +} diff --git a/libjava/classpath/gnu/xml/validation/datatype/NormalizedStringType.java b/libjava/classpath/gnu/xml/validation/datatype/NormalizedStringType.java index a74312d11d3..9009f648ae4 100644 --- a/libjava/classpath/gnu/xml/validation/datatype/NormalizedStringType.java +++ b/libjava/classpath/gnu/xml/validation/datatype/NormalizedStringType.java @@ -1,4 +1,4 @@ -/* NormalizedStringType.java -- +/* NormalizedStringType.java -- Copyright (C) 2006 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -83,6 +83,5 @@ final class NormalizedStringType throw new DatatypeException(i, "invalid normalized-string value"); } } - -} +} diff --git a/libjava/classpath/gnu/xml/validation/datatype/NotationType.java b/libjava/classpath/gnu/xml/validation/datatype/NotationType.java index e9d7c9fda20..b661cb4e1ea 100644 --- a/libjava/classpath/gnu/xml/validation/datatype/NotationType.java +++ b/libjava/classpath/gnu/xml/validation/datatype/NotationType.java @@ -1,4 +1,4 @@ -/* NotationType.java -- +/* NotationType.java -- Copyright (C) 2006 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -83,6 +83,5 @@ final class NotationType { return true; } - -} +} diff --git a/libjava/classpath/gnu/xml/validation/datatype/PatternFacet.java b/libjava/classpath/gnu/xml/validation/datatype/PatternFacet.java index d594b26b938..9c1cb7e301f 100644 --- a/libjava/classpath/gnu/xml/validation/datatype/PatternFacet.java +++ b/libjava/classpath/gnu/xml/validation/datatype/PatternFacet.java @@ -1,4 +1,4 @@ -/* PatternFacet.java -- +/* PatternFacet.java -- Copyright (C) 2006 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -66,6 +66,5 @@ public final class PatternFacet return (other instanceof PatternFacet && ((PatternFacet) other).value.equals(value)); } - -} +} diff --git a/libjava/classpath/gnu/xml/validation/datatype/PositiveIntegerType.java b/libjava/classpath/gnu/xml/validation/datatype/PositiveIntegerType.java index 0c10df3ab8d..15d0febfc52 100644 --- a/libjava/classpath/gnu/xml/validation/datatype/PositiveIntegerType.java +++ b/libjava/classpath/gnu/xml/validation/datatype/PositiveIntegerType.java @@ -1,4 +1,4 @@ -/* PositiveIntegerType.java -- +/* PositiveIntegerType.java -- Copyright (C) 2006 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -95,7 +95,7 @@ final class PositiveIntegerType throw new DatatypeException(i, "invalid positive integer value"); } } - + public Object createValue(String literal, ValidationContext context) { try { @@ -106,6 +106,5 @@ final class PositiveIntegerType return null; } } - -} +} diff --git a/libjava/classpath/gnu/xml/validation/datatype/QNameType.java b/libjava/classpath/gnu/xml/validation/datatype/QNameType.java index 1eaa518954d..bdc40c97f1d 100644 --- a/libjava/classpath/gnu/xml/validation/datatype/QNameType.java +++ b/libjava/classpath/gnu/xml/validation/datatype/QNameType.java @@ -1,4 +1,4 @@ -/* QNameType.java -- +/* QNameType.java -- Copyright (C) 2006 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -117,6 +117,5 @@ final class QNameType { return true; } - -} +} diff --git a/libjava/classpath/gnu/xml/validation/datatype/ShortType.java b/libjava/classpath/gnu/xml/validation/datatype/ShortType.java index 3179c8dae99..43255571d02 100644 --- a/libjava/classpath/gnu/xml/validation/datatype/ShortType.java +++ b/libjava/classpath/gnu/xml/validation/datatype/ShortType.java @@ -1,4 +1,4 @@ -/* ShortType.java -- +/* ShortType.java -- Copyright (C) 2006 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -117,7 +117,7 @@ final class ShortType throw new DatatypeException(i, "invalid short value"); } } - + public Object createValue(String literal, ValidationContext context) { try { @@ -128,6 +128,5 @@ final class ShortType return null; } } - -} +} diff --git a/libjava/classpath/gnu/xml/validation/datatype/SimpleType.java b/libjava/classpath/gnu/xml/validation/datatype/SimpleType.java index 1b8479922b8..1233723bd40 100644 --- a/libjava/classpath/gnu/xml/validation/datatype/SimpleType.java +++ b/libjava/classpath/gnu/xml/validation/datatype/SimpleType.java @@ -1,4 +1,4 @@ -/* SimpleType.java -- +/* SimpleType.java -- Copyright (C) 2006 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -60,12 +60,12 @@ public class SimpleType * The variety of the <code>anySimpleType</code> datatype. */ public static final int ANY = 0; - + /** * The atomic variety. */ public static final int ATOMIC = 1; - + /** * The list variety. */ @@ -229,15 +229,15 @@ public class SimpleType { throw new UnsupportedOperationException(); } - + public Object createValue(String literal, ValidationContext context) { return literal; } - + public boolean sameValue(Object value1, Object value2) { return value1.equals(value2); } - + public int valueHashCode(Object value) { return value.hashCode(); } @@ -253,4 +253,3 @@ public class SimpleType } } - diff --git a/libjava/classpath/gnu/xml/validation/datatype/StringType.java b/libjava/classpath/gnu/xml/validation/datatype/StringType.java index 593c265dc59..e20d1b87e1b 100644 --- a/libjava/classpath/gnu/xml/validation/datatype/StringType.java +++ b/libjava/classpath/gnu/xml/validation/datatype/StringType.java @@ -1,4 +1,4 @@ -/* StringType.java -- +/* StringType.java -- Copyright (C) 2006 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -70,4 +70,3 @@ final class StringType } } - diff --git a/libjava/classpath/gnu/xml/validation/datatype/TimeType.java b/libjava/classpath/gnu/xml/validation/datatype/TimeType.java index 0152e11717d..83ada5bc63c 100644 --- a/libjava/classpath/gnu/xml/validation/datatype/TimeType.java +++ b/libjava/classpath/gnu/xml/validation/datatype/TimeType.java @@ -1,4 +1,4 @@ -/* TimeType.java -- +/* TimeType.java -- Copyright (C) 2006 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -86,7 +86,7 @@ final class TimeType } return 0; } - + } static final int[] CONSTRAINING_FACETS = { @@ -217,7 +217,7 @@ final class TimeType throw new DatatypeException(len, "invalid time value"); } } - + public Object createValue(String value, ValidationContext context) { int len = value.length(); int state = 3; @@ -298,6 +298,5 @@ final class TimeType return null; } } - -} +} diff --git a/libjava/classpath/gnu/xml/validation/datatype/TokenType.java b/libjava/classpath/gnu/xml/validation/datatype/TokenType.java index 18e1e8ad53a..dfe5f14cef9 100644 --- a/libjava/classpath/gnu/xml/validation/datatype/TokenType.java +++ b/libjava/classpath/gnu/xml/validation/datatype/TokenType.java @@ -1,4 +1,4 @@ -/* TokenType.java -- +/* TokenType.java -- Copyright (C) 2006 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -91,6 +91,5 @@ final class TokenType last = c; } } - -} +} diff --git a/libjava/classpath/gnu/xml/validation/datatype/TotalDigitsFacet.java b/libjava/classpath/gnu/xml/validation/datatype/TotalDigitsFacet.java index 4debc638e5e..25b50cd6f38 100644 --- a/libjava/classpath/gnu/xml/validation/datatype/TotalDigitsFacet.java +++ b/libjava/classpath/gnu/xml/validation/datatype/TotalDigitsFacet.java @@ -1,4 +1,4 @@ -/* TotalDigitsFacet.java -- +/* TotalDigitsFacet.java -- Copyright (C) 2006 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -45,7 +45,7 @@ package gnu.xml.validation.datatype; public final class TotalDigitsFacet extends Facet { - + public final int value; public final boolean fixed; @@ -56,7 +56,7 @@ public final class TotalDigitsFacet this.value = value; this.fixed = fixed; } - + public int hashCode() { return value; @@ -67,6 +67,5 @@ public final class TotalDigitsFacet return (other instanceof TotalDigitsFacet && ((TotalDigitsFacet) other).value == value); } - -} +} diff --git a/libjava/classpath/gnu/xml/validation/datatype/Type.java b/libjava/classpath/gnu/xml/validation/datatype/Type.java index be6f0a0b447..ebd6509330a 100644 --- a/libjava/classpath/gnu/xml/validation/datatype/Type.java +++ b/libjava/classpath/gnu/xml/validation/datatype/Type.java @@ -1,4 +1,4 @@ -/* Type.java -- +/* Type.java -- Copyright (C) 2006 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -58,6 +58,5 @@ public abstract class Type { this.name = name; } - -} +} diff --git a/libjava/classpath/gnu/xml/validation/datatype/TypeBuilder.java b/libjava/classpath/gnu/xml/validation/datatype/TypeBuilder.java index 054eb8a55de..0873331536f 100644 --- a/libjava/classpath/gnu/xml/validation/datatype/TypeBuilder.java +++ b/libjava/classpath/gnu/xml/validation/datatype/TypeBuilder.java @@ -1,4 +1,4 @@ -/* TypeBuilder.java -- +/* TypeBuilder.java -- Copyright (C) 2006 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -54,7 +54,7 @@ public class TypeBuilder { final SimpleType type; - + TypeBuilder(SimpleType type) { this.type = type; @@ -136,7 +136,7 @@ public class TypeBuilder } return new MaxLengthFacet(Integer.parseInt(value), fixed, null); } - + PatternFacet parsePatternFacet(String value) throws DatatypeException { @@ -185,7 +185,7 @@ public class TypeBuilder } return new MaxInclusiveFacet(type.createValue(value, context), fixed, null); } - + MaxExclusiveFacet parseMaxExclusiveFacet(String value, ValidationContext context) throws DatatypeException @@ -201,7 +201,7 @@ public class TypeBuilder } return new MaxExclusiveFacet(type.createValue(value, context), fixed, null); } - + MinExclusiveFacet parseMinExclusiveFacet(String value, ValidationContext context) throws DatatypeException @@ -217,7 +217,7 @@ public class TypeBuilder } return new MinExclusiveFacet(type.createValue(value, context), fixed, null); } - + MinInclusiveFacet parseMinInclusiveFacet(String value, ValidationContext context) throws DatatypeException @@ -233,7 +233,7 @@ public class TypeBuilder } return new MinInclusiveFacet(type.createValue(value, context), fixed, null); } - + TotalDigitsFacet parseTotalDigitsFacet(String value) throws DatatypeException { @@ -251,7 +251,7 @@ public class TypeBuilder throw new DatatypeException("value must be a positiveInteger"); return new TotalDigitsFacet(val, fixed, null); } - + FractionDigitsFacet parseFractionDigitsFacet(String value) throws DatatypeException { @@ -269,10 +269,10 @@ public class TypeBuilder throw new DatatypeException("value must be a positiveInteger"); return new FractionDigitsFacet(val, fixed, null); } - + public Datatype createDatatype() { return type; } - + } diff --git a/libjava/classpath/gnu/xml/validation/datatype/TypeLibrary.java b/libjava/classpath/gnu/xml/validation/datatype/TypeLibrary.java index f1daecebd97..4db48f79953 100644 --- a/libjava/classpath/gnu/xml/validation/datatype/TypeLibrary.java +++ b/libjava/classpath/gnu/xml/validation/datatype/TypeLibrary.java @@ -1,4 +1,4 @@ -/* TypeLibrary.java -- +/* TypeLibrary.java -- Copyright (C) 2006 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -52,7 +52,7 @@ import org.relaxng.datatype.DatatypeLibrary; public class TypeLibrary implements DatatypeLibrary { - + public static final SimpleType ANY_SIMPLE_TYPE = new AnySimpleType(); public static final SimpleType STRING = new StringType(); @@ -169,5 +169,5 @@ public class TypeLibrary throw new DatatypeException("Unknown type name: " + typeLocalName); return type; } - + } diff --git a/libjava/classpath/gnu/xml/validation/datatype/TypeLibraryFactory.java b/libjava/classpath/gnu/xml/validation/datatype/TypeLibraryFactory.java index 21ee6422409..2f9bbd3c61d 100644 --- a/libjava/classpath/gnu/xml/validation/datatype/TypeLibraryFactory.java +++ b/libjava/classpath/gnu/xml/validation/datatype/TypeLibraryFactory.java @@ -1,4 +1,4 @@ -/* TypeLibraryFactory.java -- +/* TypeLibraryFactory.java -- Copyright (C) 2006 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -56,5 +56,5 @@ public class TypeLibraryFactory return new TypeLibrary(); return null; } - + } diff --git a/libjava/classpath/gnu/xml/validation/datatype/UnionSimpleType.java b/libjava/classpath/gnu/xml/validation/datatype/UnionSimpleType.java index d87c2aa7a1b..253e1df7bac 100644 --- a/libjava/classpath/gnu/xml/validation/datatype/UnionSimpleType.java +++ b/libjava/classpath/gnu/xml/validation/datatype/UnionSimpleType.java @@ -1,4 +1,4 @@ -/* UnionSimpleType.java -- +/* UnionSimpleType.java -- Copyright (C) 2006 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -57,7 +57,7 @@ public class UnionSimpleType * The member types in this union. */ public final List memberTypes; - + public UnionSimpleType(QName name, Set facets, int fundamentalFacets, SimpleType baseType, Annotation annotation, List memberTypes) @@ -78,6 +78,5 @@ public class UnionSimpleType } throw new DatatypeException("invalid union type value"); } - -} +} diff --git a/libjava/classpath/gnu/xml/validation/datatype/UnsignedByteType.java b/libjava/classpath/gnu/xml/validation/datatype/UnsignedByteType.java index 772c9cc0a9b..cf12abe3a74 100644 --- a/libjava/classpath/gnu/xml/validation/datatype/UnsignedByteType.java +++ b/libjava/classpath/gnu/xml/validation/datatype/UnsignedByteType.java @@ -1,4 +1,4 @@ -/* UnsignedByteType.java -- +/* UnsignedByteType.java -- Copyright (C) 2006 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -105,7 +105,7 @@ final class UnsignedByteType throw new DatatypeException(i, "invalid unsigned byte value"); } } - + public Object createValue(String literal, ValidationContext context) { try { @@ -116,6 +116,5 @@ final class UnsignedByteType return null; } } - -} +} diff --git a/libjava/classpath/gnu/xml/validation/datatype/UnsignedIntType.java b/libjava/classpath/gnu/xml/validation/datatype/UnsignedIntType.java index a4e8a68201c..b634442bb12 100644 --- a/libjava/classpath/gnu/xml/validation/datatype/UnsignedIntType.java +++ b/libjava/classpath/gnu/xml/validation/datatype/UnsignedIntType.java @@ -1,4 +1,4 @@ -/* UnsignedIntType.java -- +/* UnsignedIntType.java -- Copyright (C) 2006 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -105,7 +105,7 @@ final class UnsignedIntType throw new DatatypeException(i, "invalid unsigned int value"); } } - + public Object createValue(String literal, ValidationContext context) { try { @@ -116,6 +116,5 @@ final class UnsignedIntType return null; } } - -} +} diff --git a/libjava/classpath/gnu/xml/validation/datatype/UnsignedLongType.java b/libjava/classpath/gnu/xml/validation/datatype/UnsignedLongType.java index 5a36d8a3170..784b8666300 100644 --- a/libjava/classpath/gnu/xml/validation/datatype/UnsignedLongType.java +++ b/libjava/classpath/gnu/xml/validation/datatype/UnsignedLongType.java @@ -1,4 +1,4 @@ -/* UnsignedLongType.java -- +/* UnsignedLongType.java -- Copyright (C) 2006 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -105,7 +105,7 @@ final class UnsignedLongType throw new DatatypeException(i, "invalid unsigned long value"); } } - + public Object createValue(String literal, ValidationContext context) { try { @@ -116,6 +116,5 @@ final class UnsignedLongType return null; } } - -} +} diff --git a/libjava/classpath/gnu/xml/validation/datatype/UnsignedShortType.java b/libjava/classpath/gnu/xml/validation/datatype/UnsignedShortType.java index 49f621be771..ececb608c0b 100644 --- a/libjava/classpath/gnu/xml/validation/datatype/UnsignedShortType.java +++ b/libjava/classpath/gnu/xml/validation/datatype/UnsignedShortType.java @@ -1,4 +1,4 @@ -/* UnsignedShortType.java -- +/* UnsignedShortType.java -- Copyright (C) 2006 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -106,7 +106,7 @@ final class UnsignedShortType throw new DatatypeException(i, "invalid unsigned short value"); } } - + public Object createValue(String literal, ValidationContext context) { try { @@ -117,6 +117,5 @@ final class UnsignedShortType return null; } } - -} +} diff --git a/libjava/classpath/gnu/xml/validation/datatype/WhiteSpaceFacet.java b/libjava/classpath/gnu/xml/validation/datatype/WhiteSpaceFacet.java index 5920e1c88b6..0f2109cfcf5 100644 --- a/libjava/classpath/gnu/xml/validation/datatype/WhiteSpaceFacet.java +++ b/libjava/classpath/gnu/xml/validation/datatype/WhiteSpaceFacet.java @@ -1,4 +1,4 @@ -/* WhiteSpaceFacet.java -- +/* WhiteSpaceFacet.java -- Copyright (C) 2006 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -45,11 +45,11 @@ package gnu.xml.validation.datatype; public final class WhiteSpaceFacet extends Facet { - + public static final int PRESERVE = 0; public static final int REPLACE = 1; public static final int COLLAPSE = 2; - + public final int value; public final boolean fixed; @@ -59,7 +59,7 @@ public final class WhiteSpaceFacet this.value = value; this.fixed = fixed; } - + public int hashCode() { return value; @@ -70,6 +70,5 @@ public final class WhiteSpaceFacet return (other instanceof WhiteSpaceFacet && ((WhiteSpaceFacet) other).value == value); } - -} +} 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; - -} +} 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); } - -} +} |
