Fixed multiple issues causing dangling references to discarded queries

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

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 6e786c0d201abfb98fa0b1c983dce79709d80e2d..3498b1ac2763167d3834d1abefa964ec9f8fdc90 100644 (file)
--- 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
@@ -1,76 +1,60 @@
-/*******************************************************************************\r
- * Copyright (c) 2007, 2010 Association for Decentralized Information Management\r
- * in Industry THTH ry.\r
- * All rights reserved. This program and the accompanying materials\r
- * are made available under the terms of the Eclipse Public License v1.0\r
- * which accompanies this distribution, and is available at\r
- * http://www.eclipse.org/legal/epl-v10.html\r
- *\r
- * Contributors:\r
- *     VTT Technical Research Centre of Finland - initial API and implementation\r
- *******************************************************************************/\r
-package org.simantics.db.impl.query;\r
-\r
-import org.simantics.db.impl.graph.ReadGraphImpl;\r
-import org.simantics.db.request.RequestFlags;\r
-\r
-abstract public class StringQuery<Procedure> extends CacheEntryBase implements Query {\r
-\r
-    final public String id;\r
-    final public int hash;\r
-\r
-    public StringQuery(String id) {\r
-        assert(id != null);\r
-       this.id = id;\r
-       hash = id.hashCode();\r
-    }\r
-    \r
-    @Override\r
-    int makeHash() {\r
-       return id.hashCode();\r
-    }\r
-    \r
-    final protected static int hash(String id) {\r
-        return id.hashCode();\r
-    }\r
-    \r
-    @Override\r
-    public int type() {\r
-        return RequestFlags.INVALIDATE;\r
-    }\r
-    \r
-    @Override\r
-    final public boolean equals(Object object) {\r
-        if (this == object)\r
-            return true;\r
-        else if (object == null)\r
-            return false;\r
-        else if (getClass() != object.getClass())\r
-            return false;\r
-        StringQuery other = (StringQuery)object;\r
-        return id == other.id;\r
-    }\r
-    \r
-    @Override\r
-    final public Query getQuery() {\r
-        return this;\r
-    }\r
-    \r
-    @Override\r
-    public void recompute(ReadGraphImpl graph, Object provider, CacheEntry entry) {\r
-        throw new Error("Recompute of primitive queries is not supported.");\r
-    }\r
-    \r
-    @Override\r
-    public void performFromCache(ReadGraphImpl graph, Object provider, Object procedure) {\r
-       throw new Error("Not possible.");\r
-    }\r
-    \r
-    abstract public void recompute(ReadGraphImpl graph, QueryProcessor provider);\r
-    abstract public void computeForEach(ReadGraphImpl graph, QueryProcessor provider, Procedure procedure);\r
-    abstract public void performFromCache(ReadGraphImpl graph, QueryProcessor provider, Procedure procedure);\r
-    abstract public void putEntry(QueryProcessor provider);\r
-    abstract public void removeEntry(QueryProcessor provider);\r
-    abstract public StringQuery<Procedure> getEntry(QueryProcessor provider);\r
-       \r
-}\r
+/*******************************************************************************
+ * Copyright (c) 2007, 2018 Association for Decentralized Information Management
+ * in Industry THTH ry.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     VTT Technical Research Centre of Finland - initial API and implementation
+ *******************************************************************************/
+package org.simantics.db.impl.query;
+
+import org.simantics.db.request.RequestFlags;
+
+public abstract class StringQuery<Procedure> extends CacheEntryBase<Procedure> implements Query {
+
+    public final String id;
+    protected final int hash;
+
+    public StringQuery(String id) {
+        assert(id != null);
+        this.id = id;
+        hash = id.hashCode();
+    }
+
+    @Override
+    int makeHash() {
+        return id.hashCode();
+    }
+
+    protected static final int hash(String id) {
+        return id.hashCode();
+    }
+
+    @Override
+    public int type() {
+        return RequestFlags.INVALIDATE;
+    }
+
+    @Override
+    final public boolean equals(Object object) {
+        if (this == object)
+            return true;
+        else if (object == null)
+            return false;
+        else if (getClass() != object.getClass())
+            return false;
+        StringQuery<?> other = (StringQuery<?>) object;
+        return id == other.id;
+    }
+
+    @Override
+    final public Query getQuery() {
+        return this;
+    }
+
+    abstract public void removeEntry(QueryProcessor provider);
+
+}