Make UI work in headless mode

Update comment in core main
WPIRoboticsProjects · Nov 4, 2016 · 51a667d · 51a667d
1 parent eeb2024
commit 51a667d
Show file tree

Hide file tree

Showing 2 changed files with 39 additions and 33 deletions.
diff --git a/core/src/main/java/edu/wpi/grip/core/Main.java b/core/src/main/java/edu/wpi/grip/core/Main.java
@@ -91,10 +91,10 @@ public void start(String[] args) throws IOException, InterruptedException {
       }
     }
 
-    // This will thrown an exception if the port specified by the save file is already taken.
-    // Since we have to have the server running to handle remotely loading pipelines and uploading
-    // images, as well as potential HTTP publishing operations, this will cause the program
-    // to exit.
+    // This will throw an exception if the port specified by the save file or command line
+    // argument is already taken. Since we have to have the server running to handle remotely
+    // loading pipelines and uploading images, as well as potential HTTP publishing operations,
+    // this will cause the program to exit.
     gripServer.start();
 
     if (pipelineRunner.state() == Service.State.NEW) {

diff --git a/ui/src/main/java/edu/wpi/grip/ui/Main.java b/ui/src/main/java/edu/wpi/grip/ui/Main.java
@@ -100,7 +100,6 @@ public void init() throws IOException {
 
     notifyPreloader(new Preloader.ProgressNotification(0.45));
     server.addHandler(pipelineSwitcher);
-    server.start();
     notifyPreloader(new Preloader.ProgressNotification(0.6));
 
     pipelineRunner.startAsync();
@@ -109,6 +108,41 @@ public void init() throws IOException {
 
   @Override
   public void start(Stage stage) throws IOException {
+    // If there was a file specified on the command line, open it immediately
+    if (parsedArgs.hasOption(CoreCommandLineHelper.FILE_OPTION)) {
+      String file = parsedArgs.getOptionValue(CoreCommandLineHelper.FILE_OPTION);
+      try {
+        project.open(new File(file));
+      } catch (IOException e) {
+        logger.log(Level.SEVERE, "Error loading file: " + file);
+        throw e;
+      }
+    }
+
+    // Set the port AFTER loading the project to override the setting in the file
+    if (parsedArgs.hasOption(CoreCommandLineHelper.PORT_OPTION)) {
+      try {
+        int port = Integer.parseInt(parsedArgs.getOptionValue(CoreCommandLineHelper.PORT_OPTION));
+        if (port < 1024 || port > 65535) {
+          logger.warning("Not a valid port: " + port);
+        } else {
+          // Valid port; set it (Note: this doesn't check to see if the port is available)
+          logger.info("Running server on port " + port);
+          server.setPort(port);
+        }
+      } catch (NumberFormatException e) {
+        logger.warning(
+            "Not a valid port: " + parsedArgs.getOptionValue(CoreCommandLineHelper.PORT_OPTION));
+      }
+    }
+
+    // This will throw an exception if the port specified by the save file or command line
+    // argument is already taken. Since we have to have the server running to handle remotely
+    // loading pipelines and uploading images, as well as potential HTTP publishing operations,
+    // this will cause the program to exit.
+    server.start();
+
+    // Load UI elements if we're not in headless mode
     if (!headless) {
       root = FXMLLoader.load(Main.class.getResource("MainWindow.fxml"), null, null,
           injector::getInstance);
@@ -118,34 +152,6 @@ public void start(Stage stage) throws IOException {
       cvOperations.addOperations();
       notifyPreloader(new Preloader.ProgressNotification(0.9));
 
-      // If there was a file specified on the command line, open it immediately
-      if (parsedArgs.hasOption(CoreCommandLineHelper.FILE_OPTION)) {
-        String file = parsedArgs.getOptionValue(CoreCommandLineHelper.FILE_OPTION);
-        try {
-          project.open(new File(file));
-        } catch (IOException e) {
-          logger.log(Level.SEVERE, "Error loading file: " + file);
-          throw e;
-        }
-      }
-
-      // Set the port AFTER loading the project to override the setting in the file
-      if (parsedArgs.hasOption(CoreCommandLineHelper.PORT_OPTION)) {
-        try {
-          int port = Integer.parseInt(parsedArgs.getOptionValue(CoreCommandLineHelper.PORT_OPTION));
-          if (port < 1024 || port > 65535) {
-            logger.warning("Not a valid port: " + port);
-          } else {
-            // Valid port; set it (Note: this doesn't check to see if the port is available)
-            logger.info("Running server on port " + port);
-            server.setPort(port);
-          }
-        } catch (NumberFormatException e) {
-          logger.warning(
-              "Not a valid port: " + parsedArgs.getOptionValue(CoreCommandLineHelper.PORT_OPTION));
-        }
-      }
-
       project.addIsSaveDirtyConsumer(newValue -> {
         if (newValue) {
           Platform.runLater(() -> stage.setTitle(MAIN_TITLE + " | Edited"));