Remove some unused code.

src/com/dmdirc/Channel.java

@@ -28,7 +28,6 @@ import com.dmdirc.events.ChannelSelfActionEvent;
 import com.dmdirc.events.ChannelSelfJoinEvent;
 import com.dmdirc.events.ChannelSelfMessageEvent;
 import com.dmdirc.events.CommandErrorEvent;
-import com.dmdirc.events.DisplayProperty;
 import com.dmdirc.events.NickListClientAddedEvent;
 import com.dmdirc.events.NickListClientRemovedEvent;
 import com.dmdirc.events.NickListClientsChangedEvent;
@@ -47,8 +46,6 @@ import com.dmdirc.ui.core.components.WindowComponent;
 import com.dmdirc.ui.input.TabCompletionType;
 import com.dmdirc.ui.messages.BackBufferFactory;
 import com.dmdirc.ui.messages.Styliser;
-import com.dmdirc.util.colours.Colour;
-import com.dmdirc.util.colours.ColourUtils;
 
 import com.google.common.collect.EvictingQueue;
 
@@ -368,49 +365,6 @@ public class Channel extends FrameContainer implements GroupChat {
         }
     }
 
-    /**
-     * Returns a string[] containing the nickname/ident/host of a channel client.
-     *
-     *
-     *
-     * @param client The channel client to check
-     *
-     * @return  A string[] containing displayable components
-     *          0 - mode
-     *          1 - nickname
-     *          2 - ident
-     *          3 - hostname
-     */
-    private String[] getDetails(final GroupChatUser client) {
-        if (client == null) {
-            // WTF?
-            throw new UnsupportedOperationException("getDetails called with"
-                    + " null ChannelClientInfo");
-        }
-
-        final String[] res = {
-            getModes(client),
-            Styliser.CODE_NICKNAME + client.getNickname() + Styliser.CODE_NICKNAME,
-            client.getUsername().orElse(""),
-            client.getHostname().orElse(""),};
-
-        if (showColours) {
-            final Optional<Colour> foreground
-                    = client.getDisplayProperty(DisplayProperty.FOREGROUND_COLOUR);
-            final Optional<Colour> background
-                    = client.getDisplayProperty(DisplayProperty.BACKGROUND_COLOUR);
-            if (foreground.isPresent()) {
-                String prefix = Styliser.CODE_HEXCOLOUR + ColourUtils.getHex(foreground.get());
-                if (background.isPresent()) {
-                    prefix += ',' + ColourUtils.getHex(background.get());
-                }
-                res[1] = prefix + res[1] + Styliser.CODE_HEXCOLOUR;
-            }
-        }
-
-        return res;
-    }
-
     // ---------------------------------------------------- TOPIC HANDLING -----
     /**
      * Adds the specified topic to this channel's topic list.

src/com/dmdirc/FrameContainer.java

@@ -38,7 +38,6 @@ import com.dmdirc.ui.messages.BackBuffer;
 import com.dmdirc.ui.messages.BackBufferFactory;
 import com.dmdirc.ui.messages.UnreadStatusManager;
 import com.dmdirc.util.ChildEventBusManager;
-import com.dmdirc.util.collections.ListenerList;
 
 import java.util.Collection;
 import java.util.Collections;
@@ -54,8 +53,6 @@ import javax.annotation.Nullable;
  */
 public class FrameContainer implements WindowModel {
 
-    /** Listeners not yet using ListenerSupport. */
-    protected final ListenerList listeners = new ListenerList();
     /** The name of the icon being used for this container's frame. */
     private String icon;
     /** The name of this container. */

src/com/dmdirc/Main.java

@@ -71,7 +71,6 @@ import dagger.ObjectGraph;
  */
 public class Main {
 
-    private final Logger log = LoggerFactory.getLogger(Main.class);
     /** The UI to use for the client. */
     private final Collection<UIController> CONTROLLERS = new HashSet<>();
     /** The identity manager the client will use. */

src/com/dmdirc/config/ConfigManager.java

@@ -22,7 +22,6 @@
 
 package com.dmdirc.config;
 
-import com.dmdirc.DMDircMBassador;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
 import com.dmdirc.interfaces.config.ConfigChangeListener;
 import com.dmdirc.interfaces.config.ConfigProvider;
@@ -93,10 +92,9 @@ class ConfigManager implements ConfigChangeListener, ConfigProviderListener,
     ConfigManager(
             final ClientInfo clientInfo,
             final IdentityManager manager,
-            final DMDircMBassador eventBus,
             final String protocol, final String ircd,
             final String network, final String server) {
-        this(clientInfo, manager, eventBus, protocol, ircd, network, server, "<Unknown>");
+        this(clientInfo, manager, protocol, ircd, network, server, "<Unknown>");
     }
 
     /**
@@ -114,7 +112,6 @@ class ConfigManager implements ConfigChangeListener, ConfigProviderListener,
     ConfigManager(
             final ClientInfo clientInfo,
             final IdentityManager manager,
-            final DMDircMBassador eventBus,
             final String protocol, final String ircd,
             final String network, final String server, final String channel) {
         final String chanName = channel + '@' + network;

src/com/dmdirc/config/ConfigModule.java

@@ -22,7 +22,6 @@
 
 package com.dmdirc.config;
 
-import com.dmdirc.DMDircMBassador;
 import com.dmdirc.commandline.CommandLineParser;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
 import com.dmdirc.interfaces.config.ConfigProvider;
@@ -64,11 +63,10 @@ public class ConfigModule {
             @Directory(DirectoryType.IDENTITIES) final Path identitiesDirectory,
             @Directory(DirectoryType.ERRORS) final Path errorsDirectory,
             final CommandLineParser commandLineParser,
-            final DMDircMBassador eventBus,
             final ClientInfo clientInfo,
             final ErrorManager errorManager) {
         final IdentityManager identityManager = new IdentityManager(baseDirectory,
-                identitiesDirectory, eventBus, clientInfo);
+                identitiesDirectory, clientInfo);
         errorManager.initialise(identityManager.getGlobalConfiguration());
         identityManager.loadVersionIdentity();
         try {

src/com/dmdirc/config/IdentityManager.java

@@ -22,7 +22,6 @@
 
 package com.dmdirc.config;
 
-import com.dmdirc.DMDircMBassador;
 import com.dmdirc.Precondition;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
 import com.dmdirc.interfaces.config.ConfigProvider;
@@ -79,18 +78,16 @@ public class IdentityManager implements IdentityFactory, IdentityController {
     /**
      * The identities that have been loaded into this manager.
      *
-     * Standard identities are inserted with a <code>null</code> key, custom identities use their
+     * Standard identities are inserted with a {@code null} key, custom identities use their
      * custom type as the key.
      */
     private final Multimap<String, ConfigProvider> identities = ArrayListMultimap.create();
     /** Map of paths to corresponding config providers, to facilitate reloading. */
     private final Map<Path, ConfigProvider> configProvidersByPath = new ConcurrentHashMap<>();
-    /** The event bus to post events to. */
-    private final DMDircMBassador eventBus;
     /**
      * The {@link ConfigProviderListener}s that have registered with this manager.
      *
-     * Listeners for standard identities are inserted with a <code>null</code> key, listeners for a
+     * Listeners for standard identities are inserted with a {@code null} key, listeners for a
      * specific custom type use their type as the key.
      */
     private final Multimap<String, WeakReference<ConfigProviderListener>> listeners =
@@ -111,13 +108,11 @@ public class IdentityManager implements IdentityFactory, IdentityController {
      *
      * @param baseDirectory       The BASE config directory.
      * @param identitiesDirectory The directory to store identities in.
-     * @param eventBus            The event bus to post events to
      */
     public IdentityManager(final Path baseDirectory, final Path identitiesDirectory,
-            final DMDircMBassador eventBus, final ClientInfo clientInfo) {
+            final ClientInfo clientInfo) {
         this.configDirectory = baseDirectory;
         this.identitiesDirectory = identitiesDirectory;
-        this.eventBus = eventBus;
         this.clientInfo = clientInfo;
     }
 
@@ -661,9 +656,8 @@ public class IdentityManager implements IdentityFactory, IdentityController {
     @Override
     public ConfigProviderMigrator createMigratableConfig(final String protocol,
             final String ircd, final String network, final String server) {
-        final ConfigManager configManager = new ConfigManager(clientInfo, this, eventBus, protocol,
-                ircd,
-                network, server);
+        final ConfigManager configManager = new ConfigManager(clientInfo, this, protocol,
+                ircd, network, server);
         setUpConfigManager(configManager);
         return new ConfigManagerMigrator(configManager);
     }
@@ -671,7 +665,7 @@ public class IdentityManager implements IdentityFactory, IdentityController {
     @Override
     public ConfigProviderMigrator createMigratableConfig(final String protocol,
             final String ircd, final String network, final String server, final String channel) {
-        final ConfigManager configManager = new ConfigManager(clientInfo, this, eventBus, protocol,
+        final ConfigManager configManager = new ConfigManager(clientInfo, this, protocol,
                 ircd, network, server, channel);
         setUpConfigManager(configManager);
         return new ConfigManagerMigrator(configManager);
@@ -680,7 +674,7 @@ public class IdentityManager implements IdentityFactory, IdentityController {
     @Override
     public AggregateConfigProvider createAggregateConfig(final String protocol, final String ircd,
             final String network, final String server) {
-        final ConfigManager configManager = new ConfigManager(clientInfo, this, eventBus, protocol,
+        final ConfigManager configManager = new ConfigManager(clientInfo, this, protocol,
                 ircd, network, server);
         setUpConfigManager(configManager);
         return configManager;
@@ -689,7 +683,7 @@ public class IdentityManager implements IdentityFactory, IdentityController {
     @Override
     public AggregateConfigProvider createAggregateConfig(final String protocol, final String ircd,
             final String network, final String server, final String channel) {
-        final ConfigManager configManager = new ConfigManager(clientInfo, this, eventBus, protocol,
+        final ConfigManager configManager = new ConfigManager(clientInfo, this, protocol,
                 ircd, network, server, channel);
         setUpConfigManager(configManager);
         return configManager;

src/com/dmdirc/config/prefs/reader/CategoryReader.java

@@ -75,7 +75,7 @@ public class CategoryReader {
         this.data = checkNotNull(data);
     }
 
-    public void read() throws PreferencesReaderException {
+    public void read() {
         title = requiredString(data, TITLE_KEY);
         description = optionalString(data, DESCRIPTION_KEY);
         icon = optionalString(data, ICON_KEY);

src/com/dmdirc/ui/input/InputHandler.java

@@ -97,7 +97,7 @@ public abstract class InputHandler implements ConfigChangeListener {
     protected int flags = HANDLE_TABCOMPLETION | HANDLE_BACKBUFFER
             | HANDLE_FORMATTING | HANDLE_RETURN;
     /** The input buffer. */
-    protected RollingList<String> buffer;
+    protected final RollingList<String> buffer;
     /** The textfield that we're handling input for. */
     protected final InputField target;
     /** The TabCompleter to use for tab completion. */

test/com/dmdirc/config/ConfigManagerTest.java

@@ -22,7 +22,6 @@
 
 package com.dmdirc.config;
 
-import com.dmdirc.DMDircMBassador;
 import com.dmdirc.interfaces.config.ConfigChangeListener;
 import com.dmdirc.util.ClientInfo;
 import com.dmdirc.util.validators.PermissiveValidator;
@@ -45,17 +44,16 @@ public class ConfigManagerTest {
 
     @Mock private IdentityManager identityManager;
     @Mock private ClientInfo clientInfo;
-    @Mock private DMDircMBassador eventBus;
 
     @Test
     public void testNonExistantOption() {
-        assertNull(new ConfigManager(clientInfo, identityManager, eventBus, "", "", "", "")
+        assertNull(new ConfigManager(clientInfo, identityManager, "", "", "", "")
                 .getOption("unit-test123", "foobar"));
     }
 
     @Test
     public void testStats() {
-        final ConfigManager cm = new ConfigManager(clientInfo, identityManager, eventBus, "", "", "", "");
+        final ConfigManager cm = new ConfigManager(clientInfo, identityManager, "", "", "", "");
         assertNull(ConfigManager.getStats().get("unit-test123.baz"));
         cm.hasOption("unit-test123", "baz", new PermissiveValidator<>());
         assertNotNull(ConfigManager.getStats().get("unit-test123.baz"));
@@ -65,7 +63,7 @@ public class ConfigManagerTest {
     @Test
     public void testDomainListener() {
         final ConfigChangeListener listener = mock(ConfigChangeListener.class);
-        final ConfigManager cm = new ConfigManager(clientInfo, identityManager, eventBus, "", "", "", "");
+        final ConfigManager cm = new ConfigManager(clientInfo, identityManager, "", "", "", "");
         cm.addChangeListener("unit-test", listener);
 
         cm.configChanged("foo", "bar");
@@ -78,7 +76,7 @@ public class ConfigManagerTest {
     @Test
     public void testDomainKeyListener() {
         final ConfigChangeListener listener = mock(ConfigChangeListener.class);
-        final ConfigManager cm = new ConfigManager(clientInfo, identityManager, eventBus, "", "", "", "");
+        final ConfigManager cm = new ConfigManager(clientInfo, identityManager, "", "", "", "");
         cm.addChangeListener("unit-test", "foo", listener);
 
         cm.configChanged("foo", "bar");

test/com/dmdirc/config/IdentityManagerTest.java

@@ -22,7 +22,6 @@
 
 package com.dmdirc.config;
 
-import com.dmdirc.DMDircMBassador;
 import com.dmdirc.interfaces.config.ConfigProvider;
 import com.dmdirc.tests.JimFsRule;
 import com.dmdirc.util.ClientInfo;
@@ -47,7 +46,6 @@ public class IdentityManagerTest {
 
     @Rule public final JimFsRule jimFsRule = new JimFsRule();
 
-    @Mock private DMDircMBassador eventBus;
     @Mock private ClientInfo clientInfo;
 
     private Path baseDirectory;
@@ -62,7 +60,7 @@ public class IdentityManagerTest {
     @Test
     public void testLoadsVersionIdentity() throws InvalidIdentityFileException {
         final IdentityManager identityManager = new IdentityManager(
-                baseDirectory, identitiesDirectory, eventBus, clientInfo);
+                baseDirectory, identitiesDirectory, clientInfo);
         identityManager.initialise();
 
         final ConfigProvider versionSettings = identityManager.getVersionSettings();
@@ -74,7 +72,7 @@ public class IdentityManagerTest {
     @Test
     public void testUsesSystemUsernameForProfileNickname() throws InvalidIdentityFileException {
         final IdentityManager identityManager = new IdentityManager(
-                baseDirectory, identitiesDirectory, eventBus, clientInfo);
+                baseDirectory, identitiesDirectory, clientInfo);
         identityManager.initialise();
 
         System.setProperty("user.name", "Awesome User");
@@ -90,7 +88,7 @@ public class IdentityManagerTest {
                 identitiesDirectory.resolve("profile"));
 
         final IdentityManager identityManager = new IdentityManager(
-                baseDirectory, identitiesDirectory, eventBus, clientInfo);
+                baseDirectory, identitiesDirectory, clientInfo);
         identityManager.initialise();
 
         final Collection<ConfigProvider> profiles = identityManager.getProvidersByType("profile");