Add externals, remove manually imported files

.gitmodules

@@ -0,0 +1,9 @@
+[submodule "externals/dmdirc-plugins"]
+	path = externals/dmdirc-plugins
+	url = ssh://renji.org.uk/home/chris/git/dmdirc-plugins/
+[submodule "externals/dmdirc"]
+	path = externals/dmdirc
+	url = ssh://renji.org.uk/home/dmdirc/git/client/
+[submodule "externals/evetool"]
+	path = externals/evetool
+	url = ssh://renji.org.uk/home/chris/git/evetool/

externals/dmdirc

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

externals/dmdirc-plugins

@@ -0,0 +1 @@
+Subproject commit 9ec827c14b0315de5be4bf8282252a688d3fe2d6

externals/evetool

@@ -0,0 +1 @@
+Subproject commit e9b1ad46814fb1885c0f484890dae4b559f6dff4

nbproject/build-impl.xml

@@ -70,6 +70,9 @@ is divided into following sections:
         </condition>
         <condition property="have.sources">
             <or>
+                <available file="${src.src3.dir}"/>
+                <available file="${src.src2.dir}"/>
+                <available file="${src.src.dir}"/>
                 <available file="${src.dir}"/>
             </or>
         </condition>
@@ -124,6 +127,9 @@ 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.src3.dir">Must set src.src3.dir</fail>
+        <fail unless="src.src2.dir">Must set src.src2.dir</fail>
+        <fail unless="src.src.dir">Must set src.src.dir</fail>
         <fail unless="src.dir">Must set src.dir</fail>
         <fail unless="test.src.dir">Must set test.src.dir</fail>
         <fail unless="build.dir">Must set build.dir</fail>
@@ -146,7 +152,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="${src.src3.dir}:${src.src2.dir}:${src.src.dir}:${src.dir}" name="srcdir"/>
             <attribute default="${build.classes.dir}" name="destdir"/>
             <attribute default="${javac.classpath}" name="classpath"/>
             <attribute default="${includes}" name="includes"/>
@@ -165,7 +171,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="${src.src3.dir}:${src.src2.dir}:${src.src.dir}:${src.dir}" name="srcdir"/>
             <attribute default="${build.classes.dir}" name="destdir"/>
             <attribute default="${javac.classpath}" name="classpath"/>
             <sequential>
@@ -337,6 +343,9 @@ 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.src3.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
+            <fileset dir="${src.src2.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
+            <fileset dir="${src.src.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
             <fileset dir="${src.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
         </copy>
     </target>
@@ -352,7 +361,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="${src.src3.dir}:${src.src2.dir}:${src.src.dir}:${src.dir}"/>
     </target>
     <target name="-post-compile-single">
         <!-- Empty placeholder for easier customization. -->
@@ -486,6 +495,15 @@ is divided into following sections:
             <classpath>
                 <path path="${javac.classpath}"/>
             </classpath>
+            <fileset dir="${src.src3.dir}" excludes="${excludes}" includes="${includes}">
+                <filename name="**/*.java"/>
+            </fileset>
+            <fileset dir="${src.src2.dir}" excludes="${excludes}" includes="${includes}">
+                <filename name="**/*.java"/>
+            </fileset>
+            <fileset dir="${src.src.dir}" excludes="${excludes}" includes="${includes}">
+                <filename name="**/*.java"/>
+            </fileset>
             <fileset dir="${src.dir}" excludes="${excludes}" includes="${includes}">
                 <filename name="**/*.java"/>
             </fileset>

nbproject/genfiles.properties

@@ -1,8 +1,8 @@
-build.xml.data.CRC32=1c42d963
+build.xml.data.CRC32=0e8d4183
 build.xml.script.CRC32=d4296ee3
 build.xml.stylesheet.CRC32=958a1d3e
 # This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
 # Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
-nbproject/build-impl.xml.data.CRC32=1c42d963
-nbproject/build-impl.xml.script.CRC32=fc1d50d2
+nbproject/build-impl.xml.data.CRC32=0e8d4183
+nbproject/build-impl.xml.script.CRC32=3c4579ea
 nbproject/build-impl.xml.stylesheet.CRC32=65b8de21

nbproject/project.properties

@@ -1,3 +1,5 @@
+application.title=charliebravo
+application.vendor=chris
 build.classes.dir=${build.dir}/classes
 build.classes.excludes=**/*.java,**/*.form
 # This directory is removed when the project is cleaned:
@@ -17,10 +19,24 @@ debug.test.classpath=\
 dist.dir=dist
 dist.jar=${dist.dir}/charliebravo.jar
 dist.javadoc.dir=${dist.dir}/javadoc
-excludes=
+excludes=com/dmdirc/addons/nowplaying/,com/dmdirc/addons/systray/,com/dmdirc/addons/nickcolours/,com/dmdirc/addons/lagdisplay/,com/dmdirc/addons/mediasource_*/,com/dmdirc/addons/ui_swing/,com/dmdirc/addons/dcc/,com/dmdirc/addons/windowstatus/,com/dmdirc/addons/osd/,com/dmdirc/addons/logging/,com/dmdirc/addons/addonbrowser/,uk/co/md87/evetool/ui/,com/dmdirc/ui/FatalErrorDialog.java,uk/co/md87/evetool/Main.java
+file.reference.jaxen-core.jar=externals/evetool/lib/jaxen-core.jar
+file.reference.jaxen-jdom.jar=externals/evetool/lib/jaxen-jdom.jar
+file.reference.jdom.jar=externals/evetool/lib/jdom.jar
+file.reference.saxpath.jar=externals/evetool/lib/saxpath.jar
+file.reference.xalan.jar=externals/evetool/lib/xalan.jar
+file.reference.xerces.jar=externals/evetool/lib/xerces.jar
+file.reference.xml-apis.jar=externals/evetool/lib/xml-apis.jar
 includes=**
 jar.compress=false
-javac.classpath=
+javac.classpath=\
+    ${file.reference.jaxen-core.jar}:\
+    ${file.reference.jaxen-jdom.jar}:\
+    ${file.reference.jdom.jar}:\
+    ${file.reference.saxpath.jar}:\
+    ${file.reference.xalan.jar}:\
+    ${file.reference.xerces.jar}:\
+    ${file.reference.xml-apis.jar}
 # Space-separated list of extra javac options
 javac.compilerargs=
 javac.deprecation=false
@@ -58,4 +74,7 @@ run.test.classpath=\
     ${build.test.classes.dir}
 source.encoding=UTF-8
 src.dir=src
+src.src.dir=externals/dmdirc/src
+src.src2.dir=externals/evetool/src
+src.src3.dir=externals/dmdirc-plugins/calc/src
 test.src.dir=test

nbproject/project.xml

@@ -6,6 +6,9 @@
             <name>charliebravo</name>
             <minimum-ant-version>1.6.5</minimum-ant-version>
             <source-roots>
+                <root id="src.src3.dir"/>
+                <root id="src.src2.dir"/>
+                <root id="src.src.dir"/>
                 <root id="src.dir"/>
             </source-roots>
             <test-roots>

src/com/dmdirc/addons/calc/Evaluator.java

@@ -1,24 +0,0 @@
-/*
- * To change this template, choose Tools | Templates
- * and open the template in the editor.
- */
-
-package com.dmdirc.addons.calc;
-
-/**
- *
- * @author chris
- */
-public class Evaluator {
-
-    private final TreeToken node;
-
-    public Evaluator(TreeToken node) {
-        this.node = node;
-    }
-
-    public Number evaluate() {
-        return node.evaluate();
-    }
-
-}

src/com/dmdirc/addons/calc/Lexer.java

@@ -1,62 +0,0 @@
-/*
- * To change this template, choose Tools | Templates
- * and open the template in the editor.
- */
-
-package com.dmdirc.addons.calc;
-
-import java.text.ParseException;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-/**
- *
- * @author chris
- */
-public class Lexer {
-
-    final String input;
-
-    public Lexer(String input) {
-        this.input = input.replaceAll("\\s+", "");
-    }
-
-    public List<Token> tokenise() throws ParseException {
-        final List<Token> res = new ArrayList<Token>();
-        List<TokenType> possibles = Arrays.asList(TokenType.values());
-
-        boolean cont = true;
-        int i = 0;
-
-        do {
-            boolean found = false;
-
-            for (TokenType type : possibles) {
-                final int match = type.match(input, i);
-
-                if (match > -1) {
-                    res.add(new Token(type, input.substring(i, match)));
-
-                    possibles = type.getFollowers();
-                    i = match;
-                    found = true;
-                    cont = type != TokenType.END;
-
-                    break;
-                }
-            }
-
-            if (!found) {
-                throw new ParseException("No legal token found at offset "
-                        + i + ". Expecting one of: "
-                        + Arrays.toString(possibles.toArray()), i);
-            }
-        } while (cont);
-
-        return res;
-    }
-
-}

src/com/dmdirc/addons/calc/Parser.java

@@ -1,153 +0,0 @@
-/*
- * To change this template, choose Tools | Templates
- * and open the template in the editor.
- */
-
-package com.dmdirc.addons.calc;
-
-import java.text.ParseException;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.List;
-
-/**
- *
- * @author chris
- */
-public class Parser {
-
-    protected final Lexer lexer;
-    protected static final List<TokenType> TOKENS_BY_PRECEDENCE;
-
-    static {
-        TOKENS_BY_PRECEDENCE = new ArrayList<TokenType>(Arrays.asList(TokenType.values()));
-        Collections.sort(TOKENS_BY_PRECEDENCE, new TokenTypePrecedenceComparator());
-    }
-
-    public Parser(Lexer lexer) {
-        this.lexer = lexer;
-    }
-
-    public TreeToken parse() throws ParseException {
-        final List<TreeToken> tokens = new ArrayList<TreeToken>();
-
-        for (Token token : lexer.tokenise()) {
-            tokens.add(new TreeToken(token));
-        }
-
-        return parse(tokens);
-    }
-
-    protected TreeToken parse(final List<TreeToken> tokens) throws ParseException {
-        System.out.println("Parse: " + Arrays.toString(tokens.toArray()));
-
-        while (tokens.size() > 1) {
-            System.out.println(" --> " + Arrays.toString(tokens.toArray()));
-            for (TokenType type : TOKENS_BY_PRECEDENCE) {
-                final int offset = findTokenType(tokens, type);
-
-                if (offset > -1) {
-                    System.out.println(" --> Found token " + type);
-                    switch (type.getArity()) {
-                        case HIDDEN:
-                            parseHiddenOperator(tokens, offset);
-                            break;
-                        case BINARY:
-                            parseBinaryOperator(tokens, offset);
-                            break;
-                        case UNARY:
-                            parseUnaryOperator(tokens, offset);
-                            break;
-                        case NULLARY:
-                            parseNullaryOperator(tokens, offset);
-                            break;
-                    }
-
-                    break;
-                }
-            }
-        }
-
-        return tokens.get(0);
-    }
-
-    protected void parseNullaryOperator(final List<TreeToken> tokens, final int offset)
-            throws ParseException {
-        if (tokens.get(offset).getToken().getType() == TokenType.BRACKET_CLOSE
-                || tokens.get(offset).getToken().getType() == TokenType.BRACKET_OPEN) {
-            parseBracket(tokens, offset);
-        } else {
-            parseNumber(tokens, offset);
-        }
-    }
-
-    protected void parseBracket(final List<TreeToken> tokens, final int offset)
-            throws ParseException {
-        final List<TreeToken> stack = new ArrayList<TreeToken>();
-
-        System.out.println("ParseBracket: " + offset + " " + Arrays.toString(tokens.toArray()));
-
-        for (int i = offset - 1; i > 0; i--) {
-            if (tokens.get(i).getToken().getType() == TokenType.BRACKET_OPEN
-                    && !tokens.get(i).isProcessed()) {
-                System.out.println("Found opening bracket at index " + i);
-                tokens.add(i, parse(stack));
-                tokens.get(i).setProcessed();
-                tokens.remove(i + 1);
-                tokens.remove(i + 1);
-                return;
-            } else {
-                System.out.println("Skipping " + tokens.get(i));
-                stack.add(0, tokens.get(i));
-                tokens.remove(i);
-            }
-        }
-
-        throw new ParseException("Couldn't find matching opening bracket", offset);
-    }
-
-    protected void parseBinaryOperator(final List<TreeToken> tokens, final int offset) {
-        tokens.get(offset).addChild(tokens.get(offset - 1));
-        tokens.get(offset).addChild(tokens.get(offset + 1));
-        tokens.get(offset).setProcessed();
-
-        tokens.remove(offset + 1);
-        tokens.remove(offset - 1);
-    }
-
-    protected void parseUnaryOperator(final List<TreeToken> tokens, final int offset) {
-        tokens.get(offset).addChild(tokens.get(offset + 1));
-        tokens.get(offset).setProcessed();
-        tokens.remove(offset + 1);
-    }
-
-    protected void parseHiddenOperator(final List<TreeToken> tokens, final int offset) {
-        tokens.remove(offset);
-    }
-
-    protected void parseNumber(final List<TreeToken> tokens, final int offset) {
-        tokens.get(offset).setProcessed();
-    }
-
-    protected static int findTokenType(final List<TreeToken> tokens, final TokenType type) {
-        for (int i = 0; i < tokens.size(); i++) {
-            if (tokens.get(i).getToken().getType() == type && !tokens.get(i).isProcessed()) {
-                return i;
-            }
-        }
-
-        return -1;
-    }
-
-    protected static class TokenTypePrecedenceComparator implements Comparator<TokenType> {
-
-        @Override
-        public int compare(TokenType o1, TokenType o2) {
-            return o2.getPrecedence() - o1.getPrecedence();
-        }
-
-    }
-
-}

src/com/dmdirc/addons/calc/Token.java

@@ -1,35 +0,0 @@
-/*
- * To change this template, choose Tools | Templates
- * and open the template in the editor.
- */
-
-package com.dmdirc.addons.calc;
-
-/**
- *
- * @author chris
- */
-public class Token {
-
-    private final TokenType type;
-    private String content;
-
-    public Token(TokenType type, String content) {
-        this.type = type;
-        this.content = content;
-    }
-
-    public String getContent() {
-        return content;
-    }
-
-    public TokenType getType() {
-        return type;
-    }
-
-    @Override
-    public String toString() {
-        return "[type: " + type + "; content: " + content + "]";
-    }
-
-}

src/com/dmdirc/addons/calc/TokenType.java

@@ -1,148 +0,0 @@
-
-package com.dmdirc.addons.calc;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-public enum TokenType {
-
-    START(TokenTypeArity.HIDDEN, "^", 0, "NUMBER_*", "BRACKET_OPEN", "MOD_*"),
-    END(TokenTypeArity.HIDDEN, "$", 0),
-    
-    BRACKET_OPEN(TokenTypeArity.NULLARY, "\\(", 0, "NUMBER_*", "MOD_*", "BRACKET_OPEN"),
-    BRACKET_CLOSE(TokenTypeArity.NULLARY, "\\)", 50, "OP_*", "BRACKET_*", "END"),
-
-    NUMBER_FLOAT(TokenTypeArity.NULLARY, "[0-9]+\\.[0-9]+", 1, "OP_*", "BRACKET_*", "END") {
-        public Number evaluate(final TreeToken token) {
-            return Float.valueOf(token.getToken().getContent());
-        }
-    },
-
-    NUMBER_INT(TokenTypeArity.NULLARY, "[0-9]+", 1, "OP_*", "BRACKET_*", "END") {
-        public Number evaluate(final TreeToken token) {
-            return Float.valueOf(token.getToken().getContent());
-        }
-    },
-
-    MOD_POSITIVE(TokenTypeArity.UNARY, "\\+", 100, "NUMBER_*") {
-        public Number evaluate(final TreeToken token) {
-            return token.getChildren().get(0).evaluate();
-        }
-    },
-
-    MOD_NEGATIVE(TokenTypeArity.UNARY, "-", 100, "NUMBER_*") {
-        public Number evaluate(final TreeToken token) {
-            return -1 * token.getChildren().get(0).evaluate().floatValue();
-        }
-    },
-
-    OP_PLUS(TokenTypeArity.BINARY, "\\+", 7, "NUMBER_*", "BRACKET_OPEN") {
-        public Number evaluate(final TreeToken token) {
-            return token.getChildren().get(0).evaluate().floatValue()
-                    + token.getChildren().get(1).evaluate().floatValue();
-        }
-    },
-
-    OP_MINUS(TokenTypeArity.BINARY, "-", 6, "NUMBER_*", "BRACKET_OPEN") {
-        public Number evaluate(final TreeToken token) {
-            return token.getChildren().get(0).evaluate().floatValue()
-                    - token.getChildren().get(1).evaluate().floatValue();
-        }
-    },
-
-    OP_MULT(TokenTypeArity.BINARY, "(?=\\()|\\*", 9, "NUMBER_*", "BRACKET_OPEN") {
-        public Number evaluate(final TreeToken token) {
-            return token.getChildren().get(0).evaluate().floatValue()
-                    * token.getChildren().get(1).evaluate().floatValue();
-        }
-    },
-
-    OP_DIVIDE(TokenTypeArity.BINARY, "/", 10, "NUMBER_*", "BRACKET_OPEN") {
-        public Number evaluate(final TreeToken token) {
-            return token.getChildren().get(0).evaluate().floatValue()
-                    / token.getChildren().get(1).evaluate().floatValue();
-        }
-    },
-
-    OP_MOD(TokenTypeArity.BINARY, "%", 8, "NUMBER_*", "BRACKET_OPEN") {
-        public Number evaluate(final TreeToken token) {
-            return token.getChildren().get(0).evaluate().floatValue()
-                    % token.getChildren().get(1).evaluate().floatValue();
-        }
-    },
-
-    OP_POWER(TokenTypeArity.BINARY, "\\^", 11, "NUMBER_*", "BRACKET_OPEN") {
-        public Number evaluate(final TreeToken token) {
-            return new Float(Math.pow(token.getChildren().get(0).evaluate().doubleValue(),
-                    token.getChildren().get(1).evaluate().doubleValue()));
-        }
-    },
-    ;
-
-    private final String[] strfollows;
-    private final int precedence;
-    private List<TokenType> follows;
-    private final Pattern regex;
-    private final TokenTypeArity arity;
-
-    TokenType(final TokenTypeArity arity, final String regex,
-            final int precedence, final String ... follows) {
-        this.arity = arity;
-        this.strfollows = follows;
-        this.precedence = precedence;
-        this.regex = Pattern.compile(regex);
-    }
-
-    public synchronized  List<TokenType> getFollowers() {
-        if (follows == null) {
-            follows = new ArrayList<TokenType>();
-
-            for (int i = 0; i < strfollows.length; i++) {
-                follows.addAll(searchValueOf(strfollows[i]));
-            }
-        }
-
-        return follows;
-    }
-
-    public TokenTypeArity getArity() {
-        return arity;
-    }
-
-    public int getPrecedence() {
-        return precedence;
-    }
-
-    public int match(final String input, final int offset) {
-        final Matcher matcher = regex.matcher(input);
-        matcher.useAnchoringBounds(false);
-        matcher.useTransparentBounds(true);
-
-        return matcher.find(offset) && matcher.start() == offset ? matcher.end() : -1;
-    }
-
-    public Number evaluate(final TreeToken token) {
-        throw new AbstractMethodError("Can't evaluate this token type");
-    }
-
-    /**
-     *
-     * @param name
-     * @return
-     */
-    protected static List<TokenType> searchValueOf(final String name) {
-        final List<TokenType> res = new ArrayList<TokenType>();
-
-        for (TokenType token : values()) {
-            if ((name.endsWith("*")
-                    && token.name().startsWith(name.substring(0, name.length() - 1)))
-                    || name.equals(token.name())) {
-                res.add(token);
-            }
-        }
-
-        return res;
-    }
-}

src/com/dmdirc/addons/calc/TokenTypeArity.java

@@ -1,19 +0,0 @@
-/*
- * To change this template, choose Tools | Templates
- * and open the template in the editor.
- */
-
-package com.dmdirc.addons.calc;
-
-/**
- *
- * @author chris
- */
-public enum TokenTypeArity {
-
-    HIDDEN,
-    NULLARY,
-    UNARY,
-    BINARY;
-
-}

src/com/dmdirc/addons/calc/TreeToken.java

@@ -1,57 +0,0 @@
-/*
- * To change this template, choose Tools | Templates
- * and open the template in the editor.
- */
-
-package com.dmdirc.addons.calc;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- *
- * @author chris
- */
-public class TreeToken {
-
-    private final List<TreeToken> children = new ArrayList<TreeToken>();
-
-    private final Token token;
-
-    private boolean processed = false;
-
-    public TreeToken(Token token) {
-        this.token = token;
-    }
-
-    public List<TreeToken> getChildren() {
-        return children;
-    }
-
-    public Token getToken() {
-        return token;
-    }
-
-    public void addChild(final TreeToken token) {
-        children.add(token);
-    }
-
-    public boolean isProcessed() {
-        return processed;
-    }
-
-    public void setProcessed() {
-        processed = true;
-    }
-
-    public Number evaluate() {
-        return token.getType().evaluate(this);
-    }
-
-    @Override
-    public String toString() {
-        return "[token: " + token + "; children: " + children + "; processed: "
-                + processed + "]";
-    }
-
-}

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

