Merge pull request #194 from csmith/master

Use forEach where possible.

calc/src/com/dmdirc/addons/calc/Parser.java

@@ -28,6 +28,7 @@ import java.util.Arrays;
 import java.util.Collections;
 import java.util.Comparator;
 import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * The parser takes the output from a {@link Lexer} and applies precedence rules to build the tokens
@@ -62,11 +63,8 @@ public class Parser {
      *                        involving a mis-matched bracket).
      */
     public TreeToken parse() throws ParseException {
-        final List<TreeToken> tokens = new ArrayList<>();
-
-        for (Token token : lexer.tokenise()) {
-            tokens.add(new TreeToken(token));
-        }
+        final List<TreeToken> tokens = lexer.tokenise().stream()
+                .map(TreeToken::new).collect(Collectors.toList());
 
         return parse(tokens);
     }

contactlist/src/com/dmdirc/addons/contactlist/ContactListListener.java

@@ -73,9 +73,7 @@ public class ContactListListener implements NicklistListener {
 
     @Override
     public void clientListUpdated(final Collection<ChannelClientInfo> clients) {
-        for (ChannelClientInfo client : clients) {
-            clientAdded(client);
-        }
+        clients.forEach(this::clientAdded);
     }
 
     @Override

debug/src/com/dmdirc/addons/debug/Debug.java

@@ -39,6 +39,7 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
+import java.util.stream.Collectors;
 
 import javax.annotation.Nonnull;
 import javax.inject.Inject;
@@ -94,7 +95,7 @@ public class Debug extends Command implements IntelligentCommand {
                 final CommandArguments newArgs = new CommandArguments(
                         controller,
                         Arrays.asList((controller.getCommandChar()
-                                + command.getName() + " "
+                                + command.getName() + ' '
                                 + args.getArgumentsAsString(1)).split(" ")));
                 command.execute(origin, newArgs, context);
             }
@@ -124,7 +125,7 @@ public class Debug extends Command implements IntelligentCommand {
      */
     public void proxyShowUsage(final FrameContainer target,
             final boolean isSilent, final String name, final String args) {
-        showUsage(target, isSilent, INFO.getName(), name + " " + args);
+        showUsage(target, isSilent, INFO.getName(), name + ' ' + args);
     }
 
     /**
@@ -148,9 +149,9 @@ public class Debug extends Command implements IntelligentCommand {
     public List<String> getCommandNames() {
         final List<String> names = new ArrayList<>(commands.size());
 
-        for (DebugCommand command : commands.values()) {
-            names.add(command.getName());
-        }
+        names.addAll(commands.values().stream()
+                .map(DebugCommand::getName)
+                .collect(Collectors.toList()));
 
         return names;
     }

debug/src/com/dmdirc/addons/debug/commands/FakeUpdates.java

@@ -45,6 +45,7 @@ import java.util.Collection;
 import java.util.HashMap;
 import java.util.Map;
 
+import javax.annotation.Nonnull;
 import javax.inject.Inject;
 import javax.inject.Provider;
 
@@ -82,7 +83,7 @@ public class FakeUpdates extends DebugCommand {
     }
 
     @Override
-    public void execute(final FrameContainer origin,
+    public void execute(@Nonnull final FrameContainer origin,
             final CommandArguments args, final CommandContext context) {
         updateManager.addCheckStrategy(new FakeUpdateCheckStrategy());
         updateManager.addRetrievalStrategy(new FakeUpdateRetriever());
@@ -100,11 +101,8 @@ public class FakeUpdates extends DebugCommand {
                 final Collection<UpdateComponent> components) {
             final Map<UpdateComponent, UpdateCheckResult> res = new HashMap<>();
 
-            for (UpdateComponent component : components) {
-                if (Math.random() * components.size() < 10) {
-                    res.put(component, new FakeUpdateCheckResult(component));
-                }
-            }
+            components.stream().filter(component -> Math.random() * components.size() < 10)
+                    .forEach(component -> res.put(component, new FakeUpdateCheckResult(component)));
 
             return res;
         }

identd/src/com/dmdirc/addons/identd/IdentdServer.java

@@ -46,7 +46,7 @@ public final class IdentdServer implements Runnable {
     /** The event bus to post errors on. */
     private final DMDircMBassador eventBus;
     /** The Thread in use for this server */
-    private volatile Thread myThread = null;
+    private volatile Thread myThread;
     /** The current socket in use for this server */
     private ServerSocket serverSocket;
     /** Arraylist of all the clients we have */
@@ -173,9 +173,7 @@ public final class IdentdServer implements Runnable {
             }
 
             synchronized (clientList) {
-                for (IdentClient aClientList : clientList) {
-                    aClientList.close();
-                }
+                clientList.forEach(IdentClient::close);
                 clientList.clear();
             }
         }

nickcolours/src/com/dmdirc/addons/nickcolours/NickColourManager.java

@@ -29,6 +29,7 @@ import com.dmdirc.events.ChannelGotnamesEvent;
 import com.dmdirc.events.ChannelJoinEvent;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
 import com.dmdirc.interfaces.config.ConfigChangeListener;
+import com.dmdirc.interfaces.config.ReadOnlyConfigProvider;
 import com.dmdirc.parser.interfaces.ChannelClientInfo;
 import com.dmdirc.parser.interfaces.ChannelInfo;
 import com.dmdirc.parser.interfaces.ClientInfo;
@@ -37,6 +38,7 @@ import com.dmdirc.util.colours.Colour;
 import com.dmdirc.ui.messages.ColourManager;
 
 import java.util.ArrayList;
+import java.util.Collection;
 import java.util.List;
 import java.util.Map;
 
@@ -106,7 +108,7 @@ public class NickColourManager implements ConfigChangeListener {
         final ClientInfo myself = client.getClient().getParser().getLocalClient();
         final String nickOption1 = "color:"
                 + client.getClient().getParser().getStringConverter().
-                toLowerCase(network + ":" + client.getClient().getNickname());
+                toLowerCase(network + ':' + client.getClient().getNickname());
         final String nickOption2 = "color:"
                 + client.getClient().getParser().getStringConverter().
                 toLowerCase("*:" + client.getClient().getNickname());
@@ -129,11 +131,11 @@ public class NickColourManager implements ConfigChangeListener {
 
         if (parts != null) {
             Colour textColor = null;
-            Colour nickColor = null;
 
             if (parts[0] != null) {
                 textColor = colourManager.getColourFromString(parts[0], null);
             }
+            Colour nickColor = null;
             if (parts[1] != null) {
                 nickColor = colourManager.getColourFromString(parts[1], null);
             }
@@ -167,7 +169,7 @@ public class NickColourManager implements ConfigChangeListener {
      *
      * @return Colour of the specified nickname
      */
-    private Colour getColour(final String nick) {
+    private Colour getColour(final CharSequence nick) {
         int count = 0;
 
         for (int i = 0; i < nick.length(); i++) {
@@ -187,18 +189,17 @@ public class NickColourManager implements ConfigChangeListener {
      *
      * @return A multi-dimensional array of nick colour info.
      */
-    public static Object[][] getData(final AggregateConfigProvider config, final String domain) {
-        final List<Object[]> data = new ArrayList<>();
+    public static Object[][] getData(final ReadOnlyConfigProvider config, final String domain) {
+        final Collection<Object[]> data = new ArrayList<>();
 
-        for (String key : config.getOptions(domain).keySet()) {
-            if (key.startsWith("color:")) {
-                final String network = key.substring(6, key.indexOf(':', 6));
-                final String user = key.substring(1 + key.indexOf(':', 6));
-                final String[] parts = getParts(config, domain, key);
+        config.getOptions(domain).keySet().stream().filter(key -> key.startsWith("color:"))
+                .forEach(key -> {
+                    final String network = key.substring(6, key.indexOf(':', 6));
+                    final String user = key.substring(1 + key.indexOf(':', 6));
+                    final String[] parts = getParts(config, domain, key);
 
-                data.add(new Object[]{network, user, parts[0], parts[1]});
-            }
-        }
+                    data.add(new Object[]{network, user, parts[0], parts[1]});
+                });
 
         final Object[][] res = new Object[data.size()][4];
 
@@ -222,7 +223,7 @@ public class NickColourManager implements ConfigChangeListener {
      *
      * @return The colours specified by the given key
      */
-    private static String[] getParts(final AggregateConfigProvider config, final String domain,
+    private static String[] getParts(final ReadOnlyConfigProvider config, final String domain,
             final String key) {
         String[] parts = config.getOption(domain, key).split(":");
 
@@ -270,13 +271,4 @@ public class NickColourManager implements ConfigChangeListener {
         setCachedSettings();
     }
 
-    /**
-     * Returns this plugin's settings domain.
-     *
-     * @return Settings domain
-     */
-    public String getDomain() {
-        return domain;
-    }
-
 }

notifications/src/com/dmdirc/addons/notifications/NotificationCommand.java

@@ -35,6 +35,7 @@ import com.dmdirc.plugins.PluginInfo;
 import com.dmdirc.ui.input.AdditionalTabTargets;
 
 import java.util.List;
+import java.util.stream.Collectors;
 
 import javax.annotation.Nonnull;
 
@@ -70,11 +71,11 @@ public class NotificationCommand extends Command implements
     @Override
     public void execute(@Nonnull final FrameContainer origin,
             final CommandArguments args, final CommandContext context) {
-        if (args.getArguments().length > 0 && args.getArguments()[0]
-                .equalsIgnoreCase("--methods")) {
+        if (args.getArguments().length > 0 &&
+                "--methods".equalsIgnoreCase(args.getArguments()[0])) {
             doMethodList(origin, args.isSilent());
-        } else if (args.getArguments().length > 0 && args.getArguments()[0]
-                .equalsIgnoreCase("--method")) {
+        } else if (args.getArguments().length > 0 &&
+                "--method".equalsIgnoreCase(args.getArguments()[0])) {
             if (args.getArguments().length > 1) {
                 final String sourceName = args.getArguments()[1];
                 final ExportedService source = manager.getMethod(sourceName)
@@ -134,11 +135,10 @@ public class NotificationCommand extends Command implements
             res.add("--methods");
             res.add("--method");
             return res;
-        } else if (arg == 1 && context.getPreviousArgs().get(0)
-                .equalsIgnoreCase("--method")) {
-            for (PluginInfo source : manager.getMethods()) {
-                res.add(source.getMetaData().getName());
-            }
+        } else if (arg == 1 && "--method".equalsIgnoreCase(context.getPreviousArgs().get(0))) {
+            res.addAll(manager.getMethods().stream()
+                    .map(source -> source.getMetaData().getName())
+                    .collect(Collectors.toList()));
             return res;
         }
         return res;

notifications/src/com/dmdirc/addons/notifications/NotificationsManager.java

@@ -32,6 +32,7 @@ import com.dmdirc.plugins.PluginInfo;
 import com.dmdirc.plugins.PluginManager;
 
 import java.util.ArrayList;
+import java.util.Collection;
 import java.util.List;
 
 import javax.inject.Inject;
@@ -41,7 +42,7 @@ import net.engio.mbassy.listener.Handler;
 public class NotificationsManager {
 
     /** The notification methods that we know of. */
-    private final List<String> methods = new ArrayList<>();
+    private final Collection<String> methods = new ArrayList<>();
     /** The user's preferred order for method usage. */
     private List<String> order;
     /** This plugin's settings domain. */
@@ -67,11 +68,9 @@ public class NotificationsManager {
         methods.clear();
         loadSettings();
         eventBus.subscribe(this);
-        for (PluginInfo target : pluginManager.getPluginInfos()) {
-            if (target.isLoaded()) {
-                addPlugin(target);
-            }
-        }
+        pluginManager.getPluginInfos().stream()
+                .filter(PluginInfo::isLoaded)
+                .forEach(this::addPlugin);
     }
 
     public void onUnload() {

nowplaying/src/com/dmdirc/addons/nowplaying/NowPlayingCommand.java

@@ -39,6 +39,7 @@ import com.dmdirc.ui.input.TabCompleterUtils;
 
 import java.util.Arrays;
 import java.util.List;
+import java.util.stream.Collectors;
 
 import javax.annotation.Nonnull;
 import javax.inject.Inject;
@@ -89,10 +90,10 @@ public class NowPlayingCommand extends Command implements IntelligentCommand {
             final CommandArguments args, final CommandContext context) {
         final FrameContainer target = ((ChatCommandContext) context).getChat();
         if (args.getArguments().length > 0
-                && args.getArguments()[0].equalsIgnoreCase("--sources")) {
+                && "--sources".equalsIgnoreCase(args.getArguments()[0])) {
             doSourceList(origin, args.isSilent(), args.getArgumentsAsString(1));
         } else if (args.getArguments().length > 0
-                && args.getArguments()[0].equalsIgnoreCase("--source")) {
+                && "--source".equalsIgnoreCase(args.getArguments()[0])) {
             if (args.getArguments().length > 1) {
                 final String sourceName = args.getArguments()[1];
                 final MediaSource source = manager.getSource(sourceName);
@@ -189,16 +190,14 @@ public class NowPlayingCommand extends Command implements IntelligentCommand {
             res.add("--source");
             res.addAll(subsList);
             return res;
-        } else if (arg == 1 && context.getPreviousArgs().get(0).equalsIgnoreCase("--source")) {
+        } else if (arg == 1 && "--source".equalsIgnoreCase(context.getPreviousArgs().get(0))) {
             final AdditionalTabTargets res = new AdditionalTabTargets();
             res.excludeAll();
-            for (MediaSource source : manager.getSources()) {
-                if (source.getState() != MediaSourceState.CLOSED) {
-                    res.add(source.getAppName());
-                }
-            }
+            res.addAll(manager.getSources().stream()
+                    .filter(source -> source.getState() != MediaSourceState.CLOSED)
+                    .map(MediaSource::getAppName).collect(Collectors.toList()));
             return res;
-        } else if (arg > 1 && context.getPreviousArgs().get(0).equalsIgnoreCase("--source")) {
+        } else if (arg > 1 && "--source".equalsIgnoreCase(context.getPreviousArgs().get(0))) {
             final AdditionalTabTargets res = tabCompleterUtils
                     .getIntelligentResults(arg, context, 2);
             res.addAll(subsList);
@@ -206,7 +205,7 @@ public class NowPlayingCommand extends Command implements IntelligentCommand {
         } else {
             final AdditionalTabTargets res = tabCompleterUtils
                     .getIntelligentResults(arg, context,
-                            context.getPreviousArgs().get(0).equalsIgnoreCase("--sources") ? 1 : 0);
+                            "--sources".equalsIgnoreCase(context.getPreviousArgs().get(0)) ? 1 : 0);
             res.addAll(subsList);
             return res;
         }

nowplaying/src/com/dmdirc/addons/nowplaying/NowPlayingManager.java

@@ -33,6 +33,7 @@ import com.dmdirc.plugins.PluginInfo;
 import com.dmdirc.plugins.PluginManager;
 
 import java.util.ArrayList;
+import java.util.Collection;
 import java.util.Collections;
 import java.util.List;
 
@@ -53,7 +54,7 @@ public class NowPlayingManager {
     /** The sources that we know of. */
     private final List<MediaSource> sources = new ArrayList<>();
     /** The managers that we know of. */
-    private final List<MediaSourceManager> managers = new ArrayList<>();
+    private final Collection<MediaSourceManager> managers = new ArrayList<>();
     /** The user's preferred order for source usage. */
     private List<String> order;
 
@@ -75,11 +76,9 @@ public class NowPlayingManager {
         managers.clear();
         order = getSettings();
         eventBus.subscribe(this);
-        for (PluginInfo target : pluginManager.getPluginInfos()) {
-            if (target.isLoaded()) {
-                addPlugin(target);
-            }
-        }
+        pluginManager.getPluginInfos().stream()
+                .filter(PluginInfo::isLoaded)
+                .forEach(this::addPlugin);
     }
 
     /**
@@ -131,9 +130,7 @@ public class NowPlayingManager {
             managers.add((MediaSourceManager) targetPlugin);
 
             if (((MediaSourceManager) targetPlugin).getSources() != null) {
-                for (MediaSource source : ((MediaSourceManager) targetPlugin).getSources()) {
-                    addSourceToOrder(source);
-                }
+                ((MediaSourceManager) targetPlugin).getSources().forEach(this::addSourceToOrder);
             }
         }
     }
@@ -191,11 +188,11 @@ public class NowPlayingManager {
      * @return The best source to use for media info
      */
     public MediaSource getBestSource() {
-        MediaSource paused = null;
         final List<MediaSource> possibleSources = getSources();
 
         Collections.sort(possibleSources, new MediaSourceComparator(order));
 
+        MediaSource paused = null;
         for (final MediaSource source : possibleSources) {
             if (source.getState() != MediaSourceState.CLOSED) {
                 if (source.getState() == MediaSourceState.PLAYING) {

parser_xmpp/src/com/dmdirc/addons/parser_xmpp/FixedXmppConnection.java

@@ -87,12 +87,11 @@ public class FixedXmppConnection extends XMPPConnection
         new ServiceDiscoveryManager(xmppc);
 
         // Now execute our real listeners
-        for (ConnectionCreationListener listener : oldListeners) {
-            // We've already created a discovery manager, don't make another...
-            if (!ServiceDiscoveryManager.class.equals(listener.getClass().getEnclosingClass())) {
-                listener.connectionCreated(xmppc);
-            }
-        }
+        // We've already created a discovery manager, don't make another...
+        oldListeners.stream()
+                .filter(listener -> !ServiceDiscoveryManager.class
+                        .equals(listener.getClass().getEnclosingClass()))
+                .forEach(listener -> listener.connectionCreated(xmppc));
     }
 
     /**

parser_xmpp/src/com/dmdirc/addons/parser_xmpp/XmppParser.java

@@ -460,14 +460,9 @@ public class XmppParser extends BaseSocketAwareParser {
                         onChannelSelfJoin(null, null, fakeChannel);
                 fakeChannel.updateContacts(contacts.values());
 
-                for (XmppClientInfo client : contacts.values()) {
-                    if (client.isAway()) {
-                        getCallback(OtherAwayStateListener.class)
-                                .onAwayStateOther(null, null, client,
-                                        AwayState.UNKNOWN,
-                                        AwayState.AWAY);
-                    }
-                }
+                contacts.values().stream().filter(XmppClientInfo::isAway).forEach(client ->
+                        getCallback(OtherAwayStateListener.class).onAwayStateOther(null, null,
+                                client, AwayState.UNKNOWN, AwayState.AWAY));
             }
         } catch (XMPPException ex) {
             LOG.debug("Go an XMPP exception", ex);

scriptplugin/src/com/dmdirc/addons/scriptplugin/ScriptCommand.java

@@ -43,6 +43,7 @@ import java.io.FileNotFoundException;
 import java.io.FileWriter;
 import java.io.IOException;
 import java.util.Map;
+import java.util.stream.Collectors;
 
 import javax.annotation.Nonnull;
 import javax.inject.Inject;
@@ -103,28 +104,28 @@ public class ScriptCommand extends Command implements IntelligentCommand {
             final CommandContext context) {
         final String[] sargs = args.getArguments();
 
-        if (sargs.length > 0 && (sargs[0].equalsIgnoreCase("rehash") || sargs[0].equalsIgnoreCase(
-                "reload"))) {
+        if (sargs.length > 0 && ("rehash".equalsIgnoreCase(sargs[0]) ||
+                "reload".equalsIgnoreCase(sargs[0]))) {
             sendLine(origin, args.isSilent(), FORMAT_OUTPUT, "Reloading scripts");
             scriptManager.rehash();
-        } else if (sargs.length > 0 && sargs[0].equalsIgnoreCase("load")) {
+        } else if (sargs.length > 0 && "load".equalsIgnoreCase(sargs[0])) {
             if (sargs.length > 1) {
                 final String filename = args.getArgumentsAsString(1);
                 sendLine(origin, args.isSilent(), FORMAT_OUTPUT, "Loading: " + filename + " ["
-                        + scriptManager.loadScript(scriptDirectory + filename) + "]");
+                        + scriptManager.loadScript(scriptDirectory + filename) + ']');
             } else {
                 sendLine(origin, args.isSilent(), FORMAT_ERROR, "You must specify a script to load");
             }
-        } else if (sargs.length > 0 && sargs[0].equalsIgnoreCase("unload")) {
+        } else if (sargs.length > 0 && "unload".equalsIgnoreCase(sargs[0])) {
             if (sargs.length > 1) {
                 final String filename = args.getArgumentsAsString(1);
                 sendLine(origin, args.isSilent(), FORMAT_OUTPUT, "Unloading: " + filename + " ["
-                        + scriptManager.loadScript(scriptDirectory + filename) + "]");
+                        + scriptManager.loadScript(scriptDirectory + filename) + ']');
             } else {
                 sendLine(origin, args.isSilent(), FORMAT_ERROR,
                         "You must specify a script to unload");
             }
-        } else if (sargs.length > 0 && sargs[0].equalsIgnoreCase("eval")) {
+        } else if (sargs.length > 0 && "eval".equalsIgnoreCase(sargs[0])) {
             if (sargs.length > 1) {
                 final String script = args.getArgumentsAsString(1);
                 sendLine(origin, args.isSilent(), FORMAT_OUTPUT, "Evaluating: " + script);
@@ -163,7 +164,7 @@ public class ScriptCommand extends Command implements IntelligentCommand {
                 sendLine(origin, args.isSilent(), FORMAT_ERROR,
                         "You must specify some script to eval.");
             }
-        } else if (sargs.length > 0 && sargs[0].equalsIgnoreCase("savetobasefile")) {
+        } else if (sargs.length > 0 && "savetobasefile".equalsIgnoreCase(sargs[0])) {
             if (sargs.length > 2) {
                 final String[] bits = sargs[1].split("/");
                 final String functionName = bits[0];
@@ -203,7 +204,7 @@ public class ScriptCommand extends Command implements IntelligentCommand {
                 sendLine(origin, args.isSilent(), FORMAT_ERROR,
                         "You must specify a function name and some script to save.");
             }
-        } else if (sargs.length > 0 && sargs[0].equalsIgnoreCase("help")) {
+        } else if (sargs.length > 0 && "help".equalsIgnoreCase(sargs[0])) {
             sendLine(origin, args.isSilent(), FORMAT_OUTPUT,
                     "This command allows you to interact with the script plugin");
             sendLine(origin, args.isSilent(), FORMAT_OUTPUT, "-------------------");
@@ -244,14 +245,11 @@ public class ScriptCommand extends Command implements IntelligentCommand {
             res.add("savetobasefile");
         } else if (arg == 1) {
             final Map<String, ScriptEngineWrapper> scripts = scriptManager.getScripts();
-            if (context.getPreviousArgs().get(0).equalsIgnoreCase("load")) {
-                for (String filename : scriptManager.getPossibleScripts()) {
-                    res.add(filename);
-                }
-            } else if (context.getPreviousArgs().get(0).equalsIgnoreCase("unload")) {
-                for (String filename : scripts.keySet()) {
-                    res.add(filename);
-                }
+            if ("load".equalsIgnoreCase(context.getPreviousArgs().get(0))) {
+                res.addAll(scriptManager.getPossibleScripts().stream()
+                        .collect(Collectors.toList()));
+            } else if ("unload".equalsIgnoreCase(context.getPreviousArgs().get(0))) {
+                res.addAll(scripts.keySet().stream().collect(Collectors.toList()));
             }
         }
 

scriptplugin/src/com/dmdirc/addons/scriptplugin/ScriptManager.java

@@ -70,9 +70,7 @@ public class ScriptManager {
 
     /** Reload all scripts */
     public void rehash() {
-        for (final ScriptEngineWrapper engine : scripts.values()) {
-            engine.reload();
-        }
+        scripts.values().forEach(ScriptEngineWrapper::reload);
         // Advise the Garbage collector that now would be a good time to run
         System.gc();
     }
@@ -120,7 +118,7 @@ public class ScriptManager {
     public void unloadScript(final String scriptFilename) {
         if (scripts.containsKey(scriptFilename)) {
             // Tell it that its about to be unloaded.
-            (scripts.get(scriptFilename)).callFunction("onUnload");
+            scripts.get(scriptFilename).callFunction("onUnload");
             // Remove the script
             scripts.remove(scriptFilename);
             // Advise the Garbage collector that now would be a good time to run

scriptplugin/src/com/dmdirc/addons/scriptplugin/TypedProperties.java

@@ -62,15 +62,13 @@ public class TypedProperties extends Properties {
     public void setCaseSensitivity(final boolean value) {
         // Set all existing values to lowercase.
         if (!value) {
-            for (final Object property : keySet()) {
-                if (property instanceof String) {
-                    final String propertyName = (String) property;
-                    if (!propertyName.equals(propertyName.toLowerCase())) {
-                        super.setProperty(propertyName.toLowerCase(), getProperty(propertyName));
-                        super.remove(propertyName);
-                    }
+            keySet().stream().filter(property -> property instanceof String).forEach(property -> {
+                final String propertyName = (String) property;
+                if (!propertyName.equals(propertyName.toLowerCase())) {
+                    super.setProperty(propertyName.toLowerCase(), getProperty(propertyName));
+                    remove(propertyName);
                 }
-            }
+            });
         }
         caseSensitive = value;
     }

ui_swing/src/com/dmdirc/addons/ui_swing/dialogs/actionsmanager/ActionGroupSettingsPanel.java

@@ -163,9 +163,7 @@ public final class ActionGroupSettingsPanel extends JPanel implements ActionList
      * Saves the changes to the settings.
      */
     public void save() {
-        for (PreferencesSetting setting : settings) {
-            setting.save();
-        }
+        settings.forEach(PreferencesSetting::save);
     }
 
     @Override

ui_swing/src/com/dmdirc/addons/ui_swing/dialogs/channelsetting/ChannelListModesPane.java

@@ -126,7 +126,7 @@ public final class ChannelListModesPane extends JPanel implements ActionListener
         this.iconManager = checkNotNull(iconManager);
         this.channel = checkNotNull(channel);
         this.parentWindow = checkNotNull(parentWindow);
-        this.setOpaque(UIUtilities.getTabbedPaneOpaque());
+        setOpaque(UIUtilities.getTabbedPaneOpaque());
 
         list = new JList<>();
         nativeRenderer = list.getCellRenderer();
@@ -304,9 +304,8 @@ public final class ChannelListModesPane extends JPanel implements ActionListener
     private void removeListMode() {
         final int selectedIndex = listModesMenu.getSelectedIndex();
         final JList<ChannelListModeItem> removeList = listModesPanels.get(selectedIndex);
-        for (ChannelListModeItem mode : removeList.getSelectedValuesList()) {
-            ((DefaultListModel<ChannelListModeItem>) removeList.getModel()).removeElement(mode);
-        }
+        removeList.getSelectedValuesList().forEach(
+                ((DefaultListModel<ChannelListModeItem>) removeList.getModel())::removeElement);
         updateModeCount();
     }
 

ui_swing/src/com/dmdirc/addons/ui_swing/wizard/WizardPanel.java

@@ -309,18 +309,16 @@ public class WizardPanel extends JPanel implements ActionListener {
      * Fires wizard finished events.
      */
     private void fireWizardFinished() {
-        for (WizardListener listener : stepListeners.get(WizardListener.class)) {
-            listener.wizardFinished();
-        }
+        stepListeners.get(WizardListener.class)
+                .forEach(WizardListener::wizardFinished);
     }
 
     /**
      * Fires wizard cancelled events.
      */
     protected void fireWizardCancelled() {
-        for (WizardListener listener : stepListeners.get(WizardListener.class)) {
-            listener.wizardCancelled();
-        }
+        stepListeners.get(WizardListener.class)
+                .forEach(WizardListener::wizardCancelled);
     }
 
 }