Java 7 conversions

Change-Id: I0b0f84fee719d5d2ad4ff62864ea340af07192a3
Reviewed-on: http://gerrit.dmdirc.com/2893
Automatic-Compile: DMDirc Build Manager
Reviewed-by: Chris Smith <chris@dmdirc.com>

src/com/dmdirc/Channel.java

@@ -436,12 +436,16 @@ public class Channel extends MessageTarget implements ConfigChangeListener {
     /** {@inheritDoc} */
     @Override
     public void configChanged(final String domain, final String key) {
-        if ("sendwho".equals(key)) {
-            sendWho = getConfigManager().getOptionBool("channel", "sendwho");
-        } else if ("showmodeprefix".equals(key)) {
-            showModePrefix = getConfigManager().getOptionBool("channel", "showmodeprefix");
-        } else if ("shownickcoloursintext".equals(key)) {
-            showColours = getConfigManager().getOptionBool("ui", "shownickcoloursintext");
+        switch (key) {
+            case "sendwho":
+                sendWho = getConfigManager().getOptionBool("channel", "sendwho");
+                break;
+            case "showmodeprefix":
+                showModePrefix = getConfigManager().getOptionBool("channel", "showmodeprefix");
+                break;
+            case "shownickcoloursintext":
+                showColours = getConfigManager().getOptionBool("ui", "shownickcoloursintext");
+                break;
         }
     }
 

src/com/dmdirc/actions/ActionGroup.java

@@ -46,7 +46,7 @@ public class ActionGroup implements Iterable<Action> {
     private static final long serialVersionUID = 1;
 
     /** The actions in this group. */
-    private final List<Action> actions = new ArrayList<Action>();
+    private final List<Action> actions = new ArrayList<>();
 
     /** The name of this action group. */
     private final String name;
@@ -64,8 +64,7 @@ public class ActionGroup implements Iterable<Action> {
     private Version version;
 
     /** A list of settings used by this action group. */
-    private final Map<String, PreferencesSetting> settings
-            = new HashMap<String, PreferencesSetting>();
+    private final Map<String, PreferencesSetting> settings = new HashMap<>();
 
     /**
      * Creates a new instance of ActionGroup.
@@ -219,7 +218,7 @@ public class ActionGroup implements Iterable<Action> {
      * Removes all actions from this group, and removes all meta-data.
      */
     public void clear() {
-        for (Action action : new ArrayList<Action>(actions)) {
+        for (Action action : new ArrayList<>(actions)) {
             remove(action);
         }
 
@@ -245,7 +244,7 @@ public class ActionGroup implements Iterable<Action> {
      * @return A list of actions in this group
      */
     public List<Action> getActions() {
-        return new ArrayList<Action>(actions);
+        return new ArrayList<>(actions);
     }
 
     /**

src/com/dmdirc/actions/ActionModel.java

@@ -57,7 +57,7 @@ public class ActionModel {
     protected String newFormat;
 
     /** The conditions for this action. */
-    protected List<ActionCondition> conditions = new ArrayList<ActionCondition>();
+    protected List<ActionCondition> conditions = new ArrayList<>();
 
     /** The condition tree used for evaluating conditions. */
     protected ConditionTree conditionTree;

src/com/dmdirc/actions/ConditionTree.java

@@ -185,7 +185,7 @@ public class ConditionTree {
      * while parsing the data
      */
     public static ConditionTree parseString(final String string) {
-        final Deque<Object> stack = new ArrayDeque<Object>();
+        final Deque<Object> stack = new ArrayDeque<>();
 
         for (int i = 0; i < string.length(); i++) {
             final char m = string.charAt(i);
@@ -220,7 +220,7 @@ public class ConditionTree {
      * while parsing the data.
      */
     private static ConditionTree parseStack(final Deque<Object> stack) {
-        final Deque<Object> myStack = new ArrayDeque<Object>();
+        final Deque<Object> myStack = new ArrayDeque<>();
 
         while (!stack.isEmpty()) {
             final Object object = stack.poll();
@@ -318,7 +318,7 @@ public class ConditionTree {
      * mismatched.
      */
     private static ConditionTree readBracket(final Deque<Object> stack) {
-        final Deque<Object> tempStack = new ArrayDeque<Object>();
+        final Deque<Object> tempStack = new ArrayDeque<>();
         boolean found = false;
 
         while (!found && !stack.isEmpty()) {

src/com/dmdirc/commandparser/PopupMenu.java

@@ -32,7 +32,7 @@ import java.util.List;
 public class PopupMenu {
 
     /** The items contained within this popup menu. */
-    private final List<PopupMenuItem> items = new ArrayList<PopupMenuItem>();
+    private final List<PopupMenuItem> items = new ArrayList<>();
 
     /**
      * Retrieves a list of items contained within this popup menu.

src/com/dmdirc/commandparser/commands/flags/CommandFlag.java

@@ -43,9 +43,9 @@ public class CommandFlag {
     /** The name of the flag. */
     private final String name;
     /** The list of flags that become enabled if this one is used. */
-    private final List<CommandFlag> enables = new LinkedList<CommandFlag>();
+    private final List<CommandFlag> enables = new LinkedList<>();
     /** The list of flags that become disabled if this one is used. */
-    private final List<CommandFlag> disables = new LinkedList<CommandFlag>();
+    private final List<CommandFlag> disables = new LinkedList<>();
     /** The number of args expected following this flag. */
     private final int immediateArgs;
     /** The number of args expected after flags are finished. */

src/com/dmdirc/commandparser/commands/flags/CommandFlagHandler.java

@@ -40,13 +40,13 @@ import java.util.Map;
 public class CommandFlagHandler {
 
     /** A map of all known flag names to their flag objects. */
-    private final Map<String, CommandFlag> flags = new HashMap<String, CommandFlag>();
+    private final Map<String, CommandFlag> flags = new HashMap<>();
     /** A map of currently enabled flag names to their flag objects. */
-    private final Map<String, CommandFlag> enabledFlags = new HashMap<String, CommandFlag>();
+    private final Map<String, CommandFlag> enabledFlags = new HashMap<>();
     /** A map of currently disabled flag names to their flag objects. */
-    private final Map<String, CommandFlag> disabledFlags = new HashMap<String, CommandFlag>();
+    private final Map<String, CommandFlag> disabledFlags = new HashMap<>();
     /** A map of disabled flag names to the flag objects that caused them to be disabled. */
-    private final Map<String, CommandFlag> disabledBy = new HashMap<String, CommandFlag>();
+    private final Map<String, CommandFlag> disabledBy = new HashMap<>();
 
     /**
      * Creates a new command flag handler which will handle all of the specified
@@ -98,8 +98,8 @@ public class CommandFlagHandler {
             (flag.isEnabled() ? enabledFlags : disabledFlags).put(flag.getName(), flag);
         }
 
-        final Map<CommandFlag, Integer> results = new HashMap<CommandFlag, Integer>();
-        final List<CommandFlag> delayedFlags = new ArrayList<CommandFlag>(flags.size());
+        final Map<CommandFlag, Integer> results = new HashMap<>();
+        final List<CommandFlag> delayedFlags = new ArrayList<>(flags.size());
 
         int offset;
         for (offset = 0; offset < arguments.getArguments().length; offset++) {
@@ -221,7 +221,7 @@ public class CommandFlagHandler {
      * specified flag.
      */
     protected String getEnablers(final CommandFlag flag) {
-        final List<CommandFlag> enablers = new LinkedList<CommandFlag>();
+        final List<CommandFlag> enablers = new LinkedList<>();
 
         for (CommandFlag target : flags.values()) {
             if (target.getEnables().contains(flag)) {

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

@@ -137,7 +137,7 @@ public class Echo extends Command implements IntelligentCommand {
                 || (arg == 3 && context.getPreviousArgs().get(2).equals("--target")
                 && context.getPreviousArgs().get(0).equals("--ts"))) {
 
-            final List<FrameContainer> windowList = new ArrayList<FrameContainer>();
+            final List<FrameContainer> windowList = new ArrayList<>();
             final Server currentServer = context.getWindow().getServer();
 
             //Active window's Children

src/com/dmdirc/logger/ProgramError.java

@@ -248,17 +248,16 @@ public final class ProgramError implements Serializable {
      * Saves this error to disk.
      */
     public void save() {
-        final PrintWriter out = new PrintWriter(getErrorFile(), true);
-        out.println("Date:" + getDate());
-        out.println("Level: " + getLevel());
-        out.println("Description: " + getMessage());
-        out.println("Details:");
-
-        for (String traceLine : getTrace()) {
-            out.println('\t' + traceLine);
+        try (PrintWriter out = new PrintWriter(getErrorFile(), true)) {
+            out.println("Date:" + getDate());
+            out.println("Level: " + getLevel());
+            out.println("Description: " + getMessage());
+            out.println("Details:");
+
+            for (String traceLine : getTrace()) {
+                out.println('\t' + traceLine);
+            }
         }
-
-        out.close();
     }
 
     /**
@@ -304,8 +303,8 @@ public final class ProgramError implements Serializable {
      * Sends this error report to the DMDirc developers.
      */
     public void send() {
-        final Map<String, String> postData = new HashMap<String, String>();
-        List<String> response = new ArrayList<String>();
+        final Map<String, String> postData = new HashMap<>();
+        List<String> response = new ArrayList<>();
         int tries = 0;
 
         String traceString = Arrays.toString(getTrace());

src/com/dmdirc/messages/LastCommandMessageSink.java

@@ -63,7 +63,7 @@ public class LastCommandMessageSink implements MessageSink {
         WritableFrameContainer best = source;
         long besttime = 0;
 
-        final List<FrameContainer> containers = new ArrayList<FrameContainer>();
+        final List<FrameContainer> containers = new ArrayList<>();
 
         containers.add(source.getServer());
         containers.addAll(source.getServer().getChildren());

src/com/dmdirc/plugins/ExportInfo.java

@@ -54,9 +54,7 @@ public class ExportInfo {
             final Class<?> c = pluginInfo.getPluginClassLoader().loadClass(className, false);
             final Plugin p = className.equals(pluginInfo.getMetaData().getMainClass()) ? pluginInfo.getPlugin() : null;
             return new ExportedService(c, methodName, p);
-        } catch (ClassNotFoundException cnfe) {
-            return null;
-        } catch (IllegalArgumentException ex) {
+        } catch (ClassNotFoundException | IllegalArgumentException cnfe) {
             return null;
         }
     }

src/com/dmdirc/plugins/ExportedService.java

@@ -22,6 +22,7 @@
 
 package com.dmdirc.plugins;
 
+import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 
 import lombok.extern.slf4j.Slf4j;
@@ -84,14 +85,11 @@ public class ExportedService {
     public Object execute(final Object... args) {
         try {
             return method.invoke(object, args);
-        } catch (final LinkageError le) {
+        } catch (final LinkageError | IllegalAccessException |
+                IllegalArgumentException | InvocationTargetException le) {
             log.error("Error with exported service calling {}",
                     method, le);
             return null;
-        } catch (final Exception e) {
-            log.error("Error with exported service calling {}",
-                    method, e);
-            return null;
         }
     }
 

src/com/dmdirc/plugins/GlobalClassLoader.java

@@ -35,7 +35,7 @@ import java.util.Map;
 public final class GlobalClassLoader extends ClassLoader {
 
     /** HashMap containing sources of Global class files. */
-    private final Map<String, String> resourcesList = new HashMap<String, String>();
+    private final Map<String, String> resourcesList = new HashMap<>();
 
     /** Plugin Manager that owns this GlobalClassLoader. */
     private final PluginManager manager;

src/com/dmdirc/plugins/PluginClassLoader.java

@@ -211,7 +211,7 @@ public class PluginClassLoader extends ClassLoader {
     protected Enumeration<URL> findResources(final String name)
             throws IOException {
         final URL resource = findResource(name);
-        final List<URL> resources = new ArrayList<URL>();
+        final List<URL> resources = new ArrayList<>();
 
         if (resource != null) {
             resources.add(resource);

src/com/dmdirc/plugins/PluginMetaDataValidator.java

@@ -43,8 +43,7 @@ public class PluginMetaDataValidator {
     private final PluginMetaData metadata;
 
     /** A collection of errors which have been identified. */
-    private final Collection<String> errors
-            = new ArrayList<String>();
+    private final Collection<String> errors = new ArrayList<>();
 
     /**
      * Creates a new metadata validator.

src/com/dmdirc/plugins/Service.java

@@ -37,7 +37,7 @@ public class Service {
     private final String name;
 
     /** List of ServiceProviders that implement this service. */
-    private final List<ServiceProvider> serviceproviders = new ArrayList<ServiceProvider>();
+    private final List<ServiceProvider> serviceproviders = new ArrayList<>();
 
     /**
      * Create a new Service.
@@ -92,7 +92,7 @@ public class Service {
      * @return List of ServiceProvider that provide this service
      */
     public List<ServiceProvider> getProviders() {
-        return new ArrayList<ServiceProvider>(serviceproviders);
+        return new ArrayList<>(serviceproviders);
     }
 
     /**

src/com/dmdirc/tls/CertificateManager.java

@@ -33,11 +33,11 @@ import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileNotFoundException;
 import java.io.IOException;
+import java.security.GeneralSecurityException;
 import java.security.InvalidAlgorithmParameterException;
 import java.security.KeyStore;
 import java.security.KeyStoreException;
 import java.security.NoSuchAlgorithmException;
-import java.security.UnrecoverableKeyException;
 import java.security.cert.CertificateException;
 import java.security.cert.CertificateParsingException;
 import java.security.cert.PKIXParameters;
@@ -80,7 +80,7 @@ public class CertificateManager implements X509TrustManager {
     private final AggregateConfigProvider config;
 
     /** The set of CAs from the global cacert file. */
-    private final Set<X509Certificate> globalTrustedCAs = new HashSet<X509Certificate>();
+    private final Set<X509Certificate> globalTrustedCAs = new HashSet<>();
 
     /** Whether or not to check specified parts of the certificate. */
     private boolean checkDate, checkIssuer, checkHost;
@@ -92,7 +92,7 @@ public class CertificateManager implements X509TrustManager {
     private CertificateAction action;
 
     /** A list of problems encountered most recently. */
-    private final List<CertificateException> problems = new ArrayList<CertificateException>();
+    private final List<CertificateException> problems = new ArrayList<>();
 
     /** The chain of certificates currently being validated. */
     private X509Certificate[] chain;
@@ -131,15 +131,8 @@ public class CertificateManager implements X509TrustManager {
             for (TrustAnchor anchor : params.getTrustAnchors()) {
                 globalTrustedCAs.add(anchor.getTrustedCert());
             }
-        } catch (CertificateException ex) {
-            Logger.userError(ErrorLevel.MEDIUM, "Unable to load trusted certificates", ex);
-        } catch (IOException ex) {
-            Logger.userError(ErrorLevel.MEDIUM, "Unable to load trusted certificates", ex);
-        } catch (InvalidAlgorithmParameterException ex) {
-            Logger.userError(ErrorLevel.MEDIUM, "Unable to load trusted certificates", ex);
-        } catch (KeyStoreException ex) {
-            Logger.userError(ErrorLevel.MEDIUM, "Unable to load trusted certificates", ex);
-        } catch (NoSuchAlgorithmException ex) {
+        } catch (CertificateException | IOException | InvalidAlgorithmParameterException |
+                KeyStoreException | NoSuchAlgorithmException ex) {
             Logger.userError(ErrorLevel.MEDIUM, "Unable to load trusted certificates", ex);
         } finally {
             StreamUtils.close(is);
@@ -175,15 +168,7 @@ public class CertificateManager implements X509TrustManager {
                 return kmf.getKeyManagers();
             } catch (FileNotFoundException ex) {
                 Logger.userError(ErrorLevel.MEDIUM, "Certificate file not found", ex);
-            } catch (KeyStoreException ex) {
-                Logger.appError(ErrorLevel.MEDIUM, "Unable to get key manager", ex);
-            } catch (IOException ex) {
-                Logger.userError(ErrorLevel.MEDIUM, "Unable to get key manager", ex);
-            } catch (CertificateException ex) {
-                Logger.appError(ErrorLevel.MEDIUM, "Unable to get key manager", ex);
-            } catch (NoSuchAlgorithmException ex) {
-                Logger.appError(ErrorLevel.MEDIUM, "Unable to get key manager", ex);
-            } catch (UnrecoverableKeyException ex) {
+            } catch (GeneralSecurityException | IOException ex) {
                 Logger.appError(ErrorLevel.MEDIUM, "Unable to get key manager", ex);
             } finally {
                 StreamUtils.close(fis);
@@ -225,7 +210,7 @@ public class CertificateManager implements X509TrustManager {
                     }
                 }
             }
-        } catch (Exception ex) {
+        } catch (GeneralSecurityException ex) {
            return TrustResult.UNTRUSTED_EXCEPTION;
         }
 
@@ -362,7 +347,7 @@ public class CertificateManager implements X509TrustManager {
                 case DISCONNECT:
                     throw new CertificateException("Not trusted");
                 case IGNORE_PERMANENTY:
-                    final List<String> list = new ArrayList<String>(config
+                    final List<String> list = new ArrayList<>(config
                             .getOptionList("ssl", "trusted"));
                     list.add(Base64.encodeToString(chain[0].getSignature(), false));
                     IdentityManager.getIdentityManager().getUserSettings()
@@ -426,7 +411,7 @@ public class CertificateManager implements X509TrustManager {
      * name
      */
     public static Map<String, String> getDNFieldsFromCert(final X509Certificate cert) {
-        final Map<String, String> res = new HashMap<String, String>();
+        final Map<String, String> res = new HashMap<>();
 
         try {
             final LdapName name = new LdapName(cert.getSubjectX500Principal().getName());

src/com/dmdirc/ui/core/dialogs/sslcertificate/SSLCertificateDialogModel.java

@@ -78,7 +78,7 @@ public class SSLCertificateDialogModel {
      * certificate chain being questioned.
      */
     public List<CertificateChainEntry> getCertificateChain() {
-        final List<CertificateChainEntry> res = new ArrayList<CertificateChainEntry>();
+        final List<CertificateChainEntry> res = new ArrayList<>();
 
         boolean first = true;
 
@@ -109,7 +109,7 @@ public class SSLCertificateDialogModel {
      */
     public List<List<CertificateInformationEntry>> getCertificateInfo(final int index) {
         final List<List<CertificateInformationEntry>> res
-                = new ArrayList<List<CertificateInformationEntry>>();
+                = new ArrayList<>();
         final X509Certificate cert = chain[index];
         List<CertificateInformationEntry> group;
 
@@ -123,7 +123,7 @@ public class SSLCertificateDialogModel {
             tooNew = true;
         }
 
-        group = new ArrayList<CertificateInformationEntry>();
+        group = new ArrayList<>();
         group.add(new CertificateInformationEntry("Valid from",
                 cert.getNotBefore().toString(), tooNew, false));
         group.add(new CertificateInformationEntry("Valid to",
@@ -134,7 +134,7 @@ public class SSLCertificateDialogModel {
         final String names = getAlternateNames(cert);
         final Map<String, String> fields = CertificateManager.getDNFieldsFromCert(cert);
 
-        group = new ArrayList<CertificateInformationEntry>();
+        group = new ArrayList<>();
         addCertField(fields, group, "Common name", "CN", wrongName);
 
         group.add(new CertificateInformationEntry("Alternate names",
@@ -147,7 +147,7 @@ public class SSLCertificateDialogModel {
         addCertField(fields, group, "Country", "C", false);
         res.add(group);
 
-        group = new ArrayList<CertificateInformationEntry>();
+        group = new ArrayList<>();
         group.add(new CertificateInformationEntry("Serial number",
                 cert.getSerialNumber().toString(), false, false));
         group.add(new CertificateInformationEntry("Algorithm",
@@ -217,7 +217,7 @@ public class SSLCertificateDialogModel {
      * @return A list of summary entries
      */
     public List<CertificateSummaryEntry> getSummary() {
-        final List<CertificateSummaryEntry> res = new ArrayList<CertificateSummaryEntry>();
+        final List<CertificateSummaryEntry> res = new ArrayList<>();
 
         boolean outofdate = false, wronghost = false, nottrusted = false;
 

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

@@ -41,7 +41,7 @@ public final class AdditionalTabTargets extends ArrayList<String> {
 
     /** Whether to include normal targets. */
     private List<TabCompletionType> includes
-            = new ArrayList<TabCompletionType>(Arrays.asList(TabCompletionType.values()));
+            = new ArrayList<>(Arrays.asList(TabCompletionType.values()));
 
     /**
      * Determines if the specified type of completion should be used.

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

@@ -472,7 +472,7 @@ public abstract class InputHandler implements ConfigChangeListener {
      * @return A copy of the input backbuffer.
      */
     public List<String> getBackBuffer() {
-        return new ArrayList<String>(buffer.getList());
+        return new ArrayList<>(buffer.getList());
     }
 
     /**

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

@@ -42,7 +42,7 @@ public final class TabCompleterResult {
      * Creates a new instance of TabCompleterResult with an empty result set.
      */
     public TabCompleterResult() {
-        this.results = new ArrayList<String>();
+        this.results = new ArrayList<>();
     }
 
     /**

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

@@ -167,7 +167,7 @@ public class IRCDocumentSearcher {
      * @return List of matches
      */
     private List<LinePosition> searchLine(final int lineNum, final String line) {
-        final List<LinePosition> matches = new ArrayList<LinePosition>();
+        final List<LinePosition> matches = new ArrayList<>();
         final Matcher matcher = Pattern.compile((caseSensitive ? "" : "(?i)")
                 + "\\Q" + phrase + "\\E").matcher(line);
 

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

@@ -41,8 +41,7 @@ public final class IRCTextAttribute extends Attribute {
     private static final long serialVersionUID = 1;
 
     /** table of all instances in this class, used by readResolve. */
-    private static final Map<String, IRCTextAttribute> INSTANCE_MAP
-            = new HashMap<String, IRCTextAttribute>(1);
+    private static final Map<String, IRCTextAttribute> INSTANCE_MAP = new HashMap<>(1);
 
     /**
      * Constructs an Attribute with the given name.

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

@@ -876,14 +876,19 @@ public class Styliser implements ConfigChangeListener {
     /** {@inheritDoc} */
     @Override
     public void configChanged(final String domain, final String key) {
-        if ("stylelinks".equals(key)) {
-            styleURIs = configManager.getOptionBool("ui", "stylelinks");
-        } else if ("stylechannels".equals(key)) {
-            styleChannels = configManager.getOptionBool("ui", "stylechannels");
-        } else if ("linkcolour".equals(key)) {
-            uriColour = configManager.getOptionColour("ui", "linkcolour");
-        } else if ("channelcolour".equals(key)) {
-            channelColour = configManager.getOptionColour("ui", "channelcolour");
+        switch (key) {
+            case "stylelinks":
+                styleURIs = configManager.getOptionBool("ui", "stylelinks");
+                break;
+            case "stylechannels":
+                styleChannels = configManager.getOptionBool("ui", "stylechannels");
+                break;
+            case "linkcolour":
+                uriColour = configManager.getOptionColour("ui", "linkcolour");
+                break;
+            case "channelcolour":
+                channelColour = configManager.getOptionColour("ui", "channelcolour");
+                break;
         }
     }
 

src/com/dmdirc/updater/checking/DMDircCheckStrategy.java

@@ -57,8 +57,7 @@ public class DMDircCheckStrategy implements UpdateCheckStrategy {
     /** {@inheritDoc} */
     @Override
     public Map<UpdateComponent, UpdateCheckResult> checkForUpdates(final Collection<UpdateComponent> components) {
-        final Map<UpdateComponent, UpdateCheckResult> res
-                = new HashMap<UpdateComponent, UpdateCheckResult>();
+        final Map<UpdateComponent, UpdateCheckResult> res = new HashMap<>();
         final Map<String, UpdateComponent> names = getComponentsByName(components);
 
         try {
@@ -139,15 +138,17 @@ public class DMDircCheckStrategy implements UpdateCheckStrategy {
     private UpdateCheckResult parseResponse(final UpdateComponent component,
             final String line) {
         final String[] parts = line.split(" ");
-
-        if ("outofdate".equals(parts[0])) {
-            return parseOutOfDateResponse(component, parts);
-        } else if ("uptodate".equals(parts[0])) {
-            return new BaseCheckResult(component);
-        } else if ("error".equals(parts[0])) {
-            log.warn("Error received from update server: {}", line);
-        } else {
-            log.error("Unknown update line received from server: {}", line);
+        switch (parts[0]) {
+            case "outofdate":
+                return parseOutOfDateResponse(component, parts);
+            case "uptodate":
+                return new BaseCheckResult(component);
+            case "error":
+                log.warn("Error received from update server: {}", line);
+                break;
+            default:
+                log.error("Unknown update line received from server: {}", line);
+                break;
         }
 
         return null;
@@ -181,7 +182,7 @@ public class DMDircCheckStrategy implements UpdateCheckStrategy {
      * which the component's name as a key and the component itself as a value.
      */
     private Map<String, UpdateComponent> getComponentsByName(final Collection<UpdateComponent> components) {
-        final Map<String, UpdateComponent> res = new HashMap<String, UpdateComponent>();
+        final Map<String, UpdateComponent> res = new HashMap<>();
 
         for (UpdateComponent component : components) {
             res.put(component.getName(), component);

src/com/dmdirc/updater/checking/NaiveConsolidator.java

@@ -38,8 +38,7 @@ public class NaiveConsolidator implements CheckResultConsolidator {
     @Override
     public Map<UpdateComponent, UpdateCheckResult> consolidate(
             final Collection<Map<UpdateComponent, UpdateCheckResult>> results) {
-        final Map<UpdateComponent, UpdateCheckResult> res
-                = new HashMap<UpdateComponent, UpdateCheckResult>();
+        final Map<UpdateComponent, UpdateCheckResult> res = new HashMap<>();
 
         for (Map<UpdateComponent, UpdateCheckResult> set : results) {
             for (Map.Entry<UpdateComponent, UpdateCheckResult> entry : set.entrySet()) {

src/com/dmdirc/util/resourcemanager/DMDircResourceManager.java

@@ -38,6 +38,10 @@ import java.net.URLDecoder;
  */
 public class DMDircResourceManager {
 
+    private DMDircResourceManager() {
+        //Prevent instantiation
+    }
+
     /**
      * Returns the working directory for the application.
      *
@@ -57,8 +61,7 @@ public class DMDircResourceManager {
      */
     public static String getWorkingDirectoryString(final URL mainClassURL) {
         try {
-            return URLDecoder.decode(
-                    getWorkingDirectoryURL(mainClassURL).getPath(), "UTF-8");
+            return URLDecoder.decode(getWorkingDirectoryURL(mainClassURL).getPath(), "UTF-8");
         } catch (UnsupportedEncodingException ex) {
             Logger.userError(ErrorLevel.MEDIUM, "Unable to decode path");
         }
@@ -86,8 +89,7 @@ public class DMDircResourceManager {
      * @return URL of client folder file or null
      */
     protected static URL getFileURL() {
-        return Thread.currentThread().getContextClassLoader()
-                    .getResource("");
+        return Thread.currentThread().getContextClassLoader().getResource("");
     }
 
     /**
@@ -99,11 +101,9 @@ public class DMDircResourceManager {
      */
     protected static URL getJarURL(final URL mainClassURL) {
         try {
-            return new URI(mainClassURL.getPath()
-                    .substring(0,mainClassURL.getPath().indexOf("!/"))).toURL();
-        } catch(MalformedURLException ex) {
-            return null;
-        } catch (URISyntaxException ex) {
+            return new URI(mainClassURL.getPath().substring(0, mainClassURL.getPath()
+                    .indexOf("!/"))).toURL();
+        } catch (MalformedURLException | URISyntaxException ex) {
             return null;
         }
     }
@@ -115,7 +115,7 @@ public class DMDircResourceManager {
      */
     public static boolean isRunningFromJar() {
         return isRunningFromJar(Thread.currentThread().getContextClassLoader().
-                        getResource("com/dmdirc/Main.class"));
+                getResource("com/dmdirc/Main.class"));
 
     }
 

src/com/dmdirc/util/resourcemanager/FileResourceManager.java

@@ -145,7 +145,7 @@ public final class FileResourceManager extends ResourceManager {
     public Map<String, byte[]> getResourcesEndingWithAsBytes(
             final String resourcesSuffix) {
         final List<File> files = getFileListing(new File(basePath));
-        final Map<String, byte[]> resources = new HashMap<String, byte[]>();
+        final Map<String, byte[]> resources = new HashMap<>();
 
         for (File file : files) {
             final String path = file.getPath().substring(basePath.length(),
@@ -163,7 +163,7 @@ public final class FileResourceManager extends ResourceManager {
     public Map<String, byte[]> getResourcesStartingWithAsBytes(
             final String resourcesPrefix) {
         final List<File> files = getFileListing(new File(basePath));
-        final Map<String, byte[]> resources = new HashMap<String, byte[]>();
+        final Map<String, byte[]> resources = new HashMap<>();
 
         for (File file : files) {
             final String path = file.getPath().substring(basePath.length(),
@@ -181,7 +181,7 @@ public final class FileResourceManager extends ResourceManager {
     public Map<String, InputStream> getResourcesStartingWithAsInputStreams(
             final String resourcesPrefix) {
         final List<File> files = getFileListing(new File(basePath));
-        final Map<String, InputStream> resources = new HashMap<String, InputStream>();
+        final Map<String, InputStream> resources = new HashMap<>();
 
         for (File file : files) {
             final String path = file.getPath().substring(basePath.length(),
@@ -198,7 +198,7 @@ public final class FileResourceManager extends ResourceManager {
     @Override
     public List<String> getResourcesStartingWith(final String resourcesPrefix) {
         final List<File> files = getFileListing(new File(basePath));
-        final List<String> resources = new ArrayList<String>();
+        final List<String> resources = new ArrayList<>();
 
         for (File file : files) {
             final String path = file.getPath().substring(basePath.length(),
@@ -219,7 +219,7 @@ public final class FileResourceManager extends ResourceManager {
      * @return Recursive directory listing
      */
     private static List<File> getFileListing(final File startingDirectory) {
-        final List<File> result = new ArrayList<File>();
+        final List<File> result = new ArrayList<>();
 
         if (startingDirectory.listFiles() == null) {
             return result;

src/com/dmdirc/util/resourcemanager/ZipResourceManager.java

@@ -77,7 +77,7 @@ public final class ZipResourceManager extends ResourceManager {
     protected ZipResourceManager(final ZipFile file) {
         super();
         zipFile = file;
-        entries = new ArrayList<String>();
+        entries = new ArrayList<>();
         final Enumeration<? extends ZipEntry> zipEntries = zipFile.entries();
         while (zipEntries.hasMoreElements()) {
             entries.add(zipEntries.nextElement().getName());
@@ -169,7 +169,7 @@ public final class ZipResourceManager extends ResourceManager {
     @Override
     public Map<String, byte[]> getResourcesEndingWithAsBytes(
             final String resourcesSuffix) {
-        final Map<String, byte[]> resources = new HashMap<String, byte[]>();
+        final Map<String, byte[]> resources = new HashMap<>();
 
         for (String entry : entries) {
             if (entry.endsWith(resourcesSuffix)) {
@@ -184,7 +184,7 @@ public final class ZipResourceManager extends ResourceManager {
     @Override
     public Map<String, byte[]> getResourcesStartingWithAsBytes(
             final String resourcesPrefix) {
-        final Map<String, byte[]> resources = new HashMap<String, byte[]>();
+        final Map<String, byte[]> resources = new HashMap<>();
 
         for (String entry : entries) {
             if (entry.startsWith(resourcesPrefix)) {
@@ -200,7 +200,7 @@ public final class ZipResourceManager extends ResourceManager {
     public Map<String, InputStream> getResourcesStartingWithAsInputStreams(
             final String resourcesPrefix) {
         final Map<String, InputStream> resources =
-                new HashMap<String, InputStream>();
+                new HashMap<>();
 
         for (String entry : entries) {
             if (entry.startsWith(resourcesPrefix)) {
@@ -214,7 +214,7 @@ public final class ZipResourceManager extends ResourceManager {
     /** {@inheritDoc} */
     @Override
     public List<String> getResourcesStartingWith(final String resourcesPrefix) {
-        final List<String> resources = new ArrayList<String>();
+        final List<String> resources = new ArrayList<>();
 
         for (String entry : entries) {
             if (entry.startsWith(resourcesPrefix)) {

test/com/dmdirc/actions/ActionComparisonNamesTest.java

@@ -51,7 +51,7 @@ public class ActionComparisonNamesTest {
 
     @Parameterized.Parameters
     public static List<Object[]> data() {
-        final List<Object[]> res = new LinkedList<Object[]>();
+        final List<Object[]> res = new LinkedList<>();
 
         for (ActionComparison comp : CoreActionComparison.values()) {
             res.add(new Object[]{comp});

test/com/dmdirc/actions/validators/ActionNameValidatorTest.java

@@ -35,7 +35,7 @@ import static org.mockito.Mockito.*;
 public class ActionNameValidatorTest {
 
     private ActionGroup getGroup() {
-        final List<Action> actions = new ArrayList<Action>();
+        final List<Action> actions = new ArrayList<>();
         final Action action1 = mock(Action.class);
         final Action action2 = mock(Action.class);
         final ActionGroup group = mock(ActionGroup.class);

test/com/dmdirc/updater/checking/NaiveConsolidatorTest.java

@@ -45,9 +45,9 @@ public class NaiveConsolidatorTest {
     @Before
     public void setUp() {
         consolidator = new NaiveConsolidator();
-        components = new ArrayList<UpdateComponent>();
-        positiveResults = new ArrayList<UpdateCheckResult>();
-        negativeResults = new ArrayList<UpdateCheckResult>();
+        components = new ArrayList<>();
+        positiveResults = new ArrayList<>();
+        negativeResults = new ArrayList<>();
 
         for (int i = 0; i < 4; i++) {
             final UpdateComponent component = mock(UpdateComponent.class);
@@ -67,11 +67,11 @@ public class NaiveConsolidatorTest {
     @Test
     public void testIncludesAllComponentsFromAllMaps() {
         final Map<UpdateComponent, UpdateCheckResult> map1
-                = new HashMap<UpdateComponent, UpdateCheckResult>();
+                = new HashMap<>();
         final Map<UpdateComponent, UpdateCheckResult> map2
-                = new HashMap<UpdateComponent, UpdateCheckResult>();
+                = new HashMap<>();
         final List<Map<UpdateComponent, UpdateCheckResult>> maps
-                = new ArrayList<Map<UpdateComponent, UpdateCheckResult>>();
+                = new ArrayList<>();
 
         map1.put(components.get(0), negativeResults.get(0));
         map1.put(components.get(1), negativeResults.get(1));
@@ -90,11 +90,11 @@ public class NaiveConsolidatorTest {
     @Test
     public void testIncludesPositiveResultsForKnownNegativeComponents() {
         final Map<UpdateComponent, UpdateCheckResult> map1
-                = new HashMap<UpdateComponent, UpdateCheckResult>();
+                = new HashMap<>();
         final Map<UpdateComponent, UpdateCheckResult> map2
-                = new HashMap<UpdateComponent, UpdateCheckResult>();
+                = new HashMap<>();
         final List<Map<UpdateComponent, UpdateCheckResult>> maps
-                = new ArrayList<Map<UpdateComponent, UpdateCheckResult>>();
+                = new ArrayList<>();
 
         map1.put(components.get(0), negativeResults.get(0));
         map1.put(components.get(1), negativeResults.get(1));
@@ -112,11 +112,11 @@ public class NaiveConsolidatorTest {
     @Test
     public void testIgnoresNegativeResultsForKnownPositiveComponents() {
         final Map<UpdateComponent, UpdateCheckResult> map1
-                = new HashMap<UpdateComponent, UpdateCheckResult>();
+                = new HashMap<>();
         final Map<UpdateComponent, UpdateCheckResult> map2
-                = new HashMap<UpdateComponent, UpdateCheckResult>();
+                = new HashMap<>();
         final List<Map<UpdateComponent, UpdateCheckResult>> maps
-                = new ArrayList<Map<UpdateComponent, UpdateCheckResult>>();
+                = new ArrayList<>();
 
         map1.put(components.get(0), negativeResults.get(0));
         map1.put(components.get(1), positiveResults.get(1));