@@ -1,209 +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.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 ChannelClientInfo {
-	/** Reference to ClientInfo object this represents. */
-	private final ClientInfo 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 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 ChannelClientInfo(final IRCParser tParser, final ClientInfo 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 newMap) {
-		myMap = newMap;
-	}
-	
-	/**
-	 * Get the Map object attatched to this object.
-	 *
-	 * @return Map to attatched to this.
-	 * @see #setMap
-	 */
-	public Map getMap() {
-		return myMap;
-	}
-	
-	/**
-	 * Get the client object represented by this channelclient.
-	 *
-	 * @return Client object represented by this channelclient
-	 */
-	public ClientInfo getClient() { return cClient; }
-	/**
-	 * Get the Channel object that owns this ChannelClient.
-	 *
-	 * @return Channel object that owns this ChannelClient
-	 */
-	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.nNextKeyPrefix; i > 0; i = i / 2) {
-			if ((nCurrentModes & i) == i) {
-				for (char cTemp : myParser.hPrefixModes.keySet()) {
-					nTemp = myParser.hPrefixModes.get(cTemp);
-					if (nTemp == i) {
-						if (bPrefix) { cTemp = myParser.hPrefixMap.get(cTemp); }
-						sModes = sModes.append(cTemp);
-						break;
-					}
-				}
-			}
-		}
-		
-		return sModes.toString();
-	}
-
-	/**
-	 * 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.nNextKeyPrefix; i > 0; i = i / 2) {
-			if ((nModes & i) == i) { return i; }
-		}
-		return 0;
-	}
-	
-	/**
-	 * Get the most important mode this client has (o, v etc), or an empty
-     * string if the client has no modes.
-	 *
-	 * @return String representing the most important mode.
-	 */
-	public String getImportantMode() {
-		String sModes = this.getChanModeStr(false);
-		if (!sModes.isEmpty()) { sModes = "" + sModes.charAt(0); }
-		return sModes;
-	}
-	
-	/**
-	 * Get the most important prefix this client has (@, + etc), or an empty
-     * string if the client has no modes.
-	 *
-	 * @return String representing the most important mode.
-	 */
-	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();
-	}	
-	
-	/**
-	 * Attempt to kick this user from the channel.
-	 *
-	 * @param sReason Why are they being kicked? "" for no reason
-	 */
-	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(); }	
-
-}
-

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

@@ -1,778 +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.util.ArrayList;
-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 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, ChannelClientInfo> hChannelUserList = new Hashtable<String, ChannelClientInfo>();
-	/** 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 ChannelInfo(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 ChannelClientInfo me = getUser(myParser.getMyself());
-		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");
-		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.hPrefixModes.get('v') != null) { voiceValue = myParser.hPrefixModes.get('v');}
-		final boolean isOpped = me.getImportantModeValue() > voiceValue;
-		
-		int modecount = 1;
-		if (!isUnreal) {
-			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.hChanModesOther.keySet()) {
-			final int nTemp = myParser.hChanModesOther.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);
-					i = 0;
-					listmodes = "";
-				}
-			}
-		}
-		if (i > 0) {
-			if (supportLISTMODE) {
-				myParser.sendString("LISTMODE "+getName()+" "+listmodes);
-			} else {
-				myParser.sendString("MODE "+getName()+" "+listmodes);
-			}
-		}
-	}
-	
-	/**
-	 * 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; }
-	
-	/**
-	 * Get the name of this channel object.
-	 *
-	 * @return Channel name.
-	 */	
-	public String getName() { return sName; }
-	/**
-	 * Get the number of users known on this channel.
-	 *
-	 * @return Channel user count.
-	 */
-	public int getUserCount() { return hChannelUserList.size(); }
-	
-	/**
-	 * Get the channel users.
-	 *
-	 * @return ArrayList of ChannelClients
-	 */
-	public List<ChannelClientInfo> getChannelClients() {
-		return new ArrayList<ChannelClientInfo>(hChannelUserList.values());
-	}
-	
-	/**
-	 * Empty the channel (Remove all known channelclients).
-	 */
-	protected void emptyChannel() {
-		ClientInfo cTemp = null;
-		for (ChannelClientInfo client : hChannelUserList.values()) {
-			cTemp = client.getClient();
-			cTemp.delChannelClientInfo(client);
-			if (cTemp != myParser.getMyself() && !cTemp.checkVisibility()) {
-				myParser.removeClient(cTemp);
-			}
-		}
-		hChannelUserList.clear();
-	}
-
-	/**
-	 * Get the ChannelClientInfo object associated with a nickname.
-	 *
-	 * @param sWho Nickname to return channelclient for
-	 * @return ChannelClientInfo object requested, or null if not found
-	 */
-	public ChannelClientInfo getUser(final String sWho) {
-		return getUser(sWho, false);
-	}
-	
-	/**
-	 * Get the ChannelClientInfo object associated with a nickname.
-	 *
-	 * @param sWho Nickname to return channelclient for
-	 * @param createFake Create a fake client if not found
-	 * @return ChannelClientInfo object requested
-	 * @since 0.6
-	 */
-	public ChannelClientInfo getUser(final String sWho, final boolean createFake) {
-		final String who = myParser.getIRCStringConverter().toLowerCase(ClientInfo.parseHost(sWho));
-		if (hChannelUserList.containsKey(who)) {
-			return hChannelUserList.get(who);
-		}
-		if (createFake) {
-			return new ChannelClientInfo(myParser, (new ClientInfo(myParser, sWho)).setFake(true), this);
-		} else {
-			return null;
-		}
-	}
-	
-	/**
-	 * Get the ChannelClientInfo object associated with a ClientInfo object.
-	 *
-	 * @param cWho ClientInfo to return ChannelClient for
-	 * @return ChannelClientInfo object requested, or null if not found
-	 */	
-	public ChannelClientInfo getUser(final ClientInfo cWho) {
-		for (ChannelClientInfo 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 ChannelClientInfo addClient(final ClientInfo cClient) {
-		ChannelClientInfo cTemp = getUser(cClient);
-		if (cTemp == null) { 
-			cTemp = new ChannelClientInfo(myParser, cClient, this);
-			hChannelUserList.put(myParser.getIRCStringConverter().toLowerCase(cTemp.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 ClientInfo cClient) {
-		ChannelClientInfo cTemp = null;
-		cTemp = getUser(cClient);
-		if (cTemp != null) {
-			final ClientInfo clTemp = cTemp.getClient();
-			clTemp.delChannelClientInfo(cTemp);
-			if (clTemp != myParser.getMyself() && !clTemp.checkVisibility()) {
-				myParser.removeClient(clTemp);
-			}
-			hChannelUserList.remove(myParser.getIRCStringConverter().toLowerCase(cTemp.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 ChannelClientInfo cChannelClient) {
-		ChannelClientInfo cTemp = null;
-		if (hChannelUserList.containsKey(oldNickname)) {
-			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.getIRCStringConverter().toLowerCase(cTemp.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; }
-	/**
-	 * Get the topic time.
-	 *
-	 * @return Unixtimestamp time for the topic (Seconds since epoch, not milliseconds)
-	 */
-	public long getTopicTime() { return nTopicTime; }	
-	
-	/**
-	 * Set the topic.
-	 *
-	 * @param sNewTopic New contents of topic
-	 */	
-	protected void setTopic(final String sNewTopic) { sTopic = sNewTopic; }
-	/**
-	 * Get the topic.
-	 *
-	 * @return contents of topic
-	 */	
-	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; }
-	/**
-	 * Get the topic creator.
-	 *
-	 * @return user who set the topic (nickname if gotten on connect, full host if seen by parser)
-	 */	
-	public String getTopicUser() { 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; }	
-	
-	/**
-	 * Get the channel modes (as a string representation).
-	 *
-	 * @return string representing modes. (boolean and non-list)
-	 */	
-	public String getModeStr() {
-		final StringBuilder sModes = new StringBuilder("+");
-		final StringBuilder sModeParams = new StringBuilder();
-		String sTemp = "";
-		long nTemp = 0;
-		final long nChanModes = this.getMode();
-		for (char cTemp : myParser.hChanModesBool.keySet()) {
-			nTemp = myParser.hChanModesBool.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.getModeParam(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);
-		}
-	}
-	/**
-	 * Get the value of a mode that requires a parameter.
-	 *
-	 * @param cMode Character representing mode
-	 * @return string representing the value of the mode ("" if mode not set)
-	 */	
-	public String getModeParam(final Character 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.hChanModesOther.containsKey(cMode) || myParser.hChanModesOther.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.getIRCStringConverter().equalsIgnoreCase(lModes.get(i).getItem(), newItem.getItem())) { 
-				if (bAdd) { return; }
-				else { 
-					lModes.remove(i);
-					break;
-				}
-			}
-		}
-		if (bAdd) { lModes.add(newItem); }
-	}
-	
-	/**
-	 * Get the list object representing a channel mode.
-	 *
-	 * @param cMode Character representing mode
-	 * @return ArrayList containing ChannelListModeItem in the list, or null if mode is invalid
-	 */
-	public List<ChannelListModeItem> getListModeParam(final Character cMode) {
-		if (!myParser.hChanModesOther.containsKey(cMode) || myParser.hChanModesOther.get(cMode) != myParser.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();
-		}
-	}
-	
-	/**
-	 * Adjust the channel modes on a channel.
-	 * This function will queue modes up to be sent in one go, according to 005 params.
-	 * If less modes are altered than the queue accepts, sendModes() must be called.<br><br>
-	 * sendModes is automatically called if you attempt to add more modes than is allowed
-	 * to be queued
-	 *
-	 * @param positive Is this a positive mode change, or a negative mode change
-	 * @param mode Character representing the mode to change
-	 * @param parameter Parameter needed to make change (not used if mode doesn't need a parameter)
-	 */
-	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.hChanModesBool.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.hPrefixModes.containsKey(mode)) {
-				modestr = modestr + " " + parameter;
-			} else {
-				modeint = myParser.hChanModesOther.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 = getModeParam(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) { sendModes(); }
-						}
-					}
-					modestr = modestr + " " + parameter;
-				}
-			}
-		}
-		myParser.callDebugInfo(IRCParser.DEBUG_INFO, "Queueing mode: %s", modestr);
-		lModeQueue.add(modestr);
-		if (lModeQueue.size() == modecount) { sendModes(); }
-	}
-	
-	/**
-	 * This function will send modes that are currently queued up to send.
-	 * This assumes that the queue only contains the amount that are alowed to be sent
-	 * and thus will try to send the entire queue in one go.<br><br>
-	 * Modes are always sent negative then positive and not mixed.
-	 */
-	public void sendModes() { 
-		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.sendLine("MODE " + sName + " " + sendModeStr.toString());
-		clearModeQueue();
-	}
-	
-	/**
-	 * This function will clear the mode queue (WITHOUT Sending).
-	 */
-	public void clearModeQueue() { 
-		lModeQueue.clear();
-	}
-	
-	/**
-	 * Send a private message to the channel.
-	 *
-	 * @param sMessage Message to send
-	 */
-	public void sendMessage(final String sMessage) { 
-		if (sMessage.isEmpty()) { return; }
-		
-		myParser.sendString("PRIVMSG " + sName + " :" + sMessage);	
-	}
-	
-	/**
-	 * 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);	
-	}
-
-	/**
-	 * Send a private message to a target.
-	 *
-	 * @param sMessage Message to send
-	 */
-	public void sendAction(final String sMessage) { 
-		if (sMessage.isEmpty()) { return; }
-		sendCTCP("ACTION", sMessage);
-	}
-	
-	/**
-	 * 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; }
-	
-	/**
-	 * Get the parser object that owns this channel.
-	 *
-	 * @return The parser object that owns this channel
-	 */
-	public IRCParser getParser() { return myParser; }
-
-}
-

src/com/dmdirc/parser/irc/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.irc;
-
-/**
- * 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/irc/ClientInfo.java

@@ -1,427 +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.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 final class ClientInfo {
-	/** 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 myMap;
-	/** List of ChannelClientInfos that point to this */
-	private final Map<String, ChannelClientInfo> myChannelClientInfos = new Hashtable<String, ChannelClientInfo>();
-	/** 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 ClientInfo(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 newMap) {
-		myMap = newMap;
-	}
-	
-	/**
-	 * Get the Map object attatched to this object.
-	 *
-	 * @return Map to attatched to this.
-	 */
-	public Map 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 ClientInfo 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; }
-	
-	/**
-	 * Get the nickname for this user.
-	 *
-	 * @return Known nickname for user.
-	 */
-	public String getNickname() { return sNickname; }
-	
-	/**
-	 * Get the ident for this user.
-	 *
-	 * @return Known ident for user. (May be "")
-	 */		
-	public String getIdent() { return sIdent; }
-	
-	/**
-	 * Get the hostname for this user.
-	 *
-	 * @return Known host for user. (May be "")
-	 */		
-	public String getHost() { 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; }
-	
-	/**
-	 * Get the RealName for this user.
-	 *
-	 * @return Known RealName for user.
-	 */
-	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; }	
-	
-	/**
-	 * Get the user modes (as a string representation).
-	 *
-	 * @return string representing modes. (boolean and non-list)
-	 */	
-	public String getUserModeStr() { 
-		final StringBuilder sModes = new StringBuilder("+");
-		long nTemp = 0;
-		final long nChanModes = this.getUserMode();
-		
-		for (char cTemp : myParser.hUserModes.keySet()) {
-			nTemp = myParser.hUserModes.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 = getUserModeStr();
-		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 ChannelClientInfo cci) {
-		final String key = myParser.getIRCStringConverter().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 ChannelClientInfo cci) {
-		final String key = myParser.getIRCStringConverter().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();
-	}
-	
-	/**
-	 * Check how many channels this client is known on.
-	 *
-	 * @return int with the count of known channels
-	 */	
-	public int channelCount() {
-		return myChannelClientInfos.size();
-	}
-	
-	/**
-	 * Get a list of channelClients that point to this object.
-	 *
-	 * @return int with the count of known channels
-	 */	
-	public List<ChannelClientInfo> getChannelClients() {
-		final List<ChannelClientInfo> result = new ArrayList<ChannelClientInfo>();
-		for (ChannelClientInfo cci : myChannelClientInfos.values()) {
-			result.add(cci);
-		}
-		return result;
-	}
-	
-	/**
-	 * Adjust the channel modes on a channel.
-	 * This function will queue modes up to be sent in one go, according to 005 params.
-	 * If less modes are altered than the queue accepts, sendModes() must be called.<br><br>
-	 * sendModes is automatically called if you attempt to add more modes than is allowed
-	 * to be queued
-	 *
-	 * @param positive Is this a positive mode change, or a negative mode change
-	 * @param mode Character representing the mode to change
-	 */
-	public void alterMode(final boolean positive, 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 = ((positive) ? "+" : "-") + mode;
-		if (!myParser.hUserModes.containsKey(mode)) { return; }
-		final String teststr = ((positive) ? "-" : "+") + mode;
-		if (lModeQueue.contains(teststr)) {
-			lModeQueue.remove(teststr);
-			return;
-		} else if (lModeQueue.contains(modestr)) {
-			return;
-		}
-		myParser.callDebugInfo(myParser.DEBUG_INFO, "Queueing user mode: %s", modestr);
-		lModeQueue.add(modestr);
-		if (lModeQueue.size() == modecount) { sendModes(); }
-	}
-	
-	/**
-	 * This function will send modes that are currently queued up to send.
-	 * This assumes that the queue only contains the amount that are alowed to be sent
-	 * and thus will try to send the entire queue in one go.<br><br>
-	 * Modes are always sent negative then positive and not mixed.
-	 */
-	public void sendModes() {
-		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.sendLine("MODE " + sNickname + " " + sendModeStr.toString());
-		clearModeQueue();
-	}
-	
-	/**
-	 * This function will clear the mode queue (WITHOUT Sending).
-	 */
-	public void clearModeQueue() { 
-		lModeQueue.clear();
-	}
-	
-	/**
-	 * Get the parser object that owns this client.
-	 *
-	 * @return The parser object that owns this client
-	 */
-	public IRCParser getParser() { return myParser; }
-
-}

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

@@ -1,128 +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
-	 */
-	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/IRCProcessor.java

@@ -1,179 +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.irc.callbacks.CallbackManager;
-
-/**
- * IRCProcessor.
- * Superclass for all IRCProcessor types.
- *
- * @author Shane Mc Cormack
- */
-public 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 ClientInfo getClientInfo(final String sWho) {
-		return myParser.getClientInfo(sWho);
-	}
-	
-	/**
-	 * Get the ChannelInfo object for a channel.
-	 *
-	 * @param sWhat This is the name of the channel.
-	 * @return ChannelInfo Object for the channel, or null
-	 */
-	protected final ChannelInfo getChannelInfo(final String sWhat) {
-		return myParser.getChannelInfo(sWhat);
-	}
-	
-	/**
-	 * 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);
-	}
-	
-	/**
-	 * 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
-	 */
-	public final String toString() { return this.getName(); }
-	
-}

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

@@ -1,142 +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;
-
-/**
- * IRC String Converter.
- *
- * @author Shane Mc Cormack
- */
-public class IRCStringConverter {
-	/** 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; }
-	
-	/**
-	 * Get the lowercase version of a String for this Server.
-	 *
-	 * @param input String to convert lowercase
-	 * @return input String converterd to lowercase
-	 */
-	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);
-	}
-
-	/**
-	 * Get the uppercase version of a String for this Server.
-	 *
-	 * @param input String to convert uppercase
-	 * @return input String converterd to uppercase
-	 */
-	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);
-	}
-
-	/**
-	 * Check if 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
-	 */
-	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,163 +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 */
-	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) {
-		}
-	}
-}

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

@@ -1,158 +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;
-
-/**
- * Contains User information.
- * 
- * @author Shane Mc Cormack
- * @author Chris Smith
- * @see IRCParser
- */
-public final 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/irc/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.irc;
-
-/**
- * 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/irc/PingTimer.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 java.util.TimerTask;
-import java.util.Timer;
-
-/**
- * Used by the parser to ping the server at a set interval to check that the
- * server is still alive.
- *
- * @author Shane Mc Cormack
- */
-public class PingTimer extends TimerTask {
-	/** Owning Parser. */
-	final IRCParser myOwner;
-	/** The Timer that owns this task */
-	final Timer myTimer;
-	
-	/**
-	 * Create the PingTimer.
-	 *
-	 * @param control IRCParser that owns this TimerTask.
-	 * @param timer Timer that owns this TimerTask.
-	 */
-	public PingTimer(final IRCParser control, final Timer timer) {
-		myOwner = control;
-		myTimer = timer;
-	}
-	
-	/** Timer has been executed. */
-	public void run() {
-		myOwner.pingTimerTask(myTimer);
-	}
-}

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

