1 files changed, 42 insertions, 33 deletions

diff --git a/logic/JavaUtils.cpp b/logic/JavaUtils.cpp
index 61d0231a..e1b3bc64 100644
--- a/logic/JavaUtils.cpp
+++ b/logic/JavaUtils.cpp
@@ -26,11 +26,24 @@
 #include "JavaUtils.h"
 #include "logger/QsLog.h"
 #include "gui/dialogs/VersionSelectDialog.h"
+#include "JavaCheckerJob.h"
+#include "lists/JavaVersionList.h"
 
 JavaUtils::JavaUtils()
 {
 }
 
+JavaVersionPtr JavaUtils::MakeJavaPtr(QString path, QString id, QString arch)
+{
+	JavaVersionPtr javaVersion(new JavaVersion());
+
+	javaVersion->id = id;
+	javaVersion->arch = arch;
+	javaVersion->path = path;
+
+	return javaVersion;
+}
+
 JavaVersionPtr JavaUtils::GetDefaultJava()
 {
 	JavaVersionPtr javaVersion(new JavaVersion());
@@ -38,7 +51,6 @@ JavaVersionPtr JavaUtils::GetDefaultJava()
 	javaVersion->id = "java";
 	javaVersion->arch = "unknown";
 	javaVersion->path = "java";
-	javaVersion->recommended = false;
 
 	return javaVersion;
 }
@@ -112,7 +124,6 @@ QList<JavaVersionPtr> JavaUtils::FindJavaFromRegistryKey(DWORD keyType, QString
 							javaVersion->arch = archType;
 							javaVersion->path =
 								QDir(PathCombine(value, "bin")).absoluteFilePath("java.exe");
-							javaVersion->recommended = (recommended == subKeyName);
 							javas.append(javaVersion);
 						}
 
@@ -128,9 +139,9 @@ QList<JavaVersionPtr> JavaUtils::FindJavaFromRegistryKey(DWORD keyType, QString
 	return javas;
 }
 
-QList<JavaVersionPtr> JavaUtils::FindJavaPaths()
+QList<QString> JavaUtils::FindJavaPaths()
 {
-	QList<JavaVersionPtr> javas;
+	QList<JavaVersionPtr> java_candidates;
 
 	QList<JavaVersionPtr> JRE64s = this->FindJavaFromRegistryKey(
 		KEY_WOW64_64KEY, "SOFTWARE\\JavaSoft\\Java Runtime Environment");
@@ -141,58 +152,56 @@ QList<JavaVersionPtr> JavaUtils::FindJavaPaths()
 	QList<JavaVersionPtr> JDK32s = this->FindJavaFromRegistryKey(
 		KEY_WOW64_32KEY, "SOFTWARE\\JavaSoft\\Java Development Kit");
 
-	javas.append(JRE64s);
-	javas.append(JDK64s);
-	javas.append(JRE32s);
-	javas.append(JDK32s);
-
-	if (javas.size() <= 0)
-	{
-		QLOG_WARN() << "Failed to find Java in the Windows registry - defaulting to \"java\"";
-		javas.append(this->GetDefaultJava());
-		return javas;
-	}
-
-	QLOG_INFO() << "Found the following Java installations (64 -> 32, JRE -> JDK): ";
-
-	for (auto &java : javas)
+	java_candidates.append(JRE64s);
+	java_candidates.append(MakeJavaPtr("C:/Program Files/Java/jre7/bin/java.exe"));
+	java_candidates.append(MakeJavaPtr("C:/Program Files/Java/jre6/bin/java.exe"));
+	java_candidates.append(JDK64s);
+	java_candidates.append(JRE32s);
+	java_candidates.append(MakeJavaPtr("C:/Program Files (x86)/Java/jre7/bin/java.exe"));
+	java_candidates.append(MakeJavaPtr("C:/Program Files (x86)/Java/jre6/bin/java.exe"));
+	java_candidates.append(JDK32s);
+	java_candidates.append(MakeJavaPtr(this->GetDefaultJava()->path));
+
+	QList<QString> candidates;
+	for(JavaVersionPtr java_candidate : java_candidates)
 	{
-		QString sRec;
-		if (java->recommended)
-			sRec = "(Recommended)";
-		QLOG_INFO() << java->id << java->arch << " at " << java->path << sRec;
+		if(!candidates.contains(java_candidate->path))
+		{
+			candidates.append(java_candidate->path);
+		}
 	}
 
-	return javas;
+	return candidates;
 }
+
 #elif OSX
-QList<JavaVersionPtr> JavaUtils::FindJavaPaths()
+QList<QString> JavaUtils::FindJavaPaths()
 {
 	QLOG_INFO() << "OS X Java detection incomplete - defaulting to \"java\"";
 
-	QList<JavaVersionPtr> javas;
-	javas.append(this->GetDefaultJava());
+	QList<QString> javas;
+	javas.append(this->GetDefaultJava()->path);
 
 	return javas;
 }
 
 #elif LINUX
-QList<JavaVersionPtr> JavaUtils::FindJavaPaths()
+QList<QString> JavaUtils::FindJavaPaths()
 {
 	QLOG_INFO() << "Linux Java detection incomplete - defaulting to \"java\"";
 
-	QList<JavaVersionPtr> javas;
-	javas.append(this->GetDefaultJava());
+	QList<QString> javas;
+	javas.append(this->GetDefaultJava()->path);
 
 	return javas;
 }
 #else
-QList<JavaVersionPtr> JavaUtils::FindJavaPaths()
+QList<QString> JavaUtils::FindJavaPaths()
 {
 	QLOG_INFO() << "Unknown operating system build - defaulting to \"java\"";
 
-	QList<JavaVersionPtr> javas;
-	javas.append(this->GetDefaultJava());
+	QList<QString> javas;
+	javas.append(this->GetDefaultJava()->path);
 
 	return javas;
 }