From de3749532d060f26c966a81c03f9a5d846c33d06 Mon Sep 17 00:00:00 2001
From: RncLsn <rnc.lsn@gmail.com>
Date: Thu, 28 May 2015 17:11:35 +0100
Subject: Merged updates from upstream.

---
 src/uk/ac/ox/cs/pagoda/query/GapByTriple.java | 40 ++++++++++-----------------
 1 file changed, 14 insertions(+), 26 deletions(-)

(limited to 'src/uk/ac/ox/cs/pagoda/query/GapByTriple.java')

diff --git a/src/uk/ac/ox/cs/pagoda/query/GapByTriple.java b/src/uk/ac/ox/cs/pagoda/query/GapByTriple.java
index a1c1b0e..eaa629b 100644
--- a/src/uk/ac/ox/cs/pagoda/query/GapByTriple.java
+++ b/src/uk/ac/ox/cs/pagoda/query/GapByTriple.java
@@ -1,36 +1,29 @@
 package uk.ac.ox.cs.pagoda.query;
 
-import java.io.BufferedWriter;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.OutputStreamWriter;
-import java.util.Collection;
-
-import org.semanticweb.HermiT.model.Atom;
-import org.semanticweb.HermiT.model.AtomicConcept;
-import org.semanticweb.HermiT.model.AtomicRole;
-import org.semanticweb.HermiT.model.DLClause;
-import org.semanticweb.HermiT.model.Individual;
-
+import org.semanticweb.HermiT.model.*;
+import uk.ac.ox.cs.JRDFox.JRDFStoreException;
+import uk.ac.ox.cs.JRDFox.Prefixes;
+import uk.ac.ox.cs.JRDFox.store.DataStore;
+import uk.ac.ox.cs.JRDFox.store.Parameters;
+import uk.ac.ox.cs.JRDFox.store.TupleIterator;
 import uk.ac.ox.cs.pagoda.MyPrefixes;
 import uk.ac.ox.cs.pagoda.owl.OWLHelper;
 import uk.ac.ox.cs.pagoda.reasoner.light.BasicQueryEngine;
 import uk.ac.ox.cs.pagoda.reasoner.light.RDFoxTripleManager;
 import uk.ac.ox.cs.pagoda.util.Namespace;
 import uk.ac.ox.cs.pagoda.util.Utility;
-import uk.ac.ox.cs.JRDFox.JRDFStoreException;
-import uk.ac.ox.cs.JRDFox.Prefixes;
-import uk.ac.ox.cs.JRDFox.store.DataStore;
-import uk.ac.ox.cs.JRDFox.store.Parameters;
-import uk.ac.ox.cs.JRDFox.store.TupleIterator;
+
+import java.io.BufferedWriter;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.OutputStreamWriter;
+import java.util.Collection;
 
 public class GapByTriple extends GapTupleIterator<String> {
 	
-	private static final String RDF_TYPE = Namespace.RDF_NS + "type"; 
-	private static final String BRIEF_RDF_TYPE = "rdf:type"; 
-	
 	static final String allTripleQuery = "SELECT ?X ?Y ?Z WHERE { ?X ?Y ?Z }";
-	
+	private static final String RDF_TYPE = Namespace.RDF_NS + "type";
+	private static final String BRIEF_RDF_TYPE = "rdf:type";
 	DataStore lowerStore, upperStore;
 	long multi; 
 	TupleIterator iterator;
@@ -163,11 +156,6 @@ public class GapByTriple extends GapTupleIterator<String> {
 		addTo(upperStore);
 	}
 	
-	@Override
-	public boolean isValid() {
-		return true;
-	}
-
 	@Override
 	public void clear() {
 		iterator.dispose();		
-- 
cgit v1.2.3