Fix fallout from util changes

Change-Id: Ia8de3c1a5fdc1eb9cfaa8b29a32bb3efb6d8ce6f
Depends-On: I0bfd2dc61096dd9670b269463c27d9b00fd9a917
Depends-On: I6d0665e57f6e0e2ff2fb6a18742acb99010e79bf
Reviewed-on: http://gerrit.dmdirc.com/2241
Automatic-Compile: DMDirc Build Manager
Reviewed-by: Greg Holmes <greg@dmdirc.com>

src/com/dmdirc/addons/dcc/io/DCCTransfer.java

 package com.dmdirc.addons.dcc.io;
 
 import com.dmdirc.addons.dcc.DCCTransferHandler;
-import com.dmdirc.util.ListenerList;
+import com.dmdirc.util.collections.ListenerList;
 
 import java.io.DataInputStream;
 import java.io.DataOutputStream;

src/com/dmdirc/addons/dcc/kde/KDialogProcess.java

 
 package com.dmdirc.addons.dcc.kde;
 
-import com.dmdirc.util.StreamReader;
+import com.dmdirc.util.io.StreamReader;
 
 import java.io.File;
 import java.io.IOException;

src/com/dmdirc/addons/exec/ExecCommand.java

 import com.dmdirc.logger.ErrorLevel;
 import com.dmdirc.logger.Logger;
 import com.dmdirc.util.CommandUtils;
-import com.dmdirc.util.StreamReader;
+import com.dmdirc.util.io.StreamReader;
 
 import java.io.File;
 import java.io.IOException;

src/com/dmdirc/addons/freedesktop_notifications/FreeDesktopNotificationsPlugin.java

 import com.dmdirc.plugins.PluginInfo;
 import com.dmdirc.plugins.PluginManager;
 import com.dmdirc.ui.messages.Styliser;
-import com.dmdirc.util.StreamReader;
+import com.dmdirc.util.io.StreamReader;
 import com.dmdirc.util.resourcemanager.ResourceManager;
 
 import java.io.IOException;

src/com/dmdirc/addons/lagdisplay/LagDisplayPlugin.java

 import com.dmdirc.plugins.BasePlugin;
 import com.dmdirc.plugins.PluginInfo;
 import com.dmdirc.plugins.PluginManager;
-import com.dmdirc.util.RollingList;
+import com.dmdirc.util.collections.RollingList;
 
 import java.util.Date;
 import java.util.HashMap;

src/com/dmdirc/addons/lagdisplay/PingHistoryPanel.java

 
 import com.dmdirc.addons.ui_swing.SwingController;
 import com.dmdirc.plugins.PluginManager;
-import com.dmdirc.util.RollingList;
+import com.dmdirc.util.collections.RollingList;
 
 import java.awt.Color;
 import java.awt.Dimension;

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

 import com.dmdirc.plugins.BasePlugin;
 import com.dmdirc.plugins.PluginInfo;
 import com.dmdirc.ui.messages.Styliser;
-import com.dmdirc.util.StreamUtil;
+import com.dmdirc.util.io.StreamUtils;
 
 import java.awt.Color;
 import java.io.BufferedWriter;
             final Collection<String> old = new ArrayList<String>(openFiles.size());
             for (Map.Entry<String, OpenFile> entry : openFiles.entrySet()) {
                 if (entry.getValue().lastUsedTime < oldestTime) {
-                    StreamUtil.close(entry.getValue().writer);
+                    StreamUtils.close(entry.getValue().writer);
                     old.add(entry.getKey());
                 }
             }
 
         synchronized (openFiles) {
             for (OpenFile file : openFiles.values()) {
-                StreamUtil.close(file.writer);
+                StreamUtils.close(file.writer);
             }
             openFiles.clear();
         }
             case QUERY_CLOSED:
                 appendLine(filename, "*** Query closed at: %s", openedAtFormat.format(new Date()));
                 if (openFiles.containsKey(filename)) {
-                    StreamUtil.close(openFiles.get(filename).writer);
+                    StreamUtils.close(openFiles.get(filename).writer);
                     openFiles.remove(filename);
                 }
                 break;
             case CHANNEL_CLOSED:
                 appendLine(filename, "*** Channel closed at: %s", openedAtFormat.format(new Date()));
                 if (openFiles.containsKey(filename)) {
-                    StreamUtil.close(openFiles.get(filename).writer);
+                    StreamUtils.close(openFiles.get(filename).writer);
                     openFiles.remove(filename);
                 }
                 break;