@@ -1,108 +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;
-
-/**
- * Process a 001 message.
- */
-public class Process001 extends IRCProcessor {
-	/**
-	 * Process a 001 message.
-	 *
-	 * @param sParam Type of line to process ("001")
-	 * @param token IRCTokenised line to process
-	 */
-	@Override
-	public void process(final String sParam, final String[] token) {
-		myParser.got001 = true;
-		// << :demon1.uk.quakenet.org 001 Java-Test :Welcome to the QuakeNet IRC Network, Java-Test
-		myParser.sServerName = token[0].substring(1,token[0].length());
-		final String sNick = token[2];
-		
-		/* Code below is here incase relying on token[2] breaks somewhere
-		String[] temp = token[token.length-1].split(" ");
-		sConfirmedNickname = temp[temp.length-1];
-		// Some servers give a full host in 001
-		temp = sNick.split("!",2);
-		sNick = temp[0];  /* */
-		
-		// Get old nickname incase we need it later
-		final String oldnick = myParser.getMyself().getNickname();
-		
-		// myself will be fake if we havn't recieved a 001 yet
-		if (myParser.getMyself().isFake()) {
-			// Update stored information
-			myParser.getMyself().setUserBits(sNick, true, true);
-			myParser.getMyself().setFake(false);
-			myParser.addClient(myParser.getMyself());
-		} else {
-			// Another 001? if nicknames change then we need to update the hashtable
-			if (!myParser.getMyself().getNickname().equalsIgnoreCase(sNick)) {
-				// Nick changed, remove old me
-				myParser.forceRemoveClient(myParser.getMyself());
-				/// Update stored information
-				myParser.getMyself().setUserBits(sNick, true, true);
-				// Check that we don't already know someone by this name
-				if (myParser.getClientInfo(myParser.getMyself().getNickname()) == null) {
-					// And add to list
-					myParser.addClient(myParser.getMyself());
-				} else {
-					// Someone else already know? this is bad!
-					myParser.callErrorInfo(new ParserError(ParserError.ERROR_FATAL, "001 overwrites existing client?", myParser.getLastLine()));
-				}
-			}
-		}
-		
-		callServerReady();
-		myParser.startPingTimer();
-	}
-	
-	/**
-	 * Callback to all objects implementing the ServerReady Callback.
-	 *
-	 * @see IServerReady
-	 * @return true if a method was called, false otherwise
-	 */	
-	protected boolean callServerReady() {
-		return getCallbackManager().getCallbackType("OnServerReady").call();
-	}
-	
-	/**
-	 * What does this IRCProcessor handle.
-	 *
-	 * @return String[] with the names of the tokens we handle.
-	 */
-	@Override
-	public String[] handles() {
-		return new String[]{"001"};
-	} 
-	
-	/**
-	 * 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 Process001 (IRCParser parser, ProcessingManager manager) { super(parser, manager); }
-
-}

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

@@ -1,141 +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;
-
-/**
- * Process ISUPPORT lines.
- */
-public class Process004005 extends IRCProcessor {
-	/**
-	 * Process ISUPPORT lines.
-	 *
-	 * @param sParam Type of line to process ("005", "004")
-	 * @param token IRCTokenised line to process
-	 */
-	@Override
-	public void process(final String sParam, final String[] token) {
-		if (sParam.equals("003")) {
-			myParser.h005Info.put("003IRCD",token[token.length-1]);
-		} else if (sParam.equals("004")) {
-			// 004
-			if (token.length > 4) {
-				myParser.h005Info.put("004IRCD",token[4]);
-				myParser.h005Info.put("USERMODES",token[5]);
-				myParser.h005Info.put("USERCHANMODES",token[6]);
-			} else {
-				final String[] bits = token[3].split(" ");
-				myParser.h005Info.put("004IRCD",bits[1]);
-				myParser.h005Info.put("USERMODES",bits[2]);
-				myParser.h005Info.put("USERCHANMODES",bits[3]);
-			}
-			myParser.parseUserModes();
-		} else if (sParam.equals("005")) {
-			// 005
-			String[] Bits = null;
-			String sKey = null, sValue = null;
-			for (int i = 3; i < token.length ; i++) {
-				Bits = token[i].split("=",2);
-				sKey = Bits[0].toUpperCase();
-				if (Bits.length == 2) { sValue = Bits[1]; } else { sValue = ""; }
-				callDebugInfo(IRCParser.DEBUG_INFO, "%s => %s",sKey,sValue);
-				myParser.h005Info.put(sKey,sValue);
-				if (sKey.equals("NETWORK")) {
-					myParser.sNetworkName = sValue;
-					callGotNetwork();
-				} else if (sKey.equals("CASEMAPPING")) {
-					byte limit = (byte)4;
-					if (sValue.equalsIgnoreCase("strict-rfc1459")) {
-						limit = (byte)3;
-					} else if (sValue.equalsIgnoreCase("ascii")) {
-						limit = (byte)0;
-					} else if (!sValue.equalsIgnoreCase("rfc1459")) {
-						myParser.callErrorInfo(new ParserError(ParserError.ERROR_WARNING, "Unknown casemapping: '"+sValue+"' - assuming rfc1459", myParser.getLastLine()));
-					}
-					final boolean limitChanged = (myParser.getIRCStringConverter().getLimit() != limit);
-					myParser.updateCharArrays(limit);
-					if (limitChanged && myParser.knownClients() == 1) {
-							// This means that the casemapping is not rfc1459
-							// We have only added ourselves so far (from 001)
-							// We can fix the hashtable easily.
-						myParser.removeClient(myParser.getMyself());
-						myParser.addClient(myParser.getMyself());
-					}
-				} else if (sKey.equals("CHANTYPES")) {
-					myParser.parseChanPrefix();
-				} else if (sKey.equals("PREFIX")) {
-					myParser.parsePrefixModes();
-				} else if (sKey.equals("CHANMODES")) {
-					myParser.parseChanModes();
-				} else if (sKey.equals("LISTMODE")) {
-					// Support for potential future decent mode listing in the protocol
-					// 
-					// See my proposal: http://shane.dmdirc.com/listmodes.php
-					// Add listmode handler
-					String[] handles = new String[2];
-					handles[0] = sValue; // List mode item
-					sValue = ""+(Integer.parseInt(sValue) + 1);
-					myParser.h005Info.put("LISTMODEEND", sValue);
-					handles[1] = sValue; // List mode end
-					// Add listmode handlers
-					try {
-						myParser.getProcessingManager().addProcessor(handles, myParser.getProcessingManager().getProcessor("__LISTMODE__"));
-					} catch (ProcessorNotFoundException e) { }
-				}
-			}
-		}
-	}
-	
-	/**
-	 * What does this IRCProcessor handle.
-	 *
-	 * @return String[] with the names of the tokens we handle.
-	 */
-	@Override
-	public String[] handles() {
-		return new String[]{"003", "004", "005"};
-	} 
-	
-	/**
-	 * Callback to all objects implementing the GotNetwork Callback.
-	 * This takes no params of its own, but works them out itself.
-	 *
-	 * @see IGotNetwork
-	 * @return true if a method was called, false otherwise
-	 */
-	protected boolean callGotNetwork() {
-		final String networkName = myParser.sNetworkName;
-		final String ircdVersion = myParser.getIRCD(false);
-		final String ircdType = myParser.getIRCD(true);
-		
-		return getCallbackManager().getCallbackType("OnGotNetwork").call(networkName, ircdVersion, ircdType);
-	}
-	
-	/**
-	 * 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 Process004005 (final IRCParser parser, final ProcessingManager manager) { super(parser, manager); }
-
-}

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

@@ -1,70 +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;
-
-/**
- * Process a 464 message.
- */
-public class Process464 extends IRCProcessor {
-	/**
-	 * Process a 464 message.
-	 *
-	 * @param sParam Type of line to process ("464")
-	 * @param token IRCTokenised line to process
-	 */
-	@Override
-	public void process(String sParam, String[] token) {
-		callPasswordRequired();
-//		ParserError ei = new ParserError(ParserError.ERROR_ERROR, "Password Required");
-//		callErrorInfo(ei);
-	}
-	
-	/**
-	 * What does this IRCProcessor handle.
-	 *
-	 * @return String[] with the names of the tokens we handle.
-	 */
-	@Override
-	public String[] handles() {
-		return new String[]{"464"};
-	} 
-	
-	/**
-	 * Callback to all objects implementing the PasswordRequired Callback.
-	 *
-	 * @see IPasswordRequired
-	 * @return true if a method was called, false otherwise
-	 */
-	protected boolean callPasswordRequired() {
-		return getCallbackManager().getCallbackType("OnPasswordRequired").call();
-	}
-	
-	/**
-	 * 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 Process464 (IRCParser parser, ProcessingManager manager) { super(parser, manager); }
-
-}

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

@@ -1,76 +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;
-
-/**
- * Process an Away/Back message.
- */
-public class ProcessAway extends IRCProcessor {
-	/**
-	 * Process an Away/Back message.
-	 *
-	 * @param sParam Type of line to process ("305", "306")
-	 * @param token IRCTokenised line to process
-	 */
-	@Override
-	public void process(String sParam, String[] token) {
-		if (sParam.equals("301")) {
-			ClientInfo iClient = myParser.getClientInfo(token[3]);
-			if (iClient != null) { iClient.setAwayReason(token[token.length-1]); }
-		} else {
-			myParser.getMyself().setAwayState(sParam.equals("306"));
-			callAwayState(myParser.getMyself().getAwayState(), myParser.getMyself().getAwayReason());
-		}
-	}
-	
-	/**
-	 * Callback to all objects implementing the onAwayState Callback.
-	 *
-	 * @see IAwayState
-	 * @param currentState Set to true if we are now away, else false.
-	 * @param reason Best guess at away reason
-	 * @return true if a method was called, false otherwise
-	 */
-	protected boolean callAwayState(boolean currentState, String reason) {
-		return myParser.getCallbackManager().getCallbackType("OnAwayState").call(currentState, reason);
-	}
-	
-	/**
-	 * What does this IRCProcessor handle.
-	 *
-	 * @return String[] with the names of the tokens we handle.
-	 */
-	@Override
-	public String[] handles() {
-		return new String[]{"301", "305", "306"};
-	} 
-	
-	/**
-	 * 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 ProcessAway (IRCParser parser, ProcessingManager manager) { super(parser, manager); }
-
-}

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

@@ -1,73 +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;
-
-/**
- * Process an Invite Request.
- */
-public class ProcessInvite extends IRCProcessor {
-	/**
-	 * Process an Invite Request.
-	 *
-	 * @param sParam Type of line to process ("INVITE")
-	 * @param token IRCTokenised line to process
-	 */
-	@Override
-	public void process(final String sParam, final String[] token) {
-		// :Tobavaj!shane@Tobavaj.users.quakenet.org INVITE Dataforce #dataforceisgod 1188846462
-		if (token.length > 2) {
-			callInvite(token[0].substring(1), token[3]);
-		}
-	}
-	
-	/**
-	 * Callback to all objects implementing the Invite Callback.
-	 *
-	 * @see IInvite
-	 * @param userHost The hostname of the person who invited us
-	 * @param channel The name of the channel we were invited to
-	 * @return true if a method was called, false otherwise
-	 */
-	protected boolean callInvite(final String userHost, final String channel) {
-		return getCallbackManager().getCallbackType("OnInvite").call(userHost, channel);
-	}
-	
-	/**
-	 * What does this IRCProcessor handle.
-	 *
-	 * @return String[] with the names of the tokens we handle.
-	 */
-	@Override
-	public String[] handles() {
-		return new String[]{"INVITE"};
-	} 
-	
-	/**
-	 * 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 ProcessInvite (IRCParser parser, ProcessingManager manager) { super(parser, manager); }
-
-}

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

@@ -1,141 +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;
-
-/**
- * Process a channel join.
- */
-public class ProcessJoin extends IRCProcessor {
-
-	/**
-	 * Process a channel join.
-	 *
-	 * @param sParam Type of line to process ("JOIN")
-	 * @param token IRCTokenised line to process
-	 */
-	@Override
-	public void process(final String sParam, final String[] token) {
-		if (sParam.equals("329")) {
-			if (token.length < 5) { return; }
-			ChannelInfo iChannel = myParser.getChannelInfo(token[3]);
-			if (iChannel != null) {
-				try {
-					iChannel.setCreateTime(Integer.parseInt(token[4]));
-				} catch (NumberFormatException nfe) { /* Oh well, not a normal ircd I guess */ }
-			}
-		} else {
-			// :nick!ident@host JOIN (:)#Channel
-			Byte nTemp;
-			if (token.length < 3) { return; }
-			ClientInfo iClient;
-			ChannelInfo iChannel;
-			ChannelClientInfo iChannelClient;
-			
-			iClient = myParser.getClientInfo(token[0]);
-			iChannel = myParser.getChannelInfo(token[token.length-1]);
-			
-			if (iClient == null) { 
-				iClient = new ClientInfo(myParser, token[0]);
-				myParser.addClient(iClient);
-			}
-			// Check to see if we know the host/ident for this client to facilitate dmdirc Formatter
-			if (iClient.getHost().isEmpty()) { iClient.setUserBits(token[0],false); }
-			if (iChannel != null) {
-				if (iClient == myParser.getMyself()) {
-					try {
-						if (iChannel.getUser(iClient) != null) {
-							// If we are joining a channel we are already on, fake a part from
-							// the channel internally, and rejoin.
-							myParser.getProcessingManager().process("PART", token);
-						} else {
-							// Otherwise we have a channel known, that we are not in?
-							myParser.callErrorInfo(new ParserError(ParserError.ERROR_FATAL, "Joined known channel that we wern't already on..", myParser.getLastLine()));
-						}
-					} catch (ProcessorNotFoundException e) { }
-				} else if (iChannel.getUser(iClient) != null) {
-					// Client joined channel that we already know of.
-					return;
-				} else {
-					// This is only done if we are already the channel, and it isn't us that
-					// joined.
-					iChannelClient = iChannel.addClient(iClient);
-					callChannelJoin(iChannel, iChannelClient);
-					return;
-				}
-			}
-			//if (iClient != myParser.getMyself()) {
-				// callErrorInfo(new ParserError(ParserError.ERROR_WARNING, "Got join for channel ("+token[token.length-1]+") that I am not on. [Me: "+myParser.getMyself()+"]", myParser.getLastLine()));
-			//}
-			iChannel = new ChannelInfo(myParser, token[token.length-1]);
-			// Add ourself to the channel, this will be overridden by the NAMES reply
-			iChannel.addClient(iClient);
-			myParser.addChannel(iChannel);
-			sendString("MODE "+iChannel.getName());
-			
-			callChannelSelfJoin(iChannel);
-		}
-	}
-	
-
-	/**
-	 * Callback to all objects implementing the ChannelJoin Callback.
-	 *
-	 * @see IChannelJoin
-	 * @param cChannel Channel Object
-	 * @param cChannelClient ChannelClient object for new person
-	 * @return true if a method was called, false otherwise
-	 */
-	protected boolean callChannelJoin(final ChannelInfo cChannel, final ChannelClientInfo cChannelClient) {
-		return getCallbackManager().getCallbackType("OnChannelJoin").call(cChannel, cChannelClient);
-	}
-	
-	/**
-	 * Callback to all objects implementing the ChannelSelfJoin Callback.
-	 *
-	 * @see IChannelSelfJoin
-	 * @param cChannel Channel Object
-	 * @return true if a method was called, false otherwise
-	 */
-	protected boolean callChannelSelfJoin(final ChannelInfo cChannel) {
-		return  getCallbackManager().getCallbackType("OnChannelSelfJoin").call(cChannel);
-	}
-	
-	/**
-	 * What does this IRCProcessor handle.
-	 *
-	 * @return String[] with the names of the tokens we handle.
-	 */
-	@Override
-	public String[] handles() {
-		return new String[]{"JOIN", "329"};
-	} 
-	
-	/**
-	 * 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 ProcessJoin (IRCParser parser, ProcessingManager manager) { super(parser, manager); }
-
-}

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

@@ -1,112 +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;
-
-/**
- * Process a channel kick.
- */
-public class ProcessKick extends IRCProcessor {
-
-	/**
-	 * Process a channel kick.
-	 *
-	 * @param sParam Type of line to process ("KICK")
-	 * @param token IRCTokenised line to process
-	 */
-	@Override
-	public void process(final String sParam, final String[] token) {
-		ChannelClientInfo iChannelClient;
-		ChannelClientInfo iChannelKicker;
-		ChannelInfo iChannel;
-		ClientInfo iClient;
-		ClientInfo iKicker;
-		String sReason = "";
-		
-		iClient = getClientInfo(token[3]);
-		iKicker = getClientInfo(token[0]);
-		iChannel = getChannelInfo(token[2]);
-		
-		if (iClient == null) { return; }
-		
-		if (IRCParser.ALWAYS_UPDATECLIENT && iKicker != null) {
-			// To facilitate dmdirc formatter, get user information
-			if (iKicker.getHost().isEmpty()) { iKicker.setUserBits(token[0],false); }
-		}
-
-		if (iChannel == null) { 
-			if (iClient != myParser.getMyself()) {
-				callErrorInfo(new ParserError(ParserError.ERROR_WARNING, "Got kick for channel ("+token[2]+") that I am not on. [User: "+token[3]+"]", myParser.getLastLine()));
-			}
-			return;
-		} else {
-			if (token.length > 4) { sReason = token[token.length-1]; }
-			iChannelClient = iChannel.getUser(iClient);
-			if (iChannelClient == null) {
-				// callErrorInfo(new ParserError(ParserError.ERROR_WARNING, "Got kick for channel ("+token[2]+") for a non-existant user. [User: "+token[0]+"]", myParser.getLastLine()));
-				return;
-			}
-			iChannelKicker = iChannel.getUser(token[0]);
-			if (myParser.removeAfterCallback) { callChannelKick(iChannel,iChannelClient,iChannelKicker,sReason,token[0]); }
-			iChannel.delClient(iClient);
-			if (!myParser.removeAfterCallback) { callChannelKick(iChannel,iChannelClient,iChannelKicker,sReason,token[0]); }
-			if (iClient == myParser.getMyself()) {
-				iChannel.emptyChannel();
-				myParser.removeChannel(iChannel);
-			}
-		}
-	}
-	
-	/**
-	 * Callback to all objects implementing the ChannelKick Callback.
-	 *
-	 * @see IChannelKick
-	 * @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)
-	 * @return true if a method was called, false otherwise
-	 */
-	protected boolean callChannelKick(ChannelInfo cChannel, ChannelClientInfo cKickedClient, ChannelClientInfo cKickedByClient, String sReason, String sKickedByHost) {
-		return getCallbackManager().getCallbackType("OnChannelKick").call(cChannel, cKickedClient, cKickedByClient, sReason, sKickedByHost);
-	}
-	
-	/**
-	 * What does this IRCProcessor handle.
-	 *
-	 * @return String[] with the names of the tokens we handle.
-	 */
-	@Override
-	public String[] handles() {
-		return new String[]{"KICK"};
-	} 
-	
-	/**
-	 * 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 ProcessKick (IRCParser parser, ProcessingManager manager) { super(parser, manager); }
-
-}

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

@@ -1,220 +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.util.List;
-import java.util.LinkedList;
-import java.util.Queue;
-
-/**
- * Process a List Modes.
- */
-public class ProcessListModes extends IRCProcessor {
-	/**
-	 * Process a ListModes.
-	 *
-	 * @param sParam Type of line to process
-	 * @param token IRCTokenised line to process
-	 */
-	@SuppressWarnings("unchecked")
-	@Override
-	public void process(String sParam, String[] token) {
-		ChannelInfo channel = getChannelInfo(token[3]);
-		String thisIRCD = myParser.getIRCD(true).toLowerCase();
-		String item = "";
-		String owner = "";
-		byte tokenStart = 4; // Where do the relevent tokens start?
-		boolean isCleverMode = false;
-		long time = 0;
-		char mode = 'b';
-		boolean isItem = true; // true if item listing, false if "end of .." item
-		if (channel == null) { return; }
-		
-		if (sParam.equals("367") || sParam.equals("368")) {
-			// Ban List/Item.
-			// (Also used for +d and +q on hyperion... -_-)
-			mode = 'b';
-			isItem = sParam.equals("367");
-		} else if (sParam.equals("348") || sParam.equals("349")) {
-			// Except / Exempt List etc
-			mode = 'e';
-			isItem = sParam.equals("348");
-		} else if (sParam.equals("346") || sParam.equals("347")) {
-			// Invite List
-			mode = 'I';
-			isItem = sParam.equals("346");
-		} else if (sParam.equals("940") || sParam.equals("941")) {
-			// Censored words List
-			mode = 'g';
-			isItem = sParam.equals("941");
-		} else if (sParam.equals("344") || sParam.equals("345")) {
-			// Reop List, or bad words list, or quiet list. god damn.
-			if (thisIRCD.equals("euircd")) {
-				mode = 'w';
-			} else if (thisIRCD.equals("oftc-hybrid")) {
-				mode = 'q';
-			} else {
-				mode = 'R';
-			}
-			isItem = sParam.equals("344");
-		} else if (thisIRCD.equals("swiftirc") && (sParam.equals("386") || sParam.equals("387"))) {
-			// Channel Owner list
-			mode = 'q';
-			isItem = sParam.equals("387");
-		} else if (thisIRCD.equals("swiftirc") && (sParam.equals("388") || sParam.equals("389"))) {
-			// Protected User list
-			mode = 'a';
-			isItem = sParam.equals("389");
-		} else if (sParam.equals(myParser.h005Info.get("LISTMODE")) || sParam.equals(myParser.h005Info.get("LISTMODEEND"))) {
-			// Support for potential future decent mode listing in the protocol
-			//
-			// See my proposal: http://shane.dmdirc.com/listmodes.php
-			mode = token[4].charAt(0);
-			isItem = sParam.equals(myParser.h005Info.get("LISTMODE"));
-			tokenStart = 5;
-			isCleverMode = true;
-		}
-		
-		final Queue<Character> listModeQueue = channel.getListModeQueue();
-		if (!isCleverMode && listModeQueue != null) {
-			if (sParam.equals("482")) {
-				myParser.callDebugInfo(IRCParser.DEBUG_LMQ, "Dropped LMQ mode "+listModeQueue.poll());
-				return;
-			} else {
-				if (listModeQueue.peek() != null) {
-					Character oldMode = mode;
-					mode = listModeQueue.peek();
-					myParser.callDebugInfo(IRCParser.DEBUG_LMQ, "LMQ says this is "+mode);
-					
-					boolean error = true;
-					
-					if ((thisIRCD.equals("hyperion") || thisIRCD.equals("dancer")) && (mode == 'b' || mode == 'q')) {
-						LinkedList<Character> lmq = (LinkedList<Character>)listModeQueue;
-						if (mode == 'b') {
-							error = !(oldMode == 'q');
-							lmq.remove((Character)'q');
-							myParser.callDebugInfo(IRCParser.DEBUG_LMQ, "Dropping q from list");
-						} else if (mode == 'q') {
-							error = !(oldMode == 'b');
-							lmq.remove((Character)'b');
-							myParser.callDebugInfo(IRCParser.DEBUG_LMQ, "Dropping b from list");
-						}
-					}
-					
-					if (oldMode != mode && error) {
-						myParser.callDebugInfo(IRCParser.DEBUG_LMQ, "LMQ disagrees with guess. LMQ: "+mode+" Guess: "+oldMode);
-						myParser.callErrorInfo(new ParserError(ParserError.ERROR_WARNING, "LMQ disagrees with guess. LMQ: "+mode+" Guess: "+oldMode, myParser.getLastLine()));
-					}
-					
-					if (!isItem) {
-						listModeQueue.poll();
-					}
-				}
-			}
-		}
-		
-		if (isItem) {
-			if ((!isCleverMode) && listModeQueue == null && (thisIRCD.equals("hyperion") || thisIRCD.equals("dancer")) && token.length > 4 && mode == 'b') {
-				// Assume mode is a 'd' mode
-				mode = 'd';
-				// Now work out if its not (or attempt to.)
-				int identstart = token[tokenStart].indexOf('!');
-				int hoststart = token[tokenStart].indexOf('@');
-				// Check that ! and @ are both in the string - as required by +b and +q
-				if ((identstart >= 0) && (identstart < hoststart)) {
-					if (thisIRCD.equals("hyperion") && token[tokenStart].charAt(0) == '%') { mode = 'q'; }
-					else { mode = 'b'; }
-				}
-			} // End Hyperian stupidness of using the same numeric for 3 different things..
-			
-			if (!channel.getAddState(mode)) {
-				callDebugInfo(IRCParser.DEBUG_INFO, "New List Mode Batch ("+mode+"): Clearing!");
-				final List<ChannelListModeItem> list = channel.getListModeParam(mode);
-				if (list == null) {
-					myParser.callErrorInfo(new ParserError(ParserError.ERROR_WARNING, "Got list mode: '"+mode+"' - but channel object doesn't agree.", myParser.getLastLine()));
-				} else {
-					list.clear();
-				}
-				channel.setAddState(mode, true);
-			}
-			
-			if (token.length > (tokenStart+2)) {
-				try { time = Long.parseLong(token[tokenStart+2]); } catch (NumberFormatException e) { time = 0; }
-			}
-			if (token.length > (tokenStart+1)) { owner = token[tokenStart+1]; }
-			if (token.length > tokenStart) { item = token[tokenStart]; }
-			if (!item.isEmpty()) {
-				ChannelListModeItem clmi = new ChannelListModeItem(item, owner, time);
-				callDebugInfo(IRCParser.DEBUG_INFO, "List Mode: %c [%s/%s/%d]",mode, item, owner, time);
-				channel.setListModeParam(mode, clmi, true);
-			}
-		} else {
-			callDebugInfo(IRCParser.DEBUG_INFO, "List Mode Batch over");
-			channel.resetAddState();
-			if (isCleverMode || listModeQueue == null || ((LinkedList<Character>)listModeQueue).size() == 0) {
-				callDebugInfo(IRCParser.DEBUG_INFO, "Calling GotListModes");
-				channel.setHasGotListModes(true);
-				callChannelGotListModes(channel);
-			}
-		}
-	}
-	
-	/**
-	 * What does this IRCProcessor handle.
-	 *
-	 * @return String[] with the names of the tokens we handle.
-	 */
-	@Override
-	public String[] handles() {
-		return new String[]{"367", "368",  /* Bans */
-		                    "344", "345",  /* Reop list (ircnet) or bad words (euirc) */
-		                    "346", "347",  /* Invite List */
-		                    "348", "349",  /* Except/Exempt List */
-		                    "386", "387",  /* Channel Owner List (swiftirc ) */
-		                    "388", "389",  /* Protected User List (swiftirc) */
-		                    "940", "941",  /* Censored words list */
-		                    "482",         /* Permission Denied */
-		                    "__LISTMODE__" /* Sensible List Modes */
-		                   };
-	}
-	
-	/**
-	 * Callback to all objects implementing the ChannelGotListModes Callback.
-	 *
-	 * @see IChannelGotListModes
-	 * @param cChannel Channel which the ListModes reply is for
-	 * @return true if a method was called, false otherwise
-	 */
-	protected boolean callChannelGotListModes(ChannelInfo cChannel) {
-		return getCallbackManager().getCallbackType("OnChannelGotListModes").call(cChannel);
-	}
-	
-	/**
-	 * 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 ProcessListModes (IRCParser parser, ProcessingManager manager) { super(parser, manager); }
-
-}

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

@@ -1,103 +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;
-
-/**
- * Process a MOTD Related Line.
- */
-public class ProcessMOTD extends IRCProcessor {
-
-	/**
-	 * Process a MOTD Related Line.
-	 *
-	 * @param sParam Type of line to process ("375", "372", "376", "422")
-	 * @param token IRCTokenised line to process
-	 */
-	@Override
-	public void process(String sParam, String[] token) {
-		if (sParam.equals("375")) {
-			callMOTDStart(token[token.length-1]);
-		} else if (sParam.equals("372")) {
-			callMOTDLine(token[token.length-1]);
-		} else {
-			if (!myParser.h005Info.containsKey("CHANTYPES")) { myParser.parseChanPrefix(); }
-			if (!myParser.h005Info.containsKey("PREFIX")) { myParser.parsePrefixModes(); }
-			if (!myParser.h005Info.containsKey("USERMODES")) { myParser.parseUserModes(); }
-			if (!myParser.h005Info.containsKey("CHANMODES")) { myParser.parseChanModes(); }
-			callMOTDEnd(sParam.equals("422"), token[token.length-1]);
-		}
-	}
-	
-	/**
-	 * Callback to all objects implementing the MOTDEnd Callback.
-	 *
-	 * @param noMOTD Was this an MOTDEnd or NoMOTD
-	 * @param data The contents of the line (incase of language changes or so)
-	 * @see IMOTDEnd
-	 * @return true if a method was called, false otherwise
-	 */
-	protected boolean callMOTDEnd(final boolean noMOTD, final String data) {
-		return getCallbackManager().getCallbackType("OnMOTDEnd").call(noMOTD, data);
-	}
-	
-	/**
-	 * Callback to all objects implementing the MOTDLine Callback.
-	 *
-	 * @see IMOTDLine
-	 * @param data Incomming Line.
-	 * @return true if a method was called, false otherwise
-	 */
-	protected boolean callMOTDLine(final String data) {
-		return getCallbackManager().getCallbackType("OnMOTDLine").call(data);
-	}
-	
-	/**
-	 * Callback to all objects implementing the MOTDStart Callback.
-	 *
-	 * @see IMOTDStart
-	 * @param data Incomming Line.
-	 * @return true if a method was called, false otherwise
-	 */
-	protected boolean callMOTDStart(String data) {
-		return getCallbackManager().getCallbackType("OnMOTDStart").call(data);
-	}
-	
-	/**
-	 * What does this IRCProcessor handle.
-	 *
-	 * @return String[] with the names of the tokens we handle.
-	 */
-	@Override
-	public String[] handles() {
-		return new String[]{"372", "375", "376", "422"};
-	} 
-	
-	/**
-	 * 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 ProcessMOTD (IRCParser parser, ProcessingManager manager) { super(parser, manager); }
-
-}

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

@@ -1,419 +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.util.regex.PatternSyntaxException;
-
-/**
- * Process PRIVMSGs and NOTICEs.
- * This horrible handles PRIVMSGs and NOTICES<br>
- * This inclues CTCPs and CTCPReplies<br>
- * It handles all 3 targets (Channel, Private, Unknown)<br>
- * Actions are handled here aswell separately from CTCPs.<br>
- * Each type has 5 Calls, making 15 callbacks handled here.
- */
-public class ProcessMessage extends IRCProcessor {
-	/**
-	 * Process PRIVMSGs and NOTICEs.
-	 * This horrible thing handles PRIVMSGs and NOTICES<br>
-	 * This inclues CTCPs and CTCPReplies<br>
-	 * It handles all 3 targets (Channel, Private, Unknown)<br>
-	 * Actions are handled here aswell separately from CTCPs.<br>
-	 * Each type has 5 Calls, making 15 callbacks handled here.
-	 *
-	 * @param sParam Type of line to process ("NOTICE", "PRIVMSG")
-	 * @param token IRCTokenised line to process
-	 */
-	@Override
-	public void process(final String sParam, String[] token) {
-		// Ignore people!
-		String sMessage = "";
-		if (token[0].charAt(0) == ':') { sMessage = token[0].substring(1); } else { sMessage = token[0]; }
-		// We use sMessage to be the users host (first token in the line)
-		try {
-			if (myParser.getIgnoreList().matches(sMessage) > -1) { return; }
-		} catch (PatternSyntaxException pse) {
-			final ParserError pe = new ParserError(ParserError.ERROR_WARNING, "Error with ignore list regex: "+pse, myParser.getLastLine());
-			pe.setException(pse);
-			callErrorInfo(pe);
-		}
-		
-		// Lines such as:
-		// "nick!user@host PRIVMSG"
-		// are invalid, stop processing.
-		if (token.length < 3) { return; }
-		
-		// Is this actually a notice auth?
-		if (token[0].indexOf('!') == -1 && token[1].equalsIgnoreCase("NOTICE") && token[2].equalsIgnoreCase("AUTH")) {
-			try {
-				myParser.getProcessingManager().process("Notice Auth", token);
-			} catch (ProcessorNotFoundException e) { }
-			return;
-		}
-		
-		ChannelClientInfo iChannelClient = null;
-		ChannelInfo iChannel = null;
-		ClientInfo iClient = null;
-		// "nick!user@host PRIVMSG #Channel" should be processed as "nick!user@host PRIVMSG #Channel :"
-		if (token.length < 4) {
-			sMessage = "";
-		} else {
-			sMessage = token[token.length-1];
-		}
-		String bits[] = sMessage.split(" ", 2);
-		final Character Char1 = Character.valueOf((char)1);
-		String sCTCP = "";
-		boolean isAction = false;
-		boolean isCTCP = false;
-		
-		if (sMessage.length() > 1) {
-			if (sParam.equalsIgnoreCase("PRIVMSG")) {
-				// Actions are special CTCPs
-				// Bits is the message been split into 2 parts, the first word and the rest
-				if (bits[0].equalsIgnoreCase(Char1+"ACTION") && Character.valueOf(sMessage.charAt(sMessage.length()-1)).equals(Char1)) {
-					isAction = true;
-					if (bits.length > 1) {
-						sMessage = bits[1];
-						sMessage = sMessage.substring(0, sMessage.length()-1);
-					} else { sMessage = ""; }
-				}
-			}
-			// If the message is not an action, check if it is another type of CTCP
-			if (!isAction) {
-				// CTCPs have Character(1) at the start/end of the line
-				if (Character.valueOf(sMessage.charAt(0)).equals(Char1) && Character.valueOf(sMessage.charAt(sMessage.length()-1)).equals(Char1)) {
-					isCTCP = true;
-					// Bits is the message been split into 2 parts, the first word and the rest
-					// Some CTCPs have messages and some do not
-					if (bits.length > 1) { sMessage = bits[1]; } else { sMessage = ""; }
-					// Remove the leading char1
-					bits = bits[0].split(Char1.toString(),2);
-					sCTCP = bits[1];
-					// remove the trailing char1
-					if (!sMessage.isEmpty()) { sMessage = sMessage.split(Char1.toString(),2)[0]; }
-					else { sCTCP = sCTCP.split(Char1.toString(),2)[0]; }
-					callDebugInfo(IRCParser.DEBUG_INFO, "CTCP: \"%s\" \"%s\"",sCTCP,sMessage);
-				}
-			}
-		}
-
-		// Remove the leading : from the host.
-		if (token[0].charAt(0) == ':' && token[0].length() > 1) { token[0] = token[0].substring(1); }
-
-		iClient = getClientInfo(token[0]);
-		if (IRCParser.ALWAYS_UPDATECLIENT && iClient != null) {
-			// Facilitate DMDIRC Formatter
-			if (iClient.getHost().isEmpty()) {iClient.setUserBits(token[0],false); }
-		}
-		
-		// Fire the appropriate callbacks.
-		// OnChannel* Callbacks are fired if the target was a channel
-		// OnPrivate* Callbacks are fired if the target was us
-		// OnUnknown* Callbacks are fired if the target was neither of the above
-		// Actions and CTCPs are send as PRIVMSGS
-		// CTCPReplies are sent as Notices
-		if (isValidChannelName(token[2])) {
-			iChannel = getChannelInfo(token[2]);
-			if (iChannel == null) {
-				// callErrorInfo(new ParserError(ParserError.ERROR_WARNING, "Got message for channel ("+token[2]+") that I am not on.", myParser.getLastLine()));
-				return;
-			}
-			if (iClient != null) { iChannelClient = iChannel.getUser(iClient); }
-			if (sParam.equalsIgnoreCase("PRIVMSG")) {
-				if (!isAction) {
-					if (isCTCP) {
-						callChannelCTCP(iChannel, iChannelClient, sCTCP, sMessage, token[0]);
-					} else {
-						callChannelMessage(iChannel, iChannelClient, sMessage, token[0]);
-					}
-				} else {
-					callChannelAction(iChannel, iChannelClient, sMessage, token[0]);
-				}
-			} else if (sParam.equalsIgnoreCase("NOTICE")) {
-				if (isCTCP) {
-					callChannelCTCPReply(iChannel, iChannelClient, sCTCP, sMessage, token[0]);
-				} else {
-					callChannelNotice(iChannel, iChannelClient, sMessage, token[0]);
-				}
-			}
-		} else if (myParser.getIRCStringConverter().equalsIgnoreCase(token[2], myParser.getMyNickname())) {
-			if (sParam.equalsIgnoreCase("PRIVMSG")) {
-				if (!isAction) {
-					if (isCTCP) {
-						callPrivateCTCP(sCTCP, sMessage, token[0]);
-					} else {
-						callPrivateMessage(sMessage, token[0]);
-					}
-				} else {
-					callPrivateAction(sMessage, token[0]);
-				}
-			} else if (sParam.equalsIgnoreCase("NOTICE")) {
-				if (isCTCP) {
-					callPrivateCTCPReply(sCTCP, sMessage, token[0]);
-				} else {
-					callPrivateNotice(sMessage, token[0]);
-				}
-			}
-		} else {
-			callDebugInfo(IRCParser.DEBUG_INFO, "Message for Other ("+token[2]+")");
-			if (sParam.equalsIgnoreCase("PRIVMSG")) {
-				if (!isAction) {
-					if (isCTCP) {
-						callUnknownCTCP(sCTCP, sMessage, token[2], token[0]);
-					} else {
-						callUnknownMessage(sMessage, token[2], token[0]);
-					}
-				} else {
-					callUnknownAction(sMessage, token[2], token[0]);
-				}
-			} else if (sParam.equalsIgnoreCase("NOTICE")) {
-				if (isCTCP) {
-					callUnknownCTCPReply(sCTCP, sMessage, token[2], token[0]);
-				} else {
-					callUnknownNotice(sMessage, token[2], token[0]);
-				}
-			}
-		}
-	}
-	
-	/**
-	 * Callback to all objects implementing the ChannelAction Callback.
-	 *
-	 * @see com.dmdirc.parser.irc.callbacks.interfaces.IChannelAction
-	 * @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)
-	 * @return true if a method was called, false otherwise
-	 */
-	protected boolean callChannelAction(final ChannelInfo cChannel, final ChannelClientInfo cChannelClient, final String sMessage, final String sHost) {
-		return getCallbackManager().getCallbackType("OnChannelAction").call(cChannel, cChannelClient, sMessage, sHost);
-	}
-	
-	/**
-	 * Callback to all objects implementing the ChannelCTCP Callback.
-	 *
-	 * @see com.dmdirc.parser.irc.callbacks.interfaces.IChannelCTCP
-	 * @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)
-	 * @return true if a method was called, false otherwise
-	 */
-	protected boolean callChannelCTCP(final ChannelInfo cChannel, final ChannelClientInfo cChannelClient, final String sType, final String sMessage, final String sHost) {
-		return getCallbackManager().getCallbackType("OnChannelCTCP").call(cChannel, cChannelClient, sType, sMessage, sHost);
-	}
-
-	/**
-	 * Callback to all objects implementing the ChannelCTCPReply Callback.
-	 *
-	 * @see com.dmdirc.parser.irc.callbacks.interfaces.IChannelCTCPReply
-	 * @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)
-	 * @return true if a method was called, false otherwise
-	 */
-	protected boolean callChannelCTCPReply(final ChannelInfo cChannel, final ChannelClientInfo cChannelClient, final String sType, final String sMessage, final String sHost) {
-		return getCallbackManager().getCallbackType("OnChannelCTCPReply").call(cChannel, cChannelClient, sType, sMessage, sHost);
-	}
-	
-	/**
-	 * Callback to all objects implementing the ChannelMessage Callback.
-	 *
-	 * @see com.dmdirc.parser.irc.callbacks.interfaces.IChannelMessage
-	 * @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)
-	 * @return true if a method was called, false otherwise
-	 */
-	protected boolean callChannelMessage(final ChannelInfo cChannel, final ChannelClientInfo cChannelClient, final String sMessage, final String sHost) {
-		return getCallbackManager().getCallbackType("OnChannelMessage").call(cChannel, cChannelClient, sMessage, sHost);
-	}
-	
-	/**
-	 * Callback to all objects implementing the ChannelNotice Callback.
-	 *
-	 * @see com.dmdirc.parser.irc.callbacks.interfaces.IChannelNotice
-	 * @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)
-	 * @return true if a method was called, false otherwise
-	 */
-	protected boolean callChannelNotice(final ChannelInfo cChannel, final ChannelClientInfo cChannelClient, final String sMessage, final String sHost) {
-		return getCallbackManager().getCallbackType("OnChannelNotice").call(cChannel, cChannelClient, sMessage, sHost);
-	}
-	
-	/**
-	 * Callback to all objects implementing the PrivateAction Callback.
-	 *
-	 * @see com.dmdirc.parser.irc.callbacks.interfaces.IPrivateAction
-	 * @param sMessage action contents
-	 * @param sHost Hostname of sender (or servername)
-	 * @return true if a method was called, false otherwise
-	 */
-	protected boolean callPrivateAction(final String sMessage, final String sHost) {
-		return getCallbackManager().getCallbackType("OnPrivateAction").call(sMessage, sHost);
-	}
-
-	/**
-	 * Callback to all objects implementing the PrivateCTCP Callback.
-	 *
-	 * @see com.dmdirc.parser.irc.callbacks.interfaces.IPrivateCTCP
-	 * @param sType Type of CTCP (VERSION, TIME etc)
-	 * @param sMessage Additional contents
-	 * @param sHost Hostname of sender (or servername)
-	 * @return true if a method was called, false otherwise
-	 */
-	protected boolean callPrivateCTCP(final String sType, final String sMessage, final String sHost) {
-		return getCallbackManager().getCallbackType("OnPrivateCTCP").call(sType, sMessage, sHost);
-	}
-
-	/**
-	 * Callback to all objects implementing the PrivateCTCPReply Callback.
-	 *
-	 * @see com.dmdirc.parser.irc.callbacks.interfaces.IPrivateCTCPReply
-	 * @param sType Type of CTCPRReply (VERSION, TIME etc)
-	 * @param sMessage Reply Contents
-	 * @param sHost Hostname of sender (or servername)
-	 * @return true if a method was called, false otherwise
-	 */
-	protected boolean callPrivateCTCPReply(final String sType, final String sMessage, final String sHost) {
-		return getCallbackManager().getCallbackType("OnPrivateCTCPReply").call(sType, sMessage, sHost);
-	}
-
-	/**
-	 * Callback to all objects implementing the PrivateMessage Callback.
-	 *
-	 * @see com.dmdirc.parser.irc.callbacks.interfaces.IPrivateMessage
-	 * @param sMessage Message contents
-	 * @param sHost Hostname of sender (or servername)
-	 * @return true if a method was called, false otherwise
-	 */
-	protected boolean callPrivateMessage(final String sMessage, final String sHost) {
-		return getCallbackManager().getCallbackType("OnPrivateMessage").call(sMessage, sHost);
-	}
-
-	/**
-	 * Callback to all objects implementing the PrivateNotice Callback.
-	 *
-	 * @see com.dmdirc.parser.irc.callbacks.interfaces.IPrivateNotice
-	 * @param sMessage Notice contents
-	 * @param sHost Hostname of sender (or servername)
-	 * @return true if a method was called, false otherwise
-	 */
-	protected boolean callPrivateNotice(final String sMessage, final String sHost) {
-		return getCallbackManager().getCallbackType("OnPrivateNotice").call(sMessage, sHost);
-	}
-	
-	/**
-	 * Callback to all objects implementing the UnknownAction Callback.
-	 *
-	 * @see com.dmdirc.parser.irc.callbacks.interfaces.IUnknownAction
-	 * @param sMessage Action contents
-	 * @param sTarget Actual target of action
-	 * @param sHost Hostname of sender (or servername)
-	 * @return true if a method was called, false otherwise
-	 */
-	protected boolean callUnknownAction(final String sMessage, final String sTarget, final String sHost) {
-		return getCallbackManager().getCallbackType("OnUnknownAction").call(sMessage, sTarget, sHost);
-	}
-
-	/**
-	 * Callback to all objects implementing the UnknownCTCP Callback.
-	 *
-	 * @see com.dmdirc.parser.irc.callbacks.interfaces.IUnknownCTCP
-	 * @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)
-	 * @return true if a method was called, false otherwise
-	 */
-	protected boolean callUnknownCTCP(final String sType, final String sMessage, final String sTarget, final String sHost) {
-		return getCallbackManager().getCallbackType("OnUnknownCTCP").call(sType, sMessage, sTarget, sHost);
-	}
-
-	/**
-	 * Callback to all objects implementing the UnknownCTCPReply Callback.
-	 *
-	 * @see com.dmdirc.parser.irc.callbacks.interfaces.IUnknownCTCPReply
-	 * @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)
-	 * @return true if a method was called, false otherwise
-	 */
-	protected boolean callUnknownCTCPReply(final String sType, final String sMessage, final String sTarget, final String sHost) {
-		return getCallbackManager().getCallbackType("OnUnknownCTCPReply").call(sType, sMessage, sTarget, sHost);
-	}
-
-	/**
-	 * Callback to all objects implementing the UnknownMessage Callback.
-	 *
-	 * @see com.dmdirc.parser.irc.callbacks.interfaces.IUnknownMessage
-	 * @param sMessage Message contents
-	 * @param sTarget Actual target of message
-	 * @param sHost Hostname of sender (or servername)
-	 * @return true if a method was called, false otherwise
-	 */
-	protected boolean callUnknownMessage(final String sMessage, final String sTarget, final String sHost) {
-		return getCallbackManager().getCallbackType("OnUnknownMessage").call(sMessage, sTarget, sHost);
-	}
-
-	/**
-	 * Callback to all objects implementing the UnknownNotice Callback.
-	 *
-	 * @see com.dmdirc.parser.irc.callbacks.interfaces.IUnknownNotice
-	 * @param sMessage Notice contents
-	 * @param sTarget Actual target of notice
-	 * @param sHost Hostname of sender (or servername)
-	 * @return true if a method was called, false otherwise
-	 */
-	protected boolean callUnknownNotice(final String sMessage, final String sTarget, final String sHost) {
-		return getCallbackManager().getCallbackType("OnUnknownNotice").call(sMessage, sTarget, sHost);
-	}
-
-	
-	/**
-	 * What does this IRCProcessor handle.
-	 *
-	 * @return String[] with the names of the tokens we handle.
-	 */
-	@Override
-	public String[] handles() {
-		return new String[]{"PRIVMSG", "NOTICE"};
-	}
-	
-	/**
-	 * 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 ProcessMessage (IRCParser parser, ProcessingManager manager) { super(parser, manager); }
-
-}

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

@@ -1,337 +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.irc.callbacks.CallbackObject;
-import java.util.Calendar;
-
-/**
- * Process a Mode line.
- */
-public class ProcessMode extends IRCProcessor {
-	/**
-	 * Process a Mode Line.
-	 *
-	 * @param sParam Type of line to process ("MODE", "324")
-	 * @param token IRCTokenised line to process
-	 */
-	@Override
-	public void process(String sParam, String[] token) {
-		String[] sModestr;
-		String sChannelName;
-		if (sParam.equals("324")) {
-			sChannelName = token[3];
-			sModestr = new String[token.length-4];
-			System.arraycopy(token, 4, sModestr, 0, token.length-4);
-		} else if (sParam.equals("221")) {
-			processUserMode(sParam, token, new String[]{token[token.length-1]}, true);
-			return;
-		} else {
-			sChannelName = token[2];
-			sModestr = new String[token.length-3];
-			System.arraycopy(token, 3, sModestr, 0, token.length-3);
-		}
-
-		if (!isValidChannelName(sChannelName)) { processUserMode(sParam, token, sModestr, false); }
-		else { processChanMode(sParam, token, sModestr, sChannelName); }
-	}
-	
-	/**
-	 * Method to trim spaces from strings
-	 *
-	 * @param str String to trim
-	 * @return String without spaces on the ends
-	 */
-	private String trim(String str) { return str.trim(); }
-	
-	/**
-	 * Process Chan modes.
-	 *
-	 * @param sParam String representation of parameter to parse
-	 * @param token IRCTokenised Array of the incomming line
-	 * @param sModestr The modes and params
-	 * @param sChannelName Channel these modes are for
-	 */	
-	public void processChanMode(String sParam, String token[], String sModestr[], String sChannelName) {
-		StringBuilder sFullModeStr = new StringBuilder();
-		String sNonUserModeStr = "";
-		String sNonUserModeStrParams = "";
-		String sModeParam;
-		String sTemp;
-		int nParam = 1;
-		long nTemp = 0, nValue = 0, nCurrent = 0;
-		boolean bPositive = true, bBooleanMode = true;
-		char cPositive = '+';
-		ChannelInfo iChannel;
-		ChannelClientInfo iChannelClientInfo;
-		ClientInfo iClient;
-		ChannelClientInfo setterCCI;
-		
-		CallbackObject cbSingle = null;
-		CallbackObject cbNonUser = null;
-
-		if (!sParam.equals("324")) {
-			cbSingle = getCallbackManager().getCallbackType("OnChannelSingleModeChanged");
-			cbNonUser = getCallbackManager().getCallbackType("OnChannelNonUserModeChanged");
-		}
-		
-		iChannel = getChannelInfo(sChannelName);
-		if (iChannel == null) { 
-			// callErrorInfo(new ParserError(ParserError.ERROR_WARNING, "Got modes for channel ("+sChannelName+") that I am not on.", myParser.getLastLine()));
-			// iChannel = new ChannelInfo(myParser, sChannelName);
-			// myParser.addChannel(iChannel);
-			return;
-		}
-		// Get the current channel modes
-		if (!sParam.equals("324")) { nCurrent = iChannel.getMode(); }
-		
-		setterCCI = iChannel.getUser(token[0]);
-		if (IRCParser.ALWAYS_UPDATECLIENT && setterCCI != null) {
-			// Facilitate dmdirc formatter
-			if (setterCCI.getClient().getHost().isEmpty()) {setterCCI.getClient().setUserBits(token[0],false); }
-		}
-		
-		// Loop through the mode string, and add/remove modes/params where they are needed
-		for (int i = 0; i < sModestr[0].length(); ++i) {
-			Character cMode = sModestr[0].charAt(i);
-			if (cMode.equals(":".charAt(0))) { continue; }
-			
-			sNonUserModeStr = sNonUserModeStr+cMode;
-			if (cMode.equals("+".charAt(0))) { cPositive = '+'; bPositive = true; }
-			else if (cMode.equals("-".charAt(0))) { cPositive = '-'; bPositive = false; }
-			else {
-				if (myParser.hChanModesBool.containsKey(cMode)) { nValue = myParser.hChanModesBool.get(cMode); bBooleanMode = true; }
-				else if (myParser.hChanModesOther.containsKey(cMode)) { nValue = myParser.hChanModesOther.get(cMode); bBooleanMode = false; }
-				else if (myParser.hPrefixModes.containsKey(cMode)) { 
-					// (de) OP/Voice someone
-					if (sModestr.length <= nParam) {
-						myParser.callErrorInfo(new ParserError(ParserError.ERROR_FATAL + ParserError.ERROR_USER, "Broken Modes. Parameter required but not given.", myParser.getLastLine()));
-					}
-					sModeParam = sModestr[nParam++];
-					nValue = myParser.hPrefixModes.get(cMode);
-					callDebugInfo(IRCParser.DEBUG_INFO, "User Mode: %c / %d [%s] {Positive: %b}",cMode, nValue, sModeParam, bPositive);
-					iChannelClientInfo = iChannel.getUser(sModeParam);
-					if (iChannelClientInfo == null) {
-						// Client not known?
-//						callErrorInfo(new ParserError(ParserError.ERROR_WARNING, "Got mode for client not known on channel - Added", myParser.getLastLine()));
-						iClient = getClientInfo(sModeParam);
-						if (iClient == null) { 
-//							callErrorInfo(new ParserError(ParserError.ERROR_WARNING, "Got mode for client not known at all - Added", myParser.getLastLine()));
-							iClient = new ClientInfo(myParser, sModeParam);
-							myParser.addClient(iClient);
-						}
-						iChannelClientInfo = iChannel.addClient(iClient);
-					}
-					callDebugInfo(IRCParser.DEBUG_INFO, "\tOld Mode Value: %d",iChannelClientInfo.getChanMode());
-					if (bPositive) { iChannelClientInfo.setChanMode(iChannelClientInfo.getChanMode() | nValue); sTemp = "+"; }
-					else { iChannelClientInfo.setChanMode(iChannelClientInfo.getChanMode() ^ (iChannelClientInfo.getChanMode() & nValue)); sTemp = "-"; }
-					sTemp = sTemp+cMode;
-					callChannelUserModeChanged(iChannel, iChannelClientInfo, setterCCI, token[0], sTemp);
-					continue;
-				} else {
-					// unknown mode - add as boolean
-//					callErrorInfo(new ParserError(ParserError.ERROR_WARNING, "Got unknown mode "+cMode+" - Added as boolean mode", myParser.getLastLine()));
-					myParser.hChanModesBool.put(cMode,myParser.nNextKeyCMBool);
-					nValue = myParser.nNextKeyCMBool;
-					bBooleanMode = true;
-					myParser.nNextKeyCMBool = myParser.nNextKeyCMBool*2;
-				}
-				
-				if (bBooleanMode) {
-					callDebugInfo(IRCParser.DEBUG_INFO, "Boolean Mode: %c [%d] {Positive: %b}",cMode, nValue, bPositive);
-					
-					if (bPositive) { nCurrent = nCurrent | nValue; }
-					else { nCurrent = nCurrent ^ (nCurrent & nValue); }
-				} else {
-					
-					if ((bPositive || nValue == IRCParser.MODE_LIST || ((nValue & IRCParser.MODE_UNSET) == IRCParser.MODE_UNSET)) && (sModestr.length <= nParam)) {
-						myParser.callErrorInfo(new ParserError(ParserError.ERROR_FATAL + ParserError.ERROR_USER, "Broken Modes. Parameter required but not given.", myParser.getLastLine()));
-					}
-					
-					if (nValue == IRCParser.MODE_LIST) {
-						// List Mode
-						sModeParam = sModestr[nParam++];
-						sNonUserModeStrParams = sNonUserModeStrParams+" "+sModeParam;
-						nTemp = (Calendar.getInstance().getTimeInMillis() / 1000);
-						iChannel.setListModeParam(cMode, new ChannelListModeItem(sModeParam, token[0], nTemp ), bPositive);
-						callDebugInfo(IRCParser.DEBUG_INFO, "List Mode: %c [%s] {Positive: %b}",cMode, sModeParam, bPositive);
-						if (cbSingle != null) { cbSingle.call(iChannel, setterCCI, token[0], cPositive+cMode+" "+sModeParam ); }
-					} else {
-						// Mode with a parameter
-						if (bPositive) { 
-							// +Mode - always needs a parameter to set
-							sModeParam = sModestr[nParam++];
-							sNonUserModeStrParams = sNonUserModeStrParams+" "+sModeParam;
-							callDebugInfo(IRCParser.DEBUG_INFO, "Set Mode: %c [%s] {Positive: %b}",cMode, sModeParam, bPositive);
-							iChannel.setModeParam(cMode,sModeParam);
-							if (cbSingle != null) { cbSingle.call(iChannel, setterCCI, token[0], cPositive+cMode+" "+sModeParam ); }
-						} else {
-							// -Mode - parameter isn't always needed, we need to check
-							if ((nValue & IRCParser.MODE_UNSET) == IRCParser.MODE_UNSET) {
-								sModeParam = sModestr[nParam++];
-								sNonUserModeStrParams = sNonUserModeStrParams+" "+sModeParam;
-							} else {
-								sModeParam = "";
-							}
-							callDebugInfo(IRCParser.DEBUG_INFO, "Unset Mode: %c [%s] {Positive: %b}",cMode, sModeParam, bPositive);
-							iChannel.setModeParam(cMode,"");
-							if (cbSingle != null) { cbSingle.call(iChannel, setterCCI, token[0], trim(cPositive+cMode+" "+sModeParam) ); }
-						}
-					}
-				}
-			}
-		}
-		
-		// Call Callbacks
-		for (int i = 0; i < sModestr.length; ++i) { sFullModeStr.append(sModestr[i]).append(" "); }
-		
-		iChannel.setMode(nCurrent);
-		if (sParam.equals("324")) { callChannelModeChanged(iChannel, null, "", sFullModeStr.toString().trim()); }
-		else { callChannelModeChanged(iChannel, setterCCI, token[0], sFullModeStr.toString().trim()); }
-		if (cbNonUser != null) { cbNonUser.call(iChannel, setterCCI, token[0], trim(sNonUserModeStr+sNonUserModeStrParams)); }
-	}
-	
-	/**
-	 * Process user modes.
-	 *
-	 * @param sParam String representation of parameter to parse
-	 * @param token IRCTokenised Array of the incomming line
-	 * @param clearOldModes Clear old modes before applying these modes (used by 221)
-	 */	
-	private void processUserMode(String sParam, String token[], String sModestr[], boolean clearOldModes) {
-		long nCurrent = 0, nValue = 0;
-		boolean bPositive = true;
-		
-		ClientInfo iClient;
-		
-		iClient = getClientInfo(token[2]);
-		if (iClient == null) { return; }
-		
-		if (clearOldModes) {
-			nCurrent = 0;
-		} else {
-			nCurrent = iClient.getUserMode();
-		}
-		
-		for (int i = 0; i < sModestr[0].length(); ++i) {
-			Character cMode = sModestr[0].charAt(i);
-			if (cMode.equals("+".charAt(0))) { bPositive = true; }
-			else if (cMode.equals("-".charAt(0))) { bPositive = false; }
-			else if (cMode.equals(":".charAt(0))) { continue; }
-			else {
-				if (myParser.hUserModes.containsKey(cMode)) { nValue = myParser.hUserModes.get(cMode); }
-				else {
-					// Unknown mode
-					callErrorInfo(new ParserError(ParserError.ERROR_WARNING, "Got unknown user mode "+cMode+" - Added", myParser.getLastLine()));
-					myParser.hUserModes.put(cMode,myParser.nNextKeyUser);
-					nValue = myParser.nNextKeyUser;
-					myParser.nNextKeyUser = myParser.nNextKeyUser*2;
-				}
-				// Usermodes are always boolean
-				callDebugInfo(IRCParser.DEBUG_INFO, "User Mode: %c [%d] {Positive: %b}",cMode, nValue, bPositive);
-				if (bPositive) { nCurrent = nCurrent | nValue; }
-				else { nCurrent = nCurrent ^ (nCurrent & nValue); }
-			}
-		}
-		
-		iClient.setUserMode(nCurrent);
-		if (sParam.equals("221")) {
-			callUserModeDiscovered(iClient, sModestr[0]);
-		} else {
-			callUserModeChanged(iClient, token[0], sModestr[0]);
-		}
-	}
-	
-	/**
-	 * Callback to all objects implementing the ChannelModeChanged Callback.
-	 *
-	 * @see IChannelModeChanged
-	 * @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 Exact String parsed
-	 * @return true if a method was called, false otherwise
-	 */
-	protected boolean callChannelModeChanged(ChannelInfo cChannel, ChannelClientInfo cChannelClient, String sHost, String sModes) {
-		return getCallbackManager().getCallbackType("OnChannelModeChanged").call(cChannel, cChannelClient, sHost, sModes);
-	}
-	
-	/**
-	 * Callback to all objects implementing the ChannelUserModeChanged Callback.
-	 *
-	 * @see IChannelUserModeChanged
-	 * @param cChannel Channel where modes were changed
-	 * @param cChangedClient Client being changed
-	 * @param cSetByClient Client chaning the modes (null if server)
-	 * @param sMode String representing mode change (ie +o)
-	 * @param sHost Host doing the mode changing (User host or server name)
-	 * @return true if a method was called, false otherwise
-	 */
-	protected boolean callChannelUserModeChanged(ChannelInfo cChannel, ChannelClientInfo cChangedClient, ChannelClientInfo cSetByClient, String sHost, String sMode) {
-		return getCallbackManager().getCallbackType("OnChannelUserModeChanged").call(cChannel, cChangedClient, cSetByClient, sHost, sMode);
-	}
-	
-	/**
-	 * Callback to all objects implementing the UserModeChanged Callback.
-	 *
-	 * @see IUserModeChanged
-	 * @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.
-	 * @return true if a method was called, false otherwise
-	 */
-	protected boolean callUserModeChanged(ClientInfo cClient, String sSetby, String sModes) {
-		return getCallbackManager().getCallbackType("OnUserModeChanged").call(cClient, sSetby, sModes);
-	}
-	
-	/**
-	 * Callback to all objects implementing the UserModeDiscovered Callback.
-	 *
-	 * @see IUserModeDiscovered
-	 * @param cClient Client that had the mode changed (almost always us)
-	 * @param sModes The modes set.
-	 * @return true if a method was called, false otherwise
-	 */
-	protected boolean callUserModeDiscovered(ClientInfo cClient, String sModes) {
-		return getCallbackManager().getCallbackType("OnUserModeDiscovered").call(cClient, sModes);
-	}	
-	
-	/**
-	 * What does this IRCProcessor handle.
-	 *
-	 * @return String[] with the names of the tokens we handle.
-	 */
-	@Override
-	public String[] handles() {
-		return new String[]{"MODE", "324", "221"};
-	} 
-	
-	/**
-	 * 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 ProcessMode (IRCParser parser, ProcessingManager manager) { super(parser, manager); }
-
-}

src/com/dmdirc/parser/irc/ProcessNames.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;
-
-/**
- * Process a Names reply.
- */
-public class ProcessNames extends IRCProcessor {
-	/**
-	 * Process a Names reply.
-	 *
-	 * @param sParam Type of line to process ("366", "353")
-	 * @param token IRCTokenised line to process
-	 */
-	@Override
-	public void process(String sParam, String[] token) {
-		ChannelInfo iChannel;
-		if (sParam.equals("366")) {
-			// End of names
-			iChannel = getChannelInfo(token[3]);
-			if (iChannel == null) { return; }
-			
-			iChannel.setAddingNames(false);
-			callChannelGotNames(iChannel);
-			
-			if (!iChannel.hasAskedForListModes()) {
-				if (myParser.getAutoListMode()) {
-					iChannel.requestListModes();
-				}
-			}
-		} else {
-			// Names
-			
-			ClientInfo iClient;
-			ChannelClientInfo iChannelClient;
-			
-			iChannel = getChannelInfo(token[4]);
-		
-			if (iChannel == null) { return; }
-			
-			// If we are not expecting names, clear the current known names - this is fresh stuff!
-			if (!iChannel.isAddingNames()) { iChannel.emptyChannel(); }
-			iChannel.setAddingNames(true);
-			
-			String[] sNames = token[token.length-1].split(" ");
-			String sNameBit = "", sName = "";
-			StringBuilder sModes = new StringBuilder();
-			long nPrefix = 0;
-			for (int j = 0; j < sNames.length; ++j) {
-				sNameBit = sNames[j];
-				// If name is empty (ie there was an extra space) ignore it.
-				if (sNameBit.isEmpty()) { continue; }
-				// This next bit of code allows for any ircd which decides to use @+Foo in names
-				for (int i = 0; i < sNameBit.length(); ++i) {
-					Character cMode = sNameBit.charAt(i);
-					// hPrefixMap contains @, o, +, v this caused issue 107
-					// hPrefixModes only contains o, v so if the mode is in hPrefixMap
-					// and not in hPrefixModes, its ok to use.
-					if (myParser.hPrefixMap.containsKey(cMode) && !myParser.hPrefixModes.containsKey(cMode)) {
-						sModes.append(cMode);
-						nPrefix = nPrefix + myParser.hPrefixModes.get(myParser.hPrefixMap.get(cMode));
-					} else {
-						sName = sNameBit.substring(i);
-						break;
-					}
-				}
-				callDebugInfo(IRCParser.DEBUG_INFO, "Name: %s Modes: \"%s\" [%d]",sName,sModes.toString(),nPrefix);
-				
-				iClient = getClientInfo(sName);
-				if (iClient == null) { iClient = new ClientInfo(myParser, sName); myParser.addClient(iClient); }
-				iChannelClient = iChannel.addClient(iClient);
-				iChannelClient.setChanMode(nPrefix);
-
-				sName = "";
-				sModes = new StringBuilder();
-				nPrefix = 0;
-			}
-		}
-	}
-	
-	/**
-	 * Callback to all objects implementing the ChannelGotNames Callback.
-	 *
-	 * @see IChannelGotNames
-	 * @param cChannel Channel which the names reply is for
-	 * @return true if a method was called, false otherwise
-	 */
-	protected boolean callChannelGotNames(ChannelInfo cChannel) {
-		return getCallbackManager().getCallbackType("OnChannelGotNames").call(cChannel);
-	}
-	
-	/**
-	 * What does this IRCProcessor handle.
-	 *
-	 * @return String[] with the names of the tokens we handle.
-	 */
-	@Override
-	public String[] handles() {
-		return new String[]{"353", "366"};
-	} 
-	
-	/**
-	 * 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 ProcessNames (IRCParser parser, ProcessingManager manager) { super(parser, manager); }
-
-}

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

@@ -1,124 +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;
-
-/**
- * Process a Nick change.
- */
-public class ProcessNick extends IRCProcessor {
-	/**
-	 * Process a Nick change.
-	 *
-	 * @param sParam Type of line to process ("NICK")
-	 * @param token IRCTokenised line to process
-	 */
-	@Override
-	public void process(String sParam, String[] token) {
-		ClientInfo iClient;
-		ChannelClientInfo iChannelClient;
-		String oldNickname;
-		
-		iClient = getClientInfo(token[0]);
-		if (iClient != null) {
-			oldNickname = myParser.getIRCStringConverter().toLowerCase(iClient.getNickname());
-			// Remove the client from the known clients list
-			final boolean isSameNick = myParser.getIRCStringConverter().equalsIgnoreCase(oldNickname, token[token.length-1]);
-			
-			if (!isSameNick) {
-				myParser.forceRemoveClient(getClientInfo(oldNickname));
-			}
-			// Change the nickame
-			iClient.setUserBits(token[token.length-1],true);
-			// Readd the client
-			if (!isSameNick && myParser.getClientInfo(iClient.getNickname()) != null) {
-//				myParser.onPostErrorInfo(new ParserError(ParserError.ERROR_FATAL, "Nick change would overwrite existing client", myParser.getLastLine()), false);
-				myParser.callErrorInfo(new ParserError(ParserError.ERROR_FATAL + ParserError.ERROR_USER, "Nick change would overwrite existing client", myParser.getLastLine()));
-			} else {
-				if (!isSameNick) {
-					myParser.addClient(iClient);
-				}
-				
-				for (ChannelInfo iChannel : myParser.getChannels()) {
-					// Find the user (using the old nickname)
-					iChannelClient = iChannel.getUser(oldNickname);
-					if (iChannelClient != null) {
-						// Rename them. This uses the old nickname (the key in the hashtable)
-						// and the channelClient object has access to the new nickname (by way
-						// of the ClientInfo object we updated above)
-						if (!isSameNick) {
-							iChannel.renameClient(oldNickname, iChannelClient);
-						}
-						callChannelNickChanged(iChannel,iChannelClient,ClientInfo.parseHost(token[0]));
-					}
-				}
-				
-				callNickChanged(iClient, ClientInfo.parseHost(token[0]));
-			}
-		}
-		
-	}
-	
-	/**
-	 * Callback to all objects implementing the ChannelNickChanged Callback.
-	 *
-	 * @see IChannelNickChanged
-	 * @param cChannel One of the channels that the user is on
-	 * @param cChannelClient Client changing nickname
-	 * @param sOldNick Nickname before change
-	 * @return true if a method was called, false otherwise
-	 */
-	protected boolean callChannelNickChanged(ChannelInfo cChannel, ChannelClientInfo cChannelClient, String sOldNick) {
-		return getCallbackManager().getCallbackType("OnChannelNickChanged").call(cChannel, cChannelClient, sOldNick);
-	}
-	
-	/**
-	 * Callback to all objects implementing the NickChanged Callback.
-	 *
-	 * @see INickChanged
-	 * @param cClient Client changing nickname
-	 * @param sOldNick Nickname before change
-	 * @return true if a method was called, false otherwise
-	 */
-	protected boolean callNickChanged(ClientInfo cClient, String sOldNick) {
-		return getCallbackManager().getCallbackType("OnNickChanged").call(cClient, sOldNick);
-	}
-	
-	/**
-	 * What does this IRCProcessor handle.
-	 *
-	 * @return String[] with the names of the tokens we handle.
-	 */
-	@Override
-	public String[] handles() {
-		return new String[]{"NICK"};
-	} 
-	
-	/**
-	 * 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 ProcessNick (IRCParser parser, ProcessingManager manager) { super(parser, manager); }
-
-}

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

@@ -1,97 +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;
-
-/**
- * Process a NickInUse message.
- * Parser implements handling of this if Pre-001 and no other handler found,
- * adding the NickInUse handler (addNickInUse) after 001 is prefered over before.<br><br>
- * <br>
- * If the first nickname is in use, and a NickInUse message is recieved before 001, we
- * will attempt to use the altnickname instead.<br>
- * If this also fails, we will start prepending _ (or the value of me.cPrepend) to the main nickname.
- */
-public class ProcessNickInUse extends IRCProcessor {
-	/**
-	 * Process a NickInUse message.
-	 * Parser implements handling of this if Pre-001 and no other handler found,
-	 * adding the NickInUse handler (addNickInUse) after 001 is prefered over before.<br><br>
-	 * <br>
-	 * If the first nickname is in use, and a NickInUse message is recieved before 001, we
-	 * will attempt to use the altnickname instead.<br>
-	 * If this also fails, we will start prepending _ (or the value of me.cPrepend) to the main nickname.
-	 *
-	 * @param sParam Type of line to process ("433")
-	 * @param token IRCTokenised line to process
-	 */
-	@Override
-	public void process(final String sParam, final String[] token) {
-		if (!callNickInUse(token[3])) {
-			// Manually handle nick in use.
-			callDebugInfo(IRCParser.DEBUG_INFO,"No Nick in use Handler.");
-			if (!myParser.got001) {
-				callDebugInfo(IRCParser.DEBUG_INFO,"Using inbuilt handler");
-				// If this is before 001 we will try and get a nickname, else we will leave the nick as-is
-				if (myParser.triedAlt) {
-					if (myParser.getIRCStringConverter().equalsIgnoreCase(myParser.sThinkNickname, myParser.me.getAltNickname())) {
-						myParser.sThinkNickname = myParser.me.getNickname();
-					}
-					myParser.setNickname(myParser.me.getPrependChar()+myParser.sThinkNickname);
-				} else {
-					myParser.setNickname(myParser.me.getAltNickname());
-					myParser.triedAlt = true; 
-				}
-			}
-		}
-	}
-	
-	/**
-	 * Callback to all objects implementing the NickInUse Callback.
-	 *
-	 * @param nickname Nickname that was wanted.
-	 * @see INickInUse
-	 * @return true if a method was called, false otherwise
-	 */
-	protected boolean callNickInUse(final String nickname) {
-		return getCallbackManager().getCallbackType("OnNickInUse").call(nickname);
-	}
-	
-	/**
-	 * What does this IRCProcessor handle.
-	 *
-	 * @return String[] with the names of the tokens we handle.
-	 */
-	@Override
-	public String[] handles() {
-		return new String[]{"433"};
-	}
-	
-	/**
-	 * Create a new instance of the ProcessNickInUse Object.
-	 *
-	 * @param parser IRCParser That owns this object
-	 * @param manager ProcessingManager that is in charge of this object
-	 */
-	protected ProcessNickInUse (final IRCParser parser, final ProcessingManager manager) { super(parser, manager); }
-
-}

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

@@ -1,69 +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;
-
-/**
- * Process a NoticeAuth message.
- */
-public class ProcessNoticeAuth extends IRCProcessor {
-	/**
-	 * Process a NoticeAuth message.
-	 *
-	 * @param sParam Type of line to process ("Notice Auth")
-	 * @param token IRCTokenised line to process
-	 */
-	@Override
-	public void process(final String sParam, final String[] token) {
-		callNoticeAuth(token[token.length-1]);
-	}
-	
-	/**
-	 * Callback to all objects implementing the NoticeAuth Callback.
-	 *
-	 * @see INoticeAuth
-	 * @param data Incomming Line.
-	 * @return true if a method was called, false otherwise
-	 */
-	protected boolean callNoticeAuth(final String data) {
-		return getCallbackManager().getCallbackType("OnNoticeAuth").call(data);
-	}
-	
-	/**
-	 * What does this IRCProcessor handle.
-	 *
-	 * @return String[] with the names of the tokens we handle.
-	 */
-	@Override
-	public String[] handles() {
-		return new String[]{"Notice Auth"};
-	} 
-	
-	/**
-	 * Create a new instance of the ProcessNoticeAuth Object.
-	 *
-	 * @param parser IRCParser That owns this object
-	 * @param manager ProcessingManager that is in charge of this object
-	 */
-	protected ProcessNoticeAuth (final IRCParser parser, final ProcessingManager manager) { super(parser, manager); }
-
-}

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

@@ -1,108 +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;
-
-/**
- * Process a channel part.
- */
-public class ProcessPart extends IRCProcessor {
-
-	/**
-	 * Process a channel part.
-	 *
-	 * @param sParam Type of line to process ("PART")
-	 * @param token IRCTokenised line to process
-	 */
-	@Override
-	public void process(final String sParam, final String[] token) {
-		// :nick!ident@host PART #Channel
-		// :nick!ident@host PART #Channel :reason
-		if (token.length < 3) { return; }
-		ClientInfo iClient;
-		ChannelInfo iChannel;
-		ChannelClientInfo iChannelClient;
-		
-		iClient = getClientInfo(token[0]);
-		iChannel = getChannelInfo(token[2]);
-		
-		if (iClient == null) { return; }
-		if (IRCParser.ALWAYS_UPDATECLIENT && iClient.getHost().isEmpty()) {
-			// This may seem pointless - updating before they leave - but the formatter needs it!
-			iClient.setUserBits(token[0],false);
-		}
-		if (iChannel == null) { 
-			if (iClient != myParser.getMyself()) {
-				callErrorInfo(new ParserError(ParserError.ERROR_WARNING, "Got part for channel ("+token[2]+") that I am not on. [User: "+token[0]+"]", myParser.getLastLine()));
-			}
-			return;
-		} else {
-			String sReason = "";
-			if (token.length > 3) { sReason = token[token.length-1]; }
-			iChannelClient = iChannel.getUser(iClient);
-			if (iChannelClient == null) {
-				// callErrorInfo(new ParserError(ParserError.ERROR_WARNING, "Got part for channel ("+token[2]+") for a non-existant user. [User: "+token[0]+"]", myParser.getLastLine()));
-				return;
-			}
-			if (myParser.removeAfterCallback) { callChannelPart(iChannel,iChannelClient,sReason); }
-			callDebugInfo(IRCParser.DEBUG_INFO, "Removing %s from %s",iClient.getNickname(),iChannel.getName());
-			iChannel.delClient(iClient);
-			if (!myParser.removeAfterCallback) { callChannelPart(iChannel,iChannelClient,sReason); }
-			if (iClient == myParser.getMyself()) {
-				iChannel.emptyChannel();
-				myParser.removeChannel(iChannel);
-			}
-		}
-	}
-	
-	/**
-	 * Callback to all objects implementing the ChannelPart Callback.
-	 *
-	 * @see IChannelPart
-	 * @param cChannel Channel that the user parted
-	 * @param cChannelClient Client that parted
-	 * @param sReason Reason given for parting (May be "")
-	 * @return true if a method was called, false otherwise
-	 */
-	protected boolean callChannelPart(final ChannelInfo cChannel, final ChannelClientInfo cChannelClient, final String sReason) {
-		return getCallbackManager().getCallbackType("OnChannelPart").call(cChannel, cChannelClient, sReason);
-	}
-	
-	/**
-	 * What does this IRCProcessor handle.
-	 *
-	 * @return String[] with the names of the tokens we handle.
-	 */
-	@Override
-	public String[] handles() {
-		return new String[]{"PART"};
-	} 
-	
-	/**
-	 * 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 ProcessPart (IRCParser parser, ProcessingManager manager) { super(parser, manager); }
-
-}

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

@@ -1,123 +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.util.ArrayList;
-
-/**
- * Process a Quit message.
- */
-public class ProcessQuit extends IRCProcessor {
-
-	/**
-	 * Process a Quit message.
-	 *
-	 * @param sParam Type of line to process ("QUIT")
-	 * @param token IRCTokenised line to process
-	 */
-	@Override
-	public void process(final String sParam, final String[] token) {
-		// :nick!ident@host QUIT
-		// :nick!ident@host QUIT :reason
-		if (token.length < 2) { return; }
-		ClientInfo iClient;
-		ChannelClientInfo iChannelClient;
-		
-		iClient = getClientInfo(token[0]);
-		
-		if (iClient == null) { return; }
-		if (IRCParser.ALWAYS_UPDATECLIENT && iClient.getHost().isEmpty()) {
-			// This may seem pointless - updating before they leave - but the formatter needs it!
-			iClient.setUserBits(token[0],false);
-		}
-		String sReason = "";
-		if (token.length > 2) { sReason = token[token.length-1]; }
-		
-		ArrayList<ChannelInfo> channelList = new ArrayList<ChannelInfo>(myParser.getChannels());
-		for (ChannelInfo iChannel : channelList) {
-			iChannelClient = iChannel.getUser(iClient);
-			if (iChannelClient != null) {
-				if (myParser.removeAfterCallback) { callChannelQuit(iChannel,iChannelClient,sReason); }
-				if (iClient == myParser.getMyself()) {
-					iChannel.emptyChannel();
-					myParser.removeChannel(iChannel);
-				} else {
-					iChannel.delClient(iClient);
-				}
-				if (!myParser.removeAfterCallback) { callChannelQuit(iChannel,iChannelClient,sReason); }
-			}
-		}
-
-		if (myParser.removeAfterCallback) { callQuit(iClient,sReason); }
-		if (iClient == myParser.getMyself()) {
-			myParser.clearClients();
-		} else {
-			myParser.removeClient(iClient);
-		}
-		if (!myParser.removeAfterCallback) { callQuit(iClient,sReason); }
-	}	
-	
-	/**
-	 * Callback to all objects implementing the ChannelQuit Callback.
-	 *
-	 * @see IChannelQuit
-	 * @param cChannel Channel that user was on
-	 * @param cChannelClient User thats quitting
-	 * @param sReason Quit reason
-	 * @return true if a method was called, false otherwise
-	 */
-	protected boolean callChannelQuit(final ChannelInfo cChannel, final ChannelClientInfo cChannelClient, final String sReason) {
-		return getCallbackManager().getCallbackType("OnChannelQuit").call(cChannel, cChannelClient, sReason);
-	}
-	
-	/**
-	 * Callback to all objects implementing the Quit Callback.
-	 *
-	 * @see IQuit
-	 * @param cClient Client Quitting
-	 * @param sReason Reason for quitting (may be "")
-	 * @return true if a method was called, false otherwise
-	 */
-	protected boolean callQuit(final ClientInfo cClient, final String sReason) {
-		return getCallbackManager().getCallbackType("OnQuit").call(cClient, sReason);
-	}
-	
-	/**
-	 * What does this IRCProcessor handle.
-	 *
-	 * @return String[] with the names of the tokens we handle.
-	 */
-	@Override
-	public String[] handles() {
-		return new String[]{"QUIT"};
-	} 
-	
-	/**
-	 * 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 ProcessQuit (IRCParser parser, ProcessingManager manager) { super(parser, manager); }
-
-}

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

@@ -1,99 +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;
-
-/**
- * Process a topic change.
- */
-public class ProcessTopic extends IRCProcessor {
-	/**
-	 * Process a topic change.
-	 *
-	 * @param sParam Type of line to process ("TOPIC", "332", "333")
-	 * @param token IRCTokenised line to process
-	 */
-	@Override
-	public void process(final String sParam, final String[] token) {
-		ChannelInfo iChannel;
-		if (sParam.equals("332")) {
-			iChannel = getChannelInfo(token[3]);
-			if (iChannel == null) { return; }
-			iChannel.setTopic(token[token.length-1]);
-		} else if (sParam.equals("333")) {
-			if (token.length > 3) {
-				iChannel = getChannelInfo(token[3]);
-				if (iChannel == null) { return; }
-				if (token.length > 4) {
-					iChannel.setTopicUser(token[4]);
-					if (token.length > 5) {
-						iChannel.setTopicTime(Long.parseLong(token[5]));
-					}
-				}
-				callChannelTopic(iChannel,true);
-			}
-		} else {
-			if (IRCParser.ALWAYS_UPDATECLIENT) {
-				final ClientInfo iClient = getClientInfo(token[0]);
-				if (iClient != null && iClient.getHost().isEmpty()) {iClient.setUserBits(token[0],false); }
-			}
-			iChannel = getChannelInfo(token[2]);
-			if (iChannel == null) { return; }
-			iChannel.setTopicTime(System.currentTimeMillis() / 1000);
-			if (token[0].charAt(0) == ':') { token[0] = token[0].substring(1); }
-			iChannel.setTopicUser(token[0]);
-			iChannel.setTopic(token[token.length-1]);
-			callChannelTopic(iChannel,false);
-		}
-	}
-	
-	/**
-	 * Callback to all objects implementing the ChannelTopic Callback.
-	 *
-	 * @see IChannelTopic
-	 * @param cChannel Channel that topic was set on
-	 * @param bIsJoinTopic True when getting topic on join, false if set by user/server
-	 * @return true if a method was called, false otherwise
-	 */
-	protected boolean callChannelTopic(final ChannelInfo cChannel, final boolean bIsJoinTopic) {
-		return getCallbackManager().getCallbackType("OnChannelTopic").call(cChannel, bIsJoinTopic);
-	}
-	
-	/**
-	 * What does this IRCProcessor handle.
-	 *
-	 * @return String[] with the names of the tokens we handle.
-	 */
-	@Override
-	public String[] handles() {
-		return new String[]{"TOPIC", "332", "333"};
-	} 
-	
-	/**
-	 * 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 ProcessTopic (IRCParser parser, ProcessingManager manager) { super(parser, manager); }
-
-}

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

@@ -1,111 +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;
-
-/**
- * Process a WALLOPS Message.
- */
-public class ProcessWallops extends IRCProcessor {
-	/**
-	 * Process a Wallops Message.
-	 *
-	 * @param sParam Type of line to process ("WALLOPS")
-	 * @param token IRCTokenised line to process
-	 */
-	@Override
-	public void process(final String sParam, final String[] token) {
-		if (token.length < 3) { return; }
-		
-		String user = token[0];
-		String message = token[token.length-1];
-		if (user.charAt(0) == ':' && user.length() > 1) { user = user.substring(1); }
-		String[] bits = message.split(" ", 2);
-
-		if (bits.length > 1) {
-			if (message.charAt(0) == '*') {
-				callWallop(bits[1], user);
-				return;
-			} else if (message.charAt(0) == '$') {
-				callWalluser(bits[1], user);
-				return;
-			}
-		}
-		callWallDesync(message, user);
-	}
-	
-	/**
-	 * Callback to all objects implementing the Wallop Callback.
-	 *
-	 * @see IWallop
-	 * @param host Host of the user who sent the wallop
-	 * @param message The message
-	 * @return true if a method was called, false otherwise
-	 */
-	protected boolean callWallop(final String message, final String host) {
-		return getCallbackManager().getCallbackType("OnWallop").call(message, host);
-	}
-	
-	/**
-	 * Callback to all objects implementing the Walluser Callback.
-	 *
-	 * @see IWalluser
-	 * @param host Host of the user who sent the walluser
-	 * @param message The message
-	 * @return true if a method was called, false otherwise
-	 */
-	protected boolean callWalluser(final String message, final String host) {
-		return getCallbackManager().getCallbackType("OnWalluser").call(message, host);
-	}
-	
-	/**
-	 * Callback to all objects implementing the WallDesync Callback.
-	 *
-	 * @see IWallDesync
-	 * @param host Host of the user who sent the WallDesync
-	 * @param message The message
-	 * @return true if a method was called, false otherwise
-	 */
-	protected boolean callWallDesync(final String message, final String host) {
-		return getCallbackManager().getCallbackType("OnWallDesync").call(message, host);
-	}
-	
-	
-	/**
-	 * What does this IRCProcessor handle.
-	 *
-	 * @return String[] with the names of the tokens we handle.
-	 */
-	@Override
-	public String[] handles() {
-		return new String[]{"WALLOPS"};
-	} 
-	
-	/**
-	 * 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 ProcessWallops (IRCParser parser, ProcessingManager manager) { super(parser, manager); }
-
-}

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

@@ -1,137 +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;
-
-/**
- * Process a /who reply.
- */
-public class ProcessWho extends IRCProcessor {
-	/**
-	 * Process a /who reply.
-	 *
-	 * @param sParam Type of line to process ("352")
-	 * @param token IRCTokenised line to process
-	 */
-	@Override
-	public void process(final String sParam, final String[] token) {
-		// :blueyonder2.uk.quakenet.org 352 Dataforce #mdbot shane Tobavaj.users.quakenet.org *.quakenet.org Tobavaj G+x :3 Tobavaj - http://shane.dmdirc.com/scriptbot.php
-		//              0               1      2        3     4              5                      6           7     8        9
-		// :blueyonder2.uk.quakenet.org 352 Dataforce #mdbot ~Dataforce ResNetUser-BrynDinas-147.143.246.102.bangor.ac.uk *.quakenet.org Dataforce H@ :0 Dataforce
-		//              0               1      2        3      4                               5                            6              7      8        9
-		// :blueyonder2.uk.quakenet.org 352 Dataforce #mdbot shane soren.dataforce.org.uk *.quakenet.org DF|Soren H :3 Unknown
-		//              0               1      2        3     4              5                      6       7     8      9
-		// :server 352 mynickname channel username address server nick flags :hops info
-		//     0    1      2         3     4          5      6      7    8        9
-		
-//		ChannelInfo channel = myParser.getChannelInfo(token[3]);
-//		ChannelClientInfo channelClient = channel.getUser(token[7]);
-//		ClientInfo client = channelClient.getClient();
-		final ClientInfo client = myParser.getClientInfo(token[7]);
-		if (client != null) {
-			// Update ident/host
-			client.setUserBits(token[7]+"!"+token[4]+"@"+token[5], false);
-			// Update real name
-			if (client.getRealName().isEmpty()) {
-				final String name = token[9].split(" ", 2)[1];
-				client.setRealName(name);
-			}
-			// Update away state
-			final String mode = token[8];
-			final boolean isAway = mode.indexOf('G') != -1;
-			if (client.getAwayState() != isAway) {
-//				System.out.println("Away state for '"+client+"' changed to: "+isAway);
-				client.setAwayState(isAway);
-				if (!isAway) { client.setAwayReason(""); }
-				if (client == myParser.getMyself()) {
-					callAwayState(client.getAwayState(), client.getAwayReason());
-				} else {
-					callAwayStateOther(client, isAway);
-					
-					ChannelClientInfo iChannelClient;
-					for (ChannelInfo iChannel : myParser.getChannels()) {
-						iChannelClient = iChannel.getUser(client);
-						if (iChannelClient != null) {
-							callChannelAwayStateOther(iChannel,iChannelClient,isAway);
-						}
-					}
-				}
-			}
-		}
-	}
-	
-	/**
-	 * Callback to all objects implementing the onAwayState Callback.
-	 *
-	 * @see IAwayState
-	 * @param currentState Set to true if we are now away, else false.
-	 * @param reason Best guess at away reason
-	 * @return true if a method was called, false otherwise
-	 */
-	protected boolean callAwayState(boolean currentState, String reason) {
-		return getCallbackManager().getCallbackType("OnAwayState").call(currentState, reason);
-	}
-	
-	/**
-	 * Callback to all objects implementing the onAwayStateOther Callback.
-	 *
-	 * @see IAwayStateOther
-	 * @param client Client this is for
-	 * @param state Away State (true if away, false if here)
-	 * @return true if a method was called, false otherwise
-	 */
-	protected boolean callAwayStateOther(final ClientInfo client, final boolean state) {
-		return getCallbackManager().getCallbackType("OnAwayStateOther").call(client, state);
-	}
-	
-	/**
-	 * Callback to all objects implementing the onChannelAwayStateOther Callback.
-	 *
-	 * @see IAwayStateOther
-	 * @param channel Channel this is for
-	 * @param channelClient ChannelClient this is for
-	 * @param state Away State (true if away, false if here)
-	 * @return true if a method was called, false otherwise
-	 */
-	protected boolean callChannelAwayStateOther(final ChannelInfo channel, final ChannelClientInfo channelClient, final boolean state) {
-		return getCallbackManager().getCallbackType("OnChannelAwayStateOther").call(channel, channelClient, state);
-	}
-	
-	/**
-	 * What does this IRCProcessor handle.
-	 *
-	 * @return String[] with the names of the tokens we handle.
-	 */
-	@Override
-	public String[] handles() {
-		return new String[]{"352"};
-	} 
-	
-	/**
-	 * 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 ProcessWho (IRCParser parser, ProcessingManager manager) { super(parser, manager); }
-
-}

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

@@ -1,220 +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.util.Hashtable;
-
-/**
- * IRC Parser Processing Manager.
- * Manages adding/removing/calling processing stuff.
- *
- * @author Shane Mc Cormack
- */
-public class ProcessingManager {
-	/** Reference to the parser object that owns this ProcessingManager */
-	IRCParser myParser;
-
-	/** Hashtable used to store the different types of IRCProcessor known. */
-	private final Hashtable<String,IRCProcessor> processHash = new Hashtable<String,IRCProcessor>();
-
-	/**
-	 * Debugging Data to the console.
-	 */
-	private void doDebug(final String line, final Object... args) {
-		myParser.callDebugInfo(IRCParser.DEBUG_PROCESSOR, line, args);
-	}
-
-	/**
-	 * Constructor to create a ProcessingManager.
-	 *
-	 * @param parser IRCParser that owns this Processing Manager
-	 */
-	public ProcessingManager(IRCParser parser) {
-		myParser = parser;
-		//------------------------------------------------
-		// Add processors
-		//------------------------------------------------
-		// NOTICE AUTH
-		addProcessor(new ProcessNoticeAuth(myParser, this));
-		// 001
-		addProcessor(new Process001(myParser, this));
-		// 004
-		// 005
-		addProcessor(new Process004005(myParser, this));
-		// 464
-		addProcessor(new Process464(myParser, this));
-		// 301
-		// 305
-		// 306
-		addProcessor(new ProcessAway(myParser, this));
-		// 352
-		addProcessor(new ProcessWho(myParser, this));
-		// INVITE
-		addProcessor(new ProcessInvite(myParser, this));
-		// JOIN
-		addProcessor(new ProcessJoin(myParser, this));
-		// KICK
-		addProcessor(new ProcessKick(myParser, this));
-		// PRIVMSG
-		// NOTICE
-		addProcessor(new ProcessMessage(myParser, this));
-		// MODE
-		// 324
-		addProcessor(new ProcessMode(myParser, this));
-		// 372
-		// 375
-		// 376
-		// 422
-		addProcessor(new ProcessMOTD(myParser, this));
-		// 353
-		// 366
-		addProcessor(new ProcessNames(myParser, this));
-		// 433
-		addProcessor(new ProcessNickInUse(myParser, this));
-		// NICK
-		addProcessor(new ProcessNick(myParser, this));
-		// PART
-		addProcessor(new ProcessPart(myParser, this));
-		// QUIT
-		addProcessor(new ProcessQuit(myParser, this));
-		// TOPIC
-		// 332
-		// 333
-		addProcessor(new ProcessTopic(myParser, this));
-		// 344
-		// 345
-		// 346
-		// 347
-		// 348
-		// 349
-		// 367
-		// 368
-		addProcessor(new ProcessListModes(myParser, this));
-		// WALLOPS
-		addProcessor(new ProcessWallops(myParser, this));
-	}
-
-	/**
-	 * Add new Process type.
-	 *
-	 * @param processor IRCProcessor subclass for the processor.
-	 */
-	public void addProcessor(final IRCProcessor processor) {
-		// handles() returns a String array of all the tokens
-		// that this processor will parse.
-		addProcessor(processor.handles(), processor);
-	}
-
-	/**
-	 * Add a processor to tokens not-specified in the handles() reply.
-	 *
-	 * @param processor IRCProcessor subclass for the processor.
-	 * @param handles String Array of tokens to add this processor as a hadler for
-	 */
-	public void addProcessor(final String[] handles, final IRCProcessor processor) {
-		doDebug("Adding processor: "+processor.getName());
-
-		for (int i = 0; i < handles.length; ++i) {
-			if (processHash.containsKey(handles[i].toLowerCase())) {
-				// New Processors take priority over old ones
-				processHash.remove(handles[i].toLowerCase());
-			}
-			doDebug("\t Added handler for: "+handles[i]);
-			processHash.put(handles[i].toLowerCase(), processor);
-		}
-	}
-
-	/**
-	 * Remove a Process type.
-	 *
-	 * @param processor IRCProcessor subclass for the processor.
-	 */
-	public void delProcessor(final IRCProcessor processor) {
-		IRCProcessor testProcessor;
-		doDebug("Deleting processor: "+processor.getName());
-		for (String elementName : processHash.keySet()) {
-			doDebug("\t Checking handler for: "+elementName);
-			testProcessor = processHash.get(elementName);
-			if (testProcessor.getName().equalsIgnoreCase(processor.getName())) {
-				doDebug("\t Removed handler for: "+elementName);
-				processHash.remove(elementName);
-			}
-		}
-	}
-
-	/**
-	 * Get the processor used for a specified token.
-	 *
-	 * @param sParam Type of line to process ("005", "PRIVMSG" etc)
-	 * @return IRCProcessor for the given param.
-	 * @throws ProcessorNotFoundException if no processer exists for the param
-	 */
-	public IRCProcessor getProcessor(final String sParam) throws ProcessorNotFoundException {
-		if (processHash.containsKey(sParam.toLowerCase())) {
-			return processHash.get(sParam.toLowerCase());
-		} else {
-			throw new ProcessorNotFoundException("No processors will handle "+sParam);
-		}
-	}
-
-	/**
-	 * Process a Line.
-	 *
-	 * @param sParam Type of line to process ("005", "PRIVMSG" etc)
-	 * @param token IRCTokenised line to process
-	 * @throws ProcessorNotFoundException exception if no processors exists to handle the line
-	 */
-	public void process(final String sParam, final String[] token) throws ProcessorNotFoundException {
-		IRCProcessor messageProcessor = null;
-		try {
-			messageProcessor = getProcessor(sParam);
-			messageProcessor.process(sParam, token);
-		} catch (ProcessorNotFoundException p) {
-			throw p;
-		} catch (Exception e) {
-			final ParserError ei = new ParserError(ParserError.ERROR_ERROR,"Exception in Processor. ["+messageProcessor+"]: "+e.getMessage(), myParser.getLastLine());
-			ei.setException(e);
-			myParser.callErrorInfo(ei);
-		} finally {
-			// Try to call callNumeric. We don't want this to work if sParam is a non
-			// integer param, hense the empty catch
-			try {
-				callNumeric(Integer.parseInt(sParam), token);
-			} catch (NumberFormatException e) { }
-		}
-	}
-
-	/**
-	 * Callback to all objects implementing the onNumeric Callback.
-	 *
-	 * @see INumeric
-	 * @param numeric What numeric is this for
-	 * @param token IRC Tokenised line
-	 * @return true if a method was called, false otherwise
-	 */
-	protected boolean callNumeric(final int numeric, final String[] token) {
-		return myParser.getCallbackManager().getCallbackType("OnNumeric").call(numeric, token);
-	}
-
-}
-

src/com/dmdirc/parser/irc/ProcessorNotFoundException.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.irc;
-
-/**
- * IRC Parser Processor Not Found Exception.
- *
- * @author Shane Mc Cormack
- */
-public class ProcessorNotFoundException extends Exception {
-	/**
-	 * 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 ProcessorNotFound Exception.
-	 *
-	 * @param message Reason for exception
-	 */
-	public ProcessorNotFoundException(final String message) { super(message); }
-
-}

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

@@ -1,166 +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.util.ArrayList;
-import java.util.List;
-import java.util.regex.PatternSyntaxException;
-
-/**
- * IRC Parser Ignore list.
- *
- * @author Shane Mc Cormack
- */
-public class RegexStringList {
-
-	/** Arraylist storing ignore patterns. */
-	protected final List<String> ignoreInfo = new ArrayList<String>();
-
-	/**
-	 * Creates a new instance of RegexStringList.
-	 */
-	public RegexStringList() {
-		// Do nothing
-	}
-
-	/**
-	 * Creates a new instance of RegexStringList, with the specified items.
-	 *
-	 * @param items Items to add to this RegexStringList
-	 */
-	public RegexStringList(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();
-	}
-
-}

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

@@ -1,201 +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;
-
-/**
- * Contains Server information.
- * 
- * @author Shane Mc Cormack
- * @author Chris Smith
- * @see IRCParser
- */
-public class ServerInfo {
-	/**
-	 * 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;
-
-	/** Server to connect to (Default: "irc.quakenet.org"). */
-	private String host = "irc.quakenet.org";
-	/** Port server listens on for client connections (Default: 6667). */
-	private int port = 6667;
-	/** Optional password needed to connect to server (Default: ""). */
-	private String password = "";
-	/** Is this an ssl-enabled server (Default: false). */
-	private boolean isSSL = false;	
-	/** Are we using a socks proxy (Default: false). */
-	private boolean useSocksProxy = false;
-	/** Proxy server to connect to (Default: "127.0.0.1"). */
-	private String proxyHost = "127.0.0.1";
-	/** Port server listens on for client connections (Default: 8080). */
-	private int proxyPort = 1080;
-	/** Proxy username if required. */
-	private String proxyUser = "";
-	/** Proxy password if required. */
-	private String proxyPass = "";
-	
-	/** Constructor using Default values. */
-	public ServerInfo () { }
-	
-	/**
-	 * Constructor using specifed host, port and password, SSL/Proxy must be specifed separately.
-	 *
-	 * @param serverHost Host to use
-	 * @param serverPort Port to use
-	 * @param serverPass Password to use
-	 */
-	public ServerInfo (final String serverHost, final int serverPort, final String serverPass) {
-		host = serverHost;
-		port = serverPort;
-		password = serverPass;
-	}
-	
-	/**
-	 * Set the hostname.
-	 *
-	 * @param newValue Value to set to.
-	 */
-	public void setHost(final String newValue) { host = newValue; }
-	
-	/**
-	 * Get the hostname.
-	 *
-	 * @return Current hostname
-	 */
-	public String getHost() { return host; }
-	
-	/**
-	 * Set the port.
-	 *
-	 * @param newValue Value to set to.
-	 */
-	public void setPort(final int newValue) { port = newValue; }
-	
-	/**
-	 * Get the port.
-	 *
-	 * @return Current port
-	 */
-	public int getPort() { return port; }
-	
-	/**
-	 * Set the password.
-	 *
-	 * @param newValue Value to set to.
-	 */
-	public void setPassword(final String newValue) { password = newValue; }
-	
-	/**
-	 * Get the password.
-	 *
-	 * @return Current Password
-	 */
-	public String getPassword() { return password; }
-	
-	/**
-	 * Set if the server uses ssl.
-	 *
-	 * @param newValue true if server uses ssl, else false
-	 */
-	public void setSSL(final boolean newValue) { isSSL = newValue; }
-	
-	/**
-	 * Get if the server uses ssl.
-	 *
-	 * @return true if server uses ssl, else false
-	 */
-	public boolean getSSL() { return isSSL; }
-	
-	/**
-	 * Set if we are connecting via a socks proxy.
-	 *
-	 * @param newValue true if we are using socks, else false
-	 */
-	public void setUseSocks(final boolean newValue) { useSocksProxy = newValue; }
-	
-	/**
-	 * Get if we are connecting via a socks proxy.
-	 *
-	 * @return true if we are using socks, else false
-	 */
-	public boolean getUseSocks() { return useSocksProxy; }
-	
-	/**
-	 * Set the Proxy hostname.
-	 *
-	 * @param newValue Value to set to.
-	 */
-	public void setProxyHost(final String newValue) { proxyHost = newValue; }
-	
-	/**
-	 * Get the Proxy hostname.
-	 *
-	 * @return Current Proxy hostname
-	 */
-	public String getProxyHost() { return proxyHost; }
-	
-	/**
-	 * Set the Proxy port.
-	 *
-	 * @param newValue Value to set to.
-	 */
-	public void setProxyPort(final int newValue) { proxyPort = newValue; }
-	
-	/**
-	 * Get the Proxy port.
-	 *
-	 * @return Current Proxy port
-	 */
-	public int getProxyPort() { return proxyPort; }
-
-	/**
-	 * Set the Proxy username.
-	 *
-	 * @param newValue Value to set to.
-	 */
-	public void setProxyUser(final String newValue) { proxyUser = newValue; }
-	
-	/**
-	 * Get the Proxy username.
-	 *
-	 * @return Current Proxy username
-	 */
-	public String getProxyUser() { return proxyUser; }
-	
-	/**
-	 * Set the Proxy password.
-	 *
-	 * @param newValue Value to set to.
-	 */
-	public void setProxyPass(final String newValue) { proxyPass = newValue; }
-	
-	/**
-	 * Get the Proxy password.
-	 *
-	 * @return Current Proxy password
-	 */
-	public String getProxyPass() { return proxyPass; }
-}
-

src/com/dmdirc/parser/irc/SocketState.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.irc;
-
-/**
- * An enumeration of possible states of an IRC Parser's socket.
- *
- * @since 0.6.3
- * @author chris
- */
-public enum SocketState {
-
-    /** Socket is not created yet. */
-    NULL,
-    /** Socket is closed. */
-    CLOSED,
-    /** Socket is Open. */
-    OPEN;
-
-}

src/com/dmdirc/parser/irc/callbacks/CallbackManager.java

@@ -1,226 +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.callbacks;
-
-import com.dmdirc.parser.irc.IRCParser;
-import com.dmdirc.parser.irc.callbacks.interfaces.*;
-
-import java.util.Hashtable;
-import java.util.Map;
-
-/**
- * IRC Parser Callback Manager.
- * Manages adding/removing/calling callbacks.
- *
- * @author            Shane Mc Cormack
- */
-public final class CallbackManager {
-
-    private static final Class[] CLASSES = {
-        IAwayState.class, IAwayStateOther.class, IChannelAwayStateOther.class,
-        IChannelAction.class, IChannelCTCP.class, IChannelCTCPReply.class,
-        IChannelGotListModes.class, IChannelGotNames.class, IChannelJoin.class,
-        IChannelKick.class, IChannelMessage.class, IChannelModeChanged.class,
-        IChannelNickChanged.class, IChannelNonUserModeChanged.class,
-        IChannelNotice.class, IChannelPart.class, IChannelQuit.class,
-        IChannelSelfJoin.class, IChannelSingleModeChanged.class,
-        IChannelTopic.class, IChannelUserModeChanged.class, IConnectError.class,
-        IDataIn.class, IDataOut.class, IDebugInfo.class, IErrorInfo.class,
-        IGotNetwork.class, IInvite.class, IMOTDEnd.class, IMOTDLine.class,
-        IMOTDStart.class, INickChanged.class, INickInUse.class,
-        INoticeAuth.class, INumeric.class, IPasswordRequired.class,
-        IPingFailed.class, IPingSuccess.class, IPingSent.class, IPrivateAction.class,
-        IPrivateCTCP.class, IPrivateCTCPReply.class, IPrivateMessage.class,
-        IPrivateNotice.class, IPost005.class, IQuit.class, IServerError.class,
-        IServerReady.class, ISocketClosed.class, IUnknownAction.class,
-        IUnknownCTCP.class, IUnknownCTCPReply.class, IUnknownMessage.class,
-        IUnknownNotice.class, IUserModeChanged.class, IUserModeDiscovered.class,
-        IWallDesync.class, IWallop.class, IWalluser.class,
-    };
-
-	/** Reference to the parser object that owns this CallbackManager. */
-	IRCParser myParser;
-	
-	/** Hashtable used to store the different types of callback known. */
-	private final Map<String, CallbackObject> callbackHash = new Hashtable<String, CallbackObject>();
-	
-	/**
-	 * Constructor to create a CallbackManager.
-	 *
-	 * @param parser IRCParser that owns this callback manager.
-	 */
-	public CallbackManager(final IRCParser parser) {
-		myParser = parser;
-		
-        for (Class<?> type : CLASSES) {
-            if (type.isAnnotationPresent(SpecificCallback.class)) {
-                addCallbackType(new CallbackObjectSpecific(myParser, this,
-                        type.asSubclass(ICallbackInterface.class)));
-            } else {
-                addCallbackType(new CallbackObject(myParser, this,
-                        type.asSubclass(ICallbackInterface.class)));
-            }
-        }
-	}
-
-	/**
-	 * 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.getLowerName())) {
-			callbackHash.put(callback.getLowerName(), 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.getLowerName())) {
-			callbackHash.remove(callback.getLowerName());
-			return true;
-		}
-		return false;
-	}
-	
-	/**
-	 * Get reference to callback object.
-	 *
-	 * @param callbackName Name of callback object.
-	 * @return CallbackObject returns the callback object for this type
-	 */
-	public CallbackObject getCallbackType(final String callbackName) {
-		if (!callbackHash.containsKey(callbackName.toLowerCase())) {
-			throw new CallbackNotFoundException("Callback not found: " + callbackName);
-		}
-		
-		return callbackHash.get(callbackName.toLowerCase());
-	}
-	
-	/**
-	 * Remove all callbacks associated with a specific object.
-	 *
-	 * @param o instance of ICallbackInterface to remove.
-	 */
-	public void delAllCallback(final ICallbackInterface 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 ICallbackInterface 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 callbackName Name of callback object.
-	 * @param o instance of ICallbackInterface to add.
-	 * @throws CallbackNotFoundException If callback is not found.
-	 * @throws NullPointerException If 'o' is null
-	 */
-	public void addCallback(final String callbackName, final ICallbackInterface o) throws CallbackNotFoundException {
-		if (o == null) {
-			throw new NullPointerException("CallbackInterface is null");
-		}
-		
-		final CallbackObject cb = getCallbackType(callbackName);
-		
-		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 callbackName Name 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 void addCallback(final String callbackName, final ICallbackInterface o, final String target) throws CallbackNotFoundException {
-		if (o == null) { throw new NullPointerException("CallbackInterface is null"); }
-		((CallbackObjectSpecific) getCallbackType(callbackName)).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 callbackName Name of callback object.
-	 * @param o instance of ICallbackInterface to add.
-	 * @return true/false if the callback was added or not.
-	 */
-	public boolean addNonCriticalCallback(final String callbackName, final ICallbackInterface o)  {
-		try {
-			addCallback(callbackName, 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 callbackName Name 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 boolean addNonCriticalCallback(final String callbackName, final ICallbackInterface o, final String target) {
-		try {
-			addCallback(callbackName, o, target);
-			return true;
-		} catch (CallbackNotFoundException e) { return false;	}
-	}
-	
-	
-	/**
-	 * Remove a callback.
-	 *
-	 * @param callbackName Name of callback object.
-	 * @param o instance of ICallbackInterface to remove.
-	 */
-	public void delCallback(final String callbackName, final ICallbackInterface o) {
-		getCallbackType(callbackName).del(o);
-	}
-
-}

src/com/dmdirc/parser/irc/callbacks/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.irc.callbacks;
-
-/**
- * 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/irc/callbacks/CallbackObject.java

@@ -1,268 +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.callbacks;
-
-import com.dmdirc.parser.irc.IRCParser;
-import com.dmdirc.parser.irc.ParserError;
-import com.dmdirc.parser.irc.callbacks.interfaces.ICallbackInterface;
-
-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 class CallbackObject {
-
-    /** The type of callback that this object is operating with. */
-    protected final Class<? extends ICallbackInterface> type;
-
-	/** Arraylist for storing callback information related to the callback. */
-	protected final List<ICallbackInterface> callbackInfo = new ArrayList<ICallbackInterface>();
-	
-	/** Reference to the IRCParser that owns this callback. */
-	protected IRCParser myParser;
-	/** Reference to the CallbackManager in charge of this callback. */
-	protected CallbackManager myManager;
-	
-	/**
-	 * Create a new instance of the Callback Object.
-	 *
-	 * @param parser IRCParser 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.3
-	 */
-	protected CallbackObject(final IRCParser parser, final CallbackManager manager,
-            final Class<? extends ICallbackInterface> 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 ICallbackInterface eMethod) {
-		for (int i = 0; i < callbackInfo.size(); i++) {
-			if (eMethod.equals(callbackInfo.get(i))) { return; }
-		}
-		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 ICallbackInterface eMethod) {
-		for (int i = 0; i < callbackInfo.size(); i++) {
-			if (eMethod.equals(callbackInfo.get(i))) { callbackInfo.remove(i); break; }
-		}
-	}
-	
-	/**
-	 * 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("OnErrorInfo").call(errorInfo);
-	}
-	
-	/**
-	 * Add a new callback.
-	 *
-	 * @param eMethod Object to callback to.
-	 */
-	public void add(final ICallbackInterface eMethod) { addCallback(eMethod); }
-	
-	/**
-	 * Remove a callback.
-	 *
-	 * @param eMethod Object to remove callback to.
-	 */
-	public void del(final ICallbackInterface eMethod) { delCallback(eMethod); }
-	
-	/**
-	 * Get the name for this callback.
-	 *
-	 * @return Name of callback
-	 */
-	public String getName() {
-		return "On" + type.getSimpleName().substring(1); // Trim the 'I'
-	}
-	
-	/**
-	 * Get the name for this callback in lowercase.
-	 *
-	 * @return Name of callback, in lowercase
-	 */
-	public final String getLowerName() { return this.getName().toLowerCase(); }
-
-    /**
-     * 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;
-
-        if (myParser.getCreateFake()) {
-            createFakeArgs(newArgs);
-        }
-
-		for (ICallbackInterface iface : new ArrayList<ICallbackInterface>(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)) {
-                    sources.put(type.getMethods()[0].getParameterTypes()[i], args[i]);
-                }
-            }
-
-            i++;
-        }
-
-        for (Constructor<?> ctor : target.getConstructors()) {
-            Object[] params = new Object[ctor.getParameterTypes().length];
-
-            i = 0;
-            Object param;
-            boolean failed = false;
-
-            for (Class<?> needed : ctor.getParameterTypes()) {
-                if (sources.containsKey(needed)) {
-                    params[i] = sources.get(needed);
-                } else if ((param = getFakeArg(args, needed)) != null) {
-                    params[i] = param;
-                } else {
-                    failed = true;
-                }
-
-                i++;
-            }
-
-            if (!failed) {
-                try {
-                    final Object instance = ctor.newInstance(params);
-
-                    for (Method method : target.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;
-    }
-
-}

src/com/dmdirc/parser/irc/callbacks/CallbackObjectSpecific.java

@@ -1,168 +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.callbacks;
-
-import java.util.Hashtable;
-
-import com.dmdirc.parser.irc.ChannelInfo;
-import com.dmdirc.parser.irc.ClientInfo;
-import com.dmdirc.parser.irc.IRCParser;
-import com.dmdirc.parser.irc.ParserError;
-import com.dmdirc.parser.irc.callbacks.interfaces.ICallbackInterface;
-import java.util.ArrayList;
-
-/**
- * CallbackObjectSpecific.
- * Superclass for all callback types that have a "specific" target.
- *
- * @author            Shane Mc Cormack
- */
-public class CallbackObjectSpecific extends CallbackObject {
-	
-	/** Hashtable for storing specific information for callback. */	
-	protected volatile Hashtable<ICallbackInterface, String> specificData = new Hashtable<ICallbackInterface, String>();
-	
-	/**
-	 * Create a new instance of the Callback Object.
-	 *
-	 * @param parser IRCParser 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.3
-	 */
-	public CallbackObjectSpecific(final IRCParser parser,
-            final CallbackManager manager, final Class<? extends ICallbackInterface> 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 ICallbackInterface eMethod, final ChannelInfo cChannel) {
-		if (specificData.containsKey(eMethod)) { 
-			if (!myParser.getIRCStringConverter().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 ICallbackInterface eMethod, final String sHost) {
-		final String nickname = ClientInfo.parseHost(sHost);
-		if (specificData.containsKey(eMethod)) {
-			if (!myParser.getIRCStringConverter().equalsIgnoreCase(nickname, specificData.get(eMethod))) { return false; }
-		}
-		return true;
-	}
-	
-	// 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 ICallbackInterface 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 ICallbackInterface 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 ICallbackInterface 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;
-
-        if (myParser.getCreateFake()) {
-            createFakeArgs(newArgs);
-        }
-
-		for (ICallbackInterface iface :new ArrayList<ICallbackInterface>(callbackInfo)) {
-            if (type.isAnnotationPresent(SpecificCallback.class) &&
-                    ((args[0] instanceof ClientInfo
-                        && !isValidUser(iface, ((ClientInfo) args[0]).getHost()))
-                        || (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/irc/callbacks/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.irc.callbacks;
-
-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.3
- * @author chris
- */
-@Retention(RetentionPolicy.RUNTIME)
-@Target(ElementType.PARAMETER)
-public @interface FakableArgument {
-
-}

src/com/dmdirc/parser/irc/callbacks/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.irc.callbacks;
-
-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.3
- * @author chris
- */
-@Retention(RetentionPolicy.RUNTIME)
-@Target(ElementType.PARAMETER)
-public @interface FakableSource {
-
-}

src/com/dmdirc/parser/irc/callbacks/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.irc.callbacks;
-
-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.3
- * @author chris
- */
-@Retention(RetentionPolicy.RUNTIME)
-public @interface SpecificCallback {
-
-}

src/com/dmdirc/parser/irc/callbacks/interfaces/IAwayState.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.irc.callbacks.interfaces;
-
-import com.dmdirc.parser.irc.IRCParser;
-
-/**
- * Called when we go away, or come back.
- */
-public interface IAwayState extends ICallbackInterface { 
-	/**
-	 * 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(IRCParser tParser, boolean currentState, String reason);
-}

src/com/dmdirc/parser/irc/callbacks/interfaces/IAwayStateOther.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.irc.callbacks.interfaces;
-
-import com.dmdirc.parser.irc.IRCParser;
-import com.dmdirc.parser.irc.ClientInfo;
-import com.dmdirc.parser.irc.callbacks.SpecificCallback;
-
-/**
- * Called when we go away, or come back.
- */
-@SpecificCallback
-public interface IAwayStateOther extends ICallbackInterface { 
-	/**
-	 * 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(IRCParser tParser, ClientInfo client, boolean state);
-}

src/com/dmdirc/parser/irc/callbacks/interfaces/ICallbackInterface.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.irc.callbacks.interfaces;
-
-/**
- * "SuperInterface" for all callbacks.
- */
-public interface ICallbackInterface { }

src/com/dmdirc/parser/irc/callbacks/interfaces/IChannelAction.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.irc.callbacks.interfaces;
-
-import com.dmdirc.parser.irc.ChannelClientInfo;
-import com.dmdirc.parser.irc.ChannelInfo;
-import com.dmdirc.parser.irc.IRCParser;
-import com.dmdirc.parser.irc.callbacks.FakableArgument;
-import com.dmdirc.parser.irc.callbacks.FakableSource;
-import com.dmdirc.parser.irc.callbacks.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 IChannelAction extends ICallbackInterface {
-	/**
-	 * 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 IRCParser tParser,
-            @FakableSource ChannelInfo cChannel,
-            @FakableArgument ChannelClientInfo cChannelClient,
-            String sMessage,
-            @FakableSource String sHost);
-}

src/com/dmdirc/parser/irc/callbacks/interfaces/IChannelAwayStateOther.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.irc.callbacks.interfaces;
-
-import com.dmdirc.parser.irc.IRCParser;
-import com.dmdirc.parser.irc.ChannelClientInfo;
-import com.dmdirc.parser.irc.ChannelInfo;
-import com.dmdirc.parser.irc.callbacks.SpecificCallback;
-
-/**
- * Called when we go away, or come back.
- */
-@SpecificCallback
-public interface IChannelAwayStateOther extends ICallbackInterface { 
-	/**
-	 * 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(IRCParser tParser, ChannelInfo channel, ChannelClientInfo channelClient, boolean state);
-}

src/com/dmdirc/parser/irc/callbacks/interfaces/IChannelCTCP.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.irc.callbacks.interfaces;
-
-import com.dmdirc.parser.irc.ChannelClientInfo;
-import com.dmdirc.parser.irc.ChannelInfo;
-import com.dmdirc.parser.irc.IRCParser;
-import com.dmdirc.parser.irc.callbacks.FakableArgument;
-import com.dmdirc.parser.irc.callbacks.FakableSource;
-import com.dmdirc.parser.irc.callbacks.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 IChannelCTCP extends ICallbackInterface {
-	/**
-	 * 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 IRCParser tParser,
-            @FakableSource ChannelInfo cChannel,
-            @FakableArgument ChannelClientInfo cChannelClient,
-            String sType, String sMessage,
-            @FakableSource String sHost);
-}

src/com/dmdirc/parser/irc/callbacks/interfaces/IChannelCTCPReply.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.irc.callbacks.interfaces;
-
-import com.dmdirc.parser.irc.ChannelClientInfo;
-import com.dmdirc.parser.irc.ChannelInfo;
-import com.dmdirc.parser.irc.IRCParser;
-import com.dmdirc.parser.irc.callbacks.FakableArgument;
-import com.dmdirc.parser.irc.callbacks.FakableSource;
-import com.dmdirc.parser.irc.callbacks.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 IChannelCTCPReply extends ICallbackInterface {
-	/**
-	 * 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 IRCParser tParser,
-            @FakableSource ChannelInfo cChannel,
-            @FakableArgument ChannelClientInfo cChannelClient,
-            String sType, String sMessage,
-            @FakableSource String sHost);
-}

src/com/dmdirc/parser/irc/callbacks/interfaces/IChannelGotListModes.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.irc.callbacks.interfaces;
-
-import com.dmdirc.parser.irc.ChannelInfo;
-import com.dmdirc.parser.irc.IRCParser;
-import com.dmdirc.parser.irc.callbacks.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 IChannelGotListModes extends ICallbackInterface {
-	/**
-	 * 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(IRCParser tParser, ChannelInfo cChannel);
-}

src/com/dmdirc/parser/irc/callbacks/interfaces/IChannelGotNames.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.irc.callbacks.interfaces;
-
-import com.dmdirc.parser.irc.ChannelInfo;
-import com.dmdirc.parser.irc.IRCParser;
-import com.dmdirc.parser.irc.callbacks.SpecificCallback;
-
-/**
- * Called when a names reply is parsed.
- */
-@SpecificCallback
-public interface IChannelGotNames extends ICallbackInterface {
-	/**
-	 * 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(IRCParser tParser, ChannelInfo cChannel);
-}

src/com/dmdirc/parser/irc/callbacks/interfaces/IChannelJoin.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.irc.callbacks.interfaces;
-
-import com.dmdirc.parser.irc.ChannelClientInfo;
-import com.dmdirc.parser.irc.ChannelInfo;
-import com.dmdirc.parser.irc.IRCParser;
-import com.dmdirc.parser.irc.callbacks.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 IChannelJoin extends ICallbackInterface {
-	/**
-	 * 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(IRCParser tParser, ChannelInfo cChannel, ChannelClientInfo cChannelClient);
-}

src/com/dmdirc/parser/irc/callbacks/interfaces/IChannelKick.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.irc.callbacks.interfaces;
-
-import com.dmdirc.parser.irc.ChannelClientInfo;
-import com.dmdirc.parser.irc.ChannelInfo;
-import com.dmdirc.parser.irc.IRCParser;
-import com.dmdirc.parser.irc.callbacks.FakableArgument;
-import com.dmdirc.parser.irc.callbacks.FakableSource;
-import com.dmdirc.parser.irc.callbacks.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 IChannelKick extends ICallbackInterface {
-	/**
-	 * 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 IRCParser tParser,
-            @FakableSource ChannelInfo cChannel,
-            ChannelClientInfo cKickedClient,
-            @FakableArgument ChannelClientInfo cKickedByClient,
-            String sReason,
-            @FakableSource String sKickedByHost);
-}

src/com/dmdirc/parser/irc/callbacks/interfaces/IChannelMessage.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.irc.callbacks.interfaces;
-
-import com.dmdirc.parser.irc.ChannelClientInfo;
-import com.dmdirc.parser.irc.ChannelInfo;
-import com.dmdirc.parser.irc.IRCParser;
-import com.dmdirc.parser.irc.callbacks.FakableArgument;
-import com.dmdirc.parser.irc.callbacks.FakableSource;
-import com.dmdirc.parser.irc.callbacks.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 IChannelMessage extends ICallbackInterface {
-	/**
-	 * 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 IRCParser tParser,
-            @FakableSource ChannelInfo cChannel,
-            @FakableArgument ChannelClientInfo cChannelClient,
-            String sMessage,
-            @FakableSource String sHost);
-}

src/com/dmdirc/parser/irc/callbacks/interfaces/IChannelModeChanged.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.irc.callbacks.interfaces;
-
-import com.dmdirc.parser.irc.ChannelClientInfo;
-import com.dmdirc.parser.irc.ChannelInfo;
-import com.dmdirc.parser.irc.IRCParser;
-import com.dmdirc.parser.irc.callbacks.FakableArgument;
-import com.dmdirc.parser.irc.callbacks.FakableSource;
-import com.dmdirc.parser.irc.callbacks.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 IChannelModeChanged extends ICallbackInterface {
-	/**
-	 * 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 IRCParser tParser,
-            @FakableSource ChannelInfo cChannel,
-            @FakableArgument ChannelClientInfo cChannelClient,
-            @FakableSource String sHost,
-            String sModes);
-}

src/com/dmdirc/parser/irc/callbacks/interfaces/IChannelNickChanged.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.irc.callbacks.interfaces;
-
-import com.dmdirc.parser.irc.ChannelClientInfo;
-import com.dmdirc.parser.irc.ChannelInfo;
-import com.dmdirc.parser.irc.IRCParser;
-import com.dmdirc.parser.irc.callbacks.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 IChannelNickChanged extends ICallbackInterface {
-	/**
-	 * 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(IRCParser tParser, ChannelInfo cChannel, ChannelClientInfo cChannelClient, String sOldNick);
-}

src/com/dmdirc/parser/irc/callbacks/interfaces/IChannelNonUserModeChanged.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.irc.callbacks.interfaces;
-
-import com.dmdirc.parser.irc.ChannelClientInfo;
-import com.dmdirc.parser.irc.ChannelInfo;
-import com.dmdirc.parser.irc.IRCParser;
-import com.dmdirc.parser.irc.callbacks.FakableArgument;
-import com.dmdirc.parser.irc.callbacks.FakableSource;
-import com.dmdirc.parser.irc.callbacks.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 IChannelNonUserModeChanged extends ICallbackInterface {
-	/**
-	 * 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 IRCParser tParser,
-            @FakableSource ChannelInfo cChannel,
-            @FakableArgument ChannelClientInfo cChannelClient,
-            @FakableSource String sHost,
-            String sModes);
-}
-

src/com/dmdirc/parser/irc/callbacks/interfaces/IChannelNotice.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.irc.callbacks.interfaces;
-
-import com.dmdirc.parser.irc.ChannelClientInfo;
-import com.dmdirc.parser.irc.ChannelInfo;
-import com.dmdirc.parser.irc.IRCParser;
-import com.dmdirc.parser.irc.callbacks.FakableArgument;
-import com.dmdirc.parser.irc.callbacks.FakableSource;
-import com.dmdirc.parser.irc.callbacks.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 IChannelNotice extends ICallbackInterface {
-	/**
-	 * 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 IRCParser tParser,
-            @FakableSource ChannelInfo cChannel,
-            @FakableArgument ChannelClientInfo cChannelClient,
-            String sMessage,
-            @FakableSource String sHost);
-}

src/com/dmdirc/parser/irc/callbacks/interfaces/IChannelPart.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.irc.callbacks.interfaces;
-
-import com.dmdirc.parser.irc.ChannelClientInfo;
-import com.dmdirc.parser.irc.ChannelInfo;
-import com.dmdirc.parser.irc.IRCParser;
-import com.dmdirc.parser.irc.callbacks.SpecificCallback;
-
-/** 
- * Called When we, or another client parts a channel.
- * This is called BEFORE client has been removed from the channel.
- */
-@SpecificCallback
-public interface IChannelPart extends ICallbackInterface {
-	/**
-	 * 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(IRCParser tParser, ChannelInfo cChannel, ChannelClientInfo cChannelClient, String sReason);
-}

src/com/dmdirc/parser/irc/callbacks/interfaces/IChannelQuit.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.irc.callbacks.interfaces;
-
-import com.dmdirc.parser.irc.ChannelClientInfo;
-import com.dmdirc.parser.irc.ChannelInfo;
-import com.dmdirc.parser.irc.IRCParser;
-import com.dmdirc.parser.irc.callbacks.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 IChannelQuit extends ICallbackInterface {
-	/**
-	 * 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(IRCParser tParser, ChannelInfo cChannel, ChannelClientInfo cChannelClient, String sReason);
-}

src/com/dmdirc/parser/irc/callbacks/interfaces/IChannelSelfJoin.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.irc.callbacks.interfaces;
-
-import com.dmdirc.parser.irc.ChannelInfo;
-import com.dmdirc.parser.irc.IRCParser;
-
-/** 
- * Called When we join a channel.
- * We are NOT added as a channelclient until after the names reply
- */
-public interface IChannelSelfJoin extends ICallbackInterface {
-	/**
-	 * 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(IRCParser tParser, ChannelInfo cChannel);
-}

src/com/dmdirc/parser/irc/callbacks/interfaces/IChannelSingleModeChanged.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.irc.callbacks.interfaces;
-
-import com.dmdirc.parser.irc.ChannelClientInfo;
-import com.dmdirc.parser.irc.ChannelInfo;
-import com.dmdirc.parser.irc.IRCParser;
-import com.dmdirc.parser.irc.callbacks.FakableArgument;
-import com.dmdirc.parser.irc.callbacks.FakableSource;
-import com.dmdirc.parser.irc.callbacks.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 IChannelSingleModeChanged extends ICallbackInterface {
-	/**
-	 * 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 IRCParser tParser,
-            @FakableSource ChannelInfo cChannel,
-            @FakableArgument ChannelClientInfo cChannelClient,
-            @FakableSource String sHost,
-            String sModes);
-}
-

src/com/dmdirc/parser/irc/callbacks/interfaces/IChannelTopic.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.irc.callbacks.interfaces;
-
-import com.dmdirc.parser.irc.ChannelInfo;
-import com.dmdirc.parser.irc.IRCParser;
-import com.dmdirc.parser.irc.callbacks.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 IChannelTopic extends ICallbackInterface {
-	/**
-	 * 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(IRCParser tParser, ChannelInfo cChannel, boolean bIsJoinTopic);
-}

src/com/dmdirc/parser/irc/callbacks/interfaces/IChannelUserModeChanged.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.irc.callbacks.interfaces;
-
-import com.dmdirc.parser.irc.ChannelClientInfo;
-import com.dmdirc.parser.irc.ChannelInfo;
-import com.dmdirc.parser.irc.IRCParser;
-import com.dmdirc.parser.irc.callbacks.FakableArgument;
-import com.dmdirc.parser.irc.callbacks.FakableSource;
-import com.dmdirc.parser.irc.callbacks.SpecificCallback;
-
-/** 
- * Called when a users channel mode is changed.
- */
-@SpecificCallback
-public interface IChannelUserModeChanged extends ICallbackInterface {
-	/**
-	 * 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 IRCParser tParser,
-            @FakableSource ChannelInfo cChannel,
-            ChannelClientInfo cChangedClient,
-            @FakableArgument ChannelClientInfo cSetByClient,
-            @FakableSource String sHost,
-            String sMode);
-}

src/com/dmdirc/parser/irc/callbacks/interfaces/IConnectError.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.irc.callbacks.interfaces;
-
-import com.dmdirc.parser.irc.IRCParser;
-import com.dmdirc.parser.irc.ParserError;
-
-/**
- * Called to give Error Information related to a connection attempt.
- */
-public interface IConnectError extends ICallbackInterface {
-	/**
-	 * 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(IRCParser tParser, ParserError errorInfo);
-}

src/com/dmdirc/parser/irc/callbacks/interfaces/IDataIn.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.irc.callbacks.interfaces;
-
-import com.dmdirc.parser.irc.IRCParser;
-
-/**
- * Interface Used on every incomming line BEFORE parsing.
- */
-public interface IDataIn extends ICallbackInterface {
-	/**
-	 * 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(IRCParser tParser, String sData);
-}

src/com/dmdirc/parser/irc/callbacks/interfaces/IDataOut.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.irc.callbacks.interfaces;
-
-import com.dmdirc.parser.irc.IRCParser;
-
-/**
- * Called on every incomming line BEFORE being sent.
- */
-public interface IDataOut extends ICallbackInterface {
-	/**
-	 * 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(IRCParser tParser, String sData, boolean bFromParser);
-}

src/com/dmdirc/parser/irc/callbacks/interfaces/IDebugInfo.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.irc.callbacks.interfaces;
-
-import com.dmdirc.parser.irc.IRCParser;
-
-/**
- * Interface Used to give Debug Information.
- */
-public interface IDebugInfo extends ICallbackInterface { 
-	/**
-	 * 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(IRCParser tParser, int nLevel, String sData);
-}

src/com/dmdirc/parser/irc/callbacks/interfaces/IErrorInfo.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.irc.callbacks.interfaces;
-
-import com.dmdirc.parser.irc.IRCParser;
-import com.dmdirc.parser.irc.ParserError;
-
-/**
- * Called to give Error Information.
- */
-public interface IErrorInfo extends ICallbackInterface {
-	/**
-	 * 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(IRCParser tParser, ParserError errorInfo);
-}

src/com/dmdirc/parser/irc/callbacks/interfaces/IGotNetwork.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.irc.callbacks.interfaces;
-
-import com.dmdirc.parser.irc.IRCParser;
-
-/**
- * Interface Used when the Network=blah 005 token is recieved.
- */
-public interface IGotNetwork extends ICallbackInterface {
-	/**
-	 * 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(IRCParser tParser, String networkName, String ircdVersion, String ircdType);
-}

src/com/dmdirc/parser/irc/callbacks/interfaces/IInvite.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.irc.callbacks.interfaces;
-
-import com.dmdirc.parser.irc.IRCParser;
-
-/**
- * Called when we are invited to a channel.
- */
-public interface IInvite extends ICallbackInterface {
-	/**
-	 * 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(IRCParser tParser, String userHost, String channel);
-}

src/com/dmdirc/parser/irc/callbacks/interfaces/IMOTDEnd.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.irc.callbacks.interfaces;
-
-import com.dmdirc.parser.irc.IRCParser;
-
-/**
- * Called when "End of MOTD" or "No MOTD" is received.
- */
-public interface IMOTDEnd extends ICallbackInterface { 
-	/**
-	 * 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(IRCParser tParser, boolean noMOTD, String sData);
-}

src/com/dmdirc/parser/irc/callbacks/interfaces/IMOTDLine.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.irc.callbacks.interfaces;
-
-import com.dmdirc.parser.irc.IRCParser;
-
-/**
- * Interface Used to give MOTD Information.
- */
-public interface IMOTDLine extends ICallbackInterface {
-	/**
-	 * 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(IRCParser tParser, String sData);
-}

src/com/dmdirc/parser/irc/callbacks/interfaces/IMOTDStart.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.irc.callbacks.interfaces;
-
-import com.dmdirc.parser.irc.IRCParser;
-
-/**
- * Interface Used when the MOTD Starts.
- */
-public interface IMOTDStart extends ICallbackInterface {
-	/**
-	 * 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(IRCParser tParser, String sData);
-}

src/com/dmdirc/parser/irc/callbacks/interfaces/INickChanged.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.irc.callbacks.interfaces;
-
-import com.dmdirc.parser.irc.ClientInfo;
-import com.dmdirc.parser.irc.IRCParser;
-
-/**
- * Called when we or another user change nickname.
- * This is called after the nickname change has been done internally
- */
-public interface INickChanged extends ICallbackInterface {
-	/**
-	 * 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(IRCParser tParser, ClientInfo cClient, String sOldNick);
-}

src/com/dmdirc/parser/irc/callbacks/interfaces/INickInUse.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.irc.callbacks.interfaces;
-
-import com.dmdirc.parser.irc.IRCParser;
-
-/**
- * Called when requested nickname is in use.
- */
-public interface INickInUse extends ICallbackInterface {
-	/**
-	 * 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(IRCParser tParser, String nickname);
-}

src/com/dmdirc/parser/irc/callbacks/interfaces/INoticeAuth.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.irc.callbacks.interfaces;
-
-import com.dmdirc.parser.irc.IRCParser;
-
-/**
- * Interface Used on every incomming line before 001.
- */
-public interface INoticeAuth extends ICallbackInterface {
-	/**
-	 * 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(IRCParser tParser, String sData);
-}

src/com/dmdirc/parser/irc/callbacks/interfaces/INumeric.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.irc.callbacks.interfaces;
-
-import com.dmdirc.parser.irc.IRCParser;
-
-/**
- * Interface Used to give numeric Information.
- */
-public interface INumeric extends ICallbackInterface {
-	/**
-	 * 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(IRCParser tParser, int numeric, String[] token);
-}

src/com/dmdirc/parser/irc/callbacks/interfaces/IPasswordRequired.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.irc.callbacks.interfaces;
-
-import com.dmdirc.parser.irc.IRCParser;
-
-/**
- * Interface Used when a raw 464 is recieved.
- */
-public interface IPasswordRequired extends ICallbackInterface {
-	/**
-	 * 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(IRCParser tParser);
-}

src/com/dmdirc/parser/irc/callbacks/interfaces/IPingFailed.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.irc.callbacks.interfaces;
-
-import com.dmdirc.parser.irc.IRCParser;
-
-/**
- * Called when a Ping Failed.
- */
-public interface IPingFailed extends ICallbackInterface {
-	/**
-	 * Called when a ping failed.
-	 * 
-	 * @param tParser Reference to the parser object that made the callback.
-	 * @see IRCParser#callPingFailed
-	 */
-	void onPingFailed(IRCParser tParser);
-}

src/com/dmdirc/parser/irc/callbacks/interfaces/IPingSent.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.irc.callbacks.interfaces;
-
-import com.dmdirc.parser.irc.IRCParser;
-
-/**
- * Called when a Ping was Sent.
- */
-public interface IPingSent extends ICallbackInterface {
-	/**
-	 * Called when a ping was Sent.
-	 * 
-	 * @param tParser Reference to the parser object that made the callback.
-	 * @see IRCParser#callPingSent
-	 */
-	void onPingSent(IRCParser tParser);
-}

src/com/dmdirc/parser/irc/callbacks/interfaces/IPingSuccess.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.irc.callbacks.interfaces;
-
-import com.dmdirc.parser.irc.IRCParser;
-
-/**
- * Called when a Ping was a Success.
- */
-public interface IPingSuccess extends ICallbackInterface {
-	/**
-	 * Called when a ping was a Success.
-	 * 
-	 * @param tParser Reference to the parser object that made the callback.
-	 * @see IRCParser#callPingSuccess
-	 */
-	void onPingSuccess(IRCParser tParser);
-}