diff --git a/src/com/sheepit/client/Configuration.java b/src/com/sheepit/client/Configuration.java index 1de4328..2045db5 100644 --- a/src/com/sheepit/client/Configuration.java +++ b/src/com/sheepit/client/Configuration.java @@ -42,7 +42,7 @@ public class Configuration { public File workingDirectory; public File storageDirectory; // for permanent storage (binary archive) - public boolean userSpecifiedACacheDir; + public boolean userHasSpecifiedACacheDir; public String static_exeDirName; private String login; private String password; @@ -75,7 +75,7 @@ public class Configuration { this.priority = 19; // default lowest this.computeMethod = null; this.GPUDevice = null; - this.userSpecifiedACacheDir = false; + this.userHasSpecifiedACacheDir = false; this.workingDirectory = null; this.storageDirectory = null; this.setCacheDir(cache_dir_); @@ -193,7 +193,7 @@ public class Configuration { public void setCacheDir(File cache_dir_) { removeWorkingDirectory(); if (cache_dir_ == null) { - this.userSpecifiedACacheDir = false; + this.userHasSpecifiedACacheDir = false; try { this.workingDirectory = File.createTempFile("farm_", ""); this.workingDirectory.createNewFile(); // hoho... @@ -212,7 +212,7 @@ public class Configuration { } } else { - this.userSpecifiedACacheDir = true; + this.userHasSpecifiedACacheDir = true; this.workingDirectory = cache_dir_; this.storageDirectory = cache_dir_; } @@ -237,8 +237,8 @@ public class Configuration { } } - public boolean getUserSpecifiedACacheDir() { - return this.userSpecifiedACacheDir; + public boolean getUserHasSpecifiedACacheDir() { + return this.userHasSpecifiedACacheDir; } public void setExtras(String str) { @@ -334,7 +334,7 @@ public class Configuration { } public void removeWorkingDirectory() { - if (this.userSpecifiedACacheDir == true) { + if (this.userHasSpecifiedACacheDir) { this.cleanWorkingDirectory(); } else { diff --git a/src/com/sheepit/client/SettingsLoader.java b/src/com/sheepit/client/SettingsLoader.java index 515996d..3145db2 100644 --- a/src/com/sheepit/client/SettingsLoader.java +++ b/src/com/sheepit/client/SettingsLoader.java @@ -347,7 +347,7 @@ public class SettingsLoader { config.setMaxRenderTime(Integer.valueOf(renderTime)); } - if (config.getUserSpecifiedACacheDir() == false && cacheDir != null && new File(cacheDir).exists()) { + if (config.getUserHasSpecifiedACacheDir() == false && cacheDir != null && new File(cacheDir).exists()) { config.setCacheDir(new File(cacheDir)); } diff --git a/src/com/sheepit/client/standalone/swing/activity/Settings.java b/src/com/sheepit/client/standalone/swing/activity/Settings.java index e3c406f..500b60c 100644 --- a/src/com/sheepit/client/standalone/swing/activity/Settings.java +++ b/src/com/sheepit/client/standalone/swing/activity/Settings.java @@ -146,7 +146,7 @@ public class Settings implements Activity { JLabel cacheLabel = new JLabel("Working directory:"); directory_panel.add(cacheLabel); String destination = DUMMY_CACHE_DIR; - if (config.getUserSpecifiedACacheDir()) { + if (config.getUserHasSpecifiedACacheDir()) { destination = config.getStorageDir().getName(); } @@ -607,7 +607,7 @@ public class Settings implements Activity { parent.setCredentials(login.getText(), new String(password.getPassword())); String cachePath = null; - if (config.getUserSpecifiedACacheDir() && config.getStorageDir() != null) { + if (config.getUserHasSpecifiedACacheDir() && config.getStorageDir() != null) { cachePath = config.getStorageDir().getAbsolutePath(); }