rochat-svn Mailing List for ROChat

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

Revision: 54
          http://rochat.svn.sourceforge.net/rochat/?rev=54&view=rev
Author:   levia
Date:     2008-06-04 23:36:28 -0700 (Wed, 04 Jun 2008)

Log Message:
-----------


Modified Paths:
--------------
    jIRClib/trunk/src/net/megakiwi/jirclib/exception/BaseException.java
    jIRClib/trunk/src/net/megakiwi/jirclib/exception/StillConnectedException.java
    jIRClib/trunk/src/net/megakiwi/jirclib/jIRClib.java
    jIRClib/trunk/src/net/megakiwi/jirclib/net/ConnectionManager.java

Added Paths:
-----------
    jIRClib/trunk/src/net/megakiwi/jirclib/net/connection/
    jIRClib/trunk/src/net/megakiwi/jirclib/net/connection/IRCConnection.java
    jIRClib/trunk/src/net/megakiwi/jirclib/net/connection/MessageHandler.java
    jIRClib/trunk/src/net/megakiwi/jirclib/net/connection/iConnection.java

Removed Paths:
-------------
    jIRClib/trunk/src/net/megakiwi/jirclib/net/Connection.java

Modified: jIRClib/trunk/src/net/megakiwi/jirclib/exception/BaseException.java
===================================================================

--- jIRClib/trunk/src/net/megakiwi/jirclib/exception/BaseException.java	2008-05-31 15:50:38 UTC (rev 53)
+++ jIRClib/trunk/src/net/megakiwi/jirclib/exception/BaseException.java	2008-06-05 06:36:28 UTC (rev 54)
@@ -20,11 +20,12 @@
 package net.megakiwi.jirclib.exception;
 
 /**
- * A base exception, which all custom exceptions implement.
+ * A base exception, which all custom exceptions implement, but can also
+ *  be used as a 'basic' exception.
  * 
  * @author  Lars 'Levia' Wesselius
 */
