mirror
/
DMDirc-Client
mirror of https://github.com/DMDirc/DMDirc.git
Watch 1
Star 0
Fork 0
Code Issues 0 Releases 49 Wiki Activity
Browse Source

Moved IconManager to UI 

Check to make sure imageURL isn't null for any reason (and throw an IAE if it is, to help debug)
Fixes issue 988

git-svn-id: http://svn.dmdirc.com/trunk@3646 00569f92-eb28-0410-84fd-f71c24880f
tags/0.6
Chris Smith 16 years ago
parent
288cc6ed4b
commit
79e0f9364b
23 changed files with 28 additions and 17 deletions
Unified View Show Diff Stats
  1. 1
    0
      src/com/dmdirc/Channel.java
  2. 1
    0
      src/com/dmdirc/CustomWindow.java
  3. 1
    0
      src/com/dmdirc/GlobalWindow.java
  4. 1
    0
      src/com/dmdirc/Query.java
  5. 1
    0
      src/com/dmdirc/Raw.java
  6. 1
    0
      src/com/dmdirc/Server.java
  7. 1
    1
      src/com/dmdirc/addons/dcc/DCCFrame.java
  8. 1
    1
      src/com/dmdirc/addons/logging/HistoryWindow.java
  9. 1
    1
      src/com/dmdirc/addons/systray/SystrayPlugin.java
  10. 1
    1
      src/com/dmdirc/logger/ErrorLevel.java
  11. 6
    1
      src/com/dmdirc/ui/IconManager.java
  12. 1
    1
      src/com/dmdirc/ui/swing/MainFrame.java
  13. 1
    1
      src/com/dmdirc/ui/swing/SwingController.java
  14. 1
    1
      src/com/dmdirc/ui/swing/components/FeedbackNag.java
  15. 1
    1
      src/com/dmdirc/ui/swing/components/InviteLabel.java
  16. 1
    1
      src/com/dmdirc/ui/swing/components/SwingInputField.java
  17. 1
    1
      src/com/dmdirc/ui/swing/components/SwingSearchBar.java
  18. 1
    1
      src/com/dmdirc/ui/swing/components/SwingStatusBar.java
  19. 1
    1
      src/com/dmdirc/ui/swing/components/expandingsettings/CurrentOptionsPanel.java
  20. 1
    1
      src/com/dmdirc/ui/swing/components/renderers/TreeViewTreeCellRenderer.java
  21. 1
    1
      src/com/dmdirc/ui/swing/components/validating/ValidatingJTextField.java
  22. 1
    1
      src/com/dmdirc/ui/swing/dialogs/actionseditor/ConditionsTabPanel.java
  23. 1
    1
      src/com/dmdirc/ui/swing/dialogs/error/FatalErrorDialog.java

+ 1
- 0
src/com/dmdirc/Channel.java View File

22
22
23 
 package com.dmdirc;
 23 
 package com.dmdirc;
24
24
25 
+import com.dmdirc.ui.IconManager;
25 
 import com.dmdirc.actions.ActionManager;
 26 
 import com.dmdirc.actions.ActionManager;
26 
 import com.dmdirc.actions.CoreActionType;
 27 
 import com.dmdirc.actions.CoreActionType;
27 
 import com.dmdirc.commandparser.CommandManager;
 28 
 import com.dmdirc.commandparser.CommandManager;

+ 1
- 0
src/com/dmdirc/CustomWindow.java View File

22
22
23 
 package com.dmdirc;
 23 
 package com.dmdirc;
24
24
25 
+import com.dmdirc.ui.IconManager;
25 
 import com.dmdirc.config.ConfigManager;
 26 
 import com.dmdirc.config.ConfigManager;
26 
 import com.dmdirc.config.IdentityManager;
 27 
 import com.dmdirc.config.IdentityManager;
27 
 import com.dmdirc.ui.WindowManager;
 28 
 import com.dmdirc.ui.WindowManager;

+ 1
- 0
src/com/dmdirc/GlobalWindow.java View File

22
22
23 
 package com.dmdirc;
 23 
 package com.dmdirc;
24
24
25 
+import com.dmdirc.ui.IconManager;
25 
 import com.dmdirc.commandparser.CommandManager;
 26 
 import com.dmdirc.commandparser.CommandManager;
26 
 import com.dmdirc.commandparser.CommandType;
 27 
 import com.dmdirc.commandparser.CommandType;
27 
 import com.dmdirc.commandparser.parsers.GlobalCommandParser;
 28 
 import com.dmdirc.commandparser.parsers.GlobalCommandParser;

+ 1
- 0
src/com/dmdirc/Query.java View File

22
22
23 
 package com.dmdirc;
 23 
 package com.dmdirc;
