mirror
/
DMDirc-Client
espelhamento de https://github.com/DMDirc/DMDirc.git
Observar 1
Favorito 0
Fork 0
Código Issues 0 Versões 49 Wiki Atividade
Ver código fonte

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 anos atrás
pai
288cc6ed4b
commit
79e0f9364b
23 arquivos alterados com 28 adições e 17 exclusões
Visão dividida Mostrar estatísticas do Diff
  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 Ver arquivo 

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

+ 1
- 0
src/com/dmdirc/CustomWindow.java Ver arquivo 

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

+ 1
- 0
src/com/dmdirc/GlobalWindow.java Ver arquivo 

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

+ 1
- 0
src/com/dmdirc/Query.java Ver arquivo 

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

+ 1
- 0
src/com/dmdirc/Raw.java Ver arquivo 

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

+ 1
- 0
src/com/dmdirc/Server.java Ver arquivo 

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

+ 1
- 1
src/com/dmdirc/addons/dcc/DCCFrame.java Ver arquivo 

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

+ 1
- 1
src/com/dmdirc/addons/logging/HistoryWindow.java Ver arquivo 

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

+ 1
- 1
src/com/dmdirc/addons/systray/SystrayPlugin.java Ver arquivo 

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

+ 1
- 1
src/com/dmdirc/logger/ErrorLevel.java Ver arquivo 

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

src/com/dmdirc/IconManager.java → src/com/dmdirc/ui/IconManager.java Ver arquivo 

@@ -20,7 +20,7 @@
20 20 
  * SOFTWARE.
21 21 
  */
22 22
23 
-package com.dmdirc;
23 
+package com.dmdirc.ui;
24 24
25 25 
 import com.dmdirc.config.IdentityManager;
26 26 
 import com.dmdirc.interfaces.ConfigChangeListener;
 
@@ -156,6 +156,11 @@ public final class IconManager implements ConfigChangeListener {
156 156
157 157 
         if (imageURL == null) {
158 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 166 
         return imageURL;

+ 1
- 1
src/com/dmdirc/ui/swing/MainFrame.java Ver arquivo 

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

+ 1
- 1
src/com/dmdirc/ui/swing/SwingController.java Ver arquivo 

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

+ 1
- 1
src/com/dmdirc/ui/swing/components/FeedbackNag.java Ver arquivo 

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

+ 1
- 1
src/com/dmdirc/ui/swing/components/InviteLabel.java Ver arquivo 

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

+ 1
- 1
src/com/dmdirc/ui/swing/components/SwingInputField.java Ver arquivo 

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

+ 1
- 1
src/com/dmdirc/ui/swing/components/SwingSearchBar.java Ver arquivo 

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

+ 1
- 1
src/com/dmdirc/ui/swing/components/SwingStatusBar.java Ver arquivo 

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

+ 1
- 1
src/com/dmdirc/ui/swing/components/expandingsettings/CurrentOptionsPanel.java Ver arquivo 

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

+ 1
- 1
src/com/dmdirc/ui/swing/components/renderers/TreeViewTreeCellRenderer.java Ver arquivo 

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

+ 1
- 1
src/com/dmdirc/ui/swing/components/validating/ValidatingJTextField.java Ver arquivo 

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

+ 1
- 1
src/com/dmdirc/ui/swing/dialogs/actionseditor/ConditionsTabPanel.java Ver arquivo 

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

+ 1
- 1
src/com/dmdirc/ui/swing/dialogs/error/FatalErrorDialog.java Ver arquivo 

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

Escrever Pré-visualização
Carregando…
Cancelar
Salvar