/hg/icedtea6: Correction of testcase test/javax/swing/plaf/synth...

[ptisnovs at icedtea.classpath.org]

changeset e4c712442cf1 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=e4c712442cf1
author: ptisnovs
date: Tue Sep 21 17:37:58 2010 +0200

	Correction of testcase test/javax/swing/plaf/synth/Test6933784.java


diffstat:

3 files changed, 52 insertions(+), 1 deletion(-)
ChangeLog                                  |    7 ++++
Makefile.am                                |    3 +
patches/openjdk/6985992-test_6933784.patch |   43 ++++++++++++++++++++++++++++

diffs (74 lines):

diff -r fd77bd063119 -r e4c712442cf1 ChangeLog
--- a/ChangeLog	Tue Sep 21 11:11:45 2010 +0200
+++ b/ChangeLog	Tue Sep 21 17:37:58 2010 +0200
@@ -1,3 +1,10 @@ 2010-09-21  Pavel Tisnovsky  <ptisnovs at r
+2010-09-21  Pavel Tisnovsky  <ptisnovs at redhat.com>
+
+	* Makefile.am:
+	Add new patch.
+	* patches/openjdk/6985992-test_6933784.patch
+	Testcase correction.
+
 2010-09-21  Pavel Tisnovsky  <ptisnovs at redhat.com>
 
 	* Makefile.am:
diff -r fd77bd063119 -r e4c712442cf1 Makefile.am
--- a/Makefile.am	Tue Sep 21 11:11:45 2010 +0200
+++ b/Makefile.am	Tue Sep 21 17:37:58 2010 +0200
@@ -291,7 +291,8 @@ ICEDTEA_PATCHES = \
 	patches/openjdk/6638712-wildcard_types.patch \
 	patches/openjdk/6650759-missing_inference.patch \
 	patches/numa_on_early_glibc.patch \
-	patches/icedtea-shark-build.patch
+	patches/icedtea-shark-build.patch \
+	patches/openjdk/6985992-test_6933784.patch
 
 if !WITH_ALT_HSBUILD
 ICEDTEA_PATCHES += \
diff -r fd77bd063119 -r e4c712442cf1 patches/openjdk/6985992-test_6933784.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/openjdk/6985992-test_6933784.patch	Tue Sep 21 17:37:58 2010 +0200
@@ -0,0 +1,43 @@
+# HG changeset patch
+# User ptisnovs
+# Date 1284983956 -7200
+# Node ID bf87d5af43614d609a5251c43eea44c028500d02
+# Parent  4d6c88bce53e4ec3902312abad5eaada33f77a23
+6985992 Fix test/javax/swing/plaf/synth/Test6933784.java for OpenJDK 6
+Summary: Testcase correction
+Reviewed-by: darcy
+
+diff -r 4d6c88bce53e -r bf87d5af4361 test/javax/swing/plaf/synth/Test6933784.java
+--- openjdk/jdk/test/javax/swing/plaf/synth/Test6933784-old.java	Thu Jan 29 14:58:12 2009 +0300
++++ openjdk/jdk/test/javax/swing/plaf/synth/Test6933784.java	Mon Sep 20 13:59:16 2010 +0200
+@@ -29,7 +29,7 @@
+ */
+ 
+ import javax.swing.*;
+-import javax.swing.plaf.nimbus.NimbusLookAndFeel;
++import javax.swing.UIManager.LookAndFeelInfo;
+ import javax.swing.plaf.synth.SynthLookAndFeel;
+ import javax.swing.text.Element;
+ import javax.swing.text.html.HTMLDocument;
+@@ -43,11 +43,20 @@
+ 
+         checkImages();
+ 
+-        UIManager.setLookAndFeel(new NimbusLookAndFeel());
++        setNimbusLookAndFeel();
+ 
+         checkImages();
+     }
+ 
++    private static void setNimbusLookAndFeel() throws Exception {
++        for (LookAndFeelInfo info : UIManager.getInstalledLookAndFeels()) {
++            if ("Nimbus".equals(info.getName())) {
++                UIManager.setLookAndFeel(info.getClassName());
++                break;
++            }
++        }
++    }
++
+     private static void checkImages() throws Exception {
+         SwingUtilities.invokeAndWait(new Runnable() {
+             public void run() {