24
24
25 
+import com.dmdirc.ui.IconManager;
25 
 import com.dmdirc.actions.ActionManager;
 26 
 import com.dmdirc.actions.ActionManager;
26 
 import com.dmdirc.actions.CoreActionType;
 27 
 import com.dmdirc.actions.CoreActionType;
27 
 import com.dmdirc.commandparser.CommandManager;
 28 
 import com.dmdirc.commandparser.CommandManager;

+ 1
- 0
src/com/dmdirc/Raw.java View File

22
22
23 
 package com.dmdirc;
 23 
 package com.dmdirc;
24
24
25 
+import com.dmdirc.ui.IconManager;
25 
 import com.dmdirc.config.ConfigManager;
 26 
 import com.dmdirc.config.ConfigManager;
26 
 import com.dmdirc.logger.ErrorLevel;
 27 
 import com.dmdirc.logger.ErrorLevel;
27 
 import com.dmdirc.logger.Logger;
 28 
 import com.dmdirc.logger.Logger;

+ 1
- 0
src/com/dmdirc/Server.java View File

22
22
23 
 package com.dmdirc;
 23 
 package com.dmdirc;
24
24
25 
+import com.dmdirc.ui.IconManager;
25 
 import com.dmdirc.actions.ActionManager;
 26 
 import com.dmdirc.actions.ActionManager;
26 
 import com.dmdirc.actions.CoreActionType;
 27 
 import com.dmdirc.actions.CoreActionType;
27 
 import com.dmdirc.actions.wrappers.AliasWrapper;
 28 
 import com.dmdirc.actions.wrappers.AliasWrapper;

+ 1
- 1
src/com/dmdirc/addons/dcc/DCCFrame.java View File

22
22
23 
 package com.dmdirc.addons.dcc;
 23 
 package com.dmdirc.addons.dcc;
24
24
25 
-import com.dmdirc.IconManager;
25 
+import com.dmdirc.ui.IconManager;
26 
 import com.dmdirc.Server;
 26 
 import com.dmdirc.Server;
27 
 import com.dmdirc.WritableFrameContainer;
 27 
 import com.dmdirc.WritableFrameContainer;
28 
 import com.dmdirc.commandparser.CommandManager;
 28 
 import com.dmdirc.commandparser.CommandManager;

+ 1
- 1
src/com/dmdirc/addons/logging/HistoryWindow.java View File

23 
 package com.dmdirc.addons.logging;
 23 
 package com.dmdirc.addons.logging;
24
24
25 
 import com.dmdirc.FrameContainer;
 25 
 import com.dmdirc.FrameContainer;
26 
-import com.dmdirc.IconManager;
26 
+import com.dmdirc.ui.IconManager;
27 
 import com.dmdirc.Main;
 27 
 import com.dmdirc.Main;
28 
 import com.dmdirc.Server;
 28 
 import com.dmdirc.Server;
29 
 import com.dmdirc.config.ConfigManager;
 29 
 import com.dmdirc.config.ConfigManager;

+ 1
- 1
src/com/dmdirc/addons/systray/SystrayPlugin.java View File

22
22
23 
 package com.dmdirc.addons.systray;
 23 
 package com.dmdirc.addons.systray;
24
24
25 
-import com.dmdirc.IconManager;
25 
+import com.dmdirc.ui.IconManager;
26 
 import com.dmdirc.Main;
 26 
 import com.dmdirc.Main;
27 
 import com.dmdirc.actions.ActionManager;
 27 
 import com.dmdirc.actions.ActionManager;
28 
 import com.dmdirc.actions.interfaces.ActionType;
 28 
 import com.dmdirc.actions.interfaces.ActionType;

+ 1
- 1
src/com/dmdirc/logger/ErrorLevel.java View File

22
22
23 
 package com.dmdirc.logger;
 23 
 package com.dmdirc.logger;
24
24
25 
-import com.dmdirc.IconManager;
25 
+import com.dmdirc.ui.IconManager;
26
26
27 
 import javax.swing.Icon;
 27 
 import javax.swing.Icon;
28
28

src/com/dmdirc/IconManager.java → src/com/dmdirc/ui/IconManager.java View File

20 
  * SOFTWARE.
 20 
  * SOFTWARE.
21 
  */
 21 
  */
22
22
23 
-package com.dmdirc;
23 
+package com.dmdirc.ui;
24
24
25 
 import com.dmdirc.config.IdentityManager;
 25 
 import com.dmdirc.config.IdentityManager;
26 
 import com.dmdirc.interfaces.ConfigChangeListener;
 26 
 import com.dmdirc.interfaces.ConfigChangeListener;
