jena-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From a...@apache.org
Subject jena git commit: Some tidying up.
Date Sun, 30 Nov 2014 19:52:40 GMT
Repository: jena
Updated Branches:
  refs/heads/master e17f8b8f2 -> 998187582


Some tidying up.

Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/99818758
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/99818758
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/99818758

Branch: refs/heads/master
Commit: 99818758220dbd7f533d69393d7b00dcd51c2c99
Parents: e17f8b8
Author: Andy Seaborne <andy@apache.org>
Authored: Sun Nov 30 19:46:01 2014 +0000
Committer: Andy Seaborne <andy@apache.org>
Committed: Sun Nov 30 19:46:01 2014 +0000

----------------------------------------------------------------------
 jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/NodeValue.java | 1 -
 jena-arq/src/main/java/com/hp/hpl/jena/sparql/util/NodeUtils.java | 2 +-
 jena-core/src/test/java/com/hp/hpl/jena/graph/test/TestNode.java  | 2 +-
 3 files changed, 2 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/jena/blob/99818758/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/NodeValue.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/NodeValue.java b/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/NodeValue.java
index 8e2c71d..0ac2186 100644
--- a/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/NodeValue.java
+++ b/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/NodeValue.java
@@ -654,7 +654,6 @@ public abstract class NodeValue extends ExprNode
 
     public static int compareAlways(NodeValue nv1, NodeValue nv2)
     {
-        // ***** Only called from a test. Sort out with NodeUtils.
         try {
             int x = compare(nv1, nv2, true) ;
             // Same?

http://git-wip-us.apache.org/repos/asf/jena/blob/99818758/jena-arq/src/main/java/com/hp/hpl/jena/sparql/util/NodeUtils.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/com/hp/hpl/jena/sparql/util/NodeUtils.java b/jena-arq/src/main/java/com/hp/hpl/jena/sparql/util/NodeUtils.java
index c3ba796..f8ae6f7 100644
--- a/jena-arq/src/main/java/com/hp/hpl/jena/sparql/util/NodeUtils.java
+++ b/jena-arq/src/main/java/com/hp/hpl/jena/sparql/util/NodeUtils.java
@@ -195,7 +195,7 @@ public class NodeUtils
     private static int compareLiteralsBySyntax(Node node1, Node node2)
     {
         if ( node1 == null || ! node1.isLiteral() ||
-        node2 == null || ! node2.isLiteral() )
+             node2 == null || ! node2.isLiteral() )
             throw new ARQInternalErrorException("compareLiteralsBySyntax called with non-literal:
("+node1+","+node2+")") ;
 
         if ( node1.equals(node2) )

http://git-wip-us.apache.org/repos/asf/jena/blob/99818758/jena-core/src/test/java/com/hp/hpl/jena/graph/test/TestNode.java
----------------------------------------------------------------------
diff --git a/jena-core/src/test/java/com/hp/hpl/jena/graph/test/TestNode.java b/jena-core/src/test/java/com/hp/hpl/jena/graph/test/TestNode.java
index 6699dd2..461b519 100644
--- a/jena-core/src/test/java/com/hp/hpl/jena/graph/test/TestNode.java
+++ b/jena-core/src/test/java/com/hp/hpl/jena/graph/test/TestNode.java
@@ -710,7 +710,7 @@ public class TestNode extends GraphTestBase
 
     private static void assertLangString(Node n) {
         RDFDatatype dt = n.getLiteralDatatype() ;
-        assertNotSame("", n.getLiteralLanguage() ) ;    // "" is not legal.
+        assertDiffer("", n.getLiteralLanguage() ) ;    // "" is not legal.
         if ( JenaRuntime.isRDF11 )
             assertEquals(RDF.dtLangString, dt) ;
         else


Mime
View raw message