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/05/07 21:55:35 UTC
svn commit: r1335219 - in
/jena/Scratch/AFS/Dev/trunk/src/main/java/projects/nodevalue: NV2.java
NodeValueOps.java TestNodeValueOps.java
Author: andy
Date: Mon May 7 19:55:35 2012
New Revision: 1335219
URL: http://svn.apache.org/viewvc?rev=1335219&view=rev
Log: (empty)
Removed:
jena/Scratch/AFS/Dev/trunk/src/main/java/projects/nodevalue/NodeValueOps.java
jena/Scratch/AFS/Dev/trunk/src/main/java/projects/nodevalue/TestNodeValueOps.java
Modified:
jena/Scratch/AFS/Dev/trunk/src/main/java/projects/nodevalue/NV2.java
Modified: jena/Scratch/AFS/Dev/trunk/src/main/java/projects/nodevalue/NV2.java
URL: http://svn.apache.org/viewvc/jena/Scratch/AFS/Dev/trunk/src/main/java/projects/nodevalue/NV2.java?rev=1335219&r1=1335218&r2=1335219&view=diff
==============================================================================
--- jena/Scratch/AFS/Dev/trunk/src/main/java/projects/nodevalue/NV2.java (original)
+++ jena/Scratch/AFS/Dev/trunk/src/main/java/projects/nodevalue/NV2.java Mon May 7 19:55:35 2012
@@ -18,76 +18,17 @@
package projects.nodevalue;
-import java.util.GregorianCalendar ;
-
import javax.xml.datatype.DatatypeConfigurationException ;
import javax.xml.datatype.DatatypeFactory ;
-import javax.xml.datatype.Duration ;
-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 ;
+import com.hp.hpl.jena.sparql.expr.nodevalue.NodeValueOps ;
import com.hp.hpl.jena.sparql.util.NodeFactory ;
public class NV2
{
- // Convert NodeValue to use javax.xml.datatype. XMLGregorianCalendar and Duration
- // Can all date/times be the same class with a "get type"
- // get type = as node .getDatatypeURI?
- // Leave the "isGYear", and hasDatetime.
- // AbstractDT
- // .getYear etc all blow up except if overridden.
- //XMLGregorianCalendar.getXYZ return MININT for undef.
-
- /* Operations
- * add, subtract (duration, duration)
- *
-(xsd:duration, xsd:duration) -> xsd:duration
- 10.6.1 op:add-yearMonthDurations
- 10.6.2 op:subtract-yearMonthDurations
-(xsd:duration, xsd:duration) -> xsd:duration
- 10.6.6 op:add-dayTimeDurations
- 10.6.7 op:subtract-dayTimeDurations
-** Java has general duration subtract
-
- * Subtract two date/times
-
-(xsd:dateTime, xsd:dateTime) -> xsd:duration
- 10.8.1 op:subtract-dateTimes -> xsd:dayTimeDuration
-(xsd:date, xsd:date) -> xsd:duration
- 10.8.2 op:subtract-dates
-(xsd:time, xsd:time) -> xsd:duration
- 10.8.3 op:subtract-times
-
- * Date/time and duration
-** Java has general duration subtract (error needed?)
-
-(xsd:dateTime, xsd:duration) -> xsd:dateTime
- 10.8.4 op:add-yearMonthDuration-to-dateTime
- 10.8.5 op:add-dayTimeDuration-to-dateTime
- 10.8.6 op:subtract-yearMonthDuration-from-dateTime
- 10.8.7 op:subtract-dayTimeDuration-from-dateTime
-
-(xsd:date, xsd:duration) -> xsd:date
- 10.8.8 op:add-yearMonthDuration-to-date
- 10.8.9 op:add-dayTimeDuration-to-date
- 10.8.10 op:subtract-yearMonthDuration-from-date
- 10.8.11 op:subtract-dayTimeDuration-from-date
-
-(xsd:time, xsd:duration) -> xsd:time
- 10.8.12 op:add-dayTimeDuration-to-time
- 10.8.13 op:subtract-dayTimeDuration-from-time
- */
-
- /* Missing:
-(xsd:duration, xsd:double) -> xsd:duration
- 10.6.8 op:multiply-dayTimeDuration
- 10.6.9 op:divide-dayTimeDuration
-
-(xsd:duration, xsd:duration) -> xsd:decimal
- 10.6.10 op:divide-dayTimeDuration-by-dayTimeDuration
- */
/*
fn:dateTime($arg1 as xs:date?, $arg2 as xs:time?) as xs:dateTime?
@@ -100,7 +41,6 @@ http://www.w3.org/TR/xmlschema11-2/#dt-d
private static DatatypeFactory datatypefactory ;
static
{
- //System.setProperty("javax.xml.datatype.DatatypeFactory", "com.sun.org.apache.xerces.internal.jaxp.datatype.DatatypeFactoryImpl") ;
try { datatypefactory = DatatypeFactory.newInstance() ; }
catch (DatatypeConfigurationException ex)
{ throw new ARQInternalErrorException("Can't create a javax.xml DatatypeFactory") ; }
@@ -154,32 +94,6 @@ http://www.w3.org/TR/xmlschema11-2/#dt-d
}
}
- // XSDFuncOps
- public static XMLGregorianCalendar xsd_add(XMLGregorianCalendar cal, Duration duration)
- {
- //if ( ! isYearMonth(duration) && ! isDayTime(duration) )
-
- XMLGregorianCalendar result = (XMLGregorianCalendar)cal.clone() ;
- result.add(duration) ;
- return result ;
- }
-
- // XSDFuncOps
- public static XMLGregorianCalendar xsd_subtract(XMLGregorianCalendar cal, Duration duration)
- {
- return xsd_add(cal, duration.negate()) ;
- }
-
- // XSDFuncOps
- public static Duration xsd_substract(XMLGregorianCalendar cal1, XMLGregorianCalendar cal2)
- {
- GregorianCalendar gcal1 = cal1.toGregorianCalendar() ;
- GregorianCalendar gcal2 = cal2.toGregorianCalendar() ;
- long x1 = gcal1.getTimeInMillis() ;
- long x2 = gcal2.getTimeInMillis() ;
- //return datatypefactory.newDurationDayTime(x1-x2) ;
- return datatypefactory.newDuration(x1-x2) ;
- }
}