Raincloud/sheepit-shadow-nabber
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Better name for variable

Browse Source
This commit is contained in:
Laurent Clouet
2018-08-18 01:44:40 +02:00
parent 6ded57fc0a
commit e5f837a249
3 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/com/sheepit/client/Configuration.java
View File

@@ -42,7 +42,7 @@ public class Configuration {
public File workingDirectory; public File workingDirectory;
public File storageDirectory; // for permanent storage (binary archive) public File storageDirectory; // for permanent storage (binary archive)
public boolean userSpecifiedACacheDir; public boolean userHasSpecifiedACacheDir;
public String static_exeDirName; public String static_exeDirName;
private String login; private String login;
private String password; private String password;
@@ -75,7 +75,7 @@ public class Configuration {
this.priority = 19; // default lowest this.priority = 19; // default lowest
this.computeMethod = null; this.computeMethod = null;
this.GPUDevice = null; this.GPUDevice = null;
this.userSpecifiedACacheDir = false; this.userHasSpecifiedACacheDir = false;
this.workingDirectory = null; this.workingDirectory = null;
this.storageDirectory = null; this.storageDirectory = null;
this.setCacheDir(cache_dir_); this.setCacheDir(cache_dir_);
@@ -193,7 +193,7 @@ public class Configuration {
public void setCacheDir(File cache_dir_) { public void setCacheDir(File cache_dir_) {
removeWorkingDirectory(); removeWorkingDirectory();
if (cache_dir_ == null) { if (cache_dir_ == null) {
this.userSpecifiedACacheDir = false; this.userHasSpecifiedACacheDir = false;
try { try {
this.workingDirectory = File.createTempFile("farm_", ""); this.workingDirectory = File.createTempFile("farm_", "");
this.workingDirectory.createNewFile(); // hoho... this.workingDirectory.createNewFile(); // hoho...
@@ -212,7 +212,7 @@ public class Configuration {
} }
} }
else { else {
this.userSpecifiedACacheDir = true; this.userHasSpecifiedACacheDir = true;
this.workingDirectory = cache_dir_; this.workingDirectory = cache_dir_;
this.storageDirectory = cache_dir_; this.storageDirectory = cache_dir_;
} }
@@ -237,8 +237,8 @@ public class Configuration {
} }
} }
public boolean getUserSpecifiedACacheDir() { public boolean getUserHasSpecifiedACacheDir() {
return this.userSpecifiedACacheDir; return this.userHasSpecifiedACacheDir;
} }
public void setExtras(String str) { public void setExtras(String str) {
@@ -334,7 +334,7 @@ public class Configuration {
} }
public void removeWorkingDirectory() { public void removeWorkingDirectory() {
if (this.userSpecifiedACacheDir == true) { if (this.userHasSpecifiedACacheDir) {
this.cleanWorkingDirectory(); this.cleanWorkingDirectory();
} }
else { else {

2
src/com/sheepit/client/SettingsLoader.java
View File

@@ -347,7 +347,7 @@ public class SettingsLoader {
config.setMaxRenderTime(Integer.valueOf(renderTime)); 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)); config.setCacheDir(new File(cacheDir));
} }

4
src/com/sheepit/client/standalone/swing/activity/Settings.java
View File

@@ -146,7 +146,7 @@ public class Settings implements Activity {
JLabel cacheLabel = new JLabel("Working directory:"); JLabel cacheLabel = new JLabel("Working directory:");
directory_panel.add(cacheLabel); directory_panel.add(cacheLabel);
String destination = DUMMY_CACHE_DIR; String destination = DUMMY_CACHE_DIR;
if (config.getUserSpecifiedACacheDir()) { if (config.getUserHasSpecifiedACacheDir()) {
destination = config.getStorageDir().getName(); destination = config.getStorageDir().getName();
} }
@@ -607,7 +607,7 @@ public class Settings implements Activity {
parent.setCredentials(login.getText(), new String(password.getPassword())); parent.setCredentials(login.getText(), new String(password.getPassword()));
String cachePath = null; String cachePath = null;
if (config.getUserSpecifiedACacheDir() && config.getStorageDir() != null) { if (config.getUserHasSpecifiedACacheDir() && config.getStorageDir() != null) {
cachePath = config.getStorageDir().getAbsolutePath(); cachePath = config.getStorageDir().getAbsolutePath();
} }