Improve CrashException handler, fix java encoding, updated junit dependencies, add private methods to javadoc, renamed Error to ErrorMessage

build.gradle

@@ -0,0 +1,11 @@
+subprojects {
+    apply plugin: 'java'
+    sourceCompatibility = JavaVersion.VERSION_17
+    targetCompatibility = JavaVersion.VERSION_17
+    javadoc {
+        options.memberLevel = JavadocMemberLevel.PRIVATE
+    }
+    compileJava {
+        // options.encoding = "UTF-8"
+    }
+}

client/build.gradle

@@ -21,10 +21,6 @@ javafx {
     modules = [ 'javafx.controls', 'javafx.graphics' ]
 }
 
-compileJava {
-    options.encoding = 'UTF-8'
-}
-
 application {
     // Define the main class for the application.
     mainClassName = 'fr.lnl.game.client.App'

client/src/main/java/fr/lnl/game/client/App.java

@@ -24,19 +24,28 @@ public class App extends Application {
     private static ViewManager viewManager;
 
     public static void main(String[] args) {
-        argsList = new LinkedList<>(Arrays.asList(args));
+         try {
-        argsList.removeIf(s -> s.startsWith("-D") || s.equals("fr.lnl.game.client.App")); // remove given parameters from gradle
+             argsList = new LinkedList<>(Arrays.asList(args));
-        Class<? extends AbstractView> clazz;
+             argsList.removeIf(s -> s.startsWith("-D") || s.equals("fr.lnl.game.client.App")); // remove given parameters from gradle
-        try {
+             Class<? extends AbstractView> clazz;
-            clazz = parseView();
+             try {
-        } catch (IllegalArgumentException e) {
+                 clazz = parseView();
-            throw new CrashException(e.getMessage(), e);
+             } catch (IllegalArgumentException e) {
-        }
+                 throw new CrashException(e.getMessage(), e);
-        if(clazz.equals(Terminal.class)) {
+             }
-            launchTerminal();
+             if(clazz.equals(Terminal.class)) {
-        } else {
+                 launchTerminal();
-            launch();
+             } else {
-        }
+                 launch();
+             }
+         } catch(CrashException e) {
+             System.err.println("Une erreur est survenue et l'application a été obligé de fermer");
+             System.err.println(e.getCause().toString());
+             for (StackTraceElement element : e.getStackTrace()) {
+                 System.err.println("   at " + element.toString());
+             }
+             System.exit(1);
+         }
     }
 
     public static void startGame(ViewLambda lambda) throws IllegalArgumentException, InvocationTargetException, NoSuchMethodException,

gradle.properties

@@ -1 +1,2 @@
-org.gradle.jvmargs='-Dfile.encoding=utf-8'
+# org.gradle.jvmargs='-Dfile.encoding=UTF-8'
+systemProp.file.encoding=UTF-8

server/build.gradle

@@ -8,8 +8,8 @@ plugins {
 }
 
 dependencies {
-    testImplementation 'org.junit.jupiter:junit-jupiter-api:5.3.1'
+    testImplementation 'org.junit.jupiter:junit-jupiter-api:5.8.2'
-    testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.3.1'
+    testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.8.2'
 }
 
 compileJava {

server/src/main/java/fr/lnl/game/server/utils/CrashException.java

@@ -4,7 +4,6 @@ public class CrashException extends RuntimeException {
 
     public CrashException(String message, Throwable cause) {
         super(message, cause);
-        System.exit(1);
     }
 
 

server/src/main/java/fr/lnl/game/server/utils/ErrorMessage.java

@@ -1,6 +1,6 @@
 package fr.lnl.game.server.utils;
 
-public class Error {
+public class ErrorMessage {
 
     public static final String Entry_Error_Message = "\033[0;31mErreur de saisie\033[0m : ";
 }

server/src/main/java/fr/lnl/game/server/utils/Maths.java

@@ -6,7 +6,7 @@ public class Maths {
 
     public static int testInteger(String entry, Scanner scanner, String error) {
         while (!isNumeric(entry)) {
-            System.out.println(Error.Entry_Error_Message + error);
+            System.out.println(ErrorMessage.Entry_Error_Message + error);
             entry = scanner.next();
         }
         return Integer.parseInt(entry);
@@ -14,7 +14,7 @@ public class Maths {
 
     public static float testFloat(String entry, Scanner scanner, String error) {
         while (!isFloat(entry)) {
-            System.out.println(Error.Entry_Error_Message + error);
+            System.out.println(ErrorMessage.Entry_Error_Message + error);
             entry = scanner.next();
         }
         return Integer.parseInt(entry);