Sfoglia il codice sorgente

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>
tags/0.7rc1
Chris Smith 12 anni fa
parent
commit
c7e9a3c076
43 ha cambiato i file con 57 aggiunte e 57 eliminazioni
  1. 1
    1
      src/com/dmdirc/addons/dcc/io/DCCTransfer.java
  2. 1
    1
      src/com/dmdirc/addons/dcc/kde/KDialogProcess.java
  3. 1
    1
      src/com/dmdirc/addons/exec/ExecCommand.java
  4. 1
    1
      src/com/dmdirc/addons/freedesktop_notifications/FreeDesktopNotificationsPlugin.java
  5. 1
    1
      src/com/dmdirc/addons/lagdisplay/LagDisplayPlugin.java
  6. 1
    1
      src/com/dmdirc/addons/lagdisplay/PingHistoryPanel.java
  7. 5
    5
      src/com/dmdirc/addons/logging/LoggingPlugin.java
  8. 3
    3
      src/com/dmdirc/addons/mediasource_linux_title/TitleMediaSource.java
  9. 1
    1
      src/com/dmdirc/addons/mediasource_vlc/VlcMediaSourcePlugin.java
  10. 1
    1
      src/com/dmdirc/addons/mediasource_windows/WindowsMediaSourcePlugin.java
  11. 2
    2
      src/com/dmdirc/addons/scriptplugin/ScriptEngineWrapper.java
  12. 3
    3
      src/com/dmdirc/addons/scriptplugin/ScriptPlugin.java
  13. 2
    2
      src/com/dmdirc/addons/ui_swing/MainFrame.java
  14. 1
    1
      src/com/dmdirc/addons/ui_swing/SwingWindowFactory.java
  15. 2
    2
      src/com/dmdirc/addons/ui_swing/adapters/ObservableListTableModelAdapter.java
  16. 1
    1
      src/com/dmdirc/addons/ui_swing/components/FileBrowser.java
  17. 1
    1
      src/com/dmdirc/addons/ui_swing/components/OptionalJSpinner.java
  18. 1
    1
      src/com/dmdirc/addons/ui_swing/components/SendWorker.java
  19. 1
    1
      src/com/dmdirc/addons/ui_swing/components/SwingSearchBar.java
  20. 4
    4
      src/com/dmdirc/addons/ui_swing/components/addonbrowser/DataLoaderWorker.java
  21. 1
    1
      src/com/dmdirc/addons/ui_swing/components/addonbrowser/InstallWorker.java
  22. 1
    1
      src/com/dmdirc/addons/ui_swing/components/addonpanel/AddonInfoPanel.java
  23. 1
    1
      src/com/dmdirc/addons/ui_swing/components/addonpanel/AddonToggle.java
  24. 1
    1
      src/com/dmdirc/addons/ui_swing/components/colours/OptionalColourChooser.java
  25. 1
    1
      src/com/dmdirc/addons/ui_swing/components/durationeditor/DurationDisplay.java
  26. 1
    1
      src/com/dmdirc/addons/ui_swing/components/durationeditor/DurationEditor.java
  27. 1
    1
      src/com/dmdirc/addons/ui_swing/components/expandingsettings/SettingsPanel.java
  28. 1
    1
      src/com/dmdirc/addons/ui_swing/components/inputfields/SwingInputField.java
  29. 1
    1
      src/com/dmdirc/addons/ui_swing/components/statusbar/ErrorPopup.java
  30. 1
    1
      src/com/dmdirc/addons/ui_swing/components/vetoable/VetoableComboBoxModel.java
  31. 1
    1
      src/com/dmdirc/addons/ui_swing/dialogs/actioneditor/ActionConditionDisplayPanel.java
  32. 1
    1
      src/com/dmdirc/addons/ui_swing/dialogs/actioneditor/ActionTriggersListPanel.java
  33. 1
    1
      src/com/dmdirc/addons/ui_swing/dialogs/actioneditor/ActionTriggersPanel.java
  34. 1
    1
      src/com/dmdirc/addons/ui_swing/dialogs/actioneditor/ActionTypeModel.java
  35. 1
    1
      src/com/dmdirc/addons/ui_swing/dialogs/channelsetting/ChannelListModesPane.java
  36. 1
    1
      src/com/dmdirc/addons/ui_swing/dialogs/channelsetting/TopicHistoryPane.java
  37. 1
    1
      src/com/dmdirc/addons/ui_swing/dialogs/serverlist/ServerListModel.java
  38. 1
    1
      src/com/dmdirc/addons/ui_swing/textpane/TextPaneBoundedRangeModel.java
  39. 1
    1
      src/com/dmdirc/addons/ui_swing/textpane/TextPaneCanvas.java
  40. 1
    1
      src/com/dmdirc/addons/ui_swing/wizard/WizardPanel.java
  41. 1
    1
      test/com/dmdirc/addons/logging/LoggingPluginTest.java
  42. 1
    1
      test/com/dmdirc/addons/logging/TestLoggingPlugin.java
  43. 1
    1
      test/com/dmdirc/addons/mediasource_vlc/VlcMediaSourcePluginTest.java

