Parser as a submodule

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "modules/parser"]
+	path = modules/parser
+	url = git://dmdirc.com/~dmdirc/parser

modules/parser

@@ -0,0 +1 @@
+Subproject commit 7f07e023bd6ebf495fa1dadeca50090b06979751

nbproject/build-impl.xml

@@ -59,12 +59,14 @@ is divided into following sections:
         </condition>
         <condition property="have.tests">
             <or>
-                <available file="${test.src.dir}"/>
+                <available file="${main.test.dir}"/>
+                <available file="${parser.test.dir}"/>
             </or>
         </condition>
         <condition property="have.sources">
             <or>
-                <available file="${src.dir}"/>
+                <available file="${main.src.dir}"/>
+                <available file="${parser.src.dir}"/>
             </or>
         </condition>
         <condition property="netbeans.home+have.tests">
@@ -112,8 +114,10 @@ is divided into following sections:
         <!-- You can override this target in the ../build.xml file. -->
     </target>
     <target depends="-pre-init,-init-private,-init-user,-init-project,-do-init" name="-init-check">
-        <fail unless="src.dir">Must set src.dir</fail>
-        <fail unless="test.src.dir">Must set test.src.dir</fail>
+        <fail unless="main.src.dir">Must set main.src.dir</fail>
+        <fail unless="main.test.dir">Must set main.test.dir</fail>
+        <fail unless="parser.src.dir">Must set parser.src.dir</fail>
+        <fail unless="parser.test.dir">Must set parser.test.dir</fail>
         <fail unless="build.dir">Must set build.dir</fail>
         <fail unless="dist.dir">Must set dist.dir</fail>
         <fail unless="build.classes.dir">Must set build.classes.dir</fail>
@@ -134,7 +138,7 @@ is divided into following sections:
     </target>
     <target name="-init-macrodef-javac">
         <macrodef name="javac" uri="http://www.netbeans.org/ns/j2se-project/3">
-            <attribute default="${src.dir}" name="srcdir"/>
+            <attribute default="${parser.src.dir}:${main.src.dir}" name="srcdir"/>
             <attribute default="${build.classes.dir}" name="destdir"/>
             <attribute default="${javac.classpath}" name="classpath"/>
             <attribute default="${includes}" name="includes"/>
@@ -154,7 +158,7 @@ is divided into following sections:
             </sequential>
         </macrodef>
         <macrodef name="depend" uri="http://www.netbeans.org/ns/j2se-project/3">
-            <attribute default="${src.dir}" name="srcdir"/>
+            <attribute default="${parser.src.dir}:${main.src.dir}" name="srcdir"/>
             <attribute default="${build.classes.dir}" name="destdir"/>
             <attribute default="${javac.classpath}" name="classpath"/>
             <sequential>
@@ -196,12 +200,12 @@ is divided into following sections:
                     </classpath>
                     <batchtest todir="${build.test.results.dir}">
                         <clover-optimized-testset>
-                            <fileset dir="${test.src.dir}" excludes="@{excludes},${excludes}" includes="@{includes}">
+                            <fileset dir="${main.test.dir}:${parser.test.dir}" excludes="@{excludes},${excludes}" includes="@{includes}">
                                 <filename name="@{testincludes}"/>
                             </fileset>
                         </clover-optimized-testset>
 
-                        <fileset dir="${test.src.dir}" excludes="@{excludes},${excludes}" includes="@{includes}">
+                        <fileset dir="${main.test.dir}:${parser.test.dir}" excludes="@{excludes},${excludes}" includes="@{includes}">
                             <filename name="**/DummyTest*"/>
                         </fileset>
                     </batchtest>
@@ -231,7 +235,7 @@ is divided into following sections:
                         <pathelement path="${clover.jar}"/>
                     </classpath>
                     <batchtest todir="${build.test.results.dir}">
-                        <fileset dir="${test.src.dir}" excludes="@{excludes},${excludes}" includes="@{includes}">
+                        <fileset dir="${main.test.dir}:${parser.test.dir}" excludes="@{excludes},${excludes}" includes="@{includes}">
                             <filename name="@{testincludes}"/>
                         </fileset>
                     </batchtest>
@@ -354,7 +358,8 @@ is divided into following sections:
     <target depends="init,deps-jar,-pre-pre-compile,-pre-compile,-compile-depend" if="have.sources" name="-do-compile">
         <j2seproject3:javac/>
         <copy todir="${build.classes.dir}">
-            <fileset dir="${src.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
+            <fileset dir="${main.src.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
+            <fileset dir="${parser.src.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
         </copy>
     </target>
     <target name="-post-compile">
@@ -369,7 +374,7 @@ is divided into following sections:
     <target depends="init,deps-jar,-pre-pre-compile" name="-do-compile-single">
         <fail unless="javac.includes">Must select some files in the IDE or set javac.includes</fail>
         <j2seproject3:force-recompile/>
-        <j2seproject3:javac excludes="" includes="${javac.includes}" sourcepath="${src.dir}"/>
+        <j2seproject3:javac excludes="" includes="${javac.includes}" sourcepath="${main.src.dir}:${parser.src.dir}"/>
     </target>
     <target name="-post-compile-single">
         <!-- Empty placeholder for easier customization. -->
@@ -503,7 +508,7 @@ is divided into following sections:
             <classpath>
                 <path path="${javac.classpath}"/>
             </classpath>
-            <fileset dir="${src.dir}" excludes="${excludes}" includes="${includes}">
+            <fileset dir="${main.src.dir}:${parser.src.dir}" excludes="${excludes}" includes="${includes}">
                 <filename name="**/*.java"/>
             </fileset>
         </javadoc>
@@ -521,7 +526,7 @@ is divided into following sections:
 
     <target depends="init,-doccheck-check" name="-doccheck-build" if="doccheck.run">
         <mkdir dir="${doccheck.dir}"/>
-        <javadoc additionalparam="-doclet com.sun.tools.doclets.doccheck.DocCheck -docletpath ${doccheck.path} -skipPkg net.miginfocom.*" author="${javadoc.author}" destdir="${doccheck.dir}" failonerror="true" private="${javadoc.private}" source="${javac.source}" sourcepath="${src.dir}" useexternalfile="true" version="${javadoc.version}">
+        <javadoc additionalparam="-doclet com.sun.tools.doclets.doccheck.DocCheck -docletpath ${doccheck.path} -skipPkg net.miginfocom.*" author="${javadoc.author}" destdir="${doccheck.dir}" failonerror="true" private="${javadoc.private}" source="${javac.source}" sourcepath="${main.src.dir}:${parser.src.dir}" useexternalfile="true" version="${javadoc.version}">
             <classpath>
                 <path path="${javac.classpath}"/>
             </classpath>
@@ -556,12 +561,12 @@ is divided into following sections:
         <!-- You can override this target in the ../build.xml file. -->
     </target>
     <target if="do.depend.true" name="-compile-test-depend">
-        <j2seproject3:depend classpath="${javac.test.classpath}" destdir="${build.test.classes.dir}" srcdir="${test.src.dir}"/>
+        <j2seproject3:depend classpath="${javac.test.classpath}" destdir="${build.test.classes.dir}" srcdir="${main.test.dir}:${parser.test.dir}"/>
     </target>
     <target depends="init,compile,-pre-pre-compile-test,-pre-compile-test,-compile-test-depend" if="have.tests" name="-do-compile-test">
-        <j2seproject3:javac classpath="${javac.test.classpath}" debug="true" destdir="${build.test.classes.dir}" srcdir="${test.src.dir}"/>
+        <j2seproject3:javac classpath="${javac.test.classpath}" debug="true" destdir="${build.test.classes.dir}" srcdir="${main.test.dir}:${parser.test.dir}"/>
         <copy todir="${build.test.classes.dir}">
-            <fileset dir="${test.src.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
+            <fileset dir="${main.test.dir}:${parser.test.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
         </copy>
     </target>
     <target name="-post-compile-test">
@@ -576,9 +581,9 @@ is divided into following sections:
     <target depends="init,compile,-pre-pre-compile-test,-pre-compile-test-single" if="have.tests" name="-do-compile-test-single">
         <fail unless="javac.includes">Must select some files in the IDE or set javac.includes</fail>
         <j2seproject3:force-recompile destdir="${build.test.classes.dir}"/>
-        <j2seproject3:javac classpath="${javac.test.classpath}" debug="true" destdir="${build.test.classes.dir}" excludes="" includes="${javac.includes}" sourcepath="${test.src.dir}" srcdir="${test.src.dir}"/>
+        <j2seproject3:javac classpath="${javac.test.classpath}" debug="true" destdir="${build.test.classes.dir}" excludes="" includes="${javac.includes}" sourcepath="${main.test.dir}:${parser.test.dir}" srcdir="${main.test.dir}:${parser.test.dir}"/>
         <copy todir="${build.test.classes.dir}">
-            <fileset dir="${test.src.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
+            <fileset dir="${main.test.dir}:${parser.test.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
         </copy>
     </target>
     <target name="-post-compile-test-single">

nbproject/project.properties

@@ -55,7 +55,7 @@ javac.test.classpath=\
     ${file.reference.fest-reflect-0.4.jar}:\
     ${file.reference.fest-util-0.4.jar}:\
     ${file.reference.mockito-all-1.6.jar}
-javadoc.additionalparam=-overview ${src.dir}/overview.html
+javadoc.additionalparam=-overview ${main.src.dir}/overview.html
 javadoc.author=false
 javadoc.encoding=
 javadoc.noindex=false
@@ -68,7 +68,7 @@ javadoc.version=false
 javadoc.windowtitle=DMDirc
 main.class=com.dmdirc.Main
 manifest.file=manifest.mf
-meta.inf.dir=${src.dir}/META-INF
+meta.inf.dir=${main.src.dir}/META-INF
 platform.active=default_platform
 run.classpath=\
     ${javac.classpath}:\
@@ -82,5 +82,7 @@ run.test.classpath=\
     ${build.test.classes.dir}:\
     ${file.reference.junit-4.jar}:\
     ${file.reference.junit-4.jar}
-src.dir=src
-test.src.dir=test
+main.src.dir=src
+parser.src.dir=modules/parser/src
+main.test.dir=test
+parser.test.dir=modules/parser/test

nbproject/project.xml

@@ -6,10 +6,12 @@
             <name>DMDirc</name>
             <minimum-ant-version>1.6.5</minimum-ant-version>
             <source-roots>
-                <root id="src.dir"/>
+                <root id="parser.src.dir" name="Parser Source"/>
+                <root id="main.src.dir" name="Main Source"/>
             </source-roots>
             <test-roots>
-                <root id="test.src.dir"/>
+                <root id="main.test.dir" name="Main Test Packages"/>
+                <root id="parser.test.dir" name="Parser Test Packages"/>
             </test-roots>
         </data>
         <junit-version xmlns="http://www.netbeans.org/ns/junit/1" value="junit4"/>

src/com/dmdirc/parser/common/CallbackManager.java

@@ -1,281 +0,0 @@
-/*
- * Copyright (c) 2006-2009 Chris Smith, Shane Mc Cormack, Gregory Holmes
- *
- * 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 com.dmdirc.parser.common;
-
-import com.dmdirc.parser.interfaces.Parser;
-import com.dmdirc.parser.interfaces.SpecificCallback;
-import com.dmdirc.parser.interfaces.callbacks.*;
-
-import java.util.Hashtable;
-import java.util.Map;
-
-/**
- * IRC Parser Callback Manager.
- * Manages adding/removing/calling callbacks.
- *
- * @param <T> The type of parser which this manager managers callbacks for
- * @author            Shane Mc Cormack
- */
-public abstract class CallbackManager<T extends Parser> {
-
-    protected static final Class[] CLASSES = {
-        AwayStateListener.class, OtherAwayStateListener.class,
-        ChannelOtherAwayStateListener.class, ChannelActionListener.class,
-        ChannelCtcpListener.class, ChannelCtcpReplyListener.class,
-        ChannelListModeListener.class, ChannelNamesListener.class,
-        ChannelJoinListener.class, ChannelKickListener.class,
-        ChannelMessageListener.class, ChannelModeChangeListener.class,
-        ChannelNickChangeListener.class, ChannelNonUserModeChangeListener.class,
-	ChannelModeMessageListener.class, ChannelModeNoticeListener.class,
-        ChannelNoticeListener.class, ChannelPartListener.class, ChannelQuitListener.class,
-        ChannelSelfJoinListener.class, ChannelSingleModeChangeListener.class,
-        ChannelTopicListener.class, ChannelUserModeChangeListener.class,
-        ConnectErrorListener.class, DataInListener.class, DataOutListener.class,
-        DebugInfoListener.class, ErrorInfoListener.class,
-        NetworkDetectedListener.class, InviteListener.class,
-        MotdEndListener.class, MotdLineListener.class, MotdStartListener.class,
-        NickChangeListener.class, NickInUseListener.class,
-        AuthNoticeListener.class, NumericListener.class,
-        PasswordRequiredListener.class, PingFailureListener.class,
-        PingSuccessListener.class, PingSentListener.class,
-        PrivateActionListener.class, PrivateCtcpListener.class,
-        PrivateCtcpReplyListener.class, PrivateMessageListener.class,
-        PrivateNoticeListener.class, Post005Listener.class, QuitListener.class,
-        ServerErrorListener.class, ServerReadyListener.class,
-        SocketCloseListener.class, UnknownActionListener.class,
-        UnknownCtcpListener.class, UnknownCtcpReplyListener.class,
-        UnknownMessageListener.class, UnknownNoticeListener.class,
-        UserModeChangeListener.class, UserModeDiscoveryListener.class,
-        WallDesyncListener.class, WallopListener.class, WalluserListener.class,
-    };
-    
-    /** Hashtable used to store the different types of callback known. */
-    private final Map<Class<? extends CallbackInterface>, CallbackObject> callbackHash
-            = new Hashtable<Class<? extends CallbackInterface>, CallbackObject>();
-
-    /**
-     * Constructor to create a CallbackManager.
-     *
-     * @param parser Parser that owns this callback manager.
-     */
-    public CallbackManager(final T parser) {
-        initialise(parser);
-    }
-
-    /**
-     * Initialises this callback manager.
-     *
-     * @param parser The parser associated with this CallbackManager
-     */
-    protected void initialise(T parser) {
-        for (Class<?> type : CLASSES) {
-            if (type.isAnnotationPresent(SpecificCallback.class)) {
-                addCallbackType(getSpecificCallbackObject(parser, type));
-            } else {
-                addCallbackType(getCallbackObject(parser, type));
-            }
-        }
-    }
-
-    /**
-     * Retrieves a relevant {@link CallbackObject} for the specified type.
-     *
-     * @param parser The parser that this manager belongs to
-     * @param type The type of callback to create an object for
-     * @return The relevant CallbackObject
-     */
-    protected abstract CallbackObject getCallbackObject(T parser, Class<?> type);
-
-    /**
-     * Retrieves a relevant {@link CallbackObjectSpecific} for the specified type.
-     *
-     * @param parser The parser that this manager belongs to
-     * @param type The type of callback to create an object for
-     * @return The relevant CallbackObject
-     */
-    protected abstract CallbackObjectSpecific getSpecificCallbackObject(T parser, Class<?> type);
-
-    /**
-     * Add new callback type.
-     *
-     * @param callback CallbackObject subclass for the callback.
-     * @return if adding succeeded or not.
-     */
-    public boolean addCallbackType(final CallbackObject callback) {
-        if (!callbackHash.containsKey(callback.getType())) {
-            callbackHash.put(callback.getType(), callback);
-            return true;
-        }
-
-        return false;
-    }
-
-    /**
-     * Remove a callback type.
-     *
-     * @param callback CallbackObject subclass to remove.
-     * @return if removal succeeded or not.
-     */
-    public boolean delCallbackType(final CallbackObject callback) {
-        if (callbackHash.containsKey(callback.getType())) {
-            callbackHash.remove(callback.getType());
-            return true;
-        }
-
-        return false;
-    }
-
-    /**
-     * Get reference to callback object.
-     *
-     * @param callback Name of type of callback object.
-     * @return CallbackObject returns the callback object for this type
-     */
-    public CallbackObject getCallbackType(final Class<? extends CallbackInterface> callback) {
-        if (!callbackHash.containsKey(callback)) {
-            throw new CallbackNotFoundException("Callback not found: " + callback.getName());
-        }
-
-        return callbackHash.get(callback);
-    }
-
-    /**
-     * Remove all callbacks associated with a specific object.
-     *
-     * @param o instance of ICallbackInterface to remove.
-     */
-    public void delAllCallback(final CallbackInterface o) {
-        for (CallbackObject cb : callbackHash.values()) {
-            if (cb != null) {
-                cb.del(o);
-            }
-        }
-    }
-
-    /**
-     * Add all callbacks.
-     *
-     * @param o instance of ICallbackInterface to add.
-     */
-    public void addAllCallback(final CallbackInterface o) {
-        for (CallbackObject cb : callbackHash.values()) {
-            if (cb != null) {
-                cb.add(o);
-            }
-        }
-    }
-
-    /**
-     * Add a callback.
-     * This method will throw a CallbackNotFoundException if the callback does not exist.
-     *
-     * @param <T> The type of callback
-     * @param callback Type of callback object
-     * @param o instance of ICallbackInterface to add.
-     * @throws CallbackNotFoundException If callback is not found.
-     * @throws NullPointerException If 'o' is null
-     */
-    public <T extends CallbackInterface> void addCallback(
-            final Class<T> callback, final T o) throws CallbackNotFoundException {
-        if (o == null) {
-            throw new NullPointerException("CallbackInterface is null");
-        }
-
-        final CallbackObject cb = getCallbackType(callback);
-
-        if (cb != null) {
-            cb.add(o);
-        }
-    }
-
-    /**
-     * Add a callback with a specific target.
-     * This method will throw a CallbackNotFoundException if the callback does not exist.
-     *
-     * @param <T> The type of callback
-     * @param callback Type of callback object.
-     * @param o instance of ICallbackInterface to add.
-     * @param target Parameter to specify that a callback should only fire for specific things
-     * @throws CallbackNotFoundException If callback is not found.
-     * @throws NullPointerException If 'o' is null
-     */
-    public <T extends CallbackInterface> void addCallback(
-            final Class<T> callback,
-            final T o, final String target) throws CallbackNotFoundException {
-        if (o == null) {
-            throw new NullPointerException("CallbackInterface is null");
-        }
-        
-        ((CallbackObjectSpecific) getCallbackType(callback)).add(o, target);
-    }
-
-    /**
-     * Add a callback without an exception.
-     * This should be used if a callback is not essential for execution (ie the DebugOut callback)
-     *
-     * @param <T> The type of callback object
-     * @param callback Type of callback object.
-     * @param o instance of ICallbackInterface to add.
-     * @return true/false if the callback was added or not.
-     */
-    public <T extends CallbackInterface> boolean addNonCriticalCallback(
-            final Class<T> callback, final T o) {
-        try {
-            addCallback(callback, o);
-            return true;
-        } catch (CallbackNotFoundException e) {
-            return false;
-        }
-    }
-
-    /**
-     * Add a callback with a specific target.
-     * This should be used if a callback is not essential for execution
-     *
-     * @param <T> The type of callback
-     * @param callback Type of callback object.
-     * @param o instance of ICallbackInterface to add.
-     * @param target Parameter to specify that a callback should only fire for specific things
-     * @return true/false if the callback was added or not.
-     */
-    public <T extends CallbackInterface> boolean addNonCriticalCallback(
-            final Class<T> callback, final T o, final String target) {
-        try {
-            addCallback(callback, o, target);
-            return true;
-        } catch (CallbackNotFoundException e) {
-            return false;
-        }
-    }
-
-    /**
-     * Remove a callback.
-     *
-     * @param callback Type of callback object.
-     * @param o instance of ICallbackInterface to remove.
-     */
-    public void delCallback(final Class<? extends CallbackInterface> callback,
-            final CallbackInterface o) {
-        getCallbackType(callback).del(o);
-    }
-}

src/com/dmdirc/parser/common/CallbackNotFoundException.java

@@ -1,45 +0,0 @@
-/*
- * Copyright (c) 2006-2009 Chris Smith, Shane Mc Cormack, Gregory Holmes
- *
- * 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 com.dmdirc.parser.common;
-
-/**
- * IRC Parser Callback Exception.
- *
- * @author            Shane Mc Cormack
- */
-public class CallbackNotFoundException extends RuntimeException {
-	/**
-	 * A version number for this class. It should be changed whenever the class
-	 * structure is changed (or anything else that would prevent serialized
-	 * objects being unserialized with the new class).
-	 */
-	private static final long serialVersionUID = 1;
-	
-	/**
-	 * Create a new CallbackNotFound Exception.
-	 *
-	 * @param message Reason for exception
-	 */
-	public CallbackNotFoundException(final String message) { super(message); }
-
-}

src/com/dmdirc/parser/common/CallbackObject.java

@@ -1,285 +0,0 @@
-/*
- * Copyright (c) 2006-2009 Chris Smith, Shane Mc Cormack, Gregory Holmes
- *
- * 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 com.dmdirc.parser.common;
-
-import com.dmdirc.parser.interfaces.FakableArgument;
-import com.dmdirc.parser.interfaces.FakableSource;
-import com.dmdirc.parser.interfaces.Parser;
-import com.dmdirc.parser.interfaces.callbacks.CallbackInterface;
-import com.dmdirc.parser.interfaces.callbacks.ErrorInfoListener;
-
-import java.lang.annotation.Annotation;
-import java.lang.reflect.Constructor;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-/**
- * CallbackObject.
- * Superclass for all callback types.
- *
- * @author            Shane Mc Cormack
- */
-public abstract class CallbackObject {
-
-    /** The type of callback that this object is operating with. */
-    protected final Class<? extends CallbackInterface> type;
-
-    /** Arraylist for storing callback information related to the callback. */
-    protected final List<CallbackInterface> callbackInfo = new ArrayList<CallbackInterface>();
-
-    /** Reference to the Parser that owns this callback. */
-    protected Parser myParser;
-
-    /** Reference to the CallbackManager in charge of this callback. */
-    protected CallbackManager<?> myManager;
-
-    /**
-     * Create a new instance of the Callback Object.
-     *
-     * @param parser Parser That owns this callback
-     * @param manager CallbackManager that is in charge of this callback
-     * @param type The type of callback to use
-     * @since 0.6.3m1
-     */
-    public CallbackObject(final Parser parser, final CallbackManager<?> manager,
-            final Class<? extends CallbackInterface> type) {
-        this.myParser = parser;
-        this.myManager = manager;
-        this.type = type;
-    }
-
-    /**
-     * Add a callback pointer to the appropriate ArrayList.
-     *
-     * @param eMethod OBject to callback to.
-     */
-    protected final void addCallback(final CallbackInterface eMethod) {
-        if (!callbackInfo.contains(eMethod)) {
-            callbackInfo.add(eMethod);
-        }
-    }
-
-    /**
-     * Delete a callback pointer from the appropriate ArrayList.
-     *
-     * @param eMethod Object that was being called back to.
-     */
-    protected final void delCallback(final CallbackInterface eMethod) {
-        callbackInfo.remove(eMethod);
-    }
-
-    /**
-     * Call the OnErrorInfo callback.
-     *
-     * @param errorInfo ParserError object to pass as error.
-     * @return true if error call succeeded, false otherwise
-     */
-    protected final boolean callErrorInfo(final ParserError errorInfo) {
-        return myManager.getCallbackType(ErrorInfoListener.class).call(errorInfo);
-    }
-
-    /**
-     * Add a new callback.
-     *
-     * @param eMethod Object to callback to.
-     */
-    public void add(final CallbackInterface eMethod) {
-        addCallback(eMethod);
-    }
-
-    /**
-     * Remove a callback.
-     *
-     * @param eMethod Object to remove callback to.
-     */
-    public void del(final CallbackInterface eMethod) {
-        delCallback(eMethod);
-    }
-
-    /**
-     * Retrieves the type of callback that this callback object is for.
-     *
-     * @return This object's type
-     * @since 0.6.3m2
-     */
-    public Class<? extends CallbackInterface> getType() {
-        return type;
-    }
-
-    /**
-     * Actually calls this callback. The specified arguments must match those
-     * specified in the callback's interface, or an error will be raised.
-     *
-     * @param args The arguments to pass to the callback implementation
-     * @return True if a method was called, false otherwise
-     */
-    public boolean call(final Object... args) {
-        boolean bResult = false;
-
-        final Object[] newArgs = new Object[args.length + 1];
-        System.arraycopy(args, 0, newArgs, 1, args.length);
-        newArgs[0] = myParser;
-
-        createFakeArgs(newArgs);
-
-        for (CallbackInterface iface : new ArrayList<CallbackInterface>(callbackInfo)) {
-            try {
-                type.getMethods()[0].invoke(iface, newArgs);
-            } catch (Exception e) {
-                final ParserError ei = new ParserError(ParserError.ERROR_ERROR,
-                        "Exception in callback (" + e.getMessage() + ")",
-                        myParser.getLastLine());
-                ei.setException(e);
-                callErrorInfo(ei);
-            }
-            bResult = true;
-        }
-        return bResult;
-    }
-
-    /**
-     * Replaces all null entries in the specified array with fake values,
-     * if the corresponding parameter of this callback's type is marked with
-     * the {@link FakableArgument} annotation. The fake classes are constructed
-     * by using parameters designated {@link FakableSource}.
-     *
-     * @param args The arguments to be faked
-     */
-    protected void createFakeArgs(final Object[] args) {
-        int i = 0;
-
-        for (Annotation[] anns : type.getMethods()[0].getParameterAnnotations()) {
-            for (Annotation ann : anns) {
-                if (ann.annotationType().equals(FakableArgument.class) && args[i] == null) {
-                    args[i] = getFakeArg(args, type.getMethods()[0].getParameterTypes()[i]);
-                }
-            }
-
-            i++;
-        }
-    }
-
-    /**
-     * Tries to create fake argument of the specified target class, by using
-     * {@link FakableSource} denoted parameters from the specified arg array.
-     *
-     * If an argument is missing, the method attempts to create a fake instance
-     * by recursing into this method again. Note that this could cause an
-     * infinite recursion in cases of cyclic dependencies. If recursion fails,
-     * the constructor is skipped.
-     *
-     * If the created object has a <code>setFake(boolean)</code> method, it
-     * is automatically invoked with an argument of <code>true</code>.
-     *
-     * @param args The arguments array to use for sources
-     * @param target The class that should be constructed
-     * @return An instance of the target class, or null on failure
-     */
-    protected Object getFakeArg(final Object[] args, final Class<?> target) {
-        final Map<Class<?>, Object> sources = new HashMap<Class<?>, Object>();
-        int i = 0;
-
-        for (Annotation[] anns : type.getMethods()[0].getParameterAnnotations()) {
-            for (Annotation ann : anns) {
-                if (ann.annotationType().equals(FakableSource.class)) {
-                    Class<?> argType = type.getMethods()[0].getParameterTypes()[i];
-
-                    sources.put(argType, args[i]);
-                }
-            }
-
-            i++;
-        }
-
-        final Class<?> actualTarget = getImplementation(target);
-
-        for (Constructor<?> ctor : actualTarget.getConstructors()) {
-            Object[] params = new Object[ctor.getParameterTypes().length];
-
-            i = 0;
-            Object param;
-            boolean failed = false;
-
-            for (Class<?> needed : ctor.getParameterTypes()) {
-                boolean found = false;
-
-                for (Class<?> source : sources.keySet()) {
-                    if (source.isAssignableFrom(needed)) {
-                        params[i] = sources.get(source);
-                        found = true;
-                    }
-                }
-
-                if (!found && (param = getFakeArg(args, needed)) != null) {
-                    params[i] = param;
-                } else if (!found) {
-                    failed = true;
-                }
-
-                i++;
-            }
-
-            if (!failed) {
-                try {
-                    final Object instance = ctor.newInstance(params);
-
-                    for (Method method : actualTarget.getMethods()) {
-                        if (method.getName().equals("setFake")
-                                && method.getParameterTypes().length == 1
-                                && method.getParameterTypes()[0].equals(Boolean.TYPE)) {
-                            method.invoke(instance, true);
-                        }
-                    }
-
-                    return instance;
-                } catch (InstantiationException ex) {
-                    // Do nothing
-                } catch (IllegalAccessException ex) {
-                    // Do nothing
-                } catch (IllegalArgumentException ex) {
-                    // Do nothing
-                } catch (InvocationTargetException ex) {
-                    // Do nothing
-                }
-            }
-        }
-
-        return null;
-    }
-
-    /**
-     * Returns the concrete class which should be instansiated if this
-     * callback object desires an instance of the specified type. Generally,
-     * this will translate the common interfaces to specific parser-dependent
-     * implementations.
-     *
-     * @param type The type to be instansiated
-     * @return A concrete implementation of that type
-     */
-    protected abstract Class<?> getImplementation(Class<?> type);
-    
-}

