From da5fbabb91f7f254fc0506aaaad03de129d02607 Mon Sep 17 00:00:00 2001 From: Laurent Clouet Date: Tue, 20 Jan 2015 22:06:05 +0100 Subject: [PATCH] Cleanup: indentation --- src/com/sheepit/client/Client.java | 10 +++++----- src/com/sheepit/client/Job.java | 14 +++++++------- src/com/sheepit/client/hardware/cpu/CPU.java | 2 +- src/com/sheepit/client/os/OS.java | 2 +- src/com/sheepit/client/standalone/Worker.java | 2 +- .../client/standalone/swing/activity/Working.java | 2 +- 6 files changed, 16 insertions(+), 16 deletions(-) diff --git a/src/com/sheepit/client/Client.java b/src/com/sheepit/client/Client.java index 55bce3f..e1d51ae 100644 --- a/src/com/sheepit/client/Client.java +++ b/src/com/sheepit/client/Client.java @@ -142,8 +142,8 @@ public class Client { this.renderingJob = null; while (this.running == true) { - synchronized(this) { - while(this.suspended) { + synchronized (this) { + while (this.suspended) { wait(); } } @@ -531,7 +531,7 @@ public class Client { Map new_env = new HashMap(); new_env.put("BLENDER_USER_CONFIG", this.config.workingDirectory.getAbsolutePath().replace("\\", "\\\\")); - + int index = 0; for (int i = 0; i < command1.length; i++) { if (command1[i].equals(".c")) { @@ -759,7 +759,7 @@ public class Client { if (md5_local.equals(ajob.getRenderMd5()) == false) { this.log.error("Client::downloadExecutable mismatch on md5 local: '" + md5_local + "' server: '" + ajob.getRenderMd5() + "'"); - // md5 of the downloaded file doesn't match the expected hash + // md5 of the downloaded file doesn't match the expected hash return -10; } return 0; @@ -883,7 +883,7 @@ public class Client { String[] parts = buf.split("-"); if (parts != null && parts.length == 2) { try { - int current = Integer.parseInt(parts[0]); + int current = Integer.parseInt(parts[0]); int total = Integer.parseInt(parts[1]); if (total != 0) { this.gui.status(String.format("Rendering %s %%", (int) (100.0 * current / total))); diff --git a/src/com/sheepit/client/Job.java b/src/com/sheepit/client/Job.java index e72ef08..7df0a4f 100644 --- a/src/com/sheepit/client/Job.java +++ b/src/com/sheepit/client/Job.java @@ -111,13 +111,13 @@ public class Job { } public void setAskForRendererKill(boolean val) { - askForRendererKill = val; - } - - public boolean getAskForRendererKill() { - return askForRendererKill; - } - + askForRendererKill = val; + } + + public boolean getAskForRendererKill() { + return askForRendererKill; + } + public void setProcess(Process val) { process = val; } diff --git a/src/com/sheepit/client/hardware/cpu/CPU.java b/src/com/sheepit/client/hardware/cpu/CPU.java index 7939413..bd6ba34 100644 --- a/src/com/sheepit/client/hardware/cpu/CPU.java +++ b/src/com/sheepit/client/hardware/cpu/CPU.java @@ -84,5 +84,5 @@ public class CPU { public boolean haveData() { return this.name != null && this.model != null && this.family != null && this.arch != null; } - + } diff --git a/src/com/sheepit/client/os/OS.java b/src/com/sheepit/client/os/OS.java index e7687bb..9e92aa6 100644 --- a/src/com/sheepit/client/os/OS.java +++ b/src/com/sheepit/client/os/OS.java @@ -33,7 +33,7 @@ public abstract class OS { public abstract int getMemory(); public abstract String getRenderBinaryPath(); - + public String getCUDALib() { return null; } diff --git a/src/com/sheepit/client/standalone/Worker.java b/src/com/sheepit/client/standalone/Worker.java index 099c1ad..ac52e5a 100644 --- a/src/com/sheepit/client/standalone/Worker.java +++ b/src/com/sheepit/client/standalone/Worker.java @@ -269,7 +269,7 @@ public class Worker { if (ui_type.equals("oneline")) { if (config.getPrintLog()) { System.out.println("OneLine UI can not be used if verbose mode is enabled"); - System.exit(2); + System.exit(2); } gui = new GuiTextOneLine(); } diff --git a/src/com/sheepit/client/standalone/swing/activity/Working.java b/src/com/sheepit/client/standalone/swing/activity/Working.java index d4292f7..46c15da 100644 --- a/src/com/sheepit/client/standalone/swing/activity/Working.java +++ b/src/com/sheepit/client/standalone/swing/activity/Working.java @@ -58,7 +58,7 @@ public class Working implements Activity { statusContent.setVerticalAlignment(JLabel.TOP); statusContent.setVerticalTextPosition(JLabel.TOP); - statusContent.setBounds(start_label_right, n, 600 -20 - start_label_right, size_height_label + sep - 3); + statusContent.setBounds(start_label_right, n, 600 - 20 - start_label_right, size_height_label + sep - 3); parent.getContentPane().add(statusContent); n += sep;