NOISSUE add 'java.vendor' to the checker and display/log the value

7 files changed, 17 insertions, 9 deletions

diff --git a/api/logic/java/JavaChecker.cpp b/api/logic/java/JavaChecker.cpp
index ca0f4bde..d78d6505 100644
--- a/api/logic/java/JavaChecker.cpp
+++ b/api/logic/java/JavaChecker.cpp
@@ -115,7 +115,7 @@ void JavaChecker::finished(int exitcode, QProcess::ExitStatus status)
         }
     }
 
-    if(!results.contains("os.arch") || !results.contains("java.version") || !success)
+    if(!results.contains("os.arch") || !results.contains("java.version") || !results.contains("java.vendor") || !success)
     {
         result.validity = JavaCheckResult::Validity::ReturnedInvalidData;
         emit checkFinished(result);
@@ -124,6 +124,7 @@ void JavaChecker::finished(int exitcode, QProcess::ExitStatus status)
 
     auto os_arch = results["os.arch"];
     auto java_version = results["java.version"];
+    auto java_vendor = results["java.vendor"];
     bool is_64 = os_arch == "x86_64" || os_arch == "amd64";
 
 
@@ -132,6 +133,7 @@ void JavaChecker::finished(int exitcode, QProcess::ExitStatus status)
     result.mojangPlatform = is_64 ? "64" : "32";
     result.realPlatform = os_arch;
     result.javaVersion = java_version;
+    result.javaVendor = java_vendor;
     qDebug() << "Java checker succeeded.";
     emit checkFinished(result);
 }
diff --git a/api/logic/java/JavaChecker.h b/api/logic/java/JavaChecker.h
index af0dcb90..0a96249a 100644
--- a/api/logic/java/JavaChecker.h
+++ b/api/logic/java/JavaChecker.h
@@ -17,6 +17,7 @@ struct MULTIMC_LOGIC_EXPORT JavaCheckResult
     QString mojangPlatform;
     QString realPlatform;
     JavaVersion javaVersion;
+    QString javaVendor;
     QString outLog;
     QString errorLog;
     bool is_64bit = false;
diff --git a/api/logic/java/launch/CheckJava.cpp b/api/logic/java/launch/CheckJava.cpp
index b75c6dc6..d8be0581 100644
--- a/api/logic/java/launch/CheckJava.cpp
+++ b/api/logic/java/launch/CheckJava.cpp
@@ -56,9 +56,10 @@ void CheckJava::executeTask()
     auto storedUnixTime = settings->get("JavaTimestamp").toLongLong();
     auto storedArchitecture = settings->get("JavaArchitecture").toString();
     auto storedVersion = settings->get("JavaVersion").toString();
+    auto storedVendor = settings->get("JavaVendor").toString();
     m_javaUnixTime = javaUnixTime;
     // if timestamps are not the same, or something is missing, check!
-    if (javaUnixTime != storedUnixTime || storedVersion.size() == 0 || storedArchitecture.size() == 0)
+    if (javaUnixTime != storedUnixTime || storedVersion.size() == 0 || storedArchitecture.size() == 0 || storedVendor.size() == 0)
     {
         m_JavaChecker = new JavaChecker();
         emit logLine(tr("Checking Java version..."), MessageLevel::MultiMC);
@@ -71,7 +72,8 @@ void CheckJava::executeTask()
     {
         auto verString = instance->settings()->get("JavaVersion").toString();
         auto archString = instance->settings()->get("JavaArchitecture").toString();
-        printJavaInfo(verString, archString);
+        auto vendorString = instance->settings()->get("JavaVendor").toString();
+        printJavaInfo(verString, archString, vendorString);
     }
     emitSucceeded();
 }
@@ -102,9 +104,10 @@ void CheckJava::checkJavaFinished(JavaCheckResult result)
         case JavaCheckResult::Validity::Valid:
         {
             auto instance = m_parent->instance();
-            printJavaInfo(result.javaVersion.toString(), result.mojangPlatform);
+            printJavaInfo(result.javaVersion.toString(), result.mojangPlatform, result.javaVendor);
             instance->settings()->set("JavaVersion", result.javaVersion.toString());
             instance->settings()->set("JavaArchitecture", result.mojangPlatform);
+            instance->settings()->set("JavaVendor", result.javaVendor);
             instance->settings()->set("JavaTimestamp", m_javaUnixTime);
             emitSucceeded();
             return;
@@ -112,9 +115,9 @@ void CheckJava::checkJavaFinished(JavaCheckResult result)
     }
 }
 
-void CheckJava::printJavaInfo(const QString& version, const QString& architecture)
+void CheckJava::printJavaInfo(const QString& version, const QString& architecture, const QString & vendor)
 {
-    emit logLine(tr("Java is version %1, using %2-bit architecture.\n\n").arg(version, architecture), MessageLevel::MultiMC);
+    emit logLine(tr("Java is version %1, using %2-bit architecture, from %3.\n\n").arg(version, architecture, vendor), MessageLevel::MultiMC);
     printSystemInfo(true, architecture == "64");
 }
 
diff --git a/api/logic/java/launch/CheckJava.h b/api/logic/java/launch/CheckJava.h
index f0dd2308..fddfd791 100644
--- a/api/logic/java/launch/CheckJava.h
+++ b/api/logic/java/launch/CheckJava.h
@@ -35,7 +35,7 @@ private slots:
     void checkJavaFinished(JavaCheckResult result);
 
 private:
-    void printJavaInfo(const QString & version, const QString & architecture);
+    void printJavaInfo(const QString & version, const QString & architecture, const QString & vendor);
     void printSystemInfo(bool javaIsKnown, bool javaIs64bit);
 
 private:
diff --git a/application/JavaCommon.cpp b/application/JavaCommon.cpp
index 563dfb35..92a058f0 100644
--- a/application/JavaCommon.cpp
+++ b/application/JavaCommon.cpp
@@ -24,7 +24,8 @@ 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());
+        "reported: %2<br />Java vendor "
+        "reported: %3<br />").arg(result.realPlatform, result.javaVersion.toString(), result.javaVendor);
     if (result.errorLog.size())
     {
         auto htmlError = result.errorLog;
diff --git a/application/MultiMC.cpp b/application/MultiMC.cpp
index eeab500e..8e2557d4 100644
--- a/application/MultiMC.cpp
+++ b/application/MultiMC.cpp
@@ -505,6 +505,7 @@ MultiMC::MultiMC(int &argc, char **argv) : QApplication(argc, argv)
         m_settings->registerSetting("JavaTimestamp", 0);
         m_settings->registerSetting("JavaArchitecture", "");
         m_settings->registerSetting("JavaVersion", "");
+        m_settings->registerSetting("JavaVendor", "");
         m_settings->registerSetting("LastHostname", "");
         m_settings->registerSetting("JvmArgs", "");
 
diff --git a/libraries/javacheck/JavaCheck.java b/libraries/javacheck/JavaCheck.java
index 69933040..560abbc0 100644
--- a/libraries/javacheck/JavaCheck.java
+++ b/libraries/javacheck/JavaCheck.java
@@ -2,7 +2,7 @@ import java.lang.Integer;
 
 public class JavaCheck
 {
-    private static final String[] keys = {"os.arch", "java.version"};
+    private static final String[] keys = {"os.arch", "java.version", "java.vendor"};
     public static void main (String [] args)
     {
         int ret = 0;