src/com/dmdirc/parser/common/CallbackObjectSpecific.java

@@ -1,186 +0,0 @@
-/*
- * Copyright (c) 2006-2009 Chris Smith, Shane Mc Cormack, Gregory Holmes
- *
- * 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 com.dmdirc.parser.common;
-
-import com.dmdirc.parser.interfaces.SpecificCallback;
-import com.dmdirc.parser.interfaces.ChannelInfo;
-import com.dmdirc.parser.interfaces.ClientInfo;
-import com.dmdirc.parser.interfaces.Parser;
-import com.dmdirc.parser.interfaces.callbacks.CallbackInterface;
-
-import java.util.ArrayList;
-import java.util.Hashtable;
-
-/**
- * CallbackObjectSpecific.
- * Superclass for all callback types that have a "specific" target.
- *
- * @author            Shane Mc Cormack
- */
-public abstract class CallbackObjectSpecific extends CallbackObject {
-
-    /** Hashtable for storing specific information for callback. */
-    protected volatile Hashtable<CallbackInterface, String> specificData
-            = new Hashtable<CallbackInterface, String>();
-
-    /**
-     * Create a new instance of the Callback Object.
-     *
-     * @param parser Parser That owns this callback
-     * @param manager CallbackManager that is in charge of this callback
-     * @param type The type of callback to use
-     * @since 0.6.3m1
-     */
-    public CallbackObjectSpecific(final Parser parser, final CallbackManager<?> manager,
-            final Class<? extends CallbackInterface> type) {
-        super(parser, manager, type);
-    }
-
-    /**
-     * Used to check if a channel matches the specificData.
-     *
-     * @param eMethod Object that is being called back to
-     * @param cChannel ChannelInfo object for the channel to test
-     * @return true if channel given matches the specifics for the method given
-     */
-    protected boolean isValidChan(final CallbackInterface eMethod, final ChannelInfo cChannel) {
-        if (specificData.containsKey(eMethod)) {
-            if (!myParser.getStringConverter().equalsIgnoreCase(cChannel.getName(),
-                    specificData.get(eMethod))) {
-                return false;
-            }
-        }
-        return true;
-    }
-
-    /**
-     * Used to check if a hostname matches the specificData.
-     *
-     * @param eMethod Object that is being called back to
-     * @param sHost Hostname of user that sent the query
-     * @return true if host given matches the specifics for the method given
-     */
-    protected boolean isValidUser(final CallbackInterface eMethod, final String sHost) {
-        final String nickname = translateHostname(sHost);
-        if (specificData.containsKey(eMethod)) {
-            if (!myParser.getStringConverter().equalsIgnoreCase(nickname,
-                    specificData.get(eMethod))) {
-                return false;
-            }
-        }
-        return true;
-    }
-
-    /**
-     * Translates the specified hostname into the form which is used to
-     * register specific callbacks (e.g. nickname).
-     *
-     * @param hostname The hostname to be parsed
-     * @return The translated hostname
-     */
-    protected abstract String translateHostname(final String hostname);
-
-    // We override the default add method to make sure that any add with no
-    // specifics will have the specific data removed.
-    /**
-     * Add a new callback.
-     *
-     * @param eMethod Object to callback to.
-     */
-    @Override
-    public void add(final CallbackInterface eMethod) {
-        addCallback(eMethod);
-        if (specificData.containsKey(eMethod)) {
-            specificData.remove(eMethod);
-        }
-    }
-
-    /**
-     * Add a new callback with a specific target.
-     *
-     * @param eMethod Object to callback to.
-     * @param specificTarget Target that must match for callback to be called.
-     */
-    public void add(final CallbackInterface eMethod, final String specificTarget) {
-        add(eMethod);
-        if (!specificTarget.isEmpty()) {
-            specificData.put(eMethod, specificTarget);
-        }
-    }
-
-    /**
-     * Remove a callback.
-     *
-     * @param eMethod Object to remove callback to.
-     */
-    @Override
-    public void del(final CallbackInterface eMethod) {
-        delCallback(eMethod);
-        if (specificData.containsKey(eMethod)) {
-            specificData.remove(eMethod);
-        }
-    }
-
-    /**
-     * Actually calls this callback. The specified arguments must match those
-     * specified in the callback's interface, or an error will be raised.
-     *
-     * @param args The arguments to pass to the callback implementation
-     * @return True if a method was called, false otherwise
-     */
-    @Override
-    public boolean call(final Object... args) {
-        boolean bResult = false;
-
-        final Object[] newArgs = new Object[args.length + 1];
-        System.arraycopy(args, 0, newArgs, 1, args.length);
-        newArgs[0] = myParser;
-
-        createFakeArgs(newArgs);
-
-        for (CallbackInterface iface : new ArrayList<CallbackInterface>(callbackInfo)) {
-            if (type.isAnnotationPresent(SpecificCallback.class) &&
-                    ((args[0] instanceof ClientInfo
-                    && !isValidUser(iface, ((ClientInfo) args[0]).getHostname()))
-                    || (args[0] instanceof ChannelInfo
-                    && !isValidChan(iface, (ChannelInfo) args[0]))
-                    || (!(args[0] instanceof ClientInfo
-                    || args[0] instanceof ChannelInfo) &&
-                    args[args.length - 1] instanceof String
-                    && !isValidUser(iface, (String) args[args.length - 1])))) {
-                continue;
-            }
-
-            try {
-                type.getMethods()[0].invoke(iface, newArgs);
-            } catch (Exception e) {
-                final ParserError ei = new ParserError(ParserError.ERROR_ERROR,
-                        "Exception in callback (" + e.getMessage() + ")",
-                        myParser.getLastLine());
-                ei.setException(e);
-                callErrorInfo(ei);
-            }
-            bResult = true;
-        }
-        return bResult;
-    }
-}

src/com/dmdirc/parser/common/ChannelListModeItem.java

@@ -1,93 +0,0 @@
-/*
- * Copyright (c) 2006-2009 Chris Smith, Shane Mc Cormack, Gregory Holmes
- *
- * 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 com.dmdirc.parser.common;
-
-/**
- * Contains Channel List Mode information.
- * 
- * @author Shane Mc Cormack
- * @author Chris Smith
- * @see IRCParser
- */
-public final class ChannelListModeItem {
-
-	/** The Item itself. */
-	private final String myItem;
-	
-	/** The Time the item was created. */
-	private final long myTime;
-	
-	/** The Person who created the item. */
-	private final String myOwner;
-	
-	/**
-	 * Create a new Item.
-	 *
-	 * @param item The item (ie: test!joe@user.com)
-	 * @param owner The owner (ie: Dataforce)
-	 * @param time The Time (ie: 1173389295)
-	 */
-	public ChannelListModeItem(final String item, final String owner, final long time) {
-		myItem = item;
-		myTime = time;
-
-		if (!owner.isEmpty() && owner.charAt(0) == ':') {
-			myOwner = owner.substring(1);
-		} else {
-			myOwner = owner;
-		}
-	}
-	
-	/**
-	 * Get The Item itself.
-	 *
-	 * @return The Item itself.
-	 */
-	public String getItem() { return myItem; }
-	
-	/**
-	 * Get The Person who created the item.
-	 *
-	 * @return The Person who created the item.
-	 */
-	public String getOwner() { return myOwner; }
-	
-	/**
-	 * Get The Time the item was created.
-	 *
-	 * @return The Time the item was created.
-	 */
-	public long getTime() { return myTime; }
-	
-	/**
-	* Returns a String representation of this object.
-	*
-	* @return String representation of this object
-	*/
-	@Override
-	public String toString() {
-		return getItem();
-	}
-
-}
-

src/com/dmdirc/parser/common/DefaultStringConverter.java

@@ -1,53 +0,0 @@
-/*
- * Copyright (c) 2006-2009 Chris Smith, Shane Mc Cormack, Gregory Holmes
- *
- * 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 com.dmdirc.parser.common;
-
-import com.dmdirc.parser.interfaces.StringConverter;
-
-/**
- * A {@link StringConverter} that uses the system's default charset.
- *
- * @since 0.6.3m2
- * @author chris
- */
-public class DefaultStringConverter implements StringConverter {
-
-    /** {@inheritDoc} */
-    @Override
-    public String toLowerCase(String input) {
-        return input.toLowerCase();
-    }
-
-    /** {@inheritDoc} */
-    @Override
-    public String toUpperCase(String input) {
-        return input.toUpperCase();
-    }
-
-    /** {@inheritDoc} */
-    @Override
-    public boolean equalsIgnoreCase(String first, String second) {
-        return first.equalsIgnoreCase(second);
-    }
-
-}

src/com/dmdirc/parser/common/IgnoreList.java

@@ -1,303 +0,0 @@
-/*
- * Copyright (c) 2006-2009 Chris Smith, Shane Mc Cormack, Gregory Holmes
- *
- * 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 com.dmdirc.parser.common;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.regex.PatternSyntaxException;
-
-/**
- * Parser Ignore list.
- *
- * @author Shane Mc Cormack
- */
-public class IgnoreList {
-
-	/** Arraylist storing ignore patterns. */
-	protected final List<String> ignoreInfo = new ArrayList<String>();
-
-	/**
-	 * Creates a new instance of RegexStringList.
-	 */
-	public IgnoreList() {
-		// Do nothing
-	}
-
-	/**
-	 * Creates a new instance of RegexStringList, with the specified items.
-	 *
-	 * @param items Items to add to this RegexStringList
-	 */
-	public IgnoreList(final List<String> items) {
-		addAll(items);
-	}
-
-	/**
-	 * Add a new ignore pattern to the ignore list.
-	 *
-	 * @param pattern Regex syntax for the ignore (Pattern is matched case-insensitively as ^pattern$)
-	 */
-	public void add(final String pattern) {
-		for (String target : ignoreInfo) {
-			if (pattern.equalsIgnoreCase(target)) {
-				return;
-			}
-		}
-
-		ignoreInfo.add(pattern);
-	}
-
-	/**
-	 * Adds a set of patterns to the list.
-	 *
-	 * @param patterns A list of patterns to be added
-	 */
-	public void addAll(final List<String> patterns) {
-		for (String pattern : patterns) {
-			add(pattern);
-		}
-	}
-
-	/**
-	 * Delete an ignore from the list.
-	 *
-	 * @param position Position in the list to remove
-	 */
-	public void remove(final int position) {
-		if (position < this.count()) {
-			ignoreInfo.remove(position);
-		}
-	}
-
-	/**
-	 * Clear the ignore list.
-	 */
-	public void clear() {
-		ignoreInfo.clear();
-	}
-
-	/**
-	 * Check if a string matches any of the ignores in the list.
-	 *
-	 * @param check String to check (Patterns are matched case-insensitively as ^pattern$)
-	 * @return integer showing the position of the first match in the ignore list (-1 if none)
-	 * @throws PatternSyntaxException if one of the items in the list is an invalid regex
-	 */
-	public int matches(final String check) throws PatternSyntaxException {
-		for (int i = 0; i < this.count(); ++i) {
-			if (check.matches("(?i)"+this.get(i))) {
-				return i;
-			}
-		}
-		return -1;
-	}
-
-	/**
-	 * Check if a string matches a specific ignore in the list.
-	 *
-	 * @param position Position to check
-	 * @param check String to check (Patterns are matched case-insensitively as ^pattern$)
-	 * @return boolean true/false
-	 * @throws PatternSyntaxException if the item is an invalid regex
-	 */
-	public boolean matches(final int position, final String check) throws PatternSyntaxException {
-		if (position < this.count()) {
-			return check.matches("(?i)"+this.get(position));
-		} else {
-			return false;
-		}
-	}
-
-	/**
-	 * Get the ignore pattern in a given position in the list.
-	 *
-	 * @param position Position to check
-	 * @return String showing the pattern. ("" if position isn't valid)
-	 */
-	public String get(final int position) {
-		if (position < this.count()) {
-			return ignoreInfo.get(position);
-		} else {
-			return "";
-		}
-	}
-
-	/**
-	 * Change the ignore pattern in a given position in the list.
-	 *
-	 * @param position Position to change
-	 * @param pattern New pattern
-	 */
-	public void set(final int position, final String pattern) {
-		if (position < this.count()) {
-			ignoreInfo.set(position, pattern);
-		}
-	}
-
-	/**
-	 * Get the amount of ignores in the list.
-	 *
-	 * @return int showing the number of ignores
-	 */
-	public int count() {
-		return ignoreInfo.size();
-	}
-
-    /**
-     * Adds the specified simple pattern to this ignore list.
-     *
-     * @param pattern The simple pattern to be added
-     */
-    public void addSimple(final String pattern) {
-        add(simpleToRegex(pattern));
-    }
-
-    /**
-     * Determines if this list can be converted to a simple list.
-     *
-     * @return True if this list can be converted, false otherwise.
-     */
-    public boolean canConvert() {
-        try {
-            getSimpleList();
-            return true;
-        } catch (UnsupportedOperationException ex) {
-            return false;
-        }
-    }
-
-    /**
-     * Retrieves a list of regular expressions in this ignore list.
-     *
-     * @return All expressions in this ignore list
-     */
-    public List<String> getRegexList() {
-        return new ArrayList<String>(ignoreInfo);
-    }
-
-    /**
-     * Retrieves a list of simple expressions in this ignore list.
-     *
-     * @return All expressions in this ignore list, converted to simple expressions
-     * @throws UnsupportedOperationException if an expression can't be converted
-     */
-    public List<String> getSimpleList() throws UnsupportedOperationException {
-        final List<String> res = new ArrayList<String>();
-
-        for (String regex : ignoreInfo) {
-            res.add(regexToSimple(regex));
-        }
-
-        return res;
-    }
-
-    /**
-     * Converts a regular expression into a simple expression.
-     *
-     * @param regex The regular expression to be converted
-     * @return A simple expression corresponding to the regex
-     * @throws UnsupportedOperationException if the regex cannot be converted
-     */
-    protected static String regexToSimple(final String regex)
-            throws UnsupportedOperationException {
-        final StringBuilder res = new StringBuilder(regex.length());
-        boolean escaped = false;
-        boolean inchar = false;
-
-        for (char part : regex.toCharArray()) {
-            if (inchar) {
-                inchar = false;
-
-                if (part == '*') {
-                    res.append(part);
-                    continue;
-                } else {
-                    res.append('?');
-                }
-            }
-
-            if (escaped) {
-                if (part == '?' || part == '*') {
-                    throw new UnsupportedOperationException("Cannot convert to"
-                            + " simple expression: ? or * is escaped.");
-                }
-
-                res.append(part);
-                escaped = false;
-            }  else if (part == '\\') {
-                escaped = true;
-            } else if (part == '.') {
-                inchar = true;
-            } else if (part == '.' || part == '^' || part == '$' || part == '['
-                    || part == ']' || part == '\\' || part == '(' || part == ')'
-                    || part == '{' || part == '}' || part == '|' || part == '+'
-                    || part == '*' || part == '?') {
-                throw new UnsupportedOperationException("Cannot convert to"
-                        + " simple expression: unescaped special char: " + part);
-            } else {
-                res.append(part);
-            }
-        }
-
-        if (escaped) {
-            throw new UnsupportedOperationException("Cannot convert to "
-                    + "simple expression: trailing backslash");
-        } else if (inchar) {
-            res.append('?');
-        }
-
-        return res.toString();
-    }
-
-    /**
-     * Converts a simple expression to a regular expression.
-     *
-     * @param regex The simple expression to be converted
-     * @return A corresponding regular expression
-     */
-    @SuppressWarnings("fallthrough")
-    protected static String simpleToRegex(final String regex) {
-        final StringBuilder res = new StringBuilder(regex.length());
-
-        for (char part : regex.toCharArray()) {
-            switch (part) {
-            case '.': case '^': case '$': case '[': case ']': case '\\':
-            case '(': case ')': case '{': case '}': case '|': case '+':
-                res.append('\\');
-                res.append(part);
-                break;
-            case '?':
-                res.append('.');
-                break;
-            case '*':
-                res.append('.');
-            default:
-                res.append(part);
-                break;
-            }
-        }
-
-        return res.toString();
-    }
-
-}

src/com/dmdirc/parser/common/MyInfo.java

@@ -1,159 +0,0 @@
-/*
- * Copyright (c) 2006-2009 Chris Smith, Shane Mc Cormack, Gregory Holmes
- *
- * 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 com.dmdirc.parser.common;
-
-/**
- * Contains User information.
- * 
- * @author Shane Mc Cormack
- * @author Chris Smith
- * @see IRCParser
- */
-public class MyInfo {
-    
-	/** Character to prepend to nickname if in use (Default "_"). */
-	private char prependChar = '_';	
-	/** Nickname to attempt to use on IRC. */
-	private String nickname;
-	/**
-	 * Alternative nickname to attempt to use on IRC.
-	 * If the first nickname is in use, and a NickInUse message is recieved before 001, we
-	 * will attempt to use this nickname instead.<br>
-	 * If this also fails, we will start prepending the prependChar character (_) to the main nickname
-	 */
-	private String altNickname;
-	/** Realname string to use */
-	private String realname;
-	/** Username to use, this doesn't matter when an ident server is running*/
-	private String username;
-	
-	/**
-	 * Create a new MyInfo object.
-	 */
-	public MyInfo() {
-		String result;
-		try {
-			result = System.getProperty("user.name");
-		} catch (SecurityException e) {
-			result = null;
-		}
-		if (result == null || result.isEmpty()) {
-			nickname = "IRCParser";
-			username = "IRCParser";
-			realname = "DMDIrc IRCParser";
-			altNickname = "IRC-Parser";
-		} else {
-			nickname = result;
-			username = nickname;
-			realname = nickname+" - DMDIrc";
-			altNickname = nickname+"-";
-		}
-	}
-	
-	/**
-	 * Set the Nickname.
-	 *
-	 * @param newValue Value to set to.
-	 */
-	public void setNickname(final String newValue) {
-		if (newValue != null && !newValue.isEmpty()) {
-			nickname = newValue;
-		}
-	}
-	
-	/**
-	 * Get the Nickname.
-	 *
-	 * @return Current Nickname
-	 */
-	public String getNickname() { return nickname; }
-	
-	/**
-	 * Set the Alternative Nickname.
-	 *
-	 * @param newValue Value to set to.
-	 */
-	public void setAltNickname(final String newValue) {
-		if (newValue != null && !newValue.isEmpty()) {
-			altNickname = newValue;
-		}
-	}
-	
-	/**
-	 * Get the Alternative Nickname.
-	 *
-	 * @return Current Nickname
-	 */
-	public String getAltNickname() { return altNickname; }
-	
-	/**
-	 * Set the Realname.
-	 *
-	 * @param newValue Value to set to.
-	 */
-	public void setRealname(final String newValue) {
-		if (newValue != null && !newValue.isEmpty()) {
-			realname = newValue;
-		}
-	}
-	
-	/**
-	 * Get the Realname.
-	 *
-	 * @return Current Realname
-	 */
-	public String getRealname() { return realname; }
-	
-	/**
-	 * Set the Username.
-	 *
-	 * @param newValue Value to set to.
-	 */
-	public void setUsername(final String newValue) {
-		if (newValue != null && !newValue.isEmpty()) {
-			username = newValue;
-		}
-	}
-	
-	/**
-	 * Get the Username.
-	 *
-	 * @return Current Username
-	 */
-	public String getUsername() { return username; }
-	
-	/**
-	 * Set the Prepend Character.
-	 *
-	 * @param newValue Value to set to.
-	 */
-	public void setPrependChar(final char newValue) { prependChar = newValue; }
-	
-	/**
-	 * Get the Prepend Character.
-	 *
-	 * @return Current Prepend Character
-	 */
-	public char getPrependChar() { return prependChar; }	
-
-}

src/com/dmdirc/parser/common/ParserError.java

@@ -1,177 +0,0 @@
-/*
- * Copyright (c) 2006-2009 Chris Smith, Shane Mc Cormack, Gregory Holmes
- *
- * 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 com.dmdirc.parser.common;
-
-/**
- * IRC Parser Error.
- *
- * @author Shane Mc Cormack
- */
-public final class ParserError {
-	/** Error is potentially Fatal, Desync 99% Guaranteed! */
-	public static final int ERROR_FATAL = 1;
-	/** Error is not fatal, but is more severe than a warning. */
-	public static final int ERROR_ERROR = 2;
-	/** Error was an unexpected occurance, but shouldn't be anything to worry about. */
-	public static final int ERROR_WARNING = 4;
-	/** Error is a user-error rather than a server error. */
-	public static final int ERROR_USER = 8;
-	/** Error was an exception from elsewhere. */
-	public static final int ERROR_EXCEPTION = 16;
-	
-	/** Store the Error level. */
-	private int errorLevel;
-	/** Store the Error Information. */
-	private String errorData;
-	/** Store the Exception object. */
-	private Exception exceptionInfo;
-	
-	/** Last line of server input before this exception was triggered. */
-	private String lastLine = "";
-	
-	/**
-	 * Create a new Error.
-	 *
-	 * @param level Set the error level.
-	 * @param data String containing information about the error.
-	 * @param line The last line of data recieved from the server before this exception.
-	 */
-	public ParserError(final int level, final String data, final String line) {
-		errorData = data;
-		errorLevel = level;
-		lastLine = line;
-	}
-	
-	/**
-	 * Check if this error is considered Fatal.
-	 *
-	 * @return Returns true for a fatal error, false for a non-fatal error
-	 */
-	public boolean isFatal() {
-		return (errorLevel & ERROR_FATAL) == ERROR_FATAL;
-	}
-	
-	/**
-	 * Check if this error is considered an error (less severe than fatal, worse than warning).
-	 *
-	 * @return Returns true for an "Error" level error, else false.
-	 */
-	public boolean isError() {
-		return (errorLevel & ERROR_ERROR) == ERROR_ERROR;
-	}
-	
-	/**
-	 * Check if this error is considered a warning.
-	 *
-	 * @return Returns true for a warning, else false.
-	 */
-	public boolean isWarning() {
-		return (errorLevel & ERROR_WARNING) == ERROR_WARNING;
-	}
-	
-	/**
-	 * Check if this error is considered a user-error rather than a server error.
-	 * For DMDirc this will cause the error not to be reported to the developers
-	 *
-	 * @return Returns true for a user error, else false.
-	 */
-	public boolean isUserError() {
-		return (errorLevel & ERROR_USER) == ERROR_USER;
-	}
-	
-	/**
-	 * Check if this error was generated from an exception.
-	 *
-	 * @return Returns true if getException will return an exception.
-	 */
-	public boolean isException() {
-		return (errorLevel & ERROR_EXCEPTION) == ERROR_EXCEPTION;
-	}
-	
-	/**
-	 * Check if this error has a lastLine parameter.
-	 *
-	 * @return Returns true if getLastLine returns anything non null, non empty.
-	 */
-	public boolean hasLastLine() {
-		return (lastLine != null && !lastLine.isEmpty());
-	}
-	
-	/**
-	 * Set the Exception object.
-	 *
-	 * @param newException The exception object to store
-	 */
-	public void setException(final Exception newException) {
-		exceptionInfo = newException;
-		if (!this.isException()) {
-			this.errorLevel = this.errorLevel + ERROR_EXCEPTION;
-		}
-	}
-	
-	/**
-	 * Get the Exception object.
-	 *
-	 * @return Returns the exception object
-	 */
-	public Exception getException() {
-		return exceptionInfo;
-	}
-	
-	/**
-	 * Get the full ErrorLevel.
-	 *
-	 * @return Returns the error level
-	 */
-	public int getLevel() {
-		return errorLevel;
-	}
-	
-	/**
-	 * Get the Error information.
-	 *
-	 * @return Returns the error data
-	 */
-	public String getData() {
-		return errorData;
-	}
-	
-	/**
-	 * Add to the error information.
-	 *
-	 * @param data Information to add to the end of the existing Data
-	 */
-	public void appendData(final String data) {
-		errorData = errorData + '[' + data + ']';
-	}
-	
-	/**
-	 * Get the last line recieved from the server before this exception.
-	 *
-	 * @return Returns the error data
-	 */
-	public String getLastLine() {
-		return lastLine;
-	}	
-
-}

src/com/dmdirc/parser/common/QueuePriority.java

@@ -1,37 +0,0 @@
-/*
- *  Copyright (c) 2006-2009 Chris Smith, Shane Mc Cormack, Gregory Holmes
- * 
- *  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 com.dmdirc.parser.common;
-
-/**
- * Queue Priority.
- *
- * @author shane
- */
-public enum QueuePriority {
-    /** Low priority. */
-    LOW,
-    /** Normal priority. */
-    NORMAL,
-    /** High Priority. */
-    HIGH;
-}

src/com/dmdirc/parser/interfaces/ChannelClientInfo.java

@@ -1,91 +0,0 @@
-/*
- * Copyright (c) 2006-2009 Chris Smith, Shane Mc Cormack, Gregory Holmes
- *
- * 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 com.dmdirc.parser.interfaces;
-
-import java.util.Map;
-
-/**
- * Describes a client that is present on a channel and provides methods to
- * interact with it.
- *
- * @since 0.6.3m2
- * @author chris
- */
-public interface ChannelClientInfo extends Comparable<ChannelClientInfo> {
-
-    /**
-     * Retrieves the {@link ClientInfo} object which this object corresponds
-     * to.
-     * 
-     * @return The client info object which this object represents
-     */
-    ClientInfo getClient();
-
-    /**
-     * Retrieves the {@link ChannelInfo} object for the channel which this
-     * object is associated with.
-     *
-     * @return The corresponding ChannelInfo object
-     */
-    ChannelInfo getChannel();
-
-    /**
-     * Returns the most important mode that the client holds in its prefix
-     * form (e.g. @, +, etc).
-     *
-     * @return The most important mode the client holds, or an empty string
-     */
-    String getImportantModePrefix();
-
-    /**
-     * Returns the most important mode that the client holds in its textual
-     * form (e.g. o, v, etc)
-     *
-     * @return The most important mode the client holds, or an empty string
-     */
-    String getImportantMode();
-
-    /**
-     * Returns a list of all modes known to be held by the client, in their
-     * textual for (e.g. o, v, etc)
-     *
-     * @return All modes the client holds, or an empty string
-     */
-    String getAllModes();
-
-    /**
-     * Retrieves a {@link Map} which can be used to store arbitrary data
-     * about the channel client.
-     *
-     * @return A map used for storing arbitrary data
-     */
-    Map<Object, Object> getMap();
-
-    /**
-     * Kicks this client from the channel.
-     *
-     * @param message The kick message to use
-     */
-    void kick(String message);
-
-}

