/*
 * $Id$
 *
 * Copyright 2004 Sun Microsystems, Inc., 4150 Network Circle,
 * Santa Clara, California 95054, U.S.A. All rights reserved.
 *
 * This library is free software; you can redistribute it and/or
 * modify it under the terms of the GNU Lesser General Public
 * License as published by the Free Software Foundation; either
 * version 2.1 of the License, or (at your option) any later version.
 * 
 * This library is distributed in the hope that it will be useful,
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 * Lesser General Public License for more details.
 * 
 * You should have received a copy of the GNU Lesser General Public
 * License along with this library; if not, write to the Free Software
 * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 */
package org.jdesktop.swingx.plaf.basic;

import javax.swing.UIManager;

import org.jdesktop.swingx.plaf.LookAndFeelAddons;

/**
 * Install simple pluggable UI. Usually not used directly, subclasses should be
 * preferred as this addon may not provide complete implementation of the
 * additional pluggable UIs.
 */
public class BasicLookAndFeelAddons extends LookAndFeelAddons {
    /**
     * {@inheritDoc}
     */
    @Override
    public void initialize() {
        super.initialize();
        //must add resource bundle before adding component values
        UIManager.getDefaults().addResourceBundle(
                "org.jdesktop.swingx.plaf.basic.resources.swingx");
    }

    /**
     * {@inheritDoc}
     */
    @Override
    public void uninitialize() {
        //must remove resource bundle before adding component values
        UIManager.getDefaults().removeResourceBundle(
                "org.jdesktop.swingx.plaf.basic.resources.swingx");
        super.uninitialize();
    }
    
}

@@ -930,31 +930,51 @@
 ort 
-javax.swing.UIManager;%0A
+org.jdesktop.swingx.plaf.LookAndFeelAddons;
 %0Aimp
@@ -1002,33 +1002,28 @@
 gx.plaf.
-LookAndFeelAddons
+UIManagerExt
 ;%0A%0A/**%0A 
@@ -1465,30 +1465,19 @@
 IManager
-.getDefaults()
+Ext
 .addReso
@@ -1737,22 +1737,11 @@
 ager
-.getDefaults()
+Ext
 .rem

Fix ColumnControl JNLP problem. Missed call to UIDefauls.addResourceBundle. Changed it to UIManagerExt.addResourceBundle.