Remove deprecated status bar methods

Change-Id: I4826900ba5cd4766fbd3553c5ff1c1f129fe47b6
Depends-On: I30b139e65cc86beafde44fef6bfa00c1cca085ad
Reviewed-on: http://gerrit.dmdirc.com/2101
Automatic-Compile: DMDirc Build Manager
Reviewed-by: Greg Holmes <greg@dmdirc.com>

src/com/dmdirc/ui/core/components/StatusBarManager.java

@@ -25,7 +25,6 @@ package com.dmdirc.ui.core.components;
 import com.dmdirc.ui.StatusMessage;
 import com.dmdirc.ui.interfaces.StatusBar;
 import com.dmdirc.ui.interfaces.StatusBarComponent;
-import com.dmdirc.ui.interfaces.StatusMessageNotifier;
 
 import java.util.Collection;
 import java.util.concurrent.CopyOnWriteArraySet;
@@ -63,82 +62,6 @@ public class StatusBarManager implements StatusBar {
         statusBars.remove(statusBar);
     }
 
-    /** {@inheritDoc}
-     *
-     * @deprecated Should use {@link setMessage(StatusMessage)} instead
-     */
-    @Deprecated
-    @Override
-    public void setMessage(final String newMessage) {
-        for (StatusBar statusBar : statusBars) {
-            statusBar.setMessage(newMessage);
-        }
-    }
-
-    /** {@inheritDoc}
-     *
-     * @deprecated Should use {@link setMessage(StatusMessage)} instead
-     */
-    @Deprecated
-    @Override
-    public void setMessage(final String iconType, final String newMessage) {
-        for (StatusBar statusBar : statusBars) {
-            statusBar.setMessage(iconType, newMessage);
-        }
-    }
-
-    /** {@inheritDoc}
-     *
-     * @deprecated Should use {@link setMessage(StatusMessage)} instead
-     */
-    @Deprecated
-    @Override
-    public void setMessage(final String newMessage,
-            final StatusMessageNotifier newNotifier) {
-        for (StatusBar statusBar : statusBars) {
-            statusBar.setMessage(newMessage, newNotifier);
-        }
-    }
-
-    /** {@inheritDoc}
-     *
-     * @deprecated Should use {@link setMessage(StatusMessage)} instead
-     */
-    @Deprecated
-    @Override
-    public void setMessage(final String iconType, final String newMessage,
-            final StatusMessageNotifier newNotifier) {
-        for (StatusBar statusBar : statusBars) {
-            statusBar.setMessage(iconType, newMessage, newNotifier);
-        }
-    }
-
-    /** {@inheritDoc}
-     *
-     * @deprecated Should use {@link setMessage(StatusMessage)} instead
-     */
-    @Deprecated
-    @Override
-    public void setMessage(final String newMessage,
-            final StatusMessageNotifier newNotifier, final int timeout) {
-        for (StatusBar statusBar : statusBars) {
-            statusBar.setMessage(newMessage, newNotifier, timeout);
-        }
-    }
-
-    /** {@inheritDoc}
-     *
-     * @deprecated Should use {@link setMessage(StatusMessage)} instead
-     */
-    @Deprecated
-    @Override
-    public void setMessage(final String iconType, final String newMessage,
-            final StatusMessageNotifier newNotifier, final int timeout) {
-        for (StatusBar statusBar : statusBars) {
-            statusBar.setMessage(iconType, newMessage, newNotifier, timeout);
-        }
-    }
-
     /** {@inheritDoc} */
     @Override
     public void setMessage(final StatusMessage message) {

src/com/dmdirc/ui/interfaces/StatusBar.java

@@ -29,95 +29,6 @@ import com.dmdirc.ui.StatusMessage;
  */
 public interface StatusBar {
 
-    /**
-     * sets the message in the status bar.
-     *
-     * @param newMessage Message to display
-     *
-     * @deprecated Should use {@link setMessage(StatusMessage)} instead
-     */
-    @Deprecated
-    void setMessage(final String newMessage);
-
-    /**
-     * sets the message in the status bar.
-     *
-     * @param iconType Message icon
-     * @param newMessage Message to display
-     *
-     * @since 0.6
-     *
-     * @deprecated Should use {@link setMessage(StatusMessage)} instead
-     */
-    @Deprecated
-    void setMessage(final String iconType, final String newMessage);
-
-    /**
-     * Sets the message in the status bar with a specified callback event
-     * using the default timeout.
-     *
-     * @param newMessage Message to display
-     * @param newNotifier status message notifier to be notified for events on
-     * this message
-     *
-     * @since 0.6
-     *
-     * @deprecated Should use {@link setMessage(StatusMessage)} instead
-     */
-    @Deprecated
-    void setMessage(final String newMessage,
-            final StatusMessageNotifier newNotifier);
-
-    /**
-     * Sets the message in the status bar with a specified callback event
-     * using the default timeout.
-     *
-     * @param iconType Message icon
-     * @param newMessage Message to display
-     * @param newNotifier status message notifier to be notified for events on
-     * this message
-     *
-     * @since 0.6
-     *
-     * @deprecated Should use {@link setMessage(StatusMessage)} instead
-     */
-    @Deprecated
-    void setMessage(final String iconType, final String newMessage,
-            final StatusMessageNotifier newNotifier);
-
-    /**
-     * Sets the message in the status bar with a specified callback event for
-     * a specified time.
-     *
-     * @param newMessage Message to display
-     * @param newNotifier status message notifier to be notified for events on
-     * this message
-     * @param timeout message timeout in seconds
-     *
-     * @deprecated Should use {@link setMessage(StatusMessage)} instead
-     */
-    @Deprecated
-    void setMessage(final String newMessage,
-            final StatusMessageNotifier newNotifier, final int timeout);
-
-    /**
-     * Sets the message in the status bar with a specified callback event for
-     * a specified time.
-     *
-     * @param iconType Message icon
-     * @param newMessage Message to display
-     * @param newNotifier status message notifier to be notified for events on
-     * this message
-     * @param timeout message timeout in seconds
-     *
-     * @since 0.6
-     *
-     * @deprecated Should use {@link setMessage(StatusMessage)} instead
-     */
-    @Deprecated
-    void setMessage(final String iconType, final String newMessage,
-            final StatusMessageNotifier newNotifier, final int timeout);
-
     /**
      * Sets the message for this message label.
      *