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 2013/03/08 16:08:31 UTC

svn commit: r1454416 - in /jena/branches/arq-riot-output: ./ bin/ src/main/java/com/hp/hpl/jena/sparql/util/ src/main/java/org/apache/jena/atlas/io/ src/test/java/com/hp/hpl/jena/query/ src/test/java/com/hp/hpl/jena/sparql/function/user/

Author: andy
Date: Fri Mar  8 15:08:30 2013
New Revision: 1454416

URL: http://svn.apache.org/r1454416
Log:
Merge from trunk

Modified:
    jena/branches/arq-riot-output/   (props changed)
    jena/branches/arq-riot-output/bin/make_classpath_mvn
    jena/branches/arq-riot-output/src/main/java/com/hp/hpl/jena/sparql/util/NodeFactory.java
    jena/branches/arq-riot-output/src/main/java/org/apache/jena/atlas/io/IO.java
    jena/branches/arq-riot-output/src/test/java/com/hp/hpl/jena/query/TestParameterizedSparqlString.java
    jena/branches/arq-riot-output/src/test/java/com/hp/hpl/jena/sparql/function/user/TestUserDefinedFunctionFactory.java
    jena/branches/arq-riot-output/src/test/java/com/hp/hpl/jena/sparql/function/user/TestUserFunctionsInSparql.java

Propchange: jena/branches/arq-riot-output/
------------------------------------------------------------------------------
  Merged /jena/trunk/jena-arq:r1452422-1454415

Modified: jena/branches/arq-riot-output/bin/make_classpath_mvn
URL: http://svn.apache.org/viewvc/jena/branches/arq-riot-output/bin/make_classpath_mvn?rev=1454416&r1=1454415&r2=1454416&view=diff
==============================================================================
--- jena/branches/arq-riot-output/bin/make_classpath_mvn (original)
+++ jena/branches/arq-riot-output/bin/make_classpath_mvn Fri Mar  8 15:08:30 2013
@@ -28,7 +28,6 @@ X=$(perl -ne 'next unless /\spath="M2_RE
 
 SEP=':'
 CP=${CP:-}
-[ "$CP" != "" ] && CP="${SEP}${CP}"
 
 for x in $X
 do

Modified: jena/branches/arq-riot-output/src/main/java/com/hp/hpl/jena/sparql/util/NodeFactory.java
URL: http://svn.apache.org/viewvc/jena/branches/arq-riot-output/src/main/java/com/hp/hpl/jena/sparql/util/NodeFactory.java?rev=1454416&r1=1454415&r2=1454416&view=diff
==============================================================================
--- jena/branches/arq-riot-output/src/main/java/com/hp/hpl/jena/sparql/util/NodeFactory.java (original)
+++ jena/branches/arq-riot-output/src/main/java/com/hp/hpl/jena/sparql/util/NodeFactory.java Fri Mar  8 15:08:30 2013
@@ -112,6 +112,26 @@ public class NodeFactory
         return i ;
     }
     