src/com/dmdirc/parser/interfaces/ChannelInfo.java

@@ -1,193 +0,0 @@
-/*
- * Copyright (c) 2006-2009 Chris Smith, Shane Mc Cormack, Gregory Holmes
- *
- * 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 com.dmdirc.parser.interfaces;
-
-import com.dmdirc.parser.common.ChannelListModeItem;
-import java.util.Collection;
-
-/**
- * Holds information about a channel and allows various operations to be
- * performed on the channel.
- *
- * @since 0.6.3m2
- * @author chris
- */
-public interface ChannelInfo {
-
-    /**
-     * Returns the name of this channel.
-     *
-     * @return The name of this channel
-     */
-    String getName();
-
-    /**
-     * Changes the topic of this channel.
-     *
-     * @param topic This channel's new topic
-     */
-    void setTopic(String topic);
-
-    /**
-     * Retrieves the current topic or subject of this channel.
-     *
-     * @return This channel's topic
-     */
-    String getTopic();
-
-    /**
-     * Retrieves the time the current topic was set, as a unix timestamp.
-     *
-     * @return The time the current topic was set
-     */
-    long getTopicTime();
-
-    /**
-     * Retrieves a textual description of the person or entity that set the
-     * channel topic.
-     *
-     * @return The person that set the current topic
-     */
-    String getTopicSetter();
-
-    /**
-     * Retrieves a textual representation of the modes currently set on this
-     * channel. This includes boolean and parameter modes, but not list modes.
-     *
-     * @return The current channel modes
-     */
-    String getModes();
-
-    /**
-     * Retrieves the value of the specified mode if it's set.
-     *
-     * @param mode The mode to retrieve
-     * @return The value for the specified mode or an empty string if it's not set
-     */
-    String getMode(char mode);
-
-    /**
-     * Retrieves the known values for the specified list mode.
-     *
-     * @param mode The list mode to be retrieved
-     * @return A collection of known list mode items
-     */
-    Collection<ChannelListModeItem> getListMode(char mode);
-
-    /**
-     * Sends the specified message to this channel.
-     *
-     * @param message The message to be sent
-     */
-    void sendMessage(final String message);
-
-    /**
-     * Sends the specified action to this channel.
-     *
-     * @param action The action to be sent
-     */
-    void sendAction(String action);
-
-    /**
-     * Parts this channel with the specified reason.
-     *
-     * @param reason The reason for parting
-     */
-    void part(String reason);
-
-    /**
-     * Sends a WHO request to get details about people who are on the channel.
-     */
-    void sendWho();
-
-    /**
-     * Adjust the modes on this channel. This method should queue modes to be
-     * sent in one go, according to the configuration/behaviour of the backend
-     * system. If fewer modes are altered than the queue accepts, the
-     * flushModes() method must be called.
-     *
-     * @param add Whether to add or remove the specified mode
-     * @param mode Character The character representation of the mode to be changed
-     * @param parameter Optional parameter needed to make change
-     */
-    void alterMode(boolean add, final Character mode, String parameter);
-
-    /**
-     * Flushes any mode changes that have been queued by the
-     * {@link #alterMode(boolean, Character, String)} method.
-     */
-    void flushModes();
-
-    /**
-     * Retrieves a channel client information object corresponding to the
-     * specified client.
-     *
-     * @param client The client whose channel client info object is being requested
-     * @return A {@link ChannelClientInfo} object corresponding to the client
-     */
-    ChannelClientInfo getChannelClient(ClientInfo client);
-
-    /**
-     * Retrieves a channel client information object corresponding to the
-     * specified client.
-     *
-     * @param client The name or other textual representation of the client
-     * @return A {@link ChannelClientInfo} object corresponding to the client,
-     * or null if none was found
-     */
-    ChannelClientInfo getChannelClient(String client);
-
-    /**
-     * Retrieves a channel client information object corresponding to the
-     * specified client. If the client doesn't exist and the value of
-     * <code>create</code> is <code>true</code>, a new fake client is created.
-     *
-     * @param client The name or other textual representation of the client
-     * @param create Whether or not to create the client if it doesn't exist
-     * @return A {@link ChannelClientInfo} object corresponding to the client
-     */
-    ChannelClientInfo getChannelClient(String client, boolean create);
-
-    /**
-     * Retrieves a collection of all known clients that are present on the
-     * channel.
-     *
-     * @return A collection of known channel clients
-     */
-    Collection<ChannelClientInfo> getChannelClients();
-
-    /**
-     * Retrieves the number of clients known to exist in this channel.
-     *
-     * @return The number of clients known in this channel
-     */
-    int getChannelClientCount();
-
-    /**
-     * Retrieves the parser which created this ChannelInfo.
-     *
-     * @return This ChannelInfo's parser
-     */
-    Parser getParser();
-
-}

src/com/dmdirc/parser/interfaces/ClientInfo.java

@@ -1,86 +0,0 @@
-/*
- * Copyright (c) 2006-2009 Chris Smith, Shane Mc Cormack, Gregory Holmes
- *
- * 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 com.dmdirc.parser.interfaces;
-
-import java.util.Map;
-
-/**
- * Holds information about a client, and provides various methods for
- * interacting with that client.
- *
- * @author chris
- * @since 0.6.3m2
- */
-public interface ClientInfo {
-
-    /**
-     * Retrieves the nickname or display name used by this client.
-     *
-     * @return This client's nickname
-     */
-    String getNickname();
-
-    /**
-     * Retrieves the username or ident used by this client.
-     *
-     * @return This client's username
-     */
-    String getUsername();
-
-    /**
-     * Retrieves the hostname that this client is connecting from.
-     *
-     * @return This client's hostname
-     */
-    String getHostname();
-
-    /**
-     * Retrieves the full/real name of the client.
-     *
-     * @return This client's real name
-     */
-    String getRealname();
-
-    /**
-     * Retrieves the number of channels that this client is known to be on.
-     *
-     * @return The number of channels the client is known to be on
-     */
-    int getChannelCount();
-
-    /**
-     * Retrieves a {@link Map} which can be used to store arbitrary data
-     * about the client.
-     *
-     * @return A map used for storing arbitrary data
-     */
-    Map<Object, Object> getMap();
-
-    /**
-     * Retrieves the parser which created this ClientInfo.
-     *
-     * @return This ClientInfo's parser
-     */
-    Parser getParser();
-    
-}

src/com/dmdirc/parser/interfaces/FakableArgument.java

@@ -1,40 +0,0 @@
-/*
- * Copyright (c) 2006-2009 Chris Smith, Shane Mc Cormack, Gregory Holmes
- *
- * 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 com.dmdirc.parser.interfaces;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/**
- * Indicates a specific argument may be faked.
- *
- * @since 0.6.3m1
- * @author chris
- */
-@Retention(RetentionPolicy.RUNTIME)
-@Target(ElementType.PARAMETER)
-public @interface FakableArgument {
-
-}

src/com/dmdirc/parser/interfaces/FakableSource.java

@@ -1,41 +0,0 @@
-/*
- * Copyright (c) 2006-2009 Chris Smith, Shane Mc Cormack, Gregory Holmes
- *
- * 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 com.dmdirc.parser.interfaces;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/**
- * Indicates that the specified argument is a source of data for fakable
- * arguments.
- *
- * @since 0.6.3m1
- * @author chris
- */
-@Retention(RetentionPolicy.RUNTIME)
-@Target(ElementType.PARAMETER)
-public @interface FakableSource {
-
-}

src/com/dmdirc/parser/interfaces/LocalClientInfo.java

@@ -1,77 +0,0 @@
-/*
- * Copyright (c) 2006-2009 Chris Smith, Shane Mc Cormack, Gregory Holmes
- *
- * 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 com.dmdirc.parser.interfaces;
-
-/**
- * A more specialised type of {@link ClientInfo} which represents a locally
- * controlled client, and as such can be modified in various ways.
- *
- * @author chris
- * @since 0.6.3m1
- */
-public interface LocalClientInfo extends ClientInfo {
-
-    /**
-     * Sets this client's nickname to the specified value.
-     *
-     * @param name The new nickname to use
-     */
-    void setNickname(String name);
-
-    /**
-     * Retrieves the modes which are currently set on the local client.
-     *
-     * @return A string representation of the client's user modes
-     */
-    String getModes();
-
-    /**
-     * Marks the local client as being away.
-     *
-     * @param reason The reason for being away
-     */
-    void setAway(String reason);
-
-    /**
-     * Marks the local client as being back (not away).
-     */
-    void setBack();
-
-    /**
-     * Alters the user modes of the local client. This method will queue modes
-     * to be sent in one go, according to the behaviour/configuration of the
-     * backend system. If fewer modes are altered than the queue accepts,
-     * {@link #flushModes()} must be called.
-     *
-     * @param add Whether to add or remove the mode
-     * @param mode Character representation of the mode to be altered
-     */
-    public void alterMode(boolean add, Character mode);
-
-    /**
-     * Flushes any modes that have been queued by the
-     * {@link #alterMode(boolean, Character)} method.
-     */
-    public void flushModes();
-
-}

src/com/dmdirc/parser/interfaces/Parser.java

@@ -1,398 +0,0 @@
-/*
- * Copyright (c) 2006-2009 Chris Smith, Shane Mc Cormack, Gregory Holmes
- *
- * 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 com.dmdirc.parser.interfaces;
-
-import com.dmdirc.parser.common.IgnoreList;
-import com.dmdirc.parser.common.CallbackManager;
-
-import com.dmdirc.parser.common.QueuePriority;
-import java.util.Collection;
-
-/**
- * A parser connects to a back-end chat system and handles all communication
- * with it.
- *
- * @since 0.6.3m2
- * @author chris
- */
-public interface Parser extends Runnable {
-
-    /**
-     * Disconnect from server. This method will quit and automatically close the
-     * socket without waiting for the server.
-     *
-     * @param message Reason for quitting.
-     */
-    void disconnect(String message);
-
-    /**
-     * Join a channel with no key.
-     *
-     * @param channel Name of channel to join
-     */
-    void joinChannel(String channel);
-
-    /**
-     * Joins a channel with the specified key.
-     *
-     * @param channel Name of channel to join
-     * @param key The key required to join the channel
-     */
-    void joinChannel(String channel, String key);
-
-    /**
-     * Retrieves a channel information object for the specified channel.
-     *
-     * @param channel Name of the channel to retrieve an information object for
-     * @return A corresponding channel info object
-     */
-    ChannelInfo getChannel(String channel);
-
-    /**
-     * Retrieves a collection of all known channels.
-     *
-     * @return A collection of known channels
-     */
-    Collection<? extends ChannelInfo> getChannels();
-
-    /**
-     * Set the IP address that this parser will bind to
-     *
-     * @param ip IP to bind to
-     */
-    void setBindIP(String ip);
-
-    /**
-     * Determines the maximimum length a message of the specified type may be.
-     *
-     * @param type Type of message (eg PRIVMSG)
-     * @param target Target of message (eg channel name)
-     * @return The maximum length of the message
-     */
-    int getMaxLength(String type, String target);
-
-    /**
-     * Determines the maximum length any message/raw command may be.
-     *
-     * @return The maximum length of a message
-     */
-    int getMaxLength();
-
-    /**
-     * Returns a {@link ClientInfo} object which represents the locally
-     * connected client.
-     *
-     * @return An info object for the local client
-     */
-    LocalClientInfo getLocalClient();
-
-    /**
-     * Retrieves a {@link ClientInfo} object which corresponds to the specified
-     * details. If the client wasn't previously known, it will be created.
-     *
-     * @param details The details of the client to look up
-     * @return A corresponding client info object
-     */
-    ClientInfo getClient(String details);
-
-    /**
-     * Sends a raw message directly to the backend system. The message will
-     * need to be of the appropriate format for whatever system is in use.
-     *
-     * @param message The message to be sent
-     */
-    void sendRawMessage(String message);
-
-    /**
-     * Sends a raw message directly to the backend system. The message will
-     * need to be of the appropriate format for whatever system is in use.
-     *
-     * @param message The message to be sent
-     * @param priority Priority of this line. (Priorities are advisory and not
-     *                 guaranteed to be enforced.
-     */
-    void sendRawMessage(String message, QueuePriority priority);
-
-    /**
-     * Retrieves an object that can be used to convert between upper- and lower-
-     * case strings in the relevant charset for the backend system.
-     *
-     * @return A string convertor for this parser
-     */
-    StringConverter getStringConverter();
-
-    /**
-     * Determines whether the specified channel name is valid or not for this
-     * parser.
-     *
-     * @param name The name of the channel to be tested
-     * @return True if the channel name is valid, false otherwise
-     */
-    boolean isValidChannelName(String name);
-
-    /**
-     * Retrieves the name of the server that this parser is connected to.
-     *
-     * @return This parser's server's name
-     */
-    String getServerName();
-
-    /**
-     * Retrieves the name of the network that this parser is connected to.
-     *
-     * @return This parser's network's name
-     */
-    String getNetworkName();
-
-    /**
-     * Retrieves a textual description of the software running on the server.
-     *
-     * @return This parser's server's software name
-     */
-    String getServerSoftware();
-
-    /**
-     * Retrieves the detected type of the software running on the server
-     *
-     * @return This parser's server's software type
-     */
-    String getServerSoftwareType();
-
-    /**
-     * Retrieves the maximum length for a topic that can be set by this parser.
-     *
-     * @return The maximum length (in bytes) of a topic
-     */
-    int getMaxTopicLength();
-
-    /**
-     * Retrieves an alphabetically-sorted list of boolean channel modes.
-     * Boolean channel modes may only be set or unset, and do not take any
-     * arguments.
-     *
-     * @return A string containing a list of channel mode characters
-     */
-    String getBooleanChannelModes();
-
-    /**
-     * Retrieves an alphabetically-sorted list of channel list modes.
-     * List channel modes may be set multiple times with different arguments,
-     * building up a "list" of values.
-     *
-     * @return A string containing a list of channel mode characters
-     */
-    String getListChannelModes();
-
-    /**
-     * Retrieves the maximum number of list modes of the specified type which
-     * may be set on a channel. Returns 0 or -1 if the limit wasn't specified,
-     * or couldn't be discovered, respectively.
-     *
-     * @param mode The list mode being requested
-     * @return The maximimum number of that mode which can be set
-     */
-    int getMaxListModes(char mode);
-
-    /**
-     * Determines if the specified channel mode is settable by users.
-     *
-     * @param mode The mode to be tested
-     * @return True if users may set the mode, false otherwise
-     */
-    boolean isUserSettable(final char mode);
-
-    /**
-     * Retrieves an alphabetically-sorted list of 'parameter' channel modes.
-     * Parameter channel modes may only be set or unset, and require a
-     * parameter to be specified when they are set (but not when unset).
-     *
-     * @return A string containing a list of channel mode characters
-     */
-    String getParameterChannelModes();
-
-    /**
-     * Retrieves an alphabetically-sorted list of 'double parameter' channel
-     * modes. Double parameter channel modes may only be set or unset, and
-     * require a parameter to be specified both when they are set and when
-     * they are unset.
-     *
-     * @return A string containing a list of channel mode characters
-     */
-    String getDoubleParameterChannelModes();
-
-    /**
-     * Retrieves a list of user modes in no particular order.
-     *
-     * @return A string containing a list of user mode characters
-     */
-    String getUserModes();
-
-    /**
-     * Retrieves a list of channel user modes, in descending priority order.
-     * 
-     * @return A string containing a list of channel user mode characters
-     */
-    String getChannelUserModes();
-    
-    /**
-     * Retrieves the object which is responsible for managing callbacks for
-     * this parser.
-     * 
-     * @return This parser's callback manager
-     */
-    CallbackManager<? extends Parser> getCallbackManager();
-
-    /**
-     * Retrieves the latency between the parser and the server in milliseconds.
-     *
-     * @return The current latency, in milliseconds
-     */
-    long getServerLatency();
-
-    /**
-     * Sends a CTCP of the specified type to the specified target.
-     *
-     * @param target The destination of the CTCP message
-     * @param type The type of CTCP to send
-     * @param message The content of the CTCP message
-     */
-    void sendCTCP(String target, String type, String message);
-
-    /**
-     * Sends a CTCP reply of the specified type to the specified target.
-     *
-     * @param target The destination of the CTCP reply
-     * @param type The type of CTCP to reply to
-     * @param message The content of the CTCP reply
-     */
-    void sendCTCPReply(String target, String type, String message);
-
-    /**
-     * Sends a message to the specified target.
-     *
-     * @param target The target to send the message to
-     * @param message The message to be sent
-     */
-    void sendMessage(String target, String message);
-
-    /**
-     * Sends a notice to the specified target.
-     *
-     * @param target The target to send the notice to
-     * @param message The message to be sent
-     */
-    void sendNotice(String target, String message);
-
-    /**
-     * Sends an action to the specified target.
-     *
-     * @param target The target to send the action to
-     * @param message The message to be sent
-     */
-    void sendAction(String target, String message);
-
-    /**
-     * Retrieves the last line/communication received from the server, for use
-     * in debugging purposes.
-     *
-     * @return The last line received
-     */
-    String getLastLine();
-
-    /**
-     * Sets the ignore list which should be used by this parser.
-     *
-     * @param ignoreList The new ignore list to be used by the parser
-     */
-    void setIgnoreList(IgnoreList ignoreList);
-
-    /**
-     * Retrieves the ignore list which is currently in use by this parser.
-     *
-     * @return This parser's ignore list
-     */
-    IgnoreList getIgnoreList();
-
-    /**
-     * Parses the specified hostmask into an array containing a nickname,
-     * username and hostname, in that order.
-     *
-     * @param hostmask The hostmask to be parsed
-     * @return An array containing the nickname, username and hostname
-     */
-    String[] parseHostmask(String hostmask);
-
-    /**
-     * Retrieves the local port number that this parser is using to communicate
-     * with the service.
-     *
-     * @return This parser's local port number
-     */
-    int getLocalPort();
-
-    /**
-     * Retrieves the amount of time elapsed since the last ping request was
-     * sent (or until the reply was received).
-     *
-     * @return The current ping time to the server
-     */
-    long getPingTime();
-
-    /**
-     * Sets the interval of the ping timer, in milliseconds. If the parser is
-     * waiting for a ping, it should fire a PingFailed event every time this
-     * interval is passed (or disconnect if no listeners are registered).
-     *
-     * @param newValue The new value for the ping timer interval
-     */
-    void setPingTimerInterval(long newValue);
-
-    /**
-     * Retrieves the length of the ping timer interval for this parser.
-     *
-     * @return This parser's ping timer interval
-     */
-    long getPingTimerInterval();
-
-    /**
-     * Sets how many ping timer intervals should pass before the parser sends
-     * a ping. That is, the time between pings on an idle connection will be
-     * <code>(ping timer interval) * (ping timer fraction)</code> millisecs.
-     *
-     * For example, setting the interval to 10,000 (10 seconds) and the fraction
-     * to 6 means that pings will be sent once every minute and if a reply is
-     * not received within 10 seconds, a ping failed event will be raised.
-     *
-     * @param newValue The new value of the ping timer fraction
-     */
-    void setPingTimerFraction(int newValue);
-
-    /**
-     * Retrieves the number of ping timer intervals that must pass before this
-     * parser sends a ping request.
-     *
-     * @return This parser's ping timer fraction
-     */
-    int getPingTimerFraction();
-
-}

src/com/dmdirc/parser/interfaces/SecureParser.java

@@ -1,52 +0,0 @@
-/*
- * Copyright (c) 2006-2009 Chris Smith, Shane Mc Cormack, Gregory Holmes
- *
- * 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 com.dmdirc.parser.interfaces;
-
-import javax.net.ssl.KeyManager;
-import javax.net.ssl.TrustManager;
-
-/**
- * A {@link SecureParser} is a specialised {@link Parser} that can connect
- * to secure (SSL-enabled) backends.
- *
- * @since 0.6.3m2
- * @author chris
- */
-public interface SecureParser extends Parser {
-
-    /**
-     * Sets the trust managers which should be used to determine if a server
-     * certificate is trusted by the client.
-     *
-     * @param managers The new trust managers to use
-     */
-    void setTrustManagers(TrustManager[] managers);
-
-    /**
-     * Sets the key managers which should be used to supply client certificates.
-     *
-     * @param managers The new key managers to use
-     */
-    void setKeyManagers(KeyManager[] managers);
-
-}

src/com/dmdirc/parser/interfaces/SpecificCallback.java

@@ -1,38 +0,0 @@
-/*
- * Copyright (c) 2006-2009 Chris Smith, Shane Mc Cormack, Gregory Holmes
- *
- * 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 com.dmdirc.parser.interfaces;
-
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-
-/**
- * Used to indicate that a callback interface can be called for specified
- * objects (hosts/channels/etc).
- *
- * @since 0.6.3m1
- * @author chris
- */
-@Retention(RetentionPolicy.RUNTIME)
-public @interface SpecificCallback {
-
-}

src/com/dmdirc/parser/interfaces/StringConverter.java

@@ -1,59 +0,0 @@
-/*
- * Copyright (c) 2006-2009 Chris Smith, Shane Mc Cormack, Gregory Holmes
- *
- * 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 com.dmdirc.parser.interfaces;
-
-/**
- * Facilitates case conversion according to the charset/rules of the specific
- * backend chat system.
- *
- * @since 0.6.3m2
- * @author chris
- */
-public interface StringConverter {
-
-    /**
-     * Get the lowercase version of a String.
-     *
-     * @param input String to convert to lowercase
-     * @return String converted to lowercase
-     */
-    String toLowerCase(String input);
-
-    /**
-     * Get the uppercase version of a String.
-     *
-     * @param input String to convert to uppercase
-     * @return String converted to uppercase
-     */
-    String toUpperCase(String input);
-
-    /**
-     * Check if the 2 strings are equal to each other ignoring case.
-     *
-     * @param first First string to check
-     * @param second Second string to check
-     * @return True if both strings are equal after being lowercased
-     */
-    boolean equalsIgnoreCase(String first, String second);
-
-}

src/com/dmdirc/parser/interfaces/callbacks/AuthNoticeListener.java

@@ -1,40 +0,0 @@
-/*
- * Copyright (c) 2006-2009 Chris Smith, Shane Mc Cormack, Gregory Holmes
- *
- * 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 com.dmdirc.parser.interfaces.callbacks;
-
-import com.dmdirc.parser.interfaces.Parser;
-
-/**
- * Interface Used on every incomming line before 001.
- */
-public interface AuthNoticeListener extends CallbackInterface {
-
-    /**
-	 * Called on every incomming line before 001.
-	 * 
-	 * @param tParser Reference to the parser object that made the callback.
-	 * @param sData Incomming Line.
-	 * @see com.dmdirc.parser.irc.ProcessNoticeAuth#callNoticeAuth
-	 */
-	void onNoticeAuth(Parser tParser, String sData);
-}

src/com/dmdirc/parser/interfaces/callbacks/AwayStateListener.java

@@ -1,41 +0,0 @@
-/*
- * Copyright (c) 2006-2009 Chris Smith, Shane Mc Cormack, Gregory Holmes
- *
- * 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 com.dmdirc.parser.interfaces.callbacks;
-
-import com.dmdirc.parser.interfaces.Parser;
-
-/**
- * Called when we go away, or come back.
- */
-public interface AwayStateListener extends CallbackInterface {
-
-    /**
-	 * Called when we go away, or come back.
-	 *
-	 * @param tParser Reference to the parser object that made the callback.
-	 * @param currentState Set to true if we are now away, else false.
-	 * @param reason Best guess at away reason
-	 * @see com.dmdirc.parser.irc.ProcessAway#callAwayState
-	 */
-	void onAwayState(Parser tParser, boolean currentState, String reason);
-}

src/com/dmdirc/parser/interfaces/callbacks/CallbackInterface.java

@@ -1,28 +0,0 @@
-/*
- * Copyright (c) 2006-2009 Chris Smith, Shane Mc Cormack, Gregory Holmes
- *
- * 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 com.dmdirc.parser.interfaces.callbacks;
-
-/**
- * "SuperInterface" for all callbacks.
- */
-public interface CallbackInterface { }

src/com/dmdirc/parser/interfaces/callbacks/ChannelActionListener.java

@@ -1,58 +0,0 @@
-/*
- * Copyright (c) 2006-2009 Chris Smith, Shane Mc Cormack, Gregory Holmes
- *
- * 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 com.dmdirc.parser.interfaces.callbacks;
-
-import com.dmdirc.parser.interfaces.ChannelClientInfo;
-import com.dmdirc.parser.interfaces.ChannelInfo;
-import com.dmdirc.parser.interfaces.Parser;
-import com.dmdirc.parser.interfaces.FakableArgument;
-import com.dmdirc.parser.interfaces.FakableSource;
-import com.dmdirc.parser.interfaces.SpecificCallback;
-
-/**
- * Called when a person does an action in a channel.
- * sHost is the hostname of the person sending the action. (Can be a server or a person)<br>
- * cChannelClient is null if user is a server, or not on the channel.
- */
-@SpecificCallback
-public interface ChannelActionListener extends CallbackInterface {
-
-    /**
-	 * Called when a person does an action in a channel.
-	 * sHost is the hostname of the person sending the action. (Can be a server or a person)<br>
-	 * cChannelClient is null if user is a server, or not on the channel.
-	 * 
-	 * @param tParser Reference to the parser object that made the callback.
-	 * @param cChannel Channel where the action was sent to
-	 * @param cChannelClient ChannelClient who sent the action (may be null if server)
-	 * @param sMessage action contents
-	 * @param sHost Hostname of sender (or servername)
-	 * @see com.dmdirc.parser.irc.ProcessMessage#callChannelAction
-	 */
-	void onChannelAction(
-            @FakableSource Parser tParser,
-            @FakableSource ChannelInfo cChannel,
-            @FakableArgument ChannelClientInfo cChannelClient,
-            String sMessage,
-            @FakableSource String sHost);
-}

src/com/dmdirc/parser/interfaces/callbacks/ChannelCtcpListener.java

@@ -1,57 +0,0 @@
-/*
- * Copyright (c) 2006-2009 Chris Smith, Shane Mc Cormack, Gregory Holmes
- *
- * 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 com.dmdirc.parser.interfaces.callbacks;
-
-import com.dmdirc.parser.interfaces.ChannelClientInfo;
-import com.dmdirc.parser.interfaces.ChannelInfo;
-import com.dmdirc.parser.interfaces.Parser;
-import com.dmdirc.parser.interfaces.FakableArgument;
-import com.dmdirc.parser.interfaces.FakableSource;
-import com.dmdirc.parser.interfaces.SpecificCallback;
-
-/**
- * Called when a person sends a CTCP to a channel.
- * sHost is the hostname of the person sending the CTCP. (Can be a server or a person)<br>
- * cChannelClient is null if user is a server.
- */
-@SpecificCallback
-public interface ChannelCtcpListener extends CallbackInterface {
-	/**
-	 * Called when a person sends a CTCP to a channel.
-	 * sHost is the hostname of the person sending the CTCP. (Can be a server or a person)<br>
-	 * cChannelClient is null if user is a server.
-	 * 
-	 * @param tParser Reference to the parser object that made the callback.
-	 * @param cChannel Channel where CTCP was sent
-	 * @param cChannelClient ChannelClient who sent the message (may be null if server)
-	 * @param sType Type of CTCP (VERSION, TIME etc)
-	 * @param sMessage Additional contents
-	 * @param sHost Hostname of sender (or servername)
-	 * @see com.dmdirc.parser.irc.ProcessMessage#callChannelCTCP
-	 */
-	void onChannelCTCP(@FakableSource Parser tParser,
-            @FakableSource ChannelInfo cChannel,
-            @FakableArgument ChannelClientInfo cChannelClient,
-            String sType, String sMessage,
-            @FakableSource String sHost);
-}

