Huge Java detection refactor, version dialogs on first run (no JavaPath set) and "auto detect" button

4 files changed, 341 insertions, 32 deletions

diff --git a/logic/JavaUtils.cpp b/logic/JavaUtils.cpp
index 5cec35b6..c0630545 100644
--- a/logic/JavaUtils.cpp
+++ b/logic/JavaUtils.cpp
@@ -15,29 +15,37 @@
 
 #include "JavaUtils.h"
 #include "pathutils.h"
+#include "MultiMC.h"
 
 #include <QStringList>
 #include <QString>
 #include <QDir>
+#include <QMessageBox>
 #include <logger/QsLog.h>
+#include <gui/versionselectdialog.h>
+#include <setting.h>
 
 JavaUtils::JavaUtils()
 {
 
 }
 
-std::vector<java_install> JavaUtils::GetDefaultJava()
+JavaVersionPtr JavaUtils::GetDefaultJava()
 {
-	std::vector<java_install> javas;
-	javas.push_back(std::make_tuple("java", "unknown", "java", false));
+	JavaVersionPtr javaVersion(new JavaVersion());
 
-	return javas;
+	javaVersion->id = "java";
+	javaVersion->arch = "unknown";
+	javaVersion->path = "java";
+	javaVersion->recommended = false;
+
+	return javaVersion;
 }
 
 #if WINDOWS