src/com/dmdirc/addons/mediasource_linux_title/TitleMediaSource.java

 import com.dmdirc.addons.nowplaying.MediaSourceState;
 import com.dmdirc.logger.ErrorLevel;
 import com.dmdirc.logger.Logger;
-import com.dmdirc.util.StreamUtil;
+import com.dmdirc.util.io.StreamUtils;
 
 import java.io.BufferedReader;
 import java.io.IOException;
             Logger.userError(ErrorLevel.LOW, "Unable to retrieve media source info",
                     ex);
         } finally {
-            StreamUtil.close(reader);
-            StreamUtil.close(input);
+            StreamUtils.close(reader);
+            StreamUtils.close(input);
         }
 
         return "";

src/com/dmdirc/addons/mediasource_vlc/VlcMediaSourcePlugin.java

 import com.dmdirc.config.prefs.PreferencesType;
 import com.dmdirc.plugins.BasePlugin;
 import com.dmdirc.plugins.PluginInfo;
-import com.dmdirc.util.Downloader;
+import com.dmdirc.util.io.Downloader;
 
 import java.io.File;
 import java.io.IOException;

src/com/dmdirc/addons/mediasource_windows/WindowsMediaSourcePlugin.java

 import com.dmdirc.plugins.BaseFileDependantPlugin;
 import com.dmdirc.plugins.PluginInfo;
 import com.dmdirc.plugins.PluginManager;
-import com.dmdirc.util.StreamReader;
+import com.dmdirc.util.io.StreamReader;
 import com.dmdirc.util.resourcemanager.ResourceManager;
 
 import java.io.IOException;

src/com/dmdirc/addons/scriptplugin/ScriptEngineWrapper.java

 
 import com.dmdirc.logger.ErrorLevel;
 import com.dmdirc.logger.Logger;
-import com.dmdirc.util.StreamUtil;
+import com.dmdirc.util.io.StreamUtils;
 
 import java.io.File;
 import java.io.FileNotFoundException;
                 fr = new FileReader(file);
                 result.eval(fr);
             } finally {
-                StreamUtil.close(fr);
+                StreamUtils.close(fr);
             }
         }
 

src/com/dmdirc/addons/scriptplugin/ScriptPlugin.java

 import com.dmdirc.logger.ErrorLevel;
 import com.dmdirc.logger.Logger;
 import com.dmdirc.plugins.BasePlugin;
-import com.dmdirc.util.StreamUtil;
+import com.dmdirc.util.io.StreamUtils;
 import com.dmdirc.util.validators.ValidationResponse;
 
 import java.io.File;
             } catch (IOException e) {
                 Logger.userError(ErrorLevel.LOW, "Error reading savedVariables from '"+savedVariables.getPath()+"': "+e.getMessage(), e);
             } finally {
-                StreamUtil.close(fis);
+                StreamUtils.close(fis);
             }
         }
         super.onLoad();
         } catch (IOException e) {
             Logger.userError(ErrorLevel.LOW, "Error reading savedVariables to '"+savedVariables.getPath()+"': "+e.getMessage(), e);
         } finally {
-            StreamUtil.close(fos);
+            StreamUtils.close(fos);
         }
         super.onUnload();
     }

src/com/dmdirc/addons/ui_swing/MainFrame.java

 import com.dmdirc.ui.Colour;
 import com.dmdirc.ui.CoreUIUtils;
 import com.dmdirc.ui.IconManager;
-import com.dmdirc.util.ListenerList;
-import com.dmdirc.util.QueuedLinkedHashSet;
+import com.dmdirc.util.collections.ListenerList;
+import com.dmdirc.util.collections.QueuedLinkedHashSet;
 import com.dmdirc.util.ReturnableThread;
 
 import java.awt.Dimension;

