More of the same

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

src/com/dmdirc/actions/Action.java

@@ -22,13 +22,13 @@
 
 package com.dmdirc.actions;
 
+import com.dmdirc.Main;
 import com.dmdirc.ServerManager;
 import com.dmdirc.WritableFrameContainer;
 import com.dmdirc.commandparser.CommandParser;
 import com.dmdirc.commandparser.GlobalCommandParser;
 import com.dmdirc.logger.ErrorLevel;
 import com.dmdirc.logger.Logger;
-import com.dmdirc.ui.MainFrame;
 import com.dmdirc.ui.interfaces.InputWindow;
 import com.dmdirc.ui.interfaces.Window;
 
@@ -476,14 +476,14 @@ public class Action implements Serializable {
             }
         }
         
-        final Window active = MainFrame.getMainFrame().getActiveFrame();
+        final Window active = Main.getUI().getMainWindow().getActiveFrame();
         InputWindow cw;
         CommandParser cp = null;
         
         if (arguments.length > 0 && arguments[0] instanceof WritableFrameContainer) {
             cw = ((WritableFrameContainer) arguments[0]).getFrame();
         } else if (active != null && active instanceof InputWindow) {
-            cw = (InputWindow) MainFrame.getMainFrame().getActiveFrame();
+            cw = (InputWindow) Main.getUI().getMainWindow().getActiveFrame();
         } else if (ServerManager.getServerManager().numServers() > 0) {
             cw = ServerManager.getServerManager().getServers().get(0).getFrame();
         } else {

src/com/dmdirc/addons/lagdisplay/LagDisplayPlugin.java

@@ -23,12 +23,12 @@
 package com.dmdirc.addons.lagdisplay;
 
 import com.dmdirc.FrameContainer;
+import com.dmdirc.Main;
 import com.dmdirc.Server;
 import com.dmdirc.actions.ActionType;
 import com.dmdirc.actions.CoreActionType;
 import com.dmdirc.plugins.EventPlugin;
 import com.dmdirc.plugins.Plugin;
-import com.dmdirc.ui.MainFrame;
 import com.dmdirc.ui.interfaces.Window;
 
 import java.awt.BorderLayout;
@@ -72,12 +72,12 @@ public final class LagDisplayPlugin extends Plugin implements EventPlugin {
     
     /** {@inheritDoc} */
     public void onActivate() {
-        MainFrame.getMainFrame().getStatusBar().addComponent(panel);
+        Main.getUI().getMainWindow().getStatusBar().addComponent(panel);
     }
     
     /** {@inheritDoc} */
     public void onDeactivate() {
-        MainFrame.getMainFrame().getStatusBar().removeComponent(panel);
+        Main.getUI().getMainWindow().getStatusBar().removeComponent(panel);
     }
     
     /** {@inheritDoc} */
@@ -112,12 +112,12 @@ public final class LagDisplayPlugin extends Plugin implements EventPlugin {
     /** {@inheritDoc} */
     public void processEvent(final ActionType type, final StringBuffer format, final Object... arguments) {
         if (type.equals(CoreActionType.SERVER_GOTPING)) {
-            final Window active = MainFrame.getMainFrame().getActiveFrame();
+            final Window active = Main.getUI().getMainWindow().getActiveFrame();
             if (((Server) arguments[0]).ownsFrame(active)) {
                 label.setText(formatTime(arguments[1]));
             }
         } else if (type.equals(CoreActionType.SERVER_NOPING)) {
-            final Window active = MainFrame.getMainFrame().getActiveFrame();
+            final Window active = Main.getUI().getMainWindow().getActiveFrame();
             if (((Server) arguments[0]).ownsFrame(active)) {
                 label.setText(formatTime(arguments[1]) + "+");
             }

src/com/dmdirc/addons/logging/LoggingPlugin.java

@@ -50,9 +50,9 @@ import com.dmdirc.parser.ClientInfo;
 import com.dmdirc.parser.IRCParser;
 import com.dmdirc.plugins.Plugin;
 import com.dmdirc.plugins.EventPlugin;
-import com.dmdirc.ui.components.Frame;
 import com.dmdirc.ui.components.PreferencesInterface;
 import com.dmdirc.ui.components.PreferencesPanel;
+import com.dmdirc.ui.interfaces.Window;
 import com.dmdirc.ui.messages.Styliser;
 
 /**
@@ -351,7 +351,7 @@ public final class LoggingPlugin extends Plugin implements EventPlugin, Preferen
 					
 					// Backbuffer Display goes here!
 					if (Config.getOptionBool(MY_DOMAIN, "backbuffer.autobackbuffer")) {
-						showBackBuffer((Frame)query.getFrame(), getLogFile(client));
+						showBackBuffer(query.getFrame(), getLogFile(client));
 					}
 					
 					appendLine(getLogFile(client), "*** Query opened at: " + openedAtFormat.format(new Date()));
@@ -364,7 +364,7 @@ public final class LoggingPlugin extends Plugin implements EventPlugin, Preferen
 					
 					// Backbuffer Display goes here!
 					if (Config.getOptionBool(MY_DOMAIN, "backbuffer.autobackbuffer")) {
-						showBackBuffer((Frame)(((Channel)arguments[0]).getFrame()), getLogFile(channel));
+						showBackBuffer(((Channel)arguments[0]).getFrame(), getLogFile(channel));
 					}
 					
 					appendLine(getLogFile(channel), "*** Channel opened at: " + openedAtFormat.format(new Date()));
@@ -495,7 +495,7 @@ public final class LoggingPlugin extends Plugin implements EventPlugin, Preferen
 	 * @param frame The frame to add the backbuffer lines to
 	 * @param filename File to get backbuffer from
 	 */
-	private void showBackBuffer(final Frame frame, final String filename) {
+	private void showBackBuffer(final Window frame, final String filename) {
 		final int numLines = Config.getOptionInt(MY_DOMAIN, "backbuffer.lines", 0);
 		final String colour = Config.getOption(MY_DOMAIN, "backbuffer.colour");
 		final boolean showTimestamp = Config.getOptionBool(MY_DOMAIN, "backbuffer.timestamp");

src/com/dmdirc/addons/nickcolours/NickColourPanel.java

@@ -23,6 +23,7 @@
 package com.dmdirc.addons.nickcolours;
 
 import com.dmdirc.ui.UIUtilities;
+
 import java.awt.BorderLayout;
 import java.awt.Color;
 import java.awt.Dimension;
@@ -33,7 +34,6 @@ import javax.swing.JPanel;
 import javax.swing.JScrollPane;
 import javax.swing.JTable;
 import javax.swing.table.TableCellRenderer;
-import javax.swing.text.StyleContext.SmallAttributeSet;
 
 /**
  * Panel used for the custom nick colour settings component in the plugin's

src/com/dmdirc/addons/nowplaying/dcop/DcopMediaSourcePlugin.java

@@ -25,6 +25,7 @@ package com.dmdirc.addons.nowplaying.dcop;
 import com.dmdirc.addons.nowplaying.MediaSource;
 import com.dmdirc.addons.nowplaying.MediaSourceManager;
 import com.dmdirc.plugins.Plugin;
+
 import java.util.ArrayList;
 import java.util.List;
 

src/com/dmdirc/addons/osdplugin/OsdWindow.java

@@ -23,7 +23,7 @@
 package com.dmdirc.addons.osdplugin;
 
 import com.dmdirc.Config;
-import com.dmdirc.ui.MainFrame;
+import com.dmdirc.Main;
 import static com.dmdirc.ui.UIUtilities.LARGE_BORDER;
 
 import java.awt.BorderLayout;
@@ -64,7 +64,7 @@ public final class OsdWindow extends JDialog implements MouseListener,
      * allow itself to be moved)
      */
     public OsdWindow(final String text, final boolean config) {
-        super(MainFrame.getMainFrame(), false);
+        super(Main.getUI().getMainWindow(), false);
         
         setFocusableWindowState(false);
         setAlwaysOnTop(true);

src/com/dmdirc/addons/systray/SystrayPlugin.java

@@ -25,7 +25,6 @@ package com.dmdirc.addons.systray;
 import com.dmdirc.IconManager;
 import com.dmdirc.Main;
 import com.dmdirc.plugins.Plugin;
-import com.dmdirc.ui.MainFrame;
     
 import java.awt.AWTException;
 import java.awt.MenuItem;
@@ -91,7 +90,7 @@ public final class SystrayPlugin  extends Plugin implements ActionListener, Mous
     /** {@inheritDoc} */
     public void actionPerformed(final ActionEvent e) {
         if (e.getActionCommand().equals("Show/hide")) {
-            MainFrame.getMainFrame().setVisible(!MainFrame.getMainFrame().isVisible());
+            Main.getUI().getMainWindow().setVisible(!Main.getUI().getMainWindow().isVisible());
         } else if (e.getActionCommand().equals("Quit")) {
             Main.quit();
         }
@@ -145,17 +144,17 @@ public final class SystrayPlugin  extends Plugin implements ActionListener, Mous
     /** {@inheritDoc} */
     public void mouseClicked(final MouseEvent e) {
         if (e.getButton() == MouseEvent.BUTTON1) {
-            if (MainFrame.getMainFrame().isVisible()) {
+            if (Main.getUI().getMainWindow().isVisible()) {
                 // TODO: Uncomment the code below, with an appropriate replacement
                 //       for requestFocus() that does something more than flash.
                 
-                //if (MainFrame.getMainFrame().isActive()) {
-                MainFrame.getMainFrame().setVisible(false);
+                //if (Main.getUI().getMainWindow().isActive()) {
+                Main.getUI().getMainWindow().setVisible(false);
                 //} else {
-                //    MainFrame.getMainFrame().requestFocus();
+                //    Main.getUI().getMainWindow().requestFocus();
                 //}
             } else {
-                MainFrame.getMainFrame().setVisible(true);
+                Main.getUI().getMainWindow().setVisible(true);
             }
         }
     }

src/com/dmdirc/addons/windowstatus/WindowStatusPlugin.java

@@ -34,6 +34,7 @@ import javax.swing.SwingConstants;
 import com.dmdirc.Channel;
 import com.dmdirc.Config;
 import com.dmdirc.FrameContainer;
+import com.dmdirc.Main;
 import com.dmdirc.Query;
 import com.dmdirc.Server;
 import com.dmdirc.actions.ActionType;
@@ -44,7 +45,6 @@ import com.dmdirc.parser.ClientInfo;
 import com.dmdirc.plugins.Plugin;
 import com.dmdirc.plugins.EventPlugin;
 import com.dmdirc.ui.interfaces.InputWindow;
-import com.dmdirc.ui.MainFrame;
 import com.dmdirc.ui.components.PreferencesInterface;
 import com.dmdirc.ui.components.PreferencesPanel;
 import com.dmdirc.ui.interfaces.Window;
@@ -96,7 +96,7 @@ public final class WindowStatusPlugin extends Plugin implements EventPlugin, Pre
 	 * Called when this plugin is Activated.
 	 */
 	public void onActivate() {
-		MainFrame.getMainFrame().getStatusBar().addComponent(panel);
+		Main.getUI().getMainWindow().getStatusBar().addComponent(panel);
 		updateStatus();
 	}
 	
@@ -104,7 +104,7 @@ public final class WindowStatusPlugin extends Plugin implements EventPlugin, Pre
 	 * Called when this plugin is deactivated.
 	 */
 	public void onDeactivate() {
-		MainFrame.getMainFrame().getStatusBar().removeComponent(panel);
+		Main.getUI().getMainWindow().getStatusBar().removeComponent(panel);
 	}
 	
 	/**
@@ -159,7 +159,7 @@ public final class WindowStatusPlugin extends Plugin implements EventPlugin, Pre
 	 * Update the window status using the current active window.
 	 */
 	public void updateStatus() {
-		Window active = MainFrame.getMainFrame().getActiveFrame();
+		Window active = Main.getUI().getMainWindow().getActiveFrame();
 
 		if (active != null) {
 			FrameContainer activeFrame = ((InputWindow) active).getContainer();