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 2015/06/24 22:40:41 UTC
[2/4] jena git commit: Ensure version initialized.
Ensure version initialized.
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/f334ad4a
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/f334ad4a
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/f334ad4a
Branch: refs/heads/master
Commit: f334ad4a157fa558543822052a4b803ad877c00f
Parents: 72720ec
Author: Andy Seaborne <an...@apache.org>
Authored: Wed Jun 24 12:49:31 2015 +0100
Committer: Andy Seaborne <an...@apache.org>
Committed: Wed Jun 24 12:49:31 2015 +0100
----------------------------------------------------------------------
.../src/main/java/riotcmd/CmdLangParse.java | 29 +++++++++++++-------
1 file changed, 19 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/f334ad4a/jena-arq/src/main/java/riotcmd/CmdLangParse.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/riotcmd/CmdLangParse.java b/jena-arq/src/main/java/riotcmd/CmdLangParse.java
index 28fc61c..754f749 100644
--- a/jena-arq/src/main/java/riotcmd/CmdLangParse.java
+++ b/jena-arq/src/main/java/riotcmd/CmdLangParse.java
@@ -21,7 +21,9 @@ package riotcmd;
import java.io.InputStream ;
import java.io.OutputStream ;
+import jena.cmd.ArgDecl ;
import jena.cmd.CmdException;
+import jena.cmd.CmdGeneral ;
import org.apache.jena.Jena ;
import org.apache.jena.atlas.io.IO ;
import org.apache.jena.atlas.lib.InternalErrorException ;
@@ -40,16 +42,20 @@ import org.apache.jena.riot.tokens.Tokenizer ;
import org.apache.jena.riot.tokens.TokenizerFactory ;
import org.apache.jena.sparql.core.DatasetGraph ;
import org.apache.jena.sparql.core.DatasetGraphFactory ;
-
import arq.cmdline.* ;
/** Common framework for running RIOT parsers */
-public abstract class CmdLangParse extends CmdARQ
+public abstract class CmdLangParse extends CmdGeneral
{
+ static { RIOT.init(); }
protected ModTime modTime = new ModTime() ;
protected ModLangParse modLangParse = new ModLangParse() ;
protected ModLangOutput modLangOutput = new ModLangOutput() ;
protected InferenceSetupRDFS setup = null ;
+ protected ModSymbol modSymbol = new ModSymbol() ;
+ protected ArgDecl strictDecl = new ArgDecl(ArgDecl.NoValue, "strict") ;
+
+ protected boolean cmdStrictMode = false ;
interface LangHandler {
String getItemsName() ;
@@ -83,17 +89,18 @@ public abstract class CmdLangParse extends CmdARQ
protected CmdLangParse(String[] argv)
{
super(argv) ;
-
- super.addModule(modSymbol) ;
- super.addModule(modTime) ;
- super.addModule(modLangOutput) ;
- super.addModule(modLangParse) ;
+ addModule(modSymbol) ;
+ addModule(modTime) ;
+ addModule(modLangOutput) ;
+ addModule(modLangParse) ;
super.modVersion.addClass(Jena.class) ;
- super.modVersion.addClass(ARQ.class) ;
+ // Force - sometimes initialization does not cause these
+ // to initialized early enough for reflection.
+ String x1 = ARQ.VERSION ;
+ String x2 = ARQ.BUILD_DATE ;
super.modVersion.addClass(RIOT.class) ;
-
}
@Override
@@ -111,7 +118,9 @@ public abstract class CmdLangParse extends CmdARQ
@Override
- protected void processModulesAndArgs() {}
+ protected void processModulesAndArgs() {
+ cmdStrictMode = super.contains(strictDecl) ;
+ }
protected interface PostParseHandler { void postParse(); }