1995 called and they want their collection types back

Change-Id: I5d76244f67d380b350853aff05a3c0af731d892b
Reviewed-on: http://gerrit.dmdirc.com/1359
Reviewed-by: Gregory Holmes <greg@dmdirc.com>
Automatic-Compile: DMDirc Local Commits <dmdirc@googlemail.com>

src/com/dmdirc/parser/common/CallbackManager.java

@@ -26,7 +26,7 @@ import com.dmdirc.parser.interfaces.Parser;
 import com.dmdirc.parser.interfaces.SpecificCallback;
 import com.dmdirc.parser.interfaces.callbacks.*;
 
-import java.util.Hashtable;
+import java.util.HashMap;
 import java.util.Map;
 
 /**
@@ -72,7 +72,7 @@ public abstract class CallbackManager<T extends Parser> {
     
     /** Hashtable used to store the different types of callback known. */
     private final Map<Class<? extends CallbackInterface>, CallbackObject> callbackHash
-            = new Hashtable<Class<? extends CallbackInterface>, CallbackObject>();
+            = new HashMap<Class<? extends CallbackInterface>, CallbackObject>();
 
     /**
      * Constructor to create a CallbackManager.

src/com/dmdirc/parser/common/CallbackObjectSpecific.java

@@ -29,7 +29,8 @@ import com.dmdirc.parser.interfaces.callbacks.CallbackInterface;
 
 import java.util.ArrayList;
 import java.util.Date;
-import java.util.Hashtable;
+import java.util.HashMap;
+import java.util.Map;
 
 /**
  * CallbackObjectSpecific.
@@ -40,8 +41,8 @@ import java.util.Hashtable;
 public abstract class CallbackObjectSpecific extends CallbackObject {
 
     /** Hashtable for storing specific information for callback. */
-    protected volatile Hashtable<CallbackInterface, String> specificData
-            = new Hashtable<CallbackInterface, String>();
+    protected final Map<CallbackInterface, String> specificData
+            = new HashMap<CallbackInterface, String>();
 
     /**
      * Create a new instance of the Callback Object.

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

@@ -34,7 +34,6 @@ import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.HashMap;
-import java.util.Hashtable;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
@@ -75,11 +74,11 @@ public class IRCChannelInfo implements ChannelInfo {
     private final String sName;
 
     /** Hashtable containing references to ChannelClients. */
-    private final Map<String, IRCChannelClientInfo> hChannelUserList = Collections.synchronizedMap(new Hashtable<String, IRCChannelClientInfo>());
+    private final Map<String, IRCChannelClientInfo> hChannelUserList = Collections.synchronizedMap(new HashMap<String, IRCChannelClientInfo>());
     /** Hashtable storing values for modes set in the channel that use parameters. */
-    private final Map<Character, String> hParamModes = new Hashtable<Character, String>();
+    private final Map<Character, String> hParamModes = new HashMap<Character, String>();
     /** Hashtable storing list modes. */
-    private final Map<Character, ArrayList<ChannelListModeItem>> hListModes = new Hashtable<Character, ArrayList<ChannelListModeItem>>();
+    private final Map<Character, ArrayList<ChannelListModeItem>> hListModes = new HashMap<Character, ArrayList<ChannelListModeItem>>();
     /**
      * LinkedList storing status of mode adding.
      * if an item is in this list for a mode, we are expecting new items for the list

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

@@ -28,7 +28,6 @@ import com.dmdirc.parser.interfaces.Parser;
 
 import java.util.ArrayList;
 import java.util.HashMap;
-import java.util.Hashtable;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
@@ -62,7 +61,7 @@ public class IRCClientInfo implements LocalClientInfo {
     /** A Map to allow applications to attach misc data to this object */
     private Map<Object, Object> myMap;
     /** List of ChannelClientInfos that point to this */
-    private final Map<String, IRCChannelClientInfo> myChannelClientInfos = new Hashtable<String, IRCChannelClientInfo>();
+    private final Map<String, IRCChannelClientInfo> myChannelClientInfos = new HashMap<String, IRCChannelClientInfo>();
     /** Modes waiting to be sent to the server. */
     private final List<String> lModeQueue = new LinkedList<String>();
 

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