src/com/dmdirc/parser/interfaces/callbacks/ChannelCtcpReplyListener.java

@@ -1,57 +0,0 @@
-/*
- * Copyright (c) 2006-2009 Chris Smith, Shane Mc Cormack, Gregory Holmes
- *
- * 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 com.dmdirc.parser.interfaces.callbacks;
-
-import com.dmdirc.parser.interfaces.ChannelClientInfo;
-import com.dmdirc.parser.interfaces.ChannelInfo;
-import com.dmdirc.parser.interfaces.Parser;
-import com.dmdirc.parser.interfaces.FakableArgument;
-import com.dmdirc.parser.interfaces.FakableSource;
-import com.dmdirc.parser.interfaces.SpecificCallback;
-
-/**
- * Called when a person sends a CTCPRReply to a channel.
- * sHost is the hostname of the person sending the CTCPReply. (Can be a server or a person)<br>
- * cChannelClient is null if user is a server.
- */
-@SpecificCallback
-public interface ChannelCtcpReplyListener extends CallbackInterface {
-	/**
-	 * Called when a person sends a CTCPRReply to a channel.
-	 * sHost is the hostname of the person sending the CTCPReply. (Can be a server or a person)<br>
-	 * cChannelClient is null if user is a server.
-	 * 
-	 * @param tParser Reference to the parser object that made the callback.
-	 * @param cChannel Channel where CTCPReply was sent
-	 * @param cChannelClient ChannelClient who sent the message (may be null if server)
-	 * @param sType Type of CTCPRReply (VERSION, TIME etc)
-	 * @param sMessage Reply Contents
-	 * @param sHost Hostname of sender (or servername)
-	 * @see com.dmdirc.parser.irc.ProcessMessage#callChannelCTCPReply
-	 */
-	void onChannelCTCPReply(@FakableSource Parser tParser,
-            @FakableSource ChannelInfo cChannel,
-            @FakableArgument ChannelClientInfo cChannelClient,
-            String sType, String sMessage,
-            @FakableSource String sHost);
-}

src/com/dmdirc/parser/interfaces/callbacks/ChannelJoinListener.java

@@ -1,46 +0,0 @@
-/*
- * Copyright (c) 2006-2009 Chris Smith, Shane Mc Cormack, Gregory Holmes
- *
- * 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 com.dmdirc.parser.interfaces.callbacks;
-
-import com.dmdirc.parser.interfaces.ChannelClientInfo;
-import com.dmdirc.parser.interfaces.ChannelInfo;
-import com.dmdirc.parser.interfaces.Parser;
-import com.dmdirc.parser.interfaces.SpecificCallback;
-
-/** 
- * Called When we, or another client joins a channel.
- * This is called AFTER client has been added to channel as a ChannelClientInfo
- */
-@SpecificCallback
-public interface ChannelJoinListener extends CallbackInterface {
-	/**
-	 * Called When another client joins a channel.
-	 * This is called AFTER client has been added to channel as a ChannelClientInfo
-	 * 
-	 * @param tParser Reference to the parser object that made the callback.
-	 * @param cChannel Channel Object
-	 * @param cChannelClient ChannelClient object for new person
-	 * @see com.dmdirc.parser.irc.ProcessJoin#callChannelJoin
-	 */
-	void onChannelJoin(Parser tParser, ChannelInfo cChannel, ChannelClientInfo cChannelClient);
-}

src/com/dmdirc/parser/interfaces/callbacks/ChannelKickListener.java

@@ -1,56 +0,0 @@
-/*
- * Copyright (c) 2006-2009 Chris Smith, Shane Mc Cormack, Gregory Holmes
- *
- * 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 com.dmdirc.parser.interfaces.callbacks;
-
-import com.dmdirc.parser.interfaces.ChannelClientInfo;
-import com.dmdirc.parser.interfaces.ChannelInfo;
-import com.dmdirc.parser.interfaces.Parser;
-import com.dmdirc.parser.interfaces.FakableArgument;
-import com.dmdirc.parser.interfaces.FakableSource;
-import com.dmdirc.parser.interfaces.SpecificCallback;
-
-/**
- * Called when a person is kicked.
- * cKickedByClient can be null if kicked by a server. sKickedByHost is the hostname of the person/server doing the kicking.
- */
-@SpecificCallback
-public interface ChannelKickListener extends CallbackInterface {
-	/**
-	 * Called when a person is kicked.
-	 * cKickedByClient can be null if kicked by a server. sKickedByHost is the hostname of the person/server doing the kicking.
-	 *
-	 * @param tParser Reference to the parser object that made the callback.
-	 * @param cChannel Channel where the kick took place
-	 * @param cKickedClient ChannelClient that got kicked
-	 * @param cKickedByClient ChannelClient that did the kicking (may be null if server)
-	 * @param sReason Reason for kick (may be "")
-	 * @param sKickedByHost Hostname of Kicker (or servername)
-	 * @see com.dmdirc.parser.irc.ProcessKick#callChannelKick
-	 */
-	void onChannelKick(@FakableSource Parser tParser,
-            @FakableSource ChannelInfo cChannel,
-            ChannelClientInfo cKickedClient,
-            @FakableArgument ChannelClientInfo cKickedByClient,
-            String sReason,
-            @FakableSource String sKickedByHost);
-}

src/com/dmdirc/parser/interfaces/callbacks/ChannelListModeListener.java

@@ -1,44 +0,0 @@
-/*
- * Copyright (c) 2006-2009 Chris Smith, Shane Mc Cormack, Gregory Holmes
- *
- * 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 com.dmdirc.parser.interfaces.callbacks;
-
-import com.dmdirc.parser.interfaces.ChannelInfo;
-import com.dmdirc.parser.interfaces.Parser;
-import com.dmdirc.parser.interfaces.SpecificCallback;
-
-/**
- * Called when all requested ListModes have been sent.
- * This is decided by ProcessListModes, and is called when an "end of list"
- * reply is sent, and the listModeQueue is empty (or non-existant).
- */
-@SpecificCallback
-public interface ChannelListModeListener extends CallbackInterface {
-	/**
-	 * Called when a ListModes reply is parsed.
-	 *
-	 * @param tParser Reference to the parser object that made the callback.
-	 * @param cChannel Channel which the ListModes reply is for
-	 * @see com.dmdirc.parser.irc.ProcessListModes#callChannelGotListModes
-	 */
-	void onChannelGotListModes(Parser tParser, ChannelInfo cChannel);
-}

src/com/dmdirc/parser/interfaces/callbacks/ChannelMessageListener.java

@@ -1,56 +0,0 @@
-/*
- * Copyright (c) 2006-2009 Chris Smith, Shane Mc Cormack, Gregory Holmes
- *
- * 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 com.dmdirc.parser.interfaces.callbacks;
-
-import com.dmdirc.parser.interfaces.ChannelClientInfo;
-import com.dmdirc.parser.interfaces.ChannelInfo;
-import com.dmdirc.parser.interfaces.Parser;
-import com.dmdirc.parser.interfaces.FakableArgument;
-import com.dmdirc.parser.interfaces.FakableSource;
-import com.dmdirc.parser.interfaces.SpecificCallback;
-
-/**
- * Called when a person sends a message to a channel.
- * sHost is the hostname of the person sending the message. (Can be a server or a person)<br>
- * cChannelClient is null if user is a server, or not on the channel.
- */
-@SpecificCallback
-public interface ChannelMessageListener extends CallbackInterface {
-	/**
-	 * Called when a person sends a message to a channel.
-	 * sHost is the hostname of the person sending the message. (Can be a server or a person)<br>
-	 * cChannelClient is null if user is a server, or not on the channel.
-	 *
-	 * @param tParser Reference to the parser object that made the callback.
-	 * @param cChannel Channel where the message was sent to
-	 * @param cChannelClient ChannelClient who sent the message (may be null if server)
-	 * @param sMessage Message contents
-	 * @param sHost Hostname of sender (or servername)
-	 * @see com.dmdirc.parser.irc.ProcessMessage#callChannelMessage
-	 */
-	void onChannelMessage(@FakableSource Parser tParser,
-            @FakableSource ChannelInfo cChannel,
-            @FakableArgument ChannelClientInfo cChannelClient,
-            String sMessage,
-            @FakableSource String sHost);
-}

src/com/dmdirc/parser/interfaces/callbacks/ChannelModeChangeListener.java

@@ -1,56 +0,0 @@
-/*
- * Copyright (c) 2006-2009 Chris Smith, Shane Mc Cormack, Gregory Holmes
- *
- * 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 com.dmdirc.parser.interfaces.callbacks;
-
-import com.dmdirc.parser.interfaces.ChannelClientInfo;
-import com.dmdirc.parser.interfaces.ChannelInfo;
-import com.dmdirc.parser.interfaces.Parser;
-import com.dmdirc.parser.interfaces.FakableArgument;
-import com.dmdirc.parser.interfaces.FakableSource;
-import com.dmdirc.parser.interfaces.SpecificCallback;
-
-/** 
- * Called when the channel modes are changed or discovered.
- * cChannelClient is null if the modes were found from raw 324 (/MODE #Chan reply) or if a server set the mode.<br>
- * If a Server set the mode, sHost is the servers name, else it is the full host of the user who set it
- */
-@SpecificCallback
-public interface ChannelModeChangeListener extends CallbackInterface {
-	/**
-	 * Called when the channel modes are changed or discovered.
-	 * cChannelClient is null if the modes were found from raw 324 (/MODE #Chan reply) or if a server set the mode.<br>
-	 * If a Server set the mode, sHost is the servers name, else it is the full host of the user who set it
-	 * 
-	 * @param tParser Reference to the parser object that made the callback.
-	 * @param cChannel Channel where modes were changed
-	 * @param cChannelClient Client chaning the modes (null if server)
-	 * @param sHost Host doing the mode changing (User host or server name)
-	 * @param sModes String showing the exact mode change parsed.
-	 * @see com.dmdirc.parser.irc.ProcessMode#callChannelModeChanged
-	 */
-	void onChannelModeChanged(@FakableSource Parser tParser,
-            @FakableSource ChannelInfo cChannel,
-            @FakableArgument ChannelClientInfo cChannelClient,
-            @FakableSource String sHost,
-            String sModes);
-}

src/com/dmdirc/parser/interfaces/callbacks/ChannelModeMessageListener.java

@@ -1,59 +0,0 @@
-/*
- * Copyright (c) 2006-2009 Chris Smith, Shane Mc Cormack, Gregory Holmes
- *
- * 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 com.dmdirc.parser.interfaces.callbacks;
-
-import com.dmdirc.parser.interfaces.ChannelClientInfo;
-import com.dmdirc.parser.interfaces.ChannelInfo;
-import com.dmdirc.parser.interfaces.Parser;
-import com.dmdirc.parser.interfaces.FakableArgument;
-import com.dmdirc.parser.interfaces.FakableSource;
-import com.dmdirc.parser.interfaces.SpecificCallback;
-
-/**
- * Called when a person sends a Message to a channel with a mode prefix.
- * (Examples @#Channel +#Channel)
- * sHost is the hostname of the person sending the Message. (Can be a server or a person)<br>
- * cChannelClient is null if user is a server, or not on the channel.
- */
-@SpecificCallback
-public interface ChannelModeMessageListener extends CallbackInterface {
-	/**
-	 * Called when a person sends a Message to a channel.
-	 * sHost is the hostname of the person sending the Message. (Can be a server or a person)<br>
-	 * cChannelClient is null if user is a server, or not on the channel.
-	 * 
-	 * @param tParser Reference to the parser object that made the callback.
-         * @param prefix The mode prefix of the message
-	 * @param cChannel Channel where the Message was sent to
-	 * @param cChannelClient ChannelClient who sent the Message (may be null if server)
-	 * @param sMessage Message contents
-	 * @param sHost Hostname of sender (or servername)
-	 * @see com.dmdirc.parser.irc.ProcessMessage#callChannelModeMessage
-	 */
-	void onChannelModeMessage(@FakableSource Parser tParser,
-            char prefix,
-            @FakableSource ChannelInfo cChannel,
-            @FakableArgument ChannelClientInfo cChannelClient,
-            String sMessage,
-            @FakableSource String sHost);
-}

src/com/dmdirc/parser/interfaces/callbacks/ChannelModeNoticeListener.java

@@ -1,59 +0,0 @@
-/*
- * Copyright (c) 2006-2009 Chris Smith, Shane Mc Cormack, Gregory Holmes
- *
- * 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 com.dmdirc.parser.interfaces.callbacks;
-
-import com.dmdirc.parser.interfaces.ChannelClientInfo;
-import com.dmdirc.parser.interfaces.ChannelInfo;
-import com.dmdirc.parser.interfaces.Parser;
-import com.dmdirc.parser.interfaces.FakableArgument;
-import com.dmdirc.parser.interfaces.FakableSource;
-import com.dmdirc.parser.interfaces.SpecificCallback;
-
-/**
- * Called when a person sends a notice to a channel with a mode prefix.
- * (Examples @#Channel +#Channel)
- * sHost is the hostname of the person sending the notice. (Can be a server or a person)<br>
- * cChannelClient is null if user is a server, or not on the channel.
- */
-@SpecificCallback
-public interface ChannelModeNoticeListener extends CallbackInterface {
-	/**
-	 * Called when a person sends a notice to a channel.
-	 * sHost is the hostname of the person sending the notice. (Can be a server or a person)<br>
-	 * cChannelClient is null if user is a server, or not on the channel.
-	 * 
-	 * @param tParser Reference to the parser object that made the callback.
-         * @param prefix The mode prefix of the message
-	 * @param cChannel Channel where the notice was sent to
-	 * @param cChannelClient ChannelClient who sent the notice (may be null if server)
-	 * @param sMessage notice contents
-	 * @param sHost Hostname of sender (or servername)
-	 * @see com.dmdirc.parser.irc.ProcessMessage#callChannelModeNotice
-	 */
-	void onChannelModeNotice(@FakableSource Parser tParser,
-            char prefix,
-            @FakableSource ChannelInfo cChannel,
-            @FakableArgument ChannelClientInfo cChannelClient,
-            String sMessage,
-            @FakableSource String sHost);
-}

src/com/dmdirc/parser/interfaces/callbacks/ChannelNamesListener.java

@@ -1,42 +0,0 @@
-/*
- * Copyright (c) 2006-2009 Chris Smith, Shane Mc Cormack, Gregory Holmes
- *
- * 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 com.dmdirc.parser.interfaces.callbacks;
-
-import com.dmdirc.parser.interfaces.ChannelInfo;
-import com.dmdirc.parser.interfaces.Parser;
-import com.dmdirc.parser.interfaces.SpecificCallback;
-
-/**
- * Called when a names reply is parsed.
- */
-@SpecificCallback
-public interface ChannelNamesListener extends CallbackInterface {
-	/**
-	 * Called when a names reply is parsed.
-	 *
-	 * @param tParser Reference to the parser object that made the callback.
-	 * @param cChannel Channel which the names reply is for
-	 * @see com.dmdirc.parser.irc.ProcessNames#callChannelGotNames
-	 */
-	void onChannelGotNames(Parser tParser, ChannelInfo cChannel);
-}

src/com/dmdirc/parser/interfaces/callbacks/ChannelNickChangeListener.java

@@ -1,47 +0,0 @@
-/*
- * Copyright (c) 2006-2009 Chris Smith, Shane Mc Cormack, Gregory Holmes
- *
- * 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 com.dmdirc.parser.interfaces.callbacks;
-
-import com.dmdirc.parser.interfaces.ChannelClientInfo;
-import com.dmdirc.parser.interfaces.ChannelInfo;
-import com.dmdirc.parser.interfaces.Parser;
-import com.dmdirc.parser.interfaces.SpecificCallback;
-
-/** 
- * Called when we or another user change nickname (Called once per channel the user is on).
- * This is called after the nickname change has been done internally
- */
-@SpecificCallback
-public interface ChannelNickChangeListener extends CallbackInterface {
-	/**
-	 * Called when we or another user change nickname (Called once per channel the user is on).
-	 * This is called after the nickname change has been done internally
-	 * 
-	 * @param tParser Reference to the parser object that made the callback.
-	 * @param cChannel One of the channels that the user is on
-	 * @param cChannelClient Client changing nickname
-	 * @param sOldNick Nickname before change
-	 * @see com.dmdirc.parser.irc.ProcessNick#callChannelNickChanged
-	 */
-	 void onChannelNickChanged(Parser tParser, ChannelInfo cChannel, ChannelClientInfo cChannelClient, String sOldNick);
-}

src/com/dmdirc/parser/interfaces/callbacks/ChannelNonUserModeChangeListener.java

@@ -1,56 +0,0 @@
-/*
- * Copyright (c) 2006-2009 Chris Smith, Shane Mc Cormack, Gregory Holmes
- *
- * 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 com.dmdirc.parser.interfaces.callbacks;
-
-import com.dmdirc.parser.interfaces.ChannelClientInfo;
-import com.dmdirc.parser.interfaces.ChannelInfo;
-import com.dmdirc.parser.interfaces.Parser;
-import com.dmdirc.parser.interfaces.FakableArgument;
-import com.dmdirc.parser.interfaces.FakableSource;
-import com.dmdirc.parser.interfaces.SpecificCallback;
-
-/** 
- * Called when the channel modes are changed or discovered.
- * cChannelClient is null if the modes were found from raw 324 (/MODE #Chan reply) or if a server set the mode.<br>
- * If a Server set the mode, sHost is the servers name, else it is the full host of the user who set it
- */
-@SpecificCallback
-public interface ChannelNonUserModeChangeListener extends CallbackInterface {
-	/**
-	 * Called when the channel modes are changed or discovered.
-	 * cChannelClient is null if the modes were found from raw 324 (/MODE #Chan reply) or if a server set the mode.<br>
-	 * If a Server set the mode, sHost is the servers name, else it is the full host of the user who set it
-	 * 
-	 * @param tParser Reference to the parser object that made the callback.
-	 * @param cChannel Channel where modes were changed
-	 * @param cChannelClient Client chaning the modes (null if server)
-	 * @param sHost Host doing the mode changing (User host or server name)
-	 * @param sModes String showing the exact mode change parsed. (Not including user modes)
-	 */
-	void onChannelNonUserModeChanged(@FakableSource Parser tParser,
-            @FakableSource ChannelInfo cChannel,
-            @FakableArgument ChannelClientInfo cChannelClient,
-            @FakableSource String sHost,
-            String sModes);
-}
-

src/com/dmdirc/parser/interfaces/callbacks/ChannelNoticeListener.java

@@ -1,56 +0,0 @@
-/*
- * Copyright (c) 2006-2009 Chris Smith, Shane Mc Cormack, Gregory Holmes
- *
- * 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 com.dmdirc.parser.interfaces.callbacks;
-
-import com.dmdirc.parser.interfaces.ChannelClientInfo;
-import com.dmdirc.parser.interfaces.ChannelInfo;
-import com.dmdirc.parser.interfaces.Parser;
-import com.dmdirc.parser.interfaces.FakableArgument;
-import com.dmdirc.parser.interfaces.FakableSource;
-import com.dmdirc.parser.interfaces.SpecificCallback;
-
-/**
- * Called when a person sends a notice to a channel.
- * sHost is the hostname of the person sending the notice. (Can be a server or a person)<br>
- * cChannelClient is null if user is a server, or not on the channel.
- */
-@SpecificCallback
-public interface ChannelNoticeListener extends CallbackInterface {
-	/**
-	 * Called when a person sends a notice to a channel.
-	 * sHost is the hostname of the person sending the notice. (Can be a server or a person)<br>
-	 * cChannelClient is null if user is a server, or not on the channel.
-	 * 
-	 * @param tParser Reference to the parser object that made the callback.
-	 * @param cChannel Channel where the notice was sent to
-	 * @param cChannelClient ChannelClient who sent the notice (may be null if server)
-	 * @param sMessage notice contents
-	 * @param sHost Hostname of sender (or servername)
-	 * @see com.dmdirc.parser.irc.ProcessMessage#callChannelNotice
-	 */
-	void onChannelNotice(@FakableSource Parser tParser,
-            @FakableSource ChannelInfo cChannel,
-            @FakableArgument ChannelClientInfo cChannelClient,
-            String sMessage,
-            @FakableSource String sHost);
-}

src/com/dmdirc/parser/interfaces/callbacks/ChannelOtherAwayStateListener.java

@@ -1,45 +0,0 @@
-/*
- * Copyright (c) 2006-2009 Chris Smith, Shane Mc Cormack, Gregory Holmes
- *
- * 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 com.dmdirc.parser.interfaces.callbacks;
-
-import com.dmdirc.parser.interfaces.ChannelClientInfo;
-import com.dmdirc.parser.interfaces.ChannelInfo;
-import com.dmdirc.parser.interfaces.Parser;
-import com.dmdirc.parser.interfaces.SpecificCallback;
-
-/**
- * Called when we go away, or come back.
- */
-@SpecificCallback
-public interface ChannelOtherAwayStateListener extends CallbackInterface {
-	/**
-	 * Called when we go away, or come back.
-	 *
-	 * @param tParser Reference to the parser object that made the callback.
-	 * @param channel Channel this is for
-	 * @param channelClient Client this is for
-	 * @param state Away State (true if away, false if here)
-	 * @see com.dmdirc.parser.irc.ProcessAway#callChannelAwayStateOther
-	 */
-	void onChannelAwayStateOther(Parser tParser, ChannelInfo channel, ChannelClientInfo channelClient, boolean state);
-}

src/com/dmdirc/parser/interfaces/callbacks/ChannelPartListener.java

@@ -1,47 +0,0 @@
-/*
- * Copyright (c) 2006-2009 Chris Smith, Shane Mc Cormack, Gregory Holmes
- *
- * 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 com.dmdirc.parser.interfaces.callbacks;
-
-import com.dmdirc.parser.interfaces.ChannelClientInfo;
-import com.dmdirc.parser.interfaces.ChannelInfo;
-import com.dmdirc.parser.interfaces.Parser;
-import com.dmdirc.parser.interfaces.SpecificCallback;
-
-/** 
- * Called When we, or another client parts a channel.
- * This is called BEFORE client has been removed from the channel.
- */
-@SpecificCallback
-public interface ChannelPartListener extends CallbackInterface {
-	/**
-	 * Called When we, or another client parts a channel.
-	 * This is called BEFORE client has been removed from the channel.
-	 * 
-	 * @param tParser Reference to the parser object that made the callback.
-	 * @param cChannel Channel that the user parted
-	 * @param cChannelClient Client that parted
-	 * @param sReason Reason given for parting (May be "")
-	 * @see com.dmdirc.parser.irc.ProcessPart#callChannelPart
-	 */
-	void onChannelPart(Parser tParser, ChannelInfo cChannel, ChannelClientInfo cChannelClient, String sReason);
-}

src/com/dmdirc/parser/interfaces/callbacks/ChannelQuitListener.java

@@ -1,47 +0,0 @@
-/*
- * Copyright (c) 2006-2009 Chris Smith, Shane Mc Cormack, Gregory Holmes
- *
- * 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 com.dmdirc.parser.interfaces.callbacks;
-
-import com.dmdirc.parser.interfaces.ChannelClientInfo;
-import com.dmdirc.parser.interfaces.ChannelInfo;
-import com.dmdirc.parser.interfaces.Parser;
-import com.dmdirc.parser.interfaces.SpecificCallback;
-
-/** 
- * Called When we, or another client quits IRC (Called once per channel the user was on).
- * This is called BEFORE client has been removed from the channel.
- */
-@SpecificCallback
-public interface ChannelQuitListener extends CallbackInterface {
-	/**
-	 * Called When we, or another client quits IRC (Called once per channel the user was on).
-	 * This is called BEFORE client has been removed from the channel.
-	 * 
-	 * @param tParser Reference to the parser object that made the callback.
-	 * @param cChannel Channel that user was on
-	 * @param cChannelClient User thats quitting
-	 * @param sReason Quit reason
-	 * @see com.dmdirc.parser.irc.ProcessQuit#callChannelQuit
-	 */
-	void onChannelQuit(Parser tParser, ChannelInfo cChannel, ChannelClientInfo cChannelClient, String sReason);
-}

src/com/dmdirc/parser/interfaces/callbacks/ChannelSelfJoinListener.java

@@ -1,42 +0,0 @@
-/*
- * Copyright (c) 2006-2009 Chris Smith, Shane Mc Cormack, Gregory Holmes
- *
- * 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 com.dmdirc.parser.interfaces.callbacks;
-
-import com.dmdirc.parser.interfaces.ChannelInfo;
-import com.dmdirc.parser.interfaces.Parser;
-
-/** 
- * Called When we join a channel.
- * We are NOT added as a channelclient until after the names reply
- */
-public interface ChannelSelfJoinListener extends CallbackInterface {
-	/**
-	 * Called When we join a channel.
-	 * We are NOT added as a channelclient until after the names reply
-	 * 
-	 * @param tParser Reference to the parser object that made the callback.
-	 * @param cChannel Channel Object
-	 * @see com.dmdirc.parser.irc.ProcessJoin#callChannelSelfJoin
-	 */
-	void onChannelSelfJoin(Parser tParser, ChannelInfo cChannel);
-}

src/com/dmdirc/parser/interfaces/callbacks/ChannelSingleModeChangeListener.java

@@ -1,56 +0,0 @@
-/*
- * Copyright (c) 2006-2009 Chris Smith, Shane Mc Cormack, Gregory Holmes
- *
- * 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 com.dmdirc.parser.interfaces.callbacks;
-
-import com.dmdirc.parser.interfaces.ChannelClientInfo;
-import com.dmdirc.parser.interfaces.ChannelInfo;
-import com.dmdirc.parser.interfaces.Parser;
-import com.dmdirc.parser.interfaces.FakableArgument;
-import com.dmdirc.parser.interfaces.FakableSource;
-import com.dmdirc.parser.interfaces.SpecificCallback;
-
-/** 
- * Called when the channel modes are changed or discovered.
- * cChannelClient is null if the modes were found from raw 324 (/MODE #Chan reply) or if a server set the mode.<br>
- * If a Server set the mode, sHost is the servers name, else it is the full host of the user who set it
- */
-@SpecificCallback
-public interface ChannelSingleModeChangeListener extends CallbackInterface {
-	/**
-	 * Called when the channel modes are changed or discovered.
-	 * cChannelClient is null if the modes were found from raw 324 (/MODE #Chan reply) or if a server set the mode.<br>
-	 * If a Server set the mode, sHost is the servers name, else it is the full host of the user who set it
-	 * 
-	 * @param tParser Reference to the parser object that made the callback.
-	 * @param cChannel Channel where modes were changed
-	 * @param cChannelClient Client chaning the modes (null if server)
-	 * @param sHost Host doing the mode changing (User host or server name)
-	 * @param sModes String parsed (ie "+m" or "+k moo"
-	 */
-	void onChannelSingleModeChanged(@FakableSource Parser tParser,
-            @FakableSource ChannelInfo cChannel,
-            @FakableArgument ChannelClientInfo cChannelClient,
-            @FakableSource String sHost,
-            String sModes);
-}
-

src/com/dmdirc/parser/interfaces/callbacks/ChannelTopicListener.java

