fix missing AWT initialization when starting rest api

Author: Markus Fleischauer

sirius_cli/src/main/resources/sirius_frontend.build.properties

@@ -1,5 +1,5 @@
 #here you can provide properties that may be needed during build- AND during runtime and should not be editable by the user at runtime
-de.unijena.bioinf.siriusFrontend.version=6.2.1-SNAPSHOT
+de.unijena.bioinf.siriusFrontend.version=6.2.2-SNAPSHOT
 #
 de.unijena.bioinf.sirius.http.job.fingerprint.limit = 5000
 de.unijena.bioinf.sirius.http.job.canopus.limit = 5000

sirius_gui/src/main/java/de/unijena/bioinf/ms/frontend/splash/Splash.java

@@ -27,7 +27,7 @@ public class Splash extends JWindow implements JobProgressEventListener {
     private final JProgressBar progressBar;
     protected ProgressJJob<?> source;
 
-    public Splash(boolean indeterminate) {
+    public Splash(boolean indeterminate, boolean fake) {
         UIDefaults overrides = new UIDefaults();
 //        overrides.put("ProgressBar[Enabled].foregroundPainter", new MyPainter(new Color(155, 166, 219)));
         overrides.put("ProgressBar[Enabled].foregroundPainter", new MyPainter(Colors.SplashScreen.PROGRESS_BAR));
@@ -43,7 +43,11 @@ public Splash(boolean indeterminate) {
         this.setContentPane(contentPane);
         contentPane.setLayout(new BorderLayout());
         ImageIcon icon = new ImageIcon(MainFrame.class.getResource("/icons/sirius_splash_scribble.gif"));
-        this.setSize(icon.getIconWidth(), icon.getIconHeight());
+        // fake screener is used to init GUI AWT framwork so that JCEF has a canvas to connect to
+        if (fake)
+            this.setSize(1, 1);
+        else
+            this.setSize(icon.getIconWidth(), icon.getIconHeight());
         contentPane.add(new JLabel(icon, JLabel.CENTER), BorderLayout.CENTER);
         contentPane.add(progressBar, BorderLayout.SOUTH);
 

sirius_gui/src/main/java/de/unijena/bioinf/ms/gui/mainframe/MainFrame.java

@@ -206,10 +206,6 @@ public void decoradeMainFrame() {
         ));
 
         setLocationRelativeTo(null); //init mainframe
-        setVisible(true);
-        toFront();
-
-        Jobs.runEDTLater(this::checkAndInitSoftwareTour);
     }
 
     // region dragndrop
@@ -272,7 +268,7 @@ private void importDragAndDropFiles(InputFilesOptions files) {
     }
     //endregion
 
-    private void checkAndInitSoftwareTour() {
+    public void checkAndInitSoftwareTour() {
         SoftwareTourUtils.checkAndInitTour(this, SoftwareTourInfoStore.MainFrameTourName, SoftwareTourInfoStore.MainFrameTourKey, gui.getProperties());
     }
 }

sirius_rest_service/src/main/java/de/unijena/bioinf/ms/frontend/subtools/middleware/MiddlewareAppOptions.java

@@ -187,9 +187,6 @@ public void run() {
                         if (isStartGui())
                             guiService.createGuiInstance(startPs.getProjectId());
 
-                        if (splash != null)
-                            Jobs.runEDTLater(splash::dispose);
-
                         //increase priority of GUI thread.
                         Jobs.runEDTLater(() -> Thread.currentThread().setPriority(9));
                     } else {
@@ -199,6 +196,8 @@ public void run() {
                     throw new RuntimeException(e);
                 }
             }
+            if (splash != null)
+                Jobs.runEDTLater(splash::dispose);
         }
     }
 }

sirius_rest_service/src/main/java/de/unijena/bioinf/ms/middleware/SiriusMiddlewareApplication.java

@@ -36,6 +36,7 @@
 import de.unijena.bioinf.ms.frontend.subtools.middleware.MiddlewareAppOptions;
 import de.unijena.bioinf.ms.frontend.workflow.InstanceBufferFactory;
 import de.unijena.bioinf.ms.frontend.workflow.WorkflowBuilder;
+import de.unijena.bioinf.ms.gui.compute.jjobs.Jobs;
 import de.unijena.bioinf.ms.middleware.service.gui.GuiService;
 import de.unijena.bioinf.ms.middleware.service.projects.ProjectsProvider;
 import de.unijena.bioinf.ms.properties.PropertyManager;
@@ -183,7 +184,10 @@ public static void main(String[] args) {
                                 log.error("Error when initializing Splash.", e);
                             }
                         }
-                        splashScreen = new Splash(true);
+                        splashScreen = new Splash(true, false);
+                    } else {
+                        splashScreen = new Splash(true, true);
+                        Jobs.runEDTLater(splashScreen::dispose);
                     }
                 }
 

sirius_rest_service/src/main/java/de/unijena/bioinf/ms/middleware/controller/GuiController.java

@@ -21,10 +21,8 @@
 package de.unijena.bioinf.ms.middleware.controller;
 
 import de.unijena.bioinf.ms.middleware.model.gui.GuiInfo;
-import de.unijena.bioinf.ms.middleware.model.gui.GuiParameters;
 import de.unijena.bioinf.ms.middleware.service.gui.GuiService;
 import de.unijena.bioinf.ms.middleware.service.projects.ProjectsProvider;
-import io.swagger.v3.oas.annotations.Hidden;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnExpression;
@@ -65,15 +63,10 @@ public List<GuiInfo> getGuis() {
      * Open GUI instance on specified project-space and bring the GUI window to foreground.
      * @param projectId of project-space the GUI instance will connect to.
      */
-    //todo enabled advanced setting here due to compatibility with explorer.
-    // remove after sdk update
     @PostMapping(value = "/api/projects/{projectId}/gui", produces = MediaType.APPLICATION_JSON_VALUE)
     @ResponseStatus(HttpStatus.CREATED)
-    public void openGui(@PathVariable String projectId,
-                                @RequestBody(required = false) GuiParameters guiParameters,
-                                @RequestParam(required = false, defaultValue = "false") boolean readOnly
-    ) {
-        guiService.createGuiInstance(projectId, guiParameters);
+    public void openGui(@PathVariable String projectId) {
+        guiService.createGuiInstance(projectId, null);
     }
 
     /**

sirius_rest_service/src/main/java/de/unijena/bioinf/ms/middleware/service/gui/GuiServiceImpl.java

@@ -111,6 +111,11 @@ public void windowClosing(WindowEvent e) {
                 }
             });
         }
+        Jobs.runEDTLater(() -> {
+            gui.getMainFrame().setVisible(true);
+            gui.getMainFrame().toFront();
+            gui.getMainFrame().checkAndInitSoftwareTour();
+        });
     }
 
     @Override