Refactoring - boolean getters and miscellaneous

[fanfix.git] / src / jexer / demos / Demo1.java

diff --git a/src/jexer/demos/Demo1.java b/src/jexer/demos/Demo1.java
index f0a8c59387278659b13c0d4bcba1b5502a8619e9..f8ede8578465370bd0348000bff37958ef7227ee 100644 (file)
--- a/src/jexer/demos/Demo1.java
+++ b/src/jexer/demos/Demo1.java
@@ -422,17 +422,16 @@ class DemoMainWindow extends TWindow {
         progressBar = addProgressBar(1, row, 22, 0);
         row++;
         timerLabel = addLabel("Timer", 1, row);
-        timer = getApplication().addTimer(100, true,
+        timer = getApplication().addTimer(250, true,
             new TAction() {
 
                 public void DO() {
-                    timerLabel.setText(String.format("Timer: %d", timerI));
-                    timerLabel.setWidth(timerLabel.getText().length());
+                    timerLabel.setLabel(String.format("Timer: %d", timerI));
+                    timerLabel.setWidth(timerLabel.getLabel().length());
                     if (timerI < 100) {
                         timerI++;
                     }
                     progressBar.setValue(timerI);
-                    DemoMainWindow.this.setRepaint();
                 }
             }
         );
@@ -447,10 +446,11 @@ class DemoApplication extends TApplication {
     /**
      * Public constructor.
      *
+     * @param backendType one of the TApplication.BackendType values
      * @throws Exception if TApplication can't instantiate the Backend.
      */
-    public DemoApplication() throws Exception {
-        super(null, null);
+    public DemoApplication(BackendType backendType) throws Exception {
+        super(backendType);
         new DemoMainWindow(this);
 
         // Add the menus
@@ -495,8 +495,21 @@ public class Demo1 {
      */
     public static void main(final String [] args) {
         try {
-            DemoApplication app = new DemoApplication();
-            app.run();
+            // Swing is the default backend on Windows unless explicitly
+            // overridden by jexer.Swing.
+            TApplication.BackendType backendType = TApplication.BackendType.XTERM;
+            if (System.getProperty("os.name").startsWith("Windows")) {
+                backendType = TApplication.BackendType.SWING;
+            }
+            if (System.getProperty("jexer.Swing") != null) {
+                if (System.getProperty("jexer.Swing", "false").equals("true")) {
+                    backendType = TApplication.BackendType.SWING;
+                } else {
+                    backendType = TApplication.BackendType.XTERM;
+                }
+            }
+            DemoApplication app = new DemoApplication(backendType);
+            (new Thread(app)).start();
         } catch (Exception e) {
             e.printStackTrace();
         }