More abstraction (core no longer deals with internal frame listener stuff)

This breaks the raw window quite impressively, will be fixed when it's made into a custom window.

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

src/com/dmdirc/Channel.java

@@ -132,7 +132,6 @@ public final class Channel extends WritableFrameContainer implements
                 public void run() {
                     frame = new ChannelFrame(Channel.this);
                     MainFrame.getMainFrame().addChild(frame);
-                    frame.addInternalFrameListener(Channel.this);
                     frame.setFrameIcon(imageIcon);
                     frame.getInputHandler().setTabCompleter(tabCompleter);
                 }

src/com/dmdirc/FrameContainer.java

@@ -25,7 +25,6 @@ package com.dmdirc;
 import com.dmdirc.identities.ConfigManager;
 import com.dmdirc.logger.ErrorLevel;
 import com.dmdirc.logger.Logger;
-import com.dmdirc.ui.interfaces.InputWindow;
 import com.dmdirc.ui.MainFrame;
 import com.dmdirc.ui.interfaces.Window;
 
@@ -33,16 +32,14 @@ import java.awt.Color;
 import java.beans.PropertyVetoException;
 
 import javax.swing.ImageIcon;
-import javax.swing.event.InternalFrameEvent;
-import javax.swing.event.InternalFrameListener;
 
 /**
  * The frame container implements basic methods that should be present in
  * all objects that handle a frame.
- * 
+ *
  * @author chris
  */
