Expose JFXRepresentation's ToolkitListener list to DisplayRuntimeInstance

Author: daykin

app/display/runtime/src/main/java/org/csstudio/display/builder/runtime/app/DisplayRuntimeInstance.java

@@ -17,13 +17,15 @@
 import java.util.concurrent.Future;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeoutException;
+import java.util.concurrent.FutureTask;
 import java.util.logging.Level;
 
 import org.csstudio.display.builder.model.DisplayModel;
 import org.csstudio.display.builder.model.Preferences;
 import org.csstudio.display.builder.model.Widget;
 import org.csstudio.display.builder.model.persist.ModelLoader;
 import org.csstudio.display.builder.model.util.ModelResourceUtil;
+import org.csstudio.display.builder.representation.ToolkitListener;
 import org.csstudio.display.builder.representation.javafx.JFXRepresentation;
 import org.csstudio.display.builder.runtime.ActionUtil;
 import org.csstudio.display.builder.runtime.RuntimeUtil;
@@ -75,6 +77,7 @@ public class DisplayRuntimeInstance implements AppInstance
     private final BorderPane layout = new BorderPane();
     private final DockItemWithInput dock_item;
     private final DockItemRepresentation representation;
+    private FutureTask<Object> representation_init = new FutureTask<>(() -> {return null;});
     private Node toolbar;
 
     /** Property on the 'model_parent' of the JFX scene that holds this DisplayRuntimeInstance */
@@ -157,10 +160,9 @@ public static DisplayRuntimeInstance ofDisplayModel(final DisplayModel model)
                 representation.fireContextMenu(model, (int)event.getScreenX(), (int)event.getScreenY());
             }
         });
-
         layout.addEventFilter(KeyEvent.KEY_PRESSED, this::handleKeys);
-
         dock_item.addClosedNotification(this::onClosed);
+        representation_init.run();
     }
 
     @Override
@@ -186,6 +188,13 @@ DisplayNavigation getNavigation()
         return navigation;
     }
 
+    /* Clients waiting for the representation to be initialized can get() this,
+    * which will block until the representation is initialized.
+    */
+    public FutureTask<Object> getRepresentation_init() {
+        return representation_init;
+    }
+
     private Node createToolbar()
     {
         zoom_action = new ZoomAction(this);
@@ -499,6 +508,15 @@ public void onClosed()
         navigation.dispose();
     }
 
+    public void addListener(ToolkitListener listener){
+        this.getRepresentation().removeListener(listener);
+        this.getRepresentation().addListener(listener);
+    }
+
+    public void removeListener(ToolkitListener listener){
+        this.getRepresentation().removeListener(listener);
+    }
+
     @Override
     public Optional<Rectangle2D> getPositionAndSizeHint() {
         return Optional.ofNullable(active_model).flatMap(displayModel -> {