X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=blobdiff_plain;ds=sidebyside;f=bundles%2Forg.simantics.db.common%2Fsrc%2Forg%2Fsimantics%2Fdb%2Fcommon%2Frequest%2FPossibleTypedParent.java;h=bae974e3ed235fdd490939699a4f2ab4c283b6a1;hb=1e957fc9da518f3bef8a2c19cad72772087e1b6a;hp=668791821c7320927fb50c3e785537bf70422783;hpb=0ae2b770234dfc3cbb18bd38f324125cf0faca07;p=simantics%2Fplatform.git

diff --git a/bundles/org.simantics.db.common/src/org/simantics/db/common/request/PossibleTypedParent.java b/bundles/org.simantics.db.common/src/org/simantics/db/common/request/PossibleTypedParent.java
index 668791821..bae974e3e 100644
--- a/bundles/org.simantics.db.common/src/org/simantics/db/common/request/PossibleTypedParent.java
+++ b/bundles/org.simantics.db.common/src/org/simantics/db/common/request/PossibleTypedParent.java
@@ -12,59 +12,77 @@
 package org.simantics.db.common.request;
 
 import org.simantics.db.AsyncReadGraph;
+import org.simantics.db.ReadGraph;
 import org.simantics.db.Resource;
+import org.simantics.db.exception.DatabaseException;
 import org.simantics.db.procedure.AsyncProcedure;
 import org.simantics.layer0.Layer0;
 
-public class PossibleTypedParent extends ResourceAsyncRead2<Resource> {
+public class PossibleTypedParent extends ResourceRead2<Resource> {
 
 	public PossibleTypedParent(Resource resource, Resource type) {
 		super(resource, type);
 	}
 
-	@Override
-	public void perform(AsyncReadGraph graph, final AsyncProcedure<Resource> procedure) {
-
-	    final Layer0 l0 = graph.getService(Layer0.class);
-
-		graph.forIsInstanceOf(resource, resource2, new AsyncProcedure<Boolean>() {
-
-			@Override
-			public void execute(AsyncReadGraph graph, Boolean isInstance) {
-				if(isInstance) {
-					procedure.execute(graph, resource);
-				} else {
-					
-					graph.forPossibleObject(resource, l0.PartOf, new AsyncProcedure<Resource>() {
-
-						@Override
-						public void execute(AsyncReadGraph graph, final Resource parent) {
 
-							if(parent == null) {
-								procedure.execute(graph, null);
-							} else {
-								graph.asyncRequest(new PossibleTypedParent(parent, resource2), procedure);
-							}
-							
-						}
-
-						@Override
-						public void exception(AsyncReadGraph graph, Throwable throwable) {
-							procedure.exception(graph, throwable);
-						}
-						
-					});
-					
-				}
-			}
-
-			@Override
-			public void exception(AsyncReadGraph graph, Throwable throwable) {
-				procedure.exception(graph, throwable);
+	@Override
+	public Resource perform(ReadGraph graph) throws DatabaseException {
+		if(graph.isInstanceOf(resource, resource2)) {
+			return resource;
+		} else {
+			Layer0 L0 = Layer0.getInstance(graph);
+			Resource possibleParent = graph.getPossibleObject(resource, L0.PartOf);
+			if(possibleParent != null) {
+				return graph.syncRequest(new PossibleTypedParent(possibleParent, resource2));
+			} else {
+				return null;	
 			}
-		});
-		
-		
+		}
 	}
 
+//	@Override
+//	public void perform(AsyncReadGraph graph, final AsyncProcedure<Resource> procedure) {
+//
+//	    final Layer0 l0 = graph.getService(Layer0.class);
+//
+//		graph.forIsInstanceOf(resource, resource2, new AsyncProcedure<Boolean>() {
+//
+//			@Override
+//			public void execute(AsyncReadGraph graph, Boolean isInstance) {
+//				if(isInstance) {
+//					procedure.execute(graph, resource);
+//				} else {
+//					
+//					graph.forPossibleObject(resource, l0.PartOf, new AsyncProcedure<Resource>() {
+//
+//						@Override
+//						public void execute(AsyncReadGraph graph, final Resource parent) {
+//
+//							if(parent == null) {
+//								procedure.execute(graph, null);
+//							} else {
+//								graph.asyncRequest(new PossibleTypedParent(parent, resource2), procedure);
+//							}
+//							
+//						}
+//
+//						@Override
+//						public void exception(AsyncReadGraph graph, Throwable throwable) {
+//							procedure.exception(graph, throwable);
+//						}
+//						
+//					});
+//					
+//				}
+//			}
+//
+//			@Override
+//			public void exception(AsyncReadGraph graph, Throwable throwable) {
+//				procedure.exception(graph, throwable);
+//			}
+//		});
+//		
+//		
+//	}
+
 }