-public abstract class FrameContainer implements InternalFrameListener {
+public abstract class FrameContainer {
     
     /** The colour of our frame's notifications. */
     protected Color notification = Color.BLACK;
@@ -52,13 +49,14 @@ public abstract class FrameContainer implements InternalFrameListener {
     
     /**
      * Returns the internal frame associated with this object.
-     * 
+     *
      * @return The internal frame associated with this object
      */
     public abstract Window getFrame();
     
     /**
      * Returns a string identifier for this object/its frame.
+     *
      * @return String identifier
      */
     public abstract String toString();
@@ -70,12 +68,14 @@ public abstract class FrameContainer implements InternalFrameListener {
     
     /**
      * Returns the server instance associated with this container.
+     *
      * @return the associated server connection
      */
     public abstract Server getServer();
     
     /**
      * Retrieves the icon used by the query frame.
+     *
      * @return The query frame's icon
      */
     public ImageIcon getIcon() {
@@ -84,6 +84,7 @@ public abstract class FrameContainer implements InternalFrameListener {
     
     /**
      * Returns the config manager for this container.
+     *
      * @return the associated config manager
      */
     public ConfigManager getConfigManager() {
@@ -107,6 +108,7 @@ public abstract class FrameContainer implements InternalFrameListener {
     
     /**
      * Sends a notification to the frame manager if this fame isn't active.
+     *
      * @param colour The colour to use for the notification
      */
     public void sendNotification(final Color colour) {
@@ -119,6 +121,7 @@ public abstract class FrameContainer implements InternalFrameListener {
     
     /**
      * Retrieves the current notification colour of this channel.
+     *
      * @return This channel's notification colour
      */
     public Color getNotification() {
@@ -127,6 +130,7 @@ public abstract class FrameContainer implements InternalFrameListener {
     
     /**
      * Determines if the specified frame is owned by this object.
+     *
      * @param target Window to check ownership of
      * @return True iff frame is owned by this container, false otherwise
      */
@@ -135,10 +139,9 @@ public abstract class FrameContainer implements InternalFrameListener {
     }
     
     /**
-     * Invoked when a internal frame has been opened.
-     * @param internalFrameEvent frame opened event
+     * Invoked when our window has been opened.
      */
-    public void internalFrameOpened(final InternalFrameEvent internalFrameEvent) {
+    public void windowOpened() {
         final boolean pref = getServer().getConfigManager().getOptionBool("ui", "maximisewindows");
         if (pref || MainFrame.getMainFrame().getMaximised()) {
             try {
@@ -150,42 +153,23 @@ public abstract class FrameContainer implements InternalFrameListener {
     }
     
     /**
-     * Invoked when an internal frame is in the process of being closed.
-     * @param internalFrameEvent frame closing event
+     * Invoked when our window is closing.
      */
-    public void internalFrameClosing(final InternalFrameEvent internalFrameEvent) {
+    public void windowClosing() {
         close();
     }
     
     /**
-     * Invoked when an internal frame has been closed.
-     * @param internalFrameEvent frame closed event
-     */
-    public void internalFrameClosed(final InternalFrameEvent internalFrameEvent) {
-        //Ignore.
-    }
-    
-    /**
-     * Invoked when an internal frame is iconified.
-     * @param internalFrameEvent frame iconified event
-     */
-    public void internalFrameIconified(final InternalFrameEvent internalFrameEvent) {
-        //Ignore.
-    }
-    
-    /**
-     * Invoked when an internal frame is de-iconified.
-     * @param internalFrameEvent frame deiconified event
+     * Invoked when our window has been closed.
      */
-    public void internalFrameDeiconified(final InternalFrameEvent internalFrameEvent) {
-        //Ignore.
+    public void windowClosed() {
+        // Ignore.
     }
     
     /**
-     * Invoked when an internal frame is activated.
-     * @param internalFrameEvent frame activation event
+     * Invoked when our window is activated.
      */
-    public void internalFrameActivated(final InternalFrameEvent internalFrameEvent) {
+    public void windowActivated() {
         if (MainFrame.getMainFrame().getMaximised()) {
             try {
                 getFrame().setMaximum(true);
@@ -199,11 +183,10 @@ public abstract class FrameContainer implements InternalFrameListener {
     }
     
     /**
-     * Invoked when an internal frame is de-activated.
-     * @param internalFrameEvent frame deactivation event
+     * Invoked when our window is deactivated.
      */
-    public void internalFrameDeactivated(final InternalFrameEvent internalFrameEvent) {
-        //Ignore.
+    public void windowDeactivated() {
+        // Do nothing.
     }
     
 }

src/com/dmdirc/Query.java

@@ -85,7 +85,6 @@ public final class Query extends WritableFrameContainer implements
         ActionManager.processEvent(CoreActionType.QUERY_OPENED, null, this);
         
         MainFrame.getMainFrame().addChild(frame);
-        frame.addInternalFrameListener(this);
         frame.setFrameIcon(imageIcon);
         
         if (!Config.getOptionBool("general", "hidequeries")) {

src/com/dmdirc/Raw.java

@@ -63,7 +63,6 @@ public final class Raw extends FrameContainer implements IDataIn, IDataOut {
         
         frame = new ServerFrame(server);
         frame.setTitle("(Raw log)");
-        frame.addInternalFrameListener(this);
         MainFrame.getMainFrame().addChild(frame);
         frame.getInputHandler().setTabCompleter(server.getTabCompleter());
         frame.setFrameIcon(imageIcon);

src/com/dmdirc/Server.java

@@ -170,7 +170,6 @@ public final class Server extends WritableFrameContainer implements
         
         window.getInputHandler().setTabCompleter(tabCompleter);
         
-        ((ServerFrame) window).addInternalFrameListener(this);
         MainFrame.getMainFrame().addChild(window);
         
         window.open();
@@ -267,7 +266,7 @@ public final class Server extends WritableFrameContainer implements
         
         away = false;
         awayMessage = null;
-        ((ServerFrame) window).setAway(false);
+        window.setAwayIndicator(false);
         
         try {
             new Thread(parser).start();
@@ -499,11 +498,6 @@ public final class Server extends WritableFrameContainer implements
             parser.getCallbackManager().delAllCallback(this);
         }
         
-        if (window != null) {
-            // Unregister frame callbacks
-            ((ServerFrame) window).removeInternalFrameListener(this);
-        }
-        
         // Disconnect from the server
         disconnect(reason);
         // Close all channel windows
@@ -941,7 +935,7 @@ public final class Server extends WritableFrameContainer implements
             ActionManager.processEvent(CoreActionType.SERVER_BACK, null, this);
         }
         
-        ((ServerFrame) window).setAway(away);
+        window.setAwayIndicator(away);
     }
     
     /** {@inheritDoc} */

src/com/dmdirc/ui/ServerFrame.java

@@ -30,6 +30,7 @@ import com.dmdirc.commandparser.ServerCommandParser;
 import com.dmdirc.ui.input.InputHandler;
 import com.dmdirc.ui.components.InputFrame;
 import com.dmdirc.ui.interfaces.ServerWindow;
+import java.awt.BorderLayout;
 
 import java.awt.GridBagConstraints;
 import java.awt.GridBagLayout;
@@ -79,23 +80,34 @@ public final class ServerFrame extends InputFrame implements ServerWindow {
     
     /**
      * Sets the away status for this and all associated frames.
+     *
      * @param newAwayState away state
      */
-    public void setAway(final boolean newAwayState) {
-        if (Config.hasOption("ui", "awayindicator")
-                && Config.getOptionBool("ui", "awayindicator")) {
-            setAwayIndicator(newAwayState);
-            
-            if (getContainer().getServer().getRaw() != null) {
-                ((InputFrame) getContainer().getServer().getRaw().getFrame()).setAwayIndicator(newAwayState);
-            }
-            
-            for (String channel : getContainer().getServer().getChannels()) {
-                ((InputFrame) getContainer().getServer().getChannel(channel).getFrame()).setAwayIndicator(newAwayState);
+    @Override
+    public void setAwayIndicator(final boolean newAwayState) {
+        if (Config.getOptionBool("ui", "awayindicator")) {
+            if (newAwayState) {
+                inputPanel.add(awayLabel, BorderLayout.LINE_START);
+                awayLabel.setVisible(true);
+            } else {
+                awayLabel.setVisible(false);
             }
             
-            for (String query : getContainer().getServer().getQueries()) {
-                ((InputFrame) getContainer().getServer().getQuery(query).getFrame()).setAwayIndicator(newAwayState);
+            // Hack++. To be removed when raw window is no longer a server frame
+            if (!getContainer().getServer().getRaw().getFrame().equals(this)) {
+                
+                if (getContainer().getServer().getRaw() != null) {
+                    getContainer().getServer().getRaw().getFrame().setAwayIndicator(newAwayState);
+                }
+                
+                for (String channel : getContainer().getServer().getChannels()) {
+                    getContainer().getServer().getChannel(channel).getFrame().setAwayIndicator(newAwayState);
+                }
+                
+                for (String query : getContainer().getServer().getQueries()) {
+                    getContainer().getServer().getQuery(query).getFrame().setAwayIndicator(newAwayState);
+                }
+                
             }
         }
     }

src/com/dmdirc/ui/components/Frame.java

@@ -279,21 +279,21 @@ public abstract class Frame extends JInternalFrame implements InputWindow,
      * Not needed for this class. {@inheritDoc}
      */
     public void internalFrameOpened(final InternalFrameEvent event) {
-        //Ignore.
+        parent.windowOpened();
     }
     
     /**
      * Not needed for this class. {@inheritDoc}
      */
     public void internalFrameClosing(final InternalFrameEvent event) {
-        //Ignore.
+        parent.windowClosing();
     }
     
     /**
      * Not needed for this class. {@inheritDoc}
      */
     public void internalFrameClosed(final InternalFrameEvent event) {
-        //Ignore.
+        parent.windowClosed();
     }
     
     /**
@@ -314,14 +314,14 @@ public abstract class Frame extends JInternalFrame implements InputWindow,
      * Activates the input field on frame focus. {@inheritDoc}
      */
     public void internalFrameActivated(final InternalFrameEvent event) {
-        //Ignore.
+        parent.windowActivated();
     }
     
     /**
      * Not needed for this class. {@inheritDoc}
      */
     public void internalFrameDeactivated(final InternalFrameEvent event) {
-        //Ignore.
+        parent.windowDeactivated();
     }
     
     /** {@inheritDoc} */

src/com/dmdirc/ui/components/InputFrame.java

@@ -52,7 +52,6 @@ import javax.swing.AbstractAction;
 import javax.swing.BorderFactory;
 import javax.swing.JLabel;
 import javax.swing.JMenuItem;
-import javax.swing.JOptionPane;
 import javax.swing.JPanel;
 import javax.swing.JPopupMenu;
 import javax.swing.JTextField;
@@ -107,7 +106,7 @@ public abstract class InputFrame extends Frame implements
     private Robot robot;
     
     /** Away label. */
-    private JLabel awayLabel;
+    protected JLabel awayLabel;
     
     /**
      * Creates a new instance of InputFrame.
@@ -313,35 +312,35 @@ public abstract class InputFrame extends Frame implements
      * Not needed for this class. {@inheritDoc}
      */
     public void internalFrameOpened(final InternalFrameEvent event) {
-        //Ignore.
+        super.internalFrameOpened(event);
     }
     
     /**
      * Not needed for this class. {@inheritDoc}
      */
     public void internalFrameClosing(final InternalFrameEvent event) {
-        //Ignore.
+        super.internalFrameClosing(event);
     }
     
     /**
      * Not needed for this class. {@inheritDoc}
      */
     public void internalFrameClosed(final InternalFrameEvent event) {
-        //Ignore.
+        super.internalFrameClosed(event);
     }
     
     /**
      * Makes the internal frame invisible. {@inheritDoc}
      */
     public void internalFrameIconified(final InternalFrameEvent event) {
-        //Ignore.
+        super.internalFrameIconified(event);
     }
     
     /**
      * Not needed for this class. {@inheritDoc}
      */
     public void internalFrameDeiconified(final InternalFrameEvent event) {
-        //Ignore.
+        super.internalFrameDeiconified(event);
     }
     
     /**
@@ -349,6 +348,7 @@ public abstract class InputFrame extends Frame implements
      */
     public void internalFrameActivated(final InternalFrameEvent event) {
         getInputField().requestFocus();
+        
         super.internalFrameActivated(event);
     }
     
@@ -356,7 +356,7 @@ public abstract class InputFrame extends Frame implements
      * Not needed for this class. {@inheritDoc}
      */
     public void internalFrameDeactivated(final InternalFrameEvent event) {
-        //Ignore.
+        super.internalFrameDeactivated(event);
     }
     
     /** {@inheritDoc} */

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

@@ -47,4 +47,12 @@ public interface InputWindow extends Window {
      */
     InputHandler getInputHandler();
     
+    /**
+     * Toggles the away-status indicator for this input window, if the UI
+     * supports it.
+     * 
+     * @param isAway Whether the away indicator should be displayed or not
+     */
+    void setAwayIndicator(boolean isAway);
+    
 }