Merge pull request #659 from csmith/master

Remove some unused code.

src/com/dmdirc/Channel.java

@@ -22,7 +22,6 @@
 
 package com.dmdirc;
 
-import com.dmdirc.config.ConfigBinding;
 import com.dmdirc.events.ChannelClosedEvent;
 import com.dmdirc.events.ChannelSelfActionEvent;
 import com.dmdirc.events.ChannelSelfJoinEvent;
@@ -81,12 +80,6 @@ public class Channel extends FrameContainer implements GroupChat {
     private final GroupChatUserManager groupChatUserManager;
     /** Whether we're in this channel or not. */
     private boolean isOnChannel;
-    /** Whether we should show mode prefixes in text. */
-    @ConfigBinding(domain = "channel", key = "showmodeprefix")
-    private volatile boolean showModePrefix;
-    /** Whether we should show colours in nicks. */
-    @ConfigBinding(domain = "ui", key = "shownickcoloursintext")
-    private volatile boolean showColours;
 
     /**
      * Creates a new instance of Channel.
@@ -117,8 +110,6 @@ public class Channel extends FrameContainer implements GroupChat {
         this.connection = connection;
         this.groupChatUserManager = groupChatUserManager;
 
-        getConfigManager().getBinder().bind(this, Channel.class);
-
         topics = EvictingQueue.create(
                 getConfigManager().getOptionInt("channel", "topichistorysize"));
 
@@ -269,7 +260,6 @@ public class Channel extends FrameContainer implements GroupChat {
 
         // Remove any callbacks or listeners
         eventHandler.unregisterCallbacks();
-        getConfigManager().getBinder().unbind(this);
 
         connection.getParser().map(Parser::getCallbackManager)
                 .ifPresent(cm -> cm.unsubscribe(eventHandler));
@@ -349,22 +339,6 @@ public class Channel extends FrameContainer implements GroupChat {
         getEventBus().publishAsync(new NickListUpdatedEvent(this));
     }
 
-    /**
-     * Returns a string containing the most important mode for the specified client.
-     *
-     * @param user The channel client to check.
-     *
-     * @return A string containing the most important mode, or an empty string if there are no
-     *         (known) modes.
-     */
-    private String getModes(final GroupChatUser user) {
-        if (user == null || !showModePrefix) {
-            return "";
-        } else {
-            return user.getImportantMode();
-        }
-    }
-
     // ---------------------------------------------------- TOPIC HANDLING -----
     /**
      * Adds the specified topic to this channel's topic list.

src/com/dmdirc/logger/ProgramErrorManager.java

@@ -33,11 +33,7 @@ import com.dmdirc.util.LogUtils;
 
 import ch.qos.logback.classic.spi.ILoggingEvent;
 
-import com.google.common.base.Throwables;
-
 import java.time.LocalDateTime;
-import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.HashSet;
@@ -129,22 +125,6 @@ public class ProgramErrorManager {
         return error;
     }
 
-    /**
-     * Returns this errors trace.
-     *
-     * @return Error trace
-     */
-    private Iterable<String> getTrace(final String message, final Throwable throwable) {
-        final Collection<String> lines = new ArrayList<>();
-        if (message != null) {
-            lines.add(message);
-        }
-        if (throwable != null) {
-            lines.addAll(Arrays.asList(Throwables.getStackTraceAsString(throwable).split("\n")));
-        }
-        return lines;
-    }
-
     /**
      * Called when an error needs to be deleted from the list.
      *