-std::vector<java_install> JavaUtils::FindJavaFromRegistryKey(DWORD keyType, QString keyName)
+QList<JavaVersionPtr> JavaUtils::FindJavaFromRegistryKey(DWORD keyType, QString keyName)
 {
-	std::vector<java_install> javas;
+	QList<JavaVersionPtr> javas;
 
 	QString archType = "unknown";
 	if(keyType == KEY_WOW64_64KEY) archType = "64";
@@ -87,7 +95,14 @@ std::vector<java_install> JavaUtils::FindJavaFromRegistryKey(DWORD keyType, QStr
 							value = new char[valueSz];
 							RegQueryValueEx(newKey, "JavaHome", NULL, NULL, (BYTE*)value, &valueSz);
 
-							javas.push_back(std::make_tuple(subKeyName, archType, QDir(PathCombine(value, "bin")).absoluteFilePath("java.exe"), (recommended == subKeyName)));
+							// Now, we construct the version object and add it to the list.
+							JavaVersionPtr javaVersion(new JavaVersion());
+
+							javaVersion->id = subKeyName;
+							javaVersion->arch = archType;
+							javaVersion->path = QDir(PathCombine(value, "bin")).absoluteFilePath("java.exe");
+							javaVersion->recommended = (recommended == subKeyName);
+							javas.append(javaVersion);
 						}
 
 						RegCloseKey(newKey);
@@ -102,23 +117,25 @@ std::vector<java_install> JavaUtils::FindJavaFromRegistryKey(DWORD keyType, QStr
 	return javas;
 }
 
-std::vector<java_install> JavaUtils::FindJavaPaths()
-{			
-	std::vector<java_install> JRE64s = this->FindJavaFromRegistryKey(KEY_WOW64_64KEY, "SOFTWARE\\JavaSoft\\Java Runtime Environment");
-	std::vector<java_install> JDK64s = this->FindJavaFromRegistryKey(KEY_WOW64_64KEY, "SOFTWARE\\JavaSoft\\Java Development Kit");
-	std::vector<java_install> JRE32s = this->FindJavaFromRegistryKey(KEY_WOW64_32KEY, "SOFTWARE\\JavaSoft\\Java Runtime Environment");
-	std::vector<java_install> JDK32s = this->FindJavaFromRegistryKey(KEY_WOW64_32KEY, "SOFTWARE\\JavaSoft\\Java Development Kit");
-
-	std::vector<java_install> javas;
-	javas.insert(javas.end(), JRE64s.begin(), JRE64s.end());
-	javas.insert(javas.end(), JDK64s.begin(), JDK64s.end());
-	javas.insert(javas.end(), JRE32s.begin(), JRE32s.end());
-	javas.insert(javas.end(), JDK32s.begin(), JDK32s.end());
+QList<JavaVersionPtr> JavaUtils::FindJavaPaths()
+{
+	QList<JavaVersionPtr> javas;
+
+	QList<JavaVersionPtr> JRE64s = this->FindJavaFromRegistryKey(KEY_WOW64_64KEY, "SOFTWARE\\JavaSoft\\Java Runtime Environment");
+	QList<JavaVersionPtr> JDK64s = this->FindJavaFromRegistryKey(KEY_WOW64_64KEY, "SOFTWARE\\JavaSoft\\Java Development Kit");
+	QList<JavaVersionPtr> JRE32s = this->FindJavaFromRegistryKey(KEY_WOW64_32KEY, "SOFTWARE\\JavaSoft\\Java Runtime Environment");
+	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\"";
-		return this->GetDefaultJava();
+		javas.append(this->GetDefaultJava());
+		return javas;
 	}
 
 	QLOG_INFO() << "Found the following Java installations (64 -> 32, JRE -> JDK): ";
@@ -126,8 +143,8 @@ std::vector<java_install> JavaUtils::FindJavaPaths()
 	for(auto &java : javas)
 	{
 		QString sRec;
-		if(std::get<JI_REC>(java)) sRec = "(Recommended)";
-		QLOG_INFO() << std::get<JI_ID>(java) << std::get<JI_ARCH>(java) << " at " << std::get<JI_PATH>(java) << sRec;
+		if(java->recommended) sRec = "(Recommended)";
+		QLOG_INFO() << java->id << java->arch << " at " << java->path << sRec;
 	}
 
 	return javas;
diff --git a/logic/JavaUtils.h b/logic/JavaUtils.h
index 63daac12..e4f777d0 100644
--- a/logic/JavaUtils.h
+++ b/logic/JavaUtils.h
@@ -16,29 +16,25 @@
 #pragma once
 
 #include <QStringList>
-
+#include <QWidget>
+#include <logic/lists/JavaVersionList.h>
 #include "osutils.h"
 
 #if WINDOWS
 	#include <windows.h>
 #endif
 
-#define JI_ID 0
-#define JI_ARCH 1
-#define JI_PATH 2
-#define JI_REC 3
-typedef std::tuple<QString, QString, QString, bool> java_install;
-
 class JavaUtils
 {
 public:
 	JavaUtils();
 
-	std::vector<java_install> FindJavaPaths();
+	QList<JavaVersionPtr> FindJavaPaths();
+	JavaVersionPtr GetDefaultJava();
 
 private:
-	std::vector<java_install> GetDefaultJava();
+
 #if WINDOWS
-	std::vector<java_install> FindJavaFromRegistryKey(DWORD keyType, QString keyName);
+	QList<JavaVersionPtr> FindJavaFromRegistryKey(DWORD keyType, QString keyName);
 #endif
 };
diff --git a/logic/lists/JavaVersionList.cpp b/logic/lists/JavaVersionList.cpp
new file mode 100644
index 00000000..5389c4cc
--- /dev/null
+++ b/logic/lists/JavaVersionList.cpp
@@ -0,0 +1,203 @@
+/* Copyright 2013 MultiMC Contributors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "JavaVersionList.h"
+#include "MultiMC.h"
+
+#include <QtNetwork>
+#include <QtXml>
+#include <QRegExp>
+
+#include <logger/QsLog.h>
+#include <logic/JavaUtils.h>
+
+JavaVersionList::JavaVersionList(QObject *parent) : BaseVersionList(parent)
+{
+}
+
+Task *JavaVersionList::getLoadTask()
+{
+	return new JavaListLoadTask(this);
+}
+
+
+const BaseVersionPtr JavaVersionList::at(int i) const
+{
+	return m_vlist.at(i);
+}
+
+bool JavaVersionList::isLoaded()
+{
+	return m_loaded;
+}
+
+int JavaVersionList::count() const
+{
+	return m_vlist.count();
+}
+
+int JavaVersionList::columnCount(const QModelIndex &parent) const
+{
+	return 4;
+}
+
+QVariant JavaVersionList::data(const QModelIndex &index, int role) const
+{
+	if (!index.isValid())
+		return QVariant();
+
+	if (index.row() > count())
+		return QVariant();
+
+	auto version = std::dynamic_pointer_cast<JavaVersion>(m_vlist[index.row()]);
+	switch (role)
+	{
+	case Qt::DisplayRole:
+		switch (index.column())
+		{
+		case 0:
+			return version->id;
+
+		case 1:
+			return version->arch;
+
+		case 2:
+			return version->path;
+
+		case 3:
+			return version->recommended ? tr("Yes") : tr("No");
+
+		default:
+			return QVariant();
+		}
+
+	case Qt::ToolTipRole:
+		return version->descriptor();
+
+	case VersionPointerRole:
+		return qVariantFromValue(m_vlist[index.row()]);
+
+	default:
+		return QVariant();
+	}
+}
+
+QVariant JavaVersionList::headerData(int section, Qt::Orientation orientation, int role) const
+{
+	switch (role)
+	{
+	case Qt::DisplayRole:
+		switch (section)
+		{
+		case 0:
+			return "Version";
+
+		case 1:
+			return "Arch";
+
+		case 2:
+			return "Path";
+
+		case 3:
+			return "Recommended";
+
+		default:
+			return QVariant();
+		}
+
+	case Qt::ToolTipRole:
+		switch (section)
+		{
+		case 0:
+			return "The name of the version.";
+
+		case 1:
+			return "The architecture this version is for.";
+
+		case 2:
+			return "Path to this Java version.";
+
+		case 3:
+			return "Whether the version is recommended or not.";
+
+		default:
+			return QVariant();
+		}
+
+	default:
+		return QVariant();
+	}
+}
+
+BaseVersionPtr JavaVersionList::getTopRecommended() const
+{
+	for (int i = 0; i < m_vlist.length(); i++)
+	{
+		auto ver = std::dynamic_pointer_cast<JavaVersion>(m_vlist.at(i));
+		if (ver->recommended)
+		{
+			return m_vlist.at(i);
+		}
+	}
+	return BaseVersionPtr();
+}
+
+void JavaVersionList::updateListData(QList<BaseVersionPtr> versions)
+{
+	beginResetModel();
+	m_vlist = versions;
+	m_loaded = true;
+	endResetModel();
+	// NOW SORT!!
+	// sort();
+}
+
+void JavaVersionList::sort()
+{
+	// NO-OP for now
+}
+
+JavaListLoadTask::JavaListLoadTask(JavaVersionList *vlist)
+{
+	m_list = vlist;
+	m_currentRecommended = NULL;
+}
+
+JavaListLoadTask::~JavaListLoadTask()
+{
+}
+
+void JavaListLoadTask::executeTask()
+{
+	setStatus("Detecting Java installations...");
+
+	JavaUtils ju;
+	QList<JavaVersionPtr> javas = ju.FindJavaPaths();
+
+	QList<BaseVersionPtr> javas_bvp;
+	for(int i = 0; i < javas.length(); i++)
+	{
+		BaseVersionPtr java = std::dynamic_pointer_cast<BaseVersion>(javas.at(i));
+
+		if(java)
+		{
+			javas_bvp.append(java);
+		}
+	}
+
+	m_list->updateListData(javas_bvp);
+
+	emitSucceeded();
+}
diff --git a/logic/lists/JavaVersionList.h b/logic/lists/JavaVersionList.h
new file mode 100644
index 00000000..23bccfe4
--- /dev/null
+++ b/logic/lists/JavaVersionList.h
@@ -0,0 +1,93 @@
+/* Copyright 2013 MultiMC Contributors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#pragma once
+
+#include <QObject>
+#include <QAbstractListModel>
+#include <QSharedPointer>
+
+#include "BaseVersionList.h"
+#include "logic/tasks/Task.h"
+
+class JavaListLoadTask;
+
+struct JavaVersion : public BaseVersion
+{
+	virtual QString descriptor()
+	{
+		return id;
+	}
+
+	virtual QString name()
+	{
+		return id;
+	}
+
+	virtual QString typeString() const
+	{
+		return arch;
+	}
+
+	QString id;
+	QString arch;
+	QString path;
+	bool recommended;
+};
+
+typedef std::shared_ptr<JavaVersion> JavaVersionPtr;
+
+class JavaVersionList : public BaseVersionList
+{
+	Q_OBJECT
+public:
+	explicit JavaVersionList(QObject *parent = 0);
+
+	virtual Task *getLoadTask();
+	virtual bool isLoaded();
+	virtual const BaseVersionPtr at(int i) const;
+	virtual int count() const;
+	virtual void sort();
+
+	virtual BaseVersionPtr getTopRecommended() const;
+
+	virtual QVariant data(const QModelIndex &index, int role) const;
+	virtual QVariant headerData(int section, Qt::Orientation orientation,
+								int role) const;
+	virtual int columnCount(const QModelIndex &parent) const;
+
+public slots:
+	virtual void updateListData(QList<BaseVersionPtr> versions);
+
+protected:
+	QList<BaseVersionPtr> m_vlist;
+
+	bool m_loaded = false;
+};
+
+class JavaListLoadTask : public Task
+{
+	Q_OBJECT
+
+public:
+	explicit JavaListLoadTask(JavaVersionList *vlist);
+	~JavaListLoadTask();
+
+	virtual void executeTask();
+
+protected:
+	JavaVersionList *m_list;
+	JavaVersion *m_currentRecommended;
+};