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 2016/06/20 08:34:27 UTC
[1/3] jena git commit: Always set the error handler to something
non-null.
Repository: jena
Updated Branches:
refs/heads/master e1bb3c967 -> 646c910fd
Always set the error handler to something non-null.
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/b43dfcfb
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/b43dfcfb
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/b43dfcfb
Branch: refs/heads/master
Commit: b43dfcfb1132deecf0b3e8ff12362ae0700505f9
Parents: e1bb3c9
Author: Andy Seaborne <an...@apache.org>
Authored: Fri Jun 17 09:49:48 2016 +0100
Committer: Andy Seaborne <an...@apache.org>
Committed: Fri Jun 17 09:49:48 2016 +0100
----------------------------------------------------------------------
jena-cmds/src/main/java/riotcmd/CmdLangParse.java | 14 +++++---------
1 file changed, 5 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/b43dfcfb/jena-cmds/src/main/java/riotcmd/CmdLangParse.java
----------------------------------------------------------------------
diff --git a/jena-cmds/src/main/java/riotcmd/CmdLangParse.java b/jena-cmds/src/main/java/riotcmd/CmdLangParse.java
index 080edd7..67571d8 100644
--- a/jena-cmds/src/main/java/riotcmd/CmdLangParse.java
+++ b/jena-cmds/src/main/java/riotcmd/CmdLangParse.java
@@ -213,9 +213,8 @@ public abstract class CmdLangParse extends CmdGeneral
if ( modLangParse.explicitChecking() ) checking = true ;
if ( modLangParse.explicitNoChecking() ) checking = false ;
- ErrorHandler errHandler = null ;
- if ( checking )
- {
+ ErrorHandler errHandler = ErrorHandlerFactory.errorHandlerWarn ;
+ if ( checking ) {
if ( modLangParse.stopOnBadTerm() )
errHandler = ErrorHandlerFactory.errorHandlerStd ;
else
@@ -223,8 +222,7 @@ public abstract class CmdLangParse extends CmdGeneral
errHandler = ErrorHandlerFactory.errorHandlerWarn ;
}
- if ( modLangParse.skipOnBadTerm() )
- {
+ if ( modLangParse.skipOnBadTerm() ) {
// TODO skipOnBadterm
}
@@ -240,10 +238,8 @@ public abstract class CmdLangParse extends CmdGeneral
// If multiple files, choose the overall labels.
if ( langHandlerOverall == null )
langHandlerOverall = handler ;
- else
- {
- if ( langHandlerOverall != langHandlerAny )
- {
+ else {
+ if ( langHandlerOverall != langHandlerAny ) {
if ( langHandlerOverall != handler )
langHandlerOverall = langHandlerAny ;
}
[3/3] jena git commit: JENA-1191: Set prefix map depending on
presence of --graph
Posted by an...@apache.org.
JENA-1191: Set prefix map depending on presence of --graph
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/646c910f
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/646c910f
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/646c910f
Branch: refs/heads/master
Commit: 646c910fd9bc7c7419ab3092936fa2ac993787a7
Parents: f49894e
Author: Andy Seaborne <an...@apache.org>
Authored: Mon Jun 20 09:18:22 2016 +0100
Committer: Andy Seaborne <an...@apache.org>
Committed: Mon Jun 20 09:18:22 2016 +0100
----------------------------------------------------------------------
jena-sdb/src/main/java/sdb/sdbload.java | 18 ++++++++++++------
1 file changed, 12 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/646c910f/jena-sdb/src/main/java/sdb/sdbload.java
----------------------------------------------------------------------
diff --git a/jena-sdb/src/main/java/sdb/sdbload.java b/jena-sdb/src/main/java/sdb/sdbload.java
index 23d3901..b414784 100644
--- a/jena-sdb/src/main/java/sdb/sdbload.java
+++ b/jena-sdb/src/main/java/sdb/sdbload.java
@@ -41,7 +41,7 @@ import org.apache.jena.sdb.SDBFactory ;
import org.apache.jena.sdb.Store ;
import org.apache.jena.sdb.store.StoreBaseHSQL ;
import org.apache.jena.sdb.store.StoreLoaderPlus ;
-import org.apache.jena.sparql.core.DatasetGraph ;
+import org.apache.jena.shared.PrefixMapping ;
import org.apache.jena.sparql.core.Quad ;
import sdb.cmd.CmdArgsDB ;
import sdb.cmd.ModGraph ;
@@ -111,14 +111,20 @@ public class sdbload extends CmdArgsDB {
private void loadOne(String filename, boolean replace) {
Model model = null ;
Dataset dataset = null ;
+ PrefixMapping pmap ;
+
Lang lang = RDFLanguages.filenameToLang(filename) ;
if ( lang == null )
throw new CmdException("Data syntax not recognized: " + filename) ;
- if ( modGraph.getGraphName() != null )
+ // --graph or not
+ if ( modGraph.getGraphName() != null ) {
model = modGraph.getModel(getStore()) ;
- else
+ pmap = model;
+ } else {
dataset = SDBFactory.connectDataset(getStore()) ;
+ pmap = dataset.asDatasetGraph().getDefaultGraph().getPrefixMapping() ;
+ }
// For monitoring only.
Graph monitorGraph = (model == null) ? null : model.getGraph() ;
@@ -135,7 +141,7 @@ public class sdbload extends CmdArgsDB {
if ( showProgress )
output.print("Start load: %s", filename) ;
- StreamRDF stream = streamToStore(dataset.asDatasetGraph(), getStore()) ;
+ StreamRDF stream = streamToStore(pmap, getStore()) ;
if ( modGraph.getGraphName() != null ) {
Node gn = NodeFactory.createURI(modGraph.getGraphName()) ;
stream = StreamRDFLib.extendTriplesToQuads(gn, stream) ;
@@ -159,7 +165,7 @@ public class sdbload extends CmdArgsDB {
}
}
- private StreamRDF streamToStore(DatasetGraph dsg, Store store) {
+ private StreamRDF streamToStore(PrefixMapping pmap, Store store) {
StoreLoaderPlus sl = (StoreLoaderPlus)store.getLoader() ;
return new StreamRDF() {
@@ -183,7 +189,7 @@ public class sdbload extends CmdArgsDB {
@Override
public void prefix(String prefix, String iri) {
- dsg.getDefaultGraph().getPrefixMapping().setNsPrefix(prefix, iri) ;
+ pmap.setNsPrefix(prefix, iri) ;
}
@Override
[2/3] jena git commit: Typos
Posted by an...@apache.org.
Typos
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/f49894e1
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/f49894e1
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/f49894e1
Branch: refs/heads/master
Commit: f49894e1e122b3f992decece7cfb188df7d89dab
Parents: b43dfcf
Author: Andy Seaborne <an...@apache.org>
Authored: Fri Jun 17 09:50:01 2016 +0100
Committer: Andy Seaborne <an...@apache.org>
Committed: Fri Jun 17 09:50:01 2016 +0100
----------------------------------------------------------------------
jena-core/src/main/java/org/apache/jena/system/JenaSystem.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/f49894e1/jena-core/src/main/java/org/apache/jena/system/JenaSystem.java
----------------------------------------------------------------------
diff --git a/jena-core/src/main/java/org/apache/jena/system/JenaSystem.java b/jena-core/src/main/java/org/apache/jena/system/JenaSystem.java
index 433a446..7a0c451 100644
--- a/jena-core/src/main/java/org/apache/jena/system/JenaSystem.java
+++ b/jena-core/src/main/java/org/apache/jena/system/JenaSystem.java
@@ -60,7 +60,7 @@ public class JenaSystem {
/** Initialize Jena.
* <p>
* This function is cheap to call when already initialized so can be called to be sure.
- * A commonly used idom in jena is in static initailizers in key classes.
+ * A commonly used idiom in jena is a static initializer in key classes.
* <p>
* By default, initialization happens by using {@code ServiceLoader.load} to find
* {@link JenaSubsystemLifecycle} objects.