@@ -1,45 +0,0 @@
-/*
- * Copyright (c) 2006-2009 Chris Smith, Shane Mc Cormack, Gregory Holmes
- *
- * 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 com.dmdirc.parser.interfaces.callbacks;
-
-import com.dmdirc.parser.interfaces.ChannelInfo;
-import com.dmdirc.parser.interfaces.Parser;
-import com.dmdirc.parser.interfaces.SpecificCallback;
-
-/** 
- * Called when the topic is changed or discovered for the first time.
- * bIsNewTopic is true if someone sets the topic, false if the topic is discovered on join
- */
-@SpecificCallback
-public interface ChannelTopicListener extends CallbackInterface {
-	/**
-	 * Called when the topic is changed or discovered for the first time.
-	 * bIsNewTopic is true if someone sets the topic, false if the topic is discovered on join
-	 * 
-	 * @param tParser Reference to the parser object that made the callback.
-	 * @param cChannel Channel that topic was set on
-	 * @param bIsJoinTopic True when getting topic on join, false if set by user/server
-	 * @see com.dmdirc.parser.irc.ProcessTopic#callChannelTopic
-	 */
-	void onChannelTopic(Parser tParser, ChannelInfo cChannel, boolean bIsJoinTopic);
-}

src/com/dmdirc/parser/interfaces/callbacks/ChannelUserModeChangeListener.java

@@ -1,56 +0,0 @@
-/*
- * Copyright (c) 2006-2009 Chris Smith, Shane Mc Cormack, Gregory Holmes
- *
- * 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 com.dmdirc.parser.interfaces.callbacks;
-
-import com.dmdirc.parser.interfaces.ChannelClientInfo;
-import com.dmdirc.parser.interfaces.ChannelInfo;
-import com.dmdirc.parser.interfaces.Parser;
-import com.dmdirc.parser.interfaces.FakableArgument;
-import com.dmdirc.parser.interfaces.FakableSource;
-import com.dmdirc.parser.interfaces.SpecificCallback;
-
-/** 
- * Called when a users channel mode is changed.
- */
-@SpecificCallback
-public interface ChannelUserModeChangeListener extends CallbackInterface {
-	/**
-	 * Called when a users channel mode is changed.
-	 * cChannelClient is null if the modes were found from raw 324 (/MODE #Chan reply) or if a server set the mode.<br>
-	 * If a Server set the mode, sHost is the servers name, else it is the full host of the user who set it
-	 * 
-	 * @param tParser Reference to the parser object that made the callback.
-	 * @param cChannel Channel where modes were changed
-	 * @param cChangedClient Client being changed
-	 * @param cSetByClient Client chaning the modes (null if server)
-	 * @param sHost Host doing the mode changing (User host or server name)
-	 * @param sMode String representing mode change (ie +o)
-	 * @see com.dmdirc.parser.irc.ProcessMode#callChannelUserModeChanged
-	 */
-	void onChannelUserModeChanged(@FakableSource Parser tParser,
-            @FakableSource ChannelInfo cChannel,
-            ChannelClientInfo cChangedClient,
-            @FakableArgument ChannelClientInfo cSetByClient,
-            @FakableSource String sHost,
-            String sMode);
-}

src/com/dmdirc/parser/interfaces/callbacks/ConnectErrorListener.java

@@ -1,40 +0,0 @@
-/*
- * Copyright (c) 2006-2009 Chris Smith, Shane Mc Cormack, Gregory Holmes
- *
- * 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 com.dmdirc.parser.interfaces.callbacks;
-
-import com.dmdirc.parser.interfaces.Parser;
-import com.dmdirc.parser.common.ParserError;
-
-/**
- * Called to give Error Information related to a connection attempt.
- */
-public interface ConnectErrorListener extends CallbackInterface {
-	/**
-	 * Called to give Error Information related to a connection attempt.
-	 * 
-	 * @param tParser Reference to the parser object that made the callback.
-	 * @param errorInfo ParserError object representing the error.
-	 * @see com.dmdirc.parser.irc.IRCParser#callConnectError
-	 */
-	void onConnectError(Parser tParser, ParserError errorInfo);
-}

src/com/dmdirc/parser/interfaces/callbacks/DataInListener.java

@@ -1,39 +0,0 @@
-/*
- * Copyright (c) 2006-2009 Chris Smith, Shane Mc Cormack, Gregory Holmes
- *
- * 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 com.dmdirc.parser.interfaces.callbacks;
-
-import com.dmdirc.parser.interfaces.Parser;
-
-/**
- * Interface Used on every incomming line BEFORE parsing.
- */
-public interface DataInListener extends CallbackInterface {
-	/**
-	 * Called on every incomming line BEFORE parsing.
-	 * 
-	 * @param tParser Reference to the parser object that made the callback.
-	 * @param sData Incomming Line.
-	 * @see com.dmdirc.parser.irc.IRCParser#callDataIn
-	 */
-	void onDataIn(Parser tParser, String sData);
-}

src/com/dmdirc/parser/interfaces/callbacks/DataOutListener.java

@@ -1,40 +0,0 @@
-/*
- * Copyright (c) 2006-2009 Chris Smith, Shane Mc Cormack, Gregory Holmes
- *
- * 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 com.dmdirc.parser.interfaces.callbacks;
-
-import com.dmdirc.parser.interfaces.Parser;
-
-/**
- * Called on every incomming line BEFORE being sent.
- */
-public interface DataOutListener extends CallbackInterface {
-	/**
-	 * Called on every incomming line BEFORE being sent.
-	 * 
-	 * @param tParser Reference to the parser object that made the callback.
-	 * @param sData Outgoing Data
-	 * @param bFromParser True if parser sent the data, false if sent using .sendLine
-	 * @see com.dmdirc.parser.irc.IRCParser#callDataOut
-	 */
-	void onDataOut(Parser tParser, String sData, boolean bFromParser);
-}

src/com/dmdirc/parser/interfaces/callbacks/DebugInfoListener.java

@@ -1,40 +0,0 @@
-/*
- * Copyright (c) 2006-2009 Chris Smith, Shane Mc Cormack, Gregory Holmes
- *
- * 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 com.dmdirc.parser.interfaces.callbacks;
-
-import com.dmdirc.parser.interfaces.Parser;
-
-/**
- * Interface Used to give Debug Information.
- */
-public interface DebugInfoListener extends CallbackInterface {
-	/**
-	 * This callback is used to provide occasional debug information from the parser.
-	 *
-	 * @param tParser Reference to the parser object that made the callback.
-	 * @param nLevel Debugging Level (ndInfo, ndSocket etc)
-	 * @param sData Debugging Information
-	 * @see com.dmdirc.parser.irc.IRCParser#callDebugInfo
-	 */
-	void onDebugInfo(Parser tParser, int nLevel, String sData);
-}

src/com/dmdirc/parser/interfaces/callbacks/ErrorInfoListener.java

@@ -1,40 +0,0 @@
-/*
- * Copyright (c) 2006-2009 Chris Smith, Shane Mc Cormack, Gregory Holmes
- *
- * 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 com.dmdirc.parser.interfaces.callbacks;
-
-import com.dmdirc.parser.interfaces.Parser;
-import com.dmdirc.parser.common.ParserError;
-
-/**
- * Called to give Error Information.
- */
-public interface ErrorInfoListener extends CallbackInterface {
-	/**
-	 * Called to give Error Information.
-	 * 
-	 * @param tParser Reference to the parser object that made the callback.
-	 * @param errorInfo ParserError object representing the error.
-	 * @see com.dmdirc.parser.irc.IRCParser#callErrorInfo
-	 */
-	void onErrorInfo(Parser tParser, ParserError errorInfo);
-}

src/com/dmdirc/parser/interfaces/callbacks/InviteListener.java

@@ -1,40 +0,0 @@
-/*
- * Copyright (c) 2006-2009 Chris Smith, Shane Mc Cormack, Gregory Holmes
- *
- * 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 com.dmdirc.parser.interfaces.callbacks;
-
-import com.dmdirc.parser.interfaces.Parser;
-
-/**
- * Called when we are invited to a channel.
- */
-public interface InviteListener extends CallbackInterface {
-	/**
-	 * Called when we are invited to a channel.
-	 * 
-	 * @param tParser Reference to the parser object that made the callback.
-	 * @param userHost Hostname of user who invited us
-	 * @param channel Channel we were invited to
-	 * @see com.dmdirc.parser.irc.ProcessInvite#callInvite
-	 */
-	void onInvite(Parser tParser, String userHost, String channel);
-}

src/com/dmdirc/parser/interfaces/callbacks/MotdEndListener.java

@@ -1,40 +0,0 @@
-/*
- * Copyright (c) 2006-2009 Chris Smith, Shane Mc Cormack, Gregory Holmes
- *
- * 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 com.dmdirc.parser.interfaces.callbacks;
-
-import com.dmdirc.parser.interfaces.Parser;
-
-/**
- * Called when "End of MOTD" or "No MOTD" is received.
- */
-public interface MotdEndListener extends CallbackInterface {
-	/**
-	 * Called when "End of MOTD" or "No MOTD".
-	 *
-	 * @param tParser Reference to the parser object that made the callback.
-	 * @param noMOTD Set to true if this was a "No MOTD Found" message rather than an "End of MOTD"
-	 * @param sData The contents of the line (incase of language changes or so)
-	 * @see com.dmdirc.parser.irc.ProcessMOTD#callMOTDEnd
-	 */
-	void onMOTDEnd(Parser tParser, boolean noMOTD, String sData);
-}

src/com/dmdirc/parser/interfaces/callbacks/MotdLineListener.java

@@ -1,39 +0,0 @@
-/*
- * Copyright (c) 2006-2009 Chris Smith, Shane Mc Cormack, Gregory Holmes
- *
- * 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 com.dmdirc.parser.interfaces.callbacks;
-
-import com.dmdirc.parser.interfaces.Parser;
-
-/**
- * Interface Used to give MOTD Information.
- */
-public interface MotdLineListener extends CallbackInterface {
-	/**
-	 * Called on every incomming line from the MOTD.
-	 * 
-	 * @param tParser Reference to the parser object that made the callback.
-	 * @param sData Incomming Line.
-	 * @see com.dmdirc.parser.irc.ProcessMOTD#callMOTDLine
-	 */
-	void onMOTDLine(Parser tParser, String sData);
-}

src/com/dmdirc/parser/interfaces/callbacks/MotdStartListener.java

@@ -1,39 +0,0 @@
-/*
- * Copyright (c) 2006-2009 Chris Smith, Shane Mc Cormack, Gregory Holmes
- *
- * 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 com.dmdirc.parser.interfaces.callbacks;
-
-import com.dmdirc.parser.interfaces.Parser;
-
-/**
- * Interface Used when the MOTD Starts.
- */
-public interface MotdStartListener extends CallbackInterface {
-	/**
-	 * Called on MOTD Start.
-	 * 
-	 * @param tParser Reference to the parser object that made the callback.
-	 * @param sData Incomming Line.
-	 * @see com.dmdirc.parser.irc.ProcessMOTD#callMOTDStart
-	 */
-	void onMOTDStart(Parser tParser, String sData);
-}

src/com/dmdirc/parser/interfaces/callbacks/NetworkDetectedListener.java

@@ -1,42 +0,0 @@
-/*
- * Copyright (c) 2006-2009 Chris Smith, Shane Mc Cormack, Gregory Holmes
- *
- * 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 com.dmdirc.parser.interfaces.callbacks;
-
-import com.dmdirc.parser.interfaces.Parser;
-
-/**
- * Interface Used when the Network=blah 005 token is recieved.
- */
-public interface NetworkDetectedListener extends CallbackInterface {
-	/**
-	 * Called when the Network=blah 005 token is recieved.
-	 * if NETWORK= is not sent in 005, this will not be called.
-	 * 
-	 * @param tParser Reference to the parser object that made the callback.
-	 * @param networkName The name of the network.
-	 * @param ircdVersion The version of the ircd.
-	 * @param ircdType The Guessed type of the ircd based on the name.
-	 * @see com.dmdirc.parser.irc.Process004005#callGotNetwork
-	 */
-	void onGotNetwork(Parser tParser, String networkName, String ircdVersion, String ircdType);
-}

src/com/dmdirc/parser/interfaces/callbacks/NickChangeListener.java

@@ -1,43 +0,0 @@
-/*
- * Copyright (c) 2006-2009 Chris Smith, Shane Mc Cormack, Gregory Holmes
- *
- * 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 com.dmdirc.parser.interfaces.callbacks;
-
-import com.dmdirc.parser.interfaces.ClientInfo;
-import com.dmdirc.parser.interfaces.Parser;
-
-/**
- * Called when we or another user change nickname.
- * This is called after the nickname change has been done internally
- */
-public interface NickChangeListener extends CallbackInterface {
-	/**
-	 * Called when we or another user change nickname.
-	 * This is called after the nickname change has been done internally
-	 * 
-	 * @param tParser Reference to the parser object that made the callback.
-	 * @param cClient Client changing nickname
-	 * @param sOldNick Nickname before change
-	 * @see com.dmdirc.parser.irc.ProcessNick#callNickChanged
-	 */
-	void onNickChanged(Parser tParser, ClientInfo cClient, String sOldNick);
-}

src/com/dmdirc/parser/interfaces/callbacks/NickInUseListener.java

@@ -1,39 +0,0 @@
-/*
- * Copyright (c) 2006-2009 Chris Smith, Shane Mc Cormack, Gregory Holmes
- *
- * 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 com.dmdirc.parser.interfaces.callbacks;
-
-import com.dmdirc.parser.interfaces.Parser;
-
-/**
- * Called when requested nickname is in use.
- */
-public interface NickInUseListener extends CallbackInterface {
-	/**
-	 * Called when requested nickname is in use.
-	 *
-	 * @param nickname Nickname that was wanted.
-	 * @param tParser Reference to the parser object that made the callback.
-	 * @see com.dmdirc.parser.irc.ProcessNickInUse#callNickInUse
-	 */
-	void onNickInUse(Parser tParser, String nickname);
-}

src/com/dmdirc/parser/interfaces/callbacks/NumericListener.java

@@ -1,40 +0,0 @@
-/*
- * Copyright (c) 2006-2009 Chris Smith, Shane Mc Cormack, Gregory Holmes
- *
- * 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 com.dmdirc.parser.interfaces.callbacks;
-
-import com.dmdirc.parser.interfaces.Parser;
-
-/**
- * Interface Used to give numeric Information.
- */
-public interface NumericListener extends CallbackInterface {
-	/**
-	 * Called on every incomming line with a numerical type.
-	 * 
-	 * @param tParser Reference to the parser object that made the callback.
-	 * @param numeric What numeric is this for
-	 * @param token IRC Tokenised line
-	 * @see com.dmdirc.parser.irc.ProcessingManager#callNumeric
-	 */
-	void onNumeric(Parser tParser, int numeric, String[] token);
-}

src/com/dmdirc/parser/interfaces/callbacks/OtherAwayStateListener.java

@@ -1,43 +0,0 @@
-/*
- * Copyright (c) 2006-2009 Chris Smith, Shane Mc Cormack, Gregory Holmes
- *
- * 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 com.dmdirc.parser.interfaces.callbacks;
-
-import com.dmdirc.parser.interfaces.ClientInfo;
-import com.dmdirc.parser.interfaces.Parser;
-import com.dmdirc.parser.interfaces.SpecificCallback;
-
-/**
- * Called when we go away, or come back.
- */
-@SpecificCallback
-public interface OtherAwayStateListener extends CallbackInterface {
-	/**
-	 * Called when we go away, or come back.
-	 *
-	 * @param tParser Reference to the parser object that made the callback.
-	 * @param client Client this is for
-	 * @param state Away State (true if away, false if here)
-	 * @see com.dmdirc.parser.irc.ProcessAway#callAwayStateOther
-	 */
-	void onAwayStateOther(Parser tParser, ClientInfo client, boolean state);
-}

src/com/dmdirc/parser/interfaces/callbacks/PasswordRequiredListener.java

@@ -1,38 +0,0 @@
-/*
- * Copyright (c) 2006-2009 Chris Smith, Shane Mc Cormack, Gregory Holmes
- *
- * 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 com.dmdirc.parser.interfaces.callbacks;
-
-import com.dmdirc.parser.interfaces.Parser;
-
-/**
- * Interface Used when a raw 464 is recieved.
- */
-public interface PasswordRequiredListener extends CallbackInterface {
-	/**
-	 * Called when a raw 464 is recieved.
-	 *
-	 * @param tParser Reference to the parser object that made the callback.
-	 * @see com.dmdirc.parser.irc.Process004005#callPasswordRequired
-	 */
-	void onPasswordRequired(Parser tParser);
-}

src/com/dmdirc/parser/interfaces/callbacks/PingFailureListener.java

@@ -1,38 +0,0 @@
-/*
- * Copyright (c) 2006-2009 Chris Smith, Shane Mc Cormack, Gregory Holmes
- *
- * 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 com.dmdirc.parser.interfaces.callbacks;
-
-import com.dmdirc.parser.interfaces.Parser;
-
-/**
- * Called when a Ping Failed.
- */
-public interface PingFailureListener extends CallbackInterface {
-	/**
-	 * Called when a ping failed.
-	 * 
-	 * @param tParser Reference to the parser object that made the callback.
-	 * @see IRCParser#callPingFailed
-	 */
-	void onPingFailed(Parser tParser);
-}

src/com/dmdirc/parser/interfaces/callbacks/PingSentListener.java

@@ -1,38 +0,0 @@
-/*
- * Copyright (c) 2006-2009 Chris Smith, Shane Mc Cormack, Gregory Holmes
- *
- * 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 com.dmdirc.parser.interfaces.callbacks;
-
-import com.dmdirc.parser.interfaces.Parser;
-
-/**
- * Called when a Ping was Sent.
- */
-public interface PingSentListener extends CallbackInterface {
-	/**
-	 * Called when a ping was Sent.
-	 * 
-	 * @param tParser Reference to the parser object that made the callback.
-	 * @see IRCParser#callPingSent
-	 */
-	void onPingSent(Parser tParser);
-}

src/com/dmdirc/parser/interfaces/callbacks/PingSuccessListener.java

@@ -1,38 +0,0 @@
-/*
- * Copyright (c) 2006-2009 Chris Smith, Shane Mc Cormack, Gregory Holmes
- *
- * 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 com.dmdirc.parser.interfaces.callbacks;
-
-import com.dmdirc.parser.interfaces.Parser;
-
-/**
- * Called when a Ping was a Success.
- */
-public interface PingSuccessListener extends CallbackInterface {
-	/**
-	 * Called when a ping was a Success.
-	 * 
-	 * @param tParser Reference to the parser object that made the callback.
-	 * @see IRCParser#callPingSuccess
-	 */
-	void onPingSuccess(Parser tParser);
-}

src/com/dmdirc/parser/interfaces/callbacks/Post005Listener.java

@@ -1,38 +0,0 @@
-/*
- * Copyright (c) 2006-2009 Chris Smith, Shane Mc Cormack, Gregory Holmes
- *
- * 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 com.dmdirc.parser.interfaces.callbacks;
-
-import com.dmdirc.parser.interfaces.Parser;
-
-/**
- * Called after 001.
- */
-public interface Post005Listener extends CallbackInterface {
-	/**
-	 * Called after 005.
-	 * 
-	 * @param tParser Reference to the parser object that made the callback.
-	 * @see com.dmdirc.parser.irc.Process001#callPost005
-	 */
-	void onPost005(Parser tParser);
-}

src/com/dmdirc/parser/interfaces/callbacks/PrivateActionListener.java

@@ -1,46 +0,0 @@
-/*
- * Copyright (c) 2006-2009 Chris Smith, Shane Mc Cormack, Gregory Holmes
- *
- * 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 com.dmdirc.parser.interfaces.callbacks;
-
-import com.dmdirc.parser.interfaces.Parser;
-import com.dmdirc.parser.interfaces.SpecificCallback;
-
-/**
- * Called when a person does an action to you (PM).
- * sHost is the hostname of the person sending the action. (Can be a server or a person)<br>
- * cClient is null if user is a server, or not on any common channel.
- */
-@SpecificCallback
-public interface PrivateActionListener extends CallbackInterface {
-	/**
-	 * Called when a person does an action to you (PM).
-	 * sHost is the hostname of the person sending the action. (Can be a server or a person)<br>
-	 * cClient is null if user is a server, or not on any common channel.
-	 * 
-	 * @param tParser Reference to the parser object that made the callback.
-	 * @param sMessage action contents
-	 * @param sHost Hostname of sender (or servername)
-	 * @see com.dmdirc.parser.irc.ProcessMessage#callPrivateAction
-	 */
-	void onPrivateAction(Parser tParser, String sMessage, String sHost);
-}

src/com/dmdirc/parser/interfaces/callbacks/PrivateCtcpListener.java

@@ -1,47 +0,0 @@
-/*
- * Copyright (c) 2006-2009 Chris Smith, Shane Mc Cormack, Gregory Holmes
- *
- * 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 com.dmdirc.parser.interfaces.callbacks;
-
-import com.dmdirc.parser.interfaces.Parser;
-import com.dmdirc.parser.interfaces.SpecificCallback;
-
-/**
- * Called when a person sends a CTCP to you directly.
- * sHost is the hostname of the person sending the CTCP. (Can be a server or a person)<br>
- * cClient is null if user is a server, or not on any common channels.
- */
-@SpecificCallback
-public interface PrivateCtcpListener extends CallbackInterface {
-	/**
-	 * Called when a person sends a CTCP to you directly.
-	 * sHost is the hostname of the person sending the CTCP. (Can be a server or a person)<br>
-	 * cClient is null if user is a server, or not on any common channels.
-	 * 
-	 * @param tParser Reference to the parser object that made the callback.
-	 * @param sType Type of CTCP (VERSION, TIME etc)
-	 * @param sMessage Additional contents
-	 * @param sHost Hostname of sender (or servername)
-	 * @see com.dmdirc.parser.irc.ProcessMessage#callPrivateCTCP
-	 */
-	void onPrivateCTCP(Parser tParser, String sType, String sMessage, String sHost);
-}

src/com/dmdirc/parser/interfaces/callbacks/PrivateCtcpReplyListener.java

@@ -1,47 +0,0 @@
-/*
- * Copyright (c) 2006-2009 Chris Smith, Shane Mc Cormack, Gregory Holmes
- *
- * 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 com.dmdirc.parser.interfaces.callbacks;
-
-import com.dmdirc.parser.interfaces.Parser;
-import com.dmdirc.parser.interfaces.SpecificCallback;
-
-/**
- * Called when a person sends a CTCPRReply to you directly.
- * sHost is the hostname of the person sending the CTCPRReply. (Can be a server or a person)<br>
- * cClient is null if user is a server, or not on any common channels.
- */
-@SpecificCallback
-public interface PrivateCtcpReplyListener extends CallbackInterface {
-	/**
-	 * Called when a person sends a CTCPRReply to you directly.
-	 * sHost is the hostname of the person sending the CTCPRReply. (Can be a server or a person)<br>
-	 * cClient is null if user is a server, or not on any common channels.
-	 * 
-	 * @param tParser Reference to the parser object that made the callback.
-	 * @param sType Type of CTCPRReply (VERSION, TIME etc)
-	 * @param sMessage Reply Contents
-	 * @param sHost Hostname of sender (or servername)
-	 * @see com.dmdirc.parser.irc.ProcessMessage#callPrivateCTCPReply
-	 */
-	void onPrivateCTCPReply(Parser tParser, String sType, String sMessage, String sHost);
-}

src/com/dmdirc/parser/interfaces/callbacks/PrivateMessageListener.java

@@ -1,46 +0,0 @@
-/*
- * Copyright (c) 2006-2009 Chris Smith, Shane Mc Cormack, Gregory Holmes
- *
- * 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 com.dmdirc.parser.interfaces.callbacks;
-
-import com.dmdirc.parser.interfaces.Parser;
-import com.dmdirc.parser.interfaces.SpecificCallback;
-
-/**
- * Called when a person sends a message to you directly (PM). 
- * sHost is the hostname of the person sending the message. (Can be a server or a person)<br>
- * cClient is null if user is a server, or not on any common channel.
- */
-@SpecificCallback
-public interface PrivateMessageListener extends CallbackInterface {
-	/**
-	 * Called when a person sends a message to you directly (PM). 
-	 * sHost is the hostname of the person sending the message. (Can be a server or a person)<br>
-	 * cClient is null if user is a server, or not on any common channel.
-	 * 
-	 * @param tParser Reference to the parser object that made the callback.
-	 * @param sMessage Message contents
-	 * @param sHost Hostname of sender (or servername)
-	 * @see com.dmdirc.parser.irc.ProcessMessage#callPrivateMessage
-	 */
-	void onPrivateMessage(Parser tParser, String sMessage, String sHost);
-}

src/com/dmdirc/parser/interfaces/callbacks/PrivateNoticeListener.java

@@ -1,46 +0,0 @@
-/*
- * Copyright (c) 2006-2009 Chris Smith, Shane Mc Cormack, Gregory Holmes
- *
- * 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 com.dmdirc.parser.interfaces.callbacks;
-
-import com.dmdirc.parser.interfaces.Parser;
-import com.dmdirc.parser.interfaces.SpecificCallback;
-
-/**
- * Called when a person sends a notice to you.
- * sHost is the hostname of the person sending the notice. (Can be a server or a person)<br>
- * cClient is null if user is a server, or not on any common channel.
- */
-@SpecificCallback
-public interface PrivateNoticeListener extends CallbackInterface {
-	/**
-	 * Called when a person sends a notice to you.
-	 * sHost is the hostname of the person sending the notice. (Can be a server or a person)<br>
-	 * cClient is null if user is a server, or not on any common channel.
-	 * 
-	 * @param tParser Reference to the parser object that made the callback.
-	 * @param sMessage Notice contents
-	 * @param sHost Hostname of sender (or servername)
-	 * @see com.dmdirc.parser.irc.ProcessMessage#callPrivateNotice
-	 */
-	void onPrivateNotice(Parser tParser, String sMessage, String sHost);
-}

src/com/dmdirc/parser/interfaces/callbacks/QuitListener.java

@@ -1,43 +0,0 @@
-/*
- * Copyright (c) 2006-2009 Chris Smith, Shane Mc Cormack, Gregory Holmes
- *
- * 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 com.dmdirc.parser.interfaces.callbacks;
-
-import com.dmdirc.parser.interfaces.ClientInfo;
-import com.dmdirc.parser.interfaces.Parser;
-
-/** 
- * Called When we, or another client quits IRC (Called once in total).
- * This is called BEFORE client has been removed from the channel.
- */
-public interface QuitListener extends CallbackInterface {
-	/**
-	 * Called When we, or another client quits IRC (Called once in total).
-	 * This is called BEFORE client has been removed from the channel.
-	 *
-	 * @param tParser Reference to the parser object that made the callback.
-	 * @param cClient Client Quitting
-	 * @param sReason Reason for quitting (may be "")
-	 * @see com.dmdirc.parser.irc.ProcessQuit#callQuit
-	 */
-	void onQuit(Parser tParser, ClientInfo cClient, String sReason);
-}

src/com/dmdirc/parser/interfaces/callbacks/ServerErrorListener.java

@@ -1,39 +0,0 @@
-/*
- * Copyright (c) 2006-2009 Chris Smith, Shane Mc Cormack, Gregory Holmes
- *
- * 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 com.dmdirc.parser.interfaces.callbacks;
-
-import com.dmdirc.parser.interfaces.Parser;
-
-/**
- * Interface Used to give ServerError.
- */
-public interface ServerErrorListener extends CallbackInterface {
-	/**
-	 * This callback is used to give messages the server sends as an ERROR.
-	 *
-	 * @param tParser Reference to the parser object that made the callback.
-	 * @param sMessage Error Information
-	 * @see com.dmdirc.parser.irc.IRCParser#callServerError
-	 */
-	void onServerError(Parser tParser, String sMessage);
-}

src/com/dmdirc/parser/interfaces/callbacks/ServerReadyListener.java

