Remove CallbackNotFoundException, tidy up Query.

We don't need to reregister on nick change now, as we get all the events anyway and filter them manually.
DMDirc · Feb 1, 2015 · 8c91a4c · 8c91a4c
1 parent 5eae2f4
commit 8c91a4c
Showing 1 changed file with 1 addition and 22 deletions.
diff --git a/src/com/dmdirc/Query.java b/src/com/dmdirc/Query.java
@@ -23,7 +23,6 @@
 package com.dmdirc;
 
 import com.dmdirc.commandparser.CommandType;
-import com.dmdirc.events.AppErrorEvent;
 import com.dmdirc.events.CommandErrorEvent;
 import com.dmdirc.events.QueryActionEvent;
 import com.dmdirc.events.QueryClosedEvent;
@@ -36,9 +35,7 @@
 import com.dmdirc.interfaces.PrivateChat;
 import com.dmdirc.interfaces.User;
 import com.dmdirc.interfaces.WindowModel;
-import com.dmdirc.logger.ErrorLevel;
 import com.dmdirc.parser.common.CallbackManager;
-import com.dmdirc.parser.common.CallbackNotFoundException;
 import com.dmdirc.parser.common.CompositionState;
 import com.dmdirc.parser.events.CompositionStateChangeEvent;
 import com.dmdirc.parser.events.NickChangeEvent;
@@ -187,14 +184,7 @@ private void updateTitle() {
      */
     public void reregister() {
         final CallbackManager callbackManager = connection.getParser().get().getCallbackManager();
-        final String nick = getNickname();
-
-        try {
-            callbackManager.subscribe(this);
-        } catch (CallbackNotFoundException ex) {
-            getEventBus().publishAsync(new AppErrorEvent(ErrorLevel.HIGH, ex,
-                    "Unable to get query events", ex.getMessage()));
-        }
+        callbackManager.subscribe(this);
     }
 
     @Handler
@@ -205,17 +195,6 @@ public void onNickChanged(final NickChangeEvent event) {
         final ClientInfo client = event.getClient();
         final String oldNick = event.getOldNick();
         if (client.getNickname().equals(getNickname())) {
-            final CallbackManager callbackManager = connection.getParser().get().getCallbackManager();
-
-            // TODO: Not specific now.
-            try {
-                callbackManager.subscribe(this);
-            } catch (CallbackNotFoundException ex) {
-                getEventBus().publishAsync(
-                        new AppErrorEvent(ErrorLevel.HIGH, ex, "Unable to get query events",
-                                ex.getMessage()));
-            }
-
             connection.updateQuery(this, oldNick, client.getNickname());
 
             getEventBus().publish(new QueryNickChangeEvent(this, oldNick, client.getNickname()));