Merge pull request #116 from ShaneMcC/master

Add numeric stuff to IRCDataInEvent

irc/src/com/dmdirc/parser/irc/events/IRCDataInEvent.java

@@ -41,6 +41,8 @@ public class IRCDataInEvent extends DataInEvent {
     private final ReadLine line;
     private final String[] tokenisedData;
     private final String action;
+    private final int numeric;
+    private final boolean isNumeric;
 
     public IRCDataInEvent(final IRCParser parser, final LocalDateTime date, final ReadLine line) {
         super(parser, date, checkNotNull(line).getLine());
@@ -63,6 +65,11 @@ public class IRCDataInEvent extends DataInEvent {
         } else {
             action = "";
         }
+
+        int num = -1;
+        try { num = Integer.parseInt(action); } catch (final NumberFormatException e) { }
+        numeric = num;
+        isNumeric = (numeric != -1);
     }
 
     public String[] getTokenisedData() {
@@ -76,4 +83,12 @@ public class IRCDataInEvent extends DataInEvent {
     public String getAction() {
         return action;
     }
+
+    public boolean isNumeric() {
+        return isNumeric;
+    }
+
+    public int getNumeric() {
+        return numeric;
+    }
 }

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

@@ -187,7 +187,7 @@ public class ProcessJoin extends IRCProcessor {
                 iChannel.setInternalPassword(pendingJoin.getKey());
             } else {
                 // Out of sync, clear
-                callDebugInfo(IRCParser.DEBUG_INFO, "processJoin: pending join keys out of sync (Got: " + pendingJoin.getChannel() + ", Wanted: " + channelName + ") - Clearing.");
+                callDebugInfo(IRCParser.DEBUG_INFO, "processJoin: pending join keys out of sync (Got: " + (pendingJoin == null ? pendingJoin : pendingJoin.getChannel()) + ", Wanted: " + channelName + ") - Clearing.");
                 pendingJoins.clear();
             }
 
@@ -220,7 +220,9 @@ public class ProcessJoin extends IRCProcessor {
             // don't have guesses for channels we are already in.
             for (final String chan : newLine[1].split(",")) {
                 final String key = keys.poll();
-                if (getChannel(chan) == null) {
+                if (chan.equals("0")) {
+                    callDebugInfo(IRCParser.DEBUG_INFO, "processJoin: Ignoring possible channel Key for part-all channel: " + chan + " -> " + key);
+                } else if (getChannel(chan) == null) {
                     callDebugInfo(IRCParser.DEBUG_INFO, "processJoin: Intercepted possible channel Key: " + chan + " -> " + key);
                     pendingJoins.add(new PendingJoin(chan, key));
                 } else {