Repository: jena Updated Branches: refs/heads/master 6c3a4b6ce -> b40d2a07d
Align to refactoring of common library code Project: http://git-wip-us.apache.org/repos/asf/jena/repo Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/b40d2a07 Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/b40d2a07 Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/b40d2a07 Branch: refs/heads/master Commit: b40d2a07dca035340b0de1a72a4c9f1a927c1148 Parents: 6c3a4b6 Author: Andy Seaborne <[email protected]> Authored: Tue Apr 28 15:50:54 2015 +0100 Committer: Andy Seaborne <[email protected]> Committed: Tue Apr 28 15:50:54 2015 +0100 ---------------------------------------------------------------------- .../sdb/core/sqlnode/GenerateSQLVisitor.java | 10 ++++---- .../jena/sdb/core/sqlnode/SqlNodeBase.java | 12 ++++----- jena-sdb/src/main/java/sdb/SDBCmd.java | 4 +-- jena-sdb/src/main/java/sdb/query.java | 4 +-- jena-sdb/src/main/java/sdb/sdbconfig.java | 6 ++--- jena-sdb/src/main/java/sdb/sdbdelete.java | 4 +-- jena-sdb/src/main/java/sdb/sdbdump.java | 6 ++--- jena-sdb/src/main/java/sdb/sdbinfo.java | 6 ++--- jena-sdb/src/main/java/sdb/sdbload.java | 16 ++++++------ jena-sdb/src/main/java/sdb/sdbmeta.java | 6 ++--- jena-sdb/src/main/java/sdb/sdbprint.java | 4 +-- jena-sdb/src/main/java/sdb/sdbquery.java | 4 +-- jena-sdb/src/main/java/sdb/sdbsql.java | 4 +-- jena-sdb/src/main/java/sdb/sdbtruncate.java | 6 ++--- jena-sdb/src/main/java/sdb/sdbtuple.java | 4 +-- jena-sdb/src/test/java/sdb/DBTest.java | 26 ++++++++++---------- jena-sdb/src/test/java/sdb/sdbtest.java | 14 +++++------ 17 files changed, 68 insertions(+), 68 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/jena/blob/b40d2a07/jena-sdb/src/main/java/org/apache/jena/sdb/core/sqlnode/GenerateSQLVisitor.java ---------------------------------------------------------------------- diff --git a/jena-sdb/src/main/java/org/apache/jena/sdb/core/sqlnode/GenerateSQLVisitor.java b/jena-sdb/src/main/java/org/apache/jena/sdb/core/sqlnode/GenerateSQLVisitor.java index 46ce36d..489ebf8 100644 --- a/jena-sdb/src/main/java/org/apache/jena/sdb/core/sqlnode/GenerateSQLVisitor.java +++ b/jena-sdb/src/main/java/org/apache/jena/sdb/core/sqlnode/GenerateSQLVisitor.java @@ -21,11 +21,10 @@ package org.apache.jena.sdb.core.sqlnode; import java.util.List ; import java.util.Set ; +import org.apache.jena.atlas.io.IndentedWriter ; import org.apache.jena.atlas.iterator.Iter ; import org.apache.jena.atlas.iterator.Transform ; -import org.slf4j.Logger ; -import org.slf4j.LoggerFactory ; -import org.apache.jena.atlas.io.IndentedWriter ; +import org.apache.jena.atlas.lib.Lib ; import org.apache.jena.sdb.SDB ; import org.apache.jena.sdb.core.Annotations ; import org.apache.jena.sdb.core.sqlexpr.S_Equal ; @@ -35,7 +34,8 @@ import org.apache.jena.sdb.core.sqlexpr.SqlExprList ; import org.apache.jena.sdb.shared.SDBInternalError ; import org.apache.jena.sdb.shared.SDBNotImplemented ; import org.apache.jena.sparql.core.Var ; -import org.apache.jena.sparql.util.Utils ; +import org.slf4j.Logger ; +import org.slf4j.LoggerFactory ; // This is not a general purpose SQL writer - it needs only work with the // SQL node trees that the SDB compiler generate. @@ -67,7 +67,7 @@ public class GenerateSQLVisitor implements SqlNodeVisitor public void visit(SqlRename sqlNode) { shouldNotSee(sqlNode) ; } private void shouldNotSee(SqlNode sqlNode) - { throw new SDBInternalError("Didn't expect: "+Utils.className(sqlNode)) ; } + { throw new SDBInternalError("Didn't expect: "+Lib.className(sqlNode)) ; } // If nested (subquery) http://git-wip-us.apache.org/repos/asf/jena/blob/b40d2a07/jena-sdb/src/main/java/org/apache/jena/sdb/core/sqlnode/SqlNodeBase.java ---------------------------------------------------------------------- diff --git a/jena-sdb/src/main/java/org/apache/jena/sdb/core/sqlnode/SqlNodeBase.java b/jena-sdb/src/main/java/org/apache/jena/sdb/core/sqlnode/SqlNodeBase.java index c7669ce..8b08268 100644 --- a/jena-sdb/src/main/java/org/apache/jena/sdb/core/sqlnode/SqlNodeBase.java +++ b/jena-sdb/src/main/java/org/apache/jena/sdb/core/sqlnode/SqlNodeBase.java @@ -18,14 +18,14 @@ package org.apache.jena.sdb.core.sqlnode; -import java.util.LinkedHashSet; -import java.util.Set; +import java.util.LinkedHashSet ; +import java.util.Set ; -import org.apache.jena.atlas.io.IndentedLineBuffer; -import org.apache.jena.atlas.io.IndentedWriter; +import org.apache.jena.atlas.io.IndentedLineBuffer ; +import org.apache.jena.atlas.io.IndentedWriter ; +import org.apache.jena.atlas.lib.Lib ; import org.apache.jena.sdb.core.AnnotationsBase ; import org.apache.jena.sdb.core.sqlexpr.SqlColumn ; -import org.apache.jena.sparql.util.Utils ; public abstract class SqlNodeBase extends AnnotationsBase implements SqlNode @@ -100,7 +100,7 @@ public abstract class SqlNodeBase extends AnnotationsBase implements SqlNode private void classError(Class<?> wanted) { - throw new ClassCastException("Wanted class: "+Utils.className(wanted)+" :: Actual class "+Utils.className(this) ) ; + throw new ClassCastException("Wanted class: "+Lib.className(wanted)+" :: Actual class "+Lib.className(this) ) ; } @Override http://git-wip-us.apache.org/repos/asf/jena/blob/b40d2a07/jena-sdb/src/main/java/sdb/SDBCmd.java ---------------------------------------------------------------------- diff --git a/jena-sdb/src/main/java/sdb/SDBCmd.java b/jena-sdb/src/main/java/sdb/SDBCmd.java index f1457df..e7ff5e8 100644 --- a/jena-sdb/src/main/java/sdb/SDBCmd.java +++ b/jena-sdb/src/main/java/sdb/SDBCmd.java @@ -18,7 +18,7 @@ package sdb; -import org.apache.jena.sparql.util.Utils ; +import org.apache.jena.atlas.lib.Lib ; import arq.cmdline.CmdMain; /** Convenience ways to execute commands (import static) */ @@ -49,7 +49,7 @@ public class SDBCmd int code = cmd.mainRun(false, false) ; if ( code != 0 && exitOnError ) { - System.err.println("Exit: command: "+Utils.className(cmd)) ; + System.err.println("Exit: command: "+Lib.className(cmd)) ; System.exit(code) ; } return code ; http://git-wip-us.apache.org/repos/asf/jena/blob/b40d2a07/jena-sdb/src/main/java/sdb/query.java ---------------------------------------------------------------------- diff --git a/jena-sdb/src/main/java/sdb/query.java b/jena-sdb/src/main/java/sdb/query.java index af8f7f5..2610264 100644 --- a/jena-sdb/src/main/java/sdb/query.java +++ b/jena-sdb/src/main/java/sdb/query.java @@ -18,7 +18,7 @@ package sdb; -import org.apache.jena.sparql.util.Utils ; +import org.apache.jena.atlas.lib.Lib ; import sdb.cmd.ModDatasetStore; import arq.cmdline.ModDataset; @@ -43,7 +43,7 @@ public class query extends arq.query } @Override - protected String getCommandName() { return Utils.className(this) ; } + protected String getCommandName() { return Lib.className(this) ; } @Override protected String getSummary() { return getCommandName()+" --sdb=FILE --query=<query>" ; } http://git-wip-us.apache.org/repos/asf/jena/blob/b40d2a07/jena-sdb/src/main/java/sdb/sdbconfig.java ---------------------------------------------------------------------- diff --git a/jena-sdb/src/main/java/sdb/sdbconfig.java b/jena-sdb/src/main/java/sdb/sdbconfig.java index 717d1bd..5680d05 100644 --- a/jena-sdb/src/main/java/sdb/sdbconfig.java +++ b/jena-sdb/src/main/java/sdb/sdbconfig.java @@ -23,7 +23,7 @@ import java.util.List; import arq.cmd.CmdException; import org.apache.jena.sdb.SDB ; import org.apache.jena.sdb.Store ; -import org.apache.jena.sparql.util.Utils ; +import org.apache.jena.atlas.lib.Lib ; import sdb.cmd.CmdArgsDB; import sdb.cmd.ModConfig; @@ -46,10 +46,10 @@ public class sdbconfig extends CmdArgsDB } @Override - protected String getCommandName() { return Utils.className(this) ; } + protected String getCommandName() { return Lib.className(this) ; } @Override - protected String getSummary() { return Utils.className(this)+" --sdb <SPEC> <NAME>" ; } + protected String getSummary() { return Lib.className(this)+" --sdb <SPEC> <NAME>" ; } @Override protected void processModulesAndArgs() http://git-wip-us.apache.org/repos/asf/jena/blob/b40d2a07/jena-sdb/src/main/java/sdb/sdbdelete.java ---------------------------------------------------------------------- diff --git a/jena-sdb/src/main/java/sdb/sdbdelete.java b/jena-sdb/src/main/java/sdb/sdbdelete.java index ed81578..f543508 100644 --- a/jena-sdb/src/main/java/sdb/sdbdelete.java +++ b/jena-sdb/src/main/java/sdb/sdbdelete.java @@ -25,7 +25,7 @@ import org.apache.jena.rdf.model.Model ; import org.apache.jena.sdb.SDB ; import org.apache.jena.sdb.SDBFactory ; import org.apache.jena.sdb.store.StoreBaseHSQL ; -import org.apache.jena.sparql.util.Utils ; +import org.apache.jena.atlas.lib.Lib ; import sdb.cmd.CmdArgsDB; import arq.cmdline.ArgDecl; @@ -59,7 +59,7 @@ public class sdbdelete extends CmdArgsDB } @Override - protected String getCommandName() { return Utils.className(this) ; } + protected String getCommandName() { return Lib.className(this) ; } @Override protected String getSummary() { return getCommandName()+" <SPEC> default | <IRI> ..."; } http://git-wip-us.apache.org/repos/asf/jena/blob/b40d2a07/jena-sdb/src/main/java/sdb/sdbdump.java ---------------------------------------------------------------------- diff --git a/jena-sdb/src/main/java/sdb/sdbdump.java b/jena-sdb/src/main/java/sdb/sdbdump.java index fed6579..9465db3 100644 --- a/jena-sdb/src/main/java/sdb/sdbdump.java +++ b/jena-sdb/src/main/java/sdb/sdbdump.java @@ -22,7 +22,7 @@ import java.util.List; import org.apache.jena.rdf.model.Model ; import org.apache.jena.sdb.SDB ; -import org.apache.jena.sparql.util.Utils ; +import org.apache.jena.atlas.lib.Lib ; import sdb.cmd.CmdArgsDB; import sdb.cmd.ModGraph; import arq.cmdline.ArgDecl; @@ -61,10 +61,10 @@ public class sdbdump extends CmdArgsDB } @Override - protected String getCommandName() { return Utils.className(this) ; } + protected String getCommandName() { return Lib.className(this) ; } @Override - protected String getSummary() { return Utils.className(this)+" --sdb <SPEC> [--out syntax]" ; } + protected String getSummary() { return Lib.className(this)+" --sdb <SPEC> [--out syntax]" ; } @Override protected void processModulesAndArgs() http://git-wip-us.apache.org/repos/asf/jena/blob/b40d2a07/jena-sdb/src/main/java/sdb/sdbinfo.java ---------------------------------------------------------------------- diff --git a/jena-sdb/src/main/java/sdb/sdbinfo.java b/jena-sdb/src/main/java/sdb/sdbinfo.java index ca9af5f..b6a18d8 100644 --- a/jena-sdb/src/main/java/sdb/sdbinfo.java +++ b/jena-sdb/src/main/java/sdb/sdbinfo.java @@ -23,7 +23,7 @@ import java.util.List ; import org.apache.jena.rdf.model.Model ; import org.apache.jena.sdb.SDB ; import org.apache.jena.sdb.store.StoreConfig ; -import org.apache.jena.sparql.util.Utils ; +import org.apache.jena.atlas.lib.Lib ; import sdb.cmd.CmdArgsDB ; import arq.cmdline.ArgDecl ; @@ -59,10 +59,10 @@ public class sdbinfo extends CmdArgsDB } @Override - protected String getCommandName() { return Utils.className(this) ; } + protected String getCommandName() { return Lib.className(this) ; } @Override - protected String getSummary() { return Utils.className(this)+" --sdb <SPEC>" ; } + protected String getSummary() { return Lib.className(this)+" --sdb <SPEC>" ; } @Override protected void processModulesAndArgs() http://git-wip-us.apache.org/repos/asf/jena/blob/b40d2a07/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 7a1ab07..3151e4d 100644 --- a/jena-sdb/src/main/java/sdb/sdbload.java +++ b/jena-sdb/src/main/java/sdb/sdbload.java @@ -19,21 +19,21 @@ package sdb; -import java.util.Iterator; -import java.util.List; +import java.util.Iterator ; +import java.util.List ; +import org.apache.jena.atlas.lib.Lib ; +import org.apache.jena.atlas.lib.Timer ; import org.apache.jena.graph.Graph ; import org.apache.jena.graph.GraphListener ; import org.apache.jena.graph.Triple ; import org.apache.jena.rdf.model.Model ; import org.apache.jena.sdb.SDB ; import org.apache.jena.sdb.store.StoreBaseHSQL ; -import org.apache.jena.sparql.util.Timer ; -import org.apache.jena.sparql.util.Utils ; import org.apache.jena.util.FileUtils ; -import sdb.cmd.CmdArgsDB; -import sdb.cmd.ModGraph; -import arq.cmdline.ArgDecl; +import sdb.cmd.CmdArgsDB ; +import sdb.cmd.ModGraph ; +import arq.cmdline.ArgDecl ; /** Load data files into an SDB model in a database. * @@ -70,7 +70,7 @@ public class sdbload extends CmdArgsDB } @Override - protected String getCommandName() { return Utils.className(this) ; } + protected String getCommandName() { return Lib.className(this) ; } @Override protected String getSummary() { return getCommandName()+" <SPEC> [--graph IRI] file ..."; } http://git-wip-us.apache.org/repos/asf/jena/blob/b40d2a07/jena-sdb/src/main/java/sdb/sdbmeta.java ---------------------------------------------------------------------- diff --git a/jena-sdb/src/main/java/sdb/sdbmeta.java b/jena-sdb/src/main/java/sdb/sdbmeta.java index e8d70d9..b51f6d4 100644 --- a/jena-sdb/src/main/java/sdb/sdbmeta.java +++ b/jena-sdb/src/main/java/sdb/sdbmeta.java @@ -28,7 +28,7 @@ import org.apache.jena.rdf.model.ModelFactory ; import org.apache.jena.sdb.SDB ; import org.apache.jena.sdb.sql.SDBConnection ; import org.apache.jena.sdb.store.StoreConfig ; -import org.apache.jena.sparql.util.Utils ; +import org.apache.jena.atlas.lib.Lib ; import org.apache.jena.util.FileManager ; import sdb.cmd.CmdArgsDB; import arq.cmd.CmdException; @@ -76,10 +76,10 @@ public class sdbmeta extends CmdArgsDB @Override protected String getSummary() - { return Utils.className(this)+" --sdb <SPEC> [--tag=TAG] [get|tags|put|remove|reset]" ; } + { return Lib.className(this)+" --sdb <SPEC> [--tag=TAG] [get|tags|put|remove|reset]" ; } @Override - protected String getCommandName() { return Utils.className(this) ; } + protected String getCommandName() { return Lib.className(this) ; } @Override protected void execCmd(List<String> positionalArgs) http://git-wip-us.apache.org/repos/asf/jena/blob/b40d2a07/jena-sdb/src/main/java/sdb/sdbprint.java ---------------------------------------------------------------------- diff --git a/jena-sdb/src/main/java/sdb/sdbprint.java b/jena-sdb/src/main/java/sdb/sdbprint.java index 0d5226c..275215c 100644 --- a/jena-sdb/src/main/java/sdb/sdbprint.java +++ b/jena-sdb/src/main/java/sdb/sdbprint.java @@ -30,7 +30,7 @@ import org.apache.jena.sdb.sql.JDBC ; import org.apache.jena.sdb.store.LayoutType ; import org.apache.jena.sdb.util.PrintSDB ; import org.apache.jena.sparql.algebra.Op ; -import org.apache.jena.sparql.util.Utils ; +import org.apache.jena.atlas.lib.Lib ; import sdb.cmd.CmdArgsDB; import arq.cmd.CmdException; import arq.cmdline.ArgDecl; @@ -169,5 +169,5 @@ public class sdbprint extends CmdArgsDB } @Override - protected String getCommandName() { return Utils.className(this) ; } + protected String getCommandName() { return Lib.className(this) ; } } http://git-wip-us.apache.org/repos/asf/jena/blob/b40d2a07/jena-sdb/src/main/java/sdb/sdbquery.java ---------------------------------------------------------------------- diff --git a/jena-sdb/src/main/java/sdb/sdbquery.java b/jena-sdb/src/main/java/sdb/sdbquery.java index 6ba530e..8285bcd 100644 --- a/jena-sdb/src/main/java/sdb/sdbquery.java +++ b/jena-sdb/src/main/java/sdb/sdbquery.java @@ -28,7 +28,7 @@ import org.apache.jena.sdb.engine.QueryEngineSDB ; import org.apache.jena.sdb.util.PrintSDB ; import org.apache.jena.sparql.engine.QueryExecutionBase ; import org.apache.jena.sparql.util.QueryExecUtils ; -import org.apache.jena.sparql.util.Utils ; +import org.apache.jena.atlas.lib.Lib ; import sdb.cmd.CmdArgsDB; import arq.cmdline.ArgDecl; import arq.cmdline.ModQueryIn; @@ -76,7 +76,7 @@ public class sdbquery extends CmdArgsDB } @Override - protected String getCommandName() { return Utils.className(this) ; } + protected String getCommandName() { return Lib.className(this) ; } @Override protected String getSummary() { return getCommandName()+" <SPEC> [--direct] [ <query> | --query=file ]"; } http://git-wip-us.apache.org/repos/asf/jena/blob/b40d2a07/jena-sdb/src/main/java/sdb/sdbsql.java ---------------------------------------------------------------------- diff --git a/jena-sdb/src/main/java/sdb/sdbsql.java b/jena-sdb/src/main/java/sdb/sdbsql.java index 3534987..fe667d0 100644 --- a/jena-sdb/src/main/java/sdb/sdbsql.java +++ b/jena-sdb/src/main/java/sdb/sdbsql.java @@ -24,7 +24,7 @@ import java.util.List; import org.apache.jena.sdb.SDB ; import org.apache.jena.sdb.sql.RS ; import org.apache.jena.sdb.sql.ResultSetJDBC ; -import org.apache.jena.sparql.util.Utils ; +import org.apache.jena.atlas.lib.Lib ; import org.apache.jena.util.FileManager ; import sdb.cmd.CmdArgsDB; import arq.cmd.TerminationException; @@ -50,7 +50,7 @@ public class sdbsql extends CmdArgsDB } @Override - protected String getCommandName() { return Utils.className(this) ; } + protected String getCommandName() { return Lib.className(this) ; } @Override protected String getSummary() { return getCommandName()+" --sdb <SPEC> SQLSTRING | --file=FILE"; } http://git-wip-us.apache.org/repos/asf/jena/blob/b40d2a07/jena-sdb/src/main/java/sdb/sdbtruncate.java ---------------------------------------------------------------------- diff --git a/jena-sdb/src/main/java/sdb/sdbtruncate.java b/jena-sdb/src/main/java/sdb/sdbtruncate.java index 3d459d4..10b600a 100644 --- a/jena-sdb/src/main/java/sdb/sdbtruncate.java +++ b/jena-sdb/src/main/java/sdb/sdbtruncate.java @@ -21,7 +21,7 @@ package sdb; import java.util.List; import org.apache.jena.sdb.SDB ; -import org.apache.jena.sparql.util.Utils ; +import org.apache.jena.atlas.lib.Lib ; import sdb.cmd.CmdArgsDB; import arq.cmd.CmdException; import arq.cmdline.ArgDecl; @@ -49,10 +49,10 @@ public class sdbtruncate extends CmdArgsDB } @Override - protected String getCommandName() { return Utils.className(this) ; } + protected String getCommandName() { return Lib.className(this) ; } @Override - protected String getSummary() { return Utils.className(this)+" --sdb <SPEC> --confirm" ; } + protected String getSummary() { return Lib.className(this)+" --sdb <SPEC> --confirm" ; } @Override protected void processModulesAndArgs() http://git-wip-us.apache.org/repos/asf/jena/blob/b40d2a07/jena-sdb/src/main/java/sdb/sdbtuple.java ---------------------------------------------------------------------- diff --git a/jena-sdb/src/main/java/sdb/sdbtuple.java b/jena-sdb/src/main/java/sdb/sdbtuple.java index 131667b..26ce273 100644 --- a/jena-sdb/src/main/java/sdb/sdbtuple.java +++ b/jena-sdb/src/main/java/sdb/sdbtuple.java @@ -25,7 +25,7 @@ import org.apache.jena.sdb.SDB ; import org.apache.jena.sdb.Store ; import org.apache.jena.sdb.store.TableDesc ; import org.apache.jena.sdb.store.TupleTable ; -import org.apache.jena.sparql.util.Utils ; +import org.apache.jena.atlas.lib.Lib ; import sdb.cmd.CmdArgsDB; import arq.cmdline.ArgDecl; import arq.cmdline.CmdArgModule; @@ -129,7 +129,7 @@ public class sdbtuple extends CmdArgsDB { return getCommandName()+" --sdb <SPEC> [--print|--load|--create|--drop] [--table TableName] TableName..." ; } @Override - protected String getCommandName() { return Utils.className(this) ; } + protected String getCommandName() { return Lib.className(this) ; } static final String divider = "- - - - - - - - - - - - - -" ; boolean needDivider = false ; http://git-wip-us.apache.org/repos/asf/jena/blob/b40d2a07/jena-sdb/src/test/java/sdb/DBTest.java ---------------------------------------------------------------------- diff --git a/jena-sdb/src/test/java/sdb/DBTest.java b/jena-sdb/src/test/java/sdb/DBTest.java index a6f50a9..7d0a242 100644 --- a/jena-sdb/src/test/java/sdb/DBTest.java +++ b/jena-sdb/src/test/java/sdb/DBTest.java @@ -18,19 +18,19 @@ package sdb; -import java.sql.Connection; -import java.util.List; +import java.sql.Connection ; +import java.util.List ; -import org.apache.jena.sparql.util.Utils ; -import org.junit.runner.JUnitCore; -import org.junit.runner.notification.RunListener; -import sdb.cmd.CmdArgsDB; -import sdb.junit.TextListener2; -import sdb.test.Params; -import sdb.test.ParamsVocab; -import sdb.test.TestI18N; -import sdb.test.TestStringBasic; -import arq.cmd.CmdException; +import org.apache.jena.atlas.lib.Lib ; +import org.junit.runner.JUnitCore ; +import org.junit.runner.notification.RunListener ; +import sdb.cmd.CmdArgsDB ; +import sdb.junit.TextListener2 ; +import sdb.test.Params ; +import sdb.test.ParamsVocab ; +import sdb.test.TestI18N ; +import sdb.test.TestStringBasic ; +import arq.cmd.CmdException ; /** Run some DB tests to check setup */ @@ -50,7 +50,7 @@ public class DBTest extends CmdArgsDB } @Override - protected String getCommandName() { return Utils.className(this) ; } + protected String getCommandName() { return Lib.className(this) ; } @Override protected String getSummary() { return getCommandName()+" <SPEC> "; } http://git-wip-us.apache.org/repos/asf/jena/blob/b40d2a07/jena-sdb/src/test/java/sdb/sdbtest.java ---------------------------------------------------------------------- diff --git a/jena-sdb/src/test/java/sdb/sdbtest.java b/jena-sdb/src/test/java/sdb/sdbtest.java index 880dbdd..b59eeb1 100644 --- a/jena-sdb/src/test/java/sdb/sdbtest.java +++ b/jena-sdb/src/test/java/sdb/sdbtest.java @@ -18,9 +18,10 @@ package sdb; -import java.util.List; +import java.util.List ; -import junit.framework.TestSuite; +import junit.framework.TestSuite ; +import org.apache.jena.atlas.lib.Lib ; import org.apache.jena.query.ARQ ; import org.apache.jena.rdf.model.Model ; import org.apache.jena.rdf.model.Resource ; @@ -29,12 +30,11 @@ import org.apache.jena.sdb.test.junit.QueryTestSDBFactory ; import org.apache.jena.sparql.junit.EarlReport ; import org.apache.jena.sparql.junit.ScriptTestSuiteFactory ; import org.apache.jena.sparql.junit.SimpleTestRunner ; -import org.apache.jena.sparql.util.Utils ; import org.apache.jena.sparql.vocabulary.FOAF ; import org.apache.jena.vocabulary.DC ; import org.apache.jena.vocabulary.DCTerms ; -import sdb.cmd.CmdArgsDB; -import arq.cmdline.ArgDecl; +import sdb.cmd.CmdArgsDB ; +import arq.cmdline.ArgDecl ; /** Run a test suite * @@ -65,10 +65,10 @@ public class sdbtest extends CmdArgsDB } @Override - protected String getCommandName() { return Utils.className(this) ; } + protected String getCommandName() { return Lib.className(this) ; } @Override - protected String getSummary() { return Utils.className(this)+" <SPEC> [--earl] [--direct] [manifest]" ; } + protected String getSummary() { return Lib.className(this)+" <SPEC> [--earl] [--direct] [manifest]" ; } @Override protected void processModulesAndArgs()
