[Jason-developers] SF.net SVN: jason:[1777] trunk

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

Revision: 1777
          http://sourceforge.net/p/jason/svn/1777
Author:   jomifred
Date:     2014-05-25 15:26:46 +0000 (Sun, 25 May 2014)
Log Message:
-----------
improve java home detection for Config

Modified Paths:
--------------
    trunk/lib/c4jason.jar
    trunk/lib/cartago.jar
    trunk/lib/moise.jar
    trunk/src/jason/jeditplugin/Config.java
    trunk/src/jason/util/ConfigGUI.java

Modified: trunk/lib/c4jason.jar
===================================================================
(Binary files differ)

Modified: trunk/lib/cartago.jar
===================================================================
(Binary files differ)

Modified: trunk/lib/moise.jar
===================================================================
(Binary files differ)

Modified: trunk/src/jason/jeditplugin/Config.java
===================================================================
--- trunk/src/jason/jeditplugin/Config.java	2014-05-12 13:39:52 UTC (rev 1776)
+++ trunk/src/jason/jeditplugin/Config.java	2014-05-25 15:26:46 UTC (rev 1777)
@@ -224,7 +224,17 @@
             if (checkJavaHomePath(javaHome)) {
                 setJavaHome(javaHome);
             } else {
-                setJavaHome(File.separator);
+                String javaHomeUp = javaHome + File.separator + "..";
+                if (checkJavaHomePath(javaHomeUp)) {
+                    setJavaHome(javaHomeUp);
+                } else {                
+                    // try JRE
+                    if (checkJREHomePath(javaHome)) {
+                        setJavaHome(javaHome);
+                    } else {
+                        setJavaHome(File.separator);
+                    }
+                }
             }
         }
 
@@ -478,6 +488,21 @@
         return false;
     }
 
+    public static boolean checkJREHomePath(String javaHome) {
+        try {
+            if (!javaHome.endsWith(File.separator)) {
+                javaHome += File.separator;
+            }
+            File javac1 = new File(javaHome + "bin" + File.separatorChar + "java");
+            File javac2 = new File(javaHome + "bin" + File.separatorChar + "java.exe");
+            if (javac1.exists() || javac2.exists()) {
+                return true;
+            }
+        } catch (Exception e) {
+        }
+        return false;
+    }
+
     public static boolean checkAntLib(String al) {
         try {
             if (!al.endsWith(File.separator)) {

Modified: trunk/src/jason/util/ConfigGUI.java
===================================================================
--- trunk/src/jason/util/ConfigGUI.java	2014-05-12 13:39:52 UTC (rev 1776)
+++ trunk/src/jason/util/ConfigGUI.java	2014-05-25 15:26:46 UTC (rev 1777)
@@ -356,7 +356,7 @@
             userProperties.put(Config.JASON_JAR, jasonTF.getText().trim());
         }
 
-        if (Config.checkJavaHomePath(javaTF.getText())) {
+        if (Config.checkJavaHomePath(javaTF.getText()) || Config.checkJREHomePath(javaTF.getText())) {
             userProperties.setJavaHome(javaTF.getText().trim());
         }
 

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