Support selection of experiment run for scene graph provider

[simantics/platform.git] / bundles / org.simantics.diagram / src / org / simantics / diagram / runtime / RuntimeDiagramManager.java

diff --git a/bundles/org.simantics.diagram/src/org/simantics/diagram/runtime/RuntimeDiagramManager.java b/bundles/org.simantics.diagram/src/org/simantics/diagram/runtime/RuntimeDiagramManager.java
index 10c2d89040b1fe2a800091cda84767be54982f09..b0ba03c58b5ee2ea50f72944c0c0b7e993d3f5e0 100644 (file)
--- a/bundles/org.simantics.diagram/src/org/simantics/diagram/runtime/RuntimeDiagramManager.java
+++ b/bundles/org.simantics.diagram/src/org/simantics/diagram/runtime/RuntimeDiagramManager.java
@@ -33,7 +33,6 @@ import org.simantics.diagram.stubs.DiagramResource;
 import org.simantics.layer0.Layer0;
 import org.simantics.operation.Layer0X;
 import org.simantics.ui.workbench.IResourceEditorInput2;
-import org.simantics.utils.datastructures.Callback;
 import org.simantics.utils.ui.ErrorLogger;
 
 /**
@@ -277,8 +276,8 @@ public class RuntimeDiagramManager {
         return createRuntimeDiagram(graph, diagram, desc);
     }
 
-    private void listenRequest(RequestProcessor processor, final Resource diagram) {
-        processor.asyncRequest(new RuntimeVariableForInput(getResourceInput()), new AsyncListener<RuntimeDiagramDesc>() {
+    private void listenRequest(RequestProcessor processor, final Resource diagram) throws DatabaseException {
+        processor.syncRequest(new RuntimeVariableForInput(getResourceInput()), new AsyncListener<RuntimeDiagramDesc>() {
 
             @Override
             public void exception(AsyncReadGraph graph, Throwable throwable) {
@@ -300,13 +299,10 @@ public class RuntimeDiagramManager {
                         if (runtime != null)
                             writeConfig(graph, runtime, diagram, desc);
                     }
-                }, new Callback<DatabaseException>() {
-                    @Override
-                    public void run(DatabaseException e) {
-                        ListenerSupport s = support;
-                        if (e != null && s != null)
-                            s.exception(e);
-                    }
+                }, e -> {
+                    ListenerSupport s = support;
+                    if (e != null && s != null)
+                        s.exception(e);
                 });
             }
 
@@ -318,7 +314,7 @@ public class RuntimeDiagramManager {
         });
     }
 
-    private Resource createRuntimeDiagram(WriteGraph graph, Resource diagram, RuntimeDiagramDesc desc) throws DatabaseException {
+    protected Resource createRuntimeDiagram(WriteGraph graph, Resource diagram, RuntimeDiagramDesc desc) throws DatabaseException {
 
         Layer0 L0 = Layer0.getInstance(graph);
         final DiagramResource DIA = DiagramResource.getInstance(graph);