Cleanup: switch instead of ifs
This commit is contained in:
committed by
Laurent Clouet
parent
bda6691159
commit
3497ff7333
@@ -537,7 +537,8 @@ public class Client {
|
||||
new_env.put("BLENDER_USER_CONFIG", this.config.workingDirectory.getAbsolutePath().replace("\\", "\\\\"));
|
||||
|
||||
for (String arg : command1) {
|
||||
if (arg.equals(".c")) {
|
||||
switch (arg) {
|
||||
case ".c":
|
||||
command.add(ajob.getScenePath());
|
||||
command.add("-P");
|
||||
|
||||
@@ -560,23 +561,24 @@ public class Client {
|
||||
return Error.Type.UNKNOWN;
|
||||
}
|
||||
script_file.deleteOnExit();
|
||||
}
|
||||
else if (arg.equals(".e")) {
|
||||
break;
|
||||
case ".e":
|
||||
command.add(ajob.getRendererPath());
|
||||
// the number of cores has to be put after the binary and before the scene arg
|
||||
if (this.config.getNbCores() > 0) {
|
||||
command.add("-t");
|
||||
command.add(Integer.toString(this.config.getNbCores()));
|
||||
}
|
||||
}
|
||||
else if (arg.equals(".o")) {
|
||||
break;
|
||||
case ".o":
|
||||
command.add(this.config.workingDirectory.getAbsolutePath() + File.separator + ajob.getPrefixOutputImage());
|
||||
}
|
||||
else if (arg.equals(".f")) {
|
||||
break;
|
||||
case ".f":
|
||||
command.add(ajob.getFrameNumber());
|
||||
}
|
||||
else {
|
||||
break;
|
||||
default:
|
||||
command.add(arg);
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -266,23 +266,25 @@ public class Worker {
|
||||
Log.getInstance(config).debug("client version " + config.getJarVersion());
|
||||
|
||||
Gui gui;
|
||||
if (ui_type.equals("oneline")) {
|
||||
switch (ui_type) {
|
||||
case "oneline":
|
||||
if (config.getPrintLog()) {
|
||||
System.out.println("OneLine UI can not be used if verbose mode is enabled");
|
||||
System.exit(2);
|
||||
}
|
||||
gui = new GuiTextOneLine();
|
||||
}
|
||||
else if (ui_type.equals("swing")) {
|
||||
break;
|
||||
case "swing":
|
||||
if (java.awt.GraphicsEnvironment.isHeadless()) {
|
||||
System.out.println("Graphical ui can not be launch.");
|
||||
System.out.println("You should set a DISPLAY or use a text ui (via -ui oneline or -ui text).");
|
||||
System.exit(3);
|
||||
}
|
||||
gui = new GuiSwing();
|
||||
}
|
||||
else {
|
||||
break;
|
||||
default:
|
||||
gui = new GuiText();
|
||||
break;
|
||||
}
|
||||
Client cli = new Client(gui, config, server);
|
||||
gui.setClient(cli);
|
||||
|
||||
Reference in New Issue
Block a user