Cleanup: indentation

This commit is contained in:
Laurent Clouet
2015-01-20 22:06:05 +01:00
parent e391f08f66
commit da5fbabb91
6 changed files with 16 additions and 16 deletions

View File

@@ -142,8 +142,8 @@ public class Client {
this.renderingJob = null; this.renderingJob = null;
while (this.running == true) { while (this.running == true) {
synchronized(this) { synchronized (this) {
while(this.suspended) { while (this.suspended) {
wait(); wait();
} }
} }
@@ -531,7 +531,7 @@ public class Client {
Map<String, String> new_env = new HashMap<String, String>(); Map<String, String> new_env = new HashMap<String, String>();
new_env.put("BLENDER_USER_CONFIG", this.config.workingDirectory.getAbsolutePath().replace("\\", "\\\\")); new_env.put("BLENDER_USER_CONFIG", this.config.workingDirectory.getAbsolutePath().replace("\\", "\\\\"));
int index = 0; int index = 0;
for (int i = 0; i < command1.length; i++) { for (int i = 0; i < command1.length; i++) {
if (command1[i].equals(".c")) { if (command1[i].equals(".c")) {
@@ -759,7 +759,7 @@ public class Client {
if (md5_local.equals(ajob.getRenderMd5()) == false) { if (md5_local.equals(ajob.getRenderMd5()) == false) {
this.log.error("Client::downloadExecutable mismatch on md5 local: '" + md5_local + "' server: '" + ajob.getRenderMd5() + "'"); 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 -10;
} }
return 0; return 0;
@@ -883,7 +883,7 @@ public class Client {
String[] parts = buf.split("-"); String[] parts = buf.split("-");
if (parts != null && parts.length == 2) { if (parts != null && parts.length == 2) {
try { try {
int current = Integer.parseInt(parts[0]); int current = Integer.parseInt(parts[0]);
int total = Integer.parseInt(parts[1]); int total = Integer.parseInt(parts[1]);
if (total != 0) { if (total != 0) {
this.gui.status(String.format("Rendering %s %%", (int) (100.0 * current / total))); this.gui.status(String.format("Rendering %s %%", (int) (100.0 * current / total)));

View File

@@ -111,13 +111,13 @@ public class Job {
} }
public void setAskForRendererKill(boolean val) { public void setAskForRendererKill(boolean val) {
askForRendererKill = val; askForRendererKill = val;
} }
public boolean getAskForRendererKill() { public boolean getAskForRendererKill() {
return askForRendererKill; return askForRendererKill;
} }
public void setProcess(Process val) { public void setProcess(Process val) {
process = val; process = val;
} }

View File

@@ -84,5 +84,5 @@ public class CPU {
public boolean haveData() { public boolean haveData() {
return this.name != null && this.model != null && this.family != null && this.arch != null; return this.name != null && this.model != null && this.family != null && this.arch != null;
} }
} }

View File

@@ -33,7 +33,7 @@ public abstract class OS {
public abstract int getMemory(); public abstract int getMemory();
public abstract String getRenderBinaryPath(); public abstract String getRenderBinaryPath();
public String getCUDALib() { public String getCUDALib() {
return null; return null;
} }

View File

@@ -269,7 +269,7 @@ public class Worker {
if (ui_type.equals("oneline")) { if (ui_type.equals("oneline")) {
if (config.getPrintLog()) { if (config.getPrintLog()) {
System.out.println("OneLine UI can not be used if verbose mode is enabled"); System.out.println("OneLine UI can not be used if verbose mode is enabled");
System.exit(2); System.exit(2);
} }
gui = new GuiTextOneLine(); gui = new GuiTextOneLine();
} }

View File

@@ -58,7 +58,7 @@ public class Working implements Activity {
statusContent.setVerticalAlignment(JLabel.TOP); statusContent.setVerticalAlignment(JLabel.TOP);
statusContent.setVerticalTextPosition(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); parent.getContentPane().add(statusContent);
n += sep; n += sep;