More HashTable removal

Make the LoggingPlugin less stupid

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

src/com/dmdirc/addons/logging/LoggingPlugin.java

@@ -47,6 +47,7 @@ import com.dmdirc.parser.interfaces.ClientInfo;
 import com.dmdirc.parser.interfaces.Parser;
 import com.dmdirc.plugins.Plugin;
 import com.dmdirc.ui.messages.Styliser;
+import com.dmdirc.util.StreamUtil;
 
 import java.awt.Color;
 import java.io.BufferedWriter;
@@ -59,11 +60,11 @@ import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;
 import java.text.DateFormat;
 import java.text.SimpleDateFormat;
+import java.util.Collections;
 import java.util.Date;
-import java.util.Hashtable;
+import java.util.HashMap;
 import java.util.Map;
 import java.util.Stack;
-
 import java.util.Timer;
 import java.util.TimerTask;
 
@@ -108,19 +109,13 @@ public class LoggingPlugin extends Plugin implements ActionListener,
     /** Timer used to close idle files */
     protected Timer idleFileTimer;
 
-    /** Hashtable of open files. */
-    protected final Map<String, OpenFile> openFiles = new Hashtable<String, OpenFile>();
+    /** Map of open files. */
+    protected final Map<String, OpenFile> openFiles
+            = Collections.synchronizedMap(new HashMap<String, OpenFile>());
 
     /** Date format used for "File Opened At" log. */
     final DateFormat openedAtFormat = new SimpleDateFormat("EEEE MMMM dd, yyyy - HH:mm:ss");
 
-    /**
-     * Creates a new instance of the Logging Plugin.
-     */
-    public LoggingPlugin() {
-        super();
-    }
-
     /** {@inheritDoc} */
     @Override
     public void domainUpdated() {
@@ -192,15 +187,10 @@ public class LoggingPlugin extends Plugin implements ActionListener,
         final long oldestTime = System.currentTimeMillis() - 3480000;
 
         synchronized (openFiles) {
-            for (String filename : (new Hashtable<String, OpenFile>(openFiles)).keySet()) {
-                OpenFile file = openFiles.get(filename);
-                if (file.lastUsedTime < oldestTime) {
-                    try {
-                        file.writer.close();
-                        openFiles.remove(filename);
-                    } catch (IOException e) {
-                        Logger.userError(ErrorLevel.LOW, "Unable to close idle file (File: " + filename + ")");
-                    }
+            for (Map.Entry<String, OpenFile> entry : openFiles.entrySet()) {
+                if (entry.getValue().lastUsedTime < oldestTime) {
+                    StreamUtil.close(entry.getValue().writer);
+                    openFiles.remove(entry.getKey());
                 }
             }
         }

src/com/dmdirc/addons/ui_swing/dialogs/channelsetting/ChannelModesPane.java

@@ -29,7 +29,7 @@ import com.dmdirc.addons.ui_swing.components.text.TextLabel;
 import com.dmdirc.parser.interfaces.Parser;
 
 import java.awt.Insets;
-import java.util.Hashtable;
+import java.util.HashMap;
 import java.util.Map;
 import java.util.TreeSet;
 
@@ -87,12 +87,10 @@ public final class ChannelModesPane extends JPanel {
 
         final String booleanModes = parser.getBooleanChannelModes();
         final String ourBooleanModes = channel.getChannelInfo().getModes();
-        final String paramModes =
-                parser.getParameterChannelModes() + parser.
-                getDoubleParameterChannelModes();
+        final String paramModes = parser.getParameterChannelModes()
+                + parser.getDoubleParameterChannelModes();
 
-        modeCheckBoxes =
-                new Hashtable<String, JCheckBox>();
+        modeCheckBoxes = new HashMap<String, JCheckBox>();
 
         // Lay out all the boolean mode checkboxes
         for (int i = 0; i < booleanModes.length(); i++) {
@@ -104,10 +102,10 @@ public final class ChannelModesPane extends JPanel {
             String text;
             String tooltip;
 
-            if (channel.getConfigManager().hasOptionString("server",
-                    "mode" + mode)) {
-                text = channel.getConfigManager().
-                        getOption("server", "mode" + mode) + " [+" + mode + "]";
+            if (channel.getConfigManager().hasOptionString("server", "mode"
+                    + mode)) {
+                text = channel.getConfigManager().getOption("server", "mode"
+                        + mode) + " [+" + mode + "]";
             } else {
                 text = "Mode " + mode;
             }
@@ -139,7 +137,7 @@ public final class ChannelModesPane extends JPanel {
         }
 
         // Lay out all the parameter-requiring modes
-        modeInputs = new Hashtable<String, ParamModePanel>();
+        modeInputs = new HashMap<String, ParamModePanel>();
 
         for (int i = 0; i < paramModes.length(); i++) {
             final String mode = paramModes.substring(i, i + 1);

src/com/dmdirc/addons/ui_swing/dialogs/serversetting/UserModesPane.java

@@ -28,7 +28,7 @@ import com.dmdirc.addons.ui_swing.UIUtilities;
 import com.dmdirc.parser.interfaces.Parser;
 
 import java.awt.Insets;
-import java.util.Hashtable;
+import java.util.HashMap;
 import java.util.Map;
 import java.util.TreeSet;
 
@@ -85,7 +85,7 @@ public final class UserModesPane extends JPanel {
         final String userModes = parser.getUserModes();
         final String ourUserModes = parser.getLocalClient().getModes();
 
-        modeCheckBoxes = new Hashtable<String, JCheckBox>();
+        modeCheckBoxes = new HashMap<String, JCheckBox>();
 
         // Lay out all the boolean mode checkboxes
         for (int i = 0; i < userModes.length(); i++) {

src/com/dmdirc/addons/windowstatus/WindowStatusPlugin.java

@@ -46,7 +46,7 @@ import com.dmdirc.plugins.Plugin;
 import com.dmdirc.ui.WindowManager;
 import com.dmdirc.util.ReturnableThread;
 
-import java.util.Hashtable;
+import java.util.HashMap;
 import java.util.Map;
 import java.util.Map.Entry;
 
@@ -148,8 +148,8 @@ public final class WindowStatusPlugin extends Plugin implements ActionListener,
         } else if (current instanceof Channel) {
             final Channel frame = (Channel) current;
             final ChannelInfo chan = frame.getChannelInfo();
-            final Map<Integer, String> names = new Hashtable<Integer, String>();
-            final Map<Integer, Integer> types = new Hashtable<Integer, Integer>();
+            final Map<Integer, String> names = new HashMap<Integer, String>();
+            final Map<Integer, Integer> types = new HashMap<Integer, Integer>();
 
             textString.append(chan.getName());
             textString.append(" - Nicks: " + chan.getChannelClientCount() + " (");