fix some nimbus issues with textlabels

src/com/dmdirc/addons/addonbrowser/AddonInfoListCellRenderer.java

@@ -22,7 +22,7 @@
 
 package com.dmdirc.addons.addonbrowser;
 
-import com.dmdirc.addons.ui_swing.components.TextLabel;
+import com.dmdirc.addons.ui_swing.components.text.TextLabel;
 import java.awt.Color;
 import java.awt.Component;
 import java.awt.Font;

src/com/dmdirc/addons/dcc/DCCPlugin.java

@@ -30,7 +30,7 @@ import com.dmdirc.actions.interfaces.ActionType;
 import com.dmdirc.addons.dcc.kde.KFileChooser;
 import com.dmdirc.addons.dcc.actions.DCCActions;
 import com.dmdirc.addons.ui_swing.components.frames.TextFrame;
-import com.dmdirc.addons.ui_swing.components.TextLabel;
+import com.dmdirc.addons.ui_swing.components.text.TextLabel;
 import com.dmdirc.commandparser.CommandManager;
 import com.dmdirc.config.Identity;
 import com.dmdirc.config.IdentityManager;

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

@@ -23,7 +23,7 @@
 package com.dmdirc.addons.mediasource_vlc;
 
 import com.dmdirc.config.prefs.PreferencesInterface;
-import com.dmdirc.addons.ui_swing.components.TextLabel;
+import com.dmdirc.addons.ui_swing.components.text.TextLabel;
 
 import javax.swing.JPanel;
 

src/com/dmdirc/addons/nowplaying/ConfigPanel.java

@@ -24,7 +24,7 @@ package com.dmdirc.addons.nowplaying;
 
 import com.dmdirc.config.IdentityManager;
 import com.dmdirc.config.prefs.PreferencesInterface;
-import com.dmdirc.addons.ui_swing.components.TextLabel;
+import com.dmdirc.addons.ui_swing.components.text.TextLabel;
 import com.dmdirc.addons.ui_swing.components.reorderablelist.ReorderableJList;
 
 import java.awt.event.KeyEvent;

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

@@ -241,8 +241,10 @@ public final class UIUtilities {
         final String uiname = UIManager.getLookAndFeel().getClass().getName();
         final String windows =
                 "com.sun.java.swing.plaf.windows.WindowsLookAndFeel";
+        final String nimbus = "sun.swing.plaf.nimbus.NimbusLookAndFeel";
 
-        return !(windows.equals(uiname) || Apple.isAppleUI());
+        return !(windows.equals(uiname) || Apple.isAppleUI() || nimbus.equals(
+                uiname));
     }
     
     /**

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

@@ -23,11 +23,13 @@
 
 package com.dmdirc.addons.ui_swing.components;
 
+import com.dmdirc.addons.ui_swing.UIUtilities;
 import java.awt.Color;
 
 import javax.swing.BorderFactory;
 import javax.swing.JLabel;
 import javax.swing.JPanel;
+import javax.swing.UIManager;
 import javax.swing.border.Border;
 
 import net.miginfocom.swing.MigLayout;
@@ -82,8 +84,6 @@ public class TitlePanel extends JPanel {
                 getSize() * 1.5)));
 
         add(title, "grow, push");
-        setOpaque(true);
-        setBackground(Color.WHITE);
         setBorder(border);
     }
 

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

@@ -24,6 +24,8 @@ package com.dmdirc.addons.ui_swing.components;
  * SOFTWARE.
  */
 
+import com.dmdirc.addons.ui_swing.components.text.TextLabel;
+import com.dmdirc.addons.ui_swing.UIUtilities;
 import java.awt.Color;
 import java.awt.event.MouseEvent;
 import java.awt.event.MouseListener;
@@ -33,6 +35,7 @@ import java.util.Map;
 import javax.swing.BorderFactory;
 import javax.swing.JComponent;
 import javax.swing.JPanel;
+import javax.swing.UIManager;
 import javax.swing.text.SimpleAttributeSet;
 import javax.swing.text.StyleConstants;
 
