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/11/21 17:48:47 UTC
[1/7] jena git commit: Reformat comments.
Repository: jena
Updated Branches:
refs/heads/master 7c987169f -> 69ffd0cfb
Reformat comments.
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/6393067c
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/6393067c
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/6393067c
Branch: refs/heads/master
Commit: 6393067cbcfd5ae83f66abf61726e70607a888b1
Parents: 7c98716
Author: Andy Seaborne <an...@apache.org>
Authored: Fri Nov 21 15:55:57 2014 +0000
Committer: Andy Seaborne <an...@apache.org>
Committed: Fri Nov 21 15:55:57 2014 +0000
----------------------------------------------------------------------
.../java/org/apache/jena/riot/writer/TurtleShell.java | 14 ++++++--------
1 file changed, 6 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/6393067c/jena-arq/src/main/java/org/apache/jena/riot/writer/TurtleShell.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/riot/writer/TurtleShell.java b/jena-arq/src/main/java/org/apache/jena/riot/writer/TurtleShell.java
index f128c73..0162c6c 100644
--- a/jena-arq/src/main/java/org/apache/jena/riot/writer/TurtleShell.java
+++ b/jena-arq/src/main/java/org/apache/jena/riot/writer/TurtleShell.java
@@ -585,14 +585,12 @@ public abstract class TurtleShell {
}
for ( Node p : predicates ) {
- List<Node> rdfLiterals = new ArrayList<>() ; // Literals in the
- // group
- List<Node> rdfSimpleNodes = new ArrayList<>() ; // Non-literals,
- // printed
- List<Node> rdfComplexNodes = new ArrayList<>() ; // Non-literals,
- // printed ()
- // or
- // []-embedded
+ // Literals in the group
+ List<Node> rdfLiterals = new ArrayList<>() ;
+ // Non-literals, printed
+ List<Node> rdfSimpleNodes = new ArrayList<>() ;
+ // Non-literals, printed (), or []-embedded
+ List<Node> rdfComplexNodes = new ArrayList<>() ;
for ( Node o : pGroups.get(p) ) {
if ( o.isLiteral() ) {
[7/7] jena git commit: Set RDF 11 mode false.
Posted by an...@apache.org.
Set RDF 11 mode false.
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/69ffd0cf
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/69ffd0cf
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/69ffd0cf
Branch: refs/heads/master
Commit: 69ffd0cfb266878b885e792ddeed00f8327a7bbf
Parents: 0e83e7b
Author: Andy Seaborne <an...@apache.org>
Authored: Fri Nov 21 16:48:35 2014 +0000
Committer: Andy Seaborne <an...@apache.org>
Committed: Fri Nov 21 16:48:35 2014 +0000
----------------------------------------------------------------------
jena-core/src/main/java/com/hp/hpl/jena/JenaRuntime.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/69ffd0cf/jena-core/src/main/java/com/hp/hpl/jena/JenaRuntime.java
----------------------------------------------------------------------
diff --git a/jena-core/src/main/java/com/hp/hpl/jena/JenaRuntime.java b/jena-core/src/main/java/com/hp/hpl/jena/JenaRuntime.java
index dc8148d..068a756 100644
--- a/jena-core/src/main/java/com/hp/hpl/jena/JenaRuntime.java
+++ b/jena-core/src/main/java/com/hp/hpl/jena/JenaRuntime.java
@@ -81,7 +81,7 @@ public class JenaRuntime
* </p>
*/
- public static boolean isRDF11 = true ;
+ public static boolean isRDF11 = false ;
// --------------------------------------------------------------
[4/7] jena git commit: Remove unused.
Posted by an...@apache.org.
Remove unused.
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/82128c27
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/82128c27
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/82128c27
Branch: refs/heads/master
Commit: 82128c271bbc902eeb14373addea8fa10cf2334d
Parents: 985b99a
Author: Andy Seaborne <an...@apache.org>
Authored: Fri Nov 21 15:57:20 2014 +0000
Committer: Andy Seaborne <an...@apache.org>
Committed: Fri Nov 21 15:57:20 2014 +0000
----------------------------------------------------------------------
.../jena/graph/impl/LiteralLabelFactory.java | 22 +-------------------
1 file changed, 1 insertion(+), 21 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/82128c27/jena-core/src/main/java/com/hp/hpl/jena/graph/impl/LiteralLabelFactory.java
----------------------------------------------------------------------
diff --git a/jena-core/src/main/java/com/hp/hpl/jena/graph/impl/LiteralLabelFactory.java b/jena-core/src/main/java/com/hp/hpl/jena/graph/impl/LiteralLabelFactory.java
index 360514d..69c9ae1 100644
--- a/jena-core/src/main/java/com/hp/hpl/jena/graph/impl/LiteralLabelFactory.java
+++ b/jena-core/src/main/java/com/hp/hpl/jena/graph/impl/LiteralLabelFactory.java
@@ -49,24 +49,6 @@ public class LiteralLabelFactory
return new LiteralLabelImpl(value, lang, dtype) ;
}
-
-// /**
-// * Build a typed literal label supplying both value and lexical form.
-// * The caller guarantees that the lexical form is legal,
-// * and the value corresponds.
-// *
-// * @param lex the lexical form of the literal
-// * @param value the value of the literal
-// * @param lang the optional language tag, only relevant for plain literals
-// * @param dtype the type of the literal, null for old style "plain" literals
-// */
-// public static LiteralLabel create(String lex,
-// Object value,
-// String lang,
-// RDFDatatype dtype) {
-// return new LiteralLabelImpl(lex, value, lang, dtype) ;
-// }
-
/**
* Build a typed literal label from its value form using
* whatever datatype is currently registered as the the default
@@ -78,10 +60,8 @@ public class LiteralLabelFactory
}
/**
- * Old style constructor. Creates either a plain literal or an
- * XMLLiteral.
+ * Creates either a plain literal or an XMLLiteral.
* @param xml If true then s is exclusive canonical XML of type rdf:XMLLiteral, and no checking will be invoked.
-
*/
public static LiteralLabel create(String s, String lg, boolean xml) {
return new LiteralLabelImpl(s, lg, xml) ;
[2/7] jena git commit: Typo
Posted by an...@apache.org.
Typo
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/8a8bf936
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/8a8bf936
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/8a8bf936
Branch: refs/heads/master
Commit: 8a8bf936d419fae9a6980474c271d5a23670cae3
Parents: 6393067
Author: Andy Seaborne <an...@apache.org>
Authored: Fri Nov 21 15:56:10 2014 +0000
Committer: Andy Seaborne <an...@apache.org>
Committed: Fri Nov 21 15:56:10 2014 +0000
----------------------------------------------------------------------
.../datatypes/xsd/impl/XSDBaseStringType.java | 24 +-------------------
1 file changed, 1 insertion(+), 23 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/8a8bf936/jena-core/src/main/java/com/hp/hpl/jena/datatypes/xsd/impl/XSDBaseStringType.java
----------------------------------------------------------------------
diff --git a/jena-core/src/main/java/com/hp/hpl/jena/datatypes/xsd/impl/XSDBaseStringType.java b/jena-core/src/main/java/com/hp/hpl/jena/datatypes/xsd/impl/XSDBaseStringType.java
index 6a5613e..e8e2a6e 100644
--- a/jena-core/src/main/java/com/hp/hpl/jena/datatypes/xsd/impl/XSDBaseStringType.java
+++ b/jena-core/src/main/java/com/hp/hpl/jena/datatypes/xsd/impl/XSDBaseStringType.java
@@ -23,7 +23,7 @@ import com.hp.hpl.jena.graph.impl.LiteralLabel;
import com.hp.hpl.jena.shared.impl.JenaParameters;
/**
- * Base implementation for all string datatypes derinved from
+ * Base implementation for all string datatypes derived from
* xsd:string. The only purpose of this place holder is
* to support the isValidLiteral tests across string types.
*/
@@ -49,28 +49,6 @@ public class XSDBaseStringType extends XSDDatatype {
super(typeName, javaClass);
}
-
-// Functionality moved to XSDDatatype but old code left here temporarily until
-// we're sure the change is correct.
-//
-// /**
-// * Test whether the given LiteralLabel is a valid instance
-// * of this datatype. This takes into accound typing information
-// * as well as lexical form - for example an xsd:string is
-// * never considered valid as an xsd:integer (even if it is
-// * lexically legal like "1").
-// */
-// public boolean isValidLiteral(LiteralLabel lit) {
-// RDFDatatype dt = lit.getDatatype();
-// if ( dt == null && lit.language().equals("") ) return true;
-// if ( this.equals(dt) ) return true;
-// if (dt instanceof XSDBaseStringType) {
-// return isValid(lit.getLexicalForm());
-// } else {
-// return false;
-// }
-// }
-
/**
* Compares two instances of values of the given datatype.
* This ignores lang tags and optionally allows plain literals to
[5/7] jena git commit: Make development flag "JenaRuntime.isRDF11"
mutable.
Posted by an...@apache.org.
Make development flag "JenaRuntime.isRDF11" mutable.
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/be227075
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/be227075
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/be227075
Branch: refs/heads/master
Commit: be2270755eac4c1b7f268a3f5907cee2ab77eae6
Parents: 82128c2
Author: Andy Seaborne <an...@apache.org>
Authored: Fri Nov 21 16:02:40 2014 +0000
Committer: Andy Seaborne <an...@apache.org>
Committed: Fri Nov 21 16:02:40 2014 +0000
----------------------------------------------------------------------
jena-core/src/main/java/com/hp/hpl/jena/JenaRuntime.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/be227075/jena-core/src/main/java/com/hp/hpl/jena/JenaRuntime.java
----------------------------------------------------------------------
diff --git a/jena-core/src/main/java/com/hp/hpl/jena/JenaRuntime.java b/jena-core/src/main/java/com/hp/hpl/jena/JenaRuntime.java
index 4813d14..dc8148d 100644
--- a/jena-core/src/main/java/com/hp/hpl/jena/JenaRuntime.java
+++ b/jena-core/src/main/java/com/hp/hpl/jena/JenaRuntime.java
@@ -81,7 +81,7 @@ public class JenaRuntime
* </p>
*/
- public final static boolean isRDF11 = false ;
+ public static boolean isRDF11 = true ;
// --------------------------------------------------------------
[6/7] jena git commit: JENA-816 : Ouput RDF 1.1 form when in RDF 1.1.
mode.
Posted by an...@apache.org.
JENA-816 : Ouput RDF 1.1 form when in RDF 1.1. mode.
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/0e83e7be
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/0e83e7be
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/0e83e7be
Branch: refs/heads/master
Commit: 0e83e7be295e1f466b29af553e146d8275cc92d7
Parents: be22707
Author: Andy Seaborne <an...@apache.org>
Authored: Fri Nov 21 16:48:11 2014 +0000
Committer: Andy Seaborne <an...@apache.org>
Committed: Fri Nov 21 16:48:11 2014 +0000
----------------------------------------------------------------------
.../java/org/apache/jena/riot/out/NodeFormatterBase.java | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/0e83e7be/jena-arq/src/main/java/org/apache/jena/riot/out/NodeFormatterBase.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/riot/out/NodeFormatterBase.java b/jena-arq/src/main/java/org/apache/jena/riot/out/NodeFormatterBase.java
index a921e97..6ea8dd7 100644
--- a/jena-arq/src/main/java/org/apache/jena/riot/out/NodeFormatterBase.java
+++ b/jena-arq/src/main/java/org/apache/jena/riot/out/NodeFormatterBase.java
@@ -20,6 +20,8 @@ package org.apache.jena.riot.out;
import org.apache.jena.atlas.io.AWriter ;
+import com.hp.hpl.jena.JenaRuntime ;
+import com.hp.hpl.jena.datatypes.xsd.XSDDatatype ;
import com.hp.hpl.jena.graph.Node ;
import com.hp.hpl.jena.sparql.ARQInternalErrorException ;
@@ -58,7 +60,12 @@ public abstract class NodeFormatterBase implements NodeFormatter
String lang = n.getLiteralLanguage() ;
String lex = n.getLiteralLexicalForm() ;
- if ( dt == null )
+ // In RDF 1.1, print xsd:string and language strings without datatype explicitly.
+ // dt should not be null for RDF 1.1 but let's play carefully.
+ boolean shortString = JenaRuntime.isRDF11 ? (dt == null || dt.equals(XSDDatatype.XSDstring.getURI()))
+ : (dt == null) ;
+
+ if ( shortString )
{
if ( lang == null || lang.equals("") )
formatLitString(w, lex) ;
[3/7] jena git commit: Jena-1/2 mention - now rather old.
Posted by an...@apache.org.
Jena-1/2 mention - now rather old.
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/985b99ae
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/985b99ae
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/985b99ae
Branch: refs/heads/master
Commit: 985b99ae73c77730d6d590aa7b76c987e6b546e2
Parents: 8a8bf93
Author: Andy Seaborne <an...@apache.org>
Authored: Fri Nov 21 15:56:54 2014 +0000
Committer: Andy Seaborne <an...@apache.org>
Committed: Fri Nov 21 15:56:54 2014 +0000
----------------------------------------------------------------------
.../src/main/java/com/hp/hpl/jena/graph/NodeFactory.java | 11 +++++------
1 file changed, 5 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/985b99ae/jena-core/src/main/java/com/hp/hpl/jena/graph/NodeFactory.java
----------------------------------------------------------------------
diff --git a/jena-core/src/main/java/com/hp/hpl/jena/graph/NodeFactory.java b/jena-core/src/main/java/com/hp/hpl/jena/graph/NodeFactory.java
index 4918cc9..e62bab5 100644
--- a/jena-core/src/main/java/com/hp/hpl/jena/graph/NodeFactory.java
+++ b/jena-core/src/main/java/com/hp/hpl/jena/graph/NodeFactory.java
@@ -59,12 +59,11 @@ public class NodeFactory
@param isXml If true then lit is exclusive canonical XML of type
rdf:XMLLiteral, and no checking will be invoked.
*/
- public static Node createLiteral( String lit, String lang, boolean isXml )
- {
- if (lit == null) throw new NullPointerException
- ( "null for literals has been illegal since Jena 2.0" );
- return createLiteral( LiteralLabelFactory.create( lit, lang, isXml ) );
- }
+ public static Node createLiteral( String lex, String lang, boolean isXml )
+ {
+ if (lex == null) throw new NullPointerException( "null lexical form for literal" );
+ return createLiteral( LiteralLabelFactory.create( lex, lang, isXml ) );
+ }
/**
* Build a literal node from its lexical form. The