@@ -1,38 +0,0 @@
-/*
- * Copyright (c) 2006-2009 Chris Smith, Shane Mc Cormack, Gregory Holmes
- *
- * 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 com.dmdirc.parser.interfaces.callbacks;
-
-import com.dmdirc.parser.interfaces.Parser;
-
-/**
- * Called after 001.
- */
-public interface ServerReadyListener extends CallbackInterface {
-	/**
-	 * Called after 001.
-	 * 
-	 * @param tParser Reference to the parser object that made the callback.
-	 * @see com.dmdirc.parser.irc.Process001#callServerReady
-	 */
-	void onServerReady(Parser tParser);
-}

src/com/dmdirc/parser/interfaces/callbacks/SocketCloseListener.java

@@ -1,38 +0,0 @@
-/*
- * Copyright (c) 2006-2009 Chris Smith, Shane Mc Cormack, Gregory Holmes
- *
- * 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 com.dmdirc.parser.interfaces.callbacks;
-
-import com.dmdirc.parser.interfaces.Parser;
-
-/**
- * Called when the socket is closed.
- */
-public interface SocketCloseListener extends CallbackInterface {
-
-    /**
-	 * Called when the socket is closed.
-	 * 
-	 * @param tParser Reference to the parser object that made the callback.
-	 */
-	void onSocketClosed(Parser tParser);
-}

src/com/dmdirc/parser/interfaces/callbacks/UnknownActionListener.java

@@ -1,45 +0,0 @@
-/*
- * Copyright (c) 2006-2009 Chris Smith, Shane Mc Cormack, Gregory Holmes
- *
- * 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 com.dmdirc.parser.interfaces.callbacks;
-
-import com.dmdirc.parser.interfaces.Parser;
-
-/**
- * Called when a person sends an action not aimed specifically at you or a channel (ie $*).
- * sHost is the hostname of the person sending the message. (Can be a server or a person)<br>
- * cClient is null if user is a server, or not on any common channel.
- */
-public interface UnknownActionListener extends CallbackInterface {
-	/**
-	 * Called when a person sends an action not aimed specifically at you or a channel (ie $*).
-	 * sHost is the hostname of the person sending the message. (Can be a server or a person)<br>
-	 * cClient is null if user is a server, or not on any common channel.
-	 * 
-	 * @param tParser Reference to the parser object that made the callback.
-	 * @param sMessage Action contents
-	 * @param sTarget Actual target of action
-	 * @param sHost Hostname of sender (or servername)
-	 * @see com.dmdirc.parser.irc.ProcessMessage#callUnknownAction
-	 */
-	void onUnknownAction(Parser tParser, String sMessage, String sTarget, String sHost);
-}

src/com/dmdirc/parser/interfaces/callbacks/UnknownCtcpListener.java

@@ -1,46 +0,0 @@
-/*
- * Copyright (c) 2006-2009 Chris Smith, Shane Mc Cormack, Gregory Holmes
- *
- * 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 com.dmdirc.parser.interfaces.callbacks;
-
-import com.dmdirc.parser.interfaces.Parser;
-
-/**
- * Called when a person sends a CTCP not aimed at you or a channel (ie $*).
- * sHost is the hostname of the person sending the CTCP. (Can be a server or a person)<br>
- * cClient is null if user is a server, or not on any common channels.
- */
-public interface UnknownCtcpListener extends CallbackInterface {
-	/**
-	 * Called when a person sends a CTCP not aimed at you or a channel (ie $*).
-	 * sHost is the hostname of the person sending the CTCP. (Can be a server or a person)<br>
-	 * cClient is null if user is a server, or not on any common channels.
-	 * 
-	 * @param tParser Reference to the parser object that made the callback.
-	 * @param sType Type of CTCP (VERSION, TIME etc)
-	 * @param sMessage Additional contents
-	 * @param sTarget Actual Target of CTCP
-	 * @param sHost Hostname of sender (or servername)
-	 * @see com.dmdirc.parser.irc.ProcessMessage#callUnknownCTCP
-	 */
-	void onUnknownCTCP(Parser tParser, String sType, String sMessage, String sTarget, String sHost);
-}

src/com/dmdirc/parser/interfaces/callbacks/UnknownCtcpReplyListener.java

@@ -1,46 +0,0 @@
-/*
- * Copyright (c) 2006-2009 Chris Smith, Shane Mc Cormack, Gregory Holmes
- *
- * 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 com.dmdirc.parser.interfaces.callbacks;
-
-import com.dmdirc.parser.interfaces.Parser;
-
-/**
- * Called when a person sends a CTCP not aimed at you or a channel (ie $*).
- * sHost is the hostname of the person sending the CTCP. (Can be a server or a person)<br>
- * cClient is null if user is a server, or not on any common channels.
- */
-public interface UnknownCtcpReplyListener extends CallbackInterface {
-	/**
-	 * Called when a person sends a CTCP not aimed at you or a channel (ie $*).
-	 * sHost is the hostname of the person sending the CTCP. (Can be a server or a person)<br>
-	 * cClient is null if user is a server, or not on any common channels.
-	 *
-	 * @param tParser Reference to the parser object that made the callback.
-	 * @param sType Type of CTCPRReply (VERSION, TIME etc)
-	 * @param sMessage Reply Contents
-	 * @param sTarget Actual Target of CTCPReply
-	 * @param sHost Hostname of sender (or servername)
-	 * @see com.dmdirc.parser.irc.ProcessMessage#callUnknownCTCPReply
-	 */
-	void onUnknownCTCPReply(Parser tParser, String sType, String sMessage, String sTarget, String sHost);
-}

src/com/dmdirc/parser/interfaces/callbacks/UnknownMessageListener.java

@@ -1,45 +0,0 @@
-/*
- * Copyright (c) 2006-2009 Chris Smith, Shane Mc Cormack, Gregory Holmes
- *
- * 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 com.dmdirc.parser.interfaces.callbacks;
-
-import com.dmdirc.parser.interfaces.Parser;
-
-/**
- * Called when a person sends a message not aimed specifically at you or a channel (ie $*).
- * sHost is the hostname of the person sending the message. (Can be a server or a person)<br>
- * cClient is null if user is a server, or not on any common channel.
- */
-public interface UnknownMessageListener extends CallbackInterface {
-	/**
-	 * Called when a person sends a message not aimed specifically at you or a channel (ie $*).
-	 * sHost is the hostname of the person sending the message. (Can be a server or a person)<br>
-	 * cClient is null if user is a server, or not on any common channel.
-	 * 
-	 * @param tParser Reference to the parser object that made the callback.
-	 * @param sMessage Message contents
-	 * @param sTarget Actual target of message
-	 * @param sHost Hostname of sender (or servername)
-	 * @see com.dmdirc.parser.irc.ProcessMessage#callUnknownMessage
-	 */
-	void onUnknownMessage(Parser tParser, String sMessage, String sTarget, String sHost);
-}

src/com/dmdirc/parser/interfaces/callbacks/UnknownNoticeListener.java

@@ -1,45 +0,0 @@
-/*
- * Copyright (c) 2006-2009 Chris Smith, Shane Mc Cormack, Gregory Holmes
- *
- * 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 com.dmdirc.parser.interfaces.callbacks;
-
-import com.dmdirc.parser.interfaces.Parser;
-
-/**
- * Called when a person sends a notice not aimed specifically at you or a channel (ie $*).
- * sHost is the hostname of the person sending the message. (Can be a server or a person)<br>
- * cClient is null if user is a server, or not on any common channel.
- */
-public interface UnknownNoticeListener extends CallbackInterface {
-	/**
-	 * Called when a person sends a notice not aimed specifically at you or a channel (ie $*).
-	 * sHost is the hostname of the person sending the message. (Can be a server or a person)<br>
-	 * cClient is null if user is a server, or not on any common channel.
-	 * 
-	 * @param tParser Reference to the parser object that made the callback.
-	 * @param sMessage Notice contents
-	 * @param sTarget Actual target of notice
-	 * @param sHost Hostname of sender (or servername)
-	 * @see com.dmdirc.parser.irc.ProcessMessage#callUnknownNotice
-	 */
-	void onUnknownNotice(Parser tParser, String sMessage, String sTarget, String sHost);
-}

src/com/dmdirc/parser/interfaces/callbacks/UserModeChangeListener.java

@@ -1,46 +0,0 @@
-/*
- * Copyright (c) 2006-2009 Chris Smith, Shane Mc Cormack, Gregory Holmes
- *
- * 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 com.dmdirc.parser.interfaces.callbacks;
-
-import com.dmdirc.parser.interfaces.ClientInfo;
-import com.dmdirc.parser.interfaces.Parser;
-
-/** 
- * Called when user modes are changed.
- * cClient represents the user who's modes were changed (should ALWAYS be us)<br>
- * sSetby is the host of the person who set the mode (usually us, may be an oper or server in some cases)
- */
-public interface UserModeChangeListener extends CallbackInterface {
-	/**
-	 * Called when user modes are changed.
-	 * cClient represents the user who's modes were changed (should ALWAYS be us)<br>
-	 * sSetby is the host of the person who set the mode (usually us, may be an oper or server in some cases)
-	 * 
-	 * @param tParser Reference to the parser object that made the callback.
-	 * @param cClient Client that had the mode changed (almost always us)
-	 * @param sSetBy Host that set the mode (us or servername)
-	 * @param sModes The modes set.
-	 * @see com.dmdirc.parser.irc.ProcessMode#callUserModeChanged
-	 */
-	void onUserModeChanged(Parser tParser, ClientInfo cClient, String sSetBy, String sModes);
-}

src/com/dmdirc/parser/interfaces/callbacks/UserModeDiscoveryListener.java

@@ -1,44 +0,0 @@
-/*
- * Copyright (c) 2006-2009 Chris Smith, Shane Mc Cormack, Gregory Holmes
- *
- * 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 com.dmdirc.parser.interfaces.callbacks;
-
-import com.dmdirc.parser.interfaces.ClientInfo;
-import com.dmdirc.parser.interfaces.Parser;
-
-/** 
- * Called when user modes are Discovered.
- * cClient represents the user who's modes were Discovered (should ALWAYS be us)<br>
- * sSetby is the host of the person who set the mode (usually us, may be an oper or server in some cases)
- */
-public interface UserModeDiscoveryListener extends CallbackInterface {
-	/**
-	 * Called when user modes are Discovered.
-	 * cClient represents the user who's modes were Discovered (should ALWAYS be us)
-	 * 
-	 * @param tParser Reference to the parser object that made the callback.
-	 * @param cClient Client that had the mode changed (almost always us)
-	 * @param sModes The modes set.
-	 * @see com.dmdirc.parser.irc.ProcessMode#callUserModeDiscovered
-	 */
-	void onUserModeDiscovered(Parser tParser, ClientInfo cClient, String sModes);
-}

src/com/dmdirc/parser/interfaces/callbacks/WallDesyncListener.java

@@ -1,44 +0,0 @@
-/*
- * Copyright (c) 2006-2009 Chris Smith, Shane Mc Cormack, Gregory Holmes
- *
- * 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 com.dmdirc.parser.interfaces.callbacks;
-
-import com.dmdirc.parser.interfaces.Parser;
-import com.dmdirc.parser.interfaces.SpecificCallback;
-
-/**
- * Called when a Desync message is recieved over wallops.
- * sHost is the hostname of the person sending the message. (Can be a server or a person)<br>
- */
-@SpecificCallback
-public interface WallDesyncListener extends CallbackInterface {
-	/**
-	 * Called when a Desync message is recieved over wallops.
-	 * sHost is the hostname of the person sending the message. (Can be a server or a person)<br>
-	 * 
-	 * @param tParser Reference to the parser object that made the callback.
-	 * @param sMessage Message contents
-	 * @param sHost Hostname of sender (or servername)
-	 * @see com.dmdirc.parser.irc.ProcessWallops#callWallDesync
-	 */
-	void onWallDesync(Parser tParser, String sMessage, String sHost);
-}

src/com/dmdirc/parser/interfaces/callbacks/WallopListener.java

@@ -1,44 +0,0 @@
-/*
- * Copyright (c) 2006-2009 Chris Smith, Shane Mc Cormack, Gregory Holmes
- *
- * 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 com.dmdirc.parser.interfaces.callbacks;
-
-import com.dmdirc.parser.interfaces.Parser;
-import com.dmdirc.parser.interfaces.SpecificCallback;
-
-/**
- * Called when an oper-only message is recieved over wallops.
- * sHost is the hostname of the person sending the message. (Can be a server or a person)<br>
- */
-@SpecificCallback
-public interface WallopListener extends CallbackInterface {
-	/**
-	 * Called when an oper-only message is recieved over wallops.
-	 * sHost is the hostname of the person sending the message. (Can be a server or a person)<br>
-	 * 
-	 * @param tParser Reference to the parser object that made the callback.
-	 * @param sMessage Message contents
-	 * @param sHost Hostname of sender (or servername)
-	 * @see com.dmdirc.parser.irc.ProcessWallops#callWallop
-	 */
-	void onWallop(Parser tParser, String sMessage, String sHost);
-}

src/com/dmdirc/parser/interfaces/callbacks/WalluserListener.java

@@ -1,44 +0,0 @@
-/*
- * Copyright (c) 2006-2009 Chris Smith, Shane Mc Cormack, Gregory Holmes
- *
- * 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 com.dmdirc.parser.interfaces.callbacks;
-
-import com.dmdirc.parser.interfaces.Parser;
-import com.dmdirc.parser.interfaces.SpecificCallback;
-
-/**
- * Called when an all-users message is recieved over wallops.
- * sHost is the hostname of the person sending the message. (Can be a server or a person)<br>
- */
-@SpecificCallback
-public interface WalluserListener extends CallbackInterface {
-	/**
-	 * Called when an all-users message is recieved over wallops.
-	 * sHost is the hostname of the person sending the message. (Can be a server or a person)<br>
-	 * 
-	 * @param tParser Reference to the parser object that made the callback.
-	 * @param sMessage Message contents
-	 * @param sHost Hostname of sender (or servername)
-	 * @see com.dmdirc.parser.irc.ProcessWallops#callWalluser
-	 */
-	void onWalluser(Parser tParser, String sMessage, String sHost);
-}

src/com/dmdirc/parser/interfaces/callbacks/package-info.java

@@ -1,29 +0,0 @@
-/*
- * Copyright (c) 2006-2009 Chris Smith, Shane Mc Cormack, Gregory Holmes
- *
- * 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.
- */
-
-/**
- * Parser callback interfaces.  Classes wanting to use callbacks will be 
- * required to implement the appropriate interface from this package.
- *
- * @since 0.6.3m2
- */
-package com.dmdirc.parser.interfaces.callbacks;

src/com/dmdirc/parser/irc/IRCAuthenticator.java

@@ -1,130 +0,0 @@
-/*
- * Copyright (c) 2006-2009 Chris Smith, Shane Mc Cormack, Gregory Holmes
- *
- * 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 com.dmdirc.parser.irc;
-
-import java.net.Authenticator;
-import java.net.PasswordAuthentication;
-
-import java.util.Map;
-import java.util.HashMap;
-
-/**
- * Handles proxy authentication for the parser.
- * 
- * @author Shane Mc Cormack
- * @see IRCParser
- */
-public class IRCAuthenticator extends Authenticator {
-    /**
-     * A version number for this class. It should be changed whenever the class
-     * structure is changed (or anything else that would prevent serialized
-     * objects being unserialized with the new class).
-     */
-    private static final long serialVersionUID = 1;
-
-    /** Singleton instance of IRCAuthenticator. */
-    private static IRCAuthenticator me = null;
-    
-    /** List of authentication replies. */
-    private final Map<String,PasswordAuthentication> replies = new HashMap<String,PasswordAuthentication>();
-    
-    /**
-     * Create a new IRCAuthenticator.
-     *
-     * This creates an IRCAuthenticator and registers it as the default
-     * Authenticator.
-     */
-    private IRCAuthenticator() {
-/*        try {
-            final Field field = Authenticator.class.getDeclaredField("theAuthenticator");
-            field.setAccessible(true);
-            final Object authenticator = field.get(null);
-            if (authenticator instanceof Authenticator) {
-                oldAuthenticator = (Authenticator)authenticator;
-            }
-        } catch (NoSuchFieldException nsfe) {
-        } catch (IllegalAccessException iae) {
-        }*/
-        Authenticator.setDefault(this);
-    }
-    
-    /**
-     * Get the instance of IRCAuthenticator.
-     *
-     * @return The IRCAuthenticator instance.
-     */
-    public static synchronized IRCAuthenticator getIRCAuthenticator() {
-        if (me == null) {
-            me = new IRCAuthenticator();
-        }
-        return me;
-    }
-
-    /**
-     * Add a server to authenticate for.
-     *
-     * @param server ServerInfo object with proxy details.
-     */
-    public void addAuthentication(final ServerInfo server) {
-        addAuthentication(server.getProxyHost(), server.getProxyPort(), server.getProxyUser(), server.getProxyPass());
-    }
-
-    /**
-     * Add a host to authenticate for.
-     *
-     * @param host Hostname
-     * @param port Port
-     * @param username Username to return for authentication
-     * @param password Password to return for authentication
-     */
-    public void addAuthentication(final String host, final int port, final String username, final String password) {
-        if (username == null || password == null || username.isEmpty() || password.isEmpty()) {
-            return;
-        }
-        final PasswordAuthentication pass = new PasswordAuthentication(username, password.toCharArray());
-        final String fullhost = host.toLowerCase()+":"+port;
-        
-        if (replies.containsKey(fullhost)) {
-            replies.remove(fullhost);
-        }
-        
-        replies.put(fullhost, pass);
-    }
-    
-    /** {@inheritDoc} */
-    protected PasswordAuthentication getPasswordAuthentication() {
-        /*
-         * getRequestingHost: 85.234.138.2
-         * getRequestingPort: 1080
-         * getRequestingPrompt: SOCKS authentication
-         * getRequestingProtocol: SOCKS5
-         * getRequestingScheme: null
-         * getRequestingSite: /85.234.138.2
-         * getRequestingURL: null
-         * getRequestorType: SERVER
-         */
-
-        final String fullhost = getRequestingHost().toLowerCase()+":"+getRequestingPort();
-        return replies.get(fullhost);
-    }
-}

src/com/dmdirc/parser/irc/IRCCallbackManager.java

@@ -1,55 +0,0 @@
-/*
- * Copyright (c) 2006-2009 Chris Smith, Shane Mc Cormack, Gregory Holmes
- *
- * 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 com.dmdirc.parser.irc;
-
-import com.dmdirc.parser.common.CallbackObjectSpecific;
-import com.dmdirc.parser.common.CallbackObject;
-import com.dmdirc.parser.common.CallbackManager;
-import com.dmdirc.parser.interfaces.callbacks.CallbackInterface;
-
-/**
- * Handles callbacks for the IRC Parser.
- * 
- * @author chris
- */
-public class IRCCallbackManager extends CallbackManager<IRCParser> {
-
-    public IRCCallbackManager(final IRCParser parser) {
-        super(parser);
-    }
-
-    /** {@inheritDoc} */
-    @Override
-    protected CallbackObject getCallbackObject(final IRCParser parser, final Class<?> type) {
-        return new IRCCallbackObject(parser, this, type.asSubclass(CallbackInterface.class));
-    }
-
-    /** {@inheritDoc} */
-    @Override
-    protected CallbackObjectSpecific getSpecificCallbackObject(final IRCParser parser,
-            final Class<?> type) {
-        return new IRCCallbackObjectSpecific(parser, this,
-                type.asSubclass(CallbackInterface.class));
-    }
-
-}

src/com/dmdirc/parser/irc/IRCCallbackObject.java

@@ -1,65 +0,0 @@
-/*
- * Copyright (c) 2006-2009 Chris Smith, Shane Mc Cormack, Gregory Holmes
- *
- * 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 com.dmdirc.parser.irc;
-
-import com.dmdirc.parser.common.CallbackManager;
-import com.dmdirc.parser.common.CallbackObject;
-import com.dmdirc.parser.interfaces.ChannelClientInfo;
-import com.dmdirc.parser.interfaces.ChannelInfo;
-import com.dmdirc.parser.interfaces.ClientInfo;
-import com.dmdirc.parser.interfaces.LocalClientInfo;
-import com.dmdirc.parser.interfaces.Parser;
-import com.dmdirc.parser.interfaces.callbacks.CallbackInterface;
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- * A callback object for the IRC parser.
- *
- * @since 0.6.3m2
- * @author chris
- */
-public class IRCCallbackObject extends CallbackObject {
-
-    /** A map of interfaces to the classes which should be instansiated for them. */
-    protected static Map<Class<?>, Class<?>> IMPL_MAP = new HashMap<Class<?>, Class<?>>();
-
-    static {
-        IMPL_MAP.put(ChannelClientInfo.class, IRCChannelClientInfo.class);
-        IMPL_MAP.put(ChannelInfo.class, IRCChannelInfo.class);
-        IMPL_MAP.put(ClientInfo.class, IRCClientInfo.class);
-        IMPL_MAP.put(LocalClientInfo.class, IRCClientInfo.class);
-    }
-
-    public IRCCallbackObject(Parser parser, CallbackManager<?> manager,
-            Class<? extends CallbackInterface> type) {
-        super(parser, manager, type);
-    }
-
-    /** {@inheritDoc} */
-    @Override
-    protected Class<?> getImplementation(Class<?> type) {
-        return IMPL_MAP.containsKey(type) ? IMPL_MAP.get(type) : type;
-    }
-
-}

src/com/dmdirc/parser/irc/IRCCallbackObjectSpecific.java

@@ -1,71 +0,0 @@
-/*
- * Copyright (c) 2006-2009 Chris Smith, Shane Mc Cormack, Gregory Holmes
- *
- * 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 com.dmdirc.parser.irc;
-
-import com.dmdirc.parser.common.CallbackManager;
-import com.dmdirc.parser.common.CallbackObjectSpecific;
-import com.dmdirc.parser.interfaces.ChannelClientInfo;
-import com.dmdirc.parser.interfaces.ChannelInfo;
-import com.dmdirc.parser.interfaces.ClientInfo;
-import com.dmdirc.parser.interfaces.LocalClientInfo;
-import com.dmdirc.parser.interfaces.Parser;
-import com.dmdirc.parser.interfaces.callbacks.CallbackInterface;
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- * A specific callback object for use with the IRC Parser
- *
- * @since 0.6.3m2
- * @author chris
- */
-public class IRCCallbackObjectSpecific extends CallbackObjectSpecific {
-
-    /** A map of interfaces to the classes which should be instansiated for them. */
-    protected static Map<Class<?>, Class<?>> IMPL_MAP = new HashMap<Class<?>, Class<?>>();
-
-    static {
-        IMPL_MAP.put(ChannelClientInfo.class, IRCChannelClientInfo.class);
-        IMPL_MAP.put(ChannelInfo.class, IRCChannelInfo.class);
-        IMPL_MAP.put(ClientInfo.class, IRCClientInfo.class);
-        IMPL_MAP.put(LocalClientInfo.class, IRCClientInfo.class);
-    }
-
-    public IRCCallbackObjectSpecific(final Parser parser,
-            final CallbackManager<?> manager, final Class<? extends CallbackInterface> type) {
-        super(parser, manager, type);
-    }
-
-    /** {@inheritDoc} */
-    @Override
-    protected String translateHostname(final String hostname) {
-        return IRCClientInfo.parseHost(hostname);
-    }
-
-    /** {@inheritDoc} */
-    @Override
-    protected Class<?> getImplementation(Class<?> type) {
-        return IMPL_MAP.containsKey(type) ? IMPL_MAP.get(type) : type;
-    }
-
-}

src/com/dmdirc/parser/irc/IRCChannelClientInfo.java

@@ -1,207 +0,0 @@
-/*
- * Copyright (c) 2006-2009 Chris Smith, Shane Mc Cormack, Gregory Holmes
- *
- * 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 com.dmdirc.parser.irc;
-
-import com.dmdirc.parser.interfaces.ChannelClientInfo;
-import com.dmdirc.parser.interfaces.ChannelInfo;
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- * Contains information about a client on a channel.
- * 
- * @author Shane Mc Cormack
- * @author Chris Smith
- * @see IRCParser
- */
-public class IRCChannelClientInfo implements ChannelClientInfo {
-    
-    /** Reference to ClientInfo object this represents. */
-    private final IRCClientInfo cClient;
-    /** Integer representation of the channel modes assocated with this user. */
-    private long nModes;
-    /** Reference to the parser object that owns this channelclient, Used for modes. */
-    private final IRCParser myParser;
-    /** Reference to the channel object that owns this channelclient. */
-    private final ChannelInfo myChannel;
-    /** A Map to allow applications to attach misc data to this object */
-    private Map<Object, Object> myMap;
-    
-    /**
-     * Create a ChannelClient instance of a CLient.
-     *
-     * @param tParser Refernce to parser that owns this channelclient (used for modes)
-     * @param client Client that this channelclient represents
-     * @param channel Channel that owns this channelclient
-     */    
-    public IRCChannelClientInfo(final IRCParser tParser, final IRCClientInfo client, final ChannelInfo channel) {
-        myMap = new HashMap<Object, Object>();
-        myParser = tParser;
-        cClient = client;
-        myChannel = channel;
-        cClient.addChannelClientInfo(this);
-    }
-    
-    /**
-     * Set the Map object attatched to this object.
-     *
-     * @param newMap New Map to attatch.
-     * @see #getMap
-     */
-    public void setMap(final Map<Object, Object> newMap) {
-        myMap = newMap;
-    }
-    
-    /** {@inheritDoc} */
-        @Override
-    public Map<Object, Object> getMap() { return myMap; }
-    
-    /** {@inheritDoc} */
-        @Override
-    public IRCClientInfo getClient() { return cClient; }
-
-    /** {@inheritDoc} */
-        @Override
-    public ChannelInfo getChannel() { return myChannel; }
-    /**
-     * Get the nickname of the client object represented by this channelclient.
-     *
-     * @return Nickname of the Client object represented by this channelclient
-     */    
-    public String getNickname() { return cClient.getNickname(); }    
-    
-    /**
-     * Set the modes this client has (Prefix modes).
-     *
-     * @param nNewMode integer representing the modes this client has.
-     */
-    public void setChanMode(final long nNewMode) { nModes = nNewMode; }
-    /**
-     * Get the modes this client has (Prefix modes).
-     *
-     * @return integer representing the modes this client has.
-     */
-    public long getChanMode() { return nModes; }
-    
-    /**
-     * Get the modes this client has (Prefix modes) as a string.
-     * Returns all known modes that the client has.
-     * getChanModeStr(false).charAt(0) can be used to get the highest mode (o)
-     * getChanModeStr(true).charAt(0) can be used to get the highest prefix (@)
-     *
-     * @param bPrefix if this is true, prefixes will be returned (@+) not modes (ov)
-     * @return String representing the modes this client has.
-     */
-    public String getChanModeStr(final boolean bPrefix) {
-        StringBuilder sModes = new StringBuilder();
-        long nTemp = 0;
-        final long nCurrentModes = this.getChanMode();
-
-        for (long i = myParser.nextKeyPrefix; i > 0; i = i / 2) {
-            if ((nCurrentModes & i) == i) {
-                for (char cTemp : myParser.prefixModes.keySet()) {
-                    nTemp = myParser.prefixModes.get(cTemp);
-                    if (nTemp == i) {
-                        if (bPrefix) { cTemp = myParser.prefixMap.get(cTemp); }
-                        sModes = sModes.append(cTemp);
-                        break;
-                    }
-                }
-            }
-        }
-        
-        return sModes.toString();
-    }
-
-    /** {@inheritDoc} */
-    @Override
-    public String getAllModes() {
-        return getChanModeStr(false);
-    }
-
-    /**
-     * Get the value of the most important mode this client has (Prefix modes).
-     * A higher value, is a more important mode, 0 = no modes.
-     *
-     * @return integer representing the value of the most important mode.
-     */
-    public long getImportantModeValue() {
-        for (long i = myParser.nextKeyPrefix; i > 0; i = i / 2) {
-            if ((nModes & i) == i) { return i; }
-        }
-        return 0;
-    }
-    
-    /** {@inheritDoc} */
-        @Override
-    public String getImportantMode() {
-        String sModes = this.getChanModeStr(false);
-        if (!sModes.isEmpty()) { sModes = "" + sModes.charAt(0); }
-        return sModes;
-    }
-    
-    /** {@inheritDoc} */
-        @Override
-    public String getImportantModePrefix() {
-        String sModes = this.getChanModeStr(true);
-        if (!sModes.isEmpty()) { sModes = "" + sModes.charAt(0); }
-        return sModes;
-    }
-    
-
-    /**
-     * Get the String Value of ChannelClientInfo (ie @Nickname).
-     *
-     * @return String Value of user (inc prefix) (ie @Nickname)
-     */
-    @Override
-    public String toString() { 
-        return this.getImportantModePrefix() + this.getNickname();
-    }    
-    
-    /** {@inheritDoc} */
-        @Override
-    public void kick(final String sReason) {
-        myParser.sendString("KICK " + myChannel + " " + this.getNickname() + (sReason.isEmpty() ? sReason : " :" + sReason));
-    }
-    
-    /**
-     * Get the "Complete" String Value of ChannelClientInfo (ie @+Nickname).
-     *
-     * @return String Value of user (inc prefix) (ie @+Nickname)
-     */
-    public String toFullString() { return this.getChanModeStr(true) + this.getNickname(); }
-
-        /** {@inheritDoc} */
-        @Override
-        public int compareTo(final ChannelClientInfo arg0) {
-            if (arg0 instanceof IRCChannelClientInfo) {
-                final IRCChannelClientInfo other = (IRCChannelClientInfo) arg0;
-                return (int) (getImportantModeValue() - other.getImportantModeValue());
-            }
-
-            return 0;
-        }
-
-}
-

