Tidying

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

src/com/dmdirc/actions/CoreActionComparison.java

     STRING_CONTAINS {
         @Override
         public boolean test(final Object arg1, final Object arg2) {
-            return ((String) arg1).contains((String) arg2);
+            return ((String) arg1).contains((CharSequence) arg2);
         }
 
         @Override
     STRING_NCONTAINS {
         @Override
         public boolean test(final Object arg1, final Object arg2) {
-            return !((String) arg1).contains((String) arg2);
+            return !((String) arg1).contains((CharSequence) arg2);
         }
 
         @Override

src/com/dmdirc/actions/CoreActionComponent.java

 import com.dmdirc.FrameContainer;
 import com.dmdirc.Query;
 import com.dmdirc.interfaces.Connection;
+import com.dmdirc.interfaces.PrivateChat;
 import com.dmdirc.interfaces.actions.ActionComponent;
 import com.dmdirc.interfaces.config.ConfigProvider;
 import com.dmdirc.interfaces.ui.Window;
 import com.dmdirc.logger.Logger;
 import com.dmdirc.parser.interfaces.ChannelClientInfo;
 import com.dmdirc.parser.interfaces.ClientInfo;
-import com.dmdirc.util.colours.Colour;
 import com.dmdirc.ui.messages.Styliser;
+import com.dmdirc.util.colours.Colour;
 
+import java.awt.AWTKeyStroke;
+import java.awt.event.InputEvent;
 import java.awt.event.KeyEvent;
 import java.util.Calendar;
-import java.util.GregorianCalendar;
 
 import javax.swing.KeyStroke;
 
         @Override
         public Object get(final Object arg) {
             // TODO: This should understand unset notifications
-            return ((Channel) arg).getNotification().or(Colour.BLACK);
+            return ((FrameContainer) arg).getNotification().or(Colour.BLACK);
         }
 
         @Override
     STRING_LENGTH {
         @Override
         public Object get(final Object arg) {
-            return ((String) arg).length();
+            return ((CharSequence) arg).length();
         }
 
         @Override
     CALENDAR_FULLSTRING {
         @Override
         public Object get(final Object arg) {
-            return ((GregorianCalendar) arg).getTime().toString();
+            return ((Calendar) arg).getTime().toString();
         }
 
         @Override
     KEYEVENT_KEYNAME {
         @Override
         public Object get(final Object arg) {
-            return KeyEvent.getKeyText(((KeyStroke) arg).getKeyCode());
+            return KeyEvent.getKeyText(((AWTKeyStroke) arg).getKeyCode());
         }
 
         @Override
     KEYEVENT_CTRLSTATE {
         @Override
         public Object get(final Object arg) {
-            return (((KeyStroke) arg).getModifiers() & KeyEvent.CTRL_DOWN_MASK) != 0;
+            return (((AWTKeyStroke) arg).getModifiers() & InputEvent.CTRL_DOWN_MASK) != 0;
         }
 
         @Override
     KEYEVENT_SHIFTSTATE {
         @Override
         public Object get(final Object arg) {
-            return (((KeyStroke) arg).getModifiers() & KeyEvent.SHIFT_DOWN_MASK) != 0;
+            return (((AWTKeyStroke) arg).getModifiers() & InputEvent.SHIFT_DOWN_MASK) != 0;
         }
 
         @Override
     KEYEVENT_ALTSTATE {
         @Override
         public Object get(final Object arg) {
-            return (((KeyStroke) arg).getModifiers() & KeyEvent.ALT_DOWN_MASK) != 0;
+            return (((AWTKeyStroke) arg).getModifiers() & InputEvent.ALT_DOWN_MASK) != 0;
         }
 
         @Override
     QUERY_HOST {
         @Override
         public Object get(final Object arg) {
-            return ((Query) arg).getHost();
+            return ((PrivateChat) arg).getHost();
         }
 
         @Override
     QUERY_NICK {
         @Override
         public Object get(final Object arg) {
-            return ((Query) arg).getName();
+            return ((FrameContainer) arg).getName();
         }
 
         @Override
         @Override
         public Object get(final Object arg) {
             // TODO: This should understand unset notifications
-            return ((Query) arg).getNotification().or(Colour.BLACK);
+            return ((FrameContainer) arg).getNotification().or(Colour.BLACK);
         }
 
         @Override

src/com/dmdirc/actions/wrappers/PerformWrapper.java

      *
      * @since 0.6.4
      */
-    public void setPerform(final PerformDescription perform, final String[] content) {
+    public void setPerform(final PerformDescription perform, final String... content) {
         synchronized (this) {
             Action action = getAction(perform.getType() == PerformType.NETWORK
                     ? CoreActionComponent.SERVER_NETWORK : CoreActionComponent.SERVER_NAME,
      *
      * @since 0.6.4
      */
-    private static boolean isEmpty(final String[] perform) {
+    private static boolean isEmpty(final String... perform) {
         for (String part : perform) {
             if (part != null && !part.isEmpty()) {
                 return false;
      * @since 0.6.3m2
      * @return True if the conditions are valid, false otherwise
      */
-    protected boolean checkConditions(final List<ActionCondition> conditions) {
+    protected boolean checkConditions(final Iterable<ActionCondition> conditions) {
         boolean target = false;
         boolean profile = false;
 
 
             final PerformDescription other = (PerformDescription) obj;
 
-            if (this.type != other.type || !this.target.equals(other.target)) {
-                return false;
-            }
+            return !(type != other.type || !target.equals(other.target)) &&
+                    (profile == null ? other.profile == null : profile.equals(other.profile));
 
-            return !((this.profile == null) ? (other.profile != null)
-                    : !this.profile.equals(other.profile));
         }
 
         @Override
         public int hashCode() {
             int hash = 7;
-            hash = 89 * hash + (this.type != null ? this.type.hashCode() : 0);
-            hash = 89 * hash + (this.target != null ? this.target.hashCode() : 0);
-            hash = 89 * hash + (this.profile != null ? this.profile.hashCode() : 0);
+            hash = 89 * hash + (type != null ? type.hashCode() : 0);
+            hash = 89 * hash + target.hashCode();
+            hash = 89 * hash + (profile != null ? profile.hashCode() : 0);
             return hash;
         }
 

src/com/dmdirc/commandparser/CommandManager.java

      * @since 0.6.3m1
      */
     private void registerCommand(final CommandInfo info, final Command command,
-            final List<? extends CommandParser> myParsers, final boolean register) {
+            final Iterable<? extends CommandParser> myParsers, final boolean register) {
         for (CommandParser parser : myParsers) {
             if (register) {
                 parser.registerCommand(command, info);
         final Map<CommandInfo, Command> res = new HashMap<>();
 
         for (Map.Entry<CommandInfo, Command> entry : commands.entrySet()) {
-            if ((type == null || type.equals(entry.getKey().getType()))
+            if ((type == null || type == entry.getKey().getType())
                     && (name == null || name.equals(entry.getKey().getName()))) {
                 res.put(entry.getKey(), entry.getValue());
             }

src/com/dmdirc/commandparser/commands/global/OpenWindow.java

 import com.dmdirc.CustomWindow;
 import com.dmdirc.DMDircMBassador;
 import com.dmdirc.FrameContainer;
-import com.dmdirc.Server;
 import com.dmdirc.commandparser.BaseCommandInfo;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.CommandInfo;
                 return;
             }
 
-            parent = (Server) origin.getConnection();
+            parent = (FrameContainer) origin.getConnection();
             start = 1;
         } else if (args.getArguments().length > 0 && "--child".equals(args.getArguments()[0])) {
             parent = origin;

src/com/dmdirc/commandparser/commands/global/SetCommand.java

 
 import com.dmdirc.Channel;
 import com.dmdirc.FrameContainer;
-import com.dmdirc.Server;
 import com.dmdirc.commandparser.BaseCommandInfo;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.CommandInfo;
 import com.dmdirc.interfaces.config.ConfigProvider;
 import com.dmdirc.interfaces.config.IdentityController;
 import com.dmdirc.interfaces.config.IdentityFactory;
+import com.dmdirc.interfaces.config.ReadOnlyConfigProvider;
 import com.dmdirc.ui.input.AdditionalTabTargets;
 
 import java.util.List;
             }
 
             identity = origin.getConnection().getServerIdentity();
-            manager = ((Server) origin.getConnection()).getConfigManager();
+            manager = ((FrameContainer) origin.getConnection()).getConfigManager();
         }
 
         if (res.hasFlag(channelFlag)) {
      * @param domain   The domain to be inspected
      */
     private void doOptionsList(final FrameContainer origin,
-            final boolean isSilent, final AggregateConfigProvider manager, final String domain) {
+            final boolean isSilent, final ReadOnlyConfigProvider manager, final String domain) {
         final StringBuilder output = new StringBuilder(24);
 
         output.append("Options in domain '");
      * @param option   The name of the option
      */
     private void doShowOption(final FrameContainer origin,
-            final boolean isSilent, final AggregateConfigProvider manager,
+            final boolean isSilent, final ReadOnlyConfigProvider manager,
             final String domain, final String option) {
         if (manager.hasOptionString(domain, option)) {
             sendLine(origin, isSilent, FORMAT_OUTPUT, "The current value of "
-                    + domain + "." + option + " is: " + manager.getOption(domain, option));
+                    + domain + '.' + option + " is: " + manager.getOption(domain, option));
         } else {
-            sendLine(origin, isSilent, FORMAT_ERROR, "Option not found: " + domain + "." + option);
+            sendLine(origin, isSilent, FORMAT_ERROR, "Option not found: " + domain + '.' + option);
         }
     }
 
             final String domain, final String option, final String newvalue) {
         identity.setOption(domain, option, newvalue);
 
-        sendLine(origin, isSilent, FORMAT_OUTPUT, domain + "." + option
+        sendLine(origin, isSilent, FORMAT_OUTPUT, domain + '.' + option
                 + " has been set to: " + newvalue);
     }
 
      */
     private void doAppendOption(final FrameContainer origin,
             final boolean isSilent, final ConfigProvider identity,
-            final AggregateConfigProvider manager,
+            final ReadOnlyConfigProvider manager,
             final String domain, final String option, final String data) {
         doSetOption(origin, isSilent, identity, domain, option,
                 (manager.hasOptionString(domain, option)
             final String option) {
         identity.unsetOption(domain, option);
 
-        sendLine(origin, isSilent, FORMAT_OUTPUT, domain + "." + option + " has been unset.");
+        sendLine(origin, isSilent, FORMAT_OUTPUT, domain + '.' + option + " has been unset.");
     }
 
     @Override
             res.add("--channel");
             res.excludeAll();
         } else if (arg == 1 && previousArgs.size() >= 1) {
-            if (previousArgs.get(0).equalsIgnoreCase("--unset")
-                    || previousArgs.get(0).equalsIgnoreCase("--append")
-                    || previousArgs.get(0).equalsIgnoreCase("--server")
-                    || previousArgs.get(0).equalsIgnoreCase("--channel")) {
+            if ("--unset".equalsIgnoreCase(previousArgs.get(0))
+                    || "--append".equalsIgnoreCase(previousArgs.get(0))
+                    || "--server".equalsIgnoreCase(previousArgs.get(0))
+                    || "--channel".equalsIgnoreCase(previousArgs.get(0))) {
                 res.addAll(context.getWindow().getConfigManager()
                         .getDomains());
             } else {
                         .getOptions(previousArgs.get(0)).keySet());
             }
             res.excludeAll();
-        } else if (arg == 2 && (previousArgs.get(0).equalsIgnoreCase("--unset")
-                || previousArgs.get(0).equalsIgnoreCase("--append")
-                || previousArgs.get(0).equalsIgnoreCase("--server")
-                || previousArgs.get(0).equalsIgnoreCase("--channel"))) {
+        } else if (arg == 2 && ("--unset".equalsIgnoreCase(previousArgs.get(0))
+                || "--append".equalsIgnoreCase(previousArgs.get(0))
+                || "--server".equalsIgnoreCase(previousArgs.get(0))
+                || "--channel".equalsIgnoreCase(previousArgs.get(0)))) {
             res.addAll(context.getWindow().getConfigManager()
                     .getOptions(previousArgs.get(1)).keySet());
             res.excludeAll();

src/com/dmdirc/commandparser/commands/server/OpenQuery.java

                     + "with a channel; maybe you meant " + Styliser.CODE_FIXED
                     + Styliser.CODE_BOLD
                     + getController().getCommandChar()
-                    + (args.getArguments().length > 1 ? "msg" : "join") + " "
+                    + (args.getArguments().length > 1 ? "msg" : "join") + ' '
                     + args.getArgumentsAsString()
-                    + Styliser.CODE_BOLD + Styliser.CODE_FIXED + "?");
+                    + Styliser.CODE_BOLD + Styliser.CODE_FIXED + '?');
             return;
         }
 

src/com/dmdirc/config/ConfigTarget.java

      */
     @Override
     public int compareTo(@Nonnull final ConfigTarget target) {
-        if (type.equals(target.getType())) {
+        if (type == target.getType()) {
             return target.getOrder() - order;
         } else {
             return type.compareTo(target.getType());

src/com/dmdirc/config/prefs/PreferencesSetting.java

 
 package com.dmdirc.config.prefs;
 
-import com.dmdirc.interfaces.config.AggregateConfigProvider;
 import com.dmdirc.interfaces.config.ConfigProvider;
+import com.dmdirc.interfaces.config.ReadOnlyConfigProvider;
 import com.dmdirc.util.validators.PermissiveValidator;
 import com.dmdirc.util.validators.Validator;
 
 import java.util.ArrayList;
+import java.util.Collection;
 import java.util.HashMap;
-import java.util.List;
 import java.util.Map;
 
 /**
     /** The original value of this setting. */
     private String original;
     /** A list of change listeners. */
-    private final List<SettingChangeListener> listeners = new ArrayList<>();
+    private final Collection<SettingChangeListener> listeners = new ArrayList<>();
     /** Identity to save settings to. */
     private final ConfigProvider identity;
 
     public PreferencesSetting(final PreferencesType type,
             final Validator<String> validator, final String domain,
             final String option, final String title, final String helptext,
-            final AggregateConfigProvider configManager, final ConfigProvider identity) {
-        if (PreferencesType.MULTICHOICE.equals(type)) {
+            final ReadOnlyConfigProvider configManager, final ConfigProvider identity) {
+        if (PreferencesType.MULTICHOICE == type) {
             throw new IllegalArgumentException("Multi-choice preferences must "
                     + "have their options specified.");
         }
      */
     public PreferencesSetting(final PreferencesType type, final String domain,
             final String option, final String title, final String helptext,
-            final AggregateConfigProvider configManager, final ConfigProvider identity) {
-        if (PreferencesType.MULTICHOICE.equals(type)) {
+            final ReadOnlyConfigProvider configManager, final ConfigProvider identity) {
+        if (PreferencesType.MULTICHOICE == type) {
             throw new IllegalArgumentException("Multi-choice preferences must "
                     + "have their options specified.");
         }
     public PreferencesSetting(final String domain, final String option,
             final String title, final String helptext,
             final Map<String, String> options,
-            final AggregateConfigProvider configManager, final ConfigProvider identity) {
+            final ReadOnlyConfigProvider configManager, final ConfigProvider identity) {
         this.type = PreferencesType.MULTICHOICE;
         this.comboOptions = new HashMap<>(options);
         this.validator = new PermissiveValidator<>();
         original = value;
 
         if (!comboOptions.containsKey(value)) {
-            comboOptions.put(value, "Current (" + value + ")");
+            comboOptions.put(value, "Current (" + value + ')');
         }
     }
 
      * Dismisses changes to this setting.
      */
     public void dismiss() {
-        if ((original != null && original.equals(value))
-                || (original == null && value == null)) {
+        if (original != null && original.equals(value)
+                || original == null && value == null) {
             return;
         }
 

src/com/dmdirc/interfaces/ui/SearchBar.java

 public interface SearchBar {
 
     /** Direction used for searching. */
-    public enum Direction {
+    enum Direction {
 
         /** Move up through the document. */
         UP,

src/com/dmdirc/logger/ErrorManager.java

             final boolean appError,
             final boolean canReport) {
         final boolean dupe = addError(error);
-        if (error.getLevel().equals(ErrorLevel.FATAL)) {
+        if (error.getLevel() == ErrorLevel.FATAL) {
             if (dupe) {
                 error.setReportStatus(ErrorReportStatus.NOT_APPLICABLE);
             }
-        } else if (!canReport || (appError && !error.isValidSource())) {
-            error.setReportStatus(ErrorReportStatus.NOT_APPLICABLE);
-        } else if (!appError) {
-            error.setReportStatus(ErrorReportStatus.NOT_APPLICABLE);
-        } else if (dupe) {
+        } else if (!canReport || appError && !error.isValidSource() || !appError || dupe) {
             error.setReportStatus(ErrorReportStatus.NOT_APPLICABLE);
         } else if (sendReports) {
             sendError(error);

src/com/dmdirc/logger/ProgramError.java

      * @param newStatus new ErrorReportStatus for the error
      */
     public void setReportStatus(final ErrorReportStatus newStatus) {
-        if (newStatus != null && !reportStatus.equals(newStatus)) {
+        if (newStatus != null && reportStatus != newStatus) {
             reportStatus = newStatus;
             ErrorManager.getErrorManager().fireErrorStatusChanged(this);
 
         if (errorFile.exists()) {
             boolean rename = false;
             for (int i = 0; !rename; i++) {
-                rename = errorFile.renameTo(new File(errorDir, logName + "-" + i + ".log"));
+                rename = errorFile.renameTo(new File(errorDir, logName + '-' + i + ".log"));
             }
         }
 
             return "1 occurrence on " + format.format(getDate());
         } else {
             return count.get() + " occurrences between " + format.format(
-                    getDate()) + " and " + format.format(getLastDate()) + ".";
+                    getDate()) + " and " + format.format(getLastDate()) + '.';
         }
     }
 
     @Override
     public String toString() {
         return "ID" + id + " Level: " + getLevel() + " Status: " + getReportStatus()
-                + " Message: '" + getMessage() + "'";
+                + " Message: '" + getMessage() + '\'';
     }
 
     @Override

test/com/dmdirc/actions/ActionComponentChainTest.java

 package com.dmdirc.actions;
 
 import com.dmdirc.Server;
+import com.dmdirc.interfaces.actions.ActionComponent;
 
 import org.junit.Before;
 import org.junit.Test;
     @Test
     public void testSingle() {
         final ActionComponentChain chain = new ActionComponentChain(String.class, "STRING_STRING", actionManager);
-        assertEquals(chain.get("foo bar baz"), "foo bar baz");
+        assertEquals("foo bar baz", chain.get("foo bar baz"));
         assertEquals("STRING_STRING", chain.toString());
     }
 
     public void testDouble() {
         final ActionComponentChain chain = new ActionComponentChain(String.class,
                 "STRING_STRING.STRING_STRING", actionManager);
-        assertEquals(chain.get("foo bar baz"), "foo bar baz");
+        assertEquals("foo bar baz", chain.get("foo bar baz"));
         assertEquals("STRING_STRING.STRING_STRING", chain.toString());
     }
 
 
     @Test
     public void testAppliesTo() {
-        final ActionComponentChain chain = new ActionComponentChain(String.class,
+        final ActionComponent chain = new ActionComponentChain(String.class,
                 "STRING_STRING.STRING_STRING.STRING_LENGTH", actionManager);
-        assertEquals(String.class, chain.appliesTo());
+        assertSame(String.class, chain.appliesTo());
     }
 
     @Test
     public void testGetType() {
-        final ActionComponentChain chain = new ActionComponentChain(String.class,
+        final ActionComponent chain = new ActionComponentChain(String.class,
                 "STRING_STRING.STRING_STRING.STRING_LENGTH", actionManager);
-        assertEquals(Integer.class, chain.getType());
+        assertSame(Integer.class, chain.getType());
     }
 
     @Test
     public void testGetName() {
-        final ActionComponentChain chain = new ActionComponentChain(String.class,
+        final ActionComponent chain = new ActionComponentChain(String.class,
                 "STRING_STRING.STRING_STRING.STRING_LENGTH", actionManager);
 
-        assertTrue(chain.getName().indexOf(CoreActionComponent.STRING_STRING.getName()) > -1);
-        assertTrue(chain.getName().indexOf(CoreActionComponent.STRING_LENGTH.getName()) > -1);
+        assertTrue(chain.getName().contains(CoreActionComponent.STRING_STRING.getName()));
+        assertTrue(chain.getName().contains(CoreActionComponent.STRING_LENGTH.getName()));
     }
 
     @Test(expected=AssertionError.class)
     public void testEmptyAppliesTo() {
-        final ActionComponentChain chain = new ActionComponentChain(String.class, "", actionManager);
+        final ActionComponent chain = new ActionComponentChain(String.class, "", actionManager);
         chain.appliesTo();
     }
 
     @Test(expected=AssertionError.class)
     public void testEmptyGetType() {
-        final ActionComponentChain chain = new ActionComponentChain(String.class, "", actionManager);
+        final ActionComponent chain = new ActionComponentChain(String.class, "", actionManager);
         chain.getType();
     }
 
     @Test(expected=AssertionError.class)
     public void testEmptyGetName() {
-        final ActionComponentChain chain = new ActionComponentChain(String.class, "", actionManager);
+        final ActionComponent chain = new ActionComponentChain(String.class, "", actionManager);
         chain.getName();
     }
 
+    @SuppressWarnings("ResultOfMethodCallIgnored")
     @Test(expected=AssertionError.class)
     public void testEmptyToString() {
         final ActionComponentChain chain = new ActionComponentChain(String.class, "", actionManager);
         chain.toString();
     }
 
-    @Test()
+    @Test
     public void testRequiresConnection1() {
         final ActionComponentChain chain = new ActionComponentChain(Server.class,
                 "SERVER_NETWORK", actionManager);
         assertTrue(chain.requiresConnection());
     }
 
-    @Test()
+    @Test
     public void testRequiresConnection2() {
         final ActionComponentChain chain = new ActionComponentChain(Server.class,
                 "SERVER_NETWORK.STRING_LENGTH", actionManager);
         assertTrue(chain.requiresConnection());
     }
 
-    @Test()
+    @Test
     public void testRequiresConnection3() {
         final ActionComponentChain chain = new ActionComponentChain(Server.class,
                 "SERVER_NAME.STRING_LENGTH", actionManager);

test/com/dmdirc/config/prefs/PreferencesDialogModelTest.java

 
 package com.dmdirc.config.prefs;
 
+import com.dmdirc.DMDircMBassador;
 import com.dmdirc.events.ClientPrefsClosedEvent;
 import com.dmdirc.events.ClientPrefsOpenedEvent;
-import com.dmdirc.interfaces.ActionListener;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
 import com.dmdirc.plugins.PluginManager;
 import com.dmdirc.plugins.Service;
 import org.mockito.Mock;
 import org.mockito.runners.MockitoJUnitRunner;
 
-import com.dmdirc.DMDircMBassador;
-
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertNull;
 
     @Test
     public void testDefaults() {
-        AggregateConfigProvider cm = mock(AggregateConfigProvider.class);
+        final AggregateConfigProvider cm = mock(AggregateConfigProvider.class);
         when(cm.getOption("domain", "option")).thenReturn("fallback");
         final PreferencesDialogModel pm = new PreferencesDialogModel(null, null,
                 null, null, cm, null, pluginManager, eventBus);
 
     @Test
     public void testDismiss() {
-        AggregateConfigProvider cm = mock(AggregateConfigProvider.class);
+        final AggregateConfigProvider cm = mock(AggregateConfigProvider.class);
         when(cm.getOption("domain", "option")).thenReturn("fallback");
         final PreferencesCategory category = mock(PreferencesCategory.class);
         final PreferencesDialogModel pm = new PreferencesDialogModel(null, null,
     public void testSaveNoRestart() {
         final PreferencesCategory category = mock(PreferencesCategory.class);
         when(category.save()).thenReturn(false);
-        AggregateConfigProvider cm = mock(AggregateConfigProvider.class);
+        final AggregateConfigProvider cm = mock(AggregateConfigProvider.class);
         when(cm.getOption("domain", "option")).thenReturn("fallback");
 
         final PreferencesDialogModel pm = new PreferencesDialogModel(null, null,
     public void testSaveRestart() {
         final PreferencesCategory category = mock(PreferencesCategory.class);
         when(category.save()).thenReturn(true);
-        AggregateConfigProvider cm = mock(AggregateConfigProvider.class);
+        final AggregateConfigProvider cm = mock(AggregateConfigProvider.class);
         when(cm.getOption("domain", "option")).thenReturn("fallback");
 
         final PreferencesDialogModel pm = new PreferencesDialogModel(null, null,
 
     @Test
     public void testGetCategory() {
-        AggregateConfigProvider cm = mock(AggregateConfigProvider.class);
+        final AggregateConfigProvider cm = mock(AggregateConfigProvider.class);
         when(cm.getOption("domain", "option")).thenReturn("fallback");
 
         final PreferencesDialogModel pm = new PreferencesDialogModel(null, null,
 
     @Test
     public void testGetCategories() {
-        AggregateConfigProvider cm = mock(AggregateConfigProvider.class);
+        final AggregateConfigProvider cm = mock(AggregateConfigProvider.class);
         when(cm.getOption("domain", "option")).thenReturn("fallback");
 
         final PreferencesDialogModel pm = new PreferencesDialogModel(null, null,
 
     @Test
     public void testSaveListener() {
-        AggregateConfigProvider cm = mock(AggregateConfigProvider.class);
+        final AggregateConfigProvider cm = mock(AggregateConfigProvider.class);
         when(cm.getOption("domain", "option")).thenReturn("fallback");
 
         final PreferencesDialogModel pm = new PreferencesDialogModel(null, null,
 
     @Test
     public void testOpenAction() {
-        AggregateConfigProvider cm = mock(AggregateConfigProvider.class);
+        final AggregateConfigProvider cm = mock(AggregateConfigProvider.class);
         when(cm.getOption("domain", "option")).thenReturn("fallback");
 
-        final PreferencesDialogModel pm = new PreferencesDialogModel(null, null,
-                null, null, cm, null, pluginManager, eventBus);
+        new PreferencesDialogModel(null, null, null, null, cm, null, pluginManager, eventBus);
 
         verify(eventBus).publishAsync(isA(ClientPrefsOpenedEvent.class));
     }
 
     @Test
     public void testCloseAction() {
-        final ActionListener tal = mock(ActionListener.class);
-        AggregateConfigProvider cm = mock(AggregateConfigProvider.class);
+        final AggregateConfigProvider cm = mock(AggregateConfigProvider.class);
         when(cm.getOption("domain", "option")).thenReturn("fallback");
         final PreferencesDialogModel pm = new PreferencesDialogModel(null, null,
                 null, null, cm, null, pluginManager, eventBus);
 
     @Test
     public void testCategoryObjectSaveListeners() {
-        AggregateConfigProvider cm = mock(AggregateConfigProvider.class);
+        final AggregateConfigProvider cm = mock(AggregateConfigProvider.class);
         when(cm.getOption("domain", "option")).thenReturn("fallback");
 
         final PreferencesDialogModel pm = new PreferencesDialogModel(null, null,