This is an automated email from the ASF dual-hosted git repository. andy pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/jena.git
commit 261e8a750e56b26eb1e07e8ea5fc88eb11c32e07 Author: Andy Seaborne <[email protected]> AuthorDate: Fri Oct 31 16:00:57 2025 +0000 Tidy code --- .../java/org/apache/jena/riot/system/Checker.java | 7 +-- .../apache/jena/riot/system/ParserProfileStd.java | 3 -- .../org/apache/jena/sparql/expr/ValueSpace.java | 1 - .../sparql/expr/nodevalue/NodeValueDateTime.java | 3 +- .../sparql/expr/nodevalue/NodeValueDecimal.java | 2 +- .../sparql/expr/nodevalue/NodeValueDouble.java | 4 +- .../sparql/expr/nodevalue/NodeValueDuration.java | 18 +++---- .../sparql/expr/nodevalue/NodeValueInteger.java | 18 +++---- .../jena/sparql/expr/nodevalue/NodeValueLang.java | 3 -- .../sparql/expr/nodevalue/NodeValueLangDir.java | 4 -- .../jena/sparql/expr/nodevalue/NodeValueNode.java | 15 +++--- .../jena/sparql/expr/nodevalue/NodeValueOps.java | 4 +- .../sparql/expr/nodevalue/NodeValueSortKey.java | 10 ++-- .../sparql/expr/nodevalue/NodeValueString.java | 13 ++--- .../jena/sparql/expr/nodevalue/XSDFuncOp.java | 55 ++++++++++--------- .../org/apache/jena/datatypes/xsd/XSDDateTime.java | 62 +++++++++++----------- .../org/apache/jena/datatypes/xsd/XSDDuration.java | 3 +- .../datatypes/xsd/impl/XSDBaseNumericType.java | 1 - .../jena/datatypes/xsd/impl/XSDDurationType.java | 10 ++-- .../java/org/apache/jena/graph/Node_Literal.java | 1 - 20 files changed, 104 insertions(+), 133 deletions(-) diff --git a/jena-arq/src/main/java/org/apache/jena/riot/system/Checker.java b/jena-arq/src/main/java/org/apache/jena/riot/system/Checker.java index de65ede41c..848135dbb8 100644 --- a/jena-arq/src/main/java/org/apache/jena/riot/system/Checker.java +++ b/jena-arq/src/main/java/org/apache/jena/riot/system/Checker.java @@ -91,10 +91,6 @@ public class Checker { return checkIRI(node.getURI(), errorHandler, line, col); } -// public static boolean checkIRI(String iriStr) { -// return checkIRI(iriStr, nullErrorHandler, -1L, -1L); -// } - /** See also {@link IRIs#reference} */ public static boolean checkIRI(String iriStr, ErrorHandler errorHandler, long line, long col) { try { @@ -148,11 +144,12 @@ public class Checker { } /** @deprecated Use {@link #checkLiteral(String, String, String, RDFDatatype, ErrorHandler, long, long)} */ - @Deprecated + @Deprecated(forRemoval = true) public static boolean checkLiteral(String lexicalForm, String lang, RDFDatatype datatype, ErrorHandler errorHandler, long line, long col) { return checkLiteral(lexicalForm, lang, (TextDirection)null, datatype, errorHandler, line, col); } + public static boolean checkLiteral(String lexicalForm, String lang, String direction, RDFDatatype datatype, ErrorHandler errorHandler, long line, long col) { TextDirection textDir = null; if ( direction != null ) { diff --git a/jena-arq/src/main/java/org/apache/jena/riot/system/ParserProfileStd.java b/jena-arq/src/main/java/org/apache/jena/riot/system/ParserProfileStd.java index 333526e9fb..4a8a0f613f 100644 --- a/jena-arq/src/main/java/org/apache/jena/riot/system/ParserProfileStd.java +++ b/jena-arq/src/main/java/org/apache/jena/riot/system/ParserProfileStd.java @@ -122,14 +122,11 @@ public class ParserProfileStd implements ParserProfile { Checker.iriViolationMessage(irix.str(), true, "Relative IRI: " + irix.str(), line, col, errorHandler); // And other warnings. } - if ( ! irix.hasViolations() ) return; - irix.handleViolations((isError, message)->{ Checker.iriViolationMessage(uriStr, isError, message, line, col, errorHandler); }); - } /** diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/expr/ValueSpace.java b/jena-arq/src/main/java/org/apache/jena/sparql/expr/ValueSpace.java index c2b8749743..8cbd552687 100644 --- a/jena-arq/src/main/java/org/apache/jena/sparql/expr/ValueSpace.java +++ b/jena-arq/src/main/java/org/apache/jena/sparql/expr/ValueSpace.java @@ -174,5 +174,4 @@ public enum ValueSpace { // Includes unrecognized datatypes. return VSPACE_UNKNOWN ; } - } diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/expr/nodevalue/NodeValueDateTime.java b/jena-arq/src/main/java/org/apache/jena/sparql/expr/nodevalue/NodeValueDateTime.java index 42de6c7172..06850afdd6 100644 --- a/jena-arq/src/main/java/org/apache/jena/sparql/expr/nodevalue/NodeValueDateTime.java +++ b/jena-arq/src/main/java/org/apache/jena/sparql/expr/nodevalue/NodeValueDateTime.java @@ -81,8 +81,7 @@ public class NodeValueDateTime extends NodeValue } @Override - protected Node makeNode() - { + protected Node makeNode() { return null; } diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/expr/nodevalue/NodeValueDecimal.java b/jena-arq/src/main/java/org/apache/jena/sparql/expr/nodevalue/NodeValueDecimal.java index 4383eed722..3aba870771 100644 --- a/jena-arq/src/main/java/org/apache/jena/sparql/expr/nodevalue/NodeValueDecimal.java +++ b/jena-arq/src/main/java/org/apache/jena/sparql/expr/nodevalue/NodeValueDecimal.java @@ -28,7 +28,7 @@ import org.apache.jena.sparql.util.XSDNumUtils; public class NodeValueDecimal extends NodeValue { - BigDecimal decimal; + private BigDecimal decimal; public NodeValueDecimal(BigDecimal d) { decimal = d; } public NodeValueDecimal(BigDecimal d, Node n) { super(n); decimal = d; } diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/expr/nodevalue/NodeValueDouble.java b/jena-arq/src/main/java/org/apache/jena/sparql/expr/nodevalue/NodeValueDouble.java index 608c7530e4..0351f913d7 100644 --- a/jena-arq/src/main/java/org/apache/jena/sparql/expr/nodevalue/NodeValueDouble.java +++ b/jena-arq/src/main/java/org/apache/jena/sparql/expr/nodevalue/NodeValueDouble.java @@ -29,8 +29,8 @@ import org.apache.jena.sparql.expr.NodeValue; import org.apache.jena.sparql.util.XSDNumUtils; -public class NodeValueDouble extends NodeValue -{ +public class NodeValueDouble extends NodeValue { + double value = Double.NaN; public NodeValueDouble(double d) { super(); value = d; } diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/expr/nodevalue/NodeValueDuration.java b/jena-arq/src/main/java/org/apache/jena/sparql/expr/nodevalue/NodeValueDuration.java index e64efddaf5..33b0d8ff0e 100644 --- a/jena-arq/src/main/java/org/apache/jena/sparql/expr/nodevalue/NodeValueDuration.java +++ b/jena-arq/src/main/java/org/apache/jena/sparql/expr/nodevalue/NodeValueDuration.java @@ -25,31 +25,29 @@ import org.apache.jena.graph.Node; import org.apache.jena.graph.NodeFactory; import org.apache.jena.sparql.expr.NodeValue; -/** XSD Duration */ +/** XSD Duration */ public class NodeValueDuration extends NodeValue { - Duration duration; - - public NodeValueDuration(Duration dt) - { + Duration duration; + + public NodeValueDuration(Duration dt) { duration = dt; } - + public NodeValueDuration(Duration dt, Node n) { super(n); duration = dt; } - + @Override public boolean isDuration() { return true; } @Override public Duration getDuration() { return duration; } @Override - protected Node makeNode() - { + protected Node makeNode() { String lex = duration.toString(); return NodeFactory.createLiteralDT(lex, XSDDatatype.XSDduration); } - + @Override public void visit(NodeValueVisitor visitor) { visitor.visit(this); } } diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/expr/nodevalue/NodeValueInteger.java b/jena-arq/src/main/java/org/apache/jena/sparql/expr/nodevalue/NodeValueInteger.java index 201720c58d..3dd06efe4b 100644 --- a/jena-arq/src/main/java/org/apache/jena/sparql/expr/nodevalue/NodeValueInteger.java +++ b/jena-arq/src/main/java/org/apache/jena/sparql/expr/nodevalue/NodeValueInteger.java @@ -31,9 +31,9 @@ public class NodeValueInteger extends NodeValue { //long integer = Integer.MIN_VALUE; // The performance impact of this seems to be very low - // After all, much of the work is pattern matching. + // After all, much of the work is pattern matching. BigInteger integer; - + public NodeValueInteger(BigInteger i) { super(); integer = i; } public NodeValueInteger(BigInteger i, Node n) { super(n); integer = i; } // public NodeValueInteger(long i, Node n) { super(n); integer = new BigInteger(Long.toString(i)); } @@ -49,7 +49,7 @@ public class NodeValueInteger extends NodeValue public boolean isFloat() { return true; } @Override public boolean isDouble() { return true; } - + @Override public BigInteger getInteger() { return integer; } @Override @@ -62,18 +62,18 @@ public class NodeValueInteger extends NodeValue @Override protected Node makeNode() { return NodeFactory.createLiteralDT(integer.toString(), XSDDatatype.XSDinteger); } - + @Override public String asString() { return toString(); } - + @Override - public String toString() - { + public String toString() { // Preserve lexical form - if ( getNode() != null ) return super.asString(); // str() + if ( getNode() != null ) + return super.asString(); return integer.toString(); } - + @Override public void visit(NodeValueVisitor visitor) { visitor.visit(this); } } diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/expr/nodevalue/NodeValueLang.java b/jena-arq/src/main/java/org/apache/jena/sparql/expr/nodevalue/NodeValueLang.java index 5a13b43971..2d05bc9cad 100644 --- a/jena-arq/src/main/java/org/apache/jena/sparql/expr/nodevalue/NodeValueLang.java +++ b/jena-arq/src/main/java/org/apache/jena/sparql/expr/nodevalue/NodeValueLang.java @@ -30,9 +30,6 @@ import org.apache.jena.sparql.util.FmtUtils; * A string + language tag which is not "" */ public class NodeValueLang extends NodeValue { - // We could extend NodeValueString for the machinery - // but it get confusing as then it is a NodeValueString - // but isString is false. private final String string; private final String lang; diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/expr/nodevalue/NodeValueLangDir.java b/jena-arq/src/main/java/org/apache/jena/sparql/expr/nodevalue/NodeValueLangDir.java index f73b529ef1..2d3e4e8bb9 100644 --- a/jena-arq/src/main/java/org/apache/jena/sparql/expr/nodevalue/NodeValueLangDir.java +++ b/jena-arq/src/main/java/org/apache/jena/sparql/expr/nodevalue/NodeValueLangDir.java @@ -31,10 +31,6 @@ import org.apache.jena.sparql.util.FmtUtils; * A string + language tag which is not "" + base direction which is "ltr" or "rtl". */ public class NodeValueLangDir extends NodeValue { - // We could extend NodeValueString for the machinery - // but it get confusing as then it is a NodeValueString - // but isString is false. - private final String string; private final String lang; private final TextDirection textDir; diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/expr/nodevalue/NodeValueNode.java b/jena-arq/src/main/java/org/apache/jena/sparql/expr/nodevalue/NodeValueNode.java index d67c44fbeb..df0f14a618 100644 --- a/jena-arq/src/main/java/org/apache/jena/sparql/expr/nodevalue/NodeValueNode.java +++ b/jena-arq/src/main/java/org/apache/jena/sparql/expr/nodevalue/NodeValueNode.java @@ -21,20 +21,19 @@ package org.apache.jena.sparql.expr.nodevalue; import org.apache.jena.graph.Node; import org.apache.jena.sparql.expr.NodeValue; - -/** A NodeValue that isn't anything else - unrecognized literals, URIs and blank nodes. - * Unrecognized literals includes ones with a known type but wrong lexical form */ - +/** + * A NodeValue that isn't anything else - unrecognized literals, URIs and blank + * nodes. Unrecognized literals includes ones with a known type but wrong lexical + * form + */ public class NodeValueNode extends NodeValue { - // ??? subclasses for NodeValueUnknownLiteralType, NodeValueLiteralBadLexicalForm - public NodeValueNode(Node n) { super(n); } @Override protected Node makeNode() - { return asNode(); } - + { return asNode(); } + @Override public void visit(NodeValueVisitor visitor) { visitor.visit(this); } } diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/expr/nodevalue/NodeValueOps.java b/jena-arq/src/main/java/org/apache/jena/sparql/expr/nodevalue/NodeValueOps.java index b76ddf2460..f7b3f91acb 100644 --- a/jena-arq/src/main/java/org/apache/jena/sparql/expr/nodevalue/NodeValueOps.java +++ b/jena-arq/src/main/java/org/apache/jena/sparql/expr/nodevalue/NodeValueOps.java @@ -45,8 +45,7 @@ import org.apache.jena.sparql.util.NodeUtils; * <p> * This class is not considered to be part of the ARQ API. */ -public class NodeValueOps -{ +public class NodeValueOps { /* * Notes: * Does not consider whether a duration is dayTime or yearMonth for @@ -326,7 +325,6 @@ public class NodeValueOps * </ul> */ public static void checkTwoArgumentStringLiterals(String label, NodeValue arg1, NodeValue arg2) { - /* Quote the spec: * Compatibility of two arguments is defined as: * The arguments are simple literals or literals typed as xsd:string diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/expr/nodevalue/NodeValueSortKey.java b/jena-arq/src/main/java/org/apache/jena/sparql/expr/nodevalue/NodeValueSortKey.java index f0481a7f6b..8104ba8223 100644 --- a/jena-arq/src/main/java/org/apache/jena/sparql/expr/nodevalue/NodeValueSortKey.java +++ b/jena-arq/src/main/java/org/apache/jena/sparql/expr/nodevalue/NodeValueSortKey.java @@ -59,7 +59,7 @@ public final class NodeValueSortKey extends NodeValue implements Comparable<Node public boolean isSortKey() { return Boolean.TRUE; } - + @Override public NodeValueSortKey getSortKey() { return this; @@ -95,12 +95,10 @@ public final class NodeValueSortKey extends NodeValue implements Comparable<Node } @Override - public String toString() - { - if (getNode() != null) { + public String toString() { + if ( getNode() != null ) return FmtUtils.stringForNode(getNode()); - } - return "'"+getString()+"'"; + return "'" + getString() + "'"; } @Override diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/expr/nodevalue/NodeValueString.java b/jena-arq/src/main/java/org/apache/jena/sparql/expr/nodevalue/NodeValueString.java index aa876a73ba..144c9ec47a 100644 --- a/jena-arq/src/main/java/org/apache/jena/sparql/expr/nodevalue/NodeValueString.java +++ b/jena-arq/src/main/java/org/apache/jena/sparql/expr/nodevalue/NodeValueString.java @@ -30,8 +30,9 @@ public class NodeValueString extends NodeValue private String string; - public NodeValueString(String str) { string = str; } - public NodeValueString(String str, Node n) { super(n); string = str; } + public NodeValueString(Node node) { this(node.getLiteralLexicalForm(), node); } + public NodeValueString(String str) { string = str; } + public NodeValueString(String str, Node node) { super(node); string = str; } @Override public boolean isString() { return true; } @@ -43,14 +44,10 @@ public class NodeValueString extends NodeValue public String asString() { return string; } @Override - public String toString() - { + public String toString() { if ( getNode() != null ) - { - // Can be a plain string or an xsd:string. return FmtUtils.stringForNode(getNode()); - } - return '"'+string+'"'; + return '"' + string + '"'; } @Override diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/expr/nodevalue/XSDFuncOp.java b/jena-arq/src/main/java/org/apache/jena/sparql/expr/nodevalue/XSDFuncOp.java index 8b670df63f..9d17d9e6b7 100644 --- a/jena-arq/src/main/java/org/apache/jena/sparql/expr/nodevalue/XSDFuncOp.java +++ b/jena-arq/src/main/java/org/apache/jena/sparql/expr/nodevalue/XSDFuncOp.java @@ -979,25 +979,21 @@ public class XSDFuncOp throw new ARQInternalErrorException("Numeric op unrecognized (" + fName + "): " + nv); } - private static Set<XSDDatatype> integerSubTypes = new HashSet<>(); - static { -// decimalSubTypes.add(XSDDatatype.XSDfloat); -// decimalSubTypes.add(XSDDatatype.XSDdouble); - integerSubTypes.add(XSDDatatype.XSDint); - integerSubTypes.add(XSDDatatype.XSDlong); - integerSubTypes.add(XSDDatatype.XSDshort); - integerSubTypes.add(XSDDatatype.XSDbyte); - integerSubTypes.add(XSDDatatype.XSDunsignedByte); - integerSubTypes.add(XSDDatatype.XSDunsignedShort); - integerSubTypes.add(XSDDatatype.XSDunsignedInt); - integerSubTypes.add(XSDDatatype.XSDunsignedLong); -// integerSubTypes.add(XSDDatatype.XSDdecimal); - integerSubTypes.add(XSDDatatype.XSDinteger); - integerSubTypes.add(XSDDatatype.XSDnonPositiveInteger); - integerSubTypes.add(XSDDatatype.XSDnonNegativeInteger); - integerSubTypes.add(XSDDatatype.XSDpositiveInteger); - integerSubTypes.add(XSDDatatype.XSDnegativeInteger); - } + private static Set<XSDDatatype> integerSubTypes = Set.of + (XSDDatatype.XSDint, + XSDDatatype.XSDlong, + XSDDatatype.XSDshort, + XSDDatatype.XSDbyte, + XSDDatatype.XSDunsignedByte, + XSDDatatype.XSDunsignedShort, + XSDDatatype.XSDunsignedInt, + XSDDatatype.XSDunsignedLong, + XSDDatatype.XSDinteger, + XSDDatatype.XSDnonPositiveInteger, + XSDDatatype.XSDnonNegativeInteger, + XSDDatatype.XSDpositiveInteger, + XSDDatatype.XSDnegativeInteger + ); public static boolean isNumericDatatype(XSDDatatype xsdDatatype) { if ( XSDDatatype.XSDfloat.equals(xsdDatatype) ) @@ -1026,16 +1022,19 @@ public class XSDFuncOp return integerSubTypes.contains(xsdDatatype); } + private static Set<XSDDatatype> temporalDatatypes = Set.of( + XSDDatatype.XSDdateTime, + XSDDatatype.XSDtime, + XSDDatatype.XSDdate, + XSDDatatype.XSDgYear, + XSDDatatype.XSDgYearMonth, + XSDDatatype.XSDgMonth, + XSDDatatype.XSDgMonthDay, + XSDDatatype.XSDgDay + ); + public static boolean isTemporalDatatype(XSDDatatype datatype) { - return - datatype.equals(XSDDatatype.XSDdateTime) || - datatype.equals(XSDDatatype.XSDtime) || - datatype.equals(XSDDatatype.XSDdate) || - datatype.equals(XSDDatatype.XSDgYear) || - datatype.equals(XSDDatatype.XSDgYearMonth) || - datatype.equals(XSDDatatype.XSDgMonth) || - datatype.equals(XSDDatatype.XSDgMonthDay) || - datatype.equals(XSDDatatype.XSDgDay); + return temporalDatatypes.contains(datatype); } public static boolean isDurationDatatype(XSDDatatype datatype) { diff --git a/jena-core/src/main/java/org/apache/jena/datatypes/xsd/XSDDateTime.java b/jena-core/src/main/java/org/apache/jena/datatypes/xsd/XSDDateTime.java index ec8ecbf72a..86b9a03109 100644 --- a/jena-core/src/main/java/org/apache/jena/datatypes/xsd/XSDDateTime.java +++ b/jena-core/src/main/java/org/apache/jena/datatypes/xsd/XSDDateTime.java @@ -31,29 +31,29 @@ import org.apache.jena.datatypes.xsd.impl.XSDAbstractDateTimeType ; public class XSDDateTime extends AbstractDateTime { /** Mask to indicate whether year is present */ public static final short YEAR_MASK = 0x1; - + /** Mask to indicate whether month is present */ public static final short MONTH_MASK = 0x2; - + /** Mask to indicate whether day is present */ public static final short DAY_MASK = 0x4; - + /** Mask to indicate whether time is present */ public static final short TIME_MASK = 0x8; - + /** Mask to indicate all date/time are present */ public static final short FULL_MASK = 0xf; - + // Unused /** table mapping xs type name to mask of legal values */ //public static final HashMap maskMap = new HashMap(); - + /** Set of legal fields for the particular date/time instance */ protected short mask; - + /** * Constructor - should only be used by the internals but public scope because * the internals spread across multiple packages. - * + * * @param value the date/time value returned by the parsing * @param mask bitmask defining which components are valid in this instance * (e.g. dates don't have valid time fields). @@ -62,18 +62,17 @@ public class XSDDateTime extends AbstractDateTime { super(value); this.mask = (short)mask; } - - + /** * Constructor - create a full DateTime object from a java calendar instance. - * + * * @param date java calendar instance */ public XSDDateTime(Calendar date) { super(convertCalendar(date)); this.mask = FULL_MASK; } - + /** * Return the most specific xsd type which can represent * this date/time @@ -98,10 +97,10 @@ public class XSDDateTime extends AbstractDateTime { return XSDDatatype.XSDdateTime; } } - + /** * Set the mask for this date/time to be that appropriate - * for the given XSD subtype. If the type is a subtype of XSDdateTime the + * for the given XSD subtype. If the type is a subtype of XSDdateTime the * mask will be narrowed appropriately, other types will be silently ignored. */ public void narrowType(XSDDatatype dt) { @@ -119,9 +118,9 @@ public class XSDDateTime extends AbstractDateTime { mask = YEAR_MASK | MONTH_MASK; } else if (dt.equals(XSDDatatype.XSDdate)) { mask = MONTH_MASK | YEAR_MASK | DAY_MASK; - } + } } - + /** * Convert a java calendar object to a new int[] in the format used by XSDAbstractDateTime */ @@ -132,8 +131,8 @@ public class XSDDateTime extends AbstractDateTime { // By observation (Sun Java 6), this is necessary (to force internal calculations presumably) ... cal.get(Calendar.ZONE_OFFSET) ; // ... then we can rebase the calendar - cal.setTimeZone(TimeZone.getTimeZone("GMT")); - + cal.setTimeZone(TimeZone.getTimeZone("GMT")); + data[AbstractDateTime.CY] = cal.get(Calendar.YEAR); data[AbstractDateTime.M] = cal.get(Calendar.MONTH) + 1; data[AbstractDateTime.D] = cal.get(Calendar.DAY_OF_MONTH); @@ -158,15 +157,14 @@ public class XSDDateTime extends AbstractDateTime { data[AbstractDateTime.ms] = ms; data[AbstractDateTime.msscale] = 3; } - return data; } /** - * Return the date time as a java Calendar object. + * Return the date time as a java Calendar object. * If the timezone has been specified then the object is normalized to GMT. * If the zone has not been specified then we use the default timezone. - * + * * @throws IllegalDateTimeFieldException if this is not a full date + time */ public Calendar asCalendar () throws IllegalDateTimeFieldException { @@ -178,7 +176,7 @@ public class XSDDateTime extends AbstractDateTime { // calendar.set(Calendar.MILLISECOND, 0); return calendar; } - + /** * Return the number of years in the dateTime. * @throws IllegalDateTimeFieldException if there is no legal year component @@ -187,7 +185,7 @@ public class XSDDateTime extends AbstractDateTime { if ((mask & YEAR_MASK) == 0) throw new IllegalDateTimeFieldException("Year not available"); return data[CY]; } - + /** * Return the month in the dateTime, this is in ISO8601 format so january = 1 * @throws IllegalDateTimeFieldException if there is no legal month component @@ -196,7 +194,7 @@ public class XSDDateTime extends AbstractDateTime { if ((mask & MONTH_MASK) == 0) throw new IllegalDateTimeFieldException("Month not available"); return data[M]; } - + /** * Return the number of years in the dateTime * @throws IllegalDateTimeFieldException if there is no legal day component @@ -205,7 +203,7 @@ public class XSDDateTime extends AbstractDateTime { if ((mask & DAY_MASK) == 0) throw new IllegalDateTimeFieldException("Day not available"); return data[D]; } - + /** * Return the number of hours in the dateTime * @throws IllegalDateTimeFieldException if there is no legal time component @@ -214,7 +212,7 @@ public class XSDDateTime extends AbstractDateTime { if ((mask & TIME_MASK) == 0) throw new IllegalDateTimeFieldException("Time not available"); return data[h]; } - + /** * Return the number of minutes in the dateTime * @throws IllegalDateTimeFieldException if there is no legal time component @@ -223,7 +221,7 @@ public class XSDDateTime extends AbstractDateTime { if ((mask & TIME_MASK) == 0) throw new IllegalDateTimeFieldException("Time not available"); return data[m]; } - + /** * Return the number of full seconds in the dateTime * @throws IllegalDateTimeFieldException if there is no legal time component @@ -232,7 +230,7 @@ public class XSDDateTime extends AbstractDateTime { if ((mask & TIME_MASK) == 0) throw new IllegalDateTimeFieldException("Time not available"); return data[s]; } - + /** * Return the number of seconds in the dateTime, including fractional part * @throws IllegalDateTimeFieldException if there is no legal time component @@ -241,7 +239,7 @@ public class XSDDateTime extends AbstractDateTime { if ((mask & TIME_MASK) == 0) throw new IllegalDateTimeFieldException("Time not available"); return data[s] + fractionalSeconds; } - + /** * Return the time component of the dateTime - i.e. just the hours/mins/seconds, * and returns the values in seconds. @@ -251,7 +249,7 @@ public class XSDDateTime extends AbstractDateTime { if ((mask & TIME_MASK) == 0) throw new IllegalDateTimeFieldException("Time not available"); return ((data[h]) * 60l + data[m]) * 60l + getSeconds(); } - + /** * Return legal serialized form. */ @@ -294,7 +292,7 @@ public class XSDDateTime extends AbstractDateTime { return buff.toString(); } - + /** * Return the lexical form of the time component. */ @@ -317,5 +315,5 @@ public class XSDDateTime extends AbstractDateTime { } return buff.toString(); } - + } diff --git a/jena-core/src/main/java/org/apache/jena/datatypes/xsd/XSDDuration.java b/jena-core/src/main/java/org/apache/jena/datatypes/xsd/XSDDuration.java index e500e02699..11f09ac64b 100644 --- a/jena-core/src/main/java/org/apache/jena/datatypes/xsd/XSDDuration.java +++ b/jena-core/src/main/java/org/apache/jena/datatypes/xsd/XSDDuration.java @@ -363,6 +363,8 @@ public class XSDDuration extends AbstractDateTime { private static int[] canonical(int[] val) { val = Arrays.copyOf(val, val.length) ; + // Pairs of positive and negative overflows. + while ( val[ms] >= 1000 ) { val[s] += 1 ; val[ms] -= 1000 ; @@ -381,7 +383,6 @@ public class XSDDuration extends AbstractDateTime { val[s] += 60 ; } - while ( val[m] >= 60 ) { val[h] += 1 ; val[m] -= 60 ; diff --git a/jena-core/src/main/java/org/apache/jena/datatypes/xsd/impl/XSDBaseNumericType.java b/jena-core/src/main/java/org/apache/jena/datatypes/xsd/impl/XSDBaseNumericType.java index 788c225be5..d7a825bc66 100644 --- a/jena-core/src/main/java/org/apache/jena/datatypes/xsd/impl/XSDBaseNumericType.java +++ b/jena-core/src/main/java/org/apache/jena/datatypes/xsd/impl/XSDBaseNumericType.java @@ -54,7 +54,6 @@ public class XSDBaseNumericType extends XSDDatatype { super(typeName, javaClass); } - /** * Test whether the given LiteralLabel is a valid instance * of this datatype. This takes into account typing information diff --git a/jena-core/src/main/java/org/apache/jena/datatypes/xsd/impl/XSDDurationType.java b/jena-core/src/main/java/org/apache/jena/datatypes/xsd/impl/XSDDurationType.java index f73461d4fe..1182602035 100644 --- a/jena-core/src/main/java/org/apache/jena/datatypes/xsd/impl/XSDDurationType.java +++ b/jena-core/src/main/java/org/apache/jena/datatypes/xsd/impl/XSDDurationType.java @@ -27,13 +27,13 @@ import org.apache.jena.datatypes.xsd.* ; * avoid this proliferation of trivial types by use of reflection but * since that causes allergic reactions in some we use brute force. * <p> - * This class includees code derived from Xerces 2.6.0 + * This class includees code derived from Xerces 2.6.0 * Copyright (c) 1999-2002 The Apache Software Foundation. * All rights reserved. * </p> */ public class XSDDurationType extends XSDAbstractDateTimeType { - + /** * Constructor */ @@ -41,14 +41,14 @@ public class XSDDurationType extends XSDAbstractDateTimeType { super("duration"); javaClass = XSDDuration.class; } - + /** * Parse a validated date. This is invoked from * XSDDatatype.convertValidatedDataValue rather then from a local * parse method to make the implementation of XSDGenericType easier. */ @Override -public Object parseValidated(String str) { + public Object parseValidated(String str) { int len = str.length(); int[] date=new int[TOTAL_SIZE]; @@ -135,5 +135,5 @@ public Object parseValidated(String str) { } return new XSDDuration(date); } - + } diff --git a/jena-core/src/main/java/org/apache/jena/graph/Node_Literal.java b/jena-core/src/main/java/org/apache/jena/graph/Node_Literal.java index 82fe5cf251..21d97c7941 100644 --- a/jena-core/src/main/java/org/apache/jena/graph/Node_Literal.java +++ b/jena-core/src/main/java/org/apache/jena/graph/Node_Literal.java @@ -83,7 +83,6 @@ public class Node_Literal extends Node public final TextDirection getLiteralBaseDirection() { return getLiteral().baseDirection(); } - @Override public final String getLiteralDatatypeURI() { return getLiteral().getDatatypeURI(); }
