Merge pull request #412 from csmith/master

Remove CallbackNotFoundException usages.

parserdebug/src/com/dmdirc/addons/parserdebug/ParserDebugCommand.java

             + "onDebugInfo for the parser that owns this window",
             CommandType.TYPE_SERVER);
     /** Parser debug manager. */
-    final ParserDebugManager parserDebugManager;
+    private final ParserDebugManager parserDebugManager;
 
     /**
      * Creates a new instance of ParserDebugCommand.
             return;
         }
         if (parserDebugManager.containsParser(parser.get())) {
-            if (parserDebugManager.removeParser(parser.get(), false)) {
-                sendLine(origin, isSilent, FORMAT_OUTPUT, "Removing callback ok");
-            } else {
-                sendLine(origin, isSilent, FORMAT_ERROR, "Removing callback failed");
-            }
+            parserDebugManager.removeParser(parser.get(), false);
+            sendLine(origin, isSilent, FORMAT_OUTPUT, "Removed callback");
         } else {
-            if (parserDebugManager.addParser(parser.get(), connection)) {
-                sendLine(origin, isSilent, FORMAT_OUTPUT, "Adding callback ok");
-            } else {
-                sendLine(origin, isSilent, FORMAT_ERROR, "Adding callback failed");
-            }
+            parserDebugManager.addParser(parser.get(), connection);
+            sendLine(origin, isSilent, FORMAT_OUTPUT, "Added callback");
         }
     }
 

parserdebug/src/com/dmdirc/addons/parserdebug/ParserDebugManager.java

 import com.dmdirc.DMDircMBassador;
 import com.dmdirc.events.ServerDisconnectedEvent;
 import com.dmdirc.interfaces.Connection;
-import com.dmdirc.parser.common.CallbackNotFoundException;
 import com.dmdirc.parser.events.DebugInfoEvent;
 import com.dmdirc.parser.interfaces.Parser;
 import com.dmdirc.ui.WindowManager;
 import com.dmdirc.ui.messages.BackBufferFactory;
-import com.dmdirc.util.URLBuilder;
 
 import java.util.Date;
 import java.util.HashMap;
 
     @Inject
     public ParserDebugManager(
-            final URLBuilder urlBuilder,
             final WindowManager windowManager,
             final DMDircMBassador eventBus,
             final BackBufferFactory backBufferFactory) {
      *
      * @param parser Parser to add
      * @param connection The connection associated with the parser
-     *
-     * @return Whether we added the parser without error
      */
-    public boolean addParser(final Parser parser, final Connection connection) {
-        try {
-            parser.getCallbackManager().subscribe(this);
-            final DebugWindow window = new DebugWindow(this, "Parser Debug", parser,
-                    connection, eventBus, backBufferFactory);
-            windowManager.addWindow(connection.getWindowModel(), window);
-            registeredParsers.put(parser, window);
-            window.addLine("======================", new Date());
-            window.addLine("Started Monitoring: " + parser, new Date());
-            window.addLine("======================", new Date());
-            return true;
-        } catch (CallbackNotFoundException ex) {
-            return false;
-        }
+    public void addParser(final Parser parser, final Connection connection) {
+        parser.getCallbackManager().subscribe(this);
+        final DebugWindow window = new DebugWindow(this, "Parser Debug", parser,
+                connection, eventBus, backBufferFactory);
+        windowManager.addWindow(connection.getWindowModel(), window);
+        registeredParsers.put(parser, window);
+        window.addLine("======================", new Date());
+        window.addLine("Started Monitoring: " + parser, new Date());
+        window.addLine("======================", new Date());
     }
 
     /**
      *
      * @param parser Parser to add
      * @param close  Close debug window?
-     *
-     * @return Whether removed the parser without error
      */
-    public boolean removeParser(final Parser parser, final boolean close) {
-        try {
-            parser.getCallbackManager().unsubscribe(this);
-            final DebugWindow window = registeredParsers.get(parser);
-            window.addLine("======================", new Date());
-            window.addLine("No Longer Monitoring: " + parser + " (User Requested)", new Date());
-            window.addLine("======================", new Date());
-            if (close) {
-                window.close();
-            }
-            registeredParsers.remove(parser);
-            return true;
-        } catch (CallbackNotFoundException ex) {
-            return false;
+    public void removeParser(final Parser parser, final boolean close) {
+        parser.getCallbackManager().unsubscribe(this);
+        final DebugWindow window = registeredParsers.get(parser);
+        window.addLine("======================", new Date());
+        window.addLine("No Longer Monitoring: " + parser + " (User Requested)", new Date());
+        window.addLine("======================", new Date());
+        if (close) {
+            window.close();
         }
+        registeredParsers.remove(parser);
     }
 
     /**