* Moved MyInfo and ServerInfo into seperate classes

* Hacked Server to make it work with the new IRCParser interface

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

src/dmdirc/Server.java

@@ -78,9 +78,7 @@ public class Server {
             }
         });
         
-        try {
-            parser.connect(server, port);
-            
+        try {           
             Thread thread = new Thread(parser);
             thread.start();
         } catch (Exception ex) {

src/dmdirc/parser/IRCParser.java

@@ -39,18 +39,6 @@ public class IRCParser implements Runnable {
 	private PrintWriter out = null;
 	private BufferedReader in = null;
 
-	public class MyInfo {
-		public String sNickname = "IRCParser";
-		public String sAltNickname = "IRC-Parser"; // Alternative nickname, if this fails, we start prepending _ to sNickname
-		public String sRealname = "Java Test IRCParser";
-		public String sUsername = "IRCParser";
-	}
-	public class ServerInfo {
-		public String sHost = "uk.quakenet.org";
-		public String sPassword = "";
-		public int nPort = 6667;
-	}
-
 	public MyInfo me = new MyInfo(); // This is what the user wants, nickname here is *not* fact.
 	public ServerInfo server = new ServerInfo(); // Server Info requested by user
 

src/dmdirc/parser/MyInfo.java

@@ -0,0 +1,34 @@
+/*
+ * 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.parser;
+
+/**
+ *
+ * @author chris
+ */
+public class MyInfo {
+    public String sNickname = "IRCParser";
+    public String sAltNickname = "IRC-Parser"; // Alternative nickname, if this fails, we start prepending _ to sNickname
+    public String sRealname = "Java Test IRCParser";
+    public String sUsername = "IRCParser";
+}

src/dmdirc/parser/ServerInfo.java

@@ -0,0 +1,33 @@
+/*
+ * 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.parser;
+
+/**
+ *
+ * @author chris
+ */
+public class ServerInfo {
+    public String sHost = "irc.quakenet.org";
+    public String sPassword = "";
+    public int nPort = 6667;
+}