src/com/dmdirc/addons/ui_swing/SwingWindowFactory.java

 import com.dmdirc.ui.core.components.WindowComponent;
 import com.dmdirc.interfaces.ui.FrameListener;
 import com.dmdirc.interfaces.ui.Window;
-import com.dmdirc.util.ListenerList;
+import com.dmdirc.util.collections.ListenerList;
 
 import java.util.Arrays;
 import java.util.Collection;

src/com/dmdirc/addons/ui_swing/adapters/ObservableListTableModelAdapter.java

 package com.dmdirc.addons.ui_swing.adapters;
 
 import com.dmdirc.addons.ui_swing.UIUtilities;
-import com.dmdirc.util.ListObserver;
-import com.dmdirc.util.ObservableList;
+import com.dmdirc.util.collections.ListObserver;
+import com.dmdirc.util.collections.ObservableList;
 
 import javax.swing.table.AbstractTableModel;
 

src/com/dmdirc/addons/ui_swing/components/FileBrowser.java

 import com.dmdirc.addons.ui_swing.components.validating.ValidatingJTextField;
 import com.dmdirc.config.prefs.PreferencesSetting;
 import com.dmdirc.ui.IconManager;
-import com.dmdirc.util.ListenerList;
+import com.dmdirc.util.collections.ListenerList;
 
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;

src/com/dmdirc/addons/ui_swing/components/OptionalJSpinner.java

 
 package com.dmdirc.addons.ui_swing.components;
 
-import com.dmdirc.util.ListenerList;
+import com.dmdirc.util.collections.ListenerList;
 
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;

src/com/dmdirc/addons/ui_swing/components/SendWorker.java

 
 import com.dmdirc.addons.ui_swing.dialogs.FeedbackDialog;
 import com.dmdirc.config.IdentityManager;
-import com.dmdirc.util.Downloader;
+import com.dmdirc.util.io.Downloader;
 
 import java.io.IOException;
 import java.net.MalformedURLException;

src/com/dmdirc/addons/ui_swing/components/SwingSearchBar.java

 import com.dmdirc.ui.messages.IRCDocument;
 import com.dmdirc.ui.messages.IRCDocumentSearcher;
 import com.dmdirc.ui.messages.LinePosition;
-import com.dmdirc.util.ListenerList;
+import com.dmdirc.util.collections.ListenerList;
 
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;

src/com/dmdirc/addons/ui_swing/components/addonbrowser/DataLoaderWorker.java

 import com.dmdirc.addons.ui_swing.components.text.TextLabel;
 import com.dmdirc.logger.ErrorLevel;
 import com.dmdirc.logger.Logger;
-import com.dmdirc.util.ConfigFile;
-import com.dmdirc.util.DownloadListener;
-import com.dmdirc.util.Downloader;
-import com.dmdirc.util.InvalidConfigFileException;
+import com.dmdirc.util.io.ConfigFile;
+import com.dmdirc.util.io.DownloadListener;
+import com.dmdirc.util.io.Downloader;
+import com.dmdirc.util.io.InvalidConfigFileException;
 
 import java.io.File;
 import java.io.IOException;

src/com/dmdirc/addons/ui_swing/components/addonbrowser/InstallWorker.java

 import com.dmdirc.addons.ui_swing.components.LoggingSwingWorker;
 import com.dmdirc.plugins.PluginManager;
 import com.dmdirc.ui.themes.ThemeManager;
-import com.dmdirc.util.Downloader;
+import com.dmdirc.util.io.Downloader;
 
 import java.io.File;
 import java.io.IOException;

src/com/dmdirc/addons/ui_swing/components/addonpanel/AddonInfoPanel.java

 package com.dmdirc.addons.ui_swing.components.addonpanel;
 
 import com.dmdirc.addons.ui_swing.components.text.TextLabel;
-import com.dmdirc.util.ListenerList;
+import com.dmdirc.util.collections.ListenerList;
 
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;

src/com/dmdirc/addons/ui_swing/components/addonpanel/AddonToggle.java

 import com.dmdirc.ui.themes.ThemeManager;
 import com.dmdirc.updater.UpdateChecker;
 import com.dmdirc.updater.UpdateComponent;
