Attachment #97378 for bug #182507

This Bugzilla instance is a read-only archive of historic NetBeans bug reports. To report a bug in NetBeans please follow the project's instructions for reporting issues.

View | Details | Raw Unified | Return to bug 182507
Collapse All | Expand All

Lines 76-82 Link Here

(-)a/o.n.core/nbproject/project.xml (-1 / +3 lines)
76	<code-name-base>org.netbeans.swing.plaf</code-name-base>	76	<code-name-base>org.netbeans.swing.plaf</code-name-base>
77	<build-prerequisite/>	77	<build-prerequisite/>
78	<compile-dependency/>	78	<compile-dependency/>
79	<run-dependency/>	79	<run-dependency>
		80	<specification-version>1.15</specification-version>
		81	</run-dependency>
80	</dependency>	82	</dependency>
81	<dependency>	83	<dependency>
82	<code-name-base>org.openide.actions</code-name-base>	84	<code-name-base>org.openide.actions</code-name-base>

Lines 56-61 Link Here

(-)a/o.n.core/src/org/netbeans/core/GuiRunLevel.java (+3 lines)
56	import org.netbeans.core.startup.RunLevel;	56	import org.netbeans.core.startup.RunLevel;
57	import org.netbeans.core.startup.Splash;	57	import org.netbeans.core.startup.Splash;
58	import org.netbeans.core.startup.StartLog;	58	import org.netbeans.core.startup.StartLog;
		59	import org.netbeans.swing.plaf.Startup;
59	import org.openide.awt.StatusDisplayer;	60	import org.openide.awt.StatusDisplayer;
60	import org.openide.util.Lookup;	61	import org.openide.util.Lookup;
61	import org.openide.util.NbBundle;	62	import org.openide.util.NbBundle;
Lines 125-130 Link Here
125	/** Method to initialize the main window.	126	/** Method to initialize the main window.
126	*/	127	*/
127	private void initializeMainWindow() {	128	private void initializeMainWindow() {
		129	Startup.setClassLoader(Lookup.getDefault().lookup(ClassLoader.class)); // #182507
		130
128	StartLog.logStart ("Main window initialization"); //NOI18N	131	StartLog.logStart ("Main window initialization"); //NOI18N
129		132
130	TimableEventQueue.initialize();	133	TimableEventQueue.initialize();

Lines 1-6 Link Here

(-)a/o.n.swing.plaf/manifest.mf (-1 / +1 lines)
1	Manifest-Version: 1.0	1	Manifest-Version: 1.0
2	OpenIDE-Module-Localizing-Bundle: org/netbeans/swing/plaf/Bundle.properties	2	OpenIDE-Module-Localizing-Bundle: org/netbeans/swing/plaf/Bundle.properties
3	OpenIDE-Module: org.netbeans.swing.plaf	3	OpenIDE-Module: org.netbeans.swing.plaf
4	OpenIDE-Module-Specification-Version: 1.14	4	OpenIDE-Module-Specification-Version: 1.15
5	AutoUpdate-Show-In-Client: false	5	AutoUpdate-Show-In-Client: false
6		6




        
    }

    private static ClassLoader loader;
    /**
     * Set a class loader to be used in place of {@link Thread#getContextClassLoader}.
     * @param loader a system-wide class loader
     * @since org.netbeans.swing.plaf 1.15
     */
    public static void setClassLoader(ClassLoader loader) {
        Startup.loader = loader;
    }

    /** Gets the value of system class loader and returns it.
     */
    private static final class CLValue implements UIDefaults.ActiveValue {
        public @Override ClassLoader createValue(UIDefaults defs) {
            return loader != null ? loader : Thread.currentThread().getContextClassLoader();
        }
    }


Return to bug 182507

Lines 318-328 Link Here

(-)a/o.n.swing.plaf/src/org/netbeans/swing/plaf/Startup.java (-2 / +12 lines)
318		318
319	}	319	}
320		320
		321	private static ClassLoader loader;
		322	/**
		323	* Set a class loader to be used in place of {@link Thread#getContextClassLoader}.
		324	* @param loader a system-wide class loader
		325	* @since org.netbeans.swing.plaf 1.15
		326	*/
		327	public static void setClassLoader(ClassLoader loader) {
		328	Startup.loader = loader;
		329	}
		330
321	/** Gets the value of system class loader and returns it.	331	/** Gets the value of system class loader and returns it.
322	*/	332	*/
323	private static final class CLValue implements UIDefaults.ActiveValue {	333	private static final class CLValue implements UIDefaults.ActiveValue {
324	public Object createValue (UIDefaults defs) {	334	public @Override ClassLoader createValue(UIDefaults defs) {
325	return Thread.currentThread().getContextClassLoader();	335	return loader != null ? loader : Thread.currentThread().getContextClassLoader();
326	}	336	}
327	}	337	}
328		338