Merge pull request #33 from greboid/java8

Add java 8, run away from Dataforce

irc/src/com/dmdirc/parser/irc/IRCChannelInfo.java

@@ -73,7 +73,7 @@ public class IRCChannelInfo implements ChannelInfo {
     /** Channel Name. */
     private final String name;
     /** Hashtable containing references to ChannelClients. */
-    private final Map<String, IRCChannelClientInfo> clients = Collections.synchronizedMap(new HashMap<String, IRCChannelClientInfo>());
+    private final Map<String, IRCChannelClientInfo> clients = Collections.synchronizedMap(new HashMap<>());
     /** Hashtable storing values for modes set in the channel that use parameters. */
     private final Map<Character, String> paramModes = new HashMap<>();
     /** Hashtable storing list modes. */
@@ -277,7 +277,7 @@ public class IRCChannelInfo implements ChannelInfo {
     @Override
     public Collection<ChannelClientInfo> getChannelClients() {
         synchronized (clients) {
-            return new ArrayList<ChannelClientInfo>(clients.values());
+            return new ArrayList<>(clients.values());
         }
     }
 
@@ -529,7 +529,7 @@ public class IRCChannelInfo implements ChannelInfo {
         }
 
         if (!listModes.containsKey(cMode)) {
-            listModes.put(cMode, new ArrayList<ChannelListModeItem>());
+            listModes.put(cMode, new ArrayList<>());
         }
 
         final List<ChannelListModeItem> lModes = listModes.get(cMode);
@@ -555,7 +555,7 @@ public class IRCChannelInfo implements ChannelInfo {
         }
 
         if (!listModes.containsKey(mode)) {
-            listModes.put(mode, new ArrayList<ChannelListModeItem>());
+            listModes.put(mode, new ArrayList<>());
         }
         return listModes.get(mode);
     }

irc/src/com/dmdirc/parser/irc/IRCParser.java

@@ -517,12 +517,12 @@ public class IRCParser extends BaseSocketAwareParser implements SecureParser, En
     }
 
     @Override
