mirror of
https://github.com/MultiMC/MultiMC5.git
synced 2024-11-20 08:10:11 +00:00
c4ec6bc0f5
* Added a button to check why Java failed * It will now avoid automatically scanning binaries that do not have 'java' in their filename * Fixed some crashes related to running too many Java checks (it only does one at a time now) * It can now distinguish between more Java failure states (not there at all, crashing, returning nonsense) * Changed '...' button to Browse button to match the wizard page subtitle * Changing minimum and maximum memory will no longer trigger a java check twice
105 lines
3.3 KiB
C++
105 lines
3.3 KiB
C++
#include "JavaCommon.h"
|
|
#include "dialogs/CustomMessageBox.h"
|
|
#include <MMCStrings.h>
|
|
|
|
bool JavaCommon::checkJVMArgs(QString jvmargs, QWidget *parent)
|
|
{
|
|
if (jvmargs.contains("-XX:PermSize=") || jvmargs.contains(QRegExp("-Xm[sx]")))
|
|
{
|
|
CustomMessageBox::selectable(
|
|
parent, QObject::tr("JVM arguments warning"),
|
|
QObject::tr("You tried to manually set a JVM memory option (using "
|
|
" \"-XX:PermSize\", \"-Xmx\" or \"-Xms\") - there"
|
|
" are dedicated boxes for these in the settings (Java"
|
|
" tab, in the Memory group at the top).\n"
|
|
"Your manual settings will be overridden by the"
|
|
" dedicated options.\n"
|
|
"This message will be displayed until you remove them"
|
|
" from the JVM arguments."),
|
|
QMessageBox::Warning)->exec();
|
|
return false;
|
|
}
|
|
return true;
|
|
}
|
|
|
|
void JavaCommon::javaWasOk(QWidget *parent, JavaCheckResult result)
|
|
{
|
|
QString text;
|
|
text += QObject::tr("Java test succeeded!<br />Platform reported: %1<br />Java version "
|
|
"reported: %2<br />").arg(result.realPlatform, result.javaVersion.toString());
|
|
if (result.errorLog.size())
|
|
{
|
|
auto htmlError = result.errorLog;
|
|
htmlError.replace('\n', "<br />");
|
|
text += QObject::tr("<br />Warnings:<br /><font color=\"orange\">%1</font>").arg(htmlError);
|
|
}
|
|
CustomMessageBox::selectable(parent, QObject::tr("Java test success"), text, QMessageBox::Information)->show();
|
|
}
|
|
|
|
void JavaCommon::javaArgsWereBad(QWidget *parent, JavaCheckResult result)
|
|
{
|
|
auto htmlError = result.errorLog;
|
|
QString text;
|
|
htmlError.replace('\n', "<br />");
|
|
text += QObject::tr("The specified java binary didn't work with the arguments you provided:<br />");
|
|
text += QString("<font color=\"red\">%1</font>").arg(htmlError);
|
|
CustomMessageBox::selectable(parent, QObject::tr("Java test failure"), text, QMessageBox::Warning)->show();
|
|
}
|
|
|
|
void JavaCommon::javaBinaryWasBad(QWidget *parent, JavaCheckResult result)
|
|
{
|
|
QString text;
|
|
text += QObject::tr(
|
|
"The specified java binary didn't work.<br />You should use the auto-detect feature, "
|
|
"or set the path to the java executable.<br />");
|
|
CustomMessageBox::selectable(parent, QObject::tr("Java test failure"), text, QMessageBox::Warning)->show();
|
|
}
|
|
|
|
void JavaCommon::TestCheck::run()
|
|
{
|
|
if (!JavaCommon::checkJVMArgs(m_args, m_parent))
|
|
{
|
|
emit finished();
|
|
return;
|
|
}
|
|
checker.reset(new JavaChecker());
|
|
connect(checker.get(), SIGNAL(checkFinished(JavaCheckResult)), this,
|
|
SLOT(checkFinished(JavaCheckResult)));
|
|
checker->m_path = m_path;
|
|
checker->performCheck();
|
|
}
|
|
|
|
void JavaCommon::TestCheck::checkFinished(JavaCheckResult result)
|
|
{
|
|
if (result.validity != JavaCheckResult::Validity::Valid)
|
|
{
|
|
javaBinaryWasBad(m_parent, result);
|
|
emit finished();
|
|
return;
|
|
}
|
|
checker.reset(new JavaChecker());
|
|
connect(checker.get(), SIGNAL(checkFinished(JavaCheckResult)), this,
|
|
SLOT(checkFinishedWithArgs(JavaCheckResult)));
|
|
checker->m_path = m_path;
|
|
checker->m_args = m_args;
|
|
checker->m_minMem = m_minMem;
|
|
checker->m_maxMem = m_maxMem;
|
|
if (result.javaVersion.requiresPermGen())
|
|
{
|
|
checker->m_permGen = m_permGen;
|
|
}
|
|
checker->performCheck();
|
|
}
|
|
|
|
void JavaCommon::TestCheck::checkFinishedWithArgs(JavaCheckResult result)
|
|
{
|
|
if (result.validity == JavaCheckResult::Validity::Valid)
|
|
{
|
|
javaWasOk(m_parent, result);
|
|
emit finished();
|
|
return;
|
|
}
|
|
javaArgsWereBad(m_parent, result);
|
|
emit finished();
|
|
}
|