+ 1
- 1
src/com/dmdirc/addons/dcc/io/DCCTransfer.java Vedi File

@@ -23,7 +23,7 @@
23 23
 package com.dmdirc.addons.dcc.io;
24 24
 
25 25
 import com.dmdirc.addons.dcc.DCCTransferHandler;
26
-import com.dmdirc.util.ListenerList;
26
+import com.dmdirc.util.collections.ListenerList;
27 27
 
28 28
 import java.io.DataInputStream;
29 29
 import java.io.DataOutputStream;

+ 1
- 1
src/com/dmdirc/addons/dcc/kde/KDialogProcess.java Vedi File

@@ -22,7 +22,7 @@
22 22
 
23 23
 package com.dmdirc.addons.dcc.kde;
24 24
 
25
-import com.dmdirc.util.StreamReader;
25
+import com.dmdirc.util.io.StreamReader;
26 26
 
27 27
 import java.io.File;
28 28
 import java.io.IOException;

+ 1
- 1
src/com/dmdirc/addons/exec/ExecCommand.java Vedi File

@@ -31,7 +31,7 @@ import com.dmdirc.commandparser.commands.context.CommandContext;
31 31
 import com.dmdirc.logger.ErrorLevel;
32 32
 import com.dmdirc.logger.Logger;
33 33
 import com.dmdirc.util.CommandUtils;
34
-import com.dmdirc.util.StreamReader;
34
+import com.dmdirc.util.io.StreamReader;
35 35
 
36 36
 import java.io.File;
37 37
 import java.io.IOException;

+ 1
- 1
src/com/dmdirc/addons/freedesktop_notifications/FreeDesktopNotificationsPlugin.java Vedi File

@@ -35,7 +35,7 @@ import com.dmdirc.plugins.BaseFileDependantPlugin;
35 35
 import com.dmdirc.plugins.PluginInfo;
36 36
 import com.dmdirc.plugins.PluginManager;
37 37
 import com.dmdirc.ui.messages.Styliser;
38
-import com.dmdirc.util.StreamReader;
38
+import com.dmdirc.util.io.StreamReader;
39 39
 import com.dmdirc.util.resourcemanager.ResourceManager;
40 40
 
41 41
 import java.io.IOException;

+ 1
- 1
src/com/dmdirc/addons/lagdisplay/LagDisplayPlugin.java Vedi File

@@ -43,7 +43,7 @@ import com.dmdirc.interfaces.ConfigChangeListener;
43 43
 import com.dmdirc.plugins.BasePlugin;
44 44
 import com.dmdirc.plugins.PluginInfo;
45 45
 import com.dmdirc.plugins.PluginManager;
46
-import com.dmdirc.util.RollingList;
46
+import com.dmdirc.util.collections.RollingList;
47 47
 
48 48
 import java.util.Date;
49 49
 import java.util.HashMap;

+ 1
- 1
src/com/dmdirc/addons/lagdisplay/PingHistoryPanel.java Vedi File

@@ -24,7 +24,7 @@ package com.dmdirc.addons.lagdisplay;
24 24
 
25 25
 import com.dmdirc.addons.ui_swing.SwingController;
26 26
 import com.dmdirc.plugins.PluginManager;
27
-import com.dmdirc.util.RollingList;
27
+import com.dmdirc.util.collections.RollingList;
28 28
 
29 29
 import java.awt.Color;
30 30
 import java.awt.Dimension;

+ 5
- 5
src/com/dmdirc/addons/logging/LoggingPlugin.java Vedi File

@@ -47,7 +47,7 @@ import com.dmdirc.parser.interfaces.Parser;
47 47
 import com.dmdirc.plugins.BasePlugin;
48 48
 import com.dmdirc.plugins.PluginInfo;
49 49
 import com.dmdirc.ui.messages.Styliser;
50
-import com.dmdirc.util.StreamUtil;
50
+import com.dmdirc.util.io.StreamUtils;
51 51
 
