--- a/jdk/src/macosx/classes/sun/lwawt/macosx/CMenuItem.java Tue Mar 18 11:31:11 2014 -0700
+++ b/jdk/src/macosx/classes/sun/lwawt/macosx/CMenuItem.java Tue Mar 18 23:22:45 2014 +0400
@@ -150,8 +150,6 @@
// native callbacks
void handleAction(final long when, final int modifiers) {
- assert CThreading.assertAppKit();
-
SunToolkit.executeOnEventHandlerThread(getTarget(), new Runnable() {
public void run() {
final String cmd = ((MenuItem)getTarget()).getActionCommand();
--- a/jdk/src/macosx/classes/sun/lwawt/macosx/CPlatformWindow.java Tue Mar 18 11:31:11 2014 -0700
+++ b/jdk/src/macosx/classes/sun/lwawt/macosx/CPlatformWindow.java Tue Mar 18 23:22:45 2014 +0400
@@ -468,7 +468,6 @@
@Override // PlatformWindow
public void setBounds(int x, int y, int w, int h) {
-// assert CThreading.assertEventQueue();
nativeSetNSWindowBounds(getNSWindowPtr(), x, y, w, h);
}
@@ -1062,8 +1061,6 @@
// ----------------------------------------------------------------------
private void windowDidBecomeMain() {
- assert CThreading.assertAppKit();
-
if (checkBlockingAndOrder()) return;
// If it's not blocked, make sure it's above its siblings
orderAboveSiblings();
--- a/jdk/src/macosx/classes/sun/lwawt/macosx/CThreading.java Tue Mar 18 11:31:11 2014 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,64 +0,0 @@
-/*
- * Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation. Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code 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 General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-package sun.lwawt.macosx;
-
-import java.awt.EventQueue;
-
-
-public class CThreading {
- static String APPKIT_THREAD_NAME = "AppKit Thread";
-
- static boolean isEventQueue() {
- return EventQueue.isDispatchThread();
- }
-
- static boolean isAppKit() {
- return APPKIT_THREAD_NAME.equals(Thread.currentThread().getName());
- }
-
- static boolean assertEventQueue() {
- final boolean isEventQueue = isEventQueue();
- assert isEventQueue : "Threading violation: not EventQueue thread";
- return isEventQueue;
- }
-
- static boolean assertNotEventQueue() {
- final boolean isNotEventQueue = isEventQueue();
- assert isNotEventQueue : "Threading violation: EventQueue thread";
- return isNotEventQueue;
- }
-
- static boolean assertAppKit() {
- final boolean isAppKitThread = isAppKit();
- assert isAppKitThread : "Threading violation: not AppKit thread";
- return isAppKitThread;
- }
-
- static boolean assertNotAppKit() {
- final boolean isNotAppKitThread = !isAppKit();
- assert isNotAppKitThread : "Threading violation: AppKit thread";
- return isNotAppKitThread;
- }
-}
--- a/jdk/src/macosx/classes/sun/lwawt/macosx/LWCToolkit.java Tue Mar 18 11:31:11 2014 -0700
+++ b/jdk/src/macosx/classes/sun/lwawt/macosx/LWCToolkit.java Tue Mar 18 23:22:45 2014 +0400
@@ -476,9 +476,11 @@
return true;
}
+ private static final String APPKIT_THREAD_NAME = "AppKit Thread";
+
// Intended to be called from the LWCToolkit.m only.
private static void installToolkitThreadNameInJava() {
- Thread.currentThread().setName(CThreading.APPKIT_THREAD_NAME);
+ Thread.currentThread().setName(APPKIT_THREAD_NAME);
}
@Override