X-Git-Url: https://gerrit.simantics.org/r/gitweb?p=simantics%2Fplatform.git;a=blobdiff_plain;f=bundles%2Forg.simantics.modeling.ui%2Fsrc%2Forg%2Fsimantics%2Fmodeling%2Fui%2Ffunction%2FAll.java;h=57c1b040aa380754e8f6fcbe359d1ddd781c6cc9;hp=6cfd6193c3154cc8cb9e682be58e92a45b8cf428;hb=ffdf837;hpb=d1a82fe1414c77b97bec886d6a3ae3c5d926c334

diff --git a/bundles/org.simantics.modeling.ui/src/org/simantics/modeling/ui/function/All.java b/bundles/org.simantics.modeling.ui/src/org/simantics/modeling/ui/function/All.java
index 6cfd6193c..57c1b040a 100644
--- a/bundles/org.simantics.modeling.ui/src/org/simantics/modeling/ui/function/All.java
+++ b/bundles/org.simantics.modeling.ui/src/org/simantics/modeling/ui/function/All.java
@@ -13,7 +13,6 @@ import org.simantics.db.Session;
 import org.simantics.db.common.NamedResource;
 import org.simantics.db.exception.DatabaseException;
 import org.simantics.db.layer0.variable.Variable;
-import org.simantics.db.procedure.Procedure;
 import org.simantics.modeling.typicals.TypicalUtil;
 import org.simantics.modeling.ui.typicals.NewTypicalDiagramInstance;
 import org.simantics.scenegraph.loader.ScenegraphLoaderUtils;
@@ -50,15 +49,10 @@ public class All {
         }
         final Collection<NamedResource> namedTypicals = TypicalUtil.toNamedResources(session, typicals);
 
-        return TypicalUtil.syncExec(new Consumer<Procedure<Resource>>() {
-            @Override
-            public void accept(final Procedure<Resource> procedure) {
-                NewTypicalDiagramInstance.asyncQueryFromList(namedTypicals, selectedTypical -> {
-                    if (selectedTypical == null) {
-                        procedure.execute(null);
-                        return;
-                    }
-                    try {
+        return TypicalUtil.syncExec(procedure ->  {
+            NewTypicalDiagramInstance.asyncQueryFromList(namedTypicals, selectedTypical -> {
+                try {
+                    if (selectedTypical != null) {
                         session.syncRequest(TypicalUtil.instantiateTemplate(target, selectedTypical, instance -> {
                             try {
                                 Set<Resource> customlyNamed = new HashSet<Resource>();
@@ -71,14 +65,14 @@ public class All {
                                 procedure.exception(e);
                             }
                         }));
-                    } catch (Throwable e) {
-                        procedure.exception(e);
-                    } finally {
-                        procedure.execute(null);
                     }
-                });
-            }
+                } catch (Throwable e) {
+                    procedure.exception(e);
+                } finally {
+                    procedure.execute(null);
+                }
+            });
         });
     }
 
-}
\ No newline at end of file
+}