52 52
 import java.awt.Color;
53 53
 import java.io.BufferedWriter;
@@ -188,7 +188,7 @@ public class LoggingPlugin extends BasePlugin implements ActionListener,
188 188
             final Collection<String> old = new ArrayList<String>(openFiles.size());
189 189
             for (Map.Entry<String, OpenFile> entry : openFiles.entrySet()) {
190 190
                 if (entry.getValue().lastUsedTime < oldestTime) {
191
-                    StreamUtil.close(entry.getValue().writer);
191
+                    StreamUtils.close(entry.getValue().writer);
192 192
                     old.add(entry.getKey());
193 193
                 }
194 194
             }
@@ -211,7 +211,7 @@ public class LoggingPlugin extends BasePlugin implements ActionListener,
211 211
 
212 212
         synchronized (openFiles) {
213 213
             for (OpenFile file : openFiles.values()) {
214
-                StreamUtil.close(file.writer);
214
+                StreamUtils.close(file.writer);
215 215
             }
216 216
             openFiles.clear();
217 217
         }
@@ -338,7 +338,7 @@ public class LoggingPlugin extends BasePlugin implements ActionListener,
338 338
             case QUERY_CLOSED:
339 339
                 appendLine(filename, "*** Query closed at: %s", openedAtFormat.format(new Date()));
340 340
                 if (openFiles.containsKey(filename)) {
341
-                    StreamUtil.close(openFiles.get(filename).writer);
341
+                    StreamUtils.close(openFiles.get(filename).writer);
342 342
                     openFiles.remove(filename);
343 343
                 }
344 344
                 break;
@@ -387,7 +387,7 @@ public class LoggingPlugin extends BasePlugin implements ActionListener,
387 387
             case CHANNEL_CLOSED:
388 388
                 appendLine(filename, "*** Channel closed at: %s", openedAtFormat.format(new Date()));
389 389
                 if (openFiles.containsKey(filename)) {
390
-                    StreamUtil.close(openFiles.get(filename).writer);
390
+                    StreamUtils.close(openFiles.get(filename).writer);
391 391
                     openFiles.remove(filename);
392 392
                 }
393 393
                 break;

+ 3
- 3
src/com/dmdirc/addons/mediasource_linux_title/TitleMediaSource.java Vedi File

@@ -26,7 +26,7 @@ import com.dmdirc.addons.nowplaying.MediaSource;
26 26
 import com.dmdirc.addons.nowplaying.MediaSourceState;
27 27
 import com.dmdirc.logger.ErrorLevel;
28 28
 import com.dmdirc.logger.Logger;
29
-import com.dmdirc.util.StreamUtil;
29
+import com.dmdirc.util.io.StreamUtils;
30 30
 
31 31
 import java.io.BufferedReader;
32 32
 import java.io.IOException;
@@ -144,8 +144,8 @@ public class TitleMediaSource implements MediaSource {
144 144
             Logger.userError(ErrorLevel.LOW, "Unable to retrieve media source info",
145 145
                     ex);
146 146
         } finally {
147
-            StreamUtil.close(reader);
148
-            StreamUtil.close(input);
147
+            StreamUtils.close(reader);
148
+            StreamUtils.close(input);
149 149
         }
150 150
 
151 151
         return "";

+ 1
- 1
src/com/dmdirc/addons/mediasource_vlc/VlcMediaSourcePlugin.java Vedi File

@@ -32,7 +32,7 @@ import com.dmdirc.config.prefs.PreferencesSetting;
32 32
 import com.dmdirc.config.prefs.PreferencesType;
33 33
 import com.dmdirc.plugins.BasePlugin;
34 34
 import com.dmdirc.plugins.PluginInfo;
35
-import com.dmdirc.util.Downloader;
35
+import com.dmdirc.util.io.Downloader;
36 36
 
37 37
 import java.io.File;
38 38
 import java.io.IOException;

+ 1
- 1
src/com/dmdirc/addons/mediasource_windows/WindowsMediaSourcePlugin.java Vedi File

@@ -29,7 +29,7 @@ import com.dmdirc.logger.Logger;
29 29
 import com.dmdirc.plugins.BaseFileDependantPlugin;
30 30
 import com.dmdirc.plugins.PluginInfo;
31 31
 import com.dmdirc.plugins.PluginManager;
32
-import com.dmdirc.util.StreamReader;
32
+import com.dmdirc.util.io.StreamReader;
33 33
 import com.dmdirc.util.resourcemanager.ResourceManager;
