loader/NeptusMain: Cleanup and small tweak for loader.

Author: paulosousadias

src/java/pt/lsts/neptus/loader/LaunchInitializerHolder.java

@@ -0,0 +1,59 @@
+/*
+ * Copyright (c) 2004-2025 Universidade do Porto - Faculdade de Engenharia
+ * Laboratório de Sistemas e Tecnologia Subaquática (LSTS)
+ * All rights reserved.
+ * Rua Dr. Roberto Frias s/n, sala I203, 4200-465 Porto, Portugal
+ *
+ * This file is part of Neptus, Command and Control Framework.
+ *
+ * Commercial Licence Usage
+ * Licencees holding valid commercial Neptus licences may use this file
+ * in accordance with the commercial licence agreement provided with the
+ * Software or, alternatively, in accordance with the terms contained in a
+ * written agreement between you and Universidade do Porto. For licensing
+ * terms, conditions, and further information contact lsts@fe.up.pt.
+ *
+ * Modified European Union Public Licence - EUPL v.1.1 Usage
+ * Alternatively, this file may be used under the terms of the Modified EUPL,
+ * Version 1.1 only (the "Licence"), appearing in the file LICENCE.md
+ * included in the packaging of this file. You may not use this work
+ * except in compliance with the Licence. Unless required by applicable
+ * law or agreed to in writing, software distributed under the Licence is
+ * distributed on an "AS IS" basis, WITHOUT WARRANTIES OR CONDITIONS OF
+ * ANY KIND, either express or implied. See the Licence for the specific
+ * language governing permissions and limitations at
+ * https://github.com/LSTS/neptus/blob/develop/LICENSE.md
+ * and http://ec.europa.eu/idabc/eupl.html.
+ *
+ * For more information please see <http://lsts.fe.up.pt/neptus>.
+ *
+ * Author: Paulo Dias
+ * 2025/Sep/25
+ */
+package pt.lsts.neptus.loader;
+
+import pt.lsts.neptus.console.ConsoleLayout;
+import pt.lsts.neptus.gui.Loader;
+import pt.lsts.neptus.loader.autonaut.AutonautConsole;
+
+import java.util.LinkedHashMap;
+import java.util.Objects;
+import java.util.function.Function;
+
+public class LaunchInitializerHolder {
+    public final LinkedHashMap<String, String> appNames;
+    public final LinkedHashMap<String, Class<?>> fileHandlers;
+
+    public LaunchInitializerHolder(LinkedHashMap<String, String> appNames, LinkedHashMap<String, Class<?>> fileHandlers) {
+        this.appNames = appNames;
+        this.fileHandlers = fileHandlers;
+    }
+
+    public void registerLauncher(String key, String name, Runnable launcher) {
+        NeptusMain.registerLauncher("au", "Autonaut Console", launcher);
+    }
+
+    public void setDefaultApp(String key) {
+        NeptusMain.defaultApp = "au";
+    }
+}

src/java/pt/lsts/neptus/loader/NeptusMain.java

@@ -45,7 +45,9 @@
 import java.util.ArrayList;
 import java.util.LinkedHashMap;
 import java.util.List;
+import java.util.Map;
 import java.util.Objects;
+import java.util.function.Function;
 
 import javax.swing.ImageIcon;
 import javax.swing.JFrame;
