Minor tidying and inspection fiddling.

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

.idea/inspectionProfiles/Project_Default.xml

@@ -3,7 +3,13 @@
     <option name="myName" value="Project Default" />
     <option name="myLocal" value="false" />
     <inspection_tool class="AbstractMethodCallInConstructor" enabled="true" level="WARNING" enabled_by_default="true" />
-    <inspection_tool class="AccessToStaticFieldLockedOnInstance" enabled="true" level="WARNING" enabled_by_default="true" />
+    <inspection_tool class="AccessToStaticFieldLockedOnInstance" enabled="true" level="WARNING" enabled_by_default="true">
+      <option name="ignoredClasses">
+        <set>
+          <option value="org.slf4j.Logger" />
+        </set>
+      </option>
+    </inspection_tool>
     <inspection_tool class="AnonymousClassComplexity" enabled="true" level="WARNING" enabled_by_default="true">
       <option name="m_limit" value="3" />
     </inspection_tool>
@@ -39,7 +45,6 @@
     <inspection_tool class="CastThatLosesPrecision" enabled="true" level="WARNING" enabled_by_default="true">
       <option name="ignoreIntegerCharCasts" value="false" />
     </inspection_tool>
-    <inspection_tool class="CastToConcreteClass" enabled="true" level="WARNING" enabled_by_default="true" />
     <inspection_tool class="CastToIncompatibleInterface" enabled="true" level="WARNING" enabled_by_default="true" />
     <inspection_tool class="ChainedEquality" enabled="true" level="WARNING" enabled_by_default="true" />
     <inspection_tool class="ChannelResource" enabled="true" level="WARNING" enabled_by_default="true">
@@ -244,7 +249,7 @@
     <inspection_tool class="ThisEscapedInConstructor" enabled="true" level="WARNING" enabled_by_default="true" />
     <inspection_tool class="ThreadWithDefaultRunMethod" enabled="true" level="WARNING" enabled_by_default="true" />
     <inspection_tool class="ThrowablePrintStackTrace" enabled="true" level="WARNING" enabled_by_default="true" />
-    <inspection_tool class="TodoComment" enabled="true" level="INFO" enabled_by_default="true" />
+    <inspection_tool class="TodoComment" enabled="false" level="INFO" enabled_by_default="false" />
     <inspection_tool class="TooBroadScope" enabled="true" level="WARNING" enabled_by_default="true">
       <option name="m_allowConstructorAsInitializer" value="false" />
       <option name="m_onlyLookAtBlocks" value="false" />

.idea/misc.xml

@@ -2,10 +2,11 @@
 <project version="4">
   <component name="EntryPointsManager">
     <entry_points version="2.0" />
-    <list size="3">
-      <item index="0" class="java.lang.String" itemvalue="com.google.common.eventbus.Subscribe" />
-      <item index="1" class="java.lang.String" itemvalue="dagger.Provides" />
-      <item index="2" class="java.lang.String" itemvalue="net.engio.mbassy.listener.Handler" />
+    <list size="4">
+      <item index="0" class="java.lang.String" itemvalue="com.dmdirc.config.ConfigBinding" />
+      <item index="1" class="java.lang.String" itemvalue="com.google.common.eventbus.Subscribe" />
+      <item index="2" class="java.lang.String" itemvalue="dagger.Provides" />
+      <item index="3" class="java.lang.String" itemvalue="net.engio.mbassy.listener.Handler" />
     </list>
   </component>
   <component name="NullableNotNullManager">

src/com/dmdirc/Channel.java

@@ -418,7 +418,7 @@ public class Channel extends MessageTarget implements GroupChat {
                     + " null ChannelClientInfo");
         }
 