34 34
 
35 35
 import java.io.IOException;

+ 2
- 2
src/com/dmdirc/addons/scriptplugin/ScriptEngineWrapper.java Vedi File

@@ -24,7 +24,7 @@ package com.dmdirc.addons.scriptplugin;
24 24
 
25 25
 import com.dmdirc.logger.ErrorLevel;
26 26
 import com.dmdirc.logger.Logger;
27
-import com.dmdirc.util.StreamUtil;
27
+import com.dmdirc.util.io.StreamUtils;
28 28
 
29 29
 import java.io.File;
30 30
 import java.io.FileNotFoundException;
@@ -99,7 +99,7 @@ public class ScriptEngineWrapper {
99 99
                 fr = new FileReader(file);
100 100
                 result.eval(fr);
101 101
             } finally {
102
-                StreamUtil.close(fr);
102
+                StreamUtils.close(fr);
103 103
             }
104 104
         }
105 105
 

+ 3
- 3
src/com/dmdirc/addons/scriptplugin/ScriptPlugin.java Vedi File

@@ -30,7 +30,7 @@ import com.dmdirc.interfaces.actions.ActionType;
30 30
 import com.dmdirc.logger.ErrorLevel;
31 31
 import com.dmdirc.logger.Logger;
32 32
 import com.dmdirc.plugins.BasePlugin;
33
-import com.dmdirc.util.StreamUtil;
33
+import com.dmdirc.util.io.StreamUtils;
34 34
 import com.dmdirc.util.validators.ValidationResponse;
35 35
 
36 36
 import java.io.File;
@@ -97,7 +97,7 @@ public final class ScriptPlugin extends BasePlugin implements ActionListener {
97 97
             } catch (IOException e) {
98 98
                 Logger.userError(ErrorLevel.LOW, "Error reading savedVariables from '"+savedVariables.getPath()+"': "+e.getMessage(), e);
99 99
             } finally {
100
-                StreamUtil.close(fis);
100
+                StreamUtils.close(fis);
101 101
             }
102 102
         }
103 103
         super.onLoad();
@@ -116,7 +116,7 @@ public final class ScriptPlugin extends BasePlugin implements ActionListener {
116 116
         } catch (IOException e) {
117 117
             Logger.userError(ErrorLevel.LOW, "Error reading savedVariables to '"+savedVariables.getPath()+"': "+e.getMessage(), e);
118 118
         } finally {
119
-            StreamUtil.close(fos);
119
+            StreamUtils.close(fos);
120 120
         }
121 121
         super.onUnload();
122 122
     }

+ 2
- 2
src/com/dmdirc/addons/ui_swing/MainFrame.java Vedi File

@@ -46,8 +46,8 @@ import com.dmdirc.logger.Logger;
46 46
 import com.dmdirc.ui.Colour;
47 47
 import com.dmdirc.ui.CoreUIUtils;
48 48
 import com.dmdirc.ui.IconManager;
49
-import com.dmdirc.util.ListenerList;
50
-import com.dmdirc.util.QueuedLinkedHashSet;
49
+import com.dmdirc.util.collections.ListenerList;
50
+import com.dmdirc.util.collections.QueuedLinkedHashSet;
51 51
 import com.dmdirc.util.ReturnableThread;
52 52
 
53 53
 import java.awt.Dimension;

+ 1
- 1
src/com/dmdirc/addons/ui_swing/SwingWindowFactory.java Vedi File

@@ -33,7 +33,7 @@ import com.dmdirc.logger.Logger;
33 33
 import com.dmdirc.ui.core.components.WindowComponent;
34 34
 import com.dmdirc.interfaces.ui.FrameListener;
35 35
 import com.dmdirc.interfaces.ui.Window;
36
-import com.dmdirc.util.ListenerList;
36
+import com.dmdirc.util.collections.ListenerList;
37 37
 
38 38
 import java.util.Arrays;
39 39
 import java.util.Collection;

+ 2
- 2
src/com/dmdirc/addons/ui_swing/adapters/ObservableListTableModelAdapter.java Vedi File

@@ -23,8 +23,8 @@
23 23
 package com.dmdirc.addons.ui_swing.adapters;
24 24
 
25 25
 import com.dmdirc.addons.ui_swing.UIUtilities;
26
-import com.dmdirc.util.ListObserver;
27
-import com.dmdirc.util.ObservableList;
26
+import com.dmdirc.util.collections.ListObserver;
27
+import com.dmdirc.util.collections.ObservableList;
28 28
 
