0xf8/pollymc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Java version list should be sorted, JRE->JDK, 64->32

Browse Source
This commit is contained in:
Sky 2013-12-12 14:56:32 +00:00
parent f3fffd5259
commit a2b0941029
3 changed files with 28 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
logic/JavaUtils.cpp
View File

@ -139,9 +139,9 @@ QList<JavaVersionPtr> JavaUtils::FindJavaFromRegistryKey(DWORD keyType, QString
return javas; return javas;
} }
QList<JavaVersionPtr> JavaUtils::FindJavaPaths() QList<QString> JavaUtils::FindJavaPaths()
{ {
QList<JavaVersionPtr> candidates; QList<JavaVersionPtr> java_candidates;
QList<JavaVersionPtr> JRE64s = this->FindJavaFromRegistryKey( QList<JavaVersionPtr> JRE64s = this->FindJavaFromRegistryKey(
KEY_WOW64_64KEY, "SOFTWARE\\JavaSoft\\Java Runtime Environment"); KEY_WOW64_64KEY, "SOFTWARE\\JavaSoft\\Java Runtime Environment");
@ -152,17 +152,26 @@ QList<JavaVersionPtr> JavaUtils::FindJavaPaths()
QList<JavaVersionPtr> JDK32s = this->FindJavaFromRegistryKey( QList<JavaVersionPtr> JDK32s = this->FindJavaFromRegistryKey(
KEY_WOW64_32KEY, "SOFTWARE\\JavaSoft\\Java Development Kit"); KEY_WOW64_32KEY, "SOFTWARE\\JavaSoft\\Java Development Kit");
candidates.append(JRE64s); java_candidates.append(JRE64s);
candidates.append(JDK64s); java_candidates.append(JDK64s);
candidates.append(JRE32s); java_candidates.append(JRE32s);
candidates.append(JDK32s); java_candidates.append(JDK32s);
candidates.append(MakeJavaPtr("C:/Program Files/Java/jre7/bin/java.exe")); QList<QString> candidates;
candidates.append(MakeJavaPtr("C:/Program Files/Java/jre6/bin/java.exe")); for(JavaVersionPtr java_candidate : java_candidates)
candidates.append(MakeJavaPtr("C:/Program Files (x86)/Java/jre7/bin/java.exe")); {
candidates.append(MakeJavaPtr("C:/Program Files (x86)/Java/jre6/bin/java.exe")); if(!candidates.contains(java_candidate->path))
{
candidates.append(java_candidate->path);
}
}
candidates.append(this->GetDefaultJava()); candidates.append("C:/Program Files/Java/jre7/bin/java.exe");
candidates.append("C:/Program Files/Java/jre6/bin/java.exe");
candidates.append("C:/Program Files (x86)/Java/jre7/bin/java.exe");
candidates.append("C:/Program Files (x86)/Java/jre6/bin/java.exe");
candidates.append(this->GetDefaultJava()->path);
return candidates; return candidates;
} }

2
logic/JavaUtils.h
View File

@ -34,7 +34,7 @@ public:
JavaUtils(); JavaUtils();
JavaVersionPtr MakeJavaPtr(QString path, QString id = "unknown", QString arch = "unknown"); JavaVersionPtr MakeJavaPtr(QString path, QString id = "unknown", QString arch = "unknown");
QList<JavaVersionPtr> FindJavaPaths(); QList<QString> FindJavaPaths();
JavaVersionPtr GetDefaultJava(); JavaVersionPtr GetDefaultJava();
#if WINDOWS #if WINDOWS

20
logic/lists/JavaVersionList.cpp
View File

@ -174,28 +174,23 @@ void JavaListLoadTask::executeTask()
{ {
setStatus("Detecting Java installations..."); setStatus("Detecting Java installations...");
QSet<QString> candidate_paths;
JavaUtils ju; JavaUtils ju;
QList<QString> candidate_paths = ju.FindJavaPaths();
QList<JavaVersionPtr> candidates = ju.FindJavaPaths();
for(JavaVersionPtr &candidate : candidates)
{
candidate_paths.insert(candidate->path);
}
auto job = new JavaCheckerJob("Java detection"); auto job = new JavaCheckerJob("Java detection");
connect(job, SIGNAL(finished(QList<JavaCheckResult>)), this, SLOT(javaCheckerFinished(QList<JavaCheckResult>))); connect(job, SIGNAL(finished(QList<JavaCheckResult>)), this, SLOT(javaCheckerFinished(QList<JavaCheckResult>)));
connect(job, SIGNAL(progress(int, int)), this, SLOT(checkerProgress(int, int))); connect(job, SIGNAL(progress(int, int)), this, SLOT(checkerProgress(int, int)));
for(const QString candidate : candidate_paths) QLOG_DEBUG() << "Probing the following Java paths: ";
for(QString candidate : candidate_paths)
{ {
QLOG_DEBUG() << " " << candidate;
auto candidate_checker = new JavaChecker(); auto candidate_checker = new JavaChecker();
candidate_checker->path = candidate; candidate_checker->path = candidate;
job->addJavaCheckerAction(JavaCheckerPtr(candidate_checker)); job->addJavaCheckerAction(JavaCheckerPtr(candidate_checker));
} }
QLOG_DEBUG() << "Starting java checker job with" << job->size() << "candidates";
job->start(); job->start();
} }
@ -209,7 +204,7 @@ void JavaListLoadTask::javaCheckerFinished(QList<JavaCheckResult> results)
{ {
QList<JavaVersionPtr> candidates; QList<JavaVersionPtr> candidates;
QLOG_DEBUG() << "Got Java checker results:"; QLOG_DEBUG() << "Found the following valid Java installations:";
for(JavaCheckResult result : results) for(JavaCheckResult result : results)
{ {
if(result.valid) if(result.valid)
@ -221,7 +216,7 @@ void JavaListLoadTask::javaCheckerFinished(QList<JavaCheckResult> results)
javaVersion->path = result.path; javaVersion->path = result.path;
candidates.append(javaVersion); candidates.append(javaVersion);
QLOG_DEBUG() << javaVersion->id << javaVersion->arch << javaVersion->path; QLOG_DEBUG() << " " << javaVersion->id << javaVersion->arch << javaVersion->path;
} }
} }
@ -238,6 +233,5 @@ void JavaListLoadTask::javaCheckerFinished(QList<JavaCheckResult> results)
} }
m_list->updateListData(javas_bvp); m_list->updateListData(javas_bvp);
emitSucceeded(); emitSucceeded();
} }