-import com.dmdirc.util.ListenerList;
+import com.dmdirc.util.collections.ListenerList;
 
 /**
  * Wraps a Addon object (Theme or Plugin) with a boolean to indicate whether

src/com/dmdirc/addons/ui_swing/components/colours/OptionalColourChooser.java

 
 import com.dmdirc.addons.ui_swing.UIUtilities;
 import com.dmdirc.ui.messages.ColourManager;
-import com.dmdirc.util.ListenerList;
+import com.dmdirc.util.collections.ListenerList;
 
 import java.awt.Color;
 import java.awt.Dimension;

src/com/dmdirc/addons/ui_swing/components/durationeditor/DurationDisplay.java

 
 import com.dmdirc.addons.ui_swing.UIUtilities;
 import com.dmdirc.util.DateUtils;
-import com.dmdirc.util.ListenerList;
+import com.dmdirc.util.collections.ListenerList;
 
 import java.awt.Insets;
 import java.awt.Window;

src/com/dmdirc/addons/ui_swing/components/durationeditor/DurationEditor.java

 package com.dmdirc.addons.ui_swing.components.durationeditor;
 
 import com.dmdirc.addons.ui_swing.dialogs.StandardDialog;
-import com.dmdirc.util.ListenerList;
+import com.dmdirc.util.collections.ListenerList;
 
 import java.awt.Window;
 import java.awt.event.ActionEvent;

src/com/dmdirc/addons/ui_swing/components/expandingsettings/SettingsPanel.java

 import com.dmdirc.config.prefs.PreferencesCategory;
 import com.dmdirc.config.prefs.PreferencesSetting;
 
-import com.dmdirc.util.DoubleMap;
+import com.dmdirc.util.collections.DoubleMap;
 
 import javax.swing.BorderFactory;
 import javax.swing.JComponent;

src/com/dmdirc/addons/ui_swing/components/inputfields/SwingInputField.java

 import com.dmdirc.config.IdentityManager;
 import com.dmdirc.interfaces.ui.InputField;
 import com.dmdirc.interfaces.ui.InputValidationListener;
-import com.dmdirc.util.ListenerList;
+import com.dmdirc.util.collections.ListenerList;
 import com.dmdirc.util.ReturnableThread;
 
 import java.awt.Color;

src/com/dmdirc/addons/ui_swing/components/statusbar/ErrorPopup.java

 import com.dmdirc.logger.ErrorReportStatus;
 import com.dmdirc.logger.ProgramError;
 import com.dmdirc.ui.IconManager;
-import com.dmdirc.util.MapList;
+import com.dmdirc.util.collections.MapList;
 
 import java.awt.Font;
 import java.awt.Window;

src/com/dmdirc/addons/ui_swing/components/vetoable/VetoableComboBoxModel.java

 
 package com.dmdirc.addons.ui_swing.components.vetoable;
 
-import com.dmdirc.util.ListenerList;
+import com.dmdirc.util.collections.ListenerList;
 
 import javax.swing.DefaultComboBoxModel;
 

src/com/dmdirc/addons/ui_swing/dialogs/actioneditor/ActionConditionDisplayPanel.java

 import com.dmdirc.addons.ui_swing.components.text.TextLabel;
 import com.dmdirc.config.IdentityManager;
 import com.dmdirc.ui.IconManager;
-import com.dmdirc.util.ListenerList;
+import com.dmdirc.util.collections.ListenerList;
 
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;

src/com/dmdirc/addons/ui_swing/dialogs/actioneditor/ActionTriggersListPanel.java

 import com.dmdirc.addons.ui_swing.components.text.TextLabel;
 import com.dmdirc.config.IdentityManager;
 import com.dmdirc.ui.IconManager;
-import com.dmdirc.util.ListenerList;
+import com.dmdirc.util.collections.ListenerList;
 
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;

src/com/dmdirc/addons/ui_swing/dialogs/actioneditor/ActionTriggersPanel.java

 import com.dmdirc.addons.ui_swing.ComboBoxWidthModifier;
 import com.dmdirc.addons.ui_swing.components.renderers.ActionTypeRenderer;
 import com.dmdirc.addons.ui_swing.components.text.TextLabel;
-import com.dmdirc.util.MapList;
+import com.dmdirc.util.collections.MapList;
 
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;

src/com/dmdirc/addons/ui_swing/dialogs/actioneditor/ActionTypeModel.java

 
 import com.dmdirc.actions.ActionTypeComparator;
 import com.dmdirc.interfaces.actions.ActionType;
-import com.dmdirc.util.MapList;
+import com.dmdirc.util.collections.MapList;
 
 import java.awt.FontMetrics;
 import java.util.Collections;

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

 import com.dmdirc.util.validators.NotEmptyValidator;
 import com.dmdirc.interfaces.ConfigChangeListener;
 import com.dmdirc.parser.common.ChannelListModeItem;
-import com.dmdirc.util.MapList;
+import com.dmdirc.util.collections.MapList;
 
 import java.awt.Window;
 import java.awt.Dialog.ModalityType;

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

 import com.dmdirc.Channel;
 import com.dmdirc.Topic;
 import com.dmdirc.addons.ui_swing.UIUtilities;
-import com.dmdirc.util.ListenerList;
+import com.dmdirc.util.collections.ListenerList;
 
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;

src/com/dmdirc/addons/ui_swing/dialogs/serverlist/ServerListModel.java

 import com.dmdirc.addons.serverlists.ServerGroup;
 import com.dmdirc.addons.serverlists.ServerGroupItem;
 import com.dmdirc.addons.serverlists.ServerList;
-import com.dmdirc.util.ListenerList;
+import com.dmdirc.util.collections.ListenerList;
 
 import java.io.IOException;
 import java.net.URI;

src/com/dmdirc/addons/ui_swing/textpane/TextPaneBoundedRangeModel.java

  */
 package com.dmdirc.addons.ui_swing.textpane;
 