29 29
 import javax.swing.table.AbstractTableModel;
30 30
 

+ 1
- 1
src/com/dmdirc/addons/ui_swing/components/FileBrowser.java Vedi File

@@ -25,7 +25,7 @@ package com.dmdirc.addons.ui_swing.components;
25 25
 import com.dmdirc.addons.ui_swing.components.validating.ValidatingJTextField;
26 26
 import com.dmdirc.config.prefs.PreferencesSetting;
27 27
 import com.dmdirc.ui.IconManager;
28
-import com.dmdirc.util.ListenerList;
28
+import com.dmdirc.util.collections.ListenerList;
29 29
 
30 30
 import java.awt.event.ActionEvent;
31 31
 import java.awt.event.ActionListener;

+ 1
- 1
src/com/dmdirc/addons/ui_swing/components/OptionalJSpinner.java Vedi File

@@ -22,7 +22,7 @@
22 22
 
23 23
 package com.dmdirc.addons.ui_swing.components;
24 24
 
25
-import com.dmdirc.util.ListenerList;
25
+import com.dmdirc.util.collections.ListenerList;
26 26
 
27 27
 import java.awt.event.ActionEvent;
28 28
 import java.awt.event.ActionListener;

+ 1
- 1
src/com/dmdirc/addons/ui_swing/components/SendWorker.java Vedi File

@@ -24,7 +24,7 @@ package com.dmdirc.addons.ui_swing.components;
24 24
 
25 25
 import com.dmdirc.addons.ui_swing.dialogs.FeedbackDialog;
26 26
 import com.dmdirc.config.IdentityManager;
27
-import com.dmdirc.util.Downloader;
27
+import com.dmdirc.util.io.Downloader;
28 28
 
29 29
 import java.io.IOException;
30 30
 import java.net.MalformedURLException;

+ 1
- 1
src/com/dmdirc/addons/ui_swing/components/SwingSearchBar.java Vedi File

@@ -34,7 +34,7 @@ import com.dmdirc.interfaces.ui.SearchBar.Direction;
34 34
 import com.dmdirc.ui.messages.IRCDocument;
35 35
 import com.dmdirc.ui.messages.IRCDocumentSearcher;
36 36
 import com.dmdirc.ui.messages.LinePosition;
37
-import com.dmdirc.util.ListenerList;
37
+import com.dmdirc.util.collections.ListenerList;
38 38
 
39 39
 import java.awt.event.ActionEvent;
40 40
 import java.awt.event.ActionListener;

+ 4
- 4
src/com/dmdirc/addons/ui_swing/components/addonbrowser/DataLoaderWorker.java Vedi File

@@ -28,10 +28,10 @@ import com.dmdirc.addons.ui_swing.components.LoggingSwingWorker;
28 28
 import com.dmdirc.addons.ui_swing.components.text.TextLabel;
29 29
 import com.dmdirc.logger.ErrorLevel;
30 30
 import com.dmdirc.logger.Logger;
31
-import com.dmdirc.util.ConfigFile;
32
-import com.dmdirc.util.DownloadListener;
33
-import com.dmdirc.util.Downloader;
34
-import com.dmdirc.util.InvalidConfigFileException;
31
+import com.dmdirc.util.io.ConfigFile;
32
+import com.dmdirc.util.io.DownloadListener;
33
+import com.dmdirc.util.io.Downloader;
34
+import com.dmdirc.util.io.InvalidConfigFileException;
35 35
 
36 36
 import java.io.File;
37 37
 import java.io.IOException;

+ 1
- 1
src/com/dmdirc/addons/ui_swing/components/addonbrowser/InstallWorker.java Vedi File

@@ -27,7 +27,7 @@ import com.dmdirc.actions.ActionManager;
27 27
 import com.dmdirc.addons.ui_swing.components.LoggingSwingWorker;
28 28
 import com.dmdirc.plugins.PluginManager;
29 29
 import com.dmdirc.ui.themes.ThemeManager;
30
-import com.dmdirc.util.Downloader;
30
+import com.dmdirc.util.io.Downloader;
31 31
 
32 32
 import java.io.File;
33 33
 import java.io.IOException;

+ 1
- 1
src/com/dmdirc/addons/ui_swing/components/addonpanel/AddonInfoPanel.java Vedi File

@@ -23,7 +23,7 @@
23 23
 package com.dmdirc.addons.ui_swing.components.addonpanel;
24 24
 
25 25
 import com.dmdirc.addons.ui_swing.components.text.TextLabel;
