Allow JVM args in JavaProcess

deltacv · Sep 25, 2024 · 5649923 · 5649923
1 parent 94d4a6f
commit 5649923
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 11 deletions.
diff --git a/EOCV-Sim/src/main/java/com/github/serivesmejia/eocvsim/gui/DialogFactory.java b/EOCV-Sim/src/main/java/com/github/serivesmejia/eocvsim/gui/DialogFactory.java
@@ -46,8 +46,6 @@
 
 public class DialogFactory {
 
-    private static Executor executor = Executors.newFixedThreadPool(4);
-
     private DialogFactory() { }
 
     public static void createYesOrNo(Component parent, String message, String submessage, IntConsumer result) {
@@ -165,7 +163,7 @@ public static FileAlreadyExists.UserChoice createFileAlreadyExistsDialog(EOCVSim
     }
 
     private static void invokeLater(Runnable runn) {
-        executor.execute(runn);
+        SwingUtilities.invokeLater(runn);
     }
 
     public static class FileChooser {

diff --git a/EOCV-Sim/src/main/java/com/github/serivesmejia/eocvsim/gui/Visualizer.java b/EOCV-Sim/src/main/java/com/github/serivesmejia/eocvsim/gui/Visualizer.java
@@ -266,7 +266,7 @@ public void mouseClicked(MouseEvent e) {
 
     public void joinInit() {
         while (!hasFinishedInitializing) {
-            Thread.yield();
+            Thread.onSpinWait();
         }
     }
 

diff --git a/EOCV-Sim/src/main/java/com/github/serivesmejia/eocvsim/util/JavaProcess.java b/EOCV-Sim/src/main/java/com/github/serivesmejia/eocvsim/util/JavaProcess.java
@@ -43,7 +43,7 @@ private JavaProcess() {}
      * @throws InterruptedException if the process is interrupted
      * @throws IOException if an I/O error occurs
      */
-    public static int execClasspath(Class klass, String classpath, String... args) throws InterruptedException, IOException {
+    public static int execClasspath(Class klass, String classpath, List<String> jvmArgs, List<String> args) throws InterruptedException, IOException {
         String javaHome = System.getProperty("java.home");
         String javaBin = javaHome +
                 File.separator + "bin" +
@@ -52,11 +52,14 @@ public static int execClasspath(Class klass, String classpath, String... args) t
 
         List<String> command = new LinkedList<>();
         command.add(javaBin);
+        if(jvmArgs != null) {
+            command.addAll(jvmArgs);
+        }
         command.add("-cp");
         command.add(classpath);
         command.add(className);
         if (args != null) {
-            command.addAll(List.of(args));
+            command.addAll(args);
         }
 
         ProcessBuilder builder = new ProcessBuilder(command);
@@ -67,8 +70,8 @@ public static int execClasspath(Class klass, String classpath, String... args) t
     }
 
 
-    public static int exec(Class klass, String... args) throws InterruptedException, IOException {
-        return execClasspath(klass, System.getProperty("java.class.path"), args);
+    public static int exec(Class klass, List<String> jvmArgs, List<String> args) throws InterruptedException, IOException {
+        return execClasspath(klass, System.getProperty("java.class.path"), jvmArgs, args);
     }
 
 }
diff --git a/EOCV-Sim/src/main/java/io/github/deltacv/eocvsim/gui/dialog/SuperAccessRequest.kt b/EOCV-Sim/src/main/java/io/github/deltacv/eocvsim/gui/dialog/SuperAccessRequest.kt
@@ -103,7 +103,7 @@ class SuperAccessRequest(sourceName: String, reason: String) {
         // Setup the frame
         frame.contentPane = panel
         frame.isAlwaysOnTop = true
-        frame.defaultCloseOperation = JDialog.DISPOSE_ON_CLOSE
+        frame.defaultCloseOperation = JDialog.HIDE_ON_CLOSE
         frame.isResizable = false
 
         frame.addWindowListener(object: WindowListener {

diff --git a/EOCV-Sim/src/main/java/io/github/deltacv/eocvsim/plugin/loader/PluginLoader.kt b/EOCV-Sim/src/main/java/io/github/deltacv/eocvsim/plugin/loader/PluginLoader.kt
@@ -121,7 +121,7 @@ class PluginLoader(val pluginFile: File, val eocvSim: EOCVSim) {
                 throw UnsupportedPluginException("Plugin request api version of v${parsedVersion}, EOCV-Sim is currently running at v${EOCVSim.PARSED_VERSION}")
         }
 
-        if(pluginToml.contains("super-access") && pluginToml.getBoolean("super-access", false)) {
+        if(pluginToml.getBoolean("super-access", false)) {
             requestSuperAccess(pluginToml.getString("super-access-reason", ""))
         }
 

diff --git a/EOCV-Sim/src/main/java/io/github/deltacv/eocvsim/plugin/loader/PluginManager.kt b/EOCV-Sim/src/main/java/io/github/deltacv/eocvsim/plugin/loader/PluginManager.kt
@@ -30,6 +30,7 @@ import com.github.serivesmejia.eocvsim.util.io.EOCVSimFolder
 import com.github.serivesmejia.eocvsim.util.loggerForThis
 import io.github.deltacv.eocvsim.gui.dialog.SuperAccessRequestMain
 import java.io.File
+import java.util.*
 
 /**
  * Manages the loading, enabling and disabling of plugins
@@ -145,6 +146,8 @@ class PluginManager(val eocvSim: EOCVSim) {
     fun requestSuperAccessFor(loader: PluginLoader, reason: String): Boolean {
         if(loader.hasSuperAccess) return true
 
+        logger.info("Requesting super access for ${loader.pluginName} v${loader.pluginVersion}")
+
         var warning = "<html>$GENERIC_SUPERACCESS_WARN"
         if(reason.trim().isNotBlank()) {
             warning += "<br><br><i>$reason</i>"
@@ -156,7 +159,7 @@ class PluginManager(val eocvSim: EOCVSim) {
 
         val name = "${loader.pluginName} by ${loader.pluginAuthor}".replace(" ", "-")
 
-        if(JavaProcess.exec(SuperAccessRequestMain::class.java, name, warning) == 171) {
+        if(JavaProcess.exec(SuperAccessRequestMain::class.java, null, Arrays.asList(name, warning)) == 171) {
             eocvSim.config.superAccessPluginHashes.add(loader.pluginHash)
             eocvSim.configManager.saveToFile()
             return true