-public class BaseException extends Exception
+public class BaseException extends RuntimeException
 {
     private String m_Message;
     

Modified: jIRClib/trunk/src/net/megakiwi/jirclib/exception/StillConnectedException.java
===================================================================
--- jIRClib/trunk/src/net/megakiwi/jirclib/exception/StillConnectedException.java	2008-05-31 15:50:38 UTC (rev 53)
+++ jIRClib/trunk/src/net/megakiwi/jirclib/exception/StillConnectedException.java	2008-06-05 06:36:28 UTC (rev 54)
@@ -19,7 +19,7 @@
 */
 package net.megakiwi.jirclib.exception;
 
-import net.megakiwi.jirclib.net.Connection;
+import net.megakiwi.jirclib.net.connection.iConnection;
 
 /**
  * A exception when a socket is still connected.
@@ -28,14 +28,14 @@
 */
 public class StillConnectedException extends BaseException
 {
-    private Connection m_Connection;
+    private iConnection m_Connection;
     
     /**
      * The constructor.
      * 
      * @param   con     The connection involved.
     */
-    public StillConnectedException(Connection con, String message)
+    public StillConnectedException(iConnection con, String message)
     {
         super(message);
         m_Connection = con;
@@ -46,7 +46,7 @@
      * 
      * @return  The connection that is apparently still connected.
     */
-    public Connection getConnection()
+    public iConnection getConnection()
     {
         return m_Connection;
     }

Modified: jIRClib/trunk/src/net/megakiwi/jirclib/jIRClib.java
===================================================================
--- jIRClib/trunk/src/net/megakiwi/jirclib/jIRClib.java	2008-05-31 15:50:38 UTC (rev 53)
+++ jIRClib/trunk/src/net/megakiwi/jirclib/jIRClib.java	2008-06-05 06:36:28 UTC (rev 54)
@@ -19,6 +19,9 @@
 */
 package net.megakiwi.jirclib;
 
+import net.megakiwi.jirclib.net.*;
+import net.megakiwi.jirclib.exception.*;
+
 /**
  * The initialization class for jIRClib. This is where you start your journey.
  * 
@@ -26,6 +29,9 @@
 */
 public class jIRClib
 {
+    private boolean m_Initialized = false;
+    private ConnectionManager m_ConnectionManager;
+    
     public jIRClib()
     {
     }
@@ -33,8 +39,13 @@
     /**
      * Initializes the library.
     */
-    public void initialize()
+    public void initialize() throws BaseException
     {
-        
+        if (m_Initialized)
+        {
+            throw new BaseException("jIRCLib is already initialized.");
+        }
+        m_Initialized = true;
+        m_ConnectionManager = new ConnectionManager();
     }
 }
\ No newline at end of file

Deleted: jIRClib/trunk/src/net/megakiwi/jirclib/net/Connection.java
===================================================================
--- jIRClib/trunk/src/net/megakiwi/jirclib/net/Connection.java	2008-05-31 15:50:38 UTC (rev 53)
+++ jIRClib/trunk/src/net/megakiwi/jirclib/net/Connection.java	2008-06-05 06:36:28 UTC (rev 54)
@@ -1,75 +0,0 @@
-/*
-    jIRClib
-    Copyright (C) 2008 Lars Wesselius
-
-    This program is free software; you can redistribute it and/or
-    modify it under the terms of the GNU General Public License
-    as published by the Free Software Foundation; either version 2
-    of the License, or (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-    ----------------------------------------------------------------------------
-*/
-package net.megakiwi.jirclib.net;
-
-/**
- * Represents a connection. Interface.
- * 
- * @author  Lars 'Levia' Wesselius
-*/
-public abstract class Connection
-{
-    protected String m_Host;
-    protected int m_Port = 6667;
-    
-    /**
-     * Connects to something.
-     * 
-     * @param   host    The host to connect to.
-     * @param   port    The port to connect through.
-     * @return  True if such was succesful, false if not.
-    */
-    public abstract boolean connect(final String host, final int port);
-    
-    /**
-     * Disconnects this instance.
-     * 
-     * @return  True if such was succesful, false if not.
-    */
-    public abstract boolean disconnect();
-    
-    /**
-     * Returns whether this instance is connected or not.
-     * 
-     * @return  True if so, false if not.
-    */
-    public abstract boolean isConnected();
-    
-    /**
-     * Returns the connected host.
-     * 
-     * @return  The host it is connected to.
-    */
-    public String getHost()
-    {
-        return m_Host;
-    }
-    
-    /**
-     * Returns the port it connected through.
-     * 
-     * @return  The port it connected to.
-    */
-    public int getPort()
-    {
-        return m_Port;
-    }
-    
-}
\ No newline at end of file

Modified: jIRClib/trunk/src/net/megakiwi/jirclib/net/ConnectionManager.java
===================================================================
--- jIRClib/trunk/src/net/megakiwi/jirclib/net/ConnectionManager.java	2008-05-31 15:50:38 UTC (rev 53)
+++ jIRClib/trunk/src/net/megakiwi/jirclib/net/ConnectionManager.java	2008-06-05 06:36:28 UTC (rev 54)
@@ -19,6 +19,7 @@
 */
 package net.megakiwi.jirclib.net;
 
+import net.megakiwi.jirclib.net.connection.iConnection;
 import java.util.*;
 
 /**
@@ -29,7 +30,7 @@
 */
 public class ConnectionManager
 {
-    private Vector<Connection> m_Connections = new Vector<Connection>();
+    private Vector<iConnection> m_Connections = new Vector<iConnection>();
     
     /**
      * Add a connection to this manager.
@@ -37,7 +38,7 @@
      * @param   con     The connection to add to the manager.
      * @return  True if it was added succesfully.
     */
-    public boolean addConnection(Connection con)
+    public boolean addConnection(iConnection con)
     {
         if (m_Connections.contains(con))
         {
@@ -53,7 +54,7 @@
      * @param   con     The connection to remove.
      * @return  True if such was succesful, false if not.
     */
-    public boolean removeConnection(Connection con)
+    public boolean removeConnection(iConnection con)
     {
         return m_Connections.removeElement(con);
     }

Added: jIRClib/trunk/src/net/megakiwi/jirclib/net/connection/IRCConnection.java
===================================================================
--- jIRClib/trunk/src/net/megakiwi/jirclib/net/connection/IRCConnection.java	                        (rev 0)
+++ jIRClib/trunk/src/net/megakiwi/jirclib/net/connection/IRCConnection.java	2008-06-05 06:36:28 UTC (rev 54)
@@ -0,0 +1,128 @@
+/*
+    jIRClib
+    Copyright (C) 2008 Lars Wesselius
+
+    This program is free software; you can redistribute it and/or
+    modify it under the terms of the GNU General Public License
+    as published by the Free Software Foundation; either version 2
+    of the License, or (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+    ----------------------------------------------------------------------------
+*/
+package net.megakiwi.jirclib.net.connection;
+
+import net.megakiwi.jirclib.exception.ConnectionException;
+import java.net.*;
+import java.io.*;
+
+/**
+ * Represents a IRC connection.
+ * 
+ * @author  Lars 'Levia' Wesselius
+*/
+public class IRCConnection implements iConnection
+{
+    protected String m_Host;
+    protected int m_Port = 6667;
+    
+    protected Socket m_Connection = null;
+    protected BufferedReader m_In = null;
+    protected PrintWriter m_Out = null;
+    
+    /**
+     * Connects to something.
+     * 
+     * @param   host    The host to connect to.
+     * @param   port    The port to connect through.
+     * @return  True if such was succesful, false if not.
+    */
+    public boolean connect(final String host, final int port) throws ConnectionException
+    {
+        try
+        {
+            m_Host = host;
+            m_Port = port;
+            m_Connection = new Socket(host, port);
+            m_Connection.setKeepAlive(true);
+            if (!m_Connection.isConnected())
+            {
+                return false;
+            }
+
+            m_Out = new PrintWriter(m_Connection.getOutputStream(), true);
+            m_In = new BufferedReader(new InputStreamReader(m_Connection.getInputStream()));
+        }
+        catch (Exception ex)
+        {
+            throw new ConnectionException(this, "Couldn't connect: " + ex.getMessage());
+        }
+        return true;
+    }
+    
+    /**
+     * Disconnects this instance.
+     * 
+     * @return  True if such was succesful, false if not.
+    */
+    public boolean disconnect() throws ConnectionException
+    {
+        try
+        {
+            m_Connection.close();
+        }
+        catch (IOException ex)
+        {
+            throw new ConnectionException(this, "Couldn't disconnect: " + ex.getMessage());
+        }
+        return true;
+    }
+    
+    /**
+     * Send a raw command to the server.
+     * 
+     * @param   cmd The command.
+    */
+    public void send(String cmd)
+    {
+        m_Out.write(cmd);
+        m_Out.flush();
+    }
+    
+    /**
+     * Returns whether this instance is connected or not.
+     * 
+     * @return  True if so, false if not.
+    */
+    public boolean isConnected()
+    {
+        return m_Connection.isConnected();
+    }
+    
+    /**
+     * Returns the connected host.
+     * 
+     * @return  The host it is connected to.
+    */
+    public String getHost()
+    {
+        return m_Host;
+    }
+    
+    /**
+     * Returns the port it connected through.
+     * 
+     * @return  The port it connected to.
+    */
+    public int getPort()
+    {
+        return m_Port;
+    }
+}
\ No newline at end of file

Added: jIRClib/trunk/src/net/megakiwi/jirclib/net/connection/MessageHandler.java
===================================================================
--- jIRClib/trunk/src/net/megakiwi/jirclib/net/connection/MessageHandler.java	                        (rev 0)
+++ jIRClib/trunk/src/net/megakiwi/jirclib/net/connection/MessageHandler.java	2008-06-05 06:36:28 UTC (rev 54)
@@ -0,0 +1,147 @@
+/*
+    jIRClib
+    Copyright (C) 2008 Lars Wesselius
+
+    This program is free software; you can redistribute it and/or
+    modify it under the terms of the GNU General Public License
+    as published by the Free Software Foundation; either version 2
+    of the License, or (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+    ----------------------------------------------------------------------------
+*/
+package net.megakiwi.jirclib.net.connection;
+
+import java.io.*;
+import java.util.*;
+import java.util.regex.*;
+
+public class MessageHandler extends Thread
+{
+    private boolean m_ShouldRun = true;
+    private BufferedReader m_In;
+    private IRCConnection m_Con;
+    
+    //private List<MessageListener> m_Listeners = new ArrayList<MessageListener>();
+    
+    public MessageHandler(IRCConnection con, BufferedReader in)
+    {
+        m_Con = con;
+        m_In = in;
+    }
+    
+    public void run()
+    {
+        m_ShouldRun = true;
+        try
+        {
+            String line;
+            while (((line = m_In.readLine()) != null) && m_ShouldRun)
+            {
+                //Logger.logInformation(line);
+                parseLine(line);
+            }
+        }
+        catch (Exception e)
+        {
+            e.printStackTrace();
+        }
+    }
+    
+    private void parseLine(String str)
+    {
+        String command, nickname, host, rest;
+        command = nickname = host = rest = "";
+        System.out.println("raw: " + str);
+        if (str.startsWith("PING"))
+        {
+            str = str.trim();
+            String[] parts = str.split(":");
+            m_Con.send("PONG " + parts[1]);
+            //fireMessageReceived(str, null, null, null);
+        }
+        else if (str.startsWith(":"))
+        {
+            Pattern pattern = Pattern.compile(":([a-zA-Z.\\-\\S]\\S*) ([0-9]*) (\\[*\\]*[a-zA-Z0-9._\\-\\S]\\S*) :(.*)");
+            Matcher matcher = pattern.matcher(str.subSequence(0, str.length()));
+
+            if (matcher.find())
+            {
+                command = matcher.group(2);
+                nickname = matcher.group(3);
+                host = matcher.group(1);
+                rest = matcher.group(4);
+                //fireMessageReceived(command, nickname, host, rest);
+                return;
+            }
+            
+            pattern = Pattern.compile(":([a-zA-Z0-9!@/\\-\\S]*) ([A-Z]*) (\\[*\\]*[a-zA-Z0-9#._\\\\-]*) : *([^ ].*)");
+            matcher = pattern.matcher(str.subSequence(0, str.length()));
+            if (matcher.find())
+            {
+                command = matcher.group(2);
+                nickname = matcher.group(3);
+                host = matcher.group(1);
+                rest = matcher.group(4);
+                //fireMessageReceived(command, nickname, host, rest);
+                return;
+            }
+        }
+        else
+        {
+            Pattern pattern = Pattern.compile("([A-Z]* [A-Z]*) : *([^ ].*)");
+            Matcher matcher = pattern.matcher(str.subSequence(0, str.length()));
+
+            if (matcher.find())
+            {
+                command = matcher.group(1);
+                rest = matcher.group(2);
+                //fireMessageReceived(command, nickname, host, rest);
+                return;
+            }
+
+            pattern = Pattern.compile("([A-Z]*) (\\[*\\]*[a-zA-Z0-9._\\\\-]*) :*([^ ].*)");
+            matcher = pattern.matcher(str.subSequence(0, str.length()));
+
+            if (matcher.find())
+            {
+                command = matcher.group(1);
+                nickname = matcher.group(2);
+                rest = matcher.group(3);
+                //fireMessageReceived(command, nickname, host, rest);
+                return;
+            }
+            
+        }
+    }
+    
+    public void stopHandler()
+    {
+        m_ShouldRun = false;
+    }
+    
+    /*public void addListener(MessageListener listener)
+    {
+        m_Listeners.add(listener);
+    }
+    
+    public void removeListener(MessageListener listener)
+    {
+        m_Listeners.remove(listener);
+    }
+    
+    private void fireMessageReceived(String command, String nickname, String host, String rest)
+    {
+        for (Iterator it = m_Listeners.iterator(); it.hasNext();)
+        {
+            ((MessageListener)it.next()).messageReceived(command, nickname, host, rest);
+        }
+    }*/
+}
\ No newline at end of file

Added: jIRClib/trunk/src/net/megakiwi/jirclib/net/connection/iConnection.java
===================================================================
--- jIRClib/trunk/src/net/megakiwi/jirclib/net/connection/iConnection.java	                        (rev 0)
+++ jIRClib/trunk/src/net/megakiwi/jirclib/net/connection/iConnection.java	2008-06-05 06:36:28 UTC (rev 54)
@@ -0,0 +1,53 @@
+/*
+    jIRClib
+    Copyright (C) 2008 Lars Wesselius
+
+    This program is free software; you can redistribute it and/or
+    modify it under the terms of the GNU General Public License
+    as published by the Free Software Foundation; either version 2
+    of the License, or (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+    ----------------------------------------------------------------------------
+*/
+package net.megakiwi.jirclib.net.connection;
+
+/**
+ * Represents a connection. Interface.
+ * 
+ * @author  Lars 'Levia' Wesselius
+*/
+public interface iConnection
+{    
+    /**
+     * Connects to something.
+     * 
+     * @param   host    The host to connect to.
+     * @param   port    The port to connect through.
+     * @return  True if such was succesful, false if not.
+    */
+    public boolean connect(final String host, final int port);
+    
+    /**
+     * Disconnects this instance.
+     * 
+     * @return  True if such was succesful, false if not.
+    */
+    public boolean disconnect();
+    
+    /**
+     * Returns whether this instance is connected or not.
+     * 
+     * @return  True if so, false if not.
+    */
+    public boolean isConnected();
+    
+    
+}
\ No newline at end of file


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.




2007	Jan	Feb	Mar	Apr	May	Jun	Jul	Aug	Sep	Oct (36)	Nov (1)	Dec
2008	Jan	Feb	Mar	Apr (1)	May (14)	Jun (1)	Jul	Aug	Sep	Oct	Nov	Dec