26
-import com.dmdirc.util.ListenerList;
26
+import com.dmdirc.util.collections.ListenerList;
27 27
 
28 28
 import java.awt.event.ActionEvent;
29 29
 import java.awt.event.ActionListener;

+ 1
- 1
src/com/dmdirc/addons/ui_swing/components/addonpanel/AddonToggle.java Vedi File

@@ -28,7 +28,7 @@ import com.dmdirc.ui.themes.Theme;
28 28
 import com.dmdirc.ui.themes.ThemeManager;
29 29
 import com.dmdirc.updater.UpdateChecker;
30 30
 import com.dmdirc.updater.UpdateComponent;
31
-import com.dmdirc.util.ListenerList;
31
+import com.dmdirc.util.collections.ListenerList;
32 32
 
33 33
 /**
34 34
  * Wraps a Addon object (Theme or Plugin) with a boolean to indicate whether

+ 1
- 1
src/com/dmdirc/addons/ui_swing/components/colours/OptionalColourChooser.java Vedi File

@@ -24,7 +24,7 @@ package com.dmdirc.addons.ui_swing.components.colours;
24 24
 
25 25
 import com.dmdirc.addons.ui_swing.UIUtilities;
26 26
 import com.dmdirc.ui.messages.ColourManager;
27
-import com.dmdirc.util.ListenerList;
27
+import com.dmdirc.util.collections.ListenerList;
28 28
 
29 29
 import java.awt.Color;
30 30
 import java.awt.Dimension;

+ 1
- 1
src/com/dmdirc/addons/ui_swing/components/durationeditor/DurationDisplay.java Vedi File

@@ -24,7 +24,7 @@ package com.dmdirc.addons.ui_swing.components.durationeditor;
24 24
 
25 25
 import com.dmdirc.addons.ui_swing.UIUtilities;
26 26
 import com.dmdirc.util.DateUtils;
27
-import com.dmdirc.util.ListenerList;
27
+import com.dmdirc.util.collections.ListenerList;
28 28
 
29 29
 import java.awt.Insets;
30 30
 import java.awt.Window;

+ 1
- 1
src/com/dmdirc/addons/ui_swing/components/durationeditor/DurationEditor.java Vedi File

@@ -23,7 +23,7 @@
23 23
 package com.dmdirc.addons.ui_swing.components.durationeditor;
24 24
 
25 25
 import com.dmdirc.addons.ui_swing.dialogs.StandardDialog;
26
-import com.dmdirc.util.ListenerList;
26
+import com.dmdirc.util.collections.ListenerList;
27 27
 
28 28
 import java.awt.Window;
29 29
 import java.awt.event.ActionEvent;

+ 1
- 1
src/com/dmdirc/addons/ui_swing/components/expandingsettings/SettingsPanel.java Vedi File

@@ -28,7 +28,7 @@ import com.dmdirc.addons.ui_swing.components.text.TextLabel;
28 28
 import com.dmdirc.config.prefs.PreferencesCategory;
29 29
 import com.dmdirc.config.prefs.PreferencesSetting;
30 30
 
31
-import com.dmdirc.util.DoubleMap;
31
+import com.dmdirc.util.collections.DoubleMap;
32 32
 
33 33
 import javax.swing.BorderFactory;
34 34
 import javax.swing.JComponent;

+ 1
- 1
src/com/dmdirc/addons/ui_swing/components/inputfields/SwingInputField.java Vedi File

@@ -28,7 +28,7 @@ import com.dmdirc.addons.ui_swing.components.frames.InputTextFrame;
28 28
 import com.dmdirc.config.IdentityManager;
29 29
 import com.dmdirc.interfaces.ui.InputField;
30 30
 import com.dmdirc.interfaces.ui.InputValidationListener;
31
-import com.dmdirc.util.ListenerList;
31
+import com.dmdirc.util.collections.ListenerList;
32 32
 import com.dmdirc.util.ReturnableThread;
33 33
 
34 34
 import java.awt.Color;

+ 1
- 1
src/com/dmdirc/addons/ui_swing/components/statusbar/ErrorPopup.java Vedi File

@@ -28,7 +28,7 @@ import com.dmdirc.logger.ErrorManager;
28 28
 import com.dmdirc.logger.ErrorReportStatus;
29 29
 import com.dmdirc.logger.ProgramError;
30 30
 import com.dmdirc.ui.IconManager;
31
-import com.dmdirc.util.MapList;
31
+import com.dmdirc.util.collections.MapList;
32 32
 
33 33
 import java.awt.Font;
34 34
 import java.awt.Window;

+ 1
- 1
src/com/dmdirc/addons/ui_swing/components/vetoable/VetoableComboBoxModel.java Vedi File

@@ -22,7 +22,7 @@
22 22
 
23 23
 package com.dmdirc.addons.ui_swing.components.vetoable;
24 24
 
25
-import com.dmdirc.util.ListenerList;
25
+import com.dmdirc.util.collections.ListenerList;
26 26
 
27 27
 import javax.swing.DefaultComboBoxModel;
28 28
 

+ 1
- 1
src/com/dmdirc/addons/ui_swing/dialogs/actioneditor/ActionConditionDisplayPanel.java Vedi File

@@ -29,7 +29,7 @@ import com.dmdirc.addons.ui_swing.components.ImageToggleButton;
29 29
 import com.dmdirc.addons.ui_swing.components.text.TextLabel;
30 30
 import com.dmdirc.config.IdentityManager;
31 31
 import com.dmdirc.ui.IconManager;
32
-import com.dmdirc.util.ListenerList;
32
+import com.dmdirc.util.collections.ListenerList;
33 33
 
34 34
 import java.awt.event.ActionEvent;
35 35
 import java.awt.event.ActionListener;

+ 1
- 1
src/com/dmdirc/addons/ui_swing/dialogs/actioneditor/ActionTriggersListPanel.java Vedi File

@@ -27,7 +27,7 @@ import com.dmdirc.addons.ui_swing.components.ImageButton;
27 27
 import com.dmdirc.addons.ui_swing.components.text.TextLabel;
28 28
 import com.dmdirc.config.IdentityManager;
29 29
 import com.dmdirc.ui.IconManager;
30
-import com.dmdirc.util.ListenerList;
30
+import com.dmdirc.util.collections.ListenerList;
31 31
 
32 32
 import java.awt.event.ActionEvent;
33 33
 import java.awt.event.ActionListener;

+ 1
- 1
src/com/dmdirc/addons/ui_swing/dialogs/actioneditor/ActionTriggersPanel.java Vedi File

@@ -28,7 +28,7 @@ import com.dmdirc.interfaces.actions.ActionType;
28 28
 import com.dmdirc.addons.ui_swing.ComboBoxWidthModifier;
29 29
 import com.dmdirc.addons.ui_swing.components.renderers.ActionTypeRenderer;
30 30
 import com.dmdirc.addons.ui_swing.components.text.TextLabel;
31
-import com.dmdirc.util.MapList;
31
+import com.dmdirc.util.collections.MapList;
32 32
 
33 33
 import java.awt.event.ActionEvent;
34 34
 import java.awt.event.ActionListener;

+ 1
- 1
src/com/dmdirc/addons/ui_swing/dialogs/actioneditor/ActionTypeModel.java Vedi File

@@ -24,7 +24,7 @@ package com.dmdirc.addons.ui_swing.dialogs.actioneditor;
24 24
 
25 25
 import com.dmdirc.actions.ActionTypeComparator;
26 26
 import com.dmdirc.interfaces.actions.ActionType;
27
-import com.dmdirc.util.MapList;
27
+import com.dmdirc.util.collections.MapList;
28 28
 
29 29
 import java.awt.FontMetrics;
30 30
 import java.util.Collections;

+ 1
- 1
src/com/dmdirc/addons/ui_swing/dialogs/channelsetting/ChannelListModesPane.java Vedi File

@@ -32,7 +32,7 @@ import com.dmdirc.config.IdentityManager;
32 32
 import com.dmdirc.util.validators.NotEmptyValidator;
33 33
 import com.dmdirc.interfaces.ConfigChangeListener;
34 34
 import com.dmdirc.parser.common.ChannelListModeItem;
35
-import com.dmdirc.util.MapList;
35
+import com.dmdirc.util.collections.MapList;
36 36
 
37 37
 import java.awt.Window;
38 38
 import java.awt.Dialog.ModalityType;

+ 1
- 1
src/com/dmdirc/addons/ui_swing/dialogs/channelsetting/TopicHistoryPane.java Vedi File

@@ -25,7 +25,7 @@ package com.dmdirc.addons.ui_swing.dialogs.channelsetting;
25 25
 import com.dmdirc.Channel;
26 26
 import com.dmdirc.Topic;
27 27
 import com.dmdirc.addons.ui_swing.UIUtilities;
28
-import com.dmdirc.util.ListenerList;
28
+import com.dmdirc.util.collections.ListenerList;
29 29
 
30 30
 import java.awt.event.ActionEvent;
31 31
 import java.awt.event.ActionListener;

+ 1
- 1
src/com/dmdirc/addons/ui_swing/dialogs/serverlist/ServerListModel.java Vedi File

@@ -30,7 +30,7 @@ import com.dmdirc.addons.serverlists.ServerEntry;
30 30
 import com.dmdirc.addons.serverlists.ServerGroup;
31 31
 import com.dmdirc.addons.serverlists.ServerGroupItem;
32 32
 import com.dmdirc.addons.serverlists.ServerList;
33
-import com.dmdirc.util.ListenerList;
33
+import com.dmdirc.util.collections.ListenerList;
34 34
 
35 35
 import java.io.IOException;
36 36
 import java.net.URI;

+ 1
- 1
src/com/dmdirc/addons/ui_swing/textpane/TextPaneBoundedRangeModel.java Vedi File

@@ -21,7 +21,7 @@
21 21
  */
