Fixes issue 2980: Table in NickColours>Colours in prefs dialog displays first time and vanishes on subsequent views

Change-Id: I8d9a4c4b310eec49a9042efd9801cdc9ccf2fb29
Reviewed-on: http://gerrit.dmdirc.com/327
Tested-by: Gregory Holmes <greboid@dmdirc.com>
Reviewed-by: Shane Mc Cormack <shane@dmdirc.com>

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

@@ -33,7 +33,6 @@ import java.awt.Window;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
-import java.util.concurrent.atomic.AtomicBoolean;
 
 import javax.swing.BorderFactory;
 import javax.swing.JPanel;

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

@@ -0,0 +1,82 @@
+/*
+ * 
+ * Copyright (c) 2006-2010 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 java.awt.Component;
+import java.awt.LayoutManager;
+
+import javax.swing.JPanel;
+
+/**
+ * Creates a new JPanel that prevents components from being removed.
+ */
+public class NoRemovePanel extends JPanel {
+
+    /**
+     * 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 = 1;
+
+    /**
+     * Creates a new JPanel that prevents components being removed.
+     */
+    public NoRemovePanel() {
+    }
+
+    /**
+     * Creates a new JPanel that prevents components being removed.
+     *
+     * @param isDoubleBuffered Use double buffering?
+     */
+    public NoRemovePanel(boolean isDoubleBuffered) {
+        super(isDoubleBuffered);
+    }
+
+    /**
+     * Creates a new JPanel that prevents components being removed.
+     *
+     * @param layout Layout manager
+     */
+    public NoRemovePanel(LayoutManager layout) {
+        super(layout);
+    }
+
+    /**
+     * Creates a new JPanel that prevents components being removed.
+     *
+     * @param layout Layout manager
+     * @param isDoubleBuffered Use double buffering?
+     */
+    public NoRemovePanel(LayoutManager layout, boolean isDoubleBuffered) {
+        super(layout, isDoubleBuffered);
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public void remove(final Component comp) {
+        //Ignore
+    }
+}

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

@@ -244,9 +244,10 @@ public class PrefsCategoryLoader extends SwingWorker<JPanel, Object> {
     private void addInlineCategory(final PreferencesCategory category,
             final JPanel parent) {
         final JPanel panel =
-                new JPanel(new MigLayout("fillx, gap unrel, wrap 2, hidemode 3, pack, " +
-                "wmax 470-" + leftPadding + "-" +
+                new NoRemovePanel(new MigLayout("fillx, gap unrel, wrap 2, " +
+                "hidemode 3, pack, wmax 470-" + leftPadding + "-" +
                 rightPadding + "-2*" + padding));
+        panel.setName(category.getPath());
         panel.setBorder(BorderFactory.createTitledBorder(UIManager.getBorder(
                 "TitledBorder.border"), category.getTitle()));
 
@@ -264,9 +265,10 @@ public class PrefsCategoryLoader extends SwingWorker<JPanel, Object> {
      */
     private JPanel addCategory(final PreferencesCategory category) {
         final JPanel panel =
-                new JPanel(new MigLayout("fillx, gap unrel, " +
+                new NoRemovePanel(new MigLayout("fillx, gap unrel, " +
                 "wrap 2, hidemode 3, wmax 470-" + leftPadding + "-" +
                 rightPadding + "-2*" + padding));
+        panel.setName(category.getPath());
         final String path = category.getPath();
 
         initCategory(category, panel, path);