@@ -67,8 +70,8 @@ public class ToolTipPanel extends JPanel implements MouseListener {
         this.defaultHelp = defaultHelp;
         this.tooltips = new HashMap<JComponent, String>();
 
-        setOpaque(true);
-        setBackground(Color.WHITE);
+        setOpaque(UIUtilities.getTabbedPaneOpaque());
+        setBackground(UIManager.getColor("Label.background"));
         setBorder(BorderFactory.createEtchedBorder());
 
         tooltip = new TextLabel();

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

@@ -23,7 +23,7 @@
 package com.dmdirc.addons.ui_swing.components.expandingsettings;
 
 import com.dmdirc.config.Identity;
-import com.dmdirc.addons.ui_swing.components.TextLabel;
+import com.dmdirc.addons.ui_swing.components.text.TextLabel;
 import com.dmdirc.addons.ui_swing.UIUtilities;
 
 import java.util.LinkedHashMap;

src/com/dmdirc/addons/ui_swing/components/pluginpanel/PluginPanel.java

@@ -26,7 +26,7 @@ import com.dmdirc.config.prefs.PreferencesInterface;
 import com.dmdirc.plugins.PluginInfo;
 import com.dmdirc.plugins.PluginManager;
 import com.dmdirc.addons.ui_swing.components.LoggingSwingWorker;
-import com.dmdirc.addons.ui_swing.components.TextLabel;
+import com.dmdirc.addons.ui_swing.components.text.TextLabel;
 import com.dmdirc.addons.ui_swing.components.renderers.AddonCellRenderer;
 import com.dmdirc.addons.ui_swing.dialogs.prefs.SwingPreferencesDialog;
 import com.dmdirc.util.URLHandler;

src/com/dmdirc/addons/ui_swing/components/renderers/TopicCellRenderer.java

@@ -23,7 +23,7 @@
 package com.dmdirc.addons.ui_swing.components.renderers;
 
 import com.dmdirc.Topic;
-import com.dmdirc.addons.ui_swing.components.TextLabel;
+import com.dmdirc.addons.ui_swing.components.text.TextLabel;
 
 import java.awt.Component;
 import java.awt.Dimension;

src/com/dmdirc/addons/ui_swing/components/substitutions/SubstitutionsPanel.java

@@ -22,7 +22,7 @@
 
 package com.dmdirc.addons.ui_swing.components.substitutions;
 
-import com.dmdirc.addons.ui_swing.components.TextLabel;
+import com.dmdirc.addons.ui_swing.components.text.TextLabel;
 
 import java.util.List;
 

src/com/dmdirc/addons/ui_swing/components/HTMLLabel.java → src/com/dmdirc/addons/ui_swing/components/text/HTMLLabel.java

@@ -20,12 +20,13 @@
  * SOFTWARE.
  */
 
-package com.dmdirc.addons.ui_swing.components;
+package com.dmdirc.addons.ui_swing.components.text;
 
 import java.awt.Font;
 
 import javax.swing.JEditorPane;
 import javax.swing.UIManager;
+import javax.swing.plaf.basic.BasicTextPaneUI;
 import javax.swing.text.html.HTMLDocument;
 
 /**
@@ -65,6 +66,7 @@ public class HTMLLabel extends JEditorPane {
 
     /** Initialiases the component. */
     private void init() {
+        setUI(new BasicTextPaneUI());
         setOpaque(false);
         setEditable(false);
         setHighlighter(null);

src/com/dmdirc/addons/ui_swing/components/TextLabel.java → src/com/dmdirc/addons/ui_swing/components/text/TextLabel.java

@@ -20,13 +20,14 @@
  * SOFTWARE.
  */
 
-package com.dmdirc.addons.ui_swing.components;
+package com.dmdirc.addons.ui_swing.components.text;
 
 import java.awt.Font;
 import java.awt.Insets;
 
 import javax.swing.JTextPane;
 import javax.swing.UIManager;
+import javax.swing.plaf.basic.BasicTextPaneUI;
 import javax.swing.text.DefaultStyledDocument;
 import javax.swing.text.SimpleAttributeSet;
 import javax.swing.text.StyleConstants;
@@ -73,6 +74,7 @@ public class TextLabel extends JTextPane {
     public TextLabel(final String text, final boolean justified) {
         super(new DefaultStyledDocument());
         setEditorKit(new HTMLEditorKit());
+        setUI(new BasicTextPaneUI());
 
         final Font font = UIManager.getFont("Label.font");
         ((HTMLDocument) getDocument()).getStyleSheet().addRule("body " +

src/com/dmdirc/addons/ui_swing/components/themepanel/ThemePanel.java

@@ -27,7 +27,7 @@ import com.dmdirc.config.prefs.PreferencesInterface;
 import com.dmdirc.addons.ui_swing.components.LoggingSwingWorker;
 import com.dmdirc.ui.themes.Theme;
 import com.dmdirc.ui.themes.ThemeManager;
-import com.dmdirc.addons.ui_swing.components.TextLabel;
+import com.dmdirc.addons.ui_swing.components.text.TextLabel;
 import com.dmdirc.addons.ui_swing.components.renderers.AddonCellRenderer;
 import com.dmdirc.util.URLHandler;
 

src/com/dmdirc/addons/ui_swing/dialogs/FeedbackDialog.java

@@ -30,7 +30,7 @@ import com.dmdirc.addons.ui_swing.SwingController;
 import com.dmdirc.addons.ui_swing.UIUtilities;
 import com.dmdirc.addons.ui_swing.components.LoggingSwingWorker;
 import com.dmdirc.addons.ui_swing.components.StandardDialog;
-import com.dmdirc.addons.ui_swing.components.TextLabel;
+import com.dmdirc.addons.ui_swing.components.text.TextLabel;
 import com.dmdirc.config.IdentityManager;
 import com.dmdirc.util.Downloader;
 

src/com/dmdirc/addons/ui_swing/dialogs/about/AboutPanel.java

@@ -22,7 +22,7 @@
 
 package com.dmdirc.addons.ui_swing.dialogs.about;
 
-import com.dmdirc.addons.ui_swing.components.HTMLLabel;
+import com.dmdirc.addons.ui_swing.components.text.HTMLLabel;
 import com.dmdirc.addons.ui_swing.UIUtilities;
 import com.dmdirc.util.URLHandler;
 

src/com/dmdirc/addons/ui_swing/dialogs/about/CreditsPanel.java

@@ -22,7 +22,7 @@
 
 package com.dmdirc.addons.ui_swing.dialogs.about;
 
-import com.dmdirc.addons.ui_swing.components.HTMLLabel;
+import com.dmdirc.addons.ui_swing.components.text.HTMLLabel;
 import com.dmdirc.addons.ui_swing.UIUtilities;
 import com.dmdirc.util.URLHandler;
 

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

@@ -27,7 +27,7 @@ import com.dmdirc.actions.interfaces.ActionType;
 import com.dmdirc.ui.IconManager;
 import com.dmdirc.addons.ui_swing.components.ImageButton;
 import com.dmdirc.addons.ui_swing.components.ImageToggleButton;
-import com.dmdirc.addons.ui_swing.components.TextLabel;
+import com.dmdirc.addons.ui_swing.components.text.TextLabel;
 import com.dmdirc.util.ListenerList;
 
 import java.awt.event.ActionEvent;

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

@@ -24,7 +24,7 @@ package com.dmdirc.addons.ui_swing.dialogs.actioneditor;
 
 import com.dmdirc.actions.ActionCondition;
 import com.dmdirc.actions.interfaces.ActionType;
-import com.dmdirc.addons.ui_swing.components.TextLabel;
+import com.dmdirc.addons.ui_swing.components.text.TextLabel;
 
 import java.beans.PropertyChangeEvent;
 import java.beans.PropertyChangeListener;

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

@@ -26,7 +26,7 @@ import com.dmdirc.config.prefs.validator.ConditionRuleValidator;
 import com.dmdirc.actions.ConditionTree;
 import com.dmdirc.actions.ConditionTreeFactory;
 import com.dmdirc.actions.ConditionTreeFactory.ConditionTreeFactoryType;
-import com.dmdirc.addons.ui_swing.components.TextLabel;
+import com.dmdirc.addons.ui_swing.components.text.TextLabel;
 import com.dmdirc.addons.ui_swing.components.validating.ValidatingJTextField;
 
 import java.awt.event.ActionEvent;

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

@@ -25,7 +25,7 @@ package com.dmdirc.addons.ui_swing.dialogs.actioneditor;
 import com.dmdirc.actions.interfaces.ActionType;
 import com.dmdirc.ui.IconManager;
 import com.dmdirc.addons.ui_swing.components.ImageButton;
-import com.dmdirc.addons.ui_swing.components.TextLabel;
+import com.dmdirc.addons.ui_swing.components.text.TextLabel;
 import com.dmdirc.util.ListenerList;
 
 import java.awt.event.ActionEvent;

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

@@ -24,7 +24,7 @@ package com.dmdirc.addons.ui_swing.dialogs.actioneditor;
 
 import com.dmdirc.actions.ActionManager;
 import com.dmdirc.actions.interfaces.ActionType;
-import com.dmdirc.addons.ui_swing.components.TextLabel;
+import com.dmdirc.addons.ui_swing.components.text.TextLabel;
 import com.dmdirc.addons.ui_swing.components.renderers.ActionTypeRenderer;
 
 import java.awt.Dimension;

src/com/dmdirc/addons/ui_swing/dialogs/actionsmanager/ActionGroupInformationPanel.java

@@ -22,7 +22,7 @@
 package com.dmdirc.addons.ui_swing.dialogs.actionsmanager;
 
 import com.dmdirc.actions.ActionGroup;
-import com.dmdirc.addons.ui_swing.components.TextLabel;
+import com.dmdirc.addons.ui_swing.components.text.TextLabel;
 
 import javax.swing.JLabel;
 import javax.swing.JPanel;

src/com/dmdirc/addons/ui_swing/dialogs/actionsmanager/ActionsManagerDialog.java

@@ -31,7 +31,7 @@ import com.dmdirc.config.IdentityManager;
 import com.dmdirc.config.prefs.validator.ActionGroupValidator;
 import com.dmdirc.config.prefs.validator.FileNameValidator;
 import com.dmdirc.config.prefs.validator.ValidatorChain;
-import com.dmdirc.addons.ui_swing.components.TextLabel;
+import com.dmdirc.addons.ui_swing.components.text.TextLabel;
 import com.dmdirc.addons.ui_swing.components.ListScroller;
 import com.dmdirc.addons.ui_swing.components.StandardDialog;
 import com.dmdirc.addons.ui_swing.components.StandardInputDialog;

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

@@ -30,7 +30,7 @@ import com.dmdirc.addons.ui_swing.UIUtilities;
 import com.dmdirc.addons.ui_swing.actions.NoNewlinesPasteAction;
 import com.dmdirc.addons.ui_swing.components.SwingInputHandler;
 import com.dmdirc.addons.ui_swing.components.TextAreaInputField;
-import com.dmdirc.addons.ui_swing.components.TextLabel;
+import com.dmdirc.addons.ui_swing.components.text.TextLabel;
 
 import java.awt.Color;
 import java.awt.event.ActionEvent;

src/com/dmdirc/addons/ui_swing/dialogs/paste/PasteDialog.java

@@ -28,7 +28,7 @@ import com.dmdirc.addons.ui_swing.components.frames.InputTextFrame;
 import com.dmdirc.addons.ui_swing.components.StandardDialog;
 import com.dmdirc.addons.ui_swing.components.SwingInputHandler;
 import com.dmdirc.addons.ui_swing.components.TextAreaInputField;
-import com.dmdirc.addons.ui_swing.components.TextLabel;
+import com.dmdirc.addons.ui_swing.components.text.TextLabel;
 
 import java.awt.Window;
 import java.awt.event.ActionEvent;

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

@@ -27,7 +27,7 @@ import com.dmdirc.addons.ui_swing.UIUtilities;
 import com.dmdirc.addons.ui_swing.PrefsComponentFactory;
 import com.dmdirc.addons.ui_swing.components.ColourChooser;
 import com.dmdirc.addons.ui_swing.components.OptionalColourChooser;
-import com.dmdirc.addons.ui_swing.components.TextLabel;
+import com.dmdirc.addons.ui_swing.components.text.TextLabel;
 import com.dmdirc.addons.ui_swing.components.TitlePanel;
 import com.dmdirc.addons.ui_swing.components.ToolTipPanel;
 import com.dmdirc.addons.ui_swing.components.durationeditor.DurationDisplay;
@@ -37,6 +37,7 @@ import com.dmdirc.logger.ErrorLevel;
 import com.dmdirc.logger.Logger;
 
 import java.awt.Window;
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.concurrent.ExecutionException;
@@ -114,7 +115,7 @@ public class CategoryPanel extends JPanel {
         super(new MigLayout("fillx, wrap, ins 0"));
         this.parent = parent;
 
-        panels = new HashMap<PreferencesCategory, JPanel>();
+        panels = Collections.synchronizedMap(new HashMap<PreferencesCategory, JPanel>());
 
         loading = new JPanel(new MigLayout("fillx"));
         loading.add(new TextLabel("Loading..."));
@@ -141,6 +142,24 @@ public class CategoryPanel extends JPanel {
         setCategory(category);
     }
 
+    /**
+     * Returns this categrory panel's parent window.
+     *
+     * @return Parent window
+     */
+    protected Window getParentWindow() {
+        return parent;
+    }
+
+    /**
+     * Returns the tooltip panel for this category panel.
+     *
+     * @return Tooltip panel
+     */
+    protected ToolTipPanel getToolTipPanel() {
+        return tooltip;
+    }
+
     /**
      * Sets the new active category for this panel and relays out.
      *
@@ -297,7 +316,7 @@ public class CategoryPanel extends JPanel {
      * Retrieves the title label for the specified setting.
      *
      * @param setting The setting whose label is being requested
-     * @return A JLabel with the appropriate text and tooltip
+     * @return A TextLabel with the appropriate text and tooltip
      */
     private TextLabel getLabel(final PreferencesSetting setting) {
         final TextLabel label = new TextLabel(setting.getTitle() + ": ", false);

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

@@ -37,8 +37,8 @@ import java.awt.event.ActionListener;
 import java.awt.event.WindowAdapter;
 import java.awt.event.WindowEvent;
 import java.util.List;
-
 import java.util.concurrent.ExecutionException;
+
 import javax.swing.BorderFactory;
 import javax.swing.DefaultListModel;
 import javax.swing.JButton;

src/com/dmdirc/addons/ui_swing/dialogs/sslcertificate/CertificateInfoPanel.java

@@ -23,7 +23,7 @@
 package com.dmdirc.addons.ui_swing.dialogs.sslcertificate;
 
 import com.dmdirc.ui.core.dialogs.sslcertificate.CertificateInformationEntry;
-import com.dmdirc.addons.ui_swing.components.TextLabel;
+import com.dmdirc.addons.ui_swing.components.text.TextLabel;
 
 import java.awt.Color;
 import java.util.ArrayList;

src/com/dmdirc/addons/ui_swing/dialogs/sslcertificate/SSLCertificateDialog.java

@@ -24,7 +24,7 @@ package com.dmdirc.addons.ui_swing.dialogs.sslcertificate;
 
 import com.dmdirc.ui.core.dialogs.sslcertificate.SSLCertificateDialogModel;
 import com.dmdirc.addons.ui_swing.components.StandardDialog;
-import com.dmdirc.addons.ui_swing.components.TextLabel;
+import com.dmdirc.addons.ui_swing.components.text.TextLabel;
 
 import java.awt.Window;
 import java.awt.event.ActionEvent;

src/com/dmdirc/addons/ui_swing/dialogs/updater/SwingRestartDialog.java

@@ -24,7 +24,7 @@ package com.dmdirc.addons.ui_swing.dialogs.updater;
 
 import com.dmdirc.addons.ui_swing.MainFrame;
 import com.dmdirc.addons.ui_swing.components.StandardDialog;
-import com.dmdirc.addons.ui_swing.components.TextLabel;
+import com.dmdirc.addons.ui_swing.components.text.TextLabel;
 
 import java.awt.Dialog.ModalityType;
 import java.awt.event.ActionEvent;

src/com/dmdirc/addons/ui_swing/dialogs/updater/SwingUpdaterDialog.java

@@ -25,7 +25,7 @@ package com.dmdirc.addons.ui_swing.dialogs.updater;
 import com.dmdirc.addons.ui_swing.MainFrame;
 import com.dmdirc.updater.UpdateCheckerListener;
 import com.dmdirc.ui.interfaces.UpdaterDialog;
-import com.dmdirc.addons.ui_swing.components.TextLabel;
+import com.dmdirc.addons.ui_swing.components.text.TextLabel;
 import com.dmdirc.addons.ui_swing.components.PackingTable;
 import com.dmdirc.addons.ui_swing.components.StandardDialog;
 import com.dmdirc.addons.ui_swing.components.renderers.UpdateComponentTableCellRenderer;

src/com/dmdirc/addons/ui_swing/dialogs/url/URLDialog.java

@@ -22,7 +22,7 @@
 
 package com.dmdirc.addons.ui_swing.dialogs.url;
 
-import com.dmdirc.addons.ui_swing.components.TextLabel;
+import com.dmdirc.addons.ui_swing.components.text.TextLabel;
 import com.dmdirc.addons.ui_swing.components.StandardDialog;
 import com.dmdirc.addons.ui_swing.components.URLProtocolPanel;
 import com.dmdirc.util.URLHandler;

src/com/dmdirc/addons/ui_swing/wizard/firstrun/CommunicationStep.java

@@ -22,7 +22,7 @@
 
 package com.dmdirc.addons.ui_swing.wizard.firstrun;
 
-import com.dmdirc.addons.ui_swing.components.TextLabel;
+import com.dmdirc.addons.ui_swing.components.text.TextLabel;
 import com.dmdirc.addons.ui_swing.wizard.Step;
 
 import javax.swing.JCheckBox;

src/com/dmdirc/addons/ui_swing/wizard/firstrun/FirstRunExtractionStep.java

@@ -22,7 +22,7 @@
 
 package com.dmdirc.addons.ui_swing.wizard.firstrun;
 
-import com.dmdirc.addons.ui_swing.components.TextLabel;
+import com.dmdirc.addons.ui_swing.components.text.TextLabel;
 
 import net.miginfocom.swing.MigLayout;
 

src/com/dmdirc/addons/ui_swing/wizard/firstrun/MigrationExtrationStep.java

@@ -23,7 +23,7 @@
 package com.dmdirc.addons.ui_swing.wizard.firstrun;
 
 
-import com.dmdirc.addons.ui_swing.components.TextLabel;
+import com.dmdirc.addons.ui_swing.components.text.TextLabel;
 
 import net.miginfocom.swing.MigLayout;
 

src/com/dmdirc/addons/ui_swing/wizard/firstrun/ProfileStep.java

@@ -22,7 +22,7 @@
 
 package com.dmdirc.addons.ui_swing.wizard.firstrun;
 
-import com.dmdirc.addons.ui_swing.components.TextLabel;
+import com.dmdirc.addons.ui_swing.components.text.TextLabel;
 import com.dmdirc.addons.ui_swing.wizard.Step;
 
 import javax.swing.JCheckBox;

test/com/dmdirc/addons/ui_swing/dialogs/actioneditor/ActionEditorDialogTest.java

@@ -33,7 +33,7 @@ import com.dmdirc.harness.ui.UITestIface;
 import com.dmdirc.harness.ui.JRadioButtonByTextMatcher;
 
 import com.dmdirc.addons.ui_swing.components.ImageButton;
-import com.dmdirc.addons.ui_swing.components.TextLabel;
+import com.dmdirc.addons.ui_swing.components.text.TextLabel;
 import java.awt.Component;
 
 import java.util.regex.Matcher;