22 22
 package com.dmdirc.addons.ui_swing.textpane;
23 23
 
24
-import com.dmdirc.util.ListenerList;
24
+import com.dmdirc.util.collections.ListenerList;
25 25
 
26 26
 import javax.swing.BoundedRangeModel;
27 27
 import javax.swing.event.ChangeEvent;

+ 1
- 1
src/com/dmdirc/addons/ui_swing/textpane/TextPaneCanvas.java Vedi File

@@ -30,7 +30,7 @@ import com.dmdirc.interfaces.ConfigChangeListener;
30 30
 import com.dmdirc.ui.messages.IRCDocument;
31 31
 import com.dmdirc.ui.messages.IRCTextAttribute;
32 32
 import com.dmdirc.ui.messages.LinePosition;
33
-import com.dmdirc.util.ListenerList;
33
+import com.dmdirc.util.collections.ListenerList;
34 34
 import com.dmdirc.util.URLBuilder;
35 35
 
36 36
 import java.awt.Cursor;

+ 1
- 1
src/com/dmdirc/addons/ui_swing/wizard/WizardPanel.java Vedi File

@@ -25,7 +25,7 @@ package com.dmdirc.addons.ui_swing.wizard;
25 25
 import com.dmdirc.addons.ui_swing.components.EtchedLineBorder;
