Mercurial > hg > release > icedtea6-1.11
changeset 1910:2e9cc3b3a882
Merge
author | Andrew John Hughes <ahughes@redhat.com> |
---|---|
date | Thu, 28 Jan 2010 17:33:53 +0000 |
parents | 30881dc8076c (current diff) 2c335401e50d (diff) |
children | 7dfb8c2383c4 |
files | Makefile.am |
diffstat | 4 files changed, 90 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/Makefile.am Thu Jan 28 16:34:49 2010 +0000 +++ b/Makefile.am Thu Jan 28 17:33:53 2010 +0000 @@ -299,7 +299,10 @@ patches/icedtea-linux-separate-debuginfo.patch \ patches/icedtea-parisc.patch \ patches/icedtea-sh4-support.patch \ - patches/libpng.patch + patches/libpng.patch \ + patches/icedtea-6920143-using-with-mouse.patch \ + patches/icedtea-6920172-location-relative-to-test.patch \ + patches/icedtea-6920172-turkish.patch if WITH_RHINO ICEDTEA_PATCHES += \
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/patches/icedtea-6920143-using-with-mouse.patch Thu Jan 28 17:33:53 2010 +0000 @@ -0,0 +1,45 @@ +6920143: test/java/awt/TestArea/UsingWithMouse.java needs realSync() +Summary: Added small delay to make sure that TextArea animation have finished +Reviewed-by: anthony + +--- openjdk.orig/jdk/test/java/awt/TextArea/UsingWithMouse/SelectionAutoscrollTest.java 2010-01-27 14:45:28.000000000 +0100 ++++ openjdk/jdk/test/java/awt/TextArea/UsingWithMouse/SelectionAutoscrollTest.java 2010-01-27 14:45:27.000000000 +0100 +@@ -56,6 +56,7 @@ + TextArea textArea; + Robot robot; + final int desiredSelectionEnd = ('z'-'a'+1)*2; // 52 ++ final static int SCROLL_DELAY = 100; // ms + + public void start () { + createObjects(); +@@ -126,6 +127,8 @@ + + moveMouseBelowTextArea( tremble%2!=0 ); + Util.waitForIdle( robot ); ++ // it is needed to add some small delay on Gnome ++ waitUntilScrollIsPerformed(robot); + } + + robot.mouseRelease( MouseEvent.BUTTON1_MASK ); +@@ -141,9 +144,19 @@ + void moveMouseBelowTextArea( boolean shift ) { + Dimension d = textArea.getSize(); + Point l = textArea.getLocationOnScreen(); ++ int x = (int)(l.x+d.width*.5); + int y = (int)(l.y+d.height*1.5); + if( shift ) y+=15; +- robot.mouseMove( (int)(l.x+d.width*.5), y ); ++ robot.mouseMove( x, y ); ++ } ++ ++ void waitUntilScrollIsPerformed(Robot robot) { ++ try { ++ Thread.sleep( SCROLL_DELAY ); ++ } ++ catch( Exception e ) { ++ throw new RuntimeException( e ); ++ } + } + + void checkResults() { +
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/patches/icedtea-6920172-location-relative-to-test.patch Thu Jan 28 17:33:53 2010 +0000 @@ -0,0 +1,27 @@ +6920172: Regression test LocationRelativeToTest does not check frame position correctly. +Summary: Testcase correction - check frame position against graphics environment's center point +Reviewed-by: art + +--- openjdk.orig/jdk/test/java/awt/Multiscreen/LocationRelativeToTest/LocationRelativeToTest.java 2010-01-25 17:42:52.000000000 +0100 ++++ openjdk/jdk/test/java/awt/Multiscreen/LocationRelativeToTest/LocationRelativeToTest.java 2010-01-25 17:42:52.000000000 +0100 +@@ -50,7 +50,8 @@ + + GraphicsEnvironment ge = + GraphicsEnvironment.getLocalGraphicsEnvironment(); +- System.out.println("Center point: " + ge.getCenterPoint()); ++ Point centerPoint = ge.getCenterPoint(); ++ System.out.println("Center point: " + centerPoint); + GraphicsDevice[] gds = ge.getScreenDevices(); + GraphicsDevice gdDef = ge.getDefaultScreenDevice(); + GraphicsConfiguration gcDef = +@@ -77,8 +78,7 @@ + // second, check setLocationRelativeTo(invisible) + f.setLocationRelativeTo(f2); + Util.waitForIdle(r); +- checkLocation(f, new Point(gcBounds.x + gcBounds.width / 2, +- gcBounds.y + gcBounds.height / 2)); ++ checkLocation(f, centerPoint); + + // third, check setLocationRelativeTo(visible) + f2.setVisible(true); +
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/patches/icedtea-6920172-turkish.patch Thu Jan 28 17:33:53 2010 +0000 @@ -0,0 +1,14 @@ +6917663: test/java/security/Provider/Turkish.java not samevm friendly +Summary: Added othervm flag to ensure that this test will run in isolation. +Reviewed-by: alanb + +--- openjdk.orig/jdk/test/java/security/Provider/Turkish.java 2010-01-18 11:02:18.000000000 +0100 ++++ openjdk/jdk/test/java/security/Provider/Turkish.java 2010-01-18 11:02:17.000000000 +0100 +@@ -25,6 +25,7 @@ + * @test + * @bug 6220064 + * @summary make sure everything works ok in the Turkish local (dotted/dotless i problem) ++ * @run main/othervm Turkish + * @author Andreas Sterbenz + */ +