From 1b884d0a9dc28d8bca38fe8756482d991d0ea850 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20Mr=C3=A1zek?= Date: Mon, 4 May 2015 01:20:48 +0200 Subject: GH-907 improve Java testing and PermGen deprecation handling --- application/pages/global/JavaPage.cpp | 43 ++++++---------- application/pages/global/JavaPage.h | 9 ++-- application/pages/global/JavaPage.ui | 80 +++++++++++++++--------------- application/pages/global/MinecraftPage.cpp | 12 ----- application/pages/global/MultiMCPage.cpp | 15 +----- 5 files changed, 58 insertions(+), 101 deletions(-) (limited to 'application/pages/global') diff --git a/application/pages/global/JavaPage.cpp b/application/pages/global/JavaPage.cpp index 1b480376..3daf35dc 100644 --- a/application/pages/global/JavaPage.cpp +++ b/application/pages/global/JavaPage.cpp @@ -14,6 +14,7 @@ */ #include "JavaPage.h" +#include "JavaCommon.h" #include "ui_JavaPage.h" #include @@ -22,15 +23,11 @@ #include -#include "NagUtils.h" - -#include "Platform.h" #include "dialogs/VersionSelectDialog.h" #include #include "java/JavaUtils.h" #include "java/JavaVersionList.h" -#include "java/JavaChecker.h" #include "settings/SettingsObject.h" #include "MultiMC.h" @@ -69,7 +66,7 @@ void JavaPage::applySettings() // Java Settings s->set("JavaPath", ui->javaPathTextBox->text()); s->set("JvmArgs", ui->jvmArgsTextBox->text()); - NagUtils::checkJVMArgs(s->get("JvmArgs").toString(), this->parentWidget()); + JavaCommon::checkJVMArgs(s->get("JvmArgs").toString(), this->parentWidget()); // Custom Commands s->set("PreLaunchCommand", ui->preLaunchCmdTextBox->text()); @@ -113,33 +110,21 @@ void JavaPage::on_javaBrowseBtn_clicked() ui->javaPathTextBox->setText(dir); } } + void JavaPage::on_javaTestBtn_clicked() { - checker.reset(new JavaChecker()); - connect(checker.get(), SIGNAL(checkFinished(JavaCheckResult)), this, - SLOT(checkFinished(JavaCheckResult))); - checker->path = ui->javaPathTextBox->text(); - checker->performCheck(); + if(checker) + { + return; + } + checker.reset(new JavaCommon::TestCheck( + this, ui->javaPathTextBox->text(), ui->jvmArgsTextBox->text(), + ui->minMemSpinBox->value(), ui->maxMemSpinBox->value(), ui->permGenSpinBox->value())); + connect(checker.get(), SIGNAL(finished()), SLOT(checkerFinished())); + checker->run(); } -void JavaPage::checkFinished(JavaCheckResult result) +void JavaPage::checkerFinished() { - if (result.valid) - { - QString text; - text += "Java test succeeded!\n"; - if (result.is_64bit) - text += "Using 64bit java.\n"; - text += "\n"; - text += "Platform reported: " + result.realPlatform + "\n"; - text += "Java version reported: " + result.javaVersion; - QMessageBox::information(this, tr("Java test success"), text); - } - else - { - QMessageBox::warning( - this, tr("Java test failure"), - tr("The specified java binary didn't work. You should use the auto-detect feature, " - "or set the path to the java executable.")); - } + checker.reset(); } diff --git a/application/pages/global/JavaPage.h b/application/pages/global/JavaPage.h index 2af85280..4dd2b306 100644 --- a/application/pages/global/JavaPage.h +++ b/application/pages/global/JavaPage.h @@ -17,10 +17,10 @@ #include #include - -#include "java/JavaChecker.h" #include "pages/BasePage.h" +#include "JavaCommon.h" #include +#include class SettingsObject; @@ -64,10 +64,9 @@ slots: void on_javaDetectBtn_clicked(); void on_javaTestBtn_clicked(); void on_javaBrowseBtn_clicked(); - - void checkFinished(JavaCheckResult result); + void checkerFinished(); private: Ui::JavaPage *ui; - std::shared_ptr checker; + QObjectPtr checker; }; diff --git a/application/pages/global/JavaPage.ui b/application/pages/global/JavaPage.ui index 6ae41a49..f9c629c2 100644 --- a/application/pages/global/JavaPage.ui +++ b/application/pages/global/JavaPage.ui @@ -161,45 +161,6 @@ - - - - - 0 - 0 - - - - Auto-detect... - - - - - - - - 0 - 0 - - - - Test - - - - - - - - 0 - 0 - - - - JVM arguments: - - - @@ -229,6 +190,45 @@ + + + + + 0 + 0 + + + + JVM arguments: + + + + + + + + 0 + 0 + + + + Auto-detect... + + + + + + + + 0 + 0 + + + + Test + + + @@ -292,8 +292,6 @@ permGenSpinBox javaPathTextBox javaBrowseBtn - javaDetectBtn - javaTestBtn jvmArgsTextBox preLaunchCmdTextBox postExitCmdTextBox diff --git a/application/pages/global/MinecraftPage.cpp b/application/pages/global/MinecraftPage.cpp index f5e7e57f..d1f1fb08 100644 --- a/application/pages/global/MinecraftPage.cpp +++ b/application/pages/global/MinecraftPage.cpp @@ -23,18 +23,6 @@ #include #include "Platform.h" -#include "dialogs/VersionSelectDialog.h" -#include "dialogs/CustomMessageBox.h" - -#include "NagUtils.h" - -#include "java/JavaUtils.h" -#include "java/JavaVersionList.h" -#include "java/JavaChecker.h" - -#include "updater/UpdateChecker.h" - -#include "tools/BaseProfiler.h" #include "settings/SettingsObject.h" #include "MultiMC.h" diff --git a/application/pages/global/MultiMCPage.cpp b/application/pages/global/MultiMCPage.cpp index 5f56fb89..83c1ccd5 100644 --- a/application/pages/global/MultiMCPage.cpp +++ b/application/pages/global/MultiMCPage.cpp @@ -22,22 +22,9 @@ #include #include - -#include "Platform.h" -#include "dialogs/VersionSelectDialog.h" -#include "dialogs/CustomMessageBox.h" #include - -#include "NagUtils.h" - -#include "java/JavaUtils.h" -#include "java/JavaVersionList.h" -#include "java/JavaChecker.h" - #include "updater/UpdateChecker.h" -#include "tools/BaseProfiler.h" - #include "settings/SettingsObject.h" #include "MultiMC.h" @@ -456,4 +443,4 @@ void MultiMCPage::refreshFontPreview() workCursor.insertText(tr("[Something/WARN] A not so spooky warning."), format); workCursor.insertBlock(); } -} \ No newline at end of file +} -- cgit v1.2.3