-        final String[] res = new String[]{
+        final String[] res = {
             getModes(client),
             Styliser.CODE_NICKNAME + client.getClient().getNickname() + Styliser.CODE_NICKNAME,
             client.getClient().getUsername(),
@@ -428,10 +428,10 @@ public class Channel extends MessageTarget implements GroupChat {
             final Map<?, ?> map = client.getMap();
 
             if (map.containsKey(ChannelClientProperty.TEXT_FOREGROUND)) {
-                String prefix;
+                final String prefix;
 
                 if (map.containsKey(ChannelClientProperty.TEXT_BACKGROUND)) {
-                    prefix = "," + ColourManager.getHex((Colour) map.get(
+                    prefix = ',' + ColourManager.getHex((Colour) map.get(
                             ChannelClientProperty.TEXT_BACKGROUND));
                 } else {
                     prefix = Styliser.CODE_HEXCOLOUR + ColourManager.getHex((Colour) map.get(

src/com/dmdirc/Query.java

@@ -265,7 +265,7 @@ public class Query extends MessageTarget implements PrivateActionListener,
 
             addLine(format, oldNick, client.getUsername(),
                     client.getHostname(), client.getNickname());
-            host = client.getNickname() + "!" + client.getUsername() + "@" + client.getHostname();
+            host = client.getNickname() + '!' + client.getUsername() + '@' + client.getHostname();
             nickname = client.getNickname();
             updateTitle();
 

src/com/dmdirc/Server.java

@@ -67,8 +67,12 @@ import com.dmdirc.ui.input.TabCompletionType;
 import com.dmdirc.ui.messages.Formatter;
 import com.dmdirc.util.URLBuilder;
 
+import java.net.NoRouteToHostException;
+import java.net.SocketException;
+import java.net.SocketTimeoutException;
 import java.net.URI;
 import java.net.URISyntaxException;
+import java.net.UnknownHostException;
 import java.security.cert.CertificateException;
 import java.security.cert.X509Certificate;
 import java.util.ArrayList;
@@ -80,7 +84,6 @@ import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Random;
-import java.util.Set;
 import java.util.concurrent.ConcurrentSkipListMap;
 import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.ScheduledFuture;
@@ -89,6 +92,7 @@ import java.util.concurrent.locks.ReadWriteLock;
 import java.util.concurrent.locks.ReentrantReadWriteLock;
 
 import javax.annotation.Nonnull;
+import javax.net.ssl.SSLException;
 import javax.net.ssl.TrustManager;
 
 import org.slf4j.LoggerFactory;
@@ -146,7 +150,7 @@ public class Server extends FrameContainer implements ConfigChangeListener,
     /** A list of outstanding invites. */
     private final List<Invite> invites = new ArrayList<>();
     /** A set of channels we want to join without focusing. */
-    private final Set<String> backgroundChannels = new HashSet<>();
+    private final Collection<String> backgroundChannels = new HashSet<>();
     /** Our ignore list. */
     private final IgnoreList ignoreList = new IgnoreList();
     /** Our string convertor. */
@@ -936,14 +940,14 @@ public class Server extends FrameContainer implements ConfigChangeListener,
         boolean isTLD = false;
 
         for (String tld : tlds) {
-            if (serverName.endsWith("." + tld)) {
+            if (serverName.endsWith('.' + tld)) {
                 isTLD = true;
                 break;
             }
         }
 
         if (isTLD && parts.length > 2) {
-            return parts[parts.length - 2] + "." + parts[parts.length - 1];
+            return parts[parts.length - 2] + '.' + parts[parts.length - 1];
         } else if (parts.length > 2) {
             final StringBuilder network = new StringBuilder();
 
@@ -1038,13 +1042,13 @@ public class Server extends FrameContainer implements ConfigChangeListener,
 
     @Override
     public void sendCTCPReply(final String source, final String type, final String args) {
-        if (type.equalsIgnoreCase("VERSION")) {
+        if ("VERSION".equalsIgnoreCase(type)) {
             parser.sendCTCPReply(source, "VERSION", "DMDirc "
                     + getConfigManager().getOption("version", "version")
                     + " - http://www.dmdirc.com/");
-        } else if (type.equalsIgnoreCase("PING")) {
+        } else if ("PING".equalsIgnoreCase(type)) {
             parser.sendCTCPReply(source, "PING", args);
-        } else if (type.equalsIgnoreCase("CLIENTINFO")) {
+        } else if ("CLIENTINFO".equalsIgnoreCase(type)) {
             parser.sendCTCPReply(source, "CLIENTINFO", "VERSION PING CLIENTINFO");
         }
     }
@@ -1054,7 +1058,7 @@ public class Server extends FrameContainer implements ConfigChangeListener,
         try {
             parserLock.readLock().lock();
             return hasChannel(channelName)
-                    || (parser != null && parser.isValidChannelName(channelName));
+                    || parser != null && parser.isValidChannelName(channelName);
         } finally {
             parserLock.readLock().unlock();
         }
@@ -1088,7 +1092,7 @@ public class Server extends FrameContainer implements ConfigChangeListener,
 
             try {
                 parserLock.readLock().lock();
-                final Object[] arguments = new Object[]{
+                final Object[] arguments = {
                     address.getHost(), parser == null ? "Unknown" : parser.getServerName(),
                     address.getPort(), parser == null ? "Unknown" : getNetwork(),
                     parser == null ? "Unknown" : parser.getLocalClient().getNickname(),};
@@ -1155,7 +1159,7 @@ public class Server extends FrameContainer implements ConfigChangeListener,
         if (numeric < 10) {
             snumeric = "00" + snumeric;
         } else if (numeric < 100) {
-            snumeric = "0" + snumeric;
+            snumeric = '0' + snumeric;
         }
 
         final String sansIrcd = "numeric_" + snumeric;
@@ -1277,21 +1281,21 @@ public class Server extends FrameContainer implements ConfigChangeListener,
 
             updateIcon();
 
-            String description;
+            final String description;
 
             if (errorInfo.getException() == null) {
                 description = errorInfo.getData();
             } else {
                 final Exception exception = errorInfo.getException();
 
-                if (exception instanceof java.net.UnknownHostException) {
+                if (exception instanceof UnknownHostException) {
                     description = "Unknown host (unable to resolve)";
-                } else if (exception instanceof java.net.NoRouteToHostException) {
+                } else if (exception instanceof NoRouteToHostException) {
                     description = "No route to host";
-                } else if (exception instanceof java.net.SocketTimeoutException) {
+                } else if (exception instanceof SocketTimeoutException) {
                     description = "Connection attempt timed out";
-                } else if (exception instanceof java.net.SocketException
-                        || exception instanceof javax.net.ssl.SSLException) {
+                } else if (exception instanceof SocketException
+                        || exception instanceof SSLException) {
                     description = exception.getMessage();
                 } else {
                     Logger.appError(ErrorLevel.LOW, "Unknown socket error: "
@@ -1318,7 +1322,7 @@ public class Server extends FrameContainer implements ConfigChangeListener,
     public void onPingFailed() {
         statusBarManager.setMessage(new StatusMessage(
                 "No ping reply from " + getName() + " for over "
-                + ((int) (Math.floor(parser.getPingTime() / 1000.0)))
+                + (int) Math.floor(parser.getPingTime() / 1000.0)
                 + " seconds.", getConfigManager()));
 
         getEventBus().publishAsync(new ServerNopingEvent(this, parser.getPingTime()));
@@ -1412,8 +1416,8 @@ public class Server extends FrameContainer implements ConfigChangeListener,
                 missing.append(missingUmodes);
             }
 
-            Logger.appError(ErrorLevel.LOW, missing.toString() + " ["
-                    + parser.getServerSoftwareType() + "]",
+            Logger.appError(ErrorLevel.LOW, missing + " ["
+                    + parser.getServerSoftwareType() + ']',
                     new MissingModeAliasException(getNetwork(), parser,
                             getConfigManager().getOption("identity",
                                     "modealiasversion"), missing.toString()));
@@ -1547,8 +1551,8 @@ public class Server extends FrameContainer implements ConfigChangeListener,
 
     @Override
     public void updateAwayState(final String message) {
-        if ((awayMessage != null && awayMessage.equals(message))
-                || (awayMessage == null && message == null)) {
+        if (awayMessage != null && awayMessage.equals(message)
+                || awayMessage == null && message == null) {
             return;
         }
 

src/com/dmdirc/ServerStatus.java

@@ -104,7 +104,7 @@ public class ServerStatus {
         builder.append('→');
         builder.append(toState.name());
         builder.append(' ');
-        builder.append(Thread.currentThread().getStackTrace()[3].toString());
+        builder.append(Thread.currentThread().getStackTrace()[3]);
         builder.append(" [");
         builder.append(Thread.currentThread().getName());
         builder.append("] (parser #");
@@ -117,7 +117,7 @@ public class ServerStatus {
     /**
      * Retrieves the transition history of this status object as a string.
      *
-     * @see #addHistoryEntry(com.dmdirc.ServerState, com.dmdirc.ServerState)
+     * @see #addHistoryEntry(ServerState, ServerState)
      * @return A line feed ('\n') delimited string containing one entry for each of the entries in
      *         this status's transition history.
      */