New implementation NearestOwnerFinder of CommonDBUtils.getNearestOwner

[simantics/platform.git] / bundles / org.simantics.db.common / src / org / simantics / db / common / request / PossibleOwner.java

diff --git a/bundles/org.simantics.db.common/src/org/simantics/db/common/request/PossibleOwner.java b/bundles/org.simantics.db.common/src/org/simantics/db/common/request/PossibleOwner.java
index a39b257d2d4141fc771c341fba6c2994834fa0a8..6df6910267c59e109d10dea329e13b5179f38e85 100644 (file)
--- a/bundles/org.simantics.db.common/src/org/simantics/db/common/request/PossibleOwner.java
+++ b/bundles/org.simantics.db.common/src/org/simantics/db/common/request/PossibleOwner.java
@@ -1,12 +1,9 @@
 package org.simantics.db.common.request;
 
-import java.util.Collections;
-
 import org.simantics.db.ReadGraph;
 import org.simantics.db.Resource;
-import org.simantics.db.common.utils.CommonDBUtils;
+import org.simantics.db.common.utils.NearestOwnerFinder;
 import org.simantics.db.exception.DatabaseException;
-import org.simantics.layer0.Layer0;
 
 public class PossibleOwner extends ResourceRead<Resource> {
 
@@ -16,10 +13,7 @@ public class PossibleOwner extends ResourceRead<Resource> {
 
     @Override
     public Resource perform(ReadGraph graph) throws DatabaseException {
-        Layer0 L0 = Layer0.getInstance(graph);
-        Resource directOwner = graph.getPossibleObject(resource, L0.IsOwnedBy);
-        if(directOwner != null) return directOwner;
-        return CommonDBUtils.getNearestOwner(graph, Collections.singleton(resource));
+        return NearestOwnerFinder.getNearestOwner(graph, resource);
     }
     
 }
\ No newline at end of file