Remove TopicChangeListener. Add Topic to topic events.

src/com/dmdirc/Channel.java

@@ -28,6 +28,7 @@ import com.dmdirc.config.ConfigBinding;
 import com.dmdirc.events.ChannelClosedEvent;
 import com.dmdirc.events.ChannelSelfActionEvent;
 import com.dmdirc.events.ChannelSelfMessageEvent;
+import com.dmdirc.events.ChannelTopicChangeEvent;
 import com.dmdirc.events.DisplayProperty;
 import com.dmdirc.events.NickListClientAddedEvent;
 import com.dmdirc.events.NickListClientRemovedEvent;
@@ -37,7 +38,6 @@ import com.dmdirc.interfaces.CommandController;
 import com.dmdirc.interfaces.Connection;
 import com.dmdirc.interfaces.GroupChat;
 import com.dmdirc.interfaces.GroupChatUser;
-import com.dmdirc.interfaces.TopicChangeListener;
 import com.dmdirc.interfaces.User;
 import com.dmdirc.interfaces.config.ConfigProviderMigrator;
 import com.dmdirc.parser.interfaces.ChannelClientInfo;
@@ -502,9 +502,7 @@ public class Channel extends MessageTarget implements GroupChat {
         }
         updateTitle();
 
-        new Thread(
-                () -> listenerList.getCallable(TopicChangeListener.class).topicChanged(this, topic),
-                "Topic change listener runner").start();
+        getEventBus().publishAsync(new ChannelTopicChangeEvent(this, topic));
     }
 
     @Override
@@ -536,16 +534,6 @@ public class Channel extends MessageTarget implements GroupChat {
         return server.getParser().get().getMaxTopicLength();
     }
 
