From: Tuukka Lehtonen <tuukka.lehtonen@semantum.fi>
Date: Wed, 17 Jun 2020 20:57:03 +0000 (+0300)
Subject: Merge "Optimize ReadGraph.hasStatements(s,p) to not use getObjects(s,p)" into master
X-Git-Url: https://gerrit.simantics.org/r/gitweb?p=simantics%2Fplatform.git;a=commitdiff_plain;h=d40b57f5d1cb14a5af0d7496fcce25e15493337d;hp=638ce7e010a6292fedc677de18173676db305881

Merge "Optimize ReadGraph.hasStatements(s,p) to not use getObjects(s,p)" into master

Change-Id: I9ae1118fc2473af570d6ec4bd37610a321d28496
---

diff --git a/bundles/org.simantics.db.services/src/org/simantics/db/services/adaption/AdapterRegistry2.java b/bundles/org.simantics.db.services/src/org/simantics/db/services/adaption/AdapterRegistry2.java
index 0db80b1b4..e9b59023f 100644
--- a/bundles/org.simantics.db.services/src/org/simantics/db/services/adaption/AdapterRegistry2.java
+++ b/bundles/org.simantics.db.services/src/org/simantics/db/services/adaption/AdapterRegistry2.java
@@ -237,9 +237,9 @@ public class AdapterRegistry2 {
                 NamedNodeMap attr = n.getAttributes();
                 IDynamicAdapter2 da = null;
                 if(n.getNodeName().equals("this"))
-                    da = new ThisResource2();
+                    da = ThisResource2.INSTANCE;
                 else if(n.getNodeName().equals("graph"))
-                    da = new GraphObject2();
+                    da = GraphObject2.INSTANCE;
                 else if(n.getNodeName().equals("bundle")) {
                     String bundleId = null;
                     Node fc = n.getFirstChild();
diff --git a/bundles/org.simantics.db.services/src/org/simantics/db/services/adaption/reflection/GraphObject2.java b/bundles/org.simantics.db.services/src/org/simantics/db/services/adaption/reflection/GraphObject2.java
index e8f171b8c..8a2db578f 100644
--- a/bundles/org.simantics.db.services/src/org/simantics/db/services/adaption/reflection/GraphObject2.java
+++ b/bundles/org.simantics.db.services/src/org/simantics/db/services/adaption/reflection/GraphObject2.java
@@ -15,6 +15,8 @@ import org.simantics.db.ReadGraph;
 
 public class GraphObject2 implements IDynamicAdapter2 {
 
+	public static final IDynamicAdapter2 INSTANCE = new GraphObject2();
+
 	@Override
 	public Class<?> getType() {
 		return ReadGraph.class;
diff --git a/bundles/org.simantics.db.services/src/org/simantics/db/services/adaption/reflection/ThisResource2.java b/bundles/org.simantics.db.services/src/org/simantics/db/services/adaption/reflection/ThisResource2.java
index 24001ee0a..bacf3adee 100644
--- a/bundles/org.simantics.db.services/src/org/simantics/db/services/adaption/reflection/ThisResource2.java
+++ b/bundles/org.simantics.db.services/src/org/simantics/db/services/adaption/reflection/ThisResource2.java
@@ -16,6 +16,8 @@ import org.simantics.db.ReadGraph;
 
 public class ThisResource2 implements IDynamicAdapter2 {
 
+	public static IDynamicAdapter2 INSTANCE = new ThisResource2();
+
 	@Override
 	public Class<?> getType() {
 		return Resource.class;