X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=blobdiff_plain;f=bundles%2Forg.simantics.db.common%2Fsrc%2Forg%2Fsimantics%2Fdb%2Fcommon%2Frequest%2FPossibleTypedParent.java;h=4a6d0b19169e86f8e384fd2e430a843acbd20f95;hb=9f0fd59be54719b1fe9322d8fd37e4950857308c;hp=f962227dbd88f99f868f34f52868e4cb73611c25;hpb=969bd23cab98a79ca9101af33334000879fb60c5;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 f962227db..4a6d0b191 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
@@ -1,70 +1,40 @@
-/*******************************************************************************
- * 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.common.request;
-
-import org.simantics.db.AsyncReadGraph;
-import org.simantics.db.Resource;
-import org.simantics.db.procedure.AsyncProcedure;
-import org.simantics.layer0.Layer0;
-
-public class PossibleTypedParent extends ResourceAsyncRead2<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);
-			}
-		});
-		
-		
-	}
-
-}
+/*******************************************************************************
+ * 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.common.request;
+
+import org.simantics.db.ReadGraph;
+import org.simantics.db.Resource;
+import org.simantics.db.exception.DatabaseException;
+import org.simantics.layer0.Layer0;
+
+public class PossibleTypedParent extends ResourceRead2<Resource> {
+
+	public PossibleTypedParent(Resource resource, Resource type) {
+		super(resource, type);
+	}
+
+	@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;
+			}
+		}
+	}
+
+}