Merge pull request #194 from csmith/master

Minor tidying.

src/com/dmdirc/actions/Action.java

@@ -357,22 +357,22 @@ public class Action extends ActionModel implements ConfigChangeListener {
         newConfig.addDomain(DOMAIN_RESPONSE, responseLines);
 
         if (conditionTree != null) {
-            newConfig.addDomain(DOMAIN_CONDITIONTREE, new ArrayList<String>());
+            newConfig.addDomain(DOMAIN_CONDITIONTREE, new ArrayList<>());
             newConfig.getFlatDomain(DOMAIN_CONDITIONTREE).add(conditionTree.toString());
         }
 
         if (newFormat != null) {
-            newConfig.addDomain(DOMAIN_FORMAT, new ArrayList<String>());
+            newConfig.addDomain(DOMAIN_FORMAT, new ArrayList<>());
             newConfig.getFlatDomain(DOMAIN_FORMAT).add(newFormat);
         }
 
         if (concurrencyGroup != null) {
-            newConfig.addDomain(DOMAIN_CONCURRENCY, new HashMap<String, String>());
+            newConfig.addDomain(DOMAIN_CONCURRENCY, new HashMap<>());
             newConfig.getKeyDomain(DOMAIN_CONCURRENCY).put("group", concurrencyGroup);
         }
 
         if (stop) {
-            newConfig.addDomain(DOMAIN_MISC, new HashMap<String, String>());
+            newConfig.addDomain(DOMAIN_MISC, new HashMap<>());
             newConfig.getKeyDomain(DOMAIN_MISC).put("stopping", "true");
         }
 

src/com/dmdirc/lists/GroupListManager.java

@@ -47,7 +47,7 @@ public class GroupListManager implements GroupListStartListener,
     private final Connection connection;
     /** The cached groups. */
     private final ObservableList<GroupListEntry> groups = new ObservableListDecorator<>(
-            new LinkedList<GroupListEntry>());
+            new LinkedList<>());
 
     public GroupListManager(final Connection connection) {
         this.connection = connection;

src/com/dmdirc/plugins/PluginManager.java

@@ -587,7 +587,9 @@ public class PluginManager implements ServiceManager {
 
     @Handler
     public void handlePrefsClosed(final ClientPrefsClosedEvent event) {
-        getPluginInfos().stream().filter(PluginInfo::isTempLoaded).forEach(pi -> pi.unloadPlugin());
+        getPluginInfos().stream()
+                .filter(PluginInfo::isTempLoaded)
+                .forEach(PluginInfo::unloadPlugin);
     }
 
 }

src/com/dmdirc/ui/WarningDialog.java

@@ -27,8 +27,6 @@ import java.awt.Font;
 import java.awt.Insets;
 import java.awt.Toolkit;
 import java.awt.Window;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
 import java.awt.event.WindowAdapter;
 import java.awt.event.WindowEvent;
 import java.util.concurrent.Semaphore;
@@ -97,12 +95,7 @@ public class WarningDialog extends JDialog {
         final JPanel panel = new JPanel(new BorderLayout(5, 5));
 
         final JButton button = new JButton("OK");
-        button.addActionListener(new ActionListener() {
-            @Override
-            public void actionPerformed(final ActionEvent e) {
-                dispose();
-            }
-        });
+        button.addActionListener(e -> dispose());
 
         final JTextPane textArea = new JTextPane(new HTMLDocument());
         textArea.setEditorKit(new HTMLEditorKit());
@@ -135,13 +128,10 @@ public class WarningDialog extends JDialog {
      * Static method to instantiate and display the dialog.
      */
     public void display() {
-        SwingUtilities.invokeLater(new Runnable() {
-            @Override
-            public void run() {
-                setSize(400, 400);
-                CoreUIUtils.centreWindow(WarningDialog.this);
-                setVisible(true);
-            }
+        SwingUtilities.invokeLater(() -> {
+            setSize(400, 400);
+            CoreUIUtils.centreWindow(this);
+            setVisible(true);
         });
     }
 
@@ -150,16 +140,13 @@ public class WarningDialog extends JDialog {
      */
     public void displayBlocking() {
         final Semaphore semaphore = new Semaphore(0);
-        SwingUtilities.invokeLater(new Runnable() {
-            @Override
-            public void run() {
-                addWindowListener(new WindowAdapter() {
-                    @Override
-                    public void windowClosed(final WindowEvent e) {
-                        semaphore.release();
-                    }
-                });
-            }
+        SwingUtilities.invokeLater(() -> {
+            addWindowListener(new WindowAdapter() {
+                @Override
+                public void windowClosed(final WindowEvent e) {
+                    semaphore.release();
+                }
+            });
         });
         display();
         semaphore.acquireUninterruptibly();

src/com/dmdirc/ui/messages/ColourManager.java

@@ -64,9 +64,7 @@ public class ColourManager {
         this.configManager = configManager;
         this.eventBus = eventBus;
 
-        configManager.addChangeListener("colour", (domain, key) -> {
-            initColours();
-        });
+        configManager.addChangeListener("colour", (domain, key) -> initColours());
 
         initColours();
     }
@@ -75,7 +73,7 @@ public class ColourManager {
      * Initialises the IRC_COLOURS array.
      */
     private void initColours() {
-        final Validator validator = new ColourValidator();
+        final Validator<String> validator = new ColourValidator();
         for (int i = 0; i < 16; i++) {
             if (configManager.hasOptionString("colour", String.valueOf(i), validator)) {
                 ircColours[i] = getColourFromHex(

src/com/dmdirc/updater/manager/DMDircUpdateManager.java

@@ -67,7 +67,7 @@ public class DMDircUpdateManager extends CachingUpdateManagerImpl {
             final Set<UpdateInstallationStrategy> installationStrategies,
             final Set<UpdateComponent> components) {
         super(new ThreadPoolExecutor(THREAD_COUNT, THREAD_COUNT, 1, TimeUnit.MINUTES,
-                new LinkedBlockingQueue<Runnable>(), new NamedThreadFactory()),
+                new LinkedBlockingQueue<>(), new NamedThreadFactory()),
                 consolidator, updatePolicy);
 
         checkStrategies.forEach(DMDircUpdateManager.this::addCheckStrategy);