* Added Raw class

* Remove default ServerFrame window
* Added AddLine method to ServerFrame
* Automatically create a new server window (quakenet)
* Server instances now create an IRC Parser and Raw instance
* Added PortInputVerifier class to NewServerDialog

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

src/dmdirc/Main.java

@@ -58,6 +58,8 @@ public class Main {
         
         MainFrame frame = MainFrame.getMainFrame();
         
+        Server serv = new Server("irc.quakenet.org", 6667);
+        
     }
     
 }

src/dmdirc/Raw.java

@@ -0,0 +1,59 @@
+/*
+ * Copyright (c) 2006-2007 Chris Smith, Shane Mc Cormack
+ *
+ * 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 dmdirc;
+
+import dmdirc.parser.IRCParser;
+import dmdirc.ui.MainFrame;
+import dmdirc.ui.ServerFrame;
+
+/**
+ *
+ * @author chris
+ */
+public class Raw {
+    
+    private Server server;
+    private ServerFrame frame;
+    
+    /** Creates a new instance of Raw */
+    public Raw(Server server) {
+        this.server = server;
+        
+        frame = new ServerFrame();
+        
+        MainFrame.getMainFrame().addChild(frame);
+        
+        server.AddDataIn(new IRCParser.IDataIn() {
+            public void onDataIn(IRCParser tParser, String sData) {
+                Raw.this.frame.addLine("<<< "+sData);
+            }
+        });
+        
+        server.AddDataOut(new IRCParser.IDataOut() {
+            public void onDataOut(IRCParser tparser, String sData) {
+                Raw.this.frame.addLine(">>> "+sData);
+            }
+        });
+    }
+    
+}

src/dmdirc/Server.java

@@ -51,7 +51,7 @@ public class Server {
     private IRCParser parser;
     
     /** Creates a new instance of Server */
-    public Server() {
+    public Server(String server, int port) {
         
         channels = new Vector(0,1);
         
@@ -60,6 +60,17 @@ public class Server {
         frame = new ServerFrame();
         
         MainFrame.getMainFrame().addChild(frame);
+        
+        parser = new IRCParser();
+        
+        Raw raw = new Raw(this);
+        
+        try {
+            parser.connect(server, port);
+            parser.run();
+        } catch (Exception ex) {
+            frame.addLine("ERROR: "+ex.getMessage());
+        }
     }
     
     /**
@@ -69,4 +80,8 @@ public class Server {
         ServerManager.getServerManager().unregisterServer(this);
     }
     
+    public void AddDataIn (Object eMethod) { parser.AddDataIn(eMethod); }
+    public void AddDataOut (Object eMethod) { parser.AddDataOut(eMethod); }
+    public void AddMOTDEnd (Object eMethod) { parser.AddMOTDEnd(eMethod); }
+    
 }

src/dmdirc/ui/MainFrame.java

@@ -36,7 +36,7 @@ public class MainFrame extends javax.swing.JFrame {
     /**
      * Singleton instance of MainFrame
      */
-    private static MainFrame me = null;
+    private static MainFrame me;
     
     /**
      * Returns the singleton instance of MainFrame
@@ -53,8 +53,6 @@ public class MainFrame extends javax.swing.JFrame {
     public MainFrame() {
         initComponents();
         setVisible(true);
-        ServerFrame test = new ServerFrame();
-        desktopPane.add(test);
         
         miAddServer.addActionListener(new ActionListener() {
             public void actionPerformed(ActionEvent actionEvent) {

src/dmdirc/ui/NewServerDialog.java

@@ -27,6 +27,9 @@ import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 import java.awt.event.WindowEvent;
 import java.awt.event.WindowListener;
+import javax.swing.InputVerifier;
+import javax.swing.JComponent;
+import javax.swing.JTextField;
 
 /**
  *
@@ -46,6 +49,8 @@ public class NewServerDialog extends javax.swing.JDialog {
             jCheckBox1.setEnabled(false);
         }
         
+        jTextField2.setInputVerifier(new PortVerifier());
+        
         addCallbacks();
         
         setVisible(true);
@@ -200,3 +205,17 @@ public class NewServerDialog extends javax.swing.JDialog {
     // End of variables declaration//GEN-END:variables
     
 }
+
+class PortVerifier extends InputVerifier {
+    
+    public boolean verify(JComponent jComponent) {
+        JTextField tf = (JTextField)jComponent;
+        try {
+            Integer port = Integer.parseInt(tf.getText());
+            return (port > 0 && port <= 65535);
+        } catch (Exception e) {
+            return false;
+        }
+    }
+    
+}

src/dmdirc/ui/ServerFrame.form

@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 
 <Form version="1.3" type="org.netbeans.modules.form.forminfo.JInternalFrameFormInfo">
+  <Properties>
+    <Property name="title" type="java.lang.String" value="Server Frame"/>
+  </Properties>
   <SyntheticProperties>
     <SyntheticProperty name="formSizePolicy" type="int" value="1"/>
   </SyntheticProperties>

src/dmdirc/ui/ServerFrame.java

@@ -36,6 +36,10 @@ public class ServerFrame extends javax.swing.JInternalFrame {
         setVisible(true);
     }
     
+    public void addLine(String line) {
+        jTextArea1.append(line+"\n");
+    }
+    
     /** This method is called from within the constructor to
      * initialize the form.
      * WARNING: Do NOT modify this code. The content of this method is
@@ -47,6 +51,7 @@ public class ServerFrame extends javax.swing.JInternalFrame {
         jTextArea1 = new javax.swing.JTextArea();
         jTextField1 = new javax.swing.JTextField();
 
+        setTitle("Server Frame");
         jTextArea1.setColumns(20);
         jTextArea1.setRows(5);
         jScrollPane1.setViewportView(jTextArea1);