@@ -49,7 +49,6 @@ import java.util.Arrays;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.HashMap;
-import java.util.Hashtable;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
@@ -160,16 +159,16 @@ public class IRCParser implements SecureParser, Runnable {
     private int connectTimeout = 5000;
 
     /** Hashtable storing known prefix modes (ohv). */
-    final Map<Character, Long> prefixModes = new Hashtable<Character, Long>();
+    final Map<Character, Long> prefixModes = new HashMap<Character, Long>();
     /**
      * Hashtable maping known prefix modes (ohv) to prefixes (@%+) - Both ways.
      * Prefix map contains 2 pairs for each mode. (eg @ => o and o => @)
      */
-    final Map<Character, Character> prefixMap = new Hashtable<Character, Character>();
+    final Map<Character, Character> prefixMap = new HashMap<Character, Character>();
     /** Integer representing the next avaliable integer value of a prefix mode. */
     long nextKeyPrefix = 1;
     /** Hashtable storing known user modes (owxis etc). */
-    final Map<Character, Long> userModes = new Hashtable<Character, Long>();
+    final Map<Character, Long> userModes = new HashMap<Character, Long>();
     /** Integer representing the next avaliable integer value of a User mode. */
     long nNextKeyUser = 1;
     /**
@@ -180,7 +179,7 @@ public class IRCParser implements SecureParser, Runnable {
      * <br>
      * Channel modes discovered but not listed in 005 are stored as boolean modes automatically (and a ERROR_WARNING Error is called)
      */
-    final Map<Character, Long> chanModesBool = new Hashtable<Character, Long>();
+    final Map<Character, Long> chanModesBool = new HashMap<Character, Long>();
     /** Integer representing the next avaliable integer value of a Boolean mode. */
 
     long nextKeyCMBool = 1;
@@ -194,7 +193,7 @@ public class IRCParser implements SecureParser, Runnable {
      * see MODE_SET<br>
      * see MODE_UNSET<br>
      */
-    final Map<Character, Byte> chanModesOther = new Hashtable<Character, Byte>();
+    final Map<Character, Byte> chanModesOther = new HashMap<Character, Byte>();
 
     /** The last line of input recieved from the server */
     String lastLine = "";
@@ -204,13 +203,13 @@ public class IRCParser implements SecureParser, Runnable {
     /** Channel Prefixes (ie # + etc). */
     private final List<Character> chanPrefix = Collections.synchronizedList(new LinkedList<Character>());
     /** Hashtable storing all known clients based on nickname (in lowercase). */
-    private final Map<String, IRCClientInfo> clientList = new Hashtable<String, IRCClientInfo>();
+    private final Map<String, IRCClientInfo> clientList = new HashMap<String, IRCClientInfo>();
     /** Hashtable storing all known channels based on chanel name (inc prefix - in lowercase). */
-    private final Map<String, IRCChannelInfo> channelList = new Hashtable<String, IRCChannelInfo>();
+    private final Map<String, IRCChannelInfo> channelList = new HashMap<String, IRCChannelInfo>();
     /** Reference to the ClientInfo object that references ourself. */
     private IRCClientInfo myself = new IRCClientInfo(this, "myself").setFake(true);
     /** Hashtable storing all information gathered from 005. */
-    final Map<String, String> h005Info = new Hashtable<String, String>();
+    final Map<String, String> h005Info = new HashMap<String, String>();
 
     /** Ignore List. */
     IgnoreList myIgnoreList = new IgnoreList();

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

@@ -24,7 +24,8 @@ package com.dmdirc.parser.irc;
 
 import com.dmdirc.parser.common.ParserError;
 import com.dmdirc.parser.interfaces.callbacks.NumericListener;
-import java.util.Hashtable;
+import java.util.HashMap;
+import java.util.Map;
 
 /**
  * IRC Parser Processing Manager.
@@ -37,7 +38,7 @@ public class ProcessingManager {
     IRCParser myParser;
 
     /** Hashtable used to store the different types of IRCProcessor known. */
-    private final Hashtable<String, IRCProcessor> processHash = new Hashtable<String, IRCProcessor>();
+    private final Map<String, IRCProcessor> processHash = new HashMap<String, IRCProcessor>();
 
     /**
      * Debugging Data to the console.