Style/inspection fixes.

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

src/com/dmdirc/FrameContainer.java

@@ -733,7 +733,6 @@ public abstract class FrameContainer {
     public boolean doNotification(final Date date, final String messageType, final Object... args) {
         final List<Object> messageArgs = new ArrayList<>();
         final List<Object> actionArgs = new ArrayList<>();
-        final StringBuffer buffer = new StringBuffer(messageType);
 
         actionArgs.add(this);
 
@@ -747,7 +746,7 @@ public abstract class FrameContainer {
 
         modifyNotificationArgs(actionArgs, messageArgs);
 
-        handleNotification(date, buffer.toString(), messageArgs.toArray());
+        handleNotification(date, messageType, messageArgs.toArray());
 
         return true;
     }

src/com/dmdirc/ServerManager.java

@@ -40,6 +40,7 @@ import com.google.common.util.concurrent.ThreadFactoryBuilder;
 import java.net.URI;
 import java.net.URISyntaxException;
 import java.util.ArrayList;
+import java.util.Collection;
 import java.util.List;
 import java.util.Set;
 import java.util.concurrent.CopyOnWriteArraySet;
@@ -245,8 +246,9 @@ public class ServerManager implements ServerFactory {
         if (server.getState().isDisconnected()) {
             server.connect(uri, profile);
         } else {
-            server.join(server.getParser().extractChannels(uri)
-                    .toArray(new ChannelJoinRequest[0]));
+            Collection<? extends ChannelJoinRequest> joinRequests =
+                    server.getParser().extractChannels(uri);
+            server.join(joinRequests.toArray(new ChannelJoinRequest[joinRequests.size()]));
         }
 
         return server;

src/com/dmdirc/actions/CoreActionComponent.java

@@ -592,8 +592,7 @@ public enum CoreActionComponent implements ActionComponent {
     KEYEVENT_ALTSTATE {
         @Override
         public Object get(final Object arg) {
-            return Boolean
-                    .valueOf((((KeyStroke) arg).getModifiers() & KeyEvent.ALT_DOWN_MASK) != 0);
+            return (((KeyStroke) arg).getModifiers() & KeyEvent.ALT_DOWN_MASK) != 0;
         }
 
         @Override

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

@@ -219,16 +219,10 @@ public class Profile {
             return false;
         }
         final Profile other = (Profile) obj;
-        if (!Objects.equals(this.name, other.name)) {
-            return false;
-        }
-        if (!Objects.equals(this.realname, other.realname)) {
-            return false;
-        }
-        if (!Objects.equals(this.ident, other.ident)) {
-            return false;
-        }
-        return Objects.equals(this.nicknames, other.nicknames);
+        return Objects.equals(this.name, other.name) &&
+                Objects.equals(this.realname, other.realname) &&
+                Objects.equals(this.ident, other.ident) &&
+                Objects.equals(this.nicknames, other.nicknames);
     }
 
     @Override

src/com/dmdirc/commandline/RemoteServer.java

@@ -83,7 +83,6 @@ public class RemoteServer implements RemoteInterface {
                 registry.rebind("DMDirc", stub);
                 return;
             } catch (RemoteException ex) {
-                continue;
             }
         }
     }
@@ -100,13 +99,10 @@ public class RemoteServer implements RemoteInterface {
                 final Registry registry = LocateRegistry.getRegistry("localhost", port);
                 final RemoteInterface iface = (RemoteInterface) registry.lookup("DMDirc");
 
-                if (iface == null) {
-                    continue;
-                } else {
+                if (iface != null) {
                     return iface;
                 }
             } catch (RemoteException | NotBoundException ex) {
-                continue;
             }
         }
 

src/com/dmdirc/commandparser/commands/PreviousCommand.java

@@ -61,10 +61,7 @@ public final class PreviousCommand {
             return false;
         }
         final PreviousCommand other = (PreviousCommand) obj;
-        if (!Objects.equals(this.line, other.line)) {
-            return false;
-        }
-        return this.time == other.time;
+        return Objects.equals(this.line, other.line) && this.time == other.time;
     }
 
 }

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

