Code formating

This commit is contained in:
Laurent Clouet
2017-01-05 09:35:59 +01:00
parent 52e5f190c7
commit 2f00d7816d
12 changed files with 27 additions and 28 deletions

View File

@@ -703,7 +703,7 @@ public class Client {
File f = new File(ajob.getRendererPath()); File f = new File(ajob.getRendererPath());
f.setExecutable(true); f.setExecutable(true);
} }
catch (SecurityException e) { catch (SecurityException e) {
} }
} }

View File

@@ -168,7 +168,7 @@ public class Error {
case RENDERER_MISSING_LIBRARIES: case RENDERER_MISSING_LIBRARIES:
return "Failed to launch renderer. Please check if you have necessary libraries installed and if you have enough free space in your working directory."; return "Failed to launch renderer. Please check if you have necessary libraries installed and if you have enough free space in your working directory.";
case RENDERER_KILLED: case RENDERER_KILLED:
return "The renderer stopped because either you asked to stop or the server did (usually for a render time too high)."; return "The renderer stopped because either you asked to stop or the server did (usually for a render time too high).";
case RENDERER_KILLED_BY_USER: case RENDERER_KILLED_BY_USER:
return "The renderer stopped because you've blocked its project."; return "The renderer stopped because you've blocked its project.";
case RENDERER_KILLED_BY_SERVER: case RENDERER_KILLED_BY_SERVER:

View File

@@ -284,7 +284,7 @@ public class SettingsLoader {
config.setUseGPU(device); config.setUseGPU(device);
} }
} }
if (config.getNbCores() == -1 && cores != null) { if (config.getNbCores() == -1 && cores != null) {
config.setUseNbCores(Integer.valueOf(cores)); config.setUseNbCores(Integer.valueOf(cores));
} }
if (config.getUserSpecifiedACacheDir() == false && cacheDir != null && new File(cacheDir).exists()) { if (config.getUserSpecifiedACacheDir() == false && cacheDir != null && new File(cacheDir).exists()) {

View File

@@ -65,7 +65,7 @@ public abstract class OS {
else if (os.contains("nix") || os.contains("nux")) { else if (os.contains("nix") || os.contains("nux")) {
return new Linux(); return new Linux();
} }
else if(os.contains("freebsd")){ else if (os.contains("freebsd")) {
return new FreeBSD(); return new FreeBSD();
} }
else { else {

View File

@@ -83,11 +83,11 @@ public class WinProcess {
public WinProcess(int pid_) throws IOException { public WinProcess(int pid_) throws IOException {
this(); this();
this.handle = Kernel32.INSTANCE.OpenProcess(0x0400 | // PROCESS_QUERY_INFORMATION this.handle = Kernel32.INSTANCE.OpenProcess(0x0400 | // PROCESS_QUERY_INFORMATION
0x0800 | // PROCESS_SUSPEND_RESUME 0x0800 | // PROCESS_SUSPEND_RESUME
0x0001 | // PROCESS_TERMINATE 0x0001 | // PROCESS_TERMINATE
0x0200 | // PROCESS_SET_INFORMATION 0x0200 | // PROCESS_SET_INFORMATION
0x00100000, // SYNCHRONIZE 0x00100000, // SYNCHRONIZE
false, pid_); false, pid_);
if (this.handle == null) { if (this.handle == null) {
throw new IOException("OpenProcess failed: " + Kernel32Util.formatMessageFromLastErrorCode(Kernel32.INSTANCE.GetLastError()) + " (pid: " + pid_ + ")"); throw new IOException("OpenProcess failed: " + Kernel32Util.formatMessageFromLastErrorCode(Kernel32.INSTANCE.GetLastError()) + " (pid: " + pid_ + ")");
} }

View File

@@ -185,7 +185,6 @@ public class Working implements Activity {
buttonsPanel.add(blockJob); buttonsPanel.add(blockJob);
buttonsPanel.add(exitAfterFrame); buttonsPanel.add(exitAfterFrame);
parent.getContentPane().setLayout(new GridBagLayout()); parent.getContentPane().setLayout(new GridBagLayout());
GridBagConstraints global_constraints = new GridBagConstraints(); GridBagConstraints global_constraints = new GridBagConstraints();
global_constraints.fill = GridBagConstraints.HORIZONTAL; global_constraints.fill = GridBagConstraints.HORIZONTAL;