Sync git svn branch with SVN repository r33249.

[simantics/platform.git] / bundles / org.simantics.modeling.ui / src / org / simantics / modeling / ui / function / All.java

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 6cfd6193c3154cc8cb9e682be58e92a45b8cf428..57c1b040aa380754e8f6fcbe359d1ddd781c6cc9 100644 (file)
--- 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;\r
 import org.simantics.db.exception.DatabaseException;\r
 import org.simantics.db.layer0.variable.Variable;\r
-import org.simantics.db.procedure.Procedure;\r
 import org.simantics.modeling.typicals.TypicalUtil;\r
 import org.simantics.modeling.ui.typicals.NewTypicalDiagramInstance;\r
 import org.simantics.scenegraph.loader.ScenegraphLoaderUtils;\r
@@ -50,15 +49,10 @@ public class All {
         }\r
         final Collection<NamedResource> namedTypicals = TypicalUtil.toNamedResources(session, typicals);\r
 \r
-        return TypicalUtil.syncExec(new Consumer<Procedure<Resource>>() {\r
-            @Override\r
-            public void accept(final Procedure<Resource> procedure) {\r
-                NewTypicalDiagramInstance.asyncQueryFromList(namedTypicals, selectedTypical -> {\r
-                    if (selectedTypical == null) {\r
-                        procedure.execute(null);\r
-                        return;\r
-                    }\r
-                    try {\r
+        return TypicalUtil.syncExec(procedure ->  {\r
+            NewTypicalDiagramInstance.asyncQueryFromList(namedTypicals, selectedTypical -> {\r
+                try {\r
+                    if (selectedTypical != null) {\r
                         session.syncRequest(TypicalUtil.instantiateTemplate(target, selectedTypical, instance -> {\r
                             try {\r
                                 Set<Resource> customlyNamed = new HashSet<Resource>();\r
@@ -71,14 +65,14 @@ public class All {
                                 procedure.exception(e);\r
                             }\r
                         }));\r
-                    } catch (Throwable e) {\r
-                        procedure.exception(e);\r
-                    } finally {\r
-                        procedure.execute(null);\r
                     }\r
-                });\r
-            }\r
+                } catch (Throwable e) {\r
+                    procedure.exception(e);\r
+                } finally {\r
+                    procedure.execute(null);\r
+                }\r
+            });\r
         });\r
     }\r
 \r
-}
\ No newline at end of file
+}\r