Updating the names for cadoodle

CommonWealthRobotics · Jul 13, 2024 · 59270c1 · 59270c1
1 parent 68b2158
commit 59270c1
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 14 deletions.
diff --git a/...lthrobotics/LatestFromGithubLaunchUI.java → ...commonwealthrobotics/CadoodleUpdater.java b/...lthrobotics/LatestFromGithubLaunchUI.java → ...commonwealthrobotics/CadoodleUpdater.java
@@ -37,7 +37,7 @@
 import com.google.gson.GsonBuilder;
 import com.google.gson.reflect.TypeToken;
 
-public class LatestFromGithubLaunchUI {
+public class CadoodleUpdater {
 	public static String[] argsFromSystem;
 	//public static String[] args;
 	public static String project;

diff --git a/CaDoodleUpdater/src/main/java/com/commonwealthrobotics/JvmManager.java b/CaDoodleUpdater/src/main/java/com/commonwealthrobotics/JvmManager.java
@@ -94,31 +94,31 @@ public static String getCommandString(String project, String repo, String versio
 		} else {
 			System.out.println("Not extraction, VM exists " + dest.getAbsolutePath());
 		}
-		String cmd = bindir + name + "/bin/java" + (LatestFromGithubLaunchUI.isWin() ? ".exe" : "") + " ";
+		String cmd = bindir + name + "/bin/java" + (CadoodleUpdater.isWin() ? ".exe" : "") + " ";
 		for (String s : jvmargs) {
 			cmd += s + " ";
 		}
 		return cmd + " -jar ";
 	}
 
 	private static String discoverKey(String key) {
-		if (LatestFromGithubLaunchUI.isLin()) {
-			if (LatestFromGithubLaunchUI.isArm()) {
+		if (CadoodleUpdater.isLin()) {
+			if (CadoodleUpdater.isArm()) {
 				key = "Linux-aarch64";
 			} else {
 				key = "Linux-x64";
 			}
 		}
 
-		if (LatestFromGithubLaunchUI.isMac()) {
-			if (LatestFromGithubLaunchUI.isArm()) {
+		if (CadoodleUpdater.isMac()) {
+			if (CadoodleUpdater.isArm()) {
 				key = "Mac-aarch64";
 			} else {
 				key = "Mac-x64";
 			}
 		}
-		if (LatestFromGithubLaunchUI.isWin()) {
-			if (LatestFromGithubLaunchUI.isArm()) {
+		if (CadoodleUpdater.isWin()) {
+			if (CadoodleUpdater.isArm()) {
 				key = "UNKNOWN";
 			} else {
 				key = "Windows-x64";

diff --git a/CaDoodleUpdater/src/main/java/com/commonwealthrobotics/Main.java b/CaDoodleUpdater/src/main/java/com/commonwealthrobotics/Main.java
@@ -13,7 +13,7 @@ public class Main  extends Application {
 
 	@Override
 	public void start(Stage stage) throws Exception {
-		LatestFromGithubLaunchUI.stage=stage;
+		CadoodleUpdater.stage=stage;
 		Parent root = FXMLLoader.load(Main.class.getResource("ui.fxml"));
 
 		Scene scene = new Scene(root, 600, 523);
@@ -23,10 +23,10 @@ public void start(Stage stage) throws Exception {
 		stage.show();
 	}
 	public static void main(String [] args) {
-		LatestFromGithubLaunchUI.argsFromSystem=args;
-		LatestFromGithubLaunchUI.project="CommonWealthRobotics";
-		LatestFromGithubLaunchUI.repoName=		"CaDoodle-Application";
-		LatestFromGithubLaunchUI.jarName=		"CaDoodle-Application.jar ";
+		CadoodleUpdater.argsFromSystem=args;
+		CadoodleUpdater.project="CommonWealthRobotics";
+		CadoodleUpdater.repoName=		"CaDoodle-Application";
+		CadoodleUpdater.jarName=		"CaDoodle-Application.jar ";
 
 		launch(args);
 	}

diff --git a/CaDoodleUpdater/src/main/resources/com/commonwealthrobotics/ui.fxml b/CaDoodleUpdater/src/main/resources/com/commonwealthrobotics/ui.fxml
@@ -9,7 +9,7 @@
 <?import javafx.scene.layout.GridPane?>
 <?import javafx.scene.layout.RowConstraints?>
 
-<AnchorPane maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="523.0" prefWidth="600.0" xmlns="http://javafx.com/javafx/21" xmlns:fx="http://javafx.com/fxml/1" fx:controller="com.commonwealthrobotics.LatestFromGithubLaunchUI">
+<AnchorPane maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="523.0" prefWidth="600.0" xmlns="http://javafx.com/javafx/21" xmlns:fx="http://javafx.com/fxml/1" fx:controller="com.commonwealthrobotics.CadoodleUpdater">
    <children>
       <GridPane layoutX="184.0" layoutY="235.0" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
         <columnConstraints>