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 2014/12/31 15:46:03 UTC
jena git commit: Remove SystemARQ.SameValueAsString flag.
Repository: jena
Updated Branches:
refs/heads/master 311ee927f -> 98e2c391c
Remove SystemARQ.SameValueAsString flag.
RDF 1.1 compatibility makes it redundant.
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/98e2c391
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/98e2c391
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/98e2c391
Branch: refs/heads/master
Commit: 98e2c391c60ec12d6be1a077517915631d097b71
Parents: 311ee92
Author: Andy Seaborne <an...@apache.org>
Authored: Wed Dec 31 14:45:38 2014 +0000
Committer: Andy Seaborne <an...@apache.org>
Committed: Wed Dec 31 14:45:38 2014 +0000
----------------------------------------------------------------------
jena-arq/src/main/java/com/hp/hpl/jena/query/ARQ.java | 3 ---
jena-arq/src/main/java/com/hp/hpl/jena/sparql/SystemARQ.java | 6 +-----
.../src/main/java/com/hp/hpl/jena/sparql/expr/NodeValue.java | 4 ++--
3 files changed, 3 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/98e2c391/jena-arq/src/main/java/com/hp/hpl/jena/query/ARQ.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/com/hp/hpl/jena/query/ARQ.java b/jena-arq/src/main/java/com/hp/hpl/jena/query/ARQ.java
index 79aab38..5262c7e 100644
--- a/jena-arq/src/main/java/com/hp/hpl/jena/query/ARQ.java
+++ b/jena-arq/src/main/java/com/hp/hpl/jena/query/ARQ.java
@@ -445,7 +445,6 @@ public class ARQ
{
SystemARQ.StrictDateTimeFO = true ;
SystemARQ.ValueExtensions = false ;
- SystemARQ.SameValueAsString = false ;
SystemARQ.EnableRomanNumerals = false ;
context.set(optimization, false) ;
@@ -467,7 +466,6 @@ public class ARQ
public static void setNormalMode() {
SystemARQ.StrictDateTimeFO = false ;
SystemARQ.ValueExtensions = true ;
- SystemARQ.SameValueAsString = true ;
SystemARQ.EnableRomanNumerals = false ;
setNormalMode(ARQ.getContext()) ;
}
@@ -553,7 +551,6 @@ public class ARQ
{
SystemARQ.StrictDateTimeFO = false ;
SystemARQ.ValueExtensions = true ;
- SystemARQ.SameValueAsString = true ;
SystemARQ.EnableRomanNumerals = false ;
Context context = new Context() ;
http://git-wip-us.apache.org/repos/asf/jena/blob/98e2c391/jena-arq/src/main/java/com/hp/hpl/jena/sparql/SystemARQ.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/com/hp/hpl/jena/sparql/SystemARQ.java b/jena-arq/src/main/java/com/hp/hpl/jena/sparql/SystemARQ.java
index 6c4308b..41424ba 100644
--- a/jena-arq/src/main/java/com/hp/hpl/jena/sparql/SystemARQ.java
+++ b/jena-arq/src/main/java/com/hp/hpl/jena/sparql/SystemARQ.java
@@ -46,11 +46,7 @@ public class SystemARQ
* Examples incldue xsd;date and simple literal/xsd:string.
*/
public static boolean ValueExtensions = true ;
- /** Control whether simple literals, string literals without datatype orlanguage tag,
- * are created sameValueAs xsd:string. Normally true.
- * Some testing for pre-RDF-1.1 assumes otherwise.
- */
- public static boolean SameValueAsString = true ;
+
/**
* Under strict F&O, dateTimes and dates with no timezone have one magically applied.
* This default timezone is implementation dependent and can lead to different answers
http://git-wip-us.apache.org/repos/asf/jena/blob/98e2c391/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 3ca8cc3..33bd491 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
@@ -1063,8 +1063,8 @@ public abstract class NodeValue extends ExprNode
try { // DatatypeFormatException - should not happen
- if ( SystemARQ.SameValueAsString && XSDstring.isValidLiteral(lit) )
- // String - plain or xsd:string
+ if ( XSDstring.isValidLiteral(lit) )
+ // String - plain or xsd:string, or derived datatype.
return new NodeValueString(lit.getLexicalForm(), node) ;
// Otherwise xsd:string is like any other unknown datatype.