X-Git-Url: https://gerrit.simantics.org/r/gitweb?p=simantics%2Fplatform.git;a=blobdiff_plain;f=bundles%2Forg.simantics.db.impl%2Fsrc%2Forg%2Fsimantics%2Fdb%2Fimpl%2Fquery%2FBinaryQuery.java;h=d699ea825d9823cfb8c1f3454f13115ff4518455;hp=710895cff44e086d709675252ded264885bb7035;hb=9f0fd59be54719b1fe9322d8fd37e4950857308c;hpb=969bd23cab98a79ca9101af33334000879fb60c5

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 710895cff..d699ea825 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
@@ -1,86 +1,69 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2010 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.impl.graph.ReadGraphImpl;
-import org.simantics.db.request.RequestFlags;
-
-
-abstract public class BinaryQuery<Procedure> extends CacheEntryBase implements Query {
-
-	final public long id;
-
-	public BinaryQuery(final long r1, final long r2) {
-        assert(r1 != 0);
-        assert(r2 != 0);
-        id = id(r1,r2);
-        assert(id != 0);
-    }
-	
-	@Override
-	int makeHash() {
-		return r1() ^ r2();
-	}
-	
-    final public int r1() {
-        return (int)(id>>>32);
-    }
-    
-    final public int r2() {
-        return (int)id;
-    }
-    
-    final protected static long id(long r1, long r2) {
-        long result = (r1<<32) | (r2 & 0xffffffffL); 
-        return result;
-    }
-    
-    @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;
-        BinaryQuery<?> other = (BinaryQuery<?>)object;
-        return id == other.id;
-    }
-	
-    @Override
-    final public Query getQuery() {
-        return this;
-    }
-    
-    @Override
-    public void recompute(ReadGraphImpl graph, Object provider, CacheEntry entry) {
-        recompute(graph, (QueryProcessor)provider);
-    }
-    
-    @Override
-    public void performFromCache(ReadGraphImpl graph, Object provider, Object procedure) {
-        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 void performFromCache(ReadGraphImpl graph, QueryProcessor provider, Procedure procedure);
-    abstract public void putEntry(QueryProcessor provider);
-    abstract public void removeEntry(QueryProcessor provider);
-    abstract public BinaryQuery<Procedure> getEntry(QueryProcessor provider);
-
-}
+/*******************************************************************************
+ * 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 BinaryQuery<Procedure> extends CacheEntryBase<Procedure> implements Query {
+
+	final public long id;
+
+	public BinaryQuery(final long r1, final long r2) {
+        assert(r1 != 0);
+        assert(r2 != 0);
+        id = id(r1,r2);
+        assert(id != 0);
+    }
+	
+	@Override
+	int makeHash() {
+		return r1() ^ r2();
+	}
+	
+    final public int r1() {
+        return (int)(id>>>32);
+    }
+    
+    final public int r2() {
+        return (int)id;
+    }
+    
+    final protected static long id(long r1, long r2) {
+        long result = (r1<<32) | (r2 & 0xffffffffL); 
+        return result;
+    }
+    
+    @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;
+        BinaryQuery<?> other = (BinaryQuery<?>)object;
+        return id == other.id;
+    }
+	
+    @Override
+    final public Query getQuery() {
+        return this;
+    }
+
+    abstract public void removeEntry(QueryProcessor provider);
+
+}