Fixed multiple issues causing dangling references to discarded queries

[simantics/platform.git] / bundles / org.simantics.db.impl / src / org / simantics / db / impl / query / QueryIdentityHash.java

diff --git a/bundles/org.simantics.db.impl/src/org/simantics/db/impl/query/QueryIdentityHash.java b/bundles/org.simantics.db.impl/src/org/simantics/db/impl/query/QueryIdentityHash.java
index 4842cf5a6ca44f6cbb543fad1cac8c4c5944e115..2db67c67970b165f836317cbbaaabea40fa6994d 100644 (file)
--- a/bundles/org.simantics.db.impl/src/org/simantics/db/impl/query/QueryIdentityHash.java
+++ b/bundles/org.simantics.db.impl/src/org/simantics/db/impl/query/QueryIdentityHash.java
@@ -11,10 +11,13 @@
  *******************************************************************************/
 package org.simantics.db.impl.query;
 
-import gnu.trove.impl.hash.THash;
+import java.util.Collection;
 
+import org.simantics.db.exception.DatabaseException;
 import org.simantics.db.impl.graph.ReadGraphImpl;
 
+import gnu.trove.impl.hash.THash;
+
 
 /**
  * An open addressed hashing implementation for Object types.
@@ -58,7 +61,7 @@ abstract public class QueryIdentityHash extends THash {
         }
 
         @Override
-        public Iterable<CacheEntry> getParents(QueryProcessor processor) {
+        public Collection<CacheEntry> getParents(QueryProcessor processor) {
             // TODO Auto-generated method stub
             return null;
         }
@@ -69,12 +72,6 @@ abstract public class QueryIdentityHash extends THash {
             return null;
         }
 
-        @Override
-        public <T> T getResult() {
-            // TODO Auto-generated method stub
-            return null;
-        }
-
         @Override
         public boolean hasParents() {
             // TODO Auto-generated method stub
@@ -117,12 +114,6 @@ abstract public class QueryIdentityHash extends THash {
             return false;
         }
 
-        @Override
-        public void performFromCache(ReadGraphImpl graph, Object provider, Object procedure) {
-            // TODO Auto-generated method stub
-            
-        }
-
         @Override
         public void refute() {
             // TODO Auto-generated method stub
@@ -142,7 +133,7 @@ abstract public class QueryIdentityHash extends THash {
         }
 
         @Override
-        public void setPending() {
+        public void setPending(QuerySupport querySupport) {
             // TODO Auto-generated method stub
             
         }
@@ -226,7 +217,23 @@ abstract public class QueryIdentityHash extends THash {
                public Object getOriginalRequest() {
                        throw new UnsupportedOperationException();
                }
-        
+
+               @Override
+               Object performFromCache(ReadGraphImpl graph, Object procedure) throws DatabaseException {
+                       // TODO Auto-generated method stub
+                       return null;
+               }
+
+               @Override
+               public Object getResult() {
+                       // TODO Auto-generated method stub
+                       return null;
+               }
+
+        @Override
+            void pruneParentSet() {
+        }
+
     };
 
     /**