Remove some loggers, tidy up.

Change-Id: Iad0989f307f8915cf0dc64ba95116a1f521cf53f
Reviewed-on: http://gerrit.dmdirc.com/3715
Automatic-Compile: DMDirc Build Manager
Reviewed-by: Chris Smith <chris@dmdirc.com>

src/com/dmdirc/addons/ui_swing/components/frames/ComponentCreator.java

@@ -26,8 +26,8 @@ import com.dmdirc.FrameContainer;
 import com.dmdirc.addons.ui_swing.SwingController;
 import com.dmdirc.addons.ui_swing.components.inputfields.SwingInputField;
 import com.dmdirc.addons.ui_swing.textpane.TextPane;
+import com.dmdirc.events.UserErrorEvent;
 import com.dmdirc.logger.ErrorLevel;
-import com.dmdirc.logger.Logger;
 import com.dmdirc.ui.core.components.WindowComponent;
 import com.dmdirc.util.SimpleInjector;
 import com.dmdirc.util.URLBuilder;
@@ -82,7 +82,7 @@ public class ComponentCreator {
         for (String string : names) {
             Object object;
             try {
-                Class<?> clazz;
+                final Class<?> clazz;
                 if (string.equals(WindowComponent.INPUTFIELD.getIdentifier())) {
                     clazz = SwingInputField.class;
                 } else if (string.equals(WindowComponent.TEXTAREA.getIdentifier())) {
@@ -93,7 +93,8 @@ public class ComponentCreator {
                 object = injector.createInstance(clazz);
             } catch (ClassNotFoundException | IllegalArgumentException ex) {
                 object = null;
-                Logger.userError(ErrorLevel.HIGH, "Unable to create component: " + ex.getMessage());
+                eventBus.post(new UserErrorEvent(ErrorLevel.HIGH, ex,
+                        "Unable to create component: " + ex.getMessage(), ""));
             }
             if (object instanceof JComponent) {
                 components.add((JComponent) object);

src/com/dmdirc/addons/ui_swing/components/frames/InputTextFrame.java

@@ -33,11 +33,11 @@ import com.dmdirc.addons.ui_swing.components.TypingLabel;
 import com.dmdirc.addons.ui_swing.components.inputfields.SwingInputField;
 import com.dmdirc.addons.ui_swing.components.inputfields.SwingInputHandler;
 import com.dmdirc.addons.ui_swing.dialogs.paste.PasteDialogFactory;
+import com.dmdirc.events.UserErrorEvent;
 import com.dmdirc.interfaces.CommandController;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
 import com.dmdirc.interfaces.ui.InputWindow;
 import com.dmdirc.logger.ErrorLevel;
-import com.dmdirc.logger.Logger;
 import com.dmdirc.plugins.PluginManager;
 import com.dmdirc.ui.input.InputHandler;
 import com.dmdirc.ui.messages.ColourManager;
@@ -109,20 +109,20 @@ public abstract class InputTextFrame extends TextFrame implements InputWindow,
      * @param inputFieldProvider The provider to use to create a new input field.
      * @param owner              WritableFrameContainer owning this frame.
      */
-    public InputTextFrame(
+    protected InputTextFrame(
             final TextFrameDependencies deps,
             final Provider<SwingInputField> inputFieldProvider,
             final FrameContainer owner) {
         super(owner, owner.getCommandParser(), deps);
 
-        this.config = owner.getConfigManager();
-        this.colourManager = new ColourManager(config);
-        this.parentWindow = deps.mainWindow;
-        this.pluginManager = deps.pluginManager;
-        this.pasteDialogFactory = deps.pasteDialog;
-        this.clipboard = deps.clipboard;
-        this.commandController = deps.commandController;
-        this.eventBus = deps.eventBus;
+        config = owner.getConfigManager();
+        colourManager = new ColourManager(config);
+        parentWindow = deps.mainWindow;
+        pluginManager = deps.pluginManager;
+        pasteDialogFactory = deps.pasteDialog;
+        clipboard = deps.clipboard;
+        commandController = deps.commandController;
+        eventBus = deps.eventBus;
 
         initComponents(inputFieldProvider);
 
@@ -233,11 +233,6 @@ public abstract class InputTextFrame extends TextFrame implements InputWindow,
         return inputField;
     }
 
-    /**
-     * {@inheritDoc}
-     *
-     * @param mouseEvent Mouse event
-     */
     @Override
     public void mouseClicked(final MouseEvent mouseEvent) {
         if (mouseEvent.getSource() == getTextPane()) {
@@ -245,51 +240,26 @@ public abstract class InputTextFrame extends TextFrame implements InputWindow,
         }
     }
 
-    /**
-     * {@inheritDoc}
-     *
-     * @param mouseEvent Mouse event
-     */
     @Override
     public void mousePressed(final MouseEvent mouseEvent) {
         processMouseEvent(mouseEvent);
     }
 
-    /**
-     * {@inheritDoc}
-     *
-     * @param mouseEvent Mouse event
-     */
     @Override
     public void mouseReleased(final MouseEvent mouseEvent) {
         processMouseEvent(mouseEvent);
     }
 
-    /**
-     * {@inheritDoc}
-     *
-     * @param mouseEvent Mouse event
-     */
     @Override
     public void mouseExited(final MouseEvent mouseEvent) {
         //Ignore
     }
 
-    /**
-     * {@inheritDoc}
-     *
-     * @param mouseEvent Mouse event
-     */
     @Override
     public void mouseEntered(final MouseEvent mouseEvent) {
         //Ignore
     }
 
-    /**
-     * Processes every mouse button event to check for a popup trigger.
-     *
-     * @param e mouse event
-     */
     @Override
     public void processMouseEvent(final MouseEvent e) {
         if (e.isPopupTrigger() && e.getSource() == getInputField()) {
@@ -312,7 +282,8 @@ public abstract class InputTextFrame extends TextFrame implements InputWindow,
                 return;
             }
         } catch (final IllegalStateException ex) {
-            Logger.userError(ErrorLevel.LOW, "Unable to paste from clipboard.");
+            eventBus.post(new UserErrorEvent(ErrorLevel.LOW, ex,
+                    "Unable to past from clipboard.", ""));
             return;
         }
 
@@ -322,10 +293,11 @@ public abstract class InputTextFrame extends TextFrame implements InputWindow,
             doPaste((String) Toolkit.getDefaultToolkit()
                     .getSystemClipboard().getData(DataFlavor.stringFlavor));
         } catch (final IOException ex) {
-            Logger.userError(ErrorLevel.LOW,
-                    "Unable to get clipboard contents: " + ex.getMessage());
+            eventBus.post(new UserErrorEvent(ErrorLevel.LOW, ex,
+                    "Unable to get clipboard contents: " + ex.getMessage(), ""));
         } catch (final UnsupportedFlavorException ex) {
-            Logger.userError(ErrorLevel.LOW, "Unsupported clipboard type", ex);
+            eventBus.post(new UserErrorEvent(ErrorLevel.LOW, ex,
+                    "Unsupported clipboard type", ""));
         }
     }
 
@@ -407,6 +379,9 @@ public abstract class InputTextFrame extends TextFrame implements InputWindow,
                                             "ui", "inputforegroundcolour",
                                             "ui", "foregroundcolour"), null)));
                     break;
