From 968738243cdf38789fe826e778c03611d2080876 Mon Sep 17 00:00:00 2001 From: JKetelaar Date: Sun, 10 Jan 2016 20:31:06 +0100 Subject: [PATCH] [BUGFIX] Solved an issue that causes JavaFX not to be parsed correctly --- deploy/deploy.bat | 1 + pom.xml | 2 +- .../org/parabot/environment/Environment.java | 16 +++++++++------- 3 files changed, 11 insertions(+), 8 deletions(-) diff --git a/deploy/deploy.bat b/deploy/deploy.bat index 94fc6d1..0ed46fe 100644 --- a/deploy/deploy.bat +++ b/deploy/deploy.bat @@ -1,3 +1,4 @@ mvn install:install-file -DgroupId=${project.groupId} -DartifactId=${project.artifactId} -Dversion=${project.version} -Dpackaging=jar -Dfile=../target/${project.build.finalName}-fat.jar -DlocalRepositoryPath=../../Maven-Repository :: mvn install:install-file -DgroupId=org.parabot -DartifactId=client -Dversion=2.4.1.1 -Dpackaging=jar -Dfile=../target/Parabot-V2.4.1.1-jar-with-dependencies.jar -DlocalRepositoryPath=../../Maven-Repository +:: mvn install:install-file -DgroupId=org.parabot -DartifactId=client -Dversion=2.4.3 -Dpackaging=jar -Dfile=../target/Parabot-V2.4.3-jar-with-dependencies.jar -DlocalRepositoryPath=../../Maven-Repository diff --git a/pom.xml b/pom.xml index 7640c2e..c388333 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ org.parabot client - 2.4.1.1 + 2.4.3 jar diff --git a/src/main/java/org/parabot/environment/Environment.java b/src/main/java/org/parabot/environment/Environment.java index c8c8759..7964123 100644 --- a/src/main/java/org/parabot/environment/Environment.java +++ b/src/main/java/org/parabot/environment/Environment.java @@ -33,14 +33,16 @@ public class Environment { libs.add(new Naga()); for(Library lib : libs) { - if(!lib.hasJar() && lib.requiresJar()) { - Core.verbose("Downloading " + lib.getLibraryName() + "..."); - VerboseLoader.setState("Downloading " + lib.getLibraryName() + "..."); - WebUtil.downloadFile(lib.getDownloadLink(), lib.getJarFile(), VerboseLoader.get()); - Core.verbose("Downloaded " + lib.getLibraryName() + "."); + if (lib.requiresJar()) { + if (!lib.hasJar()) { + Core.verbose("Downloading " + lib.getLibraryName() + "..."); + VerboseLoader.setState("Downloading " + lib.getLibraryName() + "..."); + WebUtil.downloadFile(lib.getDownloadLink(), lib.getJarFile(), VerboseLoader.get()); + Core.verbose("Downloaded " + lib.getLibraryName() + "."); + } + Core.verbose("Initializing " + lib.getLibraryName()); + lib.init(); } - Core.verbose("Initializing " + lib.getLibraryName()); - lib.init(); } Core.verbose("Loading server: " + desc.toString() + "...");