* Added Channel.close(), Raw.close() and Server.close()

* Added Server.disconnect()
* Added MainFrame.delChild()
* Implemented ServerManager.disconnectAll() and added ServerManager.closeAll()
* Raw's parser callbacks are now normal methods not AICs

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

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

@@ -155,5 +155,21 @@ public class Channel implements IRCParser.IChannelMessage,
     public Server getServer() {
         return server;
     }
+
+    void close() {
+        server.getParser().delChannelMessage(this);
+        server.getParser().delChannelTopic(this);
+        server.getParser().delChannelGotNames(this);
+        server.getParser().delChannelJoin(this);
+        server.getParser().delChannelPart(this);
+        server.getParser().delChannelQuit(this);
+        server.getParser().delChannelKick(this);
+        server.getParser().delChannelAction(this);
+        
+        frame.setVisible(false);
+        MainFrame.getMainFrame().delChild(frame);
+        frame = null;
+        server = null;
+    }
     
 }

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

@@ -31,7 +31,7 @@ import uk.org.ownage.dmdirc.ui.ServerFrame;
  * received to/from the server)
  * @author chris
  */
-public class Raw {
+public class Raw implements IRCParser.IDataIn, IRCParser.IDataOut {
     
     /**
      * The server object that's being monitored
@@ -54,17 +54,26 @@ public class Raw {
         
         MainFrame.getMainFrame().addChild(frame);
         
-        server.getParser().addDataIn(new IRCParser.IDataIn() {
-            public void onDataIn(IRCParser tParser, String sData) {
-                Raw.this.frame.addLine("<<< "+sData);
-            }
-        });
+        server.getParser().addDataIn(this);
+        server.getParser().addDataOut(this);
+    }
+
+    void close() {
+        server.getParser().delDataIn(this);
+        server.getParser().delDataOut(this);
         
-        server.getParser().addDataOut(new IRCParser.IDataOut() {
-            public void onDataOut(IRCParser tparser, String sData, boolean fromParser) {
-                Raw.this.frame.addLine(">>> "+sData);
-            }
-        });
+        frame.setVisible(false);
+        MainFrame.getMainFrame().delChild(frame);
+        frame = null;
+        server = null;
+    }
+
+    public void onDataIn(IRCParser tParser, String sData) {
+        frame.addLine("<<< "+sData);
+    }
+
+    public void onDataOut(IRCParser tParser, String sData, boolean bFromParser) {
+        frame.addLine(">>> "+sData);
     }
     
 }

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

@@ -57,6 +57,8 @@ public class Server implements IRCParser.IChannelSelfJoin, IRCParser.IErrorInfo
      */
     private IRCParser parser;
     
+    private Raw raw;
+    
     /**
      * Creates a new instance of Server
      * @param server The hostname/ip of the server to connect to
@@ -73,15 +75,15 @@ public class Server implements IRCParser.IChannelSelfJoin, IRCParser.IErrorInfo
         MainFrame.getMainFrame().addChild(frame);
         
         frame.addLine("Connecting to "+server+":"+port);
-              
+        
         parser = new IRCParser(new ServerInfo(server, port, password));
         
         parser.addChannelSelfJoin(this);
         parser.addErrorInfo(this);
-                
-        Raw raw = new Raw(this);
-              
-        try {           
+        
+        raw = new Raw(this);
+        
+        try {
             Thread thread = new Thread(parser);
             thread.start();
         } catch (Exception ex) {
@@ -89,14 +91,6 @@ public class Server implements IRCParser.IChannelSelfJoin, IRCParser.IErrorInfo
         }
     }
     
-    /**
-     * Called on destruction, the server unregisters itself with the ServerManager
-     * @throws java.lang.Throwable ...
-     */
-    protected void finalize() throws Throwable {
-        ServerManager.getServerManager().unregisterServer(this);
-    }
-    
     /**
      * Retrieves the parser used for this connection
      * @return IRCParser this connection's parser
@@ -108,15 +102,46 @@ public class Server implements IRCParser.IChannelSelfJoin, IRCParser.IErrorInfo
     public void addLine(String line) {
         frame.addLine(line);
     }
-
+    
+    public void close(String reason) {
+        // Unregister parser callbacks
+        parser.delChannelSelfJoin(this);
+        parser.delErrorInfo(this);        
+        // Disconnect from the server
+        disconnect(reason);
+        // Unregister ourselves with the server manager
+        ServerManager.getServerManager().unregisterServer(this);
+        // Close all channel windows
+        closeChannels();
+        // Close the raw window
+        raw.close();
+        // Close our own window
+        frame.setVisible(false);
+        MainFrame.getMainFrame().delChild(frame);
+        frame = null;
+        // Ditch the parser
+        parser = null;
+    }
+    
+    public void disconnect(String reason) {
+        parser.quit(reason);
+    }
+    
+    private void closeChannels() {
+        for (Channel channel : channels.values()) {
+            channel.close();
+            channels.remove(channel);
+        }
+    }
+    
     private void addChannel(ChannelInfo chan) {
         channels.put(chan.getName(), new Channel(this, chan));
     }
-
+    
     public void onChannelSelfJoin(IRCParser tParser, ChannelInfo cChannel) {
         addChannel(cChannel);
     }
-
+    
     public void onErrorInfo(IRCParser tParser, ParserError errorInfo) {
         ErrorLevel errorLevel;
         if (errorInfo.isFatal()) {

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

@@ -78,9 +78,21 @@ public class ServerManager {
      * @param message The quit message to send to the IRC servers
      */
     public void disconnectAll(String message) {
-        throw new UnsupportedOperationException("Not implemented yet");
+        for (Server server : servers) {
+            server.disconnect(message);
+        }
     }
     
+    /**
+     * Closes all servers with the specified quit message
+     * @param message The quit message to send to the IRC servers
+     */
+    public void closeAll(String message) {
+        for (Server server : servers) {
+            server.close(message);
+        }
+    }    
+    
     /**
      * Returns the number of servers that are registered with the manager
      * @return number of registered servers

src/uk/org/ownage/dmdirc/ui/MainFrame.java

@@ -89,6 +89,10 @@ public class MainFrame extends javax.swing.JFrame {
         desktopPane.add(frame);
     }
     
+    public void delChild(JInternalFrame frame) {
+        desktopPane.remove(frame);
+    }    
+    
     /**
      * Returns the JInternalFrame that is currently active
      * @return The active JInternalFrame
@@ -171,6 +175,7 @@ public class MainFrame extends javax.swing.JFrame {
         );
         pack();
     }// </editor-fold>//GEN-END:initComponents
+
     
     // Variables declaration - do not modify//GEN-BEGIN:variables
     private javax.swing.JDesktopPane desktopPane;