Tidy up a load of com.dmdirc classes.

src/com/dmdirc/Channel.java

@@ -58,6 +58,7 @@ import java.util.Collection;
 import java.util.Collections;
 import java.util.List;
 import java.util.Map;
+import java.util.stream.Collectors;
 
 import javax.annotation.Nonnull;
 
@@ -136,8 +137,7 @@ public class Channel extends MessageTarget implements GroupChat {
 
         getConfigManager().getBinder().bind(this, Channel.class);
 
-        topics = new RollingList<>(getConfigManager().getOptionInt("channel",
-                "topichistorysize"));
+        topics = new RollingList<>(getConfigManager().getOptionInt("channel", "topichistorysize"));
 
         eventHandler = new ChannelEventHandler(this, getEventBus());
 
@@ -359,10 +359,8 @@ public class Channel extends MessageTarget implements GroupChat {
 
         getTabCompleter().clear(TabCompletionType.CHANNEL_NICK);
 
-        for (ChannelClientInfo client : clients) {
-            getTabCompleter().addEntry(TabCompletionType.CHANNEL_NICK,
-                    client.getClient().getNickname());
-        }
+        getTabCompleter().addEntries(TabCompletionType.CHANNEL_NICK,
+            clients.stream().map(c -> c.getClient().getNickname()).collect(Collectors.toList()));
     }
 
     /**
@@ -498,14 +496,9 @@ public class Channel extends MessageTarget implements GroupChat {
         }
         updateTitle();
 
-        new Thread(new Runnable() {
-
-            @Override
-            public void run() {
-                listenerList.getCallable(TopicChangeListener.class)
-                        .topicChanged(Channel.this, topic);
-            }
-        }, "Topic change listener runner").start();
+        new Thread(
+                () -> listenerList.getCallable(TopicChangeListener.class).topicChanged(this, topic),
+                "Topic change listener runner").start();
     }
 
     @Override

src/com/dmdirc/ChannelMap.java

@@ -112,18 +112,14 @@ public class ChannelMap {
      * Closes all channels in the map.
      */
     public void closeAll() {
-        for (Channel channel : channels.values()) {
-            channel.close();
-        }
+        channels.values().forEach(Channel::close);
     }
 
     /**
      * Resets the state of all channels in the map.
      */
     public void resetAll() {
-        for (Channel channel : channels.values()) {
-            channel.resetWindow();
-        }
+        channels.values().forEach(Channel::resetWindow);
     }
 
     /**
@@ -134,9 +130,7 @@ public class ChannelMap {
      * @param args        The arguments for the message.
      */
     public void addLineToAll(final String messageType, final Date date, final Object... args) {
-        for (Channel channel : channels.values()) {
-            channel.addLine(messageType, date, args);
-        }
+        channels.values().forEach(c -> c.addLine(messageType, date, args));
     }
 
     /**
@@ -157,14 +151,7 @@ public class ChannelMap {
      * @return A new runnable.
      */
     public Runnable getWhoRunnable() {
-        return new Runnable() {
-            @Override
-            public void run() {
-                for (Channel channel : channels.values()) {
-                    channel.checkWho();
-                }
-            }
-        };
+        return () -> channels.values().forEach(Channel::checkWho);
     }
 
 }

src/com/dmdirc/EventHandler.java

