X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=blobdiff_plain;f=bundles%2Forg.simantics.db.impl%2Fsrc%2Forg%2Fsimantics%2Fdb%2Fimpl%2Fquery%2FStringQuery.java;fp=bundles%2Forg.simantics.db.impl%2Fsrc%2Forg%2Fsimantics%2Fdb%2Fimpl%2Fquery%2FStringQuery.java;h=f3058edd7e7e97e958a030a32f72db1921c85c26;hb=d0e8f57df83c175bac2098412ee71646fb9ff0e9;hp=36d6acc5ae377e5c55e7f5019af705c48085cfe9;hpb=bdab0adcee131a18290393e1c2fca72de48c10d2;p=simantics%2Fplatform.git

diff --git a/bundles/org.simantics.db.impl/src/org/simantics/db/impl/query/StringQuery.java b/bundles/org.simantics.db.impl/src/org/simantics/db/impl/query/StringQuery.java
index 36d6acc5a..f3058edd7 100644
--- a/bundles/org.simantics.db.impl/src/org/simantics/db/impl/query/StringQuery.java
+++ b/bundles/org.simantics.db.impl/src/org/simantics/db/impl/query/StringQuery.java
@@ -11,10 +11,9 @@
  *******************************************************************************/
 package org.simantics.db.impl.query;
 
-import org.simantics.db.impl.graph.ReadGraphImpl;
 import org.simantics.db.request.RequestFlags;
 
-abstract public class StringQuery<Procedure> extends CacheEntryBase implements Query {
+abstract public class StringQuery<Procedure> extends CacheEntryBase<Procedure> implements Query {
 
     final public String id;
     final public int hash;
@@ -56,21 +55,18 @@ abstract public class StringQuery<Procedure> extends CacheEntryBase implements Q
         return this;
     }
     
-    @Override
-    public void recompute(ReadGraphImpl graph, Object provider, CacheEntry entry) {
-        throw new Error("Recompute of primitive queries is not supported.");
-    }
-    
-    @Override
-    public void performFromCache(ReadGraphImpl graph, Object provider, Object procedure) {
-    	throw new Error("Not possible.");
-    }
+//    @Override
+//    public void recompute(ReadGraphImpl graph, Object provider, CacheEntry entry) {
+//        throw new Error("Recompute of primitive queries is not supported.");
+//    }
+//    
+//    @Override
+//    public Object performFromCache(ReadGraphImpl graph, Object provider, Object procedure) throws DatabaseException {
+//        return performFromCache(graph, (QueryProcessor)provider, (Procedure)procedure);
+//    }
     
-    abstract public void recompute(ReadGraphImpl graph, QueryProcessor provider);
-    abstract public void computeForEach(ReadGraphImpl graph, QueryProcessor provider, Procedure procedure);
-    abstract public void performFromCache(ReadGraphImpl graph, QueryProcessor provider, Procedure procedure);
-    abstract public void putEntry(QueryProcessor provider);
+    //abstract public void recompute(ReadGraphImpl graph, QueryProcessor provider) throws DatabaseException;
+    //abstract public Object performFromCache(ReadGraphImpl graph, QueryProcessor provider, Procedure procedure) throws DatabaseException;
     abstract public void removeEntry(QueryProcessor provider);
-    abstract public StringQuery<Procedure> getEntry(QueryProcessor provider);
 	
 }