From a008efd24e81441a23ff3e81320ac3522251327e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20Mr=C3=A1zek?= Date: Sat, 2 Jan 2016 00:35:54 +0100 Subject: GH-1365 rework java version parsing and sorting --- application/JavaCommon.cpp | 4 ++-- application/MainWindow.cpp | 6 +++--- application/MultiMC.cpp | 4 ++-- application/MultiMC.h | 6 +++--- application/pages/InstanceSettingsPage.cpp | 6 +++--- application/pages/global/JavaPage.cpp | 6 +++--- 6 files changed, 16 insertions(+), 16 deletions(-) (limited to 'application') diff --git a/application/JavaCommon.cpp b/application/JavaCommon.cpp index 2bec046a..403883e7 100644 --- a/application/JavaCommon.cpp +++ b/application/JavaCommon.cpp @@ -26,7 +26,7 @@ void JavaCommon::TestCheck::javaWasOk(JavaCheckResult result) { QString text; text += tr("Java test succeeded!
Platform reported: %1
Java version " - "reported: %2
").arg(result.realPlatform, result.javaVersion); + "reported: %2
").arg(result.realPlatform, result.javaVersion.toString()); if (result.errorLog.size()) { auto htmlError = result.errorLog; @@ -87,7 +87,7 @@ void JavaCommon::TestCheck::checkFinished(JavaCheckResult result) checker->m_args = m_args; checker->m_minMem = m_minMem; checker->m_maxMem = m_maxMem; - if (Strings::naturalCompare(result.javaVersion, "1.8", Qt::CaseInsensitive) < 0) + if (result.javaVersion.requiresPermGen()) { checker->m_permGen = m_permGen; } diff --git a/application/MainWindow.cpp b/application/MainWindow.cpp index 2fab40cb..82d923bb 100644 --- a/application/MainWindow.cpp +++ b/application/MainWindow.cpp @@ -55,7 +55,7 @@ #include #include #include -#include +#include #include #include #include @@ -1638,14 +1638,14 @@ void MainWindow::checkSetDefaultJava() { qDebug() << "Java path needs resetting, showing Java selection dialog..."; - JavaVersionPtr java; + JavaInstallPtr java; VersionSelectDialog vselect(MMC->javalist().get(), tr("Select a Java version"), this, false); vselect.setResizeOn(2); vselect.exec(); if (vselect.selectedVersion()) - java = std::dynamic_pointer_cast(vselect.selectedVersion()); + java = std::dynamic_pointer_cast(vselect.selectedVersion()); else { CustomMessageBox::selectable(this, tr("Invalid version selected"), tr("You didn't select a valid Java version, so MultiMC will " diff --git a/application/MultiMC.cpp b/application/MultiMC.cpp index cd5e145a..a2a14506 100644 --- a/application/MultiMC.cpp +++ b/application/MultiMC.cpp @@ -586,11 +586,11 @@ std::shared_ptr MultiMC::minecraftlist() return m_minecraftlist; } -std::shared_ptr MultiMC::javalist() +std::shared_ptr MultiMC::javalist() { if (!m_javalist) { - m_javalist.reset(new JavaVersionList()); + m_javalist.reset(new JavaInstallList()); ENV.registerVersionList("com.java", m_javalist); } return m_javalist; diff --git a/application/MultiMC.h b/application/MultiMC.h index 492544fc..5b19db19 100644 --- a/application/MultiMC.h +++ b/application/MultiMC.h @@ -20,7 +20,7 @@ class IconList; class QNetworkAccessManager; class ForgeVersionList; class LiteLoaderVersionList; -class JavaVersionList; +class JavaInstallList; class UpdateChecker; class BaseProfilerFactory; class BaseDetachedToolFactory; @@ -79,7 +79,7 @@ public: std::shared_ptr lwjgllist(); std::shared_ptr forgelist(); std::shared_ptr liteloaderlist(); - std::shared_ptr javalist(); + std::shared_ptr javalist(); // APPLICATION ONLY std::shared_ptr instances() @@ -160,7 +160,7 @@ private: std::shared_ptr m_forgelist; std::shared_ptr m_liteloaderlist; std::shared_ptr m_minecraftlist; - std::shared_ptr m_javalist; + std::shared_ptr m_javalist; std::shared_ptr m_translationChecker; std::shared_ptr m_globalSettingsProvider; diff --git a/application/pages/InstanceSettingsPage.cpp b/application/pages/InstanceSettingsPage.cpp index a23d7c22..2922e469 100644 --- a/application/pages/InstanceSettingsPage.cpp +++ b/application/pages/InstanceSettingsPage.cpp @@ -9,7 +9,7 @@ #include "JavaCommon.h" #include "MultiMC.h" -#include +#include #include InstanceSettingsPage::InstanceSettingsPage(BaseInstance *inst, QWidget *parent) @@ -170,7 +170,7 @@ void InstanceSettingsPage::loadSettings() void InstanceSettingsPage::on_javaDetectBtn_clicked() { - JavaVersionPtr java; + JavaInstallPtr java; VersionSelectDialog vselect(MMC->javalist().get(), tr("Select a Java version"), this, true); vselect.setResizeOn(2); @@ -178,7 +178,7 @@ void InstanceSettingsPage::on_javaDetectBtn_clicked() if (vselect.result() == QDialog::Accepted && vselect.selectedVersion()) { - java = std::dynamic_pointer_cast(vselect.selectedVersion()); + java = std::dynamic_pointer_cast(vselect.selectedVersion()); ui->javaPathTextBox->setText(java->path); } } diff --git a/application/pages/global/JavaPage.cpp b/application/pages/global/JavaPage.cpp index 1c33a9ff..82103e23 100644 --- a/application/pages/global/JavaPage.cpp +++ b/application/pages/global/JavaPage.cpp @@ -25,7 +25,7 @@ #include #include "java/JavaUtils.h" -#include "java/JavaVersionList.h" +#include "java/JavaInstallList.h" #include "settings/SettingsObject.h" #include @@ -93,14 +93,14 @@ void JavaPage::loadSettings() void JavaPage::on_javaDetectBtn_clicked() { - JavaVersionPtr java; + JavaInstallPtr java; VersionSelectDialog vselect(MMC->javalist().get(), tr("Select a Java version"), this, true); vselect.exec(); if (vselect.result() == QDialog::Accepted && vselect.selectedVersion()) { - java = std::dynamic_pointer_cast(vselect.selectedVersion()); + java = std::dynamic_pointer_cast(vselect.selectedVersion()); ui->javaPathTextBox->setText(java->path); } } -- cgit v1.2.3