@@ -55,7 +55,7 @@ public abstract class EventHandler implements CallbackInterface {
         final CallbackManager cbm = getConnection().getParser().getCallbackManager();
 
         try {
-            for (Class<?> iface : this.getClass().getInterfaces()) {
+            for (Class<?> iface : getClass().getInterfaces()) {
                 if (CallbackInterface.class.isAssignableFrom(iface)) {
                     addCallback(cbm, iface.asSubclass(CallbackInterface.class));
                 }

src/com/dmdirc/FrameContainer.java

@@ -89,7 +89,7 @@ public abstract class FrameContainer {
     /** The config manager for this container. */
     private final AggregateConfigProvider configManager;
     /** The IconChanger for this container. */
-    private final IconChanger changer = new IconChanger();
+    private final ConfigChangeListener changer = (d, k) -> iconUpdated();
     /** The UI components that this frame requires. */
     private final Set<String> components;
     /** The styliser used by this container. */
@@ -727,16 +727,4 @@ public abstract class FrameContainer {
         // composition should override this.
     }
 
-    /**
-     * Updates the icon of this frame if its config setting is changed.
-     */
-    private class IconChanger implements ConfigChangeListener {
-
-        @Override
-        public void configChanged(final String domain, final String key) {
-            iconUpdated();
-        }
-
-    }
-
 }

src/com/dmdirc/Invite.java

@@ -67,7 +67,7 @@ public class Invite {
      *
      * @return This invite's source
      *
-     * @see Server#parseHostmask(java.lang.String)
+     * @see Server#parseHostmask(String)
      */
     public String[] getSource() {
         return connection.parseHostmask(source);

src/com/dmdirc/LauncherUtils.java

@@ -43,7 +43,7 @@ public class LauncherUtils {
         final BaseDirectoryLocator locator = new BaseDirectoryLocator();
         cliParser.parse(args);
         final String configDirectory = cliParser.getConfigDirectory();
-        return (configDirectory == null ? locator.getDefaultBaseDirectory() : configDirectory);
+        return configDirectory == null ? locator.getDefaultBaseDirectory() : configDirectory;
     }
 
     /**

src/com/dmdirc/Main.java

@@ -43,6 +43,7 @@ import com.dmdirc.logger.Logger;
 import com.dmdirc.plugins.CorePluginExtractor;
 import com.dmdirc.plugins.PluginManager;
 import com.dmdirc.plugins.Service;
+import com.dmdirc.plugins.ServiceManager;
 import com.dmdirc.plugins.ServiceProvider;
 import com.dmdirc.ui.WarningDialog;
 
@@ -185,9 +186,7 @@ public class Main {
 
         doFirstRun();
 
-        for (SystemLifecycleComponent component : lifecycleComponents) {
-            component.startUp();
-        }
+        lifecycleComponents.forEach(SystemLifecycleComponent::startUp);
 
         actionManager.initialise(colourActionComparison);
         pluginManager.doAutoLoad();
@@ -198,18 +197,11 @@ public class Main {
 
         globalWindowManager.init();
 
-        Runtime.getRuntime().addShutdownHook(new Thread(new Runnable() {
-
-            @Override
-            public void run() {
-                for (SystemLifecycleComponent component : lifecycleComponents) {
-                    component.shutDown();
-                }
-
-                eventBus.publishAsync(new ClientClosedEvent());
-                connectionManager.disconnectAll("Unexpected shutdown");
-                identityManager.saveAll();
-            }
+        Runtime.getRuntime().addShutdownHook(new Thread(() -> {
+            lifecycleComponents.forEach(SystemLifecycleComponent::shutDown);
+            eventBus.publishAsync(new ClientClosedEvent());
+            connectionManager.disconnectAll("Unexpected shutdown");
+            identityManager.saveAll();
         }, "Shutdown thread"));
     }
 
@@ -252,7 +244,7 @@ public class Main {
      *
      * @param pm The plugin manager to use to load plugins
      */
-    protected void loadUIs(final PluginManager pm) {
+    protected void loadUIs(final ServiceManager pm) {
         final List<Service> uis = pm.getServicesByType("ui");
 
         // First try: go for our desired service type

src/com/dmdirc/MissingModeAliasException.java

@@ -24,8 +24,6 @@ package com.dmdirc;
 
 import com.dmdirc.parser.interfaces.Parser;
 
-import java.util.List;
-
 /**
  * An exception detailing the missing modes aliases and supporting information.
  */
@@ -44,17 +42,17 @@ public class MissingModeAliasException extends Exception {
      */
     public MissingModeAliasException(final String network, final Parser parser,
             final String modeAliasesVersion, final String missingModes) {
-        super(missingModes + "\n"
-                + "Network: " + network + "\n"
-                + "IRCd: " + parser.getServerSoftware() + "\n"
+        super(missingModes + '\n'
+                + "Network: " + network + '\n'
+                + "IRCd: " + parser.getServerSoftware() + '\n'
                 + " (" + parser.getServerSoftwareType() + " )\n"
                 + "Mode alias version: "
-                + modeAliasesVersion + "\n"
+                + modeAliasesVersion + '\n'
                 + "Extra info: \n"
                 + arrayListToString(parser.getServerInformationLines()) + "\n\n");
     }
 
-    private static String arrayListToString(final List<String> lines) {
+    private static String arrayListToString(final Iterable<String> lines) {
         final StringBuilder sb = new StringBuilder();
 
         for (String line : lines) {

src/com/dmdirc/Server.java

@@ -473,15 +473,12 @@ public class Server extends FrameContainer implements ConfigChangeListener,
 
             handleNotification("connectRetry", getAddress(), delay / 1000);
 
-            reconnectTimerFuture = executorService.schedule(new Runnable() {
-                @Override
-                public void run() {
-                    synchronized (myStateLock) {
-                        LOG.debug("Reconnect task executing, state: {}", myState.getState());
-                        if (myState.getState() == ServerState.RECONNECT_WAIT) {
-                            myState.transition(ServerState.TRANSIENTLY_DISCONNECTED);
-                            reconnect();
-                        }
+            reconnectTimerFuture = executorService.schedule(() -> {
+                synchronized (myStateLock) {
+                    LOG.debug("Reconnect task executing, state: {}", myState.getState());
+                    if (myState.getState() == ServerState.RECONNECT_WAIT) {
+                        myState.transition(ServerState.TRANSIENTLY_DISCONNECTED);
+                        reconnect();
                     }
                 }
             }, delay, TimeUnit.MILLISECONDS);
@@ -634,9 +631,7 @@ public class Server extends FrameContainer implements ConfigChangeListener,
      * Closes all open query windows associated with this server.
      */
     private void closeQueries() {
-        for (Query query : new ArrayList<>(queries.values())) {
-            query.close();
-        }
+        new ArrayList<>(queries.values()).forEach(Query::close);
     }
 
     /**
@@ -904,7 +899,7 @@ public class Server extends FrameContainer implements ConfigChangeListener,
             parserLock.readLock().lock();
             if (parser == null) {
                 throw new IllegalStateException("getNetwork called when "
-                        + "parser is null (state: " + getState() + ")");
+                        + "parser is null (state: " + getState() + ')');
             } else if (parser.getNetworkName().isEmpty()) {
                 return getNetworkFromServerName(parser.getServerName());
             } else {
@@ -1552,20 +1547,12 @@ public class Server extends FrameContainer implements ConfigChangeListener,
 
         awayMessage = message;
 
-        new Thread(new Runnable() {
-
-            @Override
-            public void run() {
-                synchronized (listeners) {
-                    if (message == null) {
-                        for (AwayStateListener listener : listeners.get(AwayStateListener.class)) {
-                            listener.onBack();
-                        }
-                    } else {
-                        for (AwayStateListener listener : listeners.get(AwayStateListener.class)) {
-                            listener.onAway(message);
-                        }
-                    }
+        new Thread(() -> {
+            synchronized (listeners) {
+                if (message == null) {
+                    listeners.get(AwayStateListener.class).forEach(AwayStateListener::onBack);
+                } else {
+                    listeners.get(AwayStateListener.class).forEach(a -> a.onAway(message));
                 }
             }
         }, "Away state listener runner").start();

src/com/dmdirc/ServerManager.java

@@ -42,6 +42,7 @@ import java.net.URISyntaxException;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
+import java.util.Optional;
 import java.util.Set;
 import java.util.concurrent.CopyOnWriteArraySet;
 import java.util.concurrent.Executors;
@@ -145,7 +146,7 @@ public class ServerManager implements ConnectionManager {
 
     @Override
     public List<Connection> getConnections() {
-        return new ArrayList<Connection>(servers);
+        return new ArrayList<>(servers);
     }
 
     @Override
@@ -184,21 +185,16 @@ public class ServerManager implements ConnectionManager {
     @Override
     public Connection connectToAddress(final URI uri, final ConfigProvider profile) {
         checkArgument(profile.isProfile());
-        Connection server = null;
+        final Optional<Server> existingServer = servers.stream()
+                .filter(s -> s.compareURI(uri)).findAny();
 
-        for (Server loopServer : servers) {
-            if (loopServer.compareURI(uri)) {
-                server = loopServer;
-                break;
-            }
-        }
-
-        if (server == null) {
-            server = createServer(uri, profile);
+        if (!existingServer.isPresent()) {
+            final Server server = createServer(uri, profile);
             server.connect();
             return server;
         }
 
+        final Server server = existingServer.get();
         if (server.getState().isDisconnected()) {
             server.connect(uri, profile);
         } else {

src/com/dmdirc/interfaces/config/ConfigChangeListener.java

@@ -25,6 +25,7 @@ package com.dmdirc.interfaces.config;
 /**
  * Defines the method required for config change listeners.
  */
+@FunctionalInterface
 public interface ConfigChangeListener {
 
     /**