diff --git a/src/main/java/ctbrec/ui/Launcher.java b/src/main/java/ctbrec/ui/Launcher.java index 70e1bd34..d42d769b 100644 --- a/src/main/java/ctbrec/ui/Launcher.java +++ b/src/main/java/ctbrec/ui/Launcher.java @@ -3,25 +3,20 @@ package ctbrec.ui; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import ctbrec.Java; + public class Launcher { private static final transient Logger LOG = LoggerFactory.getLogger(Launcher.class); public static void main(String[] args) { - String jvmName = System.getProperty("java.vm.name"); - if (jvmName.startsWith("OpenJDK")) { - // check for OpenJFX - try { - Class.forName("javafx.application.Application"); - CamrecApplication.main(args); - } catch (ClassNotFoundException e) { - LOG.error("You are running ctbrec with OpenJDK, but OpenJFX can not be found.\n" - + "Please either install OpenJFX or use the Oracle JRE, which you can download at\n" - + "http://www.oracle.com/technetwork/java/javase/downloads/index.html"); - System.exit(1); - } - } else { - CamrecApplication.main(args); + int javaVersion = Java.version(); + if(javaVersion == 0) { + LOG.warn("Unknown Java version {}. App might not work as expected", javaVersion); + } else if (javaVersion < 10) { + LOG.error("Your Java version ({}) is too old. Please update to Java 10 or newer", javaVersion); + System.exit(1); } + CamrecApplication.main(args); } }