Repository: jena Updated Branches: refs/heads/master 890c070a4 -> 6c3a4b6ce
Clean due to refactoring changes in atlas Project: http://git-wip-us.apache.org/repos/asf/jena/repo Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/6c3a4b6c Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/6c3a4b6c Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/6c3a4b6c Branch: refs/heads/master Commit: 6c3a4b6ceadcd9795b7ed24a2f09b9d08c1b8024 Parents: 890c070 Author: Andy Seaborne <[email protected]> Authored: Tue Apr 28 15:09:20 2015 +0100 Committer: Andy Seaborne <[email protected]> Committed: Tue Apr 28 15:09:20 2015 +0100 ---------------------------------------------------------------------- .../src/main/java/jena/spatialindexdump.java | 44 ++++++++++---------- .../assembler/SpatialIndexLuceneAssembler.java | 26 ++++++------ jena-text/src/main/java/jena/textindexdump.java | 4 +- .../assembler/TextIndexLuceneAssembler.java | 2 +- 4 files changed, 38 insertions(+), 38 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/jena/blob/6c3a4b6c/jena-spatial/src/main/java/jena/spatialindexdump.java ---------------------------------------------------------------------- diff --git a/jena-spatial/src/main/java/jena/spatialindexdump.java b/jena-spatial/src/main/java/jena/spatialindexdump.java index d54c168..3ef1e26 100644 --- a/jena-spatial/src/main/java/jena/spatialindexdump.java +++ b/jena-spatial/src/main/java/jena/spatialindexdump.java @@ -18,28 +18,28 @@ package jena ; -import org.apache.jena.query.spatial.SpatialIndex; -import org.apache.jena.query.spatial.SpatialIndexException; -import org.apache.jena.query.spatial.SpatialIndexLucene; -import org.apache.jena.query.spatial.SpatialQuery; -import org.apache.jena.query.spatial.assembler.SpatialVocab; +import org.apache.jena.atlas.lib.Lib ; +import org.apache.jena.query.spatial.SpatialIndex ; +import org.apache.jena.query.spatial.SpatialIndexException ; +import org.apache.jena.query.spatial.SpatialIndexLucene ; +import org.apache.jena.query.spatial.SpatialQuery ; +import org.apache.jena.query.spatial.assembler.SpatialVocab ; import org.apache.jena.sparql.core.assembler.AssemblerUtils ; -import org.apache.jena.sparql.util.Utils ; -import org.apache.lucene.analysis.Analyzer; -import org.apache.lucene.document.Document; -import org.apache.lucene.index.DirectoryReader; -import org.apache.lucene.index.IndexReader; -import org.apache.lucene.index.IndexableField; -import org.apache.lucene.queryparser.classic.QueryParser; -import org.apache.lucene.search.IndexSearcher; -import org.apache.lucene.search.Query; -import org.apache.lucene.search.ScoreDoc; -import org.apache.lucene.store.Directory; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import arq.cmd.CmdException; -import arq.cmdline.ArgDecl; -import arq.cmdline.CmdARQ; +import org.apache.lucene.analysis.Analyzer ; +import org.apache.lucene.document.Document ; +import org.apache.lucene.index.DirectoryReader ; +import org.apache.lucene.index.IndexReader ; +import org.apache.lucene.index.IndexableField ; +import org.apache.lucene.queryparser.classic.QueryParser ; +import org.apache.lucene.search.IndexSearcher ; +import org.apache.lucene.search.Query ; +import org.apache.lucene.search.ScoreDoc ; +import org.apache.lucene.store.Directory ; +import org.slf4j.Logger ; +import org.slf4j.LoggerFactory ; +import arq.cmd.CmdException ; +import arq.cmdline.ArgDecl ; +import arq.cmdline.CmdARQ ; /** * Text index development tool - dump the index. @@ -94,7 +94,7 @@ public class spatialindexdump extends CmdARQ { // else if ( spatialIndex instanceof SpatialIndexSolr ) // dump((SpatialIndexSolr)spatialIndex) ; else - System.err.println("Unsupported index type : "+Utils.className(spatialIndex)) ; + System.err.println("Unsupported index type : "+Lib.className(spatialIndex)) ; } // private static void dump(SpatialIndexSolr spatialIndex) { System.err.println("Not implemented : dump Solr index") ; } http://git-wip-us.apache.org/repos/asf/jena/blob/6c3a4b6c/jena-spatial/src/main/java/org/apache/jena/query/spatial/assembler/SpatialIndexLuceneAssembler.java ---------------------------------------------------------------------- diff --git a/jena-spatial/src/main/java/org/apache/jena/query/spatial/assembler/SpatialIndexLuceneAssembler.java b/jena-spatial/src/main/java/org/apache/jena/query/spatial/assembler/SpatialIndexLuceneAssembler.java index c115f60..5554e3d 100644 --- a/jena-spatial/src/main/java/org/apache/jena/query/spatial/assembler/SpatialIndexLuceneAssembler.java +++ b/jena-spatial/src/main/java/org/apache/jena/query/spatial/assembler/SpatialIndexLuceneAssembler.java @@ -18,27 +18,27 @@ package org.apache.jena.query.spatial.assembler; -import static org.apache.jena.query.spatial.assembler.SpatialVocab.pDefinition; -import static org.apache.jena.query.spatial.assembler.SpatialVocab.pDirectory; +import static org.apache.jena.query.spatial.assembler.SpatialVocab.pDefinition ; +import static org.apache.jena.query.spatial.assembler.SpatialVocab.pDirectory ; -import java.io.File; -import java.io.IOException; +import java.io.File ; +import java.io.IOException ; import org.apache.jena.assembler.Assembler ; import org.apache.jena.assembler.Mode ; import org.apache.jena.assembler.assemblers.AssemblerBase ; -import org.apache.jena.atlas.io.IO; -import org.apache.jena.query.spatial.EntityDefinition; -import org.apache.jena.query.spatial.SpatialDatasetFactory; -import org.apache.jena.query.spatial.SpatialIndex; -import org.apache.jena.query.spatial.SpatialIndexException; +import org.apache.jena.atlas.io.IO ; +import org.apache.jena.atlas.lib.IRILib ; +import org.apache.jena.query.spatial.EntityDefinition ; +import org.apache.jena.query.spatial.SpatialDatasetFactory ; +import org.apache.jena.query.spatial.SpatialIndex ; +import org.apache.jena.query.spatial.SpatialIndexException ; import org.apache.jena.rdf.model.RDFNode ; import org.apache.jena.rdf.model.Resource ; -import org.apache.jena.riot.system.IRILib; import org.apache.jena.sparql.util.graph.GraphUtils ; -import org.apache.lucene.store.Directory; -import org.apache.lucene.store.FSDirectory; -import org.apache.lucene.store.RAMDirectory; +import org.apache.lucene.store.Directory ; +import org.apache.lucene.store.FSDirectory ; +import org.apache.lucene.store.RAMDirectory ; public class SpatialIndexLuceneAssembler extends AssemblerBase { http://git-wip-us.apache.org/repos/asf/jena/blob/6c3a4b6c/jena-text/src/main/java/jena/textindexdump.java ---------------------------------------------------------------------- diff --git a/jena-text/src/main/java/jena/textindexdump.java b/jena-text/src/main/java/jena/textindexdump.java index ae5dbcc..1da6279 100644 --- a/jena-text/src/main/java/jena/textindexdump.java +++ b/jena-text/src/main/java/jena/textindexdump.java @@ -18,10 +18,10 @@ package jena ; +import org.apache.jena.atlas.lib.Lib ; import org.apache.jena.query.text.* ; import org.apache.jena.query.text.assembler.TextVocab ; import org.apache.jena.sparql.core.assembler.AssemblerUtils ; -import org.apache.jena.sparql.util.Utils ; import org.apache.lucene.analysis.Analyzer ; import org.apache.lucene.document.Document ; import org.apache.lucene.index.DirectoryReader ; @@ -91,7 +91,7 @@ public class textindexdump extends CmdARQ { else if ( textIndex instanceof TextIndexSolr ) dump((TextIndexSolr)textIndex) ; else - System.err.println("Unsupported index type : "+Utils.className(textIndex)) ; + System.err.println("Unsupported index type : "+Lib.className(textIndex)) ; } private static void dump(TextIndexSolr textIndex) { System.err.println("Not implemented : dump Solr index") ; } http://git-wip-us.apache.org/repos/asf/jena/blob/6c3a4b6c/jena-text/src/main/java/org/apache/jena/query/text/assembler/TextIndexLuceneAssembler.java ---------------------------------------------------------------------- diff --git a/jena-text/src/main/java/org/apache/jena/query/text/assembler/TextIndexLuceneAssembler.java b/jena-text/src/main/java/org/apache/jena/query/text/assembler/TextIndexLuceneAssembler.java index 485f85d..361841c 100644 --- a/jena-text/src/main/java/org/apache/jena/query/text/assembler/TextIndexLuceneAssembler.java +++ b/jena-text/src/main/java/org/apache/jena/query/text/assembler/TextIndexLuceneAssembler.java @@ -29,6 +29,7 @@ import org.apache.jena.assembler.Assembler ; import org.apache.jena.assembler.Mode ; import org.apache.jena.assembler.assemblers.AssemblerBase ; import org.apache.jena.atlas.io.IO ; +import org.apache.jena.atlas.lib.IRILib ; import org.apache.jena.query.text.EntityDefinition ; import org.apache.jena.query.text.TextDatasetFactory ; import org.apache.jena.query.text.TextIndex ; @@ -36,7 +37,6 @@ import org.apache.jena.query.text.TextIndexException ; import org.apache.jena.rdf.model.RDFNode ; import org.apache.jena.rdf.model.Resource ; import org.apache.jena.rdf.model.Statement ; -import org.apache.jena.riot.system.IRILib ; import org.apache.jena.sparql.util.graph.GraphUtils ; import org.apache.lucene.analysis.Analyzer ; import org.apache.lucene.store.Directory ;
