Last of the abstraction (I think)

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

src/uk/org/ownage/dmdirc/Channel.java

@@ -830,22 +830,4 @@ public final class Channel extends FrameContainer implements IChannelMessage,
     public String toString() {
         return channelInfo.getName();
     }
-    
-    /**
-     * Formats the specified arguments using the supplied message type, and
-     * outputs to the main text area.
-     * @param messageType the message type to use
-     * @param args the arguments to pass
-     */
-    public void addLine(final String messageType, final Object... args) {
-        frame.addLine(messageType, args);
-    }
-    
-    /**
-     * Retrieves the icon used by the channel frame.
-     * @return The channel frame's icon
-     */
-    public ImageIcon getIcon() {
-        return imageIcon;
-    }
 }

src/uk/org/ownage/dmdirc/FrameContainer.java

@@ -45,7 +45,10 @@ public abstract class FrameContainer implements InternalFrameListener {
     
     /** The colour of our frame's notifications. */
     protected Color notification = Color.BLACK;
-            
+    
+    /** The icon being used for this container's frame. */
+    protected ImageIcon imageIcon;
+    
     /**
      * Returns the internal frame associated with this object.
      * @return The internal frame associated with this object
@@ -58,13 +61,6 @@ public abstract class FrameContainer implements InternalFrameListener {
      */
     public abstract String toString();
     
-    /**
-     * Returns a reference to the icon that is currently being used by the
-     * frame.
-     * @return The frame's icon
-     */
-    public abstract ImageIcon getIcon();
-    
     /**
      * Closes this container (and it's associated frame).
      */
@@ -76,6 +72,24 @@ public abstract class FrameContainer implements InternalFrameListener {
      */
     public abstract Server getServer();
     
+    /**
+     * Retrieves the icon used by the query frame.
+     * @return The query frame's icon
+     */
+    public ImageIcon getIcon() {
+        return imageIcon;
+    }
+    
+    /**
+     * Formats the specified arguments using the supplied message type, and
+     * outputs to the main text area.
+     * @param messageType the message type to use
+     * @param args the arguments to pass
+     */
+    public void addLine(final String messageType, final Object... args) {
+        getFrame().addLine(messageType, args);
+    }
+    
     /**
      * Returns the config manager for this container.
      * @return the associated config manager
@@ -89,7 +103,7 @@ public abstract class FrameContainer implements InternalFrameListener {
      */
     public void activateFrame() {
         MainFrame.getMainFrame().setActiveFrame((JInternalFrame) getFrame());
-    }    
+    }
     
     /**
      * Clears any outstanding notifications this frame has set.
@@ -124,7 +138,7 @@ public abstract class FrameContainer implements InternalFrameListener {
      */
     public Color getNotification() {
         return notification;
-    }    
+    }
     
     /**
      * Determines if the specified frame is owned by this object.

src/uk/org/ownage/dmdirc/Query.java

@@ -30,7 +30,6 @@ import uk.org.ownage.dmdirc.actions.ActionManager;
 import uk.org.ownage.dmdirc.actions.CoreActionType;
 import uk.org.ownage.dmdirc.commandparser.CommandManager;
 import uk.org.ownage.dmdirc.commandparser.CommandWindow;
-import uk.org.ownage.dmdirc.identities.ConfigManager;
 import uk.org.ownage.dmdirc.logger.ErrorLevel;
 import uk.org.ownage.dmdirc.logger.Logger;
 import uk.org.ownage.dmdirc.parser.ClientInfo;
@@ -83,6 +82,8 @@ public final class Query extends FrameContainer implements IPrivateAction,
      * @param newServer The server object that this Query belongs to
      */
     public Query(final Server newServer, final String newHost) {
+        super();
+        
         this.server = newServer;
         this.host = newHost;
         
@@ -308,22 +309,4 @@ public final class Query extends FrameContainer implements IPrivateAction,
         
         MainFrame.getMainFrame().setActiveFrame(frame);
     }
-    
-    /**
-     * Formats the specified arguments using the supplied message type, and
-     * outputs to the main text area.
-     * @param messageType the message type to use
-     * @param args the arguments to pass
-     */
-    public void addLine(final String messageType, final Object... args) {
-        frame.addLine(messageType, args);
-    }
-    
-    /**
-     * Retrieves the icon used by the query frame.
-     * @return The query frame's icon
-     */
-    public ImageIcon getIcon() {
-        return imageIcon;
-    }
 }