-import com.dmdirc.util.ListenerList;
+import com.dmdirc.util.collections.ListenerList;
 
 import javax.swing.BoundedRangeModel;
 import javax.swing.event.ChangeEvent;

src/com/dmdirc/addons/ui_swing/textpane/TextPaneCanvas.java

 import com.dmdirc.ui.messages.IRCDocument;
 import com.dmdirc.ui.messages.IRCTextAttribute;
 import com.dmdirc.ui.messages.LinePosition;
-import com.dmdirc.util.ListenerList;
+import com.dmdirc.util.collections.ListenerList;
 import com.dmdirc.util.URLBuilder;
 
 import java.awt.Cursor;

src/com/dmdirc/addons/ui_swing/wizard/WizardPanel.java

 import com.dmdirc.addons.ui_swing.components.EtchedLineBorder;
 import com.dmdirc.addons.ui_swing.components.TitlePanel;
 import com.dmdirc.addons.ui_swing.components.EtchedLineBorder.BorderSide;
-import com.dmdirc.util.ListenerList;
+import com.dmdirc.util.collections.ListenerList;
 
 import java.awt.Color;
 import java.awt.event.ActionEvent;

test/com/dmdirc/addons/logging/LoggingPluginTest.java

 import com.dmdirc.parser.interfaces.ChannelInfo;
 import com.dmdirc.parser.interfaces.ClientInfo;
 import com.dmdirc.parser.interfaces.Parser;
-import com.dmdirc.util.ConfigFile;
+import com.dmdirc.util.io.ConfigFile;
 
 import java.util.Map;
 

test/com/dmdirc/addons/logging/TestLoggingPlugin.java

 
 import com.dmdirc.interfaces.ActionController;
 import com.dmdirc.plugins.PluginInfo;
-import com.dmdirc.util.MapList;
+import com.dmdirc.util.collections.MapList;
 import static org.mockito.Mockito.*;
 
 public class TestLoggingPlugin extends LoggingPlugin {

test/com/dmdirc/addons/mediasource_vlc/VlcMediaSourcePluginTest.java

 package com.dmdirc.addons.mediasource_vlc;
 
 import com.dmdirc.plugins.PluginInfo;
-import com.dmdirc.util.TextFile;
+import com.dmdirc.util.io.TextFile;
 import java.io.IOException;
 import org.junit.Test;
 import static org.junit.Assert.*;