[Jason-developers] SF.net SVN: jason:[1778] trunk/src/jason/jeditplugin/Config.java

[<jom...@us...>]

Revision: 1778
          http://sourceforge.net/p/jason/svn/1778
Author:   jomifred
Date:     2014-05-25 15:41:39 +0000 (Sun, 25 May 2014)
Log Message:
-----------
improve Config

Modified Paths:
--------------
    trunk/src/jason/jeditplugin/Config.java

Modified: trunk/src/jason/jeditplugin/Config.java
===================================================================
--- trunk/src/jason/jeditplugin/Config.java	2014-05-25 15:26:46 UTC (rev 1777)
+++ trunk/src/jason/jeditplugin/Config.java	2014-05-25 15:41:39 UTC (rev 1778)
@@ -217,22 +217,27 @@
         tryToFixJarFileConf(JADE_JAR,   "jade.jar",  2000000);
         tryToFixJarFileConf(MOISE_JAR,  "moise.jar",  300000);
         tryToFixJarFileConf(JACAMO_JAR, "jacamo.jar",   5000);
-
+        
         // fix java home
         if (get(JAVA_HOME) == null || !checkJavaHomePath(getProperty(JAVA_HOME))) {
             String javaHome = System.getProperty("java.home");
             if (checkJavaHomePath(javaHome)) {
                 setJavaHome(javaHome);
             } else {
-                String javaHomeUp = javaHome + File.separator + "..";
-                if (checkJavaHomePath(javaHomeUp)) {
-                    setJavaHome(javaHomeUp);
-                } else {                
-                    // try JRE
-                    if (checkJREHomePath(javaHome)) {
-                        setJavaHome(javaHome);
-                    } else {
-                        setJavaHome(File.separator);
+                String javaEnvHome = System.getenv("JAVA_HOME");
+                if (javaEnvHome != null && checkJavaHomePath(javaEnvHome)) {
+                    setJavaHome(javaEnvHome);
+                } else {
+                    String javaHomeUp = javaHome + File.separator + "..";
+                    if (checkJavaHomePath(javaHomeUp)) {
+                        setJavaHome(javaHomeUp);
+                    } else {                
+                        // try JRE
+                        if (checkJREHomePath(javaHome)) {
+                            setJavaHome(javaHome);
+                        } else {
+                            setJavaHome(File.separator);
+                        }
                     }
                 }
             }

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.