@@ -177,7 +177,7 @@ public class SetCommand extends Command implements IntelligentCommand {
      */
     private void doDomainList(final FrameContainer origin, final boolean isSilent,
             final AggregateConfigProvider manager) {
-        final StringBuffer output = new StringBuffer(67);
+        final StringBuilder output = new StringBuilder(67);
 
         output.append("Valid domains (use ");
         output.append(getController().getCommandChar());
@@ -201,7 +201,7 @@ public class SetCommand extends Command implements IntelligentCommand {
      */
     private void doOptionsList(final FrameContainer origin,
             final boolean isSilent, final AggregateConfigProvider manager, final String domain) {
-        final StringBuffer output = new StringBuffer(24);
+        final StringBuilder output = new StringBuilder(24);
 
         output.append("Options in domain '");
         output.append(domain);

src/com/dmdirc/config/ConfigFileBackedConfigProvider.java

@@ -318,8 +318,8 @@ public class ConfigFileBackedConfigProvider extends BaseConfigProvider implement
 
         synchronized (this) {
             oldValue = getOption(domain, option);
-            log.trace("{}: setting {}.{} to {} (was: {})",
-                    new Object[]{getName(), domain, option, value, oldValue});
+            log.trace("{}: setting {}.{} to {} (was: {})", getName(), domain, option, value,
+                    oldValue);
 
             if (myTarget.getType() == ConfigTarget.TYPE.GLOBAL) {
                 // If we're the global config, don't set useless settings that are
@@ -455,8 +455,8 @@ public class ConfigFileBackedConfigProvider extends BaseConfigProvider implement
 
                         if (globalConfig.hasOptionString(domain, key)
                                 && globalConfig.getOption(domain, key).equals(value)) {
-                            log.debug("{}: found superfluous setting: {}.{} (= {})",
-                                    new Object[]{getName(), domain, key, value});
+                            log.debug("{}: found superfluous setting: {}.{} (= {})", getName(),
+                                    domain, key, value);
                             file.getKeyDomain(domain).remove(key);
                         }
                     }

src/com/dmdirc/config/ConfigManager.java

@@ -277,7 +277,7 @@ class ConfigManager extends BaseConfigProvider implements ConfigChangeListener,
                 && identityTargetMatches(identity.getTarget().getData(), comp);
 
         log.trace("Checking if identity {} applies. Comparison: {}, target: {}, result: {}",
-                new Object[]{identity, comp, identity.getTarget().getData(), result});
+                identity, comp, identity.getTarget().getData(), result);
 
         return result;
     }
@@ -359,10 +359,8 @@ class ConfigManager extends BaseConfigProvider implements ConfigChangeListener,
      */
     void migrate(final String protocol, final String ircd,
             final String network, final String server, final String channel) {
-        log.debug("Migrating from {{}, {}, {}, {}, {}} to {{}, {}, {}, {}, {}}",
-                new Object[]{
-                    this.protocol, this.ircd, this.network, this.server, this.channel,
-                    protocol, ircd, network, server, channel,});
+        log.debug("Migrating from {{}, {}, {}, {}, {}} to {{}, {}, {}, {}, {}}", this.protocol, this.ircd,
+                this.network, this.server, this.channel, protocol, ircd, network, server, channel);
 
         this.protocol = protocol;
         this.ircd = ircd;

src/com/dmdirc/logger/ErrorLevel.java

@@ -73,11 +73,7 @@ public enum ErrorLevel {
      * @return true iff the error is more important
      */
     public boolean moreImportant(final ErrorLevel level) {
-        if (level == null) {
-            return false;
-        }
-
-        return ordinal() > level.ordinal();
+        return level != null && ordinal() > level.ordinal();
     }
 
 }

src/com/dmdirc/logger/ProgramError.java

@@ -375,19 +375,10 @@ public final class ProgramError implements Serializable {
         }
 
         final ProgramError other = (ProgramError) obj;
-        if (this.level != other.level) {
-            return false;
-        }
-
-        if (!this.message.equals(other.message)) {
-            return false;
-        }
-
-        if (!Objects.equals(this.exception, other.exception)) {
-            return false;
-        }
+        return this.level == other.level && this.message.equals(other.message) &&
+                Objects.equals(this.exception, other.exception) &&
+                Objects.equals(this.details, other.details);
 
-        return Objects.equals(this.details, other.details);
     }
 
     @Override

src/com/dmdirc/tls/CertificateAction.java

@@ -34,6 +34,6 @@ public enum CertificateAction {
     /** Ignores the problem but does not store the exception. */
     IGNORE_TEMPORARILY,
     /** Adds a permanent exception for the certificate. */
-    IGNORE_PERMANENTLY;
+    IGNORE_PERMANENTLY
 
 }

src/com/dmdirc/tls/CertificateManager.java

@@ -235,7 +235,7 @@ public class CertificateManager implements X509TrustManager {
         try {
             if (certificate.getSubjectAlternativeNames() != null) {
                 for (List<?> entry : certificate.getSubjectAlternativeNames()) {
-                    final int type = ((Integer) entry.get(0)).intValue();
+                    final int type = (Integer) entry.get(0);
 
                     // DNS or IP
                     if ((type == 2 || type == 7) && isMatchingServerName((String) entry.get(1))) {

src/com/dmdirc/ui/WindowManager.java

@@ -300,7 +300,7 @@ public class WindowManager {
             final String name) {
         for (FrameContainer window : windows) {
             if (window instanceof CustomWindow
-                    && ((CustomWindow) window).getName().equals(name)) {
+                    && window.getName().equals(name)) {
                 return window;
             }
         }

src/com/dmdirc/ui/core/newserver/CoreNewServerDialogModel.java

@@ -129,7 +129,7 @@ public class CoreNewServerDialogModel implements NewServerDialogModel, ConfigPro
 
     @Override
     public Validator<List<ConfigProvider>> getProfileListValidator() {
-        return new ListNotEmptyValidator<ConfigProvider>();
+        return new ListNotEmptyValidator<>();
     }
 
     @Override

src/com/dmdirc/ui/core/profiles/CoreProfilesDialogModel.java

@@ -115,7 +115,7 @@ public class CoreProfilesDialogModel implements ProfilesDialogModel {
 
     @Override
     public Validator<List<Profile>> getProfileListValidator() {
-        return new ListNotEmptyValidator<Profile>();
+        return new ListNotEmptyValidator<>();
     }
 
     @Override
@@ -353,7 +353,7 @@ public class CoreProfilesDialogModel implements ProfilesDialogModel {
 
     @Override
     public Validator<List<String>> getSelectedProfileNicknamesValidator() {
-        return new ListNotEmptyValidator<String>();
+        return new ListNotEmptyValidator<>();
     }
 
     @Override

src/com/dmdirc/ui/input/TabCompleterResult.java

@@ -135,7 +135,7 @@ public class TabCompleterResult {
     /** {@inheritDoc} */
     @Override
     public String toString() {
-        final StringBuffer buff = new StringBuffer();
+        final StringBuilder buff = new StringBuilder();
 
         for (String entry : results) {
             if (buff.length() > 0) {

src/com/dmdirc/ui/input/TabCompletionType.java

@@ -38,6 +38,6 @@ public enum TabCompletionType {
     /** Additional results. */
     ADDITIONAL,
     /** Anything else. */
-    OTHER;
+    OTHER
 
 }

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

@@ -151,7 +151,7 @@ public final class Formatter {
                     // Date
                     if (args[i] instanceof String) {
                         // Assume it's a timestamp(?)
-                        res[i] = Long.valueOf(1000 * Long.valueOf((String) args[i]));
+                        res[i] = 1000 * Long.valueOf((String) args[i]);
                     } else {
                         res[i] = args[i];
                     }

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

@@ -146,10 +146,7 @@ public class Line {
     /** {@inheritDoc} */
     @Override
     public boolean equals(final Object obj) {
-        if (obj instanceof Line) {
-            return Arrays.equals(((Line) obj).getLineParts(), getLineParts());
-        }
-        return false;
+        return obj instanceof Line && Arrays.equals(((Line) obj).getLineParts(), getLineParts());
     }
 
     /** {@inheritDoc} */

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

@@ -179,8 +179,8 @@ public class Styliser implements ConfigChangeListener {
     public void addStyledString(final StyledDocument styledDoc,
             final String[] strings, final SimpleAttributeSet attribs) {
         resetAttributes(attribs);
-        for (int i = 0; i < strings.length; i++) {
-            final char[] chars = strings[i].toCharArray();
+        for (String string : strings) {
+            final char[] chars = string.toCharArray();
 
             for (int j = 0; j < chars.length; j++) {
                 if (chars[j] == 65533) {
@@ -189,12 +189,11 @@ public class Styliser implements ConfigChangeListener {
             }
 
             try {
-                final int ooffset = styledDoc.getLength();
-                int offset = ooffset;
+                int offset = styledDoc.getLength();
                 int position = 0;
 
-                final String target = doSmilies(doLinks(new String(chars)
-                        .replaceAll(INTERNAL_CHARS, "")));
+                final String target =
+                        doSmilies(doLinks(new String(chars).replaceAll(INTERNAL_CHARS, "")));
 
                 attribs.addAttribute("DefaultFontFamily", UIManager.getFont("TextPane.font"));
 
@@ -207,8 +206,8 @@ public class Styliser implements ConfigChangeListener {
                     offset += next.length();
 
                     if (position < target.length()) {
-                        position += readControlChars(target.substring(position),
-                                attribs, position == 0);
+                        position += readControlChars(target.substring(position), attribs,
+                                position == 0);
                     }
                 }
             } catch (BadLocationException ex) {

src/com/dmdirc/updater/UpdateChannel.java

@@ -34,6 +34,6 @@ public enum UpdateChannel {
     /** Nightly update chanel. */
     NIGHTLY,
     /** Not an official release (e.g. GIT). */
-    NONE;
+    NONE
 
 }