156
156
157 
         if (imageURL == null) {
 157 
         if (imageURL == null) {
158 
             imageURL = cldr.getResource("com/dmdirc/res/icon.png");
 158 
             imageURL = cldr.getResource("com/dmdirc/res/icon.png");
159 
+
160 
+            if (imageURL == null) {
161 
+                throw new IllegalArgumentException("Unable to load icon type '"
162 
+                        + type + "', and unable to load default");
163 
+            }
159 
         }
 164 
         }
160
165
161 
         return imageURL;
 166 
         return imageURL;

+ 1
- 1
src/com/dmdirc/ui/swing/MainFrame.java View File

23 
 package com.dmdirc.ui.swing;
 23 
 package com.dmdirc.ui.swing;
24
24
25 
 import com.dmdirc.FrameContainer;
 25 
 import com.dmdirc.FrameContainer;
26 
-import com.dmdirc.IconManager;
26 
+import com.dmdirc.ui.IconManager;
27 
 import com.dmdirc.Main;
 27 
 import com.dmdirc.Main;
28 
 import com.dmdirc.ServerManager;
 28 
 import com.dmdirc.ServerManager;
29 
 import com.dmdirc.actions.ActionManager;
 29 
 import com.dmdirc.actions.ActionManager;

+ 1
- 1
src/com/dmdirc/ui/swing/SwingController.java View File

24
24
25 
 import com.dmdirc.Channel;
 25 
 import com.dmdirc.Channel;
26 
 import com.dmdirc.FrameContainer;
 26 
 import com.dmdirc.FrameContainer;
27 
-import com.dmdirc.IconManager;
27 
+import com.dmdirc.ui.IconManager;
28 
 import com.dmdirc.Main;
 28 
 import com.dmdirc.Main;
29 
 import com.dmdirc.Query;
 29 
 import com.dmdirc.Query;
30 
 import com.dmdirc.Server;
 30 
 import com.dmdirc.Server;

+ 1
- 1
src/com/dmdirc/ui/swing/components/FeedbackNag.java View File

22
22
23 
 package com.dmdirc.ui.swing.components;
 23 
 package com.dmdirc.ui.swing.components;
24
24
25 
-import com.dmdirc.IconManager;
25 
+import com.dmdirc.ui.IconManager;
26 
 import com.dmdirc.Main;
 26 
 import com.dmdirc.Main;
27 
 import com.dmdirc.ui.swing.dialogs.FeedbackDialog;
 27 
 import com.dmdirc.ui.swing.dialogs.FeedbackDialog;
28
28

+ 1
- 1
src/com/dmdirc/ui/swing/components/InviteLabel.java View File

23 
 package com.dmdirc.ui.swing.components;
 23 
 package com.dmdirc.ui.swing.components;
24
24
25 
 import com.dmdirc.FrameContainer;
 25 
 import com.dmdirc.FrameContainer;
26 
-import com.dmdirc.IconManager;
26 
+import com.dmdirc.ui.IconManager;
27 
 import com.dmdirc.Invite;
 27 
 import com.dmdirc.Invite;
28 
 import com.dmdirc.Main;
 28 
 import com.dmdirc.Main;
29 
 import com.dmdirc.Server;
 29 
 import com.dmdirc.Server;

+ 1
- 1
src/com/dmdirc/ui/swing/components/SwingInputField.java View File

22
22
23 
 package com.dmdirc.ui.swing.components;
 23 
 package com.dmdirc.ui.swing.components;
24
24
25 
-import com.dmdirc.IconManager;
25 
+import com.dmdirc.ui.IconManager;
26 
 import com.dmdirc.config.IdentityManager;
 26 
 import com.dmdirc.config.IdentityManager;
27 
 import com.dmdirc.ui.interfaces.InputField;
 27 
 import com.dmdirc.ui.interfaces.InputField;
28
28

+ 1
- 1
src/com/dmdirc/ui/swing/components/SwingSearchBar.java View File

22
22
23 
 package com.dmdirc.ui.swing.components;
 23 
 package com.dmdirc.ui.swing.components;
24
24
25 
-import com.dmdirc.IconManager;
25 
+import com.dmdirc.ui.IconManager;
26 
 import com.dmdirc.Main;
 26 
 import com.dmdirc.Main;
27 
 import com.dmdirc.ui.interfaces.SearchBar;
 27 
 import com.dmdirc.ui.interfaces.SearchBar;
28 
 import com.dmdirc.ui.messages.ColourManager;
 28 
 import com.dmdirc.ui.messages.ColourManager;

+ 1
- 1
src/com/dmdirc/ui/swing/components/SwingStatusBar.java View File

22
22
23 
 package com.dmdirc.ui.swing.components;
 23 
 package com.dmdirc.ui.swing.components;
