ONIMAI-SMP/ShatteredPrism
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

update java sorting by taking into consideration release time

Browse Source 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
This commit is contained in:
Trial97 2024-05-21 08:33:09 +03:00
parent 7a42fb284a
commit f6a7fc215a
No known key found for this signature in database
GPG Key ID: 55EF5DA53DB36318
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
launcher/java/JavaMetadata.cpp
View File

@ -83,6 +83,13 @@ bool Metadata::operator<(const Metadata& rhs)
if (id > rhs.version) { if (id > rhs.version) {
return false; return false;
} }
auto date = releaseTime;
if (date < rhs.releaseTime) {
return true;
}
if (date > rhs.releaseTime) {
return false;
}
return StringUtils::naturalCompare(m_name, rhs.m_name, Qt::CaseInsensitive) < 0; return StringUtils::naturalCompare(m_name, rhs.m_name, Qt::CaseInsensitive) < 0;
} }

6
launcher/java/JavaVersion.cpp
View File

@ -59,12 +59,6 @@ bool JavaVersion::operator<(const JavaVersion& rhs)
auto major = m_major; auto major = m_major;
auto rmajor = rhs.m_major; auto rmajor = rhs.m_major;
// HACK: discourage using java 9
if (major > 8)
major = -major;
if (rmajor > 8)
rmajor = -rmajor;
if (major < rmajor) if (major < rmajor)
return true; return true;
if (major > rmajor) if (major > rmajor)