src/uk/org/ownage/dmdirc/Raw.java

@@ -48,10 +48,6 @@ public final class Raw extends FrameContainer implements IDataIn, IDataOut {
      * A serverframe instance used for displaying the raw data.
      */
     private ServerFrame frame;
-    /**
-     * The icon being used for this raw frame.
-     */
-    private final ImageIcon imageIcon;
     
     /**
      * Creates a new instance of Raw.
@@ -106,7 +102,7 @@ public final class Raw extends FrameContainer implements IDataIn, IDataOut {
      * @param data The data that was received
      */
     public void onDataIn(final IRCParser parser, final String data) {
-        frame.addLine("rawIn", data);
+        addLine("rawIn", data);
     }
     
     /**
@@ -118,7 +114,7 @@ public final class Raw extends FrameContainer implements IDataIn, IDataOut {
      */
     public void onDataOut(final IRCParser parser, final String data,
             final boolean fromParser) {
-        frame.addLine("rawOut", data);
+        addLine("rawOut", data);
     }
     
     /**
@@ -129,14 +125,6 @@ public final class Raw extends FrameContainer implements IDataIn, IDataOut {
         return "Raw";
     }
     
-    /**
-     * Retrieves the icon used by the raw frame.
-     * @return The raw frame's icon
-     */
-    public ImageIcon getIcon() {
-        return imageIcon;
-    }
-    
     /**
      * Returns the server instance associated with this frame.
      *

src/uk/org/ownage/dmdirc/Server.java

@@ -215,7 +215,7 @@ public final class Server extends FrameContainer implements IChannelSelfJoin,
         imageIcon = new ImageIcon(imageURL);
         frame.setFrameIcon(imageIcon);
         
-        frame.addLine("serverConnecting", server, port);
+        addLine("serverConnecting", server, port);
         sendNotification();
         
         final MyInfo myInfo = new MyInfo();
@@ -656,7 +656,7 @@ public final class Server extends FrameContainer implements IChannelSelfJoin,
             query.addLine(messageType, args);
             query.sendNotification();
         }
-        frame.addLine(messageType, args);
+        addLine(messageType, args);
         sendNotification();
     }
     
@@ -676,7 +676,7 @@ public final class Server extends FrameContainer implements IChannelSelfJoin,
             }
         }
         if ("server".equals(target)) {
-            frame.addLine(messageType, args);
+            addLine(messageType, args);
             sendNotification();
         } else if ("all".equals(target)) {
             addLineToAll(messageType, args);
@@ -841,7 +841,7 @@ public final class Server extends FrameContainer implements IChannelSelfJoin,
      * @param sData The message at the start of the MOTD
      */
     public void onMOTDStart(final IRCParser tParser, final String sData) {
-        frame.addLine("motdStart", sData);
+        addLine("motdStart", sData);
         sendNotification();
     }
     
@@ -851,7 +851,7 @@ public final class Server extends FrameContainer implements IChannelSelfJoin,
      * @param sData The line of the MOTD
      */
     public void onMOTDLine(final IRCParser tParser, final String sData) {
-        frame.addLine("motdLine", sData);
+        addLine("motdLine", sData);
         sendNotification();
     }
     
@@ -861,7 +861,7 @@ public final class Server extends FrameContainer implements IChannelSelfJoin,
      * @param noMOTD Indicates that there was no MOTD
      */
     public void onMOTDEnd(final IRCParser tParser, final boolean noMOTD) {
-        frame.addLine("motdEnd", "End of server's MOTD.");
+        addLine("motdEnd", "End of server's MOTD.");
         sendNotification();
     }
     
@@ -1045,14 +1045,6 @@ public final class Server extends FrameContainer implements IChannelSelfJoin,
         return this.server;
     }
     
-    /**
-     * Returns the server frame's icon.
-     * @return The server frame's icon
-     */
-    public ImageIcon getIcon() {
-        return imageIcon;
-    }
-    
     /**
      * Returns the server instance associated with this frame.
      *