Merge pull request #613 from csmith/tidying

Deprecate things that should be replaced by events

src/com/dmdirc/ChannelMap.java

@@ -116,6 +116,7 @@ public class ChannelMap {
      * @param date        The time of origin of the message.
      * @param args        The arguments for the message.
      */
+    @Deprecated
     public void addLineToAll(final String messageType, final Date date, final Object... args) {
         channels.values().forEach(c -> c.addLine(messageType, date, args));
     }

src/com/dmdirc/FrameContainer.java

@@ -308,6 +308,7 @@ public abstract class FrameContainer implements WindowModel {
     }
 
     @Override
+    @Deprecated
     public void addLine(final String type, final Date timestamp, final Object... args) {
         if (type != null && !type.isEmpty()) {
             addLine(Formatter.formatMessage(getConfigManager(), type, args), timestamp);
@@ -315,11 +316,13 @@ public abstract class FrameContainer implements WindowModel {
     }
 
     @Override
+    @Deprecated
     public void addLine(final String type, final Object... args) {
         addLine(type, new Date(), args);
     }
 
     @Override
+    @Deprecated
     public void addLine(final String line, final Date timestamp) {
         for (final String myLine : line.split("\n")) {
             getBackBuffer().getDocument().addText(
@@ -411,6 +414,7 @@ public abstract class FrameContainer implements WindowModel {
      * @param messageType The type of message that is being sent
      * @param args        The arguments for the message
      */
+    @Deprecated
     public void handleNotification(final Date date, final String messageType, final Object... args) {
         checkState(writable);
         messageSinkManager.get().dispatchMessage(this, date, messageType, args);

src/com/dmdirc/Server.java

@@ -762,6 +762,7 @@ public class Server extends FrameContainer implements Connection {
     }
 
     @Override
+    @Deprecated
     public void addLineToAll(final String messageType, final Date date,
             final Object... args) {
         groupChatManager.addLineToAll(messageType, date, args);

src/com/dmdirc/interfaces/Connection.java

@@ -49,6 +49,7 @@ public interface Connection {
      * @param date        The date at which the event occurred
      * @param args        The arguments of the message
      */
+    @Deprecated
     void addLineToAll(final String messageType, final Date date, final Object... args);
 
     /**

src/com/dmdirc/interfaces/WindowModel.java

@@ -150,6 +150,7 @@ public interface WindowModel {
      *
      * @since 0.6.4
      */
+    @Deprecated
     void addLine(String type, Date timestamp, Object... args);
 
     /**
@@ -159,6 +160,7 @@ public interface WindowModel {
      * @param type The message type to use
      * @param args The message's arguments
      */
+    @Deprecated
     void addLine(String type, Object... args);
 
     /**
@@ -170,6 +172,7 @@ public interface WindowModel {
      *
      * @since 0.6.4
      */
+    @Deprecated
     void addLine(String line, Date timestamp);
 
     /**

src/com/dmdirc/ui/messages/sink/AllMessageSink.java

@@ -32,6 +32,7 @@ import javax.inject.Inject;
 /**
  * A message sink which adds the message to all of the container's server's children.
  */
+@Deprecated
 public class AllMessageSink implements MessageSink {
 
     /** The pattern to use to match this sink. */

src/com/dmdirc/ui/messages/sink/ChannelMessageSink.java

@@ -37,6 +37,7 @@ import javax.inject.Inject;
  * for use if the channel does not exist. If no fallback is specified and the channel does not
  * exist, the message is dispatched to the source.
  */
+@Deprecated
 public class ChannelMessageSink implements MessageSink {
 
     /** The pattern to use to match this sink. */

src/com/dmdirc/ui/messages/sink/CommonChannelsMessageSink.java

@@ -38,6 +38,7 @@ import javax.inject.Inject;
  * channels with the user. If no fallback is specified and there are no common channels, the message
  * is dispatched to the source.
  */
+@Deprecated
 public class CommonChannelsMessageSink implements MessageSink {
 
     /** The pattern to use to match this sink. */

src/com/dmdirc/ui/messages/sink/CustomWindowMessageSink.java

@@ -35,6 +35,7 @@ import javax.inject.Inject;
 /**
  * A message sink which adds the message to a custom window, creating it if necessary.
  */
+@Deprecated
 public class CustomWindowMessageSink implements MessageSink {
 
     /** The pattern to use to match this sink. */

src/com/dmdirc/ui/messages/sink/ForkMessageSink.java

@@ -32,6 +32,7 @@ import javax.inject.Inject;
 /**
  * A message sink which allows the message to be forked into multiple other sinks.
  */
+@Deprecated
 public class ForkMessageSink implements MessageSink {
 
     /** The pattern to use to match this sink. */

src/com/dmdirc/ui/messages/sink/FormatMessageSink.java

@@ -32,6 +32,7 @@ import javax.inject.Inject;
 /**
  * A message sink which changes the format of the message and then re-dispatches it.
  */
+@Deprecated
 public class FormatMessageSink implements MessageSink {
 
     /** The pattern to use to match this sink. */

src/com/dmdirc/ui/messages/sink/GroupMessageSink.java

@@ -33,6 +33,7 @@ import javax.inject.Inject;
  * A message sink which changes the sink to the value of a named configuration setting to allow
  * grouping of sinks.
  */
+@Deprecated
 public class GroupMessageSink implements MessageSink {
 
     /** The pattern to use to match this sink. */

src/com/dmdirc/ui/messages/sink/LastCommandMessageSink.java

@@ -35,6 +35,7 @@ import javax.inject.Inject;
  * A message sink which adds the message to the window where a command matching the provided regex
  * was most recently executed. If no such window is found, falls back to the source.
  */
+@Deprecated
 public class LastCommandMessageSink implements MessageSink {
 
     /** The pattern to use to match this sink. */

src/com/dmdirc/ui/messages/sink/MessageSink.java

@@ -30,6 +30,7 @@ import java.util.regex.Pattern;
 /**
  * Represents a possible destination (sink) for a generic DMDirc message.
  */
+@Deprecated
 public interface MessageSink {
 
     /**

src/com/dmdirc/ui/messages/sink/MessageSinkManager.java

@@ -37,6 +37,7 @@ import static com.dmdirc.util.LogUtils.USER_ERROR;
 /**
  * Manages message sinks and facilitates dispatching of messages to sinks.
  */
+@Deprecated
 public class MessageSinkManager {
 
     private static final Logger LOG = LoggerFactory.getLogger(MessageSinkManager.class);

src/com/dmdirc/ui/messages/sink/MessagesModule.java

@@ -34,6 +34,7 @@ import dagger.Provides;
 /**
  * Module for dependency injecting the {@link MessageSinkManager} and its default sinks.
  */
+@Deprecated
 @Module(library = true, complete = false)
 public class MessagesModule {
 

src/com/dmdirc/ui/messages/sink/NullMessageSink.java

@@ -32,6 +32,7 @@ import javax.inject.Inject;
 /**
  * A message sink which does nothing with the message.
  */
+@Deprecated
 public class NullMessageSink implements MessageSink {
 
     /** The pattern to use to match this sink. */

src/com/dmdirc/ui/messages/sink/SelfMessageSink.java

@@ -32,6 +32,7 @@ import javax.inject.Inject;
 /**
  * A message sink which adds the message to the container that dispatched it.
  */
+@Deprecated
 public class SelfMessageSink implements MessageSink {
 
     /** The pattern to use to match this sink. */

src/com/dmdirc/ui/messages/sink/ServerMessageSink.java

@@ -32,6 +32,7 @@ import javax.inject.Inject;
 /**
  * A message sink which adds the message to the container's server.
  */
+@Deprecated
 public class ServerMessageSink implements MessageSink {
 
     /** The pattern to use to match this sink. */

src/com/dmdirc/ui/messages/sink/StatusBarMessageSink.java

@@ -36,6 +36,7 @@ import javax.inject.Inject;
 /**
  * A message sink which adds the message to the status bar.
  */
+@Deprecated
 public class StatusBarMessageSink implements MessageSink {
 
     /** The pattern to use to match this sink. */