-    public void setTrustManagers(final TrustManager[] managers) {
+    public void setTrustManagers(final TrustManager... managers) {
         myTrustManager = managers == null ? null : Arrays.copyOf(managers, managers.length);
     }
 
     @Override
-    public void setKeyManagers(final KeyManager[] managers) {
+    public void setKeyManagers(final KeyManager... managers) {
         myKeyManagers = managers == null ? null : Arrays.copyOf(managers, managers.length);
     }
 

irc/src/com/dmdirc/parser/irc/IRCReader.java

@@ -32,10 +32,6 @@ import java.nio.charset.CharacterCodingException;
 import java.nio.charset.Charset;
 import java.nio.charset.CharsetDecoder;
 import java.nio.charset.CodingErrorAction;
-import java.text.SimpleDateFormat;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.Date;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -197,7 +193,7 @@ public class IRCReader implements Closeable {
      * @param tokens The tokens to extract a source from
      * @return The relevant source or null if none specified
      */
-    private String getSource(final String[] tokens) {
+    private String getSource(final String... tokens) {
         if (tokens.length > 0 && tokens[0].length() > 1 && tokens[0].charAt(0) == ':') {
             return tokens[0].substring(1);
         }
@@ -214,7 +210,7 @@ public class IRCReader implements Closeable {
      * @param tokens The tokens to extract a destination from
      * @return The relevant destination or null if none specified
      */
-    private String getDestination(final String[] tokens) {
+    private String getDestination(final String... tokens) {
         if (tokens.length > 0 && tokens[0].length() >= 3 && tokens[0].charAt(0) == ':') {
             final int target = tokens[1].matches("^[0-9]+$") ? 3 : 2;
 
@@ -251,7 +247,7 @@ public class IRCReader implements Closeable {
          * @param line A string representation of the line
          * @param lineTokens The tokens which make up the line
          */
-        public ReadLine(final String line, final String[] lineTokens) {
+        public ReadLine(final String line, final String... lineTokens) {
             this.line = line;
 
             String[] tokens = lineTokens;

irc/src/com/dmdirc/parser/irc/Logging.java

@@ -91,7 +91,7 @@ public class Logging {
             factory = Class.forName("org.apache.commons.logging.LogFactory");
 
             if (factory != null) {
-                final Method getLog = factory.getMethod("getLog", new Class[]{Class.class});
+                final Method getLog = factory.getMethod("getLog", Class.class);
                 log = getLog.invoke(null, this.getClass());
             }
         } catch (ClassNotFoundException | NoSuchMethodException | IllegalAccessException | InvocationTargetException cnfe) {

irc/src/com/dmdirc/parser/irc/ProcessingManager.java

@@ -225,7 +225,7 @@ public class ProcessingManager {
      * @param token IRCTokenised line to process
      * @throws ProcessorNotFoundException exception if no processors exists to handle the line
      */
-    public void process(final String sParam, final String[] token) throws ProcessorNotFoundException {
+    public void process(final String sParam, final String... token) throws ProcessorNotFoundException {
         process(new Date(), sParam, token);
     }
 
@@ -237,7 +237,7 @@ public class ProcessingManager {
      * @param token IRCTokenised line to process
      * @throws ProcessorNotFoundException exception if no processors exists to handle the line
      */
-    public void process(final Date date, final String sParam, final String[] token) throws ProcessorNotFoundException {
+    public void process(final Date date, final String sParam, final String... token) throws ProcessorNotFoundException {
         IRCProcessor messageProcessor = null;
         try {
             messageProcessor = getProcessor(sParam);
@@ -272,7 +272,7 @@ public class ProcessingManager {
      * @param token IRC Tokenised line
      * @return true if a method was called, false otherwise
      */
-    protected boolean callNumeric(final int numeric, final String[] token) {
+    protected boolean callNumeric(final int numeric, final String... token) {
         return parser.getCallbackManager().getCallbackType(NumericListener.class).call(numeric, token);
     }
 }

irc/src/com/dmdirc/parser/irc/ServerTypeGroup.java

@@ -33,25 +33,25 @@ public enum ServerTypeGroup {
     /**
      * Freenode Group.
      */
-    FREENODE("Freenode IRCDs", new ServerType[]{ServerType.HYPERION, ServerType.DANCER}),
+    FREENODE("Freenode IRCDs", ServerType.HYPERION, ServerType.DANCER),
     /**
      * Charybdis Group.
      */
-    CHARYBDIS("Charybdis-esque IRCDs", new ServerType[]{ServerType.IRCD_SEVEN, ServerType.CHARYBDIS}),
+    CHARYBDIS("Charybdis-esque IRCDs", ServerType.IRCD_SEVEN, ServerType.CHARYBDIS),
     /**
      * Group for ircds that put the channel owners in a list under raw 386
      * rather than as a channel user mode.
      */
-    OWNER_386("Owner List", new ServerType[]{ServerType.SWIFTIRC, ServerType.AUSTHEX8}),
+    OWNER_386("Owner List", ServerType.SWIFTIRC, ServerType.AUSTHEX8),
     /**
      * Group for ircds that put the protected users in a list under raw 388
      * rather than as a channel user mode.
      */
-    PROTECTED_388("Protected List", new ServerType[]{ServerType.SWIFTIRC, ServerType.AUSTHEX8}),
+    PROTECTED_388("Protected List", ServerType.SWIFTIRC, ServerType.AUSTHEX8),
     /**
      * Group for ircds that require list modes to be sent one at a time.
      */
-    SINGLE_LISTMODE("Single List Modes", new ServerType[]{ServerType.EUIRCD, ServerType.UNREAL, ServerType.IRSEE});
+    SINGLE_LISTMODE("Single List Modes", ServerType.EUIRCD, ServerType.UNREAL, ServerType.IRSEE);
 
     /** Name of the group. */
     final String name;
@@ -64,7 +64,7 @@ public enum ServerTypeGroup {
      * @param name Name of this group.
      * @param members Members of this group.
      */
-    ServerTypeGroup(final String name, final ServerType[] members) {
+    ServerTypeGroup(final String name, final ServerType... members) {
         this.name = name;
         this.members = Arrays.asList(members);
     }

irc/src/com/dmdirc/parser/irc/TimestampedIRCProcessor.java

@@ -43,7 +43,7 @@ public abstract class TimestampedIRCProcessor extends IRCProcessor {
     }
 
     @Override
-    public final void process(final String sParam, final String[] token) {
+    public final void process(final String sParam, final String... token) {
         process(new Date(), sParam, token);
     }
 
@@ -54,7 +54,7 @@ public abstract class TimestampedIRCProcessor extends IRCProcessor {
      * @param sParam Type of line to process ("005", "PRIVMSG" etc)
      * @param token IRCTokenised line to process
      */
-    public abstract void process(final Date date, final String sParam, final String[] token);
+    public abstract void process(final Date date, final String sParam, final String... token);
 
 
 }

irc/src/com/dmdirc/parser/irc/outputqueue/PriorityQueueHandler.java

@@ -47,13 +47,7 @@ public class PriorityQueueHandler extends QueueHandler {
      * @return a QueueFactory that produces PrirortyQueueHandlers.
      */
     public static QueueFactory getFactory() {
-        return new QueueFactory() {
-
-            @Override
-            public QueueHandler getQueueHandler(final OutputQueue outputQueue, final BlockingQueue<QueueItem> queue, final PrintWriter out) {
-                return new PriorityQueueHandler(outputQueue, queue, out);
-            }
-        };
+        return PriorityQueueHandler::new;
     }
 
     @Override

irc/src/com/dmdirc/parser/irc/outputqueue/SimpleRateLimitedQueueHandler.java

@@ -67,13 +67,7 @@ public class SimpleRateLimitedQueueHandler extends QueueHandler {
      * @return a QueueFactory that produces PrirortyQueueHandlers.
      */
     public static QueueFactory getFactory() {
-        return new QueueFactory() {
-
-            @Override
-            public QueueHandler getQueueHandler(final OutputQueue outputQueue, final BlockingQueue<QueueItem> queue, final PrintWriter out) {
-                return new SimpleRateLimitedQueueHandler(outputQueue, queue, out);
-            }
-        };
+        return SimpleRateLimitedQueueHandler::new;
     }
 
     /**

irc/src/com/dmdirc/parser/irc/processors/ProcessListModes.java

@@ -254,11 +254,11 @@ public class ProcessListModes extends IRCProcessor {
                 channel.setHasGotListModes(true);
 
                 if (isCleverMode) {
-                    for (Character thisMode : parser.chanModesOther.keySet()) {
-                        if (parser.chanModesOther.get(thisMode) == IRCParser.MODE_LIST) {
-                            callChannelGotListModes(channel, thisMode);
-                        }
-                    }
+                    parser.chanModesOther.keySet()
+                            .stream()
+                            .filter(thisMode -> parser.chanModesOther
+                                    .get(thisMode) == IRCParser.MODE_LIST)
+                            .forEach(thisMode -> callChannelGotListModes(channel, thisMode));
                 } else {
                     callChannelGotListModes(channel, mode);
                 }