PMD fixes for util

Change-Id: I3fb69847901bb13d9906c10dbae67d1d437daced
Reviewed-on: http://gerrit.dmdirc.com/1702
Automatic-Compile: DMDirc Local Commits <dmdirc@googlemail.com>
Reviewed-by: Chris Smith <chris@dmdirc.com>

src/com/dmdirc/util/ConfigFile.java

@@ -23,7 +23,6 @@
 package com.dmdirc.util;
 
 import java.io.File;
-import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.io.InputStream;
 import java.nio.charset.Charset;
@@ -44,7 +43,8 @@ public class ConfigFile extends TextFile {
     private final List<String> domains = new ArrayList<String>();
 
     /** The values associated with each flat domain. */
-    private final MapList<String, String> flatdomains = new MapList<String, String>();
+    private final MapList<String, String> flatdomains
+            = new MapList<String, String>();
 
     /** The key/value sets associated with each key domain. */
     private final Map<String, Map<String, String>> keydomains
@@ -162,7 +162,8 @@ public class ConfigFile extends TextFile {
         final List<String> lines = new ArrayList<String>();
 
         lines.add("# This is a DMDirc configuration file.");
-        lines.add("# Written on: " + new GregorianCalendar().getTime().toString());
+        lines.add("# Written on: " + new GregorianCalendar().getTime()
+                .toString());
 
         writeMeta(lines);
 
@@ -180,7 +181,8 @@ public class ConfigFile extends TextFile {
                     lines.add("  " + escape(entry));
                 }
             } else {
-                for (Map.Entry<String, String> entry : keydomains.get(domain).entrySet()) {
+                for (Map.Entry<String, String> entry : keydomains.get(domain)
+                        .entrySet()) {
                     lines.add("  " + escape(entry.getKey()) + "="
                             + escape(entry.getValue()));
                 }
@@ -197,8 +199,10 @@ public class ConfigFile extends TextFile {
      */
     private void writeMeta(final List<String> lines) {
         lines.add("");
-        lines.add("# This section indicates which sections below take key/value");
-        lines.add("# pairs, rather than a simple list. It should be placed above");
+        lines.add("# This section indicates which sections below take "
+                + "key/value");
+        lines.add("# pairs, rather than a simple list. It should be "
+                + "placed above");
         lines.add("# any sections that take key/values.");
         lines.add("keysections:");
 
@@ -252,7 +256,8 @@ public class ConfigFile extends TextFile {
      * @return True if the domain is known, false otherwise
      */
     public boolean hasDomain(final String domain) {
-        return keydomains.containsKey(domain) || flatdomains.containsKey(domain);
+        return keydomains.containsKey(domain)
+                || flatdomains.containsKey(domain);
     }
 
     /**

src/com/dmdirc/util/DownloadListener.java

@@ -38,7 +38,8 @@ public interface DownloadListener {
     void downloadProgress(float percent);
     
     /**
-     * Called to notify the listener if this download has an indeterminate length.
+     * Called to notify the listener if this download has an indeterminate
+     * length.
      * 
      * @param indeterminate true or false
      * 

src/com/dmdirc/util/Downloader.java

@@ -83,7 +83,8 @@ public final class Downloader {
         BufferedReader in = null;
 
         try {
-            in = new BufferedReader(new InputStreamReader(urlConn.getInputStream()));
+            in = new BufferedReader(new InputStreamReader(
+                    urlConn.getInputStream()));
 
             String line;
 
@@ -110,7 +111,8 @@ public final class Downloader {
      * @throws java.net.MalformedURLException If the URL is malformed
      * @throws java.io.IOException If there's an I/O error while downloading
      */
-    public static List<String> getPage(final String url, final Map<String, String> postData)
+    public static List<String> getPage(final String url,
+            final Map<String, String> postData)
             throws MalformedURLException, IOException {
         final StringBuilder data = new StringBuilder();
 
@@ -174,7 +176,8 @@ public final class Downloader {
                     output.write(buffer, 0, count);
 
                     if (listener != null && length != -1) {
-                        listener.downloadProgress(100 * (float) current / length);
+                        listener.downloadProgress(100 * (float) current
+                                / length);
                     }
                 }
             } while (count > 0);
@@ -193,7 +196,8 @@ public final class Downloader {
      * @throws java.net.MalformedURLException If the specified URL is malformed
      * @throws java.io.IOException If an I/O exception occurs while connecting
      */
-    private static URLConnection getConnection(final String url, final String postData)
+    private static URLConnection getConnection(final String url,
+            final String postData)
             throws MalformedURLException, IOException {
         final URL myUrl = new URL(url);
         final URLConnection urlConn = myUrl.openConnection();
@@ -204,7 +208,8 @@ public final class Downloader {
         urlConn.setConnectTimeout(10000);
 
         if (postData.length() > 0) {
-            urlConn.setRequestProperty("Content-Type", "application/x-www-form-urlencoded");
+            urlConn.setRequestProperty("Content-Type",
+                    "application/x-www-form-urlencoded");
 
             DataOutputStream out = null;
 

src/com/dmdirc/util/EquatableWeakReference.java

@@ -39,13 +39,13 @@ public class EquatableWeakReference<T> extends WeakReference<T> {
      * 
      * @param referent The object that this weak reference should reference.
      */
-    public EquatableWeakReference(T referent) {
+    public EquatableWeakReference(final T referent) {
         super(referent);
     }
 
     /** {@inheritDoc} */
     @Override
-    public boolean equals(Object obj) {
+    public boolean equals(final Object obj) {
         if (obj instanceof Reference<?>) {
             return get().equals(((Reference<?>) obj).get());
         } else {

src/com/dmdirc/util/InvalidConfigFileException.java

@@ -40,7 +40,7 @@ public class InvalidConfigFileException extends Exception {
      * 
      * @param string A description of the exception that occured.
      */
-    public InvalidConfigFileException(String string) {
+    public InvalidConfigFileException(final String string) {
         super(string);
     }
 

src/com/dmdirc/util/RollingList.java

@@ -36,15 +36,12 @@ public class RollingList<T> {
    
     /** The items in this rolling list. */
     private final List<T> items = new ArrayList<T>();
-    
     /** The maximum capacity of this list. */
     private final int capacity;
-    
+    /** Whether or not to add a fake empty item to the end of this list. */
+    private final boolean addEmpty;
     /** This list's position pointer. */
     private int position = 0;
-    
-    /** Whether or not to add a fake empty item to the end of this list. */
-    private boolean addEmpty;
     /** The "empty" item to be added. */
     private T empty;
     
@@ -75,9 +72,10 @@ public class RollingList<T> {
      * Removes the specified element from this list.
      * 
      * @param o The object to be removed from the list.
-     * @return True if the list contained the specified element, false otherwise.
+     * @return True if the list contained the specified element,
+     * false otherwise.
      */
-    public boolean remove(final Object o) {
+    public boolean remove(final T o) {
         return items.remove(o);
     }
 
@@ -106,7 +104,7 @@ public class RollingList<T> {
      * @param o The object to be checked
      * @return True if this list contains the item, false otherwise.
      */
-    public boolean contains(final Object o) {
+    public boolean contains(final T o) {
         return items.contains(o);
     }
 
@@ -125,7 +123,7 @@ public class RollingList<T> {
      * @param e The element to be added to the list.
      * @return True
      */
-    public boolean add(T e) {
+    public boolean add(final T e) {
         while (items.size() > capacity - 1) {
             items.remove(0);
             position--;
@@ -148,17 +146,19 @@ public class RollingList<T> {
      * 
      * @param position The new position
      */
-    public void setPosition(int position) {
+    public void setPosition(final int position) {
         this.position = position;
     }    
     
     /**
-     * Determines if there is an element after the positional pointer of the list.
+     * Determines if there is an element after the positional pointer of
+     * the list.
      * 
      * @return True if there is an element, false otherwise.
      */
     public boolean hasNext() {
-        return (items.size() > position + 1) || ((items.size() > position) && addEmpty);
+        return (items.size() > position + 1) || ((items.size() > position)
+                && addEmpty);
     }
     
     /**
@@ -176,7 +176,8 @@ public class RollingList<T> {
     }
     
     /**
-     * Determines if there is an element befpre the positional pointer of the list.
+     * Determines if there is an element befpre the positional pointer of
+     * the list.
      * 
      * @return True if there is an element, false otherwise.
      */    

src/com/dmdirc/util/WeakList.java

@@ -39,7 +39,8 @@ import java.util.ListIterator;
 public class WeakList<T> implements List<T> {
 
     /** The items in this list. */
-    private final List<WeakReference<T>> list = new ArrayList<WeakReference<T>>();
+    private final List<WeakReference<T>> list
+            = new ArrayList<WeakReference<T>>();
 
     /**
      * Removes any entries from the list that have been GC'd.
@@ -79,8 +80,10 @@ public class WeakList<T> implements List<T> {
      * a weak reference.
      */
     @SuppressWarnings(value = "unchecked")
-    private Collection<WeakReference<T>> referenceCollection(final Collection<?> c) {
-        final Collection<WeakReference<T>> res = new ArrayList<WeakReference<T>>();
+    private Collection<WeakReference<T>> referenceCollection(
+            final Collection<?> c) {
+        final Collection<WeakReference<T>> res
+                = new ArrayList<WeakReference<T>>();
 
         for (Object item : c) {
             res.add(new EquatableWeakReference(item));

src/com/dmdirc/util/validators/ColourValidator.java

@@ -28,7 +28,8 @@ package com.dmdirc.util.validators;
  * @since 0.6.5
  * @author chris
  */
-public class ColourValidator extends RegexStringValidator implements Validator<String> {
+public class ColourValidator extends RegexStringValidator implements
+        Validator<String> {
 
     /**
      * Creates a new colour validator.

src/com/dmdirc/util/validators/NicknameValidator.java

@@ -28,7 +28,8 @@ package com.dmdirc.util.validators;
 public class NicknameValidator implements Validator<String> {
 
     /** Nickname regex. */
-    private static final String NICKNAME_REGEX = "[A-Za-z0-9\\[\\]{|}\\-\\^\\\\\\`\\_]+";
+    private static final String NICKNAME_REGEX
+            = "[A-Za-z0-9\\[\\]{|}\\-\\^\\\\\\`\\_]+";
     /** Failure reason. */
     private static final String FAILURE_REASON = "Nickname must only contain "
             + "letters, numbers and []{}|-^\\.`_";

src/com/dmdirc/util/validators/NumericalValidator.java

@@ -41,7 +41,7 @@ public class NumericalValidator implements Validator<String> {
      * @param min The minimum value for the number, or -1 for unlimited.
      * @param max The maximum value for the number, or -1 for unlimited.
      */
-    public NumericalValidator(int min, int max) {
+    public NumericalValidator(final int min, final int max) {
         this.max = max == -1 ? Integer.MAX_VALUE : max;
         this.min = min == -1 ? Integer.MIN_VALUE : min;
         if (this.min > this.max) {

src/com/dmdirc/util/validators/StringLengthValidator.java

@@ -50,9 +50,11 @@ public class StringLengthValidator implements Validator<String> {
     @Override
     public ValidationResponse validate(final String object) {
         if (object.length() < min && min != -1) {
-            return new ValidationResponse("Must be at least " + min + " characters long");
+            return new ValidationResponse("Must be at least " + min
+                    + " characters long");
         } else if (object.length() > max && max != -1) {
-            return new ValidationResponse("Must be at most " + max + " characters long");
+            return new ValidationResponse("Must be at most " + max
+                    + " characters long");
         } else {
             return new ValidationResponse();
         }

src/com/dmdirc/util/validators/ValidatorChain.java

@@ -23,6 +23,7 @@
 package com.dmdirc.util.validators;
 
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 
 /**
@@ -43,9 +44,7 @@ public class ValidatorChain<A> implements Validator<A> {
      * @param validators The validators to be used in this chain.
      */
     public ValidatorChain(final Validator<A> ... validators) {
-        for (Validator<A> validator : validators) {
-            validatorList.add(validator);
-        }
+        validatorList.addAll(Arrays.asList(validators));
     }
 
     /** {@inheritDoc} */