Set ADDRESS and REAL_NAME property after whois.

Having two separate events means the ordering isn't guaranteed.
Handle everything for 311 numerics in one handler.

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

@@ -65,6 +65,11 @@ public class WhoisResponseHandler {
     void handleStartOfWhois(final NumericEvent event) {
         client = event.getToken()[3];
         info.clear();
+
+        // :server 311 DMDirc User ~Ident host.dmdirc.com * :Real name
+        info.put(UserInfoType.ADDRESS,
+                event.getToken()[3] + '!' + event.getToken()[4] + '@' + event.getToken()[5]);
+        info.put(UserInfoType.REAL_NAME, event.getToken()[7]);
     }
 
     @Handler(condition = "msg.numeric == 318")
@@ -81,14 +86,6 @@ public class WhoisResponseHandler {
         info.put(UserInfoType.AWAY_MESSAGE, event.getToken()[4]);
     }
 
-    @Handler(condition = "msg.numeric == 311")
-    void handleUserInfo(final NumericEvent event) {
-        // :server 311 DMDirc User ~Ident host.dmdirc.com * :Real name
-        info.put(UserInfoType.ADDRESS,
-                event.getToken()[3] + '!' + event.getToken()[4] + '@' + event.getToken()[5]);
-        info.put(UserInfoType.REAL_NAME, event.getToken()[7]);
-    }
-
     @Handler(condition = "msg.numeric == 312")
     void handleServerInfo(final NumericEvent event) {
         // :server 312 DMDirc User *.quakenet.org :QuakeNet IRC Server