You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jena.apache.org by an...@apache.org on 2012/10/16 21:01:21 UTC
svn commit: r1398925 - in /jena/trunk/jena-arq/src/main/java:
com/hp/hpl/jena/sparql/expr/nodevalue/NodeValueDT.java
com/hp/hpl/jena/sparql/expr/nodevalue/NodeValueOps.java
org/openjena/riot/pipeline/normalize/NormalizeValue.java
Author: andy
Date: Tue Oct 16 19:01:20 2012
New Revision: 1398925
URL: http://svn.apache.org/viewvc?rev=1398925&view=rev
Log:
Use a common XML Datatype factory.
Modified:
jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/nodevalue/NodeValueDT.java
jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/nodevalue/NodeValueOps.java
jena/trunk/jena-arq/src/main/java/org/openjena/riot/pipeline/normalize/NormalizeValue.java
Modified: jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/nodevalue/NodeValueDT.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/nodevalue/NodeValueDT.java?rev=1398925&r1=1398924&r2=1398925&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/nodevalue/NodeValueDT.java (original)
+++ jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/nodevalue/NodeValueDT.java Tue Oct 16 19:01:20 2012
@@ -27,24 +27,13 @@ import static com.hp.hpl.jena.datatypes.
import static com.hp.hpl.jena.datatypes.xsd.XSDDatatype.XSDgYearMonth ;
import static com.hp.hpl.jena.datatypes.xsd.XSDDatatype.XSDtime ;
-import javax.xml.datatype.DatatypeConfigurationException ;
-import javax.xml.datatype.DatatypeFactory ;
import javax.xml.datatype.XMLGregorianCalendar ;
import com.hp.hpl.jena.graph.Node ;
-import com.hp.hpl.jena.sparql.ARQInternalErrorException ;
import com.hp.hpl.jena.sparql.expr.NodeValue ;
public class NodeValueDT extends NodeValue
{
- private static DatatypeFactory datatypefactory = null ;
- static
- {
- try { datatypefactory = DatatypeFactory.newInstance() ; }
- catch (DatatypeConfigurationException ex)
- { throw new ARQInternalErrorException("Can't create a javax.xml DatatypeFactory") ; }
- }
-
final private XMLGregorianCalendar datetime ;
public NodeValueDT(String lex, Node n)
@@ -56,12 +45,12 @@ public class NodeValueDT extends NodeVal
if ( lex.endsWith("Z") )
{
lex = lex.substring(0, lex.length()-1) ;
- datetime = datatypefactory.newXMLGregorianCalendar(lex) ;
+ datetime = NodeValue.xmlDatatypeFactory.newXMLGregorianCalendar(lex) ;
datetime.setTimezone(0) ;
return ;
}
}
- datetime = datatypefactory.newXMLGregorianCalendar(lex) ;
+ datetime = NodeValue.xmlDatatypeFactory.newXMLGregorianCalendar(lex) ;
}
// Look at datatype.
Modified: jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/nodevalue/NodeValueOps.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/nodevalue/NodeValueOps.java?rev=1398925&r1=1398924&r2=1398925&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/nodevalue/NodeValueOps.java (original)
+++ jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/nodevalue/NodeValueOps.java Tue Oct 16 19:01:20 2012
@@ -308,7 +308,6 @@ public class NodeValueOps
GregorianCalendar gcal2 = cal2.toGregorianCalendar() ;
long x1 = gcal1.getTimeInMillis() ;
long x2 = gcal2.getTimeInMillis() ;
- //return datatypefactory.newDurationDayTime(x1-x2) ;
return NodeValue.xmlDatatypeFactory.newDuration(x1-x2) ;
}
Modified: jena/trunk/jena-arq/src/main/java/org/openjena/riot/pipeline/normalize/NormalizeValue.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/openjena/riot/pipeline/normalize/NormalizeValue.java?rev=1398925&r1=1398924&r2=1398925&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/openjena/riot/pipeline/normalize/NormalizeValue.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/openjena/riot/pipeline/normalize/NormalizeValue.java Tue Oct 16 19:01:20 2012
@@ -25,14 +25,12 @@ import java.text.DecimalFormatSymbols ;
import java.text.NumberFormat ;
import java.util.Locale ;
-import javax.xml.datatype.DatatypeConfigurationException ;
-import javax.xml.datatype.DatatypeFactory ;
import javax.xml.datatype.XMLGregorianCalendar ;
import com.hp.hpl.jena.datatypes.RDFDatatype ;
import com.hp.hpl.jena.datatypes.xsd.XSDDatatype ;
import com.hp.hpl.jena.graph.Node ;
-import com.hp.hpl.jena.sparql.ARQException ;
+import com.hp.hpl.jena.sparql.expr.NodeValue ;
import com.hp.hpl.jena.sparql.graph.NodeConst ;
import com.hp.hpl.jena.sparql.util.DateTimeStruct ;
@@ -58,15 +56,6 @@ class NormalizeValue
}
} ;
- private static DatatypeFactory datatypeFactory = null ;
- static
- {
- try
- { datatypeFactory = DatatypeFactory.newInstance() ; }
- catch (DatatypeConfigurationException ex)
- { throw new ARQException("NormalizeValue", ex) ; }
- }
-
static DatatypeHandler dtAnyDateTime = new DatatypeHandler() {
@Override
public Node handle(Node node, String lexicalForm, RDFDatatype datatype)
@@ -80,7 +69,7 @@ class NormalizeValue
// Record for history.
if ( false )
{
- XMLGregorianCalendar xcal = datatypeFactory.newXMLGregorianCalendar(lexicalForm) ;
+ XMLGregorianCalendar xcal = NodeValue.xmlDatatypeFactory.newXMLGregorianCalendar(lexicalForm) ;
if ( xcal.getFractionalSecond() != null )
{
if ( xcal.getFractionalSecond().compareTo(BigDecimal.ZERO) == 0 )