Fixed some bot selection issues

Author: EmilRiedeman

game/src/spaghetti/BotProgram.java

@@ -13,9 +13,9 @@ public class BotProgram extends BoardController {
     protected final File logFile;
     protected Process process;
     protected boolean side;
-    public final String cmd;
+    public final String[] cmd;
 
-    public BotProgram(String name, String command, Board board, File logFile) {
+    public BotProgram(String name, String[] command, Board board, File logFile) {
         super(name, board);
         board.addBoardListener(this);
 

swing/src/spaghetti/gui/swing/PlayerSelection.java

@@ -251,25 +251,32 @@ public BoardController create(GraphicalBoard gb, Board board) {
                 }
                 break;
             case 2:
-                String cmd = null;
+                String[] cmd = null;
                 if (execRadio.isSelected()) {
                     if (fileExec != null && fileExec.exists())
-                        cmd = Utils.getPathWithoutSpaces(fileExec.getAbsolutePath());
+                        cmd = new String[]{fileExec.getAbsolutePath()};
                 } else if (javaRadio.isSelected()) {
                     if (fileJava != null && fileJava.exists()) {
-                        String javaExe = "java";
                         if (Utils.getFileExtension(fileJava).equals("class")) {
                             String dir = fileJava.getParent();
-                            cmd = javaExe + " -classpath " + Utils.getPathWithoutSpaces(dir) +
-                                    " " + fileJava.getName().replaceFirst("[.][^.]+$", "");
+                            cmd = new String[]{
+                                    "java",
+                                    "-classpath",
+                                    dir,
+                                    fileJava.getName().replaceFirst("[.][^.]+$", "")
+                            };
                         }
                         else if (Utils.getFileExtension(fileJava).equals("jar")) {
                             String file = fileJava.getAbsolutePath();
-                            cmd = javaExe + " -jar " + Utils.getPathWithoutSpaces(file) + "";
+                            cmd = new String[] {
+                                    "java",
+                                    "-jar",
+                                    file
+                            };
                         }
                     }
                 } else {
-                    cmd = otherField.getText();
+                    cmd = Utils.splitBackslash(otherField.getText(), ' ');
                 }
                 if (cmd != null) {
                     r = new BotProgram(name, cmd, board, logCheckBox.isSelected()? new File(logDirChooser.getSelectedFile(), logTextField.getText()): null);

utils/src/spaghetti/utils/Utils.java

@@ -1,6 +1,8 @@
 package spaghetti.utils;
 
 import java.io.File;
+import java.util.ArrayList;
+import java.util.List;
 
 public final class Utils {
     public static String getFileExtension(File f) {
@@ -12,11 +14,25 @@ public static String getFileExtension(File f) {
         return extension.toLowerCase();
     }
 
-    public static String getPathWithoutSpaces(String dir) {
-        if (System.getProperty("os.name").startsWith("Windows"))
-            return '"' + dir + '"';
-        else
-            return dir.replaceAll(" ", "\\\\ ");
+    public static String[] splitBackslash(String string, char regex) {
+        List<String> arr = new ArrayList<>();
+        StringBuilder sub = new StringBuilder();
+        boolean prevBackslash = false;
+        for (int i = 0; i < string.length(); ++i) {
+            char c = string.charAt(i);
+            if (c == regex && !prevBackslash) {
+                arr.add(sub.toString());
+                sub = new StringBuilder();
+            } else {
+                if (prevBackslash || c != '\\') {
+                    if (c != regex && c != '\\' && prevBackslash) sub.append('\\');
+                    sub.append(c);
+                }
+            }
+            prevBackslash = c == '\\' && !prevBackslash;
+        }
+        arr.add(sub.toString());
+        return arr.toArray(new String[0]);
     }
 
     public static <T> Pair<T, T> swap(T a, T b) {