Merge pull request #497 from csmith/master

Minor style fixes

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

@@ -25,7 +25,6 @@ package com.dmdirc.addons.calc;
 import java.text.ParseException;
 import java.util.ArrayList;
 import java.util.Arrays;
-import java.util.Collections;
 import java.util.Comparator;
 import java.util.List;
 import java.util.stream.Collectors;
@@ -44,8 +43,7 @@ public class Parser {
     static {
         TOKENS_BY_PRECEDENCE = new ArrayList<>(Arrays.asList(
                 TokenType.values()));
-        Collections.sort(TOKENS_BY_PRECEDENCE,
-                new TokenTypePrecedenceComparator());
+        TOKENS_BY_PRECEDENCE.sort(new TokenTypePrecedenceComparator());
     }
 
     public Parser(final Lexer lexer) {

calc/src/main/java/com/dmdirc/addons/calc/TokenType.java

@@ -130,9 +130,8 @@ public enum TokenType {
 
                 @Override
                 public Number evaluate(final TreeToken token) {
-                    return new Float(Math.pow(token.getChildren().get(0).evaluate()
-                                    .doubleValue(),
-                                    token.getChildren().get(1).evaluate().doubleValue()));
+                    return (float) Math.pow(token.getChildren().get(0).evaluate().doubleValue(),
+                            token.getChildren().get(1).evaluate().doubleValue());
                 }
             };
     /** The string representation of tokens that may follow this one. */

dcc/src/main/java/com/dmdirc/addons/dcc/TransferContainer.java

@@ -307,11 +307,9 @@ public class TransferContainer extends FrameContainer implements
             //that this send is for.
             if (connection.getParser().get().getStringConverter().equalsIgnoreCase(
                     otherNickname, myNickname)) {
-                final Thread errorThread = new Thread(() -> {
-                    JOptionPane.showMessageDialog(null,
-                            "You can't DCC yourself.", "DCC Error",
-                            JOptionPane.ERROR_MESSAGE);
-                }, "DCC-Error-Message");
+                final Thread errorThread = new Thread(() -> JOptionPane.showMessageDialog(null,
+                        "You can't DCC yourself.", "DCC Error",
+                        JOptionPane.ERROR_MESSAGE), "DCC-Error-Message");
                 errorThread.start();
             } else {
                 if (config.getOptionBool(plugin.getDomain(), "send.reverse")) {

freedesktop_notifications/src/main/java/com/dmdirc/addons/freedesktop_notifications/FDNotifyCommand.java

@@ -60,13 +60,7 @@ public final class FDNotifyCommand extends Command {
     @Override
     public void execute(@Nonnull final WindowModel origin, final CommandArguments args,
             final CommandContext context) {
-        new Thread() {
-
-            @Override
-            public void run() {
-                manager.showNotification("", args.getArgumentsAsString());
-            }
-        }.start();
+        new Thread(() -> manager.showNotification("", args.getArgumentsAsString())).start();
     }
 
 }

nickcolours/src/main/java/com/dmdirc/addons/nickcolours/NickColourYamlStore.java

@@ -54,9 +54,7 @@ public class NickColourYamlStore extends BaseYamlStore<NickColourEntry> {
     public Map<String, Color> readNickColourEntries(final Path path) {
         final Map<String, Color> nickColours = new HashMap<>();
         final Collection<NickColourEntry> nickColourEntries = read(path);
-        nickColourEntries.stream().forEach(
-                e -> nickColours.put(e.getNetwork() + ':' + e.getUser(), e.getColor())
-        );
+        nickColourEntries.forEach(e -> nickColours.put(e.getNetwork() + ':' + e.getUser(), e.getColor()));
         return nickColours;
     }
 

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

@@ -38,7 +38,6 @@ 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;
 import javax.inject.Inject;
 import net.engio.mbassy.listener.Handler;
@@ -195,7 +194,7 @@ public class NowPlayingManager {
     public MediaSource getBestSource() {
         final List<MediaSource> possibleSources = getSources();
 
-        Collections.sort(possibleSources, new MediaSourceComparator(order));
+        possibleSources.sort(new MediaSourceComparator(order));
 
         MediaSource paused = null;
         for (final MediaSource source : possibleSources) {

tabcompletion_mirc/src/main/java/com/dmdirc/addons/tabcompletion_mirc/MircStyle.java

@@ -29,11 +29,8 @@ import com.dmdirc.ui.input.TabCompleter;
 import com.dmdirc.ui.input.TabCompletionMatches;
 import com.dmdirc.ui.input.tabstyles.TabCompletionResult;
 import com.dmdirc.ui.input.tabstyles.TabCompletionStyle;
-
 import com.google.common.collect.Lists;
-
 import java.awt.Toolkit;
-import java.util.Collections;
 import java.util.List;
 
 public class MircStyle implements TabCompletionStyle {
@@ -68,7 +65,7 @@ public class MircStyle implements TabCompletionStyle {
         if (word.equals(lastWord)) {
             final TabCompletionMatches res = tabCompleter.complete(tabString, additional);
             final List<String> results = Lists.newArrayList(res.getResults());
-            Collections.sort(results, String.CASE_INSENSITIVE_ORDER);
+            results.sort(String.CASE_INSENSITIVE_ORDER);
             // We're continuing to tab through
             target = results.get((results.indexOf(lastWord) + (shiftPressed ? -1: 1) + results.size()) % results.size());
         } else {
@@ -80,7 +77,7 @@ public class MircStyle implements TabCompletionStyle {
                 Toolkit.getDefaultToolkit().beep();
                 return null;
             } else {
-                Collections.sort(results, String.CASE_INSENSITIVE_ORDER);
+                results.sort(String.CASE_INSENSITIVE_ORDER);
 
                 if (!word.isEmpty()
                         && window instanceof GroupChat

ui_swing/src/main/java/com/dmdirc/addons/ui_swing/EdtHandlerInvocation.java

@@ -22,8 +22,6 @@
 
 package com.dmdirc.addons.ui_swing;
 
-import java.lang.reflect.Method;
-
 import net.engio.mbassy.bus.MessagePublication;
 import net.engio.mbassy.dispatch.ReflectiveHandlerInvocation;
 import net.engio.mbassy.subscription.SubscriptionContext;

ui_swing/src/main/java/com/dmdirc/addons/ui_swing/components/NicklistListModel.java

@@ -104,7 +104,7 @@ public final class NicklistListModel extends AbstractListModel<GroupChatUser> im
      */
     public void sort() {
         synchronized (nicknames) {
-            Collections.sort(nicknames, new NicklistComparator(sortByMode, sortByCase));
+            nicknames.sort(new NicklistComparator(sortByMode, sortByCase));
         }
         rerender();
     }

ui_swing/src/main/java/com/dmdirc/addons/ui_swing/components/TopicBar.java

@@ -221,9 +221,7 @@ public class TopicBar extends JComponent implements ActionListener, ConfigChange
         validateTopic();
 
         final Optional<Topic> topic = channel.getCurrentTopic();
-        if (topic.isPresent()) {
-            topicChanged(channel, topic.get());
-        }
+        topic.ifPresent(topic1 -> topicChanged(channel, topic1));
     }
 
     @Handler(invocation = EdtHandlerInvocation.class)
@@ -316,9 +314,7 @@ public class TopicBar extends JComponent implements ActionListener, ConfigChange
         topicText.setVisible(false);
         topicText.setText("");
         final Optional<Topic> topic = channel.getCurrentTopic();
-        if (topic.isPresent()) {
-            topicText.setText(topic.get().getTopic());
-        }
+        topic.ifPresent(topic1 -> topicText.setText(topic1.getTopic()));
         applyAttributes();
         topicText.setCaretPosition(0);
         topicText.setFocusable(true);

ui_swing/src/main/java/com/dmdirc/addons/ui_swing/components/addonpanel/PluginPanel.java

@@ -36,7 +36,6 @@ import com.dmdirc.updater.manager.CachingUpdateManager;
 import java.awt.Window;
 import java.util.ArrayList;
 import java.util.Collection;
-import java.util.Collections;
 import java.util.Comparator;
 import java.util.List;
 import javax.inject.Inject;
@@ -99,14 +98,14 @@ public class PluginPanel extends AddonPanel {
         final List<PluginInfo> list = new ArrayList<>();
         final Collection<PluginInfo> sortedList = new ArrayList<>();
         list.addAll(pluginManager.getPluginInfos());
-        Collections.sort(list, COMPARATOR);
+        list.sort(COMPARATOR);
         list.stream().filter(plugin -> plugin.getMetaData().getParent() == null).forEach(plugin -> {
             final List<PluginInfo> childList = new ArrayList<>();
             sortedList.add(plugin);
             plugin.getChildren().stream()
                     .filter(child -> !childList.contains(child))
                     .forEach(childList::add);
-            Collections.sort(childList, COMPARATOR);
+            childList.sort(COMPARATOR);
             sortedList.addAll(childList);
         });
 

ui_swing/src/main/java/com/dmdirc/addons/ui_swing/components/menubar/MenuBar.java

@@ -111,9 +111,7 @@ public class MenuBar extends JMenuBar {
         final Optional<JMenu> menu = getParentMenuItem(parentMenu);
         if (menu.isPresent()) {
             final Optional<JMenuItem> menuItem = getChildItem(menu.get(), childItem);
-            if (menuItem.isPresent()) {
-                menu.get().remove(menuItem.get());
-            }
+            menuItem.ifPresent(jMenuItem -> menu.get().remove(jMenuItem));
         }
     }
 

ui_swing/src/main/java/com/dmdirc/addons/ui_swing/dialogs/aliases/AliasManagerLinker.java

@@ -140,9 +140,7 @@ public class AliasManagerLinker implements AliasDialogModelListener {
         deleteAlias.setEnabled(false);
         deleteAlias.addActionListener(e -> {
             final Optional<Alias> alias = model.getSelectedAlias();
-            if (alias.isPresent()) {
-                model.removeAlias(alias.get().getName());
-            }
+            alias.ifPresent(alias1 -> model.removeAlias(alias1.getName()));
         });
     }
 
@@ -198,11 +196,7 @@ public class AliasManagerLinker implements AliasDialogModelListener {
         command.setEnabled(model.isCommandValid());
         command.setText(model.getSelectedAliasName());
         final int index;
-        if (alias.isPresent()) {
-            index = commandModel.indexOf(alias.get());
-        } else {
-            index = -1;
-        }
+        index = alias.map(alias1 -> commandModel.indexOf(alias1)).orElseGet(() -> -1);
         if (index != selectionModel.getLeadSelectionIndex()) {
             selectionModel.setLeadSelectionIndex(index);
         }

ui_swing/src/main/java/com/dmdirc/addons/ui_swing/framemanager/ctrltab/CtrlTabWindowManager.java

@@ -115,11 +115,7 @@ public class CtrlTabWindowManager {
         final Optional<TextFrame> parent = event.getParentWindow();
         final TextFrame window = event.getChildWindow();
         final TreeViewNode parentNode;
-        if (parent.isPresent()) {
-            parentNode = nodes.get(parent.get());
-        } else {
-            parentNode = model.getRootNode();
-        }
+        parentNode = parent.map(nodes::get).orElseGet(model::getRootNode);
 
         UIUtilities.invokeAndWait(() -> {
             final TreeViewNode node = new TreeViewNode(null, window);

ui_swing/src/main/java/com/dmdirc/addons/ui_swing/injection/DialogModule.java

@@ -85,14 +85,14 @@ public class DialogModule {
      * Qualifier that indicates a restart dialog is needed for updates to be applied.
      */
     @Qualifier
-    public static @interface ForUpdates {
+    public @interface ForUpdates {
     }
 
     /**
      * Qualifier that indicates a restart dialog is needed for settings to be applied.
      */
     @Qualifier
-    public static @interface ForSettings {
+    public @interface ForSettings {
     }
 
     @Provides