src/com/dmdirc/parser/irc/IRCChannelInfo.java

@@ -1,742 +0,0 @@
-/*
- * Copyright (c) 2006-2009 Chris Smith, Shane Mc Cormack, Gregory Holmes
- *
- * 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 com.dmdirc.parser.irc;
-
-import com.dmdirc.parser.common.ChannelListModeItem;
-import com.dmdirc.parser.interfaces.ChannelClientInfo;
-import com.dmdirc.parser.interfaces.ChannelInfo;
-import com.dmdirc.parser.interfaces.ClientInfo;
-import com.dmdirc.parser.interfaces.Parser;
-import com.dmdirc.parser.common.QueuePriority;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Hashtable;
-import java.util.HashMap;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
-import java.util.Queue;
-
-/**
- * Contains Channel information.
- * 
- * @author Shane Mc Cormack
- * @author Chris Smith
- * @see IRCParser
- */
-public class IRCChannelInfo implements ChannelInfo {
-    /**
-     * Boolean repreenting the status of names requests.
-     * When this is false, any new names reply will cause current known channelclients to be removed.
-     */
-    private boolean bAddingNames = true;
-    
-    /** Unixtimestamp representing time when the channel was created. */
-    private long nCreateTime = 0;
-    
-    /** Current known topic in the channel. */
-    private String sTopic = "";
-    /** Last known user to set the topic (Full host where possible). */
-    private String sTopicUser = "";
-    /** Unixtimestamp representing time when the topic was set. */
-    private long nTopicTime = 0;
-    
-    /** Known boolean-modes for channel. */
-    private long nModes;
-    /** Reference to the parser object that owns this channel, Used for modes. */
-    private final IRCParser myParser; // Reference to parser object that owns this channel. Used for Modes
-    
-    /** Channel Name. */
-    private final String sName;
-    
-    /** Hashtable containing references to ChannelClients. */
-    private final Map<String, IRCChannelClientInfo> hChannelUserList = new Hashtable<String, IRCChannelClientInfo>();
-    /** Hashtable storing values for modes set in the channel that use parameters. */
-    private final Map<Character, String> hParamModes = new Hashtable<Character, String>();
-    /** Hashtable storing list modes. */
-    private final Map<Character, ArrayList<ChannelListModeItem>> hListModes = new Hashtable<Character, ArrayList<ChannelListModeItem>>();
-    /**
-     * LinkedList storing status of mode adding.
-     * if an item is in this list for a mode, we are expecting new items for the list
-     */
-    private final List<Character> lAddingModes = new LinkedList<Character>();
-    /** Modes waiting to be sent to the server. */
-    private final List<String> lModeQueue = new LinkedList<String>();
-    /** A Map to allow applications to attach misc data to this object */
-    private Map myMap;
-    
-    /** Queue of requested list modes */
-    private final Queue<Character> listModeQueue = new LinkedList<Character>();
-    /** Listmode Queue Time */
-    private long listModeQueueTime = System.currentTimeMillis();
-    /** Have we asked the server for the list modes for this channel yet? */
-    private boolean askedForListModes = false;
-    /** Has OnChannelGotListModes ever been called for this channel? */
-    private boolean hasGotListModes = false;
-
-    /**
-     * Create a new channel object.
-     *
-     * @param tParser Refernce to parser that owns this channelclient (used for modes)     
-     * @param name Channel name.
-     */
-    public IRCChannelInfo(final IRCParser tParser, final String name) {
-        myMap = new HashMap<Object, Object>();
-        myParser = tParser;
-        sName = name;
-    }
-    
-    /**
-     * Get the listModeQueue.
-     *
-     * @return The listModeQueue
-     */
-    public Queue<Character> getListModeQueue() {
-        Queue<Character> result = listModeQueue;
-        final long now = System.currentTimeMillis();
-        // Incase of breakage, if getListModeQueue() was last called greater than
-        // 60 seconds ago, we reset the list.
-        if (now-(30*1000) > listModeQueueTime) {
-            result = new LinkedList<Character>();
-            myParser.callDebugInfo(IRCParser.DEBUG_LMQ, "Resetting LMQ");
-        }
-        listModeQueueTime = now;
-        return result;
-    }
-    
-    /**
-     * Ask the server for all the list modes for this channel.
-     */
-    public void requestListModes() {
-        final IRCChannelClientInfo me = getChannelClient(myParser.getLocalClient());
-                
-        if (me == null) {
-            // In a normal situation of non bouncer-brokenness this won't happen
-            return;
-        }
-        
-        askedForListModes = true;
-        
-        final String thisIRCD = myParser.getIRCD(true).toLowerCase();
-        final boolean isFreenode = (thisIRCD.equals("hyperion") || thisIRCD.equals("dancer"));
-        final boolean isUnreal = thisIRCD.equals("unreal");
-        final boolean isStarChat = thisIRCD.equals("starchat");
-        final boolean isHybrid = thisIRCD.equals("hybrid") || thisIRCD.equals("oftc-hybrid");
-        final boolean isCharybdis = thisIRCD.equals("charybdis");
-        
-        // We are considered opped if we have a mode higher than voice (or if we have any modes if voice doesn't exist)
-        long voiceValue = 0;
-        if (myParser.prefixModes.get('v') != null) { voiceValue = myParser.prefixModes.get('v');}
-        final boolean isOpped = me.getImportantModeValue() > voiceValue;
-        
-        int modecount = 1;
-        if (!isUnreal && myParser.h005Info.containsKey("MODES")) {
-            try {
-                modecount = Integer.parseInt(myParser.h005Info.get("MODES"));
-            } catch (NumberFormatException e) { /* use default modecount */}
-        }
-        
-        // Support for potential future decent mode listing in the protocol
-        //
-        // See my proposal: http://shane.dmdirc.com/listmodes.php
-        // Add listmode handler
-        final boolean supportLISTMODE = myParser.h005Info.containsKey("LISTMODE");
-        
-        String listmodes = "";
-        int i = 0;
-        for (Character cTemp : myParser.chanModesOther.keySet()) {
-            final int nTemp = myParser.chanModesOther.get(cTemp);
-            if (nTemp == IRCParser.MODE_LIST) {
-                if ((isFreenode || isHybrid || isCharybdis) && (cTemp == 'e' || cTemp == 'I') && !isOpped) {
-                    // IRCD doesn't allow non-ops to ask for these modes.
-                    continue;
-                } else if (isStarChat && cTemp == 'H') {
-                    // IRCD Denies the mode exists
-                    continue;
-                }
-                i++;
-                listmodes = listmodes + cTemp;
-                if (i >= modecount && !supportLISTMODE) {
-                    myParser.sendString("MODE "+getName()+" "+listmodes, QueuePriority.LOW);
-                    i = 0;
-                    listmodes = "";
-                }
-            }
-        }
-        if (i > 0) {
-            if (supportLISTMODE) {
-                myParser.sendString("LISTMODE "+getName()+" "+listmodes, QueuePriority.LOW);
-            } else {
-                myParser.sendString("MODE "+getName()+" "+listmodes, QueuePriority.LOW);
-            }
-        }
-    }
-    
-    /**
-     * Have we ever asked the server for this channels listmodes?
-     *
-     * @return True if requestListModes() has ever been used, else false
-     */
-    public boolean hasAskedForListModes() {
-        return askedForListModes;
-    }
-    
-    /**
-     * Returns true if OnChannelGotListModes ever been called for this channel.
-     *
-     * @return True if OnChannelGotListModes ever been called for this channel.
-     */
-    public boolean hasGotListModes() {
-        return hasGotListModes;
-    }
-    
-    /**
-     * Set if OnChannelGotListModes ever been called for this channel.
-     *
-     * @param newValue new value for if OnChannelGotListModes ever been called for this channel.
-     */
-    protected void setHasGotListModes(final boolean newValue) {
-        hasGotListModes = newValue;
-    }
-    
-    /**
-     * Set the Map object attatched to this object.
-     *
-     * @param newMap New Map to attatch.
-     */
-    public void setMap(final Map newMap) {
-        myMap = newMap;
-    }
-    
-    /**
-     * Get the Map object attatched to this object.
-     *
-     * @return Map to attatched to this.
-     */
-    public Map getMap() {
-        return myMap;
-    }
-    
-    /**
-     * Set if we are getting a names request or not.
-     *
-     * @param newValue if false, any new names reply will cause current known channelclients to be removed.
-     */
-    public void setAddingNames(final boolean newValue) { bAddingNames = newValue; }
-    
-    /**
-     * Get if we are getting a names request or not.
-     *
-     * @return if false, any new names reply will cause current known channelclients to be removed.
-     */
-    public boolean isAddingNames() { return bAddingNames; }
-    
-    /** {@inheritDoc} */
-        @Override
-    public String getName() { return sName; }
-
-        /** {@inheritDoc} */
-        @Override
-    public int getChannelClientCount() { return hChannelUserList.size(); }
-    
-    /** {@inheritDoc} */
-        @Override
-    public Collection<ChannelClientInfo> getChannelClients() {
-        return new ArrayList<ChannelClientInfo>(hChannelUserList.values());
-    }
-    
-    /**
-     * Empty the channel (Remove all known channelclients).
-     */
-    protected void emptyChannel() {
-        IRCClientInfo cTemp = null;
-        for (IRCChannelClientInfo client : hChannelUserList.values()) {
-            cTemp = client.getClient();
-            cTemp.delChannelClientInfo(client);
-            if (cTemp != myParser.getLocalClient() && !cTemp.checkVisibility()) {
-                myParser.removeClient(cTemp);
-            }
-        }
-        hChannelUserList.clear();
-    }
-
-    /** {@inheritDoc} */
-        @Override
-    public IRCChannelClientInfo getChannelClient(final String sWho) {
-        return getChannelClient(sWho, false);
-    }
-    
-    /** {@inheritDoc} */
-        @Override
-    public IRCChannelClientInfo getChannelClient(final String sWho, final boolean createFake) {
-        final String who = myParser.getStringConverter().toLowerCase(IRCClientInfo.parseHost(sWho));
-        if (hChannelUserList.containsKey(who)) {
-            return hChannelUserList.get(who);
-        }
-        if (createFake) {
-            return new IRCChannelClientInfo(myParser, (new IRCClientInfo(myParser, sWho)).setFake(true), this);
-        } else {
-            return null;
-        }
-    }
-    
-    /** {@inheritDoc} */
-        @Override
-    public IRCChannelClientInfo getChannelClient(final ClientInfo cWho) {
-        for (IRCChannelClientInfo client : hChannelUserList.values()) {
-            if (client.getClient() == cWho) {
-                return client;
-            }
-        }
-        return null;
-    }
-    
-    /**
-     * Get the ChannelClientInfo object associated with a ClientInfo object.
-     *
-     * @param cClient Client object to be added to channel
-     * @return ChannelClientInfo object added, or an existing object if already known on channel
-     */
-    protected IRCChannelClientInfo addClient(final IRCClientInfo cClient) {
-        IRCChannelClientInfo cTemp = getChannelClient(cClient);
-        if (cTemp == null) { 
-            cTemp = new IRCChannelClientInfo(myParser, cClient, this);
-            hChannelUserList.put(myParser.getStringConverter().toLowerCase(cTemp.getClient().getNickname()), cTemp);
-        }
-        return cTemp;
-    }
-    
-    /**
-     * Remove ChannelClientInfo object associated with a ClientInfo object.
-     *
-     * @param cClient Client object to be removed from channel
-     */    
-    protected void delClient(final IRCClientInfo cClient) {
-        IRCChannelClientInfo cTemp = getChannelClient(cClient);
-        if (cTemp != null) {
-            final IRCClientInfo clTemp = cTemp.getClient();
-            clTemp.delChannelClientInfo(cTemp);
-            if (clTemp != myParser.getLocalClient() && !clTemp.checkVisibility()) {
-                myParser.removeClient(clTemp);
-            }
-            hChannelUserList.remove(myParser.getStringConverter().toLowerCase(cTemp.getClient().getNickname()));
-        }
-    }    
-    
-    /**
-     * Rename a channelClient.
-     *
-     * @param oldNickname Nickname client used to be known as
-     * @param cChannelClient ChannelClient object with updated client object
-     */    
-    protected void renameClient(final String oldNickname, final IRCChannelClientInfo cChannelClient) {
-        if (hChannelUserList.containsKey(oldNickname)) {
-            final IRCChannelClientInfo cTemp = hChannelUserList.get(oldNickname);
-            if (cTemp == cChannelClient) {
-                // Remove the old key
-                hChannelUserList.remove(oldNickname);
-                // Add with the new key. (getNickname will return the new name not the
-                // old one)
-                hChannelUserList.put(myParser.getStringConverter().toLowerCase(cTemp.getClient().getNickname()), cTemp);
-            }
-        }
-    }
-    
-    /**
-     * Set the create time.
-     *
-     * @param nNewTime New unixtimestamp time for the channel creation (Seconds since epoch, not milliseconds)
-     */
-    protected void setCreateTime(final long nNewTime) { nCreateTime = nNewTime; }
-    /**
-     * Get the Create time.
-     *
-     * @return Unixtimestamp time for the channel creation (Seconds since epoch, not milliseconds)
-     */
-    public long getCreateTime() { return nCreateTime; }    
-    
-    /**
-     * Set the topic time.
-     *
-     * @param nNewTime New unixtimestamp time for the topic (Seconds since epoch, not milliseconds)
-     */
-    protected void setTopicTime(final long nNewTime) { nTopicTime = nNewTime; }
-
-        /** {@inheritDoc} */
-        @Override
-    public long getTopicTime() { return nTopicTime; }    
-    
-    /**
-     * Set the topic.
-     *
-     * @param sNewTopic New contents of topic
-     */    
-    protected void setInternalTopic(final String sNewTopic) { sTopic = sNewTopic; }
-    
-        /** {@inheritDoc} */
-        @Override
-    public String getTopic() { return sTopic; }    
-
-    /**
-     * Set the topic creator.
-     *
-     * @param sNewUser New user who set the topic (nickname if gotten on connect, full host if seen by parser)
-     */    
-    protected void setTopicUser(final String sNewUser) { sTopicUser = sNewUser; }
-    
-        /** {@inheritDoc} */
-        @Override
-    public String getTopicSetter() { return sTopicUser; }
-    
-    /**
-     * Set the channel modes (as an integer).
-     *
-     * @param nNewMode new long representing channel modes. (Boolean only)
-     */    
-    protected void setMode(final long nNewMode) { nModes = nNewMode; }
-    /**
-     * Get the channel modes (as an integer).
-     *
-     * @return long representing channel modes. (Boolean only)
-     */    
-    public long getMode() { return nModes; }    
-    
-    /** {@inheritDoc} */
-        @Override
-    public String getModes() {
-        final StringBuilder sModes = new StringBuilder("+");
-        final StringBuilder sModeParams = new StringBuilder();
-        String sTemp = "";
-        long nTemp = 0;
-        final long nChanModes = this.getMode();
-        for (char cTemp : myParser.chanModesBool.keySet()) {
-            nTemp = myParser.chanModesBool.get(cTemp);
-            if ((nChanModes & nTemp) == nTemp) { sModes.append(cTemp); }
-        }
-        for (char cTemp : hParamModes.keySet()) {
-            sTemp = hParamModes.get(cTemp);
-            if (!sTemp.isEmpty()) {
-                sModes.append(cTemp);
-                sModeParams.append(" ").append(this.getMode(cTemp));
-             }
-        }
-        
-        return sModes.append(sModeParams).toString();
-    }    
-    
-    /**
-     * Set a channel mode that requires a parameter.
-     *
-     * @param cMode Character representing mode
-     * @param sValue String repreenting value (if "" mode is unset)
-     */    
-    protected void setModeParam(final Character cMode, final String sValue) { 
-        if (sValue.isEmpty()) {
-            if (hParamModes.containsKey(cMode)) {
-                hParamModes.remove(cMode);
-            }
-        } else {
-            hParamModes.put(cMode, sValue);
-        }
-    }
-        
-    /** {@inheritDoc} */
-        @Override
-    public String getMode(final char cMode) {
-        if (hParamModes.containsKey(cMode)) { 
-            return hParamModes.get(cMode); 
-        }
-        return "";
-    }
-    
-    /**
-     * Add/Remove a value to a channel list.
-     *
-     * @param givenMode Character representing mode
-     * @param givenItem ChannelListModeItem representing the item
-     * @param bAdd Add or remove the value. (true for add, false for remove)
-     */
-    protected void setListModeParam(final Character givenMode, final ChannelListModeItem givenItem, final boolean bAdd) { 
-        Character cMode = givenMode;
-        ChannelListModeItem newItem = givenItem;
-        if (!myParser.chanModesOther.containsKey(cMode) || myParser.chanModesOther.get(cMode) != IRCParser.MODE_LIST) { return; }
-        
-        // Hyperion sucks.
-        if (cMode == 'b' || cMode == 'q') {
-            final String thisIRCD = myParser.getIRCD(true).toLowerCase();
-            if ((thisIRCD.equals("hyperion") || thisIRCD.equals("dancer"))) {
-                if (cMode == 'b' && givenItem.getItem().charAt(0) == '%') {
-                    cMode = 'q';
-                } else if (cMode == 'q' && givenItem.getItem().charAt(0) != '%') {
-                    cMode = 'b';
-                }
-                if (givenItem.getItem().charAt(0) == '%') {
-                    newItem = new ChannelListModeItem(givenItem.getItem().substring(1), givenItem.getOwner(), givenItem.getTime());
-                }
-            }
-        }
-        
-        if (!hListModes.containsKey(cMode)) { 
-            hListModes.put(cMode, new ArrayList<ChannelListModeItem>());    
-        }
-        final ArrayList<ChannelListModeItem> lModes = hListModes.get(cMode);
-        for (int i = 0; i < lModes.size(); i++) {
-            if (myParser.getStringConverter().equalsIgnoreCase(lModes.get(i).getItem(), newItem.getItem())) {
-                if (bAdd) { return; }
-                else { 
-                    lModes.remove(i);
-                    break;
-                }
-            }
-        }
-        if (bAdd) { lModes.add(newItem); }
-    }
-    
-    /** {@inheritDoc} */
-        @Override
-    public Collection<ChannelListModeItem> getListMode(final char cMode) {
-        if (!myParser.chanModesOther.containsKey(cMode) || myParser.chanModesOther.get(cMode) != IRCParser.MODE_LIST) { return null; }
-        
-        if (!hListModes.containsKey(cMode)) { 
-            hListModes.put(cMode, new ArrayList<ChannelListModeItem>());
-        }
-        return hListModes.get(cMode);
-    }
-    
-    /**
-     * Get the "adding state" of a list mode.
-     * 
-     * @param cMode Character representing mode 
-     * @return false if we are not expecting a 367 etc, else true.
-     */
-    public boolean getAddState(final Character cMode) { 
-        synchronized (lAddingModes) {
-            return lAddingModes.contains(cMode);
-        }
-    }
-    
-    /**
-     * Get the "adding state" of a list mode.
-     * 
-     * @param cMode Character representing mode
-     * @param newState change the value returned by getAddState
-     */
-    protected void setAddState(final Character cMode, final boolean newState) { 
-        synchronized (lAddingModes) {
-            if (newState) {
-                lAddingModes.add(cMode);
-            } else {
-                if (lAddingModes.contains(cMode)) { lAddingModes.remove(cMode); }
-            }
-        }
-    }
-    
-    /**
-     * Reset the "adding state" of *all* list modes.
-     */
-    protected void resetAddState() {
-        synchronized (lAddingModes) {
-            lAddingModes.clear();
-        }
-    }
-    
-    /** {@inheritDoc} */
-        @Override
-    public void alterMode(final boolean positive, final Character mode, final String parameter) { 
-        int modecount = 1;
-        int modeint = 0;
-        String modestr = "";
-        if (myParser.h005Info.containsKey("MODES")) {
-            try {
-                modecount = Integer.parseInt(myParser.h005Info.get("MODES")); 
-            } catch (NumberFormatException e) { 
-                modecount = 1; 
-            }
-        }
-        if (!myParser.isUserSettable(mode)) { return; }
-
-        modestr = ((positive) ? "+" : "-") + mode;
-        if (myParser.chanModesBool.containsKey(mode)) {
-            final String teststr = ((positive) ? "-" : "+") + mode;
-            if (lModeQueue.contains(teststr)) {
-                lModeQueue.remove(teststr);
-                return;
-            } else if (lModeQueue.contains(modestr)) {
-                return;
-            }
-        } else {
-            // May need a param
-            if (myParser.prefixModes.containsKey(mode)) {
-                modestr = modestr + " " + parameter;
-            } else {
-                modeint = myParser.chanModesOther.get(mode);
-                if ((modeint & IRCParser.MODE_LIST) == IRCParser.MODE_LIST) {
-                    modestr = modestr + " " + parameter;
-                } else if (!positive && ((modeint & IRCParser.MODE_UNSET) == IRCParser.MODE_UNSET)) {
-                    modestr = modestr + " " + parameter;
-                } else if (positive && ((modeint & IRCParser.MODE_SET) == IRCParser.MODE_SET)) {
-                    // Does mode require a param to unset aswell?
-                    // We might need to queue an unset first
-                    if (((modeint & IRCParser.MODE_UNSET) == IRCParser.MODE_UNSET)) {
-                        final String existingParam = getMode(mode);
-                        if (!existingParam.isEmpty()) {
-                            final String reverseModeStr = "-" + mode + " " + existingParam;
-                            
-                            myParser.callDebugInfo(IRCParser.DEBUG_INFO, "Queueing mode: %s", reverseModeStr);
-                            lModeQueue.add(reverseModeStr);
-                            if (lModeQueue.size() == modecount) { flushModes(); }
-                        }
-                    }
-                    modestr = modestr + " " + parameter;
-                }
-            }
-        }
-        myParser.callDebugInfo(IRCParser.DEBUG_INFO, "Queueing mode: %s", modestr);
-        lModeQueue.add(modestr);
-        if (lModeQueue.size() == modecount) { flushModes(); }
-    }
-    
-    /** {@inheritDoc} */
-        @Override
-    public void flushModes() {
-        if (lModeQueue.isEmpty()) { return; }
-        final StringBuilder positivemode = new StringBuilder();
-        final StringBuilder positiveparam = new StringBuilder();
-        final StringBuilder negativemode = new StringBuilder();
-        final StringBuilder negativeparam = new StringBuilder();
-        final StringBuilder sendModeStr = new StringBuilder();
-        String modestr;
-        String[] modeparam;
-        boolean positive;
-        for (int i = 0; i < lModeQueue.size(); ++i) {
-            modeparam = lModeQueue.get(i).split(" ");
-            modestr = modeparam[0];
-            positive = modestr.charAt(0) == '+';
-            if (positive) {
-                positivemode.append(modestr.charAt(1));
-                if (modeparam.length > 1) { positiveparam.append(" ").append(modeparam[1]); }
-            } else {
-                negativemode.append(modestr.charAt(1));
-                if (modeparam.length > 1) { negativeparam.append(" ").append(modeparam[1]); }
-            }
-        }
-        if (negativemode.length() > 0) { sendModeStr.append("-").append(negativemode); }
-        if (positivemode.length() > 0) { sendModeStr.append("+").append(positivemode); }
-        if (negativeparam.length() > 0) { sendModeStr.append(negativeparam); }
-        if (positiveparam.length() > 0) { sendModeStr.append(positiveparam); }
-        myParser.callDebugInfo(IRCParser.DEBUG_INFO, "Sending mode: %s", sendModeStr.toString());
-        myParser.sendRawMessage("MODE " + sName + " " + sendModeStr.toString());
-        clearModeQueue();
-    }
-    
-    /**
-     * This function will clear the mode queue (WITHOUT Sending).
-     */
-    public void clearModeQueue() { 
-        lModeQueue.clear();
-    }
-    
-    /** {@inheritDoc} */
-        @Override
-    public void sendMessage(final String message) {
-        if (message.isEmpty()) { return; }
-        
-        myParser.sendString("PRIVMSG " + sName + " :" + message);
-    }
-    
-    /**
-     * Send a notice message to a target.
-     *
-     * @param sMessage Message to send
-     */
-    public void sendNotice(final String sMessage) { 
-        if (sMessage.isEmpty()) { return; }
-        
-        myParser.sendString("NOTICE " + sName + " :" + sMessage);    
-    }
-
-    /** {@inheritDoc} */
-        @Override
-    public void sendAction(final String action) {
-        if (action.isEmpty()) { return; }
-        sendCTCP("ACTION", action);
-    }
-    
-    /**
-     * Send a CTCP to a target.
-     *
-     * @param sType Type of CTCP
-     * @param sMessage Optional Additional Parameters
-     */
-    public void sendCTCP(final String sType, String sMessage) { 
-        if (sType.isEmpty()) { return; }
-        final char char1 = (char) 1;
-        if (!sMessage.isEmpty()) { sMessage = " " + sMessage; }
-        sendMessage(char1 + sType.toUpperCase() + sMessage + char1);
-    }
-    
-    /**
-     * Send a CTCPReply to a target.
-     *
-     * @param sType Type of CTCP
-     * @param sMessage Optional Additional Parameters
-     */
-    public void sendCTCPReply(final String sType, String sMessage) { 
-        if (sType.isEmpty()) { return; }
-        final char char1 = (char) 1;
-        if (!sMessage.isEmpty()) { sMessage = " " + sMessage; }
-        sendNotice(char1 + sType.toUpperCase() + sMessage + char1);    
-    }
-    
-    /**
-     * Get a string representation of the Channel.
-     *
-     * @return String representation of the Channel.
-     */
-    @Override
-    public String toString() { return sName; }
-    
-    /** {@inheritDoc} */
-        @Override
-    public Parser getParser() { return myParser; }
-
-        /** {@inheritDoc} */
-        @Override
-        public void part(final String reason) {
-            myParser.partChannel(sName, reason);
-        }
-
-    /** {@inheritDoc} */
-    @Override
-    public void setTopic(final String topic) {
-        myParser.sendRawMessage("TOPIC " + sName + " :" + topic);
-    }
-
-    /** {@inheritDoc} */
-    @Override
-    public void sendWho() {
-        myParser.sendRawMessage("WHO " + sName);
-    }
-
-}
-

