fixes issue 2544

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

@@ -19,6 +19,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
+
 package com.dmdirc.addons.ui_swing;
 
 import com.dmdirc.addons.ui_swing.components.frames.ServerFrame;
@@ -85,9 +86,8 @@ import net.miginfocom.layout.PlatformDefaults;
 public final class SwingController extends Plugin implements UIController {
 
     /** Logger to use. */
-    private static final java.util.logging.Logger LOGGER = java.util.logging
-            .Logger.getLogger(SwingController.class.getName());
-
+    private static final java.util.logging.Logger LOGGER =
+            java.util.logging.Logger.getLogger(SwingController.class.getName());
     /** Singleton instance of MainFrame. */
     private MainFrame me;
     /** Status bar. */
@@ -205,7 +205,8 @@ public final class SwingController extends Plugin implements UIController {
             @Override
             public void run() {
                 LOGGER.finest("getInputWindow(): run");
-                setObject(new CustomInputFrame(owner, commandParser, SwingController.this));
+                setObject(new CustomInputFrame(owner, commandParser,
+                        SwingController.this));
                 LOGGER.finest("getInputWindow(): object set: " + getObject());
             }
         });
@@ -302,7 +303,8 @@ public final class SwingController extends Plugin implements UIController {
      */
     void updateLookAndFeel() {
         try {
-            UIManager.setLookAndFeel(UIUtilities.getLookAndFeel(IdentityManager.getGlobalConfig().getOption("ui", "lookandfeel")));
+            UIManager.setLookAndFeel(UIUtilities.getLookAndFeel(IdentityManager.
+                    getGlobalConfig().getOption("ui", "lookandfeel")));
             final int state = UIUtilities.invokeAndWait(new ReturnableThread<Integer>() {
 
                 /** {@inheritDoc} */
@@ -385,7 +387,8 @@ public final class SwingController extends Plugin implements UIController {
 
         try {
             UIUtilities.initUISettings();
-            UIManager.setLookAndFeel(UIUtilities.getLookAndFeel(IdentityManager.getGlobalConfig().getOption("ui", "lookandfeel")));
+            UIManager.setLookAndFeel(UIUtilities.getLookAndFeel(IdentityManager.
+                    getGlobalConfig().getOption("ui", "lookandfeel")));
 
         } catch (UnsupportedOperationException ex) {
             Logger.userError(ErrorLevel.LOW, "Unable to set UI Settings");
@@ -405,6 +408,8 @@ public final class SwingController extends Plugin implements UIController {
 
         Toolkit.getDefaultToolkit().getSystemEventQueue().
                 push(new DMDircEventQueue(this));
+        //Toolkit.getDefaultToolkit().getSystemEventQueue().
+        //        push(new TracingEventQueue());
     }
 
     /** {@inheritDoc} */
@@ -525,8 +530,10 @@ public final class SwingController extends Plugin implements UIController {
     @Override
     public void onLoad() {
         if (GraphicsEnvironment.isHeadless()) {
-            throw new IllegalStateException("Swing UI can't be run in a headless environment");
+            throw new IllegalStateException(
+                    "Swing UI can't be run in a headless environment");
         }
+
         UIUtilities.invokeAndWait(new Runnable() {
 
             /** {@inheritDoc} */
@@ -539,8 +546,9 @@ public final class SwingController extends Plugin implements UIController {
             }
         });
 
-        if(!mainFrameCreated.get()) {
-            throw new IllegalStateException("Main frame not created. Unable to continue.");
+        if (!mainFrameCreated.get()) {
+            throw new IllegalStateException(
+                    "Main frame not created. Unable to continue.");
         }
 
         Main.setUI(this);

src/com/dmdirc/addons/ui_swing/dialogs/prefs/CategoryLabel.java

@@ -0,0 +1,158 @@
+/*
+ * 
+ * Copyright (c) 2006-2008 Chris Smith, Shane Mc Cormack, Gregory Holmes
+ * 
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ * 
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ * 
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+package com.dmdirc.addons.ui_swing.dialogs.prefs;
+
+import com.dmdirc.config.prefs.PreferencesCategory;
+import com.dmdirc.logger.ErrorLevel;
+import com.dmdirc.logger.Logger;
+import com.dmdirc.ui.IconManager;
+import java.awt.Color;
+import java.awt.Dimension;
+import java.util.concurrent.ExecutionException;
+import javax.swing.BorderFactory;
+import javax.swing.Icon;
+import javax.swing.JLabel;
+import javax.swing.JList;
+import javax.swing.SwingUtilities;
+import javax.swing.SwingWorker;
+import net.miginfocom.layout.PlatformDefaults;
+
+/**
+ * Category Label.
+ */
+public class CategoryLabel extends JLabel {
+
+    /**
+     * A version number for this class. It should be changed whenever the
+     * class structure is changed (or anything else that would prevent
+     * serialized objects being unserialized with the new class).
+     */
+    private static final long serialVersionUID = -1659415238166842265L;
+    /** Panel gap. */
+    private final int padding = (int) (1.5 * PlatformDefaults.getUnitValueX(
+            "related").getValue());
+    private PreferencesCategory category;
+    private JList parentList;
+    private int index;
+
+    /**
+     * 
+     * @param parentList
+     * @param category
+     * @param index 
+     */
+    public CategoryLabel(final JList parentList,
+            final PreferencesCategory category, final int index) {
+        this.parentList = parentList;
+        this.category = category;
+        this.index = index;
+
+        setText(category.getTitle());
+        new IconLoader(this, category.getIcon()).execute();
+
+        int level = 0;
+        PreferencesCategory temp = category;
+        while (temp.getParent() != null) {
+            temp = temp.getParent();
+            level++;
+        }
+
+        setPreferredSize(new Dimension(100000, Math.max(16,
+                getFont().getSize()) + padding));
+        setBorder(BorderFactory.createEmptyBorder(padding / 2, padding + level *
+                18, padding / 2,
+                padding));
+        setBackground(parentList.getBackground());
+        setForeground(parentList.getForeground());
+        setOpaque(true);
+        setToolTipText(null);
+
+        if (category.getPath().equals(category.getTitle())) {
+            boolean hasChildren = false;
+            for (PreferencesCategory child : category.getSubcats()) {
+                if (!child.isInline()) {
+                    hasChildren = true;
+                    break;
+                }
+            }
+
+            hasChildren = hasChildren || index + 1 == parentList.getModel().
+                    getSize();
+
+            setBackground(Color.LIGHT_GRAY);
+            setBorder(BorderFactory.createCompoundBorder(
+                    BorderFactory.createMatteBorder(1, 0, hasChildren ? 1 : 0, 0,
+                    Color.GRAY),
+                    getBorder()));
+        }
+
+
+    }
+
+    /**
+     * {@inheritDoc}
+     *
+     * @param icon New icon
+     */
+    @Override
+    public void setIcon(Icon icon) {
+        super.setIcon(icon);
+
+        if (parentList != null) {
+            parentList.repaint();
+        }
+    }
+
+    private class IconLoader extends SwingWorker<Icon, Void> {
+
+        private CategoryLabel label;
+        private String icon;
+
+        public IconLoader(final CategoryLabel label, final String icon) {
+            this.label = label;
+            this.icon = icon;
+        }
+
+        /** {@inheritDoc} */
+        @Override
+        protected Icon doInBackground() throws Exception {
+            return IconManager.getIconManager().getIcon(icon);
+        }
+
+        /** {@inheritDoc} */
+        @Override
+        protected void done() {
+            try {
+                label.setIcon(get());
+            } catch (InterruptedException ex) {
+                Logger.appError(ErrorLevel.LOW,
+                        "Unable to set icon for prefs cell", ex);
+            } catch (ExecutionException ex) {
+                Logger.appError(ErrorLevel.LOW, ex.getMessage(), ex);
+            }
+
+        }
+    }
+
+}

src/com/dmdirc/addons/ui_swing/dialogs/prefs/PreferencesListCellRenderer.java

@@ -77,66 +77,9 @@ public class PreferencesListCellRenderer extends JLabel implements ListCellRende
             final boolean cellHasFocus) {
         final PreferencesCategory cat = (PreferencesCategory) value;
         if (!labelMap.containsKey(cat)) {
-            labelMap.put(cat, new JLabel());
+            labelMap.put(cat, new CategoryLabel(list, cat, index));
         }
         final JLabel label = labelMap.get(cat);
-        label.setText(cat.getTitle());
-        
-        new LoggingSwingWorker<Icon, Void>() {
-
-            /** {@inheritDoc} */
-            @Override
-            protected Icon doInBackground() throws Exception {
-                return IconManager.getIconManager().getIcon(cat.getIcon());
-            }
-
-            /** {@inheritDoc} */
-            @Override
-            protected void done() {
-                try {
-                    label.setIcon(get());
-                    list.repaint();
-                } catch (InterruptedException ex) {
-                    Logger.appError(ErrorLevel.LOW, "Unable to set icon for prefs cell", ex);
-                } catch (ExecutionException ex) {
-                    Logger.appError(ErrorLevel.LOW, ex.getMessage(), ex);
-                }
-                
-            }
-        }.execute();
-
-        int level = 0;
-        PreferencesCategory temp = cat;
-        while (temp.getParent() != null) {
-            temp = temp.getParent();
-            level++;
-        }
-
-        label.setPreferredSize(new Dimension(100000, Math.max(16,
-                getFont().getSize()) + padding));
-        label.setBorder(BorderFactory.createEmptyBorder(padding / 2, padding + level * 18, padding / 2,
-                padding));
-        label.setBackground(list.getBackground());
-        label.setForeground(list.getForeground());
-        label.setOpaque(true);
-        label.setToolTipText(null);
-
-        if (cat.getPath().equals(cat.getTitle())) {
-            boolean hasChildren = false;
-            for (PreferencesCategory child : cat.getSubcats()) {
-                if (!child.isInline()) {
-                    hasChildren = true;
-                    break;
-                }
-            }
-
-            hasChildren = hasChildren || index + 1 == list.getModel().getSize();
-
-            label.setBackground(Color.LIGHT_GRAY);
-            label.setBorder(BorderFactory.createCompoundBorder(
-                    BorderFactory.createMatteBorder(1, 0, hasChildren ? 1 : 0, 0, Color.GRAY),
-                    getBorder()));
-        }
 
         if (isSelected) {
             label.setFont(getFont().deriveFont(Font.BOLD));

src/com/dmdirc/ui/IconManager.java

@@ -24,20 +24,16 @@ package com.dmdirc.ui;
 
 import com.dmdirc.config.IdentityManager;
 import com.dmdirc.interfaces.ConfigChangeListener;
-import com.dmdirc.logger.ErrorLevel;
-import com.dmdirc.logger.Logger;
 import com.dmdirc.util.URLBuilder;
 
 import java.awt.Image;
 import java.awt.Toolkit;
-import java.lang.reflect.InvocationTargetException;
 import java.net.URL;
 import java.util.HashMap;
 import java.util.Map;
 
 import javax.swing.Icon;
 import javax.swing.ImageIcon;
-import javax.swing.SwingUtilities;
 
 /**
  * The icon manager provides a standard way to access icons for use in DMDirc.
@@ -86,26 +82,8 @@ public final class IconManager implements ConfigChangeListener {
         final URL iconURL = getIconURL(type);
         final Image iconImage = Toolkit.getDefaultToolkit().getImage(iconURL);
         final Image scaledIconImage = getScaledImage(iconImage, 16, 16);
-        final Runnable runnable = new Runnable() {
-
-            @Override
-            public void run() {
-                icons.put(type, new ImageIcon(scaledIconImage));
-            }
-        };
-        final ImageIcon icon;
         if (!icons.containsKey(type)) {
-            if (SwingUtilities.isEventDispatchThread()) {
-                runnable.run();
-            } else {
-                try {
-                    SwingUtilities.invokeAndWait(runnable);
-                } catch (InterruptedException ex) {
-                    Logger.appError(ErrorLevel.HIGH, "Unable to execute thread.", ex);
-                } catch (InvocationTargetException ex) {
-                    Logger.appError(ErrorLevel.HIGH, "Unable to execute thread.", ex);
-                }
-            }
+            icons.put(type, new ImageIcon(scaledIconImage));
         }
         return icons.get(type);
     }