diff --git a/src/main/java/org/parabot/Landing.java b/src/main/java/org/parabot/Landing.java index 68b9012..de1cd97 100644 --- a/src/main/java/org/parabot/Landing.java +++ b/src/main/java/org/parabot/Landing.java @@ -30,7 +30,6 @@ public final class Landing { private static String username; private static String password; public static void main(String... args) throws IOException { - System.out.println(JavaUtil.JAVA_VERSION); Core.initiateBugsnagInstance(); parseArgs(args); diff --git a/src/main/java/org/parabot/core/lib/Library.java b/src/main/java/org/parabot/core/lib/Library.java index 73e4073..9ac49e5 100644 --- a/src/main/java/org/parabot/core/lib/Library.java +++ b/src/main/java/org/parabot/core/lib/Library.java @@ -41,6 +41,12 @@ public abstract class Library { * @return url */ public abstract URL getDownloadLink(); + + /** + * Defines if the system requires a jar + * @return boolean + */ + public abstract boolean requiresJar(); /** diff --git a/src/main/java/org/parabot/core/lib/javafx/JavaFX.java b/src/main/java/org/parabot/core/lib/javafx/JavaFX.java index 502558a..5684e45 100644 --- a/src/main/java/org/parabot/core/lib/javafx/JavaFX.java +++ b/src/main/java/org/parabot/core/lib/javafx/JavaFX.java @@ -7,6 +7,7 @@ import org.parabot.core.Core; import org.parabot.core.Directories; import org.parabot.core.build.BuildPath; import org.parabot.core.lib.Library; +import org.parabot.environment.api.utils.JavaUtil; /** * @@ -59,6 +60,11 @@ public class JavaFX extends Library { return null; } + @Override + public boolean requiresJar() { + return JavaUtil.JAVA_VERSION <= 1.7; + } + @Override public String getLibraryName() { return "JavaFX"; diff --git a/src/main/java/org/parabot/core/lib/naga/Naga.java b/src/main/java/org/parabot/core/lib/naga/Naga.java index e1645d4..9154e7e 100644 --- a/src/main/java/org/parabot/core/lib/naga/Naga.java +++ b/src/main/java/org/parabot/core/lib/naga/Naga.java @@ -56,6 +56,11 @@ public class Naga extends Library { return null; } + @Override + public boolean requiresJar() { + return true; + } + @Override public String getLibraryName() { return "Naga"; diff --git a/src/main/java/org/parabot/environment/Environment.java b/src/main/java/org/parabot/environment/Environment.java index adef982..66041bd 100644 --- a/src/main/java/org/parabot/environment/Environment.java +++ b/src/main/java/org/parabot/environment/Environment.java @@ -33,7 +33,7 @@ public class Environment { libs.add(new Naga()); for(Library lib : libs) { - if(!lib.hasJar()) { + if(!lib.hasJar() && lib.requiresJar()) { Core.verbose("Downloading " + lib.getLibraryName() + "..."); VerboseLoader.setState("Downloading " + lib.getLibraryName() + "..."); WebUtil.downloadFile(lib.getDownloadLink(), lib.getJarFile(), VerboseLoader.get());