+    public static float nodeToFloat(Node node)
+    {
+        LiteralLabel lit = node.getLiteral();
+        
+        if ( ! XSDDatatype.XSDfloat.isValidLiteral(lit) )
+            return Float.NaN;
+        float f = ((Number)lit.getValue()).floatValue();
+        return f;
+    }
+    
+    public static double nodeToDouble(Node node)
+    {
+        LiteralLabel lit = node.getLiteral();
+        
+        if ( ! XSDDatatype.XSDdouble.isValidLiteral(lit) )
+            return Double.NaN;
+        double d = ((Number)lit.getValue()).doubleValue();
+        return d;
+    }
+    
     public static Node intToNode(int integer)
     {
         return Node.createLiteral(Integer.toString(integer), "", XSDDatatype.XSDinteger) ;
@@ -126,6 +146,11 @@ public class NodeFactory
     {
         return Node.createLiteral(Float.toString(value), "", XSDDatatype.XSDfloat) ;
     }
+    
+    public static Node doubleToNode(double value)
+    {
+        return Node.createLiteral(Double.toString(value), "", XSDDatatype.XSDdouble) ;
+    }
 
     public static Node nowAsDateTime()
     {

Modified: jena/branches/arq-riot-output/src/main/java/org/apache/jena/atlas/io/IO.java
URL: http://svn.apache.org/viewvc/jena/branches/arq-riot-output/src/main/java/org/apache/jena/atlas/io/IO.java?rev=1454416&r1=1454415&r2=1454416&view=diff
==============================================================================
--- jena/branches/arq-riot-output/src/main/java/org/apache/jena/atlas/io/IO.java (original)
+++ jena/branches/arq-riot-output/src/main/java/org/apache/jena/atlas/io/IO.java Fri Mar  8 15:08:30 2013
@@ -166,7 +166,14 @@ public class IO
         try { resource.close(); } catch (IOException ex) { }
     }
     
-    public static void closeSilent(IndentedWriter resource)
+    public static void close(AWriter resource)
+    {
+        if ( resource == null )
+            return ;
+        resource.close();
+    }
+    
+    public static void closeSilent(AWriter resource)
     {
         if ( resource == null )
             return ;

Modified: jena/branches/arq-riot-output/src/test/java/com/hp/hpl/jena/query/TestParameterizedSparqlString.java
URL: http://svn.apache.org/viewvc/jena/branches/arq-riot-output/src/test/java/com/hp/hpl/jena/query/TestParameterizedSparqlString.java?rev=1454416&r1=1454415&r2=1454416&view=diff
==============================================================================
--- jena/branches/arq-riot-output/src/test/java/com/hp/hpl/jena/query/TestParameterizedSparqlString.java (original)
+++ jena/branches/arq-riot-output/src/test/java/com/hp/hpl/jena/query/TestParameterizedSparqlString.java Fri Mar  8 15:08:30 2013
@@ -34,7 +34,7 @@ import com.hp.hpl.jena.shared.impl.Prefi
 import com.hp.hpl.jena.update.UpdateRequest;
 import com.hp.hpl.jena.vocabulary.XSD;
 
-import org.junit.Assert ;
+import org.junit.Assert;
 
 public class TestParameterizedSparqlString {
 

Modified: jena/branches/arq-riot-output/src/test/java/com/hp/hpl/jena/sparql/function/user/TestUserDefinedFunctionFactory.java
URL: http://svn.apache.org/viewvc/jena/branches/arq-riot-output/src/test/java/com/hp/hpl/jena/sparql/function/user/TestUserDefinedFunctionFactory.java?rev=1454416&r1=1454415&r2=1454416&view=diff
==============================================================================
--- jena/branches/arq-riot-output/src/test/java/com/hp/hpl/jena/sparql/function/user/TestUserDefinedFunctionFactory.java (original)
+++ jena/branches/arq-riot-output/src/test/java/com/hp/hpl/jena/sparql/function/user/TestUserDefinedFunctionFactory.java Fri Mar  8 15:08:30 2013
@@ -20,7 +20,7 @@ package com.hp.hpl.jena.sparql.function.
 
 import java.util.ArrayList;
 
-import org.junit.Assert ;
+import org.junit.Assert;
 
 import org.junit.AfterClass;
 import org.junit.BeforeClass;

Modified: jena/branches/arq-riot-output/src/test/java/com/hp/hpl/jena/sparql/function/user/TestUserFunctionsInSparql.java
URL: http://svn.apache.org/viewvc/jena/branches/arq-riot-output/src/test/java/com/hp/hpl/jena/sparql/function/user/TestUserFunctionsInSparql.java?rev=1454416&r1=1454415&r2=1454416&view=diff
==============================================================================
--- jena/branches/arq-riot-output/src/test/java/com/hp/hpl/jena/sparql/function/user/TestUserFunctionsInSparql.java (original)
+++ jena/branches/arq-riot-output/src/test/java/com/hp/hpl/jena/sparql/function/user/TestUserFunctionsInSparql.java Fri Mar  8 15:08:30 2013
@@ -20,7 +20,7 @@ package com.hp.hpl.jena.sparql.function.
 
 import java.util.ArrayList;
 
-import org.junit.Assert ;
+import org.junit.Assert;
 
 import org.junit.AfterClass;
 import org.junit.BeforeClass;