More work on dummy UI

git-svn-id: http://svn.dmdirc.com/trunk@1844 00569f92-eb28-0410-84fd-f71c24880f

src/com/dmdirc/Main.java

@@ -62,7 +62,7 @@ public final class Main {
     /**
      * The UI to use for the client.
      */
-    private static UIController controller = new SwingController();
+    private static UIController controller;
     
     /**
      * Prevents creation of main.
@@ -78,10 +78,6 @@ public final class Main {
     public static void main(final String[] args) {
         Thread.setDefaultUncaughtExceptionHandler(new DMDircExceptionHandler());
         
-        if (GraphicsEnvironment.isHeadless()) {
-            controller = new DummyController();
-        }
-        
         final CommandLineParser clp = new CommandLineParser(args);
         
         IdentityManager.load();
@@ -100,7 +96,7 @@ public final class Main {
         
         new ThemeManager().loadDefaultTheme();
         
-        Main.getUI().getMainWindow();
+        getUI().getMainWindow();
         
         if (!Config.hasOption("general", "firstRun") || Config.getOptionBool("general", "firstRun")) {
             Config.setOption("general", "firstRun", "false");
@@ -140,6 +136,14 @@ public final class Main {
      * @return The client's UI controller
      */
     public static UIController getUI() {
+        if (controller == null) {
+            if (GraphicsEnvironment.isHeadless()) {
+                controller = new DummyController();
+            } else {
+                controller = new SwingController();
+            }
+        }
+        
         return controller;
     }
     

src/com/dmdirc/ui/dummy/DummyController.java

@@ -67,7 +67,7 @@ public class DummyController implements UIController {
     
     /** {@inheritDoc} */
     public StatusBar getStatusBar() {
-        throw new UnsupportedOperationException("Not supported yet.");
+        return new DummyStatusBar();
     }
     
     /** {@inheritDoc} */

src/com/dmdirc/ui/dummy/DummyMainWindow.java

@@ -85,7 +85,7 @@ public class DummyMainWindow implements MainWindow {
     
     /** {@inheritDoc} */
     public StatusBar getStatusBar() {
-        throw new UnsupportedOperationException("Not supported yet.");
+        return new DummyStatusBar();
     }
     
     /** {@inheritDoc} */

src/com/dmdirc/ui/dummy/DummyStatusBar.java

@@ -0,0 +1,76 @@
+/*
+ * Copyright (c) 2006-2007 Chris Smith, Shane Mc Cormack, Gregory Holmes
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+package com.dmdirc.ui.dummy;
+
+import com.dmdirc.ui.interfaces.StatusBar;
+import com.dmdirc.ui.interfaces.StatusErrorNotifier;
+import com.dmdirc.ui.interfaces.StatusMessageNotifier;
+import java.awt.Component;
+import javax.swing.Icon;
+
+/**
+ *
+ * @author Chris
+ */
+public class DummyStatusBar implements StatusBar {
+
+    public DummyStatusBar() {
+    }
+
+    public void setMessage(String newMessage) {
+        System.out.println("DummyStatusBar: " + newMessage);
+    }
+
+    public void setMessage(String newMessage, StatusMessageNotifier newNotifier) {
+        System.out.println("DummyStatusBar: " + newMessage);
+    }
+
+    public void setMessage(String newMessage, StatusMessageNotifier newNotifier, int timeout) {
+        System.out.println("DummyStatusBar: " + newMessage);
+    }
+
+    public void clearMessage() {
+        System.out.println("DummyStatusBar: message cleared");
+    }
+
+    public void setError(Icon newIcon) {
+        // Do nothing
+    }
+
+    public void setError(Icon newIcon, StatusErrorNotifier newNotifier) {
+        // Do nothing
+    }
+
+    public void clearError() {
+        // Do nothing
+    }
+
+    public void addComponent(Component component) {
+        // Do nothing
+    }
+
+    public void removeComponent(Component component) {
+        // Do nothing
+    }
+
+}

src/com/dmdirc/ui/interfaces/MainWindow.java

@@ -76,7 +76,9 @@ public interface MainWindow {
      * Returns the status bar instance.
      *
      * @return SwingStatusBar instance
+     * @deprecated Use UIController.getStatusBar() instead
      */
+    @Deprecated
     StatusBar getStatusBar();
     
     /**

test/com/dmdirc/ui/messages/FormatterTest.java

@@ -8,6 +8,7 @@
 package com.dmdirc.ui.messages;
 
 import com.dmdirc.Config;
+import com.dmdirc.Main;
 import com.dmdirc.config.IdentityManager;
 import java.io.File;
 import java.util.Set;
@@ -89,7 +90,7 @@ public class FormatterTest {
         Formatter.registerDefault("unitTest_saveLoad", "");
         
         final String fileName = "unittest_formatter";
-        final File file = new File(Config.getConfigDir() + fileName);
+        final File file = new File(Main.getConfigDir() + fileName);
         
         if (file.exists()) {
             file.delete();