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
}\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
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