Add standalone handlers for NickInUse and PingFailure.

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

@@ -154,8 +154,6 @@ public class IRCParser extends BaseSocketAwareParser implements SecureParser, En
     public String networkName;
     /** This is what we think the nickname should be. */
     public String thinkNickname;
-    /** When using inbuilt pre-001 NickInUse handler, have we tried our AltNick. */
-    public boolean triedAlt;
     /** Have we received the 001. */
     public boolean got001;
     /** Have we fired post005? */
@@ -671,7 +669,6 @@ public class IRCParser extends BaseSocketAwareParser implements SecureParser, En
     /** Reset internal state (use before doConnect). */
     private void resetState() {
         // Reset General State info
-        triedAlt = false;
         got001 = false;
         post005 = false;
         // Clear the hash tables
@@ -1984,7 +1981,7 @@ public class IRCParser extends BaseSocketAwareParser implements SecureParser, En
      *
      * @return value of pingNeeded.
      */
-    private boolean getPingNeeded() {
+    boolean getPingNeeded() {
         return pingNeeded.get();
     }
 

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

@@ -0,0 +1,72 @@
+/*
+ * Copyright (c) 2006-2014 DMDirc Developers
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+package com.dmdirc.parser.irc;
+
+import com.dmdirc.parser.interfaces.Parser;
+import com.dmdirc.parser.interfaces.callbacks.DebugInfoListener;
+import com.dmdirc.parser.interfaces.callbacks.NickInUseListener;
+
+import java.util.Date;
+
+/**
+ * Simple nick in use handler that tries the alternative nickname, then prepends a character until
+ * it gets a nickname.
+ */
+public class SimpleNickInUseHandler implements NickInUseListener {
+
+    private final String altNickname;
+    private final char prependChar;
+    private boolean triedAlt;
+
+    public SimpleNickInUseHandler(final String altNickname, final char prependChar) {
+        this.altNickname = altNickname;
+        this.prependChar = prependChar;
+    }
+
+    @Override
+    public void onNickInUse(final Parser parser, final Date date, final String nickname) {
+        final IRCParser ircParser = (IRCParser) parser;
+        callDebugInfo(parser, IRCParser.DEBUG_INFO, "No Nick in use Handler.");
+        if (!ircParser.got001) {
+            callDebugInfo(parser, 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 (triedAlt) {
+                final String magicAltNick = prependChar + ircParser.getMyInfo().getNickname();
+                if (parser.getStringConverter().equalsIgnoreCase(ircParser.thinkNickname, altNickname)
+                        && !altNickname.equalsIgnoreCase(magicAltNick)) {
+                    ircParser.thinkNickname = ircParser.getMyInfo().getNickname();
+                }
+                parser.getLocalClient().setNickname(prependChar + ircParser.thinkNickname);
+            } else {
+                parser.getLocalClient().setNickname(altNickname);
+                triedAlt = true;
+            }
+        }
+    }
+
+    private void callDebugInfo(final Parser parser, final int level, final String data) {
+        parser.getCallbackManager().getCallback(DebugInfoListener.class)
+                .onDebugInfo(parser, new Date(), level, data);
+    }
+}

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

@@ -0,0 +1,43 @@
+/*
+ * Copyright (c) 2006-2014 DMDirc Developers
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+package com.dmdirc.parser.irc;
+
+import com.dmdirc.parser.interfaces.Parser;
+import com.dmdirc.parser.interfaces.callbacks.PingFailureListener;
+
+import java.util.Date;
+
+/**
+ * Simple ping failure listener that disconnects on missed pings.
+ */
+public class SimplePingFailureHandler implements PingFailureListener {
+
+    @Override
+    public void onPingFailed(final Parser parser, final Date date) {
+        final IRCParser ircParser = (IRCParser) parser;
+        if (ircParser.getPingNeeded()) {
+            ircParser.stopPingTimer();
+            ircParser.disconnect("Server not responding");
+        }
+    }
+}