diff options
Diffstat (limited to 'gnu/xml/validation/datatype')
21 files changed, 107 insertions, 113 deletions
diff --git a/gnu/xml/validation/datatype/AnySimpleType.java b/gnu/xml/validation/datatype/AnySimpleType.java index 36fb98daa..a13749ea5 100644 --- a/gnu/xml/validation/datatype/AnySimpleType.java +++ b/gnu/xml/validation/datatype/AnySimpleType.java @@ -49,7 +49,7 @@ final class AnySimpleType { super(new QName(XMLConstants.W3C_XML_SCHEMA_NS_URI, "anySimpleType"), ANY, /* variety */ - (Set) null, /* facets */ + null, /* facets */ 0, /* fundametalFacets */ (SimpleType) Type.ANY_TYPE, /* baseType */ null); diff --git a/gnu/xml/validation/datatype/AtomicSimpleType.java b/gnu/xml/validation/datatype/AtomicSimpleType.java index 38528eecf..54bd7d5a3 100644 --- a/gnu/xml/validation/datatype/AtomicSimpleType.java +++ b/gnu/xml/validation/datatype/AtomicSimpleType.java @@ -52,7 +52,7 @@ public class AtomicSimpleType { public AtomicSimpleType(QName name, - Set facets, + Set<Facet> facets, int fundamentalFacets, SimpleType baseType, Annotation annotation) diff --git a/gnu/xml/validation/datatype/BooleanType.java b/gnu/xml/validation/datatype/BooleanType.java index 5d98d2412..33a918614 100644 --- a/gnu/xml/validation/datatype/BooleanType.java +++ b/gnu/xml/validation/datatype/BooleanType.java @@ -59,8 +59,8 @@ final class BooleanType Facet.WHITESPACE }; - static final Set VALUE_SPACE = - new TreeSet(Arrays.asList(new String[] {"true", "false", "1", "0"})); + static final Set<String> VALUE_SPACE = + new TreeSet<String>(Arrays.asList(new String[] {"true", "false", "1", "0"})); BooleanType() { diff --git a/gnu/xml/validation/datatype/DoubleType.java b/gnu/xml/validation/datatype/DoubleType.java index dfaa7c8cb..c9f479557 100644 --- a/gnu/xml/validation/datatype/DoubleType.java +++ b/gnu/xml/validation/datatype/DoubleType.java @@ -64,8 +64,8 @@ final class DoubleType Facet.MIN_EXCLUSIVE }; - static final Set SPECIAL = - new TreeSet(Arrays.asList(new String[] {"INF", "-INF", "NaN"})); + static final Set<String> SPECIAL = + new TreeSet<String>(Arrays.asList(new String[] {"INF", "-INF", "NaN"})); DoubleType() { diff --git a/gnu/xml/validation/datatype/DurationType.java b/gnu/xml/validation/datatype/DurationType.java index 6c0f7b889..33e210b94 100644 --- a/gnu/xml/validation/datatype/DurationType.java +++ b/gnu/xml/validation/datatype/DurationType.java @@ -52,7 +52,7 @@ final class DurationType { static class Duration - implements Comparable + implements Comparable<Duration> { int years; int months; @@ -60,6 +60,7 @@ final class DurationType int minutes; float seconds; + @Override public int hashCode() { int hc = years; @@ -70,6 +71,7 @@ final class DurationType return hc; } + @Override public boolean equals(Object other) { if (other instanceof Duration) @@ -84,24 +86,20 @@ final class DurationType return false; } - public int compareTo(Object other) + @Override + public int compareTo(Duration duration) { - if (other instanceof Duration) - { - Duration duration = (Duration) other; - if (duration.years != years) - return years - duration.years; - if (duration.months != months) - return months - duration.months; - if (duration.days != days) - return days - duration.days; - if (duration.minutes != minutes) - return minutes = duration.minutes; - if (duration.seconds == seconds) - return 0; - return (seconds < duration.seconds) ? -1 : 1; - } - return 0; + if (duration.years != years) + return years - duration.years; + if (duration.months != months) + return months - duration.months; + if (duration.days != days) + return days - duration.days; + if (duration.minutes != minutes) + return minutes = duration.minutes; + if (duration.seconds == seconds) + return 0; + return (seconds < duration.seconds) ? -1 : 1; } } @@ -173,8 +171,7 @@ final class DurationType public Object createValue(String value, ValidationContext context) { boolean negative = false; - int days = 0, months = 0, years = 0; - int minutes = 0; + int days = 0, years = 0, minutes = 0; float seconds = 0.0f; int len = value.length(); char expect = 'P'; @@ -232,6 +229,7 @@ final class DurationType duration.days = days; duration.minutes = minutes; duration.seconds = seconds; + duration.years = years; return duration; } diff --git a/gnu/xml/validation/datatype/FloatType.java b/gnu/xml/validation/datatype/FloatType.java index 8dbb4aa56..b9b25b252 100644 --- a/gnu/xml/validation/datatype/FloatType.java +++ b/gnu/xml/validation/datatype/FloatType.java @@ -64,8 +64,8 @@ final class FloatType Facet.MIN_EXCLUSIVE }; - static final Set SPECIAL = - new TreeSet(Arrays.asList(new String[] {"INF", "-INF", "NaN"})); + static final Set<String> SPECIAL = + new TreeSet<String>(Arrays.asList(new String[] {"INF", "-INF", "NaN"})); FloatType() { diff --git a/gnu/xml/validation/datatype/GDayType.java b/gnu/xml/validation/datatype/GDayType.java index cc6b8e3d4..e9d836adc 100644 --- a/gnu/xml/validation/datatype/GDayType.java +++ b/gnu/xml/validation/datatype/GDayType.java @@ -52,16 +52,18 @@ final class GDayType { static class GDay - implements Comparable + implements Comparable<GDay> { int day; + @Override public int hashCode() { return day; } + @Override public boolean equals(Object other) { if (other instanceof GDay) @@ -69,16 +71,12 @@ final class GDayType return false; } - public int compareTo(Object other) + @Override + public int compareTo(GDay gd) { - if (other instanceof GDay) - { - GDay gd = (GDay) other; - if (gd.day == day) - return 0; - return (day < gd.day) ? -1 : 1; - } - return 0; + if (gd.day == day) + return 0; + return (day < gd.day) ? -1 : 1; } } diff --git a/gnu/xml/validation/datatype/GMonthDayType.java b/gnu/xml/validation/datatype/GMonthDayType.java index d293d9b57..8832fe79d 100644 --- a/gnu/xml/validation/datatype/GMonthDayType.java +++ b/gnu/xml/validation/datatype/GMonthDayType.java @@ -52,17 +52,19 @@ final class GMonthDayType { static class GMonthDay - implements Comparable + implements Comparable<GMonthDay> { int month; int day; + @Override public int hashCode() { return month * 31 + day; } + @Override public boolean equals(Object other) { if (other instanceof GMonthDay) @@ -73,20 +75,16 @@ final class GMonthDayType return false; } - public int compareTo(Object other) + @Override + public int compareTo(GMonthDay gmd) { - if (other instanceof GMonthDay) - { - GMonthDay gmd = (GMonthDay) other; - if (gmd.month == month) - { - if (gmd.day == day) - return 0; - return (day < gmd.day) ? -1 : 1; - } - return (month < gmd.month) ? -1 : 1; - } - return 0; + if (gmd.month == month) + { + if (gmd.day == day) + return 0; + return (day < gmd.day) ? -1 : 1; + } + return (month < gmd.month) ? -1 : 1; } } diff --git a/gnu/xml/validation/datatype/GMonthType.java b/gnu/xml/validation/datatype/GMonthType.java index 9450874b9..daa907bab 100644 --- a/gnu/xml/validation/datatype/GMonthType.java +++ b/gnu/xml/validation/datatype/GMonthType.java @@ -52,16 +52,18 @@ final class GMonthType { static class GMonth - implements Comparable + implements Comparable<GMonth> { int month; + @Override public int hashCode() { return month; } + @Override public boolean equals(Object other) { if (other instanceof GMonth) @@ -69,16 +71,12 @@ final class GMonthType return false; } - public int compareTo(Object other) + @Override + public int compareTo(GMonth gm) { - if (other instanceof GMonth) - { - GMonth gm = (GMonth) other; - if (gm.month == month) - return 0; - return (month < gm.month) ? -1 : 1; - } - return 0; + if (gm.month == month) + return 0; + return (month < gm.month) ? -1 : 1; } } diff --git a/gnu/xml/validation/datatype/GYearMonthType.java b/gnu/xml/validation/datatype/GYearMonthType.java index 9aabfb61c..e10e511be 100644 --- a/gnu/xml/validation/datatype/GYearMonthType.java +++ b/gnu/xml/validation/datatype/GYearMonthType.java @@ -52,17 +52,19 @@ final class GYearMonthType { static class GYearMonth - implements Comparable + implements Comparable<GYearMonth> { int year; int month; + @Override public int hashCode() { return year * 31 + month; } + @Override public boolean equals(Object other) { if (other instanceof GYearMonth) @@ -73,20 +75,16 @@ final class GYearMonthType return false; } - public int compareTo(Object other) + @Override + public int compareTo(GYearMonth gmy) { - if (other instanceof GYearMonth) + if (gmy.year == year) { - GYearMonth gmy = (GYearMonth) other; - if (gmy.year == year) - { - if (gmy.month == month) - return 0; - return (month < gmy.month) ? -1 : 1; - } - return (year < gmy.year) ? -1 : 1; + if (gmy.month == month) + return 0; + return (month < gmy.month) ? -1 : 1; } - return 0; + return (year < gmy.year) ? -1 : 1; } } diff --git a/gnu/xml/validation/datatype/GYearType.java b/gnu/xml/validation/datatype/GYearType.java index 5b1e03232..d69fda430 100644 --- a/gnu/xml/validation/datatype/GYearType.java +++ b/gnu/xml/validation/datatype/GYearType.java @@ -52,16 +52,18 @@ final class GYearType { static class GYear - implements Comparable + implements Comparable<GYear> { int year; + @Override public int hashCode() { return year; } + @Override public boolean equals(Object other) { if (other instanceof GYear) @@ -69,16 +71,12 @@ final class GYearType return false; } - public int compareTo(Object other) + @Override + public int compareTo(GYear gy) { - if (other instanceof GYear) - { - GYear gy = (GYear) other; - if (gy.year == year) - return 0; - return (year < gy.year) ? -1 : 1; - } - return 0; + if (gy.year == year) + return 0; + return (year < gy.year) ? -1 : 1; } } diff --git a/gnu/xml/validation/datatype/ListSimpleType.java b/gnu/xml/validation/datatype/ListSimpleType.java index 1e0d41d01..54a753c9b 100644 --- a/gnu/xml/validation/datatype/ListSimpleType.java +++ b/gnu/xml/validation/datatype/ListSimpleType.java @@ -57,7 +57,7 @@ public class ListSimpleType */ public final SimpleType itemType; - public ListSimpleType(QName name, Set facets, + public ListSimpleType(QName name, Set<Facet> facets, int fundamentalFacets, SimpleType baseType, Annotation annotation, SimpleType itemType) { diff --git a/gnu/xml/validation/datatype/MaxExclusiveFacet.java b/gnu/xml/validation/datatype/MaxExclusiveFacet.java index 90e940371..e6d0beab4 100644 --- a/gnu/xml/validation/datatype/MaxExclusiveFacet.java +++ b/gnu/xml/validation/datatype/MaxExclusiveFacet.java @@ -99,7 +99,9 @@ public final class MaxExclusiveFacet { if (!(test.getClass().equals(value.getClass()))) return false; - return ((Comparable) test).compareTo(value) < 0; + @SuppressWarnings("unchecked") + Comparable<Object> comp = (Comparable<Object>) test; + return comp.compareTo(value) < 0; } Number nvalue = (Number) value; if (!(test instanceof Number)) diff --git a/gnu/xml/validation/datatype/MaxInclusiveFacet.java b/gnu/xml/validation/datatype/MaxInclusiveFacet.java index c260113da..b70dcbd70 100644 --- a/gnu/xml/validation/datatype/MaxInclusiveFacet.java +++ b/gnu/xml/validation/datatype/MaxInclusiveFacet.java @@ -100,7 +100,9 @@ public final class MaxInclusiveFacet { if (!(test.getClass().equals(value.getClass()))) return false; - return ((Comparable) test).compareTo(value) <= 0; + @SuppressWarnings("unchecked") + Comparable<Object> comp = (Comparable<Object>) test; + return comp.compareTo(value) <= 0; } Number nvalue = (Number) value; if (!(test instanceof Number)) diff --git a/gnu/xml/validation/datatype/MinExclusiveFacet.java b/gnu/xml/validation/datatype/MinExclusiveFacet.java index a779d09d8..b5717851b 100644 --- a/gnu/xml/validation/datatype/MinExclusiveFacet.java +++ b/gnu/xml/validation/datatype/MinExclusiveFacet.java @@ -99,7 +99,9 @@ public final class MinExclusiveFacet { if (!(test.getClass().equals(value.getClass()))) return false; - return ((Comparable) test).compareTo(value) > 0; + @SuppressWarnings("unchecked") + Comparable<Object> comp = (Comparable<Object>) test; + return comp.compareTo(value) > 0; } Number nvalue = (Number) value; if (!(test instanceof Number)) diff --git a/gnu/xml/validation/datatype/MinInclusiveFacet.java b/gnu/xml/validation/datatype/MinInclusiveFacet.java index 6138c9af8..11412f8c7 100644 --- a/gnu/xml/validation/datatype/MinInclusiveFacet.java +++ b/gnu/xml/validation/datatype/MinInclusiveFacet.java @@ -100,7 +100,9 @@ public final class MinInclusiveFacet { if (!(test.getClass().equals(value.getClass()))) return false; - return ((Comparable) test).compareTo(value) >= 0; + @SuppressWarnings("unchecked") + Comparable<Object> comp = (Comparable<Object>) test; + return comp.compareTo(value) >= 0; } Number nvalue = (Number) value; if (!(test instanceof Number)) diff --git a/gnu/xml/validation/datatype/SimpleType.java b/gnu/xml/validation/datatype/SimpleType.java index 1233723bd..bbfe0fa4a 100644 --- a/gnu/xml/validation/datatype/SimpleType.java +++ b/gnu/xml/validation/datatype/SimpleType.java @@ -89,7 +89,7 @@ public class SimpleType /** * The facets of this simple type. */ - public Set facets; + public Set<Facet> facets; /** * The fundamental facets of this simple type. @@ -107,7 +107,7 @@ public class SimpleType */ public final Annotation annotation; - public SimpleType(QName name, int variety, Set facets, + public SimpleType(QName name, int variety, Set<Facet> facets, int fundamentalFacets, SimpleType baseType, Annotation annotation) { @@ -141,9 +141,9 @@ public class SimpleType if (facets != null && !facets.isEmpty()) { Object parsedValue = createValue(value, context); - for (Iterator i = facets.iterator(); i.hasNext(); ) + for (Iterator<Facet> i = facets.iterator(); i.hasNext(); ) { - Facet facet = (Facet) i.next(); + Facet facet = i.next(); switch (facet.type) { case Facet.LENGTH: diff --git a/gnu/xml/validation/datatype/TimeType.java b/gnu/xml/validation/datatype/TimeType.java index 83ada5bc6..7c508c434 100644 --- a/gnu/xml/validation/datatype/TimeType.java +++ b/gnu/xml/validation/datatype/TimeType.java @@ -53,16 +53,18 @@ final class TimeType { static class Time - implements Comparable + implements Comparable<Time> { int minutes; float seconds; + @Override public int hashCode() { return minutes * 31 + new Float(seconds).hashCode(); } + @Override public boolean equals(Object other) { if (other instanceof Time) @@ -73,18 +75,14 @@ final class TimeType return false; } - public int compareTo(Object other) + @Override + public int compareTo(Time time) { - if (other instanceof Time) - { - Time time = (Time) other; - if (time.minutes != minutes) - return minutes - time.minutes; - if (time.seconds == seconds) - return 0; - return (seconds < time.seconds) ? -1 : 1; - } - return 0; + if (time.minutes != minutes) + return minutes - time.minutes; + if (time.seconds == seconds) + return 0; + return (seconds < time.seconds) ? -1 : 1; } } diff --git a/gnu/xml/validation/datatype/TypeBuilder.java b/gnu/xml/validation/datatype/TypeBuilder.java index 087333153..7a4e9610e 100644 --- a/gnu/xml/validation/datatype/TypeBuilder.java +++ b/gnu/xml/validation/datatype/TypeBuilder.java @@ -59,7 +59,7 @@ public class TypeBuilder { this.type = type; // TODO fundamental facets - type.facets = new LinkedHashSet(); + type.facets = new LinkedHashSet<Facet>(); } public void addParameter(String name, String value, ValidationContext context) diff --git a/gnu/xml/validation/datatype/TypeLibrary.java b/gnu/xml/validation/datatype/TypeLibrary.java index 4db48f799..dff67ab5d 100644 --- a/gnu/xml/validation/datatype/TypeLibrary.java +++ b/gnu/xml/validation/datatype/TypeLibrary.java @@ -101,10 +101,10 @@ public class TypeLibrary public static final SimpleType UNSIGNED_BYTE = new UnsignedByteType(); public static final SimpleType POSITIVE_INTEGER = new PositiveIntegerType(); - private static Map byName; + private static Map<String,SimpleType> byName; static { - byName = new HashMap(); + byName = new HashMap<String,SimpleType>(); byName.put("anySimpleType", ANY_SIMPLE_TYPE); byName.put("string", STRING); byName.put("boolean", BOOLEAN); diff --git a/gnu/xml/validation/datatype/UnionSimpleType.java b/gnu/xml/validation/datatype/UnionSimpleType.java index 253e1df7b..df219748a 100644 --- a/gnu/xml/validation/datatype/UnionSimpleType.java +++ b/gnu/xml/validation/datatype/UnionSimpleType.java @@ -56,11 +56,11 @@ public class UnionSimpleType /** * The member types in this union. */ - public final List memberTypes; + public final List<SimpleType> memberTypes; - public UnionSimpleType(QName name, Set facets, + public UnionSimpleType(QName name, Set<Facet> facets, int fundamentalFacets, SimpleType baseType, - Annotation annotation, List memberTypes) + Annotation annotation, List<SimpleType> memberTypes) { super(name, UNION, facets, fundamentalFacets, baseType, annotation); this.memberTypes = memberTypes; @@ -70,9 +70,9 @@ public class UnionSimpleType throws DatatypeException { super.checkValid(value, context); - for (Iterator i = memberTypes.iterator(); i.hasNext(); ) + for (Iterator<SimpleType> i = memberTypes.iterator(); i.hasNext(); ) { - SimpleType type = (SimpleType) i.next(); + SimpleType type = i.next(); if (type.isValid(value, context)) return; } |