Merge pull request #610 from csmith/tidying

Tidy up some unused/uncommonly used methods.

src/com/dmdirc/FrameContainer.java

@@ -430,19 +430,6 @@ public abstract class FrameContainer implements WindowModel {
      * @return True if any further behaviour should be executed, false otherwise
      */
     public boolean doNotification(final String messageType, final Object... args) {
-        return doNotification(new Date(), messageType, args);
-    }
-
-    /**
-     * Processes and displays a notification.
-     *
-     * @param date        The date/time at which the event occurred
-     * @param messageType The name of the formatter to be used for the message
-     * @param args        The arguments for the message
-     *
-     * @return True if any further behaviour should be executed, false otherwise
-     */
-    public boolean doNotification(final Date date, final String messageType, final Object... args) {
         final List<Object> messageArgs = new ArrayList<>();
         final List<Object> actionArgs = new ArrayList<>();
 
@@ -458,7 +445,7 @@ public abstract class FrameContainer implements WindowModel {
 
         modifyNotificationArgs(actionArgs, messageArgs);
 
-        handleNotification(date, messageType, messageArgs.toArray());
+        handleNotification(new Date(), messageType, messageArgs.toArray());
 
         return true;
     }
@@ -486,17 +473,6 @@ public abstract class FrameContainer implements WindowModel {
         return false;
     }
 
-    /**
-     * Handles general server notifications (i.e., ones not tied to a specific window). The user can
-     * select where the notifications should go in their config.
-     *
-     * @param messageType The type of message that is being sent
-     * @param args        The arguments for the message
-     */
-    public void handleNotification(final String messageType, final Object... args) {
-        handleNotification(new Date(), messageType, args);
-    }
-
     /**
      * Handles general server notifications (i.e., ones not tied to a specific window). The user can
      * select where the notifications should go in their config.

src/com/dmdirc/ServerEventHandler.java

@@ -258,7 +258,7 @@ public class ServerEventHandler extends EventHandler {
         final ServerNumericEvent coreEvent = new ServerNumericEvent(owner, event.getNumeric(),
                 event.getToken());
         final String format = EventUtils.postDisplayable(eventBus, coreEvent, target);
-        owner.handleNotification(format, (Object[]) event.getToken());
+        owner.handleNotification(event.getDate(), format, (Object[]) event.getToken());
     }
 
     @Handler