diff --git a/src/com/sheepit/client/standalone/GuiSwing.java b/src/com/sheepit/client/standalone/GuiSwing.java index e173712..cf6486a 100644 --- a/src/com/sheepit/client/standalone/GuiSwing.java +++ b/src/com/sheepit/client/standalone/GuiSwing.java @@ -35,6 +35,7 @@ import com.sheepit.client.standalone.swing.activity.Settings; import com.sheepit.client.standalone.swing.activity.Working; public class GuiSwing extends JFrame implements Gui { + public static final String type = "swing"; public enum ActivityType { WORKING, SETTINGS } diff --git a/src/com/sheepit/client/standalone/GuiText.java b/src/com/sheepit/client/standalone/GuiText.java index a9b7cfa..b8cb620 100644 --- a/src/com/sheepit/client/standalone/GuiText.java +++ b/src/com/sheepit/client/standalone/GuiText.java @@ -24,6 +24,8 @@ import com.sheepit.client.Gui; import com.sheepit.client.Log; public class GuiText implements Gui { + public static final String type = "text"; + private int framesRendered; private Log log; diff --git a/src/com/sheepit/client/standalone/GuiTextOneLine.java b/src/com/sheepit/client/standalone/GuiTextOneLine.java index 522f771..a62f5b3 100644 --- a/src/com/sheepit/client/standalone/GuiTextOneLine.java +++ b/src/com/sheepit/client/standalone/GuiTextOneLine.java @@ -4,6 +4,8 @@ import com.sheepit.client.Client; import com.sheepit.client.Gui; public class GuiTextOneLine implements Gui { + public static final String type = "oneLine"; + private int rendered; private int remaining; private String status; diff --git a/src/com/sheepit/client/standalone/Worker.java b/src/com/sheepit/client/standalone/Worker.java index 0a57807..2d546a3 100644 --- a/src/com/sheepit/client/standalone/Worker.java +++ b/src/com/sheepit/client/standalone/Worker.java @@ -82,7 +82,7 @@ public class Worker { private String extras = null; @Option(name = "-ui", usage = "Specify the user interface to use, default 'swing', available 'oneline', 'text', 'swing' (graphical)", required = false) - private String ui_type = "swing"; + private String ui_type = GuiSwing.type; @Option(name = "-config", usage = "Specify the configuration file", required = false) private String config_file = null; @@ -261,7 +261,6 @@ public class Worker { config.setComputeMethod(compute_method); - if (config_file != null) { if (new File(config_file).exists() == false) { System.err.println("Configuration file not found."); @@ -275,14 +274,14 @@ public class Worker { Gui gui; switch (ui_type) { - case "oneline": + case GuiTextOneLine.type: if (config.getPrintLog()) { System.out.println("OneLine UI can not be used if verbose mode is enabled"); System.exit(2); } gui = new GuiTextOneLine(); break; - case "swing": + case GuiSwing.type: 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).");