+                default:
+                    //Do nothing
+                    break;
             }
         }
     }

src/com/dmdirc/addons/ui_swing/components/frames/TextFrame.java

@@ -124,7 +124,7 @@ public abstract class TextFrame extends JPanel implements com.dmdirc.interfaces.
      * @param commandParser The command parser to use for this frame.
      * @param deps          Collection of TextPane dependencies.
      */
-    public TextFrame(
+    protected TextFrame(
             final FrameContainer owner,
             final CommandParser commandParser,
             final TextFrameDependencies deps) {

src/com/dmdirc/addons/ui_swing/components/inputfields/SwingInputHandler.java

@@ -29,8 +29,6 @@ import com.dmdirc.addons.ui_swing.components.LoggingSwingWorker;
 import com.dmdirc.commandparser.parsers.CommandParser;
 import com.dmdirc.interfaces.CommandController;
 import com.dmdirc.interfaces.ui.InputField;
-import com.dmdirc.logger.ErrorLevel;
-import com.dmdirc.logger.Logger;
 import com.dmdirc.plugins.ServiceManager;
 import com.dmdirc.ui.input.InputHandler;
 
@@ -59,7 +57,7 @@ public class SwingInputHandler extends InputHandler implements KeyListener {
      * @param commandController The controller to use to retrieve command information.
      * @param commandParser     The command parser to use for this text field.
      * @param parentWindow      The window that owns this input handler
-     * @param eventBus          The event bus to use to despatch input events.
+     * @param eventBus          The event bus to use to dispatch input events.
      */
     public SwingInputHandler(
             final ServiceManager serviceManager,
@@ -73,7 +71,7 @@ public class SwingInputHandler extends InputHandler implements KeyListener {
 
     @Override
     protected void addUpHandler() {
-        JTextComponent localTarget;
+        final JTextComponent localTarget;
         if (target instanceof JTextComponent) {
             localTarget = (JTextComponent) target;
         } else if (target instanceof SwingInputField) {
@@ -103,7 +101,7 @@ public class SwingInputHandler extends InputHandler implements KeyListener {
 
     @Override
     protected void addDownHandler() {
-        JTextComponent localTarget;
+        final JTextComponent localTarget;
         if (target instanceof JTextComponent) {
             localTarget = (JTextComponent) target;
         } else if (target instanceof SwingInputField) {
@@ -162,6 +160,7 @@ public class SwingInputHandler extends InputHandler implements KeyListener {
                     @Override
                     protected void done() {
                         localTarget.setEditable(true);
+                        super.done();
                     }
                 }.execute();
             }
@@ -185,6 +184,7 @@ public class SwingInputHandler extends InputHandler implements KeyListener {
                             @Override
                             protected void done() {
                                 localTarget.setEditable(true);
+                                super.done();
                             }
                         }.execute();
                     }
@@ -198,7 +198,7 @@ public class SwingInputHandler extends InputHandler implements KeyListener {
 
     @Override
     protected void addEnterHandler() {
-        JTextComponent localTarget;
+        final JTextComponent localTarget;
         if (target instanceof JTextComponent) {
             localTarget = (JTextComponent) target;
         } else if (target instanceof SwingInputField) {
@@ -226,10 +226,8 @@ public class SwingInputHandler extends InputHandler implements KeyListener {
                         } else if (e.getSource() instanceof JTextField) {
                             source = (JTextField) e.getSource();
                         } else {
-                            Logger.appError(ErrorLevel.HIGH, "Unable to send "
-                                    + "line", new IllegalArgumentException(
-                                            "Event is not from known source."));
-                            return;
+                            throw new IllegalArgumentException(
+                                            "Event is not from known source.");
                         }
                         if (source.isEditable()) {
                             new LoggingSwingWorker<Object, Void>() {
@@ -255,21 +253,11 @@ public class SwingInputHandler extends InputHandler implements KeyListener {
         target.addKeyListener(this);
     }
 
-    /**
-     * {@inheritDoc}
-     *
-     * @param e Key event
-     */
     @Override
     public void keyTyped(final KeyEvent e) {
         //Ignore
     }
 
-    /**
-     * {@inheritDoc}
-     *
-     * @param e Key event
-     */
     @Override
     public void keyPressed(final KeyEvent e) {
         if (e.getKeyCode() != KeyEvent.VK_TAB && e.getKeyCode()
@@ -284,11 +272,6 @@ public class SwingInputHandler extends InputHandler implements KeyListener {
         }
     }
 
-    /**
-     * {@inheritDoc}
-     *
-     * @param e Key event
-     */
     @Override
     public void keyReleased(final KeyEvent e) {
         validateText();