diff -r 4e4ff2ed9f67 o.n.core/arch.xml
--- a/o.n.core/arch.xml Wed Aug 24 04:36:37 2011 +0200
+++ b/o.n.core/arch.xml Wed Aug 24 09:06:26 2011 +0200
@@ -596,6 +596,13 @@
Get this property to determine when use JDK's java.net.ProxySelector or core's
implementation of ProxySelector.
+
+
+ By default NetBeans based applications install their own EventQueue.
+ One can suppress that since versiong 3.27 of org.netbeans.core module
+ by branding key TimableEventQueue.install in
+ org/netbeans/core/Bundle to false.
+
diff -r 4e4ff2ed9f67 o.n.core/manifest.mf
--- a/o.n.core/manifest.mf Wed Aug 24 04:36:37 2011 +0200
+++ b/o.n.core/manifest.mf Wed Aug 24 09:06:26 2011 +0200
@@ -4,4 +4,4 @@
OpenIDE-Module-Layer: org/netbeans/core/resources/mf-layer.xml
AutoUpdate-Show-In-Client: false
AutoUpdate-Essential-Module: true
-OpenIDE-Module-Specification-Version: 3.26
+OpenIDE-Module-Specification-Version: 3.27
diff -r 4e4ff2ed9f67 o.n.core/src/org/netbeans/core/Bundle.properties
--- a/o.n.core/src/org/netbeans/core/Bundle.properties Wed Aug 24 04:36:37 2011 +0200
+++ b/o.n.core/src/org/netbeans/core/Bundle.properties Wed Aug 24 09:06:26 2011 +0200
@@ -181,3 +181,7 @@
ProxySettings.password.description=Proxy password
Title_WebBrowser=Web Browser
+
+
+# NOI18N
+TimableEventQueue.install=true
diff -r 4e4ff2ed9f67 o.n.core/src/org/netbeans/core/TimableEventQueue.java
--- a/o.n.core/src/org/netbeans/core/TimableEventQueue.java Wed Aug 24 04:36:37 2011 +0200
+++ b/o.n.core/src/org/netbeans/core/TimableEventQueue.java Wed Aug 24 09:06:26 2011 +0200
@@ -65,6 +65,7 @@
import org.openide.util.Exceptions;
import org.openide.util.Lookup;
import org.openide.util.Mutex;
+import org.openide.util.NbBundle;
import org.openide.util.RequestProcessor;
import org.openide.windows.WindowManager;
@@ -100,7 +101,7 @@
static volatile Thread eq;
private final Frame mainWindow;
- TimableEventQueue(Frame f) {
+ private TimableEventQueue(Frame f) {
this.mainWindow = f;
TIMEOUT = RP.create(this);
TIMEOUT.setPriority(Thread.MIN_PRIORITY);
@@ -110,6 +111,10 @@
initialize(null, true);
}
static void initialize(final Frame f, final boolean defaultWindow) {
+ boolean install = Boolean.valueOf(NbBundle.getMessage(TimableEventQueue.class, "TimableEventQueue.install")); // NOI18N
+ if (!install) {
+ return;
+ }
// #28536: make sure a JRE bug does not prevent the event queue from having
// the right context class loader
diff -r 4e4ff2ed9f67 o.n.core/test/unit/src/org/netbeans/core/Bundle_te_ST.properties
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/o.n.core/test/unit/src/org/netbeans/core/Bundle_te_ST.properties Wed Aug 24 09:06:26 2011 +0200
@@ -0,0 +1,42 @@
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+#
+# Copyright 2011 Oracle and/or its affiliates. All rights reserved.
+#
+# Oracle and Java are registered trademarks of Oracle and/or its affiliates.
+# Other names may be trademarks of their respective owners.
+#
+# The contents of this file are subject to the terms of either the GNU
+# General Public License Version 2 only ("GPL") or the Common
+# Development and Distribution License("CDDL") (collectively, the
+# "License"). You may not use this file except in compliance with the
+# License. You can obtain a copy of the License at
+# http://www.netbeans.org/cddl-gplv2.html
+# or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
+# specific language governing permissions and limitations under the
+# License. When distributing the software, include this License Header
+# Notice in each file and include the License file at
+# nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
+# particular file as subject to the "Classpath" exception as provided
+# by Oracle in the GPL Version 2 section of the License file that
+# accompanied this code. If applicable, add the following below the
+# License Header, with the fields enclosed by brackets [] replaced by
+# your own identifying information:
+# "Portions Copyrighted [year] [name of copyright owner]"
+#
+# If you wish your version of this file to be governed by only the CDDL
+# or only the GPL Version 2, indicate your decision by adding
+# "[Contributor] elects to include this software in this distribution
+# under the [CDDL or GPL Version 2] license." If you do not indicate a
+# single choice of license, a recipient has the option to distribute
+# your version of this file under either the CDDL, the GPL Version 2 or
+# to extend the choice of license to its licensees as provided above.
+# However, if you add GPL Version 2 code and therefore, elected the GPL
+# Version 2 license, then the option applies only if the new code is
+# made subject to such option by the copyright holder.
+#
+# Contributor(s):
+#
+# Portions Copyrighted 2011 Sun Microsystems, Inc.
+
+# NOI18N
+TimableEventQueue.install=false
diff -r 4e4ff2ed9f67 o.n.core/test/unit/src/org/netbeans/core/TimableEventQueueSuppressTest.java
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/o.n.core/test/unit/src/org/netbeans/core/TimableEventQueueSuppressTest.java Wed Aug 24 09:06:26 2011 +0200
@@ -0,0 +1,69 @@
+/*
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+ *
+ * Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+ *
+ * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
+ * Other names may be trademarks of their respective owners.
+ *
+ * The contents of this file are subject to the terms of either the GNU
+ * General Public License Version 2 only ("GPL") or the Common
+ * Development and Distribution License("CDDL") (collectively, the
+ * "License"). You may not use this file except in compliance with the
+ * License. You can obtain a copy of the License at
+ * http://www.netbeans.org/cddl-gplv2.html
+ * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
+ * specific language governing permissions and limitations under the
+ * License. When distributing the software, include this License Header
+ * Notice in each file and include the License file at
+ * nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the GPL Version 2 section of the License file that
+ * accompanied this code. If applicable, add the following below the
+ * License Header, with the fields enclosed by brackets [] replaced by
+ * your own identifying information:
+ * "Portions Copyrighted [year] [name of copyright owner]"
+ *
+ * If you wish your version of this file to be governed by only the CDDL
+ * or only the GPL Version 2, indicate your decision by adding
+ * "[Contributor] elects to include this software in this distribution
+ * under the [CDDL or GPL Version 2] license." If you do not indicate a
+ * single choice of license, a recipient has the option to distribute
+ * your version of this file under either the CDDL, the GPL Version 2 or
+ * to extend the choice of license to its licensees as provided above.
+ * However, if you add GPL Version 2 code and therefore, elected the GPL
+ * Version 2 license, then the option applies only if the new code is
+ * made subject to such option by the copyright holder.
+ *
+ * Contributor(s):
+ *
+ * Portions Copyrighted 2008 Sun Microsystems, Inc.
+ */
+
+package org.netbeans.core;
+
+import java.awt.EventQueue;
+import java.awt.Toolkit;
+import java.util.Locale;
+import org.netbeans.junit.NbTestCase;
+
+public class TimableEventQueueSuppressTest extends NbTestCase {
+ static {
+ Locale.setDefault(new Locale("te", "ST"));
+ }
+
+
+ public TimableEventQueueSuppressTest(String testName) {
+ super(testName);
+ }
+
+ public void testNotInstalled() throws Exception {
+ EventQueue old = Toolkit.getDefaultToolkit().getSystemEventQueue();
+ if (old instanceof TimableEventQueue) {
+ fail("Old queue is already TimableEventQueue: " + old);
+ }
+ TimableEventQueue.initialize();
+ EventQueue now = Toolkit.getDefaultToolkit().getSystemEventQueue();
+ assertSame("Old queue was not replaced", old, now);
+ }
+}