26 26
 import com.dmdirc.addons.ui_swing.components.TitlePanel;
27 27
 import com.dmdirc.addons.ui_swing.components.EtchedLineBorder.BorderSide;
28
-import com.dmdirc.util.ListenerList;
28
+import com.dmdirc.util.collections.ListenerList;
29 29
 
30 30
 import java.awt.Color;
31 31
 import java.awt.event.ActionEvent;

+ 1
- 1
test/com/dmdirc/addons/logging/LoggingPluginTest.java Vedi File

@@ -30,7 +30,7 @@ import com.dmdirc.config.IdentityManager;
30 30
 import com.dmdirc.parser.interfaces.ChannelInfo;
31 31
 import com.dmdirc.parser.interfaces.ClientInfo;
32 32
 import com.dmdirc.parser.interfaces.Parser;
33
-import com.dmdirc.util.ConfigFile;
33
+import com.dmdirc.util.io.ConfigFile;
34 34
 
35 35
 import java.util.Map;
36 36
 

+ 1
- 1
test/com/dmdirc/addons/logging/TestLoggingPlugin.java Vedi File

@@ -24,7 +24,7 @@ package com.dmdirc.addons.logging;
24 24
 
25 25
 import com.dmdirc.interfaces.ActionController;
26 26
 import com.dmdirc.plugins.PluginInfo;
27
-import com.dmdirc.util.MapList;
27
+import com.dmdirc.util.collections.MapList;
28 28
 import static org.mockito.Mockito.*;
29 29
 
30 30
 public class TestLoggingPlugin extends LoggingPlugin {

+ 1
- 1
test/com/dmdirc/addons/mediasource_vlc/VlcMediaSourcePluginTest.java Vedi File

@@ -23,7 +23,7 @@
23 23
 package com.dmdirc.addons.mediasource_vlc;
24 24
 
25 25
 import com.dmdirc.plugins.PluginInfo;
26
-import com.dmdirc.util.TextFile;
26
+import com.dmdirc.util.io.TextFile;
27 27
 import java.io.IOException;
28 28
 import org.junit.Test;
29 29
 import static org.junit.Assert.*;

Loading…
Annulla
Salva