Tidying.

Change-Id: Ib589c2957a99b616774f2e6d9ca508125fd4e553
Reviewed-on: http://gerrit.dmdirc.com/3923
Reviewed-by: Greg Holmes <greg@dmdirc.com>
Automatic-Compile: DMDirc Build Manager

mediasource_dbus/src/com/dmdirc/addons/mediasource_dbus/DBusMediaSourceManager.java

@@ -32,6 +32,7 @@ import java.io.File;
 import java.io.IOException;
 import java.io.InputStreamReader;
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -99,7 +100,7 @@ public class DBusMediaSourceManager {
             }
         }
 
-        return sources;
+        return Collections.unmodifiableList(sources);
     }
 
     /**
@@ -133,7 +134,7 @@ public class DBusMediaSourceManager {
      * @return The output of the specified command
      */
     protected List<String> getInfo(final String... args) {
-        final ArrayList<String> result = new ArrayList<>();
+        final List<String> result = new ArrayList<>();
         Process process = null;
         try {
             process = Runtime.getRuntime().exec(args);
@@ -162,7 +163,7 @@ public class DBusMediaSourceManager {
      *
      * @return A map corresponding to the specified dictionary
      */
-    protected Map<String, String> parseDictionary(final List<String> lines) {
+    protected Map<String, String> parseDictionary(final Iterable<String> lines) {
         final Map<String, String> res = new HashMap<>();
 
         for (String line : lines) {

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

@@ -99,10 +99,10 @@ public class TypedProperties extends Properties {
      */
     @Override
     public String getProperty(final String key) {
-        if (!caseSensitive) {
-            return super.getProperty(key.toLowerCase());
-        } else {
+        if (caseSensitive) {
             return super.getProperty(key);
+        } else {
+            return super.getProperty(key.toLowerCase());
         }
     }
 
@@ -116,10 +116,10 @@ public class TypedProperties extends Properties {
      */
     @Override
     public String getProperty(final String key, final String fallback) {
-        if (!caseSensitive) {
-            return super.getProperty(key.toLowerCase(), fallback);
-        } else {
+        if (caseSensitive) {
             return super.getProperty(key, fallback);
+        } else {
+            return super.getProperty(key.toLowerCase(), fallback);
         }
     }
 
@@ -370,7 +370,7 @@ public class TypedProperties extends Properties {
             return fallback;
         } else {
             final String[] bits = res.split("\n");
-            final ArrayList<String> result = new ArrayList<>();
+            final List<String> result = new ArrayList<>();
             Collections.addAll(result, bits);
             return result;
         }
@@ -382,7 +382,7 @@ public class TypedProperties extends Properties {
      * @param key   key for property
      * @param value Value for property
      */
-    public void setListProperty(final String key, final List<String> value) {
+    public void setListProperty(final String key, final Iterable<String> value) {
         final StringBuilder val = new StringBuilder();
         final String lf = "\n";
         boolean first = true;

ui_swing/src/com/dmdirc/addons/ui_swing/dialogs/actioneditor/ActionResponsePanel.java

@@ -28,6 +28,7 @@ import com.dmdirc.interfaces.config.AggregateConfigProvider;
 import com.dmdirc.ui.IconManager;
 import com.dmdirc.ui.messages.ColourManagerFactory;
 
+import java.util.Collection;
 import java.util.TreeSet;
 
 import javax.swing.BorderFactory;
@@ -37,6 +38,7 @@ import javax.swing.JLabel;
 import javax.swing.JPanel;
 import javax.swing.JScrollPane;
 import javax.swing.JTextArea;
+import javax.swing.MutableComboBoxModel;
 import javax.swing.UIManager;
 
 import net.miginfocom.swing.MigLayout;
@@ -75,13 +77,12 @@ public class ActionResponsePanel extends JPanel {
         response.setRows(4);
         formatter = new JComboBox<>(new DefaultComboBoxModel<String>());
 
-        final DefaultComboBoxModel<String> model = (DefaultComboBoxModel<String>) formatter.
-                getModel();
+        final MutableComboBoxModel<String> model =
+                (MutableComboBoxModel<String>) formatter.getModel();
         model.addElement("No change");
         model.addElement("No response");
 
-        final TreeSet<String> formatters = new TreeSet<>(
-                String.CASE_INSENSITIVE_ORDER);
+        final Collection<String> formatters = new TreeSet<>(String.CASE_INSENSITIVE_ORDER);
         formatters.addAll(config.getOptions("formatter").keySet());
 
         for (final String format : formatters) {
@@ -110,7 +111,7 @@ public class ActionResponsePanel extends JPanel {
      *
      * @param response new response
      */
-    public void setResponse(final String[] response) {
+    public void setResponse(final String... response) {
         final StringBuilder sb = new StringBuilder();
         for (String responseLine : response) {
             responseLine = responseLine.replace("\n", "\\n");

ui_swing/src/com/dmdirc/addons/ui_swing/framemanager/buttonbar/ButtonBar.java

@@ -43,8 +43,8 @@ import com.dmdirc.events.NotificationSetEvent;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
 import com.dmdirc.interfaces.config.ConfigChangeListener;
 import com.dmdirc.interfaces.ui.Window;
-import com.dmdirc.util.colours.Colour;
 import com.dmdirc.ui.WindowManager;
+import com.dmdirc.util.colours.Colour;
 
 import com.google.common.base.Optional;
 
@@ -58,9 +58,9 @@ import java.awt.event.MouseEvent;
 import java.awt.event.MouseListener;
 import java.io.Serializable;
 import java.util.ArrayList;
-import java.util.Collection;
 import java.util.Collections;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 
 import javax.inject.Inject;
@@ -147,8 +147,7 @@ public final class ButtonBar implements FrameManager, ActionListener, ComponentL
         scrollPane.setHorizontalScrollBarPolicy(ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER);
         scrollPane.setVerticalScrollBarPolicy(ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED);
         scrollPane.setMinimumSize(new Dimension(0, BUTTON_HEIGHT
-                + ((int) PlatformDefaults.getUnitValueX("related")
-                .getValue()) * 2));
+                + (int) PlatformDefaults.getUnitValueX("related").getValue() * 2));
 
         position = FramemanagerPosition.getPosition(
                 globalConfig.getOption("ui", "framemanagerPosition"));
@@ -205,7 +204,7 @@ public final class ButtonBar implements FrameManager, ActionListener, ComponentL
                 parent.add(scrollPane);
                 parent.addComponentListener(ButtonBar.this);
                 ButtonBar.this.buttonWidth = position.isHorizontal()
-                        ? 150 : (parent.getWidth() / NUM_CELLS);
+                        ? 150 : parent.getWidth() / NUM_CELLS;
                 initButtons(windowManager.getRootWindows());
 
                 final TextFrame activeFrame = activeFrameManager.getActiveFrame();
@@ -226,20 +225,16 @@ public final class ButtonBar implements FrameManager, ActionListener, ComponentL
      *
      * @since 0.6.4
      */
-    private void initButtons(
-            final Collection<FrameContainer> windowCollection) {
-        TextFrame window;
-        TextFrame parentWindow;
+    private void initButtons(final Iterable<FrameContainer> windowCollection) {
         for (FrameContainer frame : windowCollection) {
-            window = windowFactory.getSwingWindow(frame);
-            parentWindow = windowFactory.getSwingWindow(frame.getParent().orNull());
+            final TextFrame window = windowFactory.getSwingWindow(frame);
+            final TextFrame parentWindow = windowFactory.getSwingWindow(frame.getParent().orNull());
             if (window != null) {
                 windowAdded(new SwingWindowAddedEvent(Optional.fromNullable(parentWindow), window));
             }
 
             if (!frame.getChildren().isEmpty()) {
-                final ArrayList<FrameContainer> childList = new ArrayList<>(frame.getChildren());
-                initButtons(childList);
+                initButtons(new ArrayList<>(frame.getChildren()));
             }
         }
     }
@@ -270,21 +265,16 @@ public final class ButtonBar implements FrameManager, ActionListener, ComponentL
      *
      * @since 0.6.4
      */
-    private void displayButtons(
-            final Collection<FrameContainer> windowCollection) {
-        FrameToggleButton button;
+    private void displayButtons(final Iterable<FrameContainer> windowCollection) {
         for (FrameContainer window : windowCollection) {
-            button = getButton(window);
+            final FrameToggleButton button = getButton(window);
             if (button != null) {
-                button.setPreferredSize(
-                        new Dimension(buttonWidth, BUTTON_HEIGHT));
+                button.setPreferredSize(new Dimension(buttonWidth, BUTTON_HEIGHT));
                 buttonPanel.add(button);
                 if (!window.getChildren().isEmpty()) {
-                    final ArrayList<FrameContainer> childList
-                            = new ArrayList<>(window.getChildren());
+                    final List<FrameContainer> childList = new ArrayList<>(window.getChildren());
                     if (sortChildWindows) {
-                        Collections.sort(childList,
-                                new FrameContainerComparator());
+                        Collections.sort(childList, new FrameContainerComparator());
                     }
                     displayButtons(childList);
                 }
@@ -299,7 +289,7 @@ public final class ButtonBar implements FrameManager, ActionListener, ComponentL
         buttonPanel.setVisible(false);
         buttonPanel.removeAll();
 
-        final ArrayList<FrameContainer> windowList = new ArrayList<>(windowManager.getRootWindows());
+        final List<FrameContainer> windowList = new ArrayList<>(windowManager.getRootWindows());
         if (sortRootWindows) {
             Collections.sort(windowList, new FrameContainerComparator());
         }
@@ -367,7 +357,7 @@ public final class ButtonBar implements FrameManager, ActionListener, ComponentL
 
     @Override
     public void componentResized(final ComponentEvent e) {
-        buttonWidth = position.isHorizontal() ? 150 : (parent.getWidth() / NUM_CELLS);
+        buttonWidth = position.isHorizontal() ? 150 : parent.getWidth() / NUM_CELLS;
         relayout();
     }
 
@@ -408,8 +398,7 @@ public final class ButtonBar implements FrameManager, ActionListener, ComponentL
             @Override
             public void run() {
                 activeWindow = window;
-                FrameToggleButton button;
-                button = getButton(selected);
+                FrameToggleButton button = getButton(selected);
                 if (selected != null && button != null) {
                     button.setSelected(false);
                 }