aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/src-tauri/src/core/java/priority.rs
diff options
context:
space:
mode:
authorBegonia, HE <163421589+BegoniaHe@users.noreply.github.com>2026-01-26 19:03:49 +0100
committerBegonia, HE <163421589+BegoniaHe@users.noreply.github.com>2026-01-29 03:01:26 +0100
commit6bb967f05b2dd32dc1cd1b849a6089bc80667aec (patch)
tree604075accba8b472efc9d8c90db65e62030c72d2 /src-tauri/src/core/java/priority.rs
parent2c90c392114a8948190e4253f0cae9379f3a614d (diff)
downloadDropOut-6bb967f05b2dd32dc1cd1b849a6089bc80667aec.tar.gz
DropOut-6bb967f05b2dd32dc1cd1b849a6089bc80667aec.zip
refactor(java): simplify version compatibility logic and improve error handling
- Extract version compatibility check into shared validation function - Remove duplicated version checking code across multiple modules - Simplify Java detection timeout logic in detection.rs - Expand vendor detection to support more JDK distributions (Dragonwell, Kona, Semeru, BiSheng, etc.) - Refactor start_game to use priority-based Java resolution - Improve error handling in Adoptium provider task collection Reviewed-by: Claude Sonnet 4.5
Diffstat (limited to 'src-tauri/src/core/java/priority.rs')
-rw-r--r--src-tauri/src/core/java/priority.rs17
1 files changed, 1 insertions, 16 deletions
diff --git a/src-tauri/src/core/java/priority.rs b/src-tauri/src/core/java/priority.rs
index 98f8b0e..09a61b3 100644
--- a/src-tauri/src/core/java/priority.rs
+++ b/src-tauri/src/core/java/priority.rs
@@ -4,7 +4,6 @@ use super::JavaInstallation;
use crate::core::java::persistence;
use crate::core::java::validation;
-#[allow(dead_code)]
pub async fn resolve_java_for_launch(
app_handle: &AppHandle,
instance_java_override: Option<&str>,
@@ -50,25 +49,11 @@ pub async fn resolve_java_for_launch(
.find(|java| is_version_compatible(java, required_major_version, max_major_version))
}
-#[allow(dead_code)]
fn is_version_compatible(
java: &JavaInstallation,
required_major_version: Option<u64>,
max_major_version: Option<u32>,
) -> bool {
let major = validation::parse_java_version(&java.version);
-
- let meets_min = if let Some(required) = required_major_version {
- major >= required as u32
- } else {
- true
- };
-
- let meets_max = if let Some(max_version) = max_major_version {
- major <= max_version
- } else {
- true
- };
-
- meets_min && meets_max
+ validation::is_version_compatible(major, required_major_version, max_major_version)
}