@@ -80,33 +82,43 @@
 public class NeptusMain {
 
     private static final LinkedHashMap<String, String> appNames = new LinkedHashMap<>();
+    private static final Map<String, Runnable> appLauncher = new LinkedHashMap<>();
     private static final LinkedHashMap<String, Class<?>> fileHandlers = new LinkedHashMap<>();
     private static final List<Window> openAppWindows = new ArrayList<>();
     private static Loader loader;
 
+    static String defaultApp = "auv";
+
     private static void init() {
         GeneralPreferences.initialize();
 
         // appNames.put("ws", I18n.text("Workspace"));
-        appNames.put("auv", I18n.text("LAUV Console"));
-        appNames.put("mra", I18n.text("Mission Review & Analysis"));
-        appNames.put("la", I18n.text("LAUV SE Console"));
-        appNames.put("uav", I18n.text("UAV Console"));
-        appNames.put("cl", I18n.text("Empty Console"));
+        appNames.putIfAbsent("auv", I18n.text("LAUV Console"));
+        appNames.putIfAbsent("mra", I18n.text("Mission Review & Analysis"));
+        appNames.putIfAbsent("la", I18n.text("LAUV SE Console"));
+        appNames.putIfAbsent("uav", I18n.text("UAV Console"));
+        appNames.putIfAbsent("cl", I18n.text("Empty Console"));
 
         // fileHandlers.put(FileUtil.FILE_TYPE_MISSION, Workspace.class);
         // fileHandlers.put(FileUtil.FILE_TYPE_MISSION_COMPRESSED, Workspace.class);
-        fileHandlers.put(FileUtil.FILE_TYPE_CONFIG, EditorLauncher.class);
-        fileHandlers.put(FileUtil.FILE_TYPE_CONSOLE, ConsoleParse.class);
+        fileHandlers.putIfAbsent(FileUtil.FILE_TYPE_CONFIG, EditorLauncher.class);
+        fileHandlers.putIfAbsent(FileUtil.FILE_TYPE_CONSOLE, ConsoleParse.class);
         // fileHandlers.put(FileUtil.FILE_TYPE_VEHICLE, Workspace.class);
-        fileHandlers.put(FileUtil.FILE_TYPE_CHECKLIST, Workspace.class);
-        fileHandlers.put(FileUtil.FILE_TYPE_INI, EditorLauncher.class);
-        fileHandlers.put(FileUtil.FILE_TYPE_RMF, RMFEditor.class);
-        fileHandlers.put(FileUtil.FILE_TYPE_XML, EditorLauncher.class);
-
-        fileHandlers.put(FileUtil.FILE_TYPE_LSF, NeptusMRA.class);
-        fileHandlers.put(FileUtil.FILE_TYPE_LSF_COMPRESSED, NeptusMRA.class);
-        fileHandlers.put(FileUtil.FILE_TYPE_LSF_COMPRESSED_BZIP2, NeptusMRA.class);
+        fileHandlers.putIfAbsent(FileUtil.FILE_TYPE_CHECKLIST, Workspace.class);
+        fileHandlers.putIfAbsent(FileUtil.FILE_TYPE_INI, EditorLauncher.class);
+        fileHandlers.putIfAbsent(FileUtil.FILE_TYPE_RMF, RMFEditor.class);
+        fileHandlers.putIfAbsent(FileUtil.FILE_TYPE_XML, EditorLauncher.class);
+
+        fileHandlers.putIfAbsent(FileUtil.FILE_TYPE_LSF, NeptusMRA.class);
+        fileHandlers.putIfAbsent(FileUtil.FILE_TYPE_LSF_COMPRESSED, NeptusMRA.class);
+        fileHandlers.putIfAbsent(FileUtil.FILE_TYPE_LSF_COMPRESSED_BZIP2, NeptusMRA.class);
+    }
+
+    static void registerLauncher(String key, String name, Runnable launcher) {
+        appNames.put(key, name);
+        if (launcher != null) {
+            appLauncher.put(key, launcher);
+        }
     }
 
     /**
@@ -120,11 +132,15 @@ public static void launch(String[] appargs) {
         launch(new Loader(), appargs);
     }
 
+    public static void launch(Loader loader, String[] appargs) {
+        launch(loader, appargs, null);
+    }
+
     /**
      * @param loader A {@link Loader} to use on the opening of the program
      * @param appargs The commandline arguments for the program
      */
-    public static void launch(Loader loader, String[] appargs) {
+    public static void launch(Loader loader, String[] appargs, Function<LaunchInitializerHolder, Boolean> afterInit) {
         ConfigFetch.initialize(); // Don't touch this, leave it as it his
         // benchmark
         long start = System.currentTimeMillis();
@@ -133,13 +149,22 @@ public static void launch(Loader loader, String[] appargs) {
         if (appNames.isEmpty()) {
             init();
         }
-        
+
         String app = appargs[0];
         loader.start();
         ConfigFetch.setSuperParentFrameForced(loader);
 
         loadPreRequirementsDataExceptConfigFetch(loader, true);
 
+        if (afterInit != null) {
+            LaunchInitializerHolder launchInitializerHolder = new LaunchInitializerHolder(appNames, fileHandlers);
+            Boolean ret = afterInit.apply(launchInitializerHolder);
+            if (ret != null && !ret) {
+                loader.end();
+                return;
+            }
+        }
+
         // When loading one can type the application to start
         String typ = loader.getTypedString();
         if (!typ.equalsIgnoreCase("")) {
@@ -161,7 +186,7 @@ JOptionPane.QUESTION_MESSAGE, new ImageIcon(ImageUtils.getImage("images/neptus-i
             if (appT != null)
                 app = typ;
             else
-                app = "auv";
+                app = defaultApp;
         }
         else if (app.equalsIgnoreCase("-f") && appargs.length >= 2) {
             loader.setText(I18n.text("Opening file..."));
@@ -224,6 +249,18 @@ else if (app.equalsIgnoreCase("uav")) {
             appC.setVisible(true);
             wrapMainApplicationWindowWithCloseActionWindowAdapter(appC);
         }
+        else if (appLauncher.containsKey(app)) {
+            ConfigFetch.initialize();
+            try {
+                appLauncher.get(app).run();
+            }
+            catch (Exception e) {
+                NeptusLog.pub().error(I18n.textf("Error launching application %app", app), e);
+                GuiUtils.errorMessage(loader, I18n.text("Error launching application"),
+                        I18n.textf("An error occurred while launching the application %app: %error", app,
+                                e.getMessage()));
+            }
+        }
         // File loading
         else {
             ConfigFetch.initialize();