/hg/release/icedtea6-1.10: 3 new changesets
andrew at icedtea.classpath.org
andrew at icedtea.classpath.org
Mon Jul 11 15:04:20 PDT 2011
changeset 28c6f2df4627 in /hg/release/icedtea6-1.10
details: http://icedtea.classpath.org/hg/release/icedtea6-1.10?cmd=changeset;node=28c6f2df4627
author: Andrew John Hughes <ahughes at redhat.com>
date: Thu Jul 07 22:01:17 2011 +0100
Allow Linux 3* to pass through the HotSpot OS version filter.
2011-06-28 Andrew John Hughes <ahughes at redhat.com>
* Makefile.am: Add new patch.
* patches/support_linux_3.patch: Allow Linux 3* through the
HotSpot OS version filter.
* NEWS: Updated.
changeset 15caf12fc26d in /hg/release/icedtea6-1.10
details: http://icedtea.classpath.org/hg/release/icedtea6-1.10?cmd=changeset;node=15caf12fc26d
author: Andrew John Hughes <ahughes at redhat.com>
date: Fri Jul 08 16:13:57 2011 +0100
Merge
changeset 6c21fc007867 in /hg/release/icedtea6-1.10
details: http://icedtea.classpath.org/hg/release/icedtea6-1.10?cmd=changeset;node=6c21fc007867
author: Andrew John Hughes <ahughes at redhat.com>
date: Wed Jun 29 18:16:57 2011 +0100
Check that JDK binaries are files in addition to being executable.
2011-06-29 Andrew John Hughes <ahughes at redhat.com>
* acinclude.m4: (IT_FIND_JAVA): Check that the
binary is also a regular file as well as executable.
(IT_FIND_JAVAH): Likewise. (IT_FIND_JAR): Likewise.
(IT_FIND_RMIC): Likewise. (IT_FIND_NATIVE2ASCII): Likewise.
diffstat:
ChangeLog | 62 +
Makefile.am | 9 +-
NEWS | 8 +
acinclude.m4 | 20 +-
patches/f14-fonts.patch | 2 +-
patches/fonts-gentoo.patch | 4 +-
patches/fonts-rhel-version.patch | 32 +
patches/fonts-rhel.patch | 3 +-
patches/jtreg-bug7036148-test.patch | 23 +
patches/openjdk/6578583-modality-broken-vista.patch | 1439 +++++++++++++++
patches/openjdk/6610244-modal-fatal-error-windows.patch | 121 +
patches/openjdk/6693253-security_warning.patch | 25 +-
patches/openjdk/6769607-modal-hangs.patch | 161 +
patches/openjdk/7036148-npe-null-jmenu-name.patch | 83 +
patches/support_linux_3.patch | 18 +
15 files changed, 1981 insertions(+), 29 deletions(-)
diffs (truncated from 2181 to 500 lines):
diff -r a95c47b36218 -r 6c21fc007867 ChangeLog
--- a/ChangeLog Wed Jun 08 18:16:37 2011 +0100
+++ b/ChangeLog Wed Jun 29 18:16:57 2011 +0100
@@ -1,3 +1,65 @@
+2011-06-29 Andrew John Hughes <ahughes at redhat.com>
+
+ * acinclude.m4:
+ (IT_FIND_JAVA): Check that the binary is also
+ a regular file as well as executable.
+ (IT_FIND_JAVAH): Likewise.
+ (IT_FIND_JAR): Likewise.
+ (IT_FIND_RMIC): Likewise.
+ (IT_FIND_NATIVE2ASCII): Likewise.
+
+2011-06-28 Andrew John Hughes <ahughes at redhat.com>
+
+ * Makefile.am: Add new patch.
+ * patches/support_linux_3.patch:
+ Allow Linux 3* through the HotSpot OS version
+ filter.
+ * NEWS: Updated.
+
+2011-06-20 Denis Lila <dlila at redhat.com>
+
+ * Makefile.am: Add patch.
+ * patches/jtreg-bug7036148-test.patch:
+ Fix regression test. It used to never end, regardless of
+ success/failure.
+
+2011-06-15 Denis Lila <dlila at redhat.com>
+
+ * Makefile.am: Apply patches.
+ * NEWS: Update with backports.
+ * patches/openjdk/6578583-modality-broken-vista.patch:
+ * patches/openjdk/6610244-modal-fatal-error-windows.patch:
+ * patches/openjdk/6769607-modal-hangs.patch:
+ New patches. The last fixes PR677. The other two are
+ necessary for the last to fully apply.
+ * patches/openjdk/6693253-security_warning.patch:
+ Replsace the awt_Dialog.cpp hunk with the corresponding hunk
+ from the OpenJDK7 changeset of which this patch is a backport.
+ Without this change, this patch doesn't apply unless the
+ previous 3 are removed.
+
+2011-06-14 Denis Lila <dlila at redhat.com>
+
+ * Makefile.am: Add patch.
+ * NEWS: Update with backports.
+ * patches/openjdk/7036148-npe-null-jmenu-name.patch:
+ Backport of S7036148. Fixes RH712211 too.
+
+2011-06-10 Pavel Tisnovsky <ptisnovs at redhat.com>
+
+ * patches/font-rhel.patch:
+ * patches/f14-fonts.patch:
+ * patches/fonts-gentoo.patch:
+ Patch updated: use only major RHEL version, not minor one.
+
+2011-06-10 Pavel Tisnovsky <ptisnovs at redhat.com>
+
+ * Makefile.am: Added new patch
+ * patches/fonts-rhel-version.patch:
+ Patch which ensures, that only one fontconfig file
+ will be needed on particular RHEL version
+ (ie. only one file for RHEL 6.0, RHEL 6.1 and RHEL 6.2)
+
2011-06-08 Andrew John Hughes <ahughes at redhat.com>
* NEWS: Add 1.10.3.
diff -r a95c47b36218 -r 6c21fc007867 Makefile.am
--- a/Makefile.am Wed Jun 08 18:16:37 2011 +0100
+++ b/Makefile.am Wed Jun 29 18:16:57 2011 +0100
@@ -203,6 +203,8 @@
ICEDTEA_PATCHES = \
$(SECURITY_PATCHES) \
+ patches/openjdk/6578583-modality-broken-vista.patch \
+ patches/openjdk/6610244-modal-fatal-error-windows.patch \
patches/stdc-limit-macros.patch \
patches/openjdk/4993545-nativeinlightfixer.patch \
patches/openjdk/6637796-set_bounds.patch \
@@ -214,6 +216,7 @@
patches/openjdk/6797195-hw_lw_mixing.patch \
patches/openjdk/6725214-direct3d-01.patch \
patches/openjdk/6633275-shaped_translucent_windows.patch \
+ patches/openjdk/6769607-modal-hangs.patch \
patches/openjdk/6791612-opengl-jni-fix.patch \
patches/openjdk/6755274-glgetstring-crash.patch \
patches/openjdk/6984543-onscreen_rendering_resize_test.patch \
@@ -341,7 +344,11 @@
patches/openjdk/7031385-gcc-register-allocation-fix.patch \
patches/shark-llvm-2.9.patch \
patches/openjdk/pgram-pipe-regression.patch \
- patches/openjdk/mutter.patch
+ patches/openjdk/mutter.patch \
+ patches/fonts-rhel-version.patch \
+ patches/openjdk/7036148-npe-null-jmenu-name.patch \
+ patches/jtreg-bug7036148-test.patch \
+ patches/support_linux_3.patch
if WITH_ALT_HSBUILD
ICEDTEA_PATCHES += \
diff -r a95c47b36218 -r 6c21fc007867 NEWS
--- a/NEWS Wed Jun 08 18:16:37 2011 +0100
+++ b/NEWS Wed Jun 29 18:16:57 2011 +0100
@@ -11,6 +11,14 @@
New in release 1.10.3 (20XX-XX-XX):
+* Bug fixes
+ - PR748: Icedtea6 fails to build with Linux 3.0.
+* Backports:
+ - S7037283, RH712211: Null Pointer Exception in SwingUtilities2.
+ - S6769607, PR677: Modal frame hangs for a while.
+ - S6578583: Modality is broken in windows vista home premium from jdk1.7 b02 onwards.
+ - S6610244: modal dialog closes with fatal error if -Xcheck:jni is set
+
New in release 1.10.2 (2011-06-07):
* Security fixes
diff -r a95c47b36218 -r 6c21fc007867 acinclude.m4
--- a/acinclude.m4 Wed Jun 08 18:16:37 2011 +0100
+++ b/acinclude.m4 Wed Jun 29 18:16:57 2011 +0100
@@ -238,8 +238,8 @@
if test "x${JAVA}" = "xno"; then
JAVA=${JAVA_DEFAULT}
fi
- AC_MSG_CHECKING([if $JAVA is a valid executable])
- if test -x "${JAVA}"; then
+ AC_MSG_CHECKING([if $JAVA is a valid executable file])
+ if test -x "${JAVA}" && test -f "${JAVA}"; then
AC_MSG_RESULT([yes])
else
AC_MSG_RESULT([no])
@@ -391,8 +391,8 @@
if test "x${JAVAH}" = "xno"; then
JAVAH=${JAVAH_DEFAULT}
fi
- AC_MSG_CHECKING([if $JAVAH is a valid executable])
- if test -x "${JAVAH}"; then
+ AC_MSG_CHECKING([if $JAVAH is a valid executable file])
+ if test -x "${JAVAH}" && test -f "${JAVAH}"; then
AC_MSG_RESULT([yes])
else
AC_MSG_RESULT([no])
@@ -428,8 +428,8 @@
if test "x${JAR}" = "xno"; then
JAR=${JAR_DEFAULT}
fi
- AC_MSG_CHECKING([if $JAR is a valid executable])
- if test -x "${JAR}"; then
+ AC_MSG_CHECKING([if $JAR is a valid executable file])
+ if test -x "${JAR}" && test -f "${JAR}"; then
AC_MSG_RESULT([yes])
else
AC_MSG_RESULT([no])
@@ -498,8 +498,8 @@
if test "x${RMIC}" = "xno"; then
RMIC=${RMIC_DEFAULT}
fi
- AC_MSG_CHECKING([if $RMIC is a valid executable])
- if test -x "${RMIC}"; then
+ AC_MSG_CHECKING([if $RMIC is a valid executable file])
+ if test -x "${RMIC}" && test -f "${RMIC}"; then
AC_MSG_RESULT([yes])
else
AC_MSG_RESULT([no])
@@ -535,8 +535,8 @@
if test "x${NATIVE2ASCII}" = "xno"; then
NATIVE2ASCII=${NATIVE2ASCII_DEFAULT}
fi
- AC_MSG_CHECKING([if $NATIVE2ASCII is a valid executable])
- if test -x "${NATIVE2ASCII}"; then
+ AC_MSG_CHECKING([if $NATIVE2ASCII is a valid executable file])
+ if test -x "${NATIVE2ASCII}" && test -f "${NATIVE2ASCII}"; then
AC_MSG_RESULT([yes])
else
AC_MSG_RESULT([no])
diff -r a95c47b36218 -r 6c21fc007867 patches/f14-fonts.patch
--- a/patches/f14-fonts.patch Wed Jun 08 18:16:37 2011 +0100
+++ b/patches/f14-fonts.patch Wed Jun 29 18:16:57 2011 +0100
@@ -8,7 +8,7 @@
+ fontconfig.Fedora.10.properties \
+ fontconfig.Fedora.11.properties \
+ fontconfig.Fedora.12.properties \
- fontconfig.RedHat.6.0.properties \
+ fontconfig.RedHat.6.properties \
fontconfig.Gentoo.properties
else
diff -r a95c47b36218 -r 6c21fc007867 patches/fonts-gentoo.patch
--- a/patches/fonts-gentoo.patch Wed Jun 08 18:16:37 2011 +0100
+++ b/patches/fonts-gentoo.patch Wed Jun 29 18:16:57 2011 +0100
@@ -5,8 +5,8 @@
fontconfig.SuSE.properties \
fontconfig.Ubuntu.properties \
fontconfig.Fedora.properties \
-- fontconfig.RedHat.6.0.properties
-+ fontconfig.RedHat.6.0.properties \
+- fontconfig.RedHat.6.properties
++ fontconfig.RedHat.6.properties \
+ fontconfig.Gentoo.properties
else
diff -r a95c47b36218 -r 6c21fc007867 patches/fonts-rhel-version.patch
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/fonts-rhel-version.patch Wed Jun 29 18:16:57 2011 +0100
@@ -0,0 +1,33 @@
+--- openjdk-orig/jdk/src/solaris/classes/sun/awt/motif/MFontConfiguration.java 2011-06-09 16:04:24.000000000 +0200
++++ openjdk/jdk/src/solaris/classes/sun/awt/motif/MFontConfiguration.java 2011-06-09 16:04:24.000000000 +0200
+@@ -169,7 +169,9 @@
+ osVersion = getVersionString(f);
+ } else if ((f = new File("/etc/redhat-release")).canRead()) {
+ osName = "RedHat";
+- osVersion = getVersionString(f);
++ // At this time we don't need to distinguish
++ // between RHEL 6.0 and RHEL 6.1 for example.
++ osVersion = getMajorVersionString(f);
+ } else if ((f = new File("/etc/turbolinux-release")).canRead()) {
+ osName = "Turbo";
+ osVersion = getVersionString(f);
+@@ -208,6 +210,19 @@
+ return null;
+ }
+
++ /**
++ * Gets the OS major version string from a Linux release-specific file.
++ */
++ private String getMajorVersionString(File f){
++ try {
++ Scanner sc = new Scanner(f);
++ return sc.findInLine("(\\d)+");
++ }
++ catch (Exception e){
++ }
++ return null;
++ }
++
+ private static final String fontsDirPrefix = "$JRE_LIB_FONTS";
+
+ protected String mapFileName(String fileName) {
diff -r a95c47b36218 -r 6c21fc007867 patches/fonts-rhel.patch
--- a/patches/fonts-rhel.patch Wed Jun 08 18:16:37 2011 +0100
+++ b/patches/fonts-rhel.patch Wed Jun 29 18:16:57 2011 +0100
@@ -7,12 +7,12 @@
fontconfig.Ubuntu.properties \
- fontconfig.Fedora.properties
+ fontconfig.Fedora.properties \
-+ fontconfig.RedHat.6.0.properties
++ fontconfig.RedHat.6.properties
else
FONTCONFIGS_SRC = $(CLOSED_SRC)/solaris/classes/sun/awt/fontconfigs
--- /dev/null 2010-12-20 09:26:08.850062021 +0100
-+++ openjdk/jdk/src/solaris/classes/sun/awt/fontconfigs/linux.fontconfig.RedHat.6.0.properties 2010-12-22 11:21:32.606781127 +0100
++++ openjdk/jdk/src/solaris/classes/sun/awt/fontconfigs/linux.fontconfig.RedHat.6.properties 2010-12-22 11:21:32.606781127 +0100
@@ -0,0 +1,441 @@
+#
+# Copyright (c) 2007, Oracle and/or its affiliates. All rights reserved.
diff -r a95c47b36218 -r 6c21fc007867 patches/jtreg-bug7036148-test.patch
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/jtreg-bug7036148-test.patch Wed Jun 29 18:16:57 2011 +0100
@@ -0,0 +1,24 @@
+diff -r e7493c32e598 test/javax/swing/JMenuItem/7036148/bug7036148.java
+--- openjdk.orig/jdk/test/javax/swing/JMenuItem/7036148/bug7036148.java Wed Jun 08 10:24:10 2011 -0700
++++ openjdk/jdk/test/javax/swing/JMenuItem/7036148/bug7036148.java Wed Jun 15 14:25:59 2011 -0400
+@@ -44,10 +44,16 @@
+ menu.add(new JMenuItem("test"));
+ bar.add(menu);
+ setJMenuBar(bar);
+- pack();
+ }
+
+- public static void main(String[] args) {
+- new bug7036148();
+- }
++ public static void main(String[] args) {
++ // if the bug is present, an NPE will be thrown on pack() above.
++ JFrame f = new bug7036148();
++
++ try {
++ f.pack();
++ } finally {
++ f.dispose();
++ }
++ }
+ }
diff -r a95c47b36218 -r 6c21fc007867 patches/openjdk/6578583-modality-broken-vista.patch
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/openjdk/6578583-modality-broken-vista.patch Wed Jun 29 18:16:57 2011 +0100
@@ -0,0 +1,1446 @@
+# HG changeset patch
+# User dcherepanov
+# Date 1205521233 -10800
+# Node ID 15ba7093f8e64e1facdfc48b8929edc6a4fbb0d3
+# Parent 92e3f57c933b45c678abcbccaa47de059dfe926a
+6578583: Regression: Modality is broken in windows vista home premium from jdk1.7 b02 onwards.
+Summary: WS_DISABLED style should be used to fix some modality bugs
+Reviewed-by: art, son
+
+diff -r 92e3f57c933b -r 15ba7093f8e6 src/windows/native/sun/windows/awt_Component.cpp
+--- openjdk.orig/jdk/src/windows/native/sun/windows/awt_Component.cpp Fri Mar 14 20:40:09 2008 +0300
++++ openjdk/jdk/src/windows/native/sun/windows/awt_Component.cpp Fri Mar 14 22:00:33 2008 +0300
+@@ -5425,7 +5425,13 @@
+ void AwtComponent::Enable(BOOL bEnable)
+ {
+ sm_suppressFocusAndActivation = TRUE;
++
++ if (bEnable && IsTopLevel()) {
++ // we should not enable blocked toplevels
++ bEnable = !::IsWindow(AwtWindow::GetModalBlocker(GetHWnd()));
++ }
+ ::EnableWindow(GetHWnd(), bEnable);
++
+ sm_suppressFocusAndActivation = FALSE;
+ CriticalSection::Lock l(GetLock());
+ VerifyState();
+diff -r 92e3f57c933b -r 15ba7093f8e6 src/windows/native/sun/windows/awt_Dialog.cpp
+--- openjdk.orig/jdk/src/windows/native/sun/windows/awt_Dialog.cpp Fri Mar 14 20:40:09 2008 +0300
++++ openjdk/jdk/src/windows/native/sun/windows/awt_Dialog.cpp Fri Mar 14 22:00:33 2008 +0300
+@@ -273,6 +273,10 @@
+ {
+ HWND blocker = AwtWindow::GetModalBlocker(AwtComponent::GetTopLevelParentForWindow(hWnd));
+ HWND topMostBlocker = blocker;
++ HWND prevForegroundWindow = ::GetForegroundWindow();
++ if (::IsWindow(blocker)) {
++ ::BringWindowToTop(hWnd);
++ }
+ while (::IsWindow(blocker)) {
+ topMostBlocker = blocker;
+ ::BringWindowToTop(blocker);
+@@ -282,7 +286,7 @@
+ // no beep/flash if the mouse was clicked in the taskbar menu
+ // or the dialog is currently inactive
+ if ((::WindowFromPoint(mhs->pt) == hWnd) &&
+- (::GetForegroundWindow() == topMostBlocker))
++ (prevForegroundWindow == topMostBlocker))
+ {
+ ::MessageBeep(MB_OK);
+ // some heuristics: 3 times x 64 milliseconds
+@@ -292,6 +296,7 @@
+ ::BringWindowToTop(topMostBlocker);
+ ::SetForegroundWindow(topMostBlocker);
+ }
++ return 1;
+ }
+ }
+ }
+diff -r 92e3f57c933b -r 15ba7093f8e6 src/windows/native/sun/windows/awt_Window.cpp
+--- openjdk.orig/jdk/src/windows/native/sun/windows/awt_Window.cpp Fri Mar 14 20:40:09 2008 +0300
++++ openjdk/jdk/src/windows/native/sun/windows/awt_Window.cpp Fri Mar 14 22:00:33 2008 +0300
+@@ -180,7 +180,6 @@
+ }
+
+ ::RemoveProp(GetHWnd(), ModalBlockerProp);
+- ::RemoveProp(GetHWnd(), ModalSaveWSEXProp);
+
+ if (m_grabbedWindow == this) {
+ Ungrab();
+@@ -1455,20 +1454,17 @@
+ if (!::IsWindow(window)) {
+ return;
+ }
+- DWORD exStyle = ::GetWindowLong(window, GWL_EXSTYLE);
++
+ if (::IsWindow(blocker)) {
+- // save WS_EX_NOACTIVATE and WS_EX_APPWINDOW styles
+- DWORD saveStyle = exStyle & (AWT_WS_EX_NOACTIVATE | WS_EX_APPWINDOW);
+- ::SetProp(window, ModalSaveWSEXProp, reinterpret_cast<HANDLE>(saveStyle));
+- ::SetWindowLong(window, GWL_EXSTYLE, (exStyle | AWT_WS_EX_NOACTIVATE) & ~WS_EX_APPWINDOW);
+ ::SetProp(window, ModalBlockerProp, reinterpret_cast<HANDLE>(blocker));
++ ::EnableWindow(window, FALSE);
+ } else {
+- // restore WS_EX_NOACTIVATE and WS_EX_APPWINDOW styles
+- DWORD saveStyle = reinterpret_cast<DWORD>(::GetProp(window, ModalSaveWSEXProp));
+- ::SetWindowLong(window, GWL_EXSTYLE,
+- (exStyle & ~(AWT_WS_EX_NOACTIVATE | WS_EX_APPWINDOW)) | saveStyle);
+- ::RemoveProp(window, ModalSaveWSEXProp);
+ ::RemoveProp(window, ModalBlockerProp);
++ AwtComponent *comp = AwtComponent::GetComponent(window);
++ // we don't expect to be called with non-java HWNDs
++ DASSERT(comp && comp->IsTopLevel());
++ // we should not unblock disabled toplevels
++ ::EnableWindow(window, comp->isEnabled());
+ }
+ }
+
+diff -r 92e3f57c933b -r 15ba7093f8e6 src/windows/native/sun/windows/awt_Window.h
+--- openjdk.orig/jdk/src/windows/native/sun/windows/awt_Window.h Fri Mar 14 20:40:09 2008 +0300
++++ openjdk/jdk/src/windows/native/sun/windows/awt_Window.h Fri Mar 14 22:00:33 2008 +0300
+@@ -33,7 +33,6 @@
+
+ // property name tagging windows disabled by modality
+ static LPCTSTR ModalBlockerProp = TEXT("SunAwtModalBlockerProp");
+-static LPCTSTR ModalSaveWSEXProp = TEXT("SunAwtModalSaveWSEXProp");
+ static LPCTSTR ModalDialogPeerProp = TEXT("SunAwtModalDialogPeerProp");
+
+ #ifndef WH_MOUSE_LL
+diff -r 92e3f57c933b -r 15ba7093f8e6 test/java/awt/Modal/WsDisabledStyle/CloseBlocker/CloseBlocker.java
+--- /dev/null Thu Jan 01 00:00:00 1970 +0000
++++ openjdk/jdk/test/java/awt/Modal/WsDisabledStyle/CloseBlocker/CloseBlocker.java Fri Mar 14 22:00:33 2008 +0300
+@@ -0,0 +1,466 @@
++/*
++ * Copyright 2007 Sun Microsystems, Inc. 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.
++ *
++ * 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
++ * CA 95054 USA or visit www.sun.com if you need additional information or
++ * have any questions.
++ */
++
++/*
++ @test %I% %E%
++ @bug 4080029
++ @summary Modal Dialog block input to all frame windows not just its parent.
++ @author dmitry.cherepanov: area=awt.modal
++ @run main/manual CloseBlocker
++*/
++
++/**
++ * ManualMainTest.java
++ *
++ * summary: The test opens and closes blocker dialog, the test verifies
++ * that active window is correct when the dialog is closed.
++ */
++
++import java.awt.*;
++import java.awt.event.*;
++
++public class CloseBlocker
++{
++
++ private static void init()
++ {
++ //*** Create instructions for the user here ***
++
++ String[] instructions =
++ {
++ " the test will be run 6 times, to start next test just close all ",
++ " windows of previous; the instructions are the same for all tests: ",
++ " 1) there are two frames (one the frames has 'show modal' button), ",
++ " 2) press the button to show a dialog, ",
++ " 3) close the dialog (an alternative scenario - activate another",
++ " native window before closing the dialog), ",
++ " 4) the frame with button should become next active window, ",
++ " if it's true, then the test passed, otherwise, it failed. ",
++ " Press 'pass' button only after all of the 6 tests are completed, ",
++ " the number of the currently executed test is displayed on the ",
++ " output window. "
++ };
++ Sysout.createDialog( );
++ Sysout.printInstructions( instructions );
++
++ test(true, true, false);
++ test(true, true, true);
++ test(false, true, false); // 3rd parameter has no affect for ownerless
++
++ test(true, false, false);
++ test(true, false, true);
++ test(false, false, false); // 3rd parameter has no affect for ownerless
++
++ }//End init()
++
++ private static final Object obj = new Object();
++ private static int counter = 0;
++
++ /*
++ * The ownerless parameter indicates whether the blocker dialog
++ * has owner. The usual parameter indicates whether the blocker
++ * dialog is a Java dialog (non-native dialog like file dialog).
++ */
++ private static void test(final boolean ownerless, final boolean usual, final boolean initiallyOwnerIsActive) {
++
++ Sysout.print(" * test #" + (++counter) + " is running ... ");
++
++ final Frame active = new Frame();
++ final Frame nonactive = new Frame();
++ Button button = new Button("show modal");
++ button.addActionListener(new ActionListener() {
++ public void actionPerformed(ActionEvent ae) {
++ Dialog dialog = null;
++ Frame parent = ownerless ? null : (initiallyOwnerIsActive? active : nonactive);
++ if (usual) {
++ dialog = new Dialog(parent, "Sample", true);
++ } else {
++ dialog = new FileDialog(parent, "Sample", FileDialog.LOAD);
More information about the distro-pkg-dev
mailing list