24
24
25 
-import com.dmdirc.IconManager;
25 
+import com.dmdirc.ui.IconManager;
26 
 import com.dmdirc.config.IdentityManager;
 26 
 import com.dmdirc.config.IdentityManager;
27 
 import com.dmdirc.interfaces.UpdateCheckerListener;
 27 
 import com.dmdirc.interfaces.UpdateCheckerListener;
28 
 import com.dmdirc.logger.ErrorLevel;
 28 
 import com.dmdirc.logger.ErrorLevel;

+ 1
- 1
src/com/dmdirc/ui/swing/components/expandingsettings/CurrentOptionsPanel.java View File

22
22
23 
 package com.dmdirc.ui.swing.components.expandingsettings;
 23 
 package com.dmdirc.ui.swing.components.expandingsettings;
24
24
25 
-import com.dmdirc.IconManager;
25 
+import com.dmdirc.ui.IconManager;
26 
 import com.dmdirc.ui.swing.components.ColourChooser;
 26 
 import com.dmdirc.ui.swing.components.ColourChooser;
27 
 import com.dmdirc.ui.swing.components.ImageButton;
 27 
 import com.dmdirc.ui.swing.components.ImageButton;
28 
 import com.dmdirc.ui.swing.components.expandingsettings.SettingsPanel.OptionType;
 28 
 import com.dmdirc.ui.swing.components.expandingsettings.SettingsPanel.OptionType;

+ 1
- 1
src/com/dmdirc/ui/swing/components/renderers/TreeViewTreeCellRenderer.java View File

23 
 package com.dmdirc.ui.swing.components.renderers;
 23 
 package com.dmdirc.ui.swing.components.renderers;
24
24
25 
 import com.dmdirc.FrameContainer;
 25 
 import com.dmdirc.FrameContainer;
26 
-import com.dmdirc.IconManager;
26 
+import com.dmdirc.ui.IconManager;
27 
 import com.dmdirc.interfaces.ConfigChangeListener;
 27 
 import com.dmdirc.interfaces.ConfigChangeListener;
28 
 import com.dmdirc.config.ConfigManager;
 28 
 import com.dmdirc.config.ConfigManager;
29 
 import com.dmdirc.config.IdentityManager;
 29 
 import com.dmdirc.config.IdentityManager;

+ 1
- 1
src/com/dmdirc/ui/swing/components/validating/ValidatingJTextField.java View File

23 
 package com.dmdirc.ui.swing.components.validating;
 23 
 package com.dmdirc.ui.swing.components.validating;
24
24
25 
 import com.dmdirc.config.prefs.validator.Validator;
 25 
 import com.dmdirc.config.prefs.validator.Validator;
26 
-import com.dmdirc.IconManager;
26 
+import com.dmdirc.ui.IconManager;
27
27
28 
 import com.dmdirc.config.prefs.validator.ValidationResponse;
 28 
 import com.dmdirc.config.prefs.validator.ValidationResponse;
29 
 import java.awt.Font;
 29 
 import java.awt.Font;

+ 1
- 1
src/com/dmdirc/ui/swing/dialogs/actionseditor/ConditionsTabPanel.java View File

22
22
23 
 package com.dmdirc.ui.swing.dialogs.actionseditor;
 23 
 package com.dmdirc.ui.swing.dialogs.actionseditor;
24
24
25 
-import com.dmdirc.IconManager;
25 
+import com.dmdirc.ui.IconManager;
26 
 import com.dmdirc.actions.ActionCondition;
 26 
 import com.dmdirc.actions.ActionCondition;
27 
 import com.dmdirc.ui.swing.components.ImageButton;
 27 
 import com.dmdirc.ui.swing.components.ImageButton;
28 
 import static com.dmdirc.ui.swing.UIUtilities.SMALL_BORDER;
 28 
 import static com.dmdirc.ui.swing.UIUtilities.SMALL_BORDER;

+ 1
- 1
src/com/dmdirc/ui/swing/dialogs/error/FatalErrorDialog.java View File

22
22
23 
 package com.dmdirc.ui.swing.dialogs.error;
 23 
 package com.dmdirc.ui.swing.dialogs.error;
24
24
25 
-import com.dmdirc.IconManager;
25 
+import com.dmdirc.ui.IconManager;
26 
 import com.dmdirc.Main;
 26 
 import com.dmdirc.Main;
27 
 import com.dmdirc.logger.ErrorReportStatus;
 27 
 import com.dmdirc.logger.ErrorReportStatus;
28 
 import com.dmdirc.logger.ProgramError;
 28 
 import com.dmdirc.logger.ProgramError;

Write Preview
Loading…
Cancel
Save