src/com/dmdirc/parser/irc/IRCClientInfo.java

@@ -1,428 +0,0 @@
-/*
- * Copyright (c) 2006-2009 Chris Smith, Shane Mc Cormack, Gregory Holmes
- *
- * 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 com.dmdirc.parser.irc;
-
-import com.dmdirc.parser.interfaces.ClientInfo;
-import com.dmdirc.parser.interfaces.LocalClientInfo;
-import com.dmdirc.parser.interfaces.Parser;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.LinkedList;
-import java.util.Hashtable;
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- * Contains information about known users.
- * 
- * @author Shane Mc Cormack
- * @author Chris Smith
- * @see IRCParser
- */
-public class IRCClientInfo implements LocalClientInfo {
-    /** Known nickname of client. */
-    private String sNickname = "";
-    /** Known ident of client. */
-    private String sIdent = "";    
-    /** Known host of client. */
-    private String sHost = "";
-    /** Known user modes of client. */
-    private long nModes;
-    /** Known Away Reason of client. */
-    private String myAwayReason = "";
-    /** Known RealName of client. */
-    private String sRealName = "";
-    /** Known away state for client. */
-    private boolean bIsAway;
-    /** Is this a fake client created just for a callback? */
-    private boolean bIsFake;
-    /** Reference to the parser object that owns this channel, Used for modes. */
-    private final IRCParser myParser;
-    /** A Map to allow applications to attach misc data to this object */
-    private Map<Object, Object> myMap;
-    /** List of ChannelClientInfos that point to this */
-    private final Map<String, IRCChannelClientInfo> myChannelClientInfos = new Hashtable<String, IRCChannelClientInfo>();
-    /** Modes waiting to be sent to the server. */
-    private final List<String> lModeQueue = new LinkedList<String>();
-
-    /**
-     * Create a new client object from a hostmask.
-     *
-      * @param tParser Refernce to parser that owns this channelclient (used for modes)
-     * @param sHostmask Hostmask parsed by parseHost to get nickname
-     * @see ClientInfo#parseHost
-     */
-    public IRCClientInfo(final IRCParser tParser, final String sHostmask) {
-        myMap = new HashMap<Object, Object>();
-        setUserBits(sHostmask, true);
-        myParser = tParser;
-    }
-
-    /**
-     * Set the Map object attatched to this object.
-     *
-     * @param newMap New Map to attatch.
-     */
-    public void setMap(final Map<Object, Object> newMap) {
-        myMap = newMap;
-    }
-    
-    /** {@inheritDoc} */
-        @Override
-    public Map<Object, Object> getMap() {
-            return myMap;
-    }
-
-    /**
-     * Check if this is a fake client.
-     *
-     * @return True if this is a fake client, else false
-     */
-    public boolean isFake() { return bIsFake; }
-    /**
-     * Check if this client is actually a server.
-     *
-     * @return True if this client is actually a server.
-     */
-    public boolean isServer() { return !(sNickname.indexOf(':') == -1); }
-    /**
-     * Set if this is a fake client.
-     * This returns "this" and thus can be used in the construction line.
-     *
-     * @param newValue new value for isFake - True if this is a fake client, else false
-     * @return this Object
-     */
-    public IRCClientInfo setFake(final boolean newValue) { bIsFake = newValue; return this; }
-
-    /**
-     * Get a nickname of a user from a hostmask.
-     * Hostmask must match (?:)nick(?!ident)(?@host)
-     *
-     * @param sWho Hostname to parse
-     * @return nickname of user
-     */
-    public static String parseHost(final String sWho) {
-        // Get the nickname from the string.
-        return parseHostFull(sWho)[0];
-    }
-    
-    /**
-     * Get a nick ident and host of a user from a hostmask.
-     * Hostmask must match (?:)nick(?!ident)(?@host)
-     *
-     * @param sWho Hostname to parse
-     * @return Array containing details. (result[0] -> Nick | result[1] -> Ident | result[2] -> Host)
-     */
-    public static String[] parseHostFull(String sWho) {
-        String[] sTemp = null;
-        final String[] result = new String[3];
-        if (!sWho.isEmpty() && sWho.charAt(0) == ':') { sWho = sWho.substring(1); }
-        sTemp = sWho.split("@", 2);
-        if (sTemp.length == 1) { result[2] = ""; } else { result[2] = sTemp[1]; }
-        sTemp = sTemp[0].split("!", 2);
-        if (sTemp.length == 1) { result[1] = ""; } else { result[1] = sTemp[1]; }
-        result[0] = sTemp[0];
-        
-        return result;
-    }
-
-    /**
-     * Set the nick/ident/host of this client.
-     *
-     * @param sHostmask takes a host (?:)nick(?!ident)(?@host) and sets nick/host/ident variables
-     * @param bUpdateNick if this is false, only host/ident will be updated.
-     */    
-    public void setUserBits(final String sHostmask, final boolean bUpdateNick) {
-        setUserBits(sHostmask, bUpdateNick, false);
-    }
-    
-    /**
-     * Set the nick/ident/host of this client.
-     *
-     * @param sHostmask takes a host (?:)nick(?!ident)(?@host) and sets nick/host/ident variables
-     * @param bUpdateNick if this is false, only host/ident will be updated.
-     * @param allowBlank if this is true, ident/host will be set even if
-     *                   parseHostFull returns empty values for them
-     */    
-    public void setUserBits(final String sHostmask, final boolean bUpdateNick, final boolean allowBlank) {
-        final String[] sTemp = parseHostFull(sHostmask);
-        if (!sTemp[2].isEmpty() || allowBlank) { sHost = sTemp[2]; }
-        if (!sTemp[1].isEmpty() || allowBlank) { sIdent = sTemp[1]; }
-        if (bUpdateNick) { sNickname = sTemp[0]; }
-    }
-    
-    /**
-     * Get a string representation of the user.
-     *
-     * @return String representation of the user.
-     */
-    @Override
-    public String toString() { return sNickname + "!" + sIdent + "@" + sHost; }
-    
-    /** {@inheritDoc} */
-    @Override
-    public String getNickname() {
-        // If this is the localClient then do what we are supposed to do, and ask
-        // the parser using parser.getNickname() like was used prior to the
-        // great-parser-breaking (aka abstraction) of 09.
-        if (this.equals(myParser.getLocalClient())) {
-            return myParser.getMyNickname();
-        } else {
-            return sNickname;
-        }
-    }
-    
-    /** {@inheritDoc} */
-    public String getRealNickname() { return sNickname; }
-    
-    /** {@inheritDoc} */
-    @Override
-    public String getUsername() { return sIdent; }
-    
-    /** {@inheritDoc} */
-  @Override
-    public String getHostname() { return sHost; }
-    
-    /**
-     * Set the away state of a user.
-     * Automatically sets away reason to "" if set to false
-     *
-     * @param bNewState Boolean representing state. true = away, false = here
-     */    
-    protected void setAwayState(final boolean bNewState) {
-        bIsAway = bNewState;
-        if (!bIsAway) { myAwayReason = ""; }
-    }
-    
-    /**
-     * Get the away state of a user.
-     *
-     * @return Boolean representing state. true = away, false = here
-     */    
-    public boolean getAwayState() { return bIsAway; }
-    
-    /**
-     * Get the Away Reason for this user.
-     *
-     * @return Known away reason for user.
-     */
-    public String getAwayReason() { return myAwayReason; }
-    
-    /**
-     * Set the Away Reason for this user.
-     * Automatically set to "" if awaystate is set to false
-     *
-     * @param newValue new away reason for user.
-     */
-    protected void setAwayReason(final String newValue) { myAwayReason = newValue; }
-    
-    /** {@inheritDoc} */
-        @Override
-    public String getRealname() { return sRealName; }
-    
-    /**
-     * Set the RealName for this user.
-     *
-     * @param newValue new RealName for user.
-     */
-    protected void setRealName(final String newValue) { sRealName = newValue; }
-    
-    /**
-     * Set the user modes (as an integer).
-     *
-     * @param nNewMode new long representing channel modes. (Boolean only)
-     */    
-    protected void setUserMode(final long nNewMode) { nModes = nNewMode; }
-    
-    /**
-     * Get the user modes (as an integer).
-     *
-     * @return long representing channel modes. (Boolean only)
-     */    
-    public long getUserMode() { return nModes; }    
-    
-    /** {@inheritDoc} */
-        @Override
-    public String getModes() {
-        final StringBuilder sModes = new StringBuilder("+");
-        long nTemp = 0;
-        final long nChanModes = this.getUserMode();
-        
-        for (char cTemp : myParser.userModes.keySet()) {
-            nTemp = myParser.userModes.get(cTemp);
-            if ((nChanModes & nTemp) == nTemp) { sModes.append(cTemp); }
-        }
-        
-        return sModes.toString();
-    }
-    
-    /**
-     * Is this client an oper?
-     * This is a guess currently based on user-modes and thus only works on the
-     * parsers own client.
-     *
-     * @return True/False if this client appears to be an oper
-     */
-    public boolean isOper() {
-        final String modestr = getModes();
-        return (modestr.indexOf('o') > -1) || (modestr.indexOf('O') > -1);
-    }
-    
-    /**
-     * Add a ChannelClientInfo as a known reference to this client.
-     *
-     * @param cci ChannelClientInfo to add as a known reference
-     */    
-    public void addChannelClientInfo(final IRCChannelClientInfo cci) {
-        final String key = myParser.getStringConverter().toLowerCase(cci.getChannel().getName());
-        if (!myChannelClientInfos.containsKey(key)) {
-            myChannelClientInfos.put(key, cci);
-        }
-    }
-    
-    /**
-     * Remove a ChannelClientInfo as a known reference to this client.
-     *
-     * @param cci ChannelClientInfo to remove as a known reference
-     */    
-    public void delChannelClientInfo(final IRCChannelClientInfo cci) {
-        final String key = myParser.getStringConverter().toLowerCase(cci.getChannel().getName());
-        if (myChannelClientInfos.containsKey(key)) {
-            myChannelClientInfos.remove(key);
-        }
-    }
-    
-    /**
-     * Check to see if a client is still known on any of the channels we are on.
-     *
-     * @return Boolean to see if client is still visable.
-     */
-    public boolean checkVisibility() {
-        return !myChannelClientInfos.isEmpty();
-    }
-    
-    /** {@inheritDoc} */
-        @Override
-    public int getChannelCount() {
-        return myChannelClientInfos.size();
-    }
-    
-    /**
-     * Get a list of channelClients that point to this object.
-     *
-     * @return int with the count of known channels
-     */    
-    public List<IRCChannelClientInfo> getChannelClients() {
-        final List<IRCChannelClientInfo> result = new ArrayList<IRCChannelClientInfo>();
-        for (IRCChannelClientInfo cci : myChannelClientInfos.values()) {
-            result.add(cci);
-        }
-        return result;
-    }
-    
-    /** {@inheritDoc} */
-        @Override
-    public void alterMode(final boolean add, final Character mode) {
-        if (isFake()) { return; }
-        int modecount = 1;
-        String modestr = "";
-        if (myParser.h005Info.containsKey("MODES")) {
-            try { 
-                modecount = Integer.parseInt(myParser.h005Info.get("MODES")); 
-            } catch (NumberFormatException e) { 
-                modecount = 1;
-            }
-        }
-        modestr = ((add) ? "+" : "-") + mode;
-        if (!myParser.userModes.containsKey(mode)) { return; }
-        final String teststr = ((add) ? "-" : "+") + mode;
-        if (lModeQueue.contains(teststr)) {
-            lModeQueue.remove(teststr);
-            return;
-        } else if (lModeQueue.contains(modestr)) {
-            return;
-        }
-        myParser.callDebugInfo(IRCParser.DEBUG_INFO, "Queueing user mode: %s", modestr);
-        lModeQueue.add(modestr);
-        if (lModeQueue.size() == modecount) { flushModes(); }
-    }
-    
-    /** {@inheritDoc} */
-        @Override
-    public void flushModes() {
-        if (lModeQueue.isEmpty()) { return; }
-        final StringBuilder positivemode = new StringBuilder();
-        final StringBuilder negativemode = new StringBuilder();
-        final StringBuilder sendModeStr = new StringBuilder();
-        String modestr;
-        boolean positive;
-        for (int i = 0; i < lModeQueue.size(); ++i) {
-            modestr = lModeQueue.get(i);
-            positive = modestr.charAt(0) == '+';
-            if (positive) {
-                positivemode.append(modestr.charAt(1));
-            } else {
-                negativemode.append(modestr.charAt(1));
-            }
-        }
-        if (negativemode.length() > 0) { sendModeStr.append("-").append(negativemode); }
-        if (positivemode.length() > 0) { sendModeStr.append("+").append(positivemode); }
-        myParser.callDebugInfo(IRCParser.DEBUG_INFO, "Sending mode: %s", sendModeStr.toString());
-        myParser.sendRawMessage("MODE " + sNickname + " " + sendModeStr.toString());
-        clearModeQueue();
-    }
-    
-    /**
-     * This function will clear the mode queue (WITHOUT Sending).
-     */
-    public void clearModeQueue() { 
-        lModeQueue.clear();
-    }
-    
-    /** {@inheritDoc} */
-        @Override
-    public Parser getParser() { return myParser; }
-
-        /** {@inheritDoc} */
-        @Override
-        public void setNickname(final String name) {
-            if (myParser.getLocalClient().equals(this)) {
-                myParser.setNickname(name);
-            } else {
-                throw new UnsupportedOperationException("Cannot call setNickname on non-local client");
-            }
-        }
-
-    /** {@inheritDoc} */
-    @Override
-    public void setAway(String reason) {
-        myParser.sendRawMessage("AWAY :" + reason);
-    }
-
-    /** {@inheritDoc} */
-    @Override
-    public void setBack() {
-        myParser.sendRawMessage("AWAY");
-    }
-
-}

src/com/dmdirc/parser/irc/IRCProcessor.java

@@ -1,192 +0,0 @@
-/*
- * Copyright (c) 2006-2009 Chris Smith, Shane Mc Cormack, Gregory Holmes
- *
- * 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 com.dmdirc.parser.irc;
-
-import com.dmdirc.parser.common.ParserError;
-import com.dmdirc.parser.common.CallbackManager;
-import com.dmdirc.parser.common.QueuePriority;
-
-/**
- * IRCProcessor.
- * Superclass for all IRCProcessor types.
- *
- * @author Shane Mc Cormack
- */
-abstract class IRCProcessor {
-    /** Reference to the IRCParser that owns this IRCProcessor. */
-    protected IRCParser myParser;
-    
-    /** Reference to the Processing in charge of this IRCProcessor. */
-    protected ProcessingManager myManager;
-
-    // Some functions from the main parser are useful, and having to use myParser.functionName
-    // is annoying, so we also implement them here (calling them again using myParser)
-    /**
-     * Create a new instance of the IRCProcessor Object.
-     *
-     * @param parser IRCParser That owns this IRCProcessor
-     * @param manager ProcessingManager that is in charge of this IRCProcessor
-     */
-    protected IRCProcessor(final IRCParser parser, final ProcessingManager manager) {
-        this.myParser = parser;
-        this.myManager = manager;
-    }
-
-    /**
-     * Callback to all objects implementing the IErrorInfo Interface.
-     *
-     * @see com.dmdirc.parser.irc.callbacks.interfaces.IErrorInfo
-     * @param errorInfo ParserError object representing the error.
-     * @return true if a method was called, false otherwise
-     */
-    protected final boolean callErrorInfo(final ParserError errorInfo) {
-        return myParser.callErrorInfo(errorInfo);
-    }
-    
-    /**
-     * Callback to all objects implementing the DebugInfo Callback.
-     *
-     * @see com.dmdirc.parser.irc.callbacks.interfaces.IDebugInfo
-     * @param level Debugging Level (DEBUG_INFO, ndSocket etc)
-     * @param data Debugging Information
-     * @param args Formatting String Options
-     * @return true if a method was called, false otherwise
-     */
-    protected final boolean callDebugInfo(final int level, final String data, final Object... args) {
-        return myParser.callDebugInfo(level, String.format(data, args));
-    }
-    
-    /**
-     * Callback to all objects implementing the DebugInfo Callback.
-     *
-     * @see com.dmdirc.parser.irc.callbacks.interfaces.IDebugInfo
-     * @param level Debugging Level (DEBUG_INFO, ndSocket etc)
-     * @param data Debugging Information
-     * @return true if a method was called, false otherwise
-     */
-    protected final boolean callDebugInfo(final int level, final String data) {
-        return myParser.callDebugInfo(level, data);
-    }
-    
-    /**
-     * Check if a channel name is valid .
-     *
-     * @param sChannelName Channel name to test
-     * @return true if name is valid on the current connection, false otherwise. (Always false before noMOTD/MOTDEnd)
-     */
-    protected final boolean isValidChannelName(final String sChannelName) {
-        return myParser.isValidChannelName(sChannelName);
-    }
-    
-    /**
-     * Get the ClientInfo object for a person.
-     *
-     * @param sWho Who can be any valid identifier for a client as long as it contains a nickname (?:)nick(?!ident)(?@host)
-     * @return ClientInfo Object for the client, or null
-     */
-    protected final IRCClientInfo getClientInfo(final String sWho) {
-        return myParser.isKnownClient(sWho) ? myParser.getClient(sWho) : null;
-    }
-    
-    /**
-     * Get the ChannelInfo object for a channel.
-     *
-     * @param name This is the name of the channel.
-     * @return ChannelInfo Object for the channel, or null
-     */
-    protected final IRCChannelInfo getChannel(final String name) {
-        return myParser.getChannel(name);
-    }
-    
-    /**
-     * Get a reference to the CallbackManager.
-     *
-     * @return Reference to the CallbackManager
-     */
-    protected final CallbackManager<?> getCallbackManager() {
-        return myParser.getCallbackManager();
-    }
-    
-    /**
-     * Send a line to the server and add proper line ending.
-     *
-     * @param line Line to send (\r\n termination is added automatically)
-     */
-    protected final void sendString(final String line) {
-        myParser.sendString(line);
-    }
-
-    /**
-     * Send a line to the server and add proper line ending.
-     *
-     * @param line Line to send (\r\n termination is added automatically)
-     * @param priority Priority of this line.
-     */
-    protected final void sendString(final String line, final QueuePriority priority) {
-        myParser.sendString(line, priority);
-    }
-    
-    /**
-     * Process a Line.
-     *
-     * @param sParam Type of line to process ("005", "PRIVMSG" etc)
-     * @param token IRCTokenised line to process
-     */
-    public abstract void process(final String sParam, final String[] token);
-    
-    /**
-     * What does this IRCProcessor handle.
-     *
-     * @return String[] with the names of the tokens we handle.
-     */
-    public abstract String[] handles();
-    
-    /** 
-     * Get the name for this Processor.
-     * @return the name of this processor
-     */
-    public final String getName() {
-        final Package thisPackage = this.getClass().getPackage();
-        int packageLength = 0;
-        if (thisPackage != null) {
-            packageLength = thisPackage.getName().length() + 1;
-        }
-        return this.getClass().getName().substring(packageLength);
-    }
-    
-    /** 
-     * Get the name for this Processor in lowercase.
-     * @return lower case name of this processor
-     */
-    public final String getLowerName() {
-        return this.getName().toLowerCase();
-    }
-    
-    /** 
-     * Get the name for this Processor.
-     * @return the name of this processor
-     */
-        @Override
-    public final String toString() { return this.getName(); }
-    
-}

src/com/dmdirc/parser/irc/IRCStringConverter.java

@@ -1,132 +0,0 @@
-/*
- * Copyright (c) 2006-2009 Chris Smith, Shane Mc Cormack, Gregory Holmes
- *
- * 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 com.dmdirc.parser.irc;
-
-import com.dmdirc.parser.interfaces.StringConverter;
-
-/**
- * IRC String Converter.
- *
- * @author Shane Mc Cormack
- */
-public class IRCStringConverter implements StringConverter {
-    
-    /** Characters to use when converting tolowercase. */
-    private final char[] lowercase;
-    /** Characters to use when converting touppercase. */
-    private final char[] uppercase;
-    /** limit */
-    private final byte limit;
-
-    /**
-     * Create a new IRCStringConverter with rfc1459 encoding.
-     */
-    public IRCStringConverter() {
-        this((byte)4);
-    }
-    
-    /**
-     * Create a new IRCStringConverter.
-     * @param limit Number of post-alphabetical characters to convert
-     *              0 = ascii encoding
-     *              3 = strict-rfc1459 encoding
-     *              4 = rfc1459 encoding
-     */
-    public IRCStringConverter(final byte limit) {
-        // If limit is out side the boundries, use rfc1459
-        if (limit > 4 || limit < 0 ) { this.limit = (byte)4; }
-        else { this.limit = limit; }
-        
-        lowercase = new char[127];
-        uppercase = new char[127];
-        // Normal Chars
-        for (char i = 0; i < lowercase.length; ++i) {
-            lowercase[i] = i;
-            uppercase[i] = i;
-        }
-
-        // Replace the uppercase chars with lowercase
-        for (char i = 65; i <= (90 + this.limit); ++i) {
-            lowercase[i] = (char)(i + 32);
-            uppercase[i + 32] = i;
-        }
-    }
-
-    /**
-     * Get last used chararray limit.
-     *
-     * @return last used chararray limit
-     */
-    protected int getLimit() { return limit; }
-    
-    /** {@inheritDoc} */
-        @Override
-    public String toLowerCase(final String input) {
-        final char[] result = input.toCharArray();
-        for (int i = 0; i < input.length(); ++i) {
-            if (result[i] >= 0 && result[i] < lowercase.length) {
-                result[i] = lowercase[result[i]];
-            } else {
-                result[i] = result[i];
-            }
-        }
-        return new String(result);
-    }
-
-    /** {@inheritDoc} */
-        @Override
-    public String toUpperCase(final String input) {
-        final char[] result = input.toCharArray();
-        for (int i = 0; i < input.length(); ++i) {
-            if (result[i] >= 0 && result[i] < uppercase.length) {
-                result[i] = uppercase[result[i]];
-            } else {
-                result[i] = result[i];
-            }
-        }
-        return new String(result);
-    }
-
-    /** {@inheritDoc} */
-        @Override
-    public boolean equalsIgnoreCase(final String first, final String second) {
-        if (first == null && second == null) { return true; }
-        if (first == null || second == null) { return false; }
-        boolean result = (first.length() == second.length());
-        if (result) {
-            final char[] firstChar = first.toCharArray();
-            final char[] secondChar = second.toCharArray();
-            for (int i = 0; i < first.length(); ++i) {
-                if (firstChar[i] < lowercase.length && secondChar[i] < lowercase.length) {
-                    result = (lowercase[firstChar[i]] == lowercase[secondChar[i]]);
-                } else {
-                    result = firstChar[i] == secondChar[i];
-                }
-                if (!result) { break; }
-            }
-        }
-
-        return result;
-    }
-
-}

src/com/dmdirc/parser/irc/Logging.java

@@ -1,167 +0,0 @@
-/*
- * Copyright (c) 2006-2009 Chris Smith, Shane Mc Cormack, Gregory Holmes
- *
- * 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 com.dmdirc.parser.irc;
-
-import java.lang.reflect.Method;
-import java.lang.reflect.InvocationTargetException;
-
-/**
- * Logging using log4j if available.
- */
-public class Logging {
-    /** Available Log Levels */
-    public enum LogLevel {
-        TRACE("trace", "isTraceEnabled"),
-        DEBUG("debug", "isDebugEnabled"),
-        INFO("info", "isInfoEnabled"),
-        WARN("warn", "isWarnEnabled"),
-        ERROR("error", "isErrorEnabled"),
-        FATAL("fatal", "isFatalEnabled");
-        
-        /** Method name */
-        private final String methodName;
-        
-        /** Check Method name */
-        private final String checkMethodName;
-        
-        /**
-         * Create a new LogLevel
-         *
-         * @param methodName Name of method in log4j to log to
-         * @param checkMethodName Name of method in log4j to sue to check logging
-         */
-        private LogLevel(final String methodName, final String checkMethodName) {
-            this.methodName = methodName;
-            this.checkMethodName = checkMethodName;
-        }
-        
-        /**
-         * Get the Name of method in log4j to log to
-         *
-         * @return Name of method in log4j to log to
-         */
-        public String getMethodName() { return methodName; }
-        
-        /**
-         * Get the Name of the check method in log4j
-         *
-         * @return Name of check method in log4j
-         */
-        public String getCheckMethodName() { return checkMethodName; }
-    };
-    
-    /** Singleton Instance of Logging. */
-    private static Logging me;
-    
-    /** Is log4j available. */
-    private final boolean isAvailable;
-    
-    /** "Log" object if available. */
-    private Object log = null;
-    
-    /**
-     * Get an instance of Logging.
-     *
-     * @return The instance of Logging
-     */
-    public static Logging getLogging() {
-        if (me == null) { me = new Logging(); }
-        return me;
-    }
-    
-    /** Create a new Logging. */
-    @SuppressWarnings("unchecked")
-    private Logging() {
-        boolean classExists = false;
-        try {
-            Class factory = null;
-            // Check for classes
-            Class.forName("org.apache.commons.logging.Log");
-            factory = Class.forName("org.apache.commons.logging.LogFactory");
-        
-            classExists = (factory != null);
-            if (classExists) {
-                final Method getLog = factory.getMethod("getLog", new Class[]{Class.class});
-                log = getLog.invoke(null, this.getClass());
-            }
-        } catch (ClassNotFoundException cnfe) {
-        } catch (NoSuchMethodException nsme) {
-        } catch (IllegalAccessException iae) {
-        } catch (InvocationTargetException ite) {
-        }
-        
-        isAvailable = (classExists && log != null);
-    }
-    
-    /**
-     * Check is a log level is available.
-     *
-     * @param level Level to check
-     */
-    public boolean levelEnabled(final LogLevel level) {
-        if (isAvailable) {
-            try {
-                final Method check = log.getClass().getMethod(level.getCheckMethodName(), new Class[0]);
-                return (Boolean)check.invoke(log, new Object[0]);
-            } catch (NoSuchMethodException nsme) {
-            } catch (IllegalAccessException iae) {
-            } catch (InvocationTargetException ite) {
-            }
-        }
-        
-        return false;
-    }
-    
-    /**
-     * Log a message if log4j is available.
-     *
-     * @param level Level to log at
-     * @param message Message to log
-     */
-    public void log(final LogLevel level, final String message) {
-        log(level, message, null);
-    }
-    
-    /**
-     * Log a message if log4j is available.
-     *
-     * @param level Level to log at
-     * @param message Message to log
-     * @param throwable Throwable to log alongside message
-     */
-    public void log(final LogLevel level, final String message, final Throwable throwable) {
-        if (!isAvailable) { return; }
-        try {
-            if (throwable == null) {
-                final Method method = log.getClass().getMethod(level.getMethodName(), new Class[]{String.class});
-                method.invoke(log, new Object[]{message});
-            } else {
-                final Method method = log.getClass().getMethod(level.getMethodName(), new Class[]{String.class, Throwable.class});
-                method.invoke(log, new Object[]{message, throwable});
-            }
-        } catch (NoSuchMethodException nsme) {
-        } catch (IllegalAccessException iae) {
-        } catch (InvocationTargetException ite) {
-        }
-    }
-}