From acc9f02f0716c4c0e79ec2321f8aa6390d515836 Mon Sep 17 00:00:00 2001 From: DaCool <8727384-DaCool@users.noreply.gitlab.com> Date: Thu, 19 Oct 2023 11:09:08 +0000 Subject: [PATCH] Rename setUsePriority to setPriority --- src/main/java/com/sheepit/client/Configuration.java | 5 ++--- src/main/java/com/sheepit/client/SettingsLoader.java | 4 +--- src/main/java/com/sheepit/client/standalone/Worker.java | 2 +- .../sheepit/client/standalone/swing/activity/Settings.java | 4 ++-- .../client/standalone/text/CLIInputActionHandler.java | 2 +- 5 files changed, 7 insertions(+), 10 deletions(-) diff --git a/src/main/java/com/sheepit/client/Configuration.java b/src/main/java/com/sheepit/client/Configuration.java index b07f849..9b02759 100644 --- a/src/main/java/com/sheepit/client/Configuration.java +++ b/src/main/java/com/sheepit/client/Configuration.java @@ -159,14 +159,13 @@ import lombok.Data; * @param priority integer that will be clamped between 19 and -19, * lowest to highest in terms of priority */ - public void setUsePriority(int priority) { + public void setPriority(int priority) { if (priority > 19) priority = 19; - if (priority < -19) + else if (priority < -19) priority = -19; this.priority = priority; - } /** diff --git a/src/main/java/com/sheepit/client/SettingsLoader.java b/src/main/java/com/sheepit/client/SettingsLoader.java index 54296b8..6623288 100644 --- a/src/main/java/com/sheepit/client/SettingsLoader.java +++ b/src/main/java/com/sheepit/client/SettingsLoader.java @@ -39,8 +39,6 @@ import com.sheepit.client.hardware.gpu.GPUDevice; import com.sheepit.client.standalone.GuiText; import com.sheepit.client.standalone.GuiTextOneLine; import com.sheepit.client.os.OS; -import com.sheepit.client.os.Linux; -import com.sheepit.client.os.Mac; import lombok.Data; @Data @@ -453,7 +451,7 @@ public class SettingsLoader { } if (config.getPriority() == 19) { // 19 is default value - config.setUsePriority(priority.getValue()); + config.setPriority(priority.getValue()); } try { if (config.getComputeMethod() == null && computeMethod == null) { diff --git a/src/main/java/com/sheepit/client/standalone/Worker.java b/src/main/java/com/sheepit/client/standalone/Worker.java index f32222e..2d75f28 100644 --- a/src/main/java/com/sheepit/client/standalone/Worker.java +++ b/src/main/java/com/sheepit/client/standalone/Worker.java @@ -136,7 +136,7 @@ public class Worker { ComputeType compute_method = null; Configuration config = new Configuration(null, login, password); config.setPrintLog(print_log); - config.setUsePriority(priority); + config.setPriority(priority); config.setDetectGPUs(!no_gpu_detection); if (sharedDownloadsDir != null) { diff --git a/src/main/java/com/sheepit/client/standalone/swing/activity/Settings.java b/src/main/java/com/sheepit/client/standalone/swing/activity/Settings.java index b064905..0db8bfb 100644 --- a/src/main/java/com/sheepit/client/standalone/swing/activity/Settings.java +++ b/src/main/java/com/sheepit/client/standalone/swing/activity/Settings.java @@ -748,10 +748,10 @@ public class Settings implements Activity { boolean high_priority_support = os.getSupportHighPriority(); if (high_priority_support) { // inverse - config.setUsePriority(-1 * priority.getValue()); + config.setPriority(-1 * priority.getValue()); } else { - config.setUsePriority(19 - priority.getValue()); + config.setPriority(19 - priority.getValue()); } config.setHeadless(headlessCheckbox.isSelected()); diff --git a/src/main/java/com/sheepit/client/standalone/text/CLIInputActionHandler.java b/src/main/java/com/sheepit/client/standalone/text/CLIInputActionHandler.java index 039bb69..7a894f0 100644 --- a/src/main/java/com/sheepit/client/standalone/text/CLIInputActionHandler.java +++ b/src/main/java/com/sheepit/client/standalone/text/CLIInputActionHandler.java @@ -80,7 +80,7 @@ public class CLIInputActionHandler implements CLIInputListener { Configuration config = client.getConfiguration(); if (config != null) { try { - config.setUsePriority(Integer.parseInt(newPriority.trim())); + config.setPriority(Integer.parseInt(newPriority.trim())); } catch (NumberFormatException e) { System.out.println("Invalid priority: " + newPriority);