-    @Override
-    public void addTopicChangeListener(final TopicChangeListener listener) {
-        listenerList.add(TopicChangeListener.class, listener);
-    }
-
-    @Override
-    public void removeTopicChangeListener(final TopicChangeListener listener) {
-        listenerList.remove(TopicChangeListener.class, listener);
-    }
-
     @Override
     public Optional<Connection> getConnection() {
         return Optional.of(server);

src/com/dmdirc/ChannelEventHandler.java

@@ -157,27 +157,26 @@ public class ChannelEventHandler extends EventHandler implements
             final ChannelInfo channel, final boolean isJoinTopic) {
         checkParser(parser);
 
+        final Topic topic = new Topic(channel.getTopic(),
+                owner.getUser(getConnection().getUser(channel.getTopicSetter())),
+                channel.getTopicTime());
+
         if (isJoinTopic) {
             if (Strings.isNullOrEmpty(channel.getTopic())) {
                 final ChannelNotopicEvent event = new ChannelNotopicEvent(owner);
                 final String format = EventUtils.postDisplayable(eventBus, event, "channelNoTopic");
                 owner.doNotification(date, format);
             } else {
-                final Topic newTopic = new Topic(channel.getTopic(),
-                        getConnection().getUser(channel.getTopicSetter()),
-                        channel.getTopicTime());
-                final ChannelGottopicEvent event = new ChannelGottopicEvent(owner, newTopic);
+                final ChannelGottopicEvent event = new ChannelGottopicEvent(owner, topic);
                 final String format = EventUtils.postDisplayable(eventBus, event,
                         "channelTopicDiscovered");
-                owner.doNotification(date, format, newTopic);
+                owner.doNotification(date, format, topic);
             }
         } else {
             final ChannelDisplayableEvent event;
             final String format;
             if (Strings.isNullOrEmpty(channel.getTopic())) {
-                event = new ChannelTopicChangeEvent(owner,
-                        channel.getChannelClient(channel.getTopicSetter(), true),
-                        channel.getTopic());
+                event = new ChannelTopicChangeEvent(owner, topic);
                 format = EventUtils.postDisplayable(eventBus, event,
                         "channelTopicRemoved");
             } else {
@@ -200,9 +199,7 @@ public class ChannelEventHandler extends EventHandler implements
             //  - It's being set while we're in the channel (rather than discovered on join), or
             //  - We think the current topic is empty and are discovering a new one, or
             //  - The newly discovered topic is different to what we thought the current topic was.
-            owner.addTopic(new Topic(channel.getTopic(),
-                    getConnection().getUser(channel.getTopicSetter()),
-                    channel.getTopicTime()));
+            owner.addTopic(topic);
         }
     }
 

src/com/dmdirc/Topic.java

@@ -22,7 +22,7 @@
 
 package com.dmdirc;
 
-import com.dmdirc.interfaces.User;
+import com.dmdirc.interfaces.GroupChatUser;
 
 /**
  * Stores information about a channel topic.
@@ -32,7 +32,7 @@ public class Topic {
     /** Topic. */
     private final String topic;
     /** Topic client. */
-    private final User client;
+    private final GroupChatUser client;
     /** Topic time. */
     private final long time;
 
@@ -43,7 +43,7 @@ public class Topic {
      * @param client Topic client
      * @param time   Topic time
      */
-    public Topic(final String topic, final User client, final long time) {
+    public Topic(final String topic, final GroupChatUser client, final long time) {
         this.topic = topic;
         this.client = client;
         this.time = time;
@@ -54,7 +54,7 @@ public class Topic {
      *
      * @return client
      */
-    public User getClient() {
+    public GroupChatUser getClient() {
         return client;
     }
 

src/com/dmdirc/commandparser/commands/channel/ShowTopic.java

@@ -36,7 +36,7 @@ import com.dmdirc.commandparser.commands.context.ChannelCommandContext;
 import com.dmdirc.commandparser.commands.context.CommandContext;
 import com.dmdirc.interfaces.CommandController;
 import com.dmdirc.interfaces.Connection;
-import com.dmdirc.interfaces.User;
+import com.dmdirc.interfaces.GroupChatUser;
 
 import java.util.Optional;
 
@@ -71,11 +71,11 @@ public class ShowTopic extends Command implements ExternalCommand {
         if (args.getArguments().length == 0) {
             final Optional<Topic> topic = channel.getCurrentTopic();
             if (topic.isPresent()) {
-                final Optional<User> user = topic.map(Topic::getClient);
+                final Optional<GroupChatUser> user = topic.map(Topic::getClient);
                 sendLine(origin, args.isSilent(), "channelTopicDiscovered", "",
-                        user.map(User::getNickname).orElse(""),
-                        user.flatMap(User::getUsername).orElse(""),
-                        user.flatMap(User::getHostname).orElse(""),
+                        user.map(GroupChatUser::getNickname).orElse(""),
+                        user.flatMap(GroupChatUser::getUsername).orElse(""),
+                        user.flatMap(GroupChatUser::getHostname).orElse(""),
                         topic.map(Topic::getTopic).orElse(""),
                         1000 * topic.map(Topic::getTime).get(),
                         channel.getName());

src/com/dmdirc/events/ChannelTopicChangeEvent.java

@@ -23,38 +23,27 @@
 package com.dmdirc.events;
 
 import com.dmdirc.Channel;
-import com.dmdirc.parser.interfaces.ChannelClientInfo;
-
-import javax.annotation.Nullable;
+import com.dmdirc.Topic;
 
 /**
  * Fired when a topic is changed.
  */
 public class ChannelTopicChangeEvent extends ChannelDisplayableEvent {
 
-    private final ChannelClientInfo client;
-    @Nullable private final String topic;
+    private final Topic topic;
 
     public ChannelTopicChangeEvent(final long timestamp, final Channel channel,
-            final ChannelClientInfo client, @Nullable final String topic) {
+            final Topic topic) {
         super(timestamp, channel);
-        this.client = client;
         this.topic = topic;
     }
 
-    public ChannelTopicChangeEvent(final Channel channel, final ChannelClientInfo client,
-            @Nullable final String topic) {
+    public ChannelTopicChangeEvent(final Channel channel, final Topic topic) {
         super(channel);
-        this.client = client;
         this.topic = topic;
     }
 
-    public ChannelClientInfo getClient() {
-        return client;
-    }
-
-    @Nullable
-    public String getTopic() {
+    public Topic getTopic() {
         return topic;
     }
 

src/com/dmdirc/interfaces/GroupChat.java

@@ -33,13 +33,6 @@ import java.util.Optional;
  */
 public interface GroupChat extends Chat {
 
-    /**
-     * Adds a topic change listener to this channel.
-     *
-     * @param listener The listener to notify about topic changes.
-     */
-    void addTopicChangeListener(final TopicChangeListener listener);
-
     /**
      * Returns the current topic for this channel.
      *
@@ -87,13 +80,6 @@ public interface GroupChat extends Chat {
      */
     void part(final String reason);
 
-    /**
-     * Removes a topic change listener from this channel.
-     *
-     * @param listener The listener to be removed.
-     */
-    void removeTopicChangeListener(final TopicChangeListener listener);
-
     /**
      * Requests all available list modes for this channel.
      */

src/com/dmdirc/interfaces/TopicChangeListener.java

@@ -1,43 +0,0 @@
-/*
- * Copyright (c) 2006-2014 DMDirc Developers
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-package com.dmdirc.interfaces;
-
-import com.dmdirc.Channel;
-import com.dmdirc.Topic;
-
-/**
- * An interface for objects interested in receiving topic change events from a {@link Channel}.
- *
- * @since 0.6.3
- */
-public interface TopicChangeListener {
-
-    /**
-     * Called whenever a topic is changed.
-     *
-     * @param channel The channel whose topic has been changed
-     * @param topic   The new topic of the channel
-     */
-    void topicChanged(final Channel channel, final Topic topic);
-
-}

test/com/dmdirc/TopicTest.java

@@ -22,20 +22,20 @@
 
 package com.dmdirc;
 
-import com.dmdirc.interfaces.User;
+import com.dmdirc.interfaces.GroupChatUser;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
 import org.mockito.runners.MockitoJUnitRunner;
 
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
 
 @RunWith(MockitoJUnitRunner.class)
 public class TopicTest {
 
     @Mock
-    private User user;
+    private GroupChatUser user;
 
     @Test
     public void testGetClient() {