Revision: 17229
http://sourceforge.net/p/gate/code/17229
Author: valyt
Date: 2014-01-15 12:03:03 +0000 (Wed, 15 Jan 2014)
Log Message:
-----------
Class rename.
Modified Paths:
--------------
mimir/branches/5.0/plugins/db-h2/src/gate/mimir/db/DBSemanticAnnotationHelper.java
mimir/branches/5.0/plugins/measurements/src/gate/mimir/measurements/MeasurementAnnotationHelper.java
mimir/branches/5.0/plugins/sesame/src/gate/mimir/sesame/SesameSemanticAnnotationHelper.java
mimir/branches/5.0/plugins/sparql/src/gate/mimir/sparql/SPARQLSemanticAnnotationHelper.java
Modified:
mimir/branches/5.0/plugins/db-h2/src/gate/mimir/db/DBSemanticAnnotationHelper.java
===================================================================
---
mimir/branches/5.0/plugins/db-h2/src/gate/mimir/db/DBSemanticAnnotationHelper.java
2014-01-15 11:23:19 UTC (rev 17228)
+++
mimir/branches/5.0/plugins/db-h2/src/gate/mimir/db/DBSemanticAnnotationHelper.java
2014-01-15 12:03:03 UTC (rev 17229)
@@ -23,7 +23,7 @@
import gate.mimir.IndexConfig;
import gate.mimir.MimirIndex;
import gate.mimir.SemanticAnnotationHelper;
-import gate.mimir.index.AtomicMentionsIndex;
+import gate.mimir.index.AtomicAnnotationIndex;
import gate.mimir.index.Indexer;
import gate.mimir.index.Mention;
import gate.mimir.search.QueryEngine;
@@ -360,7 +360,7 @@
private transient FeatureMap documentFeatures;
@Override
- public void init(AtomicMentionsIndex index) {
+ public void init(AtomicAnnotationIndex index) {
super.init(index);
if(getUriFeatures() != null && getUriFeatures().length > 0) {
logger.warn(
@@ -413,7 +413,7 @@
@Override
public void init(QueryEngine qEngine) {
super.init(qEngine);
- File dbDir = new File(qEngine.getIndexDir(), DB_DIR_NAME);
+ File dbDir = new File(qEngine.getIndexConfig().getIndexDirectory(),
DB_DIR_NAME);
if(!dbDir.exists()) { throw new IllegalArgumentException(
"Target database directory (at " + dbDir.getAbsolutePath()
+ ") does not exist!");
@@ -541,7 +541,7 @@
*
* @throws SQLException
*/
- protected void createDb(AtomicMentionsIndex indexer) throws SQLException {
+ protected void createDb(AtomicAnnotationIndex indexer) throws SQLException {
Statement stmt = dbConnection.createStatement();
// ////////////////////////////////
// create the Level 1 table
@@ -750,7 +750,7 @@
@Override
public String[] getMentionUris(Annotation ann, int length,
- AtomicMentionsIndex index) {
+ AtomicAnnotationIndex index) {
FeatureMap featuresToIndex;
if(getMode() == Mode.DOCUMENT) {
length = -1;
@@ -1291,7 +1291,7 @@
}
@Override
- public void close(AtomicMentionsIndex indexer) {
+ public void close(AtomicAnnotationIndex indexer) {
closeDB();
}
Modified:
mimir/branches/5.0/plugins/measurements/src/gate/mimir/measurements/MeasurementAnnotationHelper.java
===================================================================
---
mimir/branches/5.0/plugins/measurements/src/gate/mimir/measurements/MeasurementAnnotationHelper.java
2014-01-15 11:23:19 UTC (rev 17228)
+++
mimir/branches/5.0/plugins/measurements/src/gate/mimir/measurements/MeasurementAnnotationHelper.java
2014-01-15 12:03:03 UTC (rev 17229)
@@ -21,7 +21,7 @@
import gate.mimir.Constraint;
import gate.mimir.ConstraintType;
import gate.mimir.SemanticAnnotationHelper;
-import gate.mimir.index.AtomicMentionsIndex;
+import gate.mimir.index.AtomicAnnotationIndex;
import gate.mimir.index.Indexer;
import gate.mimir.index.Mention;
import gate.mimir.search.QueryEngine;
@@ -173,7 +173,7 @@
}
@Override
- public void init(AtomicMentionsIndex indexer) {
+ public void init(AtomicAnnotationIndex indexer) {
// create the delegate - needs to happen before super.init
if(delegateHelperType == null) { throw new IllegalArgumentException(
"No value provided for delegateHelperType"); }
Modified:
mimir/branches/5.0/plugins/sesame/src/gate/mimir/sesame/SesameSemanticAnnotationHelper.java
===================================================================
---
mimir/branches/5.0/plugins/sesame/src/gate/mimir/sesame/SesameSemanticAnnotationHelper.java
2014-01-15 11:23:19 UTC (rev 17228)
+++
mimir/branches/5.0/plugins/sesame/src/gate/mimir/sesame/SesameSemanticAnnotationHelper.java
2014-01-15 12:03:03 UTC (rev 17229)
@@ -12,15 +12,26 @@
*/
package gate.mimir.sesame;
+import static gate.mimir.sesame.SesameUtils.HAS_LENGTH;
+import static gate.mimir.sesame.SesameUtils.HAS_MENTION;
+import static gate.mimir.sesame.SesameUtils.MIMIR_NAMESPACE;
import static gate.mimir.sesame.SesameUtils.SESAME_CONNECTION_COUNT_KEY;
import static gate.mimir.sesame.SesameUtils.SESAME_INDEX_DIRNAME;
+import static gate.mimir.sesame.SesameUtils.SESAME_REPOSITORY_NAME_KEY;
import static gate.mimir.sesame.SesameUtils.SESAME_RMANAGER_KEY;
-import static gate.mimir.sesame.SesameUtils.SESAME_CONFIG_FILENAME;
-import static gate.mimir.sesame.SesameUtils.SESAME_REPOSITORY_NAME_KEY;
-import static gate.mimir.sesame.SesameUtils.MIMIR_NAMESPACE;
-import static gate.mimir.sesame.SesameUtils.HAS_MENTION;
-import static gate.mimir.sesame.SesameUtils.HAS_LENGTH;
-import static gate.mimir.sesame.SesameUtils.HAS_FEATURES;
+import gate.Annotation;
+import gate.Document;
+import gate.FeatureMap;
+import gate.Gate;
+import gate.mimir.AbstractSemanticAnnotationHelper;
+import gate.mimir.Constraint;
+import gate.mimir.ConstraintType;
+import gate.mimir.IndexConfig;
+import gate.mimir.SemanticAnnotationHelper;
+import gate.mimir.index.AtomicAnnotationIndex;
+import gate.mimir.index.Mention;
+import gate.mimir.search.QueryEngine;
+import gate.util.GateRuntimeException;
import java.io.File;
import java.io.FileReader;
@@ -33,7 +44,6 @@
import java.util.Iterator;
import java.util.LinkedList;
import java.util.List;
-import java.util.Map;
import org.apache.log4j.Logger;
import org.openrdf.OpenRDFException;
@@ -57,17 +67,12 @@
import org.openrdf.query.QueryLanguage;
import org.openrdf.query.TupleQuery;
import org.openrdf.query.TupleQueryResult;
-import org.openrdf.query.algebra.TupleExpr;
-import org.openrdf.query.algebra.evaluation.QueryBindingSet;
-import org.openrdf.query.impl.DatasetImpl;
import org.openrdf.query.parser.sparql.SPARQLParser;
-import org.openrdf.repository.Repository;
import org.openrdf.repository.RepositoryConnection;
import org.openrdf.repository.RepositoryException;
import org.openrdf.repository.RepositoryResult;
import org.openrdf.repository.config.RepositoryConfig;
import org.openrdf.repository.config.RepositoryConfigException;
-import org.openrdf.repository.config.RepositoryConfigUtil;
import org.openrdf.repository.manager.LocalRepositoryManager;
import org.openrdf.repository.manager.RepositoryManager;
import org.openrdf.rio.RDFFormat;
@@ -77,23 +82,6 @@
import org.openrdf.rio.RDFParser;
import org.openrdf.rio.Rio;
-import gate.Annotation;
-import gate.Document;
-import gate.FeatureMap;
-import gate.Gate;
-import gate.mimir.AbstractSemanticAnnotationHelper;
-import gate.mimir.Constraint;
-import gate.mimir.ConstraintType;
-import gate.mimir.IndexConfig;
-import gate.mimir.MimirIndex;
-import gate.mimir.SemanticAnnotationHelper;
-import gate.mimir.index.AtomicMentionsIndex;
-import gate.mimir.index.IndexException;
-import gate.mimir.index.Indexer;
-import gate.mimir.index.Mention;
-import gate.mimir.search.QueryEngine;
-import gate.util.GateRuntimeException;
-
public class SesameSemanticAnnotationHelper extends
AbstractSemanticAnnotationHelper {
/**
@@ -272,7 +260,7 @@
private static final long serialVersionUID = 1396623744631385943L;
@Override
- public void init(AtomicMentionsIndex indexer) {
+ public void init(AtomicAnnotationIndex indexer) {
super.init(indexer);
setFloatFeatures(concatenateArrays(getIntegerFeatures(),
getFloatFeatures()));
setIntegerFeatures(new String[0]);
@@ -341,7 +329,7 @@
@Override
public String[] getMentionUris(Annotation ann, int length,
- AtomicMentionsIndex indexer) {
+ AtomicAnnotationIndex indexer) {
if (!isInited()) init(indexer);
FeatureMap featuresToIndex;
@@ -534,7 +522,7 @@
}
@Override
- public void close(AtomicMentionsIndex index) {
+ public void close(AtomicAnnotationIndex index) {
if (isInited()) {
logger.info("Closing Sesame Repository Connection");
try {
Modified:
mimir/branches/5.0/plugins/sparql/src/gate/mimir/sparql/SPARQLSemanticAnnotationHelper.java
===================================================================
---
mimir/branches/5.0/plugins/sparql/src/gate/mimir/sparql/SPARQLSemanticAnnotationHelper.java
2014-01-15 11:23:19 UTC (rev 17228)
+++
mimir/branches/5.0/plugins/sparql/src/gate/mimir/sparql/SPARQLSemanticAnnotationHelper.java
2014-01-15 12:03:03 UTC (rev 17229)
@@ -41,7 +41,7 @@
import gate.mimir.Constraint;
import gate.mimir.ConstraintType;
import gate.mimir.SemanticAnnotationHelper;
-import gate.mimir.index.AtomicMentionsIndex;
+import gate.mimir.index.AtomicAnnotationIndex;
import gate.mimir.index.Indexer;
import gate.mimir.index.Mention;
import gate.mimir.search.QueryEngine;
@@ -235,7 +235,7 @@
}
@Override
- public void init(AtomicMentionsIndex indexer) {
+ public void init(AtomicAnnotationIndex indexer) {
super.init(indexer);
// calculate authHeader value
if(sparqlEndpointUser != null && sparqlEndpointUser.length() > 0){
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
CenturyLink Cloud: The Leader in Enterprise Cloud Services.
Learn Why More Businesses Are Choosing CenturyLink Cloud For
Critical Workloads, Development Environments & Everything In Between.
Get a Quote or Start a Free Trial Today.
http://pubads.g.doubleclick.net/gampad/clk?id=119420431&iu=/4140/ostg.clktrk
_______________________________________________
GATE-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/gate-cvs
