X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=blobdiff_plain;f=bundles%2Forg.simantics.db.impl%2Fsrc%2Forg%2Fsimantics%2Fdb%2Fimpl%2Fquery%2FBinaryQuery.java;h=3d7e14c289e5650594f86e08ab12ab2f2cbf5bf0;hb=ded784594eb0e1fb318fbb931135288152691cf2;hp=357d3d1d450406cc800580a3bd5f28c6602c74b5;hpb=67b615f53cb96c89900131f642648b5219ae8efc;p=simantics%2Fplatform.git

diff --git a/bundles/org.simantics.db.impl/src/org/simantics/db/impl/query/BinaryQuery.java b/bundles/org.simantics.db.impl/src/org/simantics/db/impl/query/BinaryQuery.java
index 357d3d1d4..3d7e14c28 100644
--- a/bundles/org.simantics.db.impl/src/org/simantics/db/impl/query/BinaryQuery.java
+++ b/bundles/org.simantics.db.impl/src/org/simantics/db/impl/query/BinaryQuery.java
@@ -11,11 +11,12 @@
  *******************************************************************************/
 package org.simantics.db.impl.query;
 
+import org.simantics.db.exception.DatabaseException;
 import org.simantics.db.impl.graph.ReadGraphImpl;
 import org.simantics.db.request.RequestFlags;
 
 
-abstract public class BinaryQuery<Procedure> extends CacheEntryBase implements Query {
+abstract public class BinaryQuery<Procedure> extends CacheEntryBase<Procedure> implements Query {
 
 	final public long id;
 
@@ -66,21 +67,21 @@ abstract public class BinaryQuery<Procedure> extends CacheEntryBase implements Q
         return this;
     }
     
-    @Override
-    public void recompute(ReadGraphImpl graph, Object provider, CacheEntry entry) {
-        recompute(graph, (QueryProcessor)provider);
-    }
-    
-    @Override
-    public Object performFromCache(ReadGraphImpl graph, Object provider, Object procedure) {
-        return performFromCache(graph, (QueryProcessor)provider, (Procedure)procedure);
-    }
+//    @Override
+//    public void recompute(ReadGraphImpl graph, Object provider, CacheEntry entry) throws DatabaseException {
+//        recompute(graph, (QueryProcessor)provider);
+//    }
+//    
+//    @SuppressWarnings("unchecked")
+//    @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, boolean store);
-    abstract public Object 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 void compute(ReadGraphImpl graph, Procedure procedure) throws DatabaseException ;
+    //abstract public Object performFromCache(ReadGraphImpl graph, QueryProcessor provider, Procedure procedure) throws DatabaseException;
+    //abstract public void putEntry(QueryProcessor provider);
     abstract public void removeEntry(QueryProcessor provider);
-    abstract public BinaryQuery<Procedure> getEntry(QueryProcessor provider);
 
 }