From 05ec20c9ad80b0bfbd513337ebc71af759d47e99 Mon Sep 17 00:00:00 2001 From: Sergey Bylokhov Date: Mon, 26 Feb 2024 10:06:36 +0000 Subject: [PATCH 01/22] 8025439: [TEST BUG] [macosx] PrintServiceLookup.lookupPrintServices doesn't work properly since jdk8b105 Reviewed-by: andrew Backport-of: a53e8ddcad8c34fc9906e083c5933d0d1c3e9f4e --- .../PrintServiceLookup/GetPrintServices.java | 45 +++++++++++-------- 1 file changed, 26 insertions(+), 19 deletions(-) diff --git a/jdk/test/javax/print/PrintServiceLookup/GetPrintServices.java b/jdk/test/javax/print/PrintServiceLookup/GetPrintServices.java index f8373a6383a..544428566cb 100644 --- a/jdk/test/javax/print/PrintServiceLookup/GetPrintServices.java +++ b/jdk/test/javax/print/PrintServiceLookup/GetPrintServices.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2013, 2016, 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 @@ -29,30 +29,37 @@ /* * @test - * @bug 8013810 - * @summary Test that print service returned without filter are of the same class as with name filter + * @bug 8013810 8025439 + * @summary Test that print service returned without filter are of the same class + * as with name filter */ public class GetPrintServices { - public static void main(String[] args) throws Exception { - for (PrintService service : PrintServiceLookup.lookupPrintServices(null, null)) { - String serviceName = service.getName(); - PrintService serviceByName = lookupByName(serviceName); - if (!service.equals(serviceByName)) { - throw new RuntimeException("NOK " + serviceName + public static void main(String[] args) throws Exception { + for (PrintService service : PrintServiceLookup.lookupPrintServices(null, null)) { + String serviceName = service.getName(); + PrinterName name = service.getAttribute(PrinterName.class); + String printerName = name.getValue(); + + PrintService serviceByName = lookupByName(printerName); + System.out.println("service " + service); + System.out.println("serviceByName " + serviceByName); + if (!service.equals(serviceByName)) { + throw new RuntimeException("NOK " + serviceName + " expected: " + service.getClass().getName() + " got: " + serviceByName.getClass().getName()); - } + } + } + System.out.println("Test PASSED"); } - System.out.println("Test PASSED"); - } - private static PrintService lookupByName(String name) { - AttributeSet attributes = new HashAttributeSet(); - attributes.add(new PrinterName(name, null)); - for (PrintService service : PrintServiceLookup.lookupPrintServices(null, attributes)) { - return service; + private static PrintService lookupByName(String name) { + AttributeSet attributes = new HashAttributeSet(); + attributes.add(new PrinterName(name, null)); + for (PrintService service : + PrintServiceLookup.lookupPrintServices(null, attributes)) { + return service; + } + return null; } - return null; - } } From b8617245bc63dcd91af76de1a72e67a9ad47850c Mon Sep 17 00:00:00 2001 From: Sergey Bylokhov Date: Mon, 26 Feb 2024 12:11:50 +0000 Subject: [PATCH 02/22] 8240756: [macos] SwingSet2:TableDemo:Printed Japanese characters were garbled Reviewed-by: andrew Backport-of: 27fe3d7f8db4ede6441a7cc325d9f29eb4a1d10d --- .../classes/sun/lwawt/macosx/CTextPipe.java | 80 ++++++++++- .../font/GlyphVector/MultiSlotFontTest.java | 136 ++++++++++++++++++ 2 files changed, 212 insertions(+), 4 deletions(-) create mode 100644 jdk/test/java/awt/font/GlyphVector/MultiSlotFontTest.java diff --git a/jdk/src/macosx/classes/sun/lwawt/macosx/CTextPipe.java b/jdk/src/macosx/classes/sun/lwawt/macosx/CTextPipe.java index 797e26f3156..30bae2b256a 100644 --- a/jdk/src/macosx/classes/sun/lwawt/macosx/CTextPipe.java +++ b/jdk/src/macosx/classes/sun/lwawt/macosx/CTextPipe.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2011, 2022, 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 @@ -81,10 +81,57 @@ public void drawString(final SunGraphics2D sg2d, final String s, final double x, } } - public void drawGlyphVector(final SunGraphics2D sg2d, final GlyphVector gV, final float x, final float y) { - final Font prevFont = sg2d.getFont(); - sg2d.setFont(gV.getFont()); + private boolean hasSlotData(GlyphVector gv) { + final int length = gv.getNumGlyphs(); + for (int i = 0; i < length; i++) { + if ((gv.getGlyphCode(i) & CompositeGlyphMapper.SLOTMASK) != 0) { + return true; + } + } + return false; + } + + private Font getSlotFont(Font font, int slot) { + Font2D f2d = FontUtilities.getFont2D(font); + if (f2d instanceof CFont) { + CompositeFont cf = ((CFont)f2d).getCompositeFont2D(); + PhysicalFont pf = cf.getSlotFont(slot); + Font f = new Font(pf.getFontName(null), + font.getStyle(), font.getSize()); + return f; + } + return null; + } + + private GlyphVector getGlyphVectorWithRange(final Font font, final GlyphVector gV, int start, int count) { + int[] glyphs = new int[count]; + for (int i = 0; i < count; i++) { + glyphs[i] = gV.getGlyphCode(start+i) & CompositeGlyphMapper.GLYPHMASK; + } + // Positions should be null to recalculate by native methods, + // if GV was segmented. + StandardGlyphVector sgv = new StandardGlyphVector(font, + gV.getFontRenderContext(), + glyphs, + null, // positions + null, // indices + gV.getLayoutFlags()); + return sgv; + } + + private int getLengthOfSameSlot(final GlyphVector gV, final int targetSlot, final int start, final int length) { + int count = 1; + for (; start + count < length; count++) { + int slot = (gV.getGlyphCode(start + count) & + CompositeGlyphMapper.SLOTMASK) >> 24; + if (targetSlot != slot) { + break; + } + } + return count; + } + private void drawGlyphVectorImpl(final SunGraphics2D sg2d, final GlyphVector gV, final float x, final float y) { final long nativeStrikePtr = getNativeStrikePtr(sg2d); if (OSXSurfaceData.IsSimpleColor(sg2d.paint) && nativeStrikePtr != 0) { final OSXSurfaceData surfaceData = (OSXSurfaceData)sg2d.getSurfaceData(); @@ -92,6 +139,31 @@ public void drawGlyphVector(final SunGraphics2D sg2d, final GlyphVector gV, fina } else { drawGlyphVectorAsShape(sg2d, gV, x, y); } + } + + public void drawGlyphVector(final SunGraphics2D sg2d, final GlyphVector gV, final float x, final float y) { + final Font prevFont = sg2d.getFont(); + sg2d.setFont(gV.getFont()); + + if (hasSlotData(gV)) { + final int length = gV.getNumGlyphs(); + float[] positions = gV.getGlyphPositions(0, length, null); + int start = 0; + while (start < length) { + int slot = (gV.getGlyphCode(start) & + CompositeGlyphMapper.SLOTMASK) >> 24; + sg2d.setFont(getSlotFont(gV.getFont(), slot)); + int count = getLengthOfSameSlot(gV, slot, start, length); + GlyphVector rangeGV = getGlyphVectorWithRange(sg2d.getFont(), + gV, start, count); + drawGlyphVectorImpl(sg2d, rangeGV, + x + positions[start * 2], + y + positions[start * 2 + 1]); + start += count; + } + } else { + drawGlyphVectorImpl(sg2d, gV, x, y); + } sg2d.setFont(prevFont); } diff --git a/jdk/test/java/awt/font/GlyphVector/MultiSlotFontTest.java b/jdk/test/java/awt/font/GlyphVector/MultiSlotFontTest.java new file mode 100644 index 00000000000..65acd420345 --- /dev/null +++ b/jdk/test/java/awt/font/GlyphVector/MultiSlotFontTest.java @@ -0,0 +1,136 @@ +/* + * Copyright (c) 2022, 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. + * + * 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. + */ + +/** + * @test + * @bug 8240756 + * @summary Non-English characters are printed with wrong glyphs on MacOS + * @modules java.desktop/sun.java2d java.desktop/sun.java2d.loops java.desktop/sun.font + * @requires os.family == "mac" + * @run main MultiSlotFontTest + */ + +import java.awt.Color; +import java.awt.Dimension; +import java.awt.Font; +import java.awt.Graphics; +import java.awt.Image; +import java.awt.RenderingHints; +import java.awt.font.FontRenderContext; +import java.awt.font.GlyphVector; +import java.awt.image.BufferedImage; +import sun.font.StandardGlyphVector; +import sun.java2d.OSXOffScreenSurfaceData; +import sun.java2d.SunGraphics2D; +import sun.java2d.SurfaceData; +import sun.java2d.loops.SurfaceType; + +public class MultiSlotFontTest { + + private static final int WIDTH = 100; + private static final int HEIGHT = 60; + + private static final String TEST_STR = "\u3042\u3044\u3046\u3048\u304Aabc"; + private static final int EXPECTED_HEIGHT = 10; + private static final int EXPECTED_WIDTH = 77; + private static final int LIMIT_DIFF_HEIGHT = 3; + private static final int LIMIT_DIFF_WIDTH = 15; + + public static void main(String[] args) throws Exception { + MultiSlotFontTest test = new MultiSlotFontTest(); + } + + public MultiSlotFontTest() { + BufferedImage img = createImage(); + + SurfaceData sd = OSXOffScreenSurfaceData.createDataIC(img, + SurfaceType.IntRgb); + SunGraphics2D g2d = new SunGraphics2D(sd, + Color.BLACK, Color.WHITE, null); + Font font = g2d.getFont(); + + if (font.canDisplayUpTo(TEST_STR) != -1) { + System.out.println("There is no capable font. Skipping the test."); + System.out.println("Font: " + font); + return; + } + + FontRenderContext frc = new FontRenderContext(null, false, false); + StandardGlyphVector gv = new StandardGlyphVector(font, TEST_STR, frc); + g2d.setRenderingHint(RenderingHints.KEY_ANTIALIASING, + RenderingHints.VALUE_ANTIALIAS_OFF); + g2d.drawGlyphVector(gv, 0.0f, (float)(HEIGHT - 5)); + g2d.dispose(); + + Dimension d = getBounds(img); + + if (Math.abs(d.height - EXPECTED_HEIGHT) > LIMIT_DIFF_HEIGHT || + Math.abs(d.width - EXPECTED_WIDTH) > LIMIT_DIFF_WIDTH) { + debugOut(img); + throw new RuntimeException( + "Incorrect GlyphVector shape " + d + "," + gv); + } + } + + private static BufferedImage createImage() { + BufferedImage image = new BufferedImage(WIDTH, HEIGHT, + BufferedImage.TYPE_INT_RGB); + Graphics g = image.createGraphics(); + g.setColor(Color.WHITE); + g.fillRect(0, 0, WIDTH, HEIGHT); + g.dispose(); + return image; + } + + private Dimension getBounds(BufferedImage img) { + int top = HEIGHT; + int left = WIDTH; + int right = 0; + int bottom = 0; + for (int y = 0; y < HEIGHT; y++) { + for (int x = 0; x < WIDTH; x++) { + if ((img.getRGB(x, y) & 0xFFFFFF) == 0) { + if (top > y) top = y; + if (bottom < y) bottom = y; + if (left > x) left = x; + if (right < x) right = x; + } + } + } + return new Dimension(right - left, bottom - top); + } + + private void debugOut(BufferedImage img) { + for (int y = 0; y < HEIGHT; y++) { + for (int x = 0; x < WIDTH; x++) { + int c = img.getRGB(x, y) & 0xFFFFFF; + if (c == 0) { + System.out.print("*"); + } else { + System.out.print(" "); + } + } + System.out.println(); + } + } +} From c01d11244013f66fcf2f7cc8d7a3c5670ba2d06b Mon Sep 17 00:00:00 2001 From: Andrew John Hughes Date: Mon, 26 Feb 2024 16:21:12 +0000 Subject: [PATCH 03/22] 8326686: Bump update version of OpenJDK: 8u422 Reviewed-by: sgehwolf --- .jcheck/conf | 2 +- common/autoconf/version-numbers | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.jcheck/conf b/.jcheck/conf index e657e8ff3f8..f002fd8b96f 100644 --- a/.jcheck/conf +++ b/.jcheck/conf @@ -1,7 +1,7 @@ [general] project=jdk8u jbs=JDK -version=openjdk8u412 +version=openjdk8u422 [checks] error=author,committer,reviewers,merge,issues,executable,symlink,message,hg-tag,whitespace diff --git a/common/autoconf/version-numbers b/common/autoconf/version-numbers index 248532982d6..bd3c3824e33 100644 --- a/common/autoconf/version-numbers +++ b/common/autoconf/version-numbers @@ -1,5 +1,5 @@ # -# Copyright (c) 2011, 2023, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2011, 2024, 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 @@ -26,7 +26,7 @@ JDK_MAJOR_VERSION=1 JDK_MINOR_VERSION=8 JDK_MICRO_VERSION=0 -JDK_UPDATE_VERSION=412 +JDK_UPDATE_VERSION=422 LAUNCHER_NAME=openjdk PRODUCT_NAME=OpenJDK PRODUCT_SUFFIX="Runtime Environment" From e2bcd784aec5d89b4faa175d039613217949a9bb Mon Sep 17 00:00:00 2001 From: sunyaqi Date: Mon, 26 Feb 2024 16:28:06 +0000 Subject: [PATCH 04/22] 8198321: javax/swing/JEditorPane/5076514/bug5076514.java fails Reviewed-by: serb, andrew Backport-of: cc3756b342a367d3d29a31a18bdcc2fa4797bdcf --- .../javax/swing/JEditorPane/5076514/bug5076514.java | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/jdk/test/javax/swing/JEditorPane/5076514/bug5076514.java b/jdk/test/javax/swing/JEditorPane/5076514/bug5076514.java index fc411722def..dab2e69a48d 100644 --- a/jdk/test/javax/swing/JEditorPane/5076514/bug5076514.java +++ b/jdk/test/javax/swing/JEditorPane/5076514/bug5076514.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2018, 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 @@ -22,13 +22,16 @@ */ /* @test - @bug 5076514 8025430 + @bug 5076514 8025430 8198321 @summary Tests if SecurityManager.checkPermission() used for clipboard access with permission 'accessClipboard' @run main bug5076514 + @run main/othervm -Djava.awt.headless=true bug5076514 */ +import java.awt.GraphicsEnvironment; import java.security.Permission; + import javax.swing.JEditorPane; public class bug5076514 { @@ -37,9 +40,13 @@ public class bug5076514 { public static void main(String[] args) { System.setSecurityManager(new MySecurityManager()); + + // no system clipboard in the headless mode + boolean expected = !GraphicsEnvironment.isHeadless(); + JEditorPane editor = new JEditorPane(); editor.copy(); - if (!isCheckPermissionCalled) { + if (isCheckPermissionCalled != expected) { throw new RuntimeException("JEditorPane's clipboard operations " + "didn't call SecurityManager.checkPermission() with " + "permission 'accessClipboard' when there is a security" From 5a284daaeaea4e79c4d61b59a5d12f07b03af20c Mon Sep 17 00:00:00 2001 From: sunyaqi Date: Mon, 26 Feb 2024 16:30:11 +0000 Subject: [PATCH 05/22] 8159690: [TESTBUG] Mark headful tests with @key headful. Reviewed-by: serb, andrew Backport-of: 4f7d655557b0843d1fd4dddc1058d3438d1332b8 --- .../GetSizeShouldNotReturnZero.java | 3 ++- .../sun/awt/Translucency/WindowOpacity.java | 3 ++- .../ChoiceKeyEventReaction.html | 3 ++- .../ChoiceMouseWheelTest.java | 3 ++- .../awt/Choice/GrabLockTest/GrabLockTest.java | 3 ++- .../ItemStateChangeTest.java | 3 ++- .../PopdownGeneratesMouseEvents.html | 3 ++- .../awt/Choice/PopupPosTest/PopupPosTest.html | 3 ++- .../RemoveAllShrinkTest.java | 3 ++- .../SelectCurrentItemTest.html | 3 ++- .../awt/Component/7097771/bug7097771.java | 3 ++- .../CompEventOnHiddenComponent.java | 3 ++- .../F10TopToplevel/F10TopToplevel.html | 3 ++- .../NativeInLightShow/NativeInLightShow.java | 3 ++- .../NoUpdateUponShow/NoUpdateUponShow.java | 3 ++- .../PrintAllXcheckJNI/PrintAllXcheckJNI.java | 3 ++- .../TreeLockDeadlock/TreeLockDeadlock.java | 1 + .../IsLightweightCrash.java | 3 ++- .../awt/ComponentOrientation/BorderTest.java | 1 + .../awt/ComponentOrientation/FlowTest.java | 1 + .../awt/ComponentOrientation/WindowTest.java | 1 + .../ContainerAIOOBE/ContainerAIOOBE.java | 3 ++- .../JInternalFrameTest.java | 3 ++- .../Dialog/CrashXCheckJni/CrashXCheckJni.java | 3 ++- .../DialogSizeOverflowTest.java | 19 ++++++++-------- .../ModalDialogPermission.java | 3 ++- .../NonResizableDialogSysMenuResize.java | 3 ++- .../HandleExceptionOnEDT.java | 3 ++- .../PreserveDispatchThread.java | 3 ++- .../PushPopDeadlock2/PushPopTest.java | 3 ++- .../FilenameFilterTest.html | 3 ++- .../awt/Focus/6378278/InputVerifierTest.java | 3 ++- .../awt/Focus/6382144/EndlessLoopTest.java | 3 ++- .../awt/Focus/6401036/InputVerifierTest2.java | 3 ++- .../ActualFocusedWindowBlockingTest.java | 3 ++- .../AppletInitialFocusTest.html | 3 ++- .../AppletInitialFocusTest1.html | 3 ++- .../ChildWindowFocusTest.html | 3 ++- .../awt/Focus/ChoiceFocus/ChoiceFocus.java | 3 ++- .../ClearLwQueueBreakTest.java | 3 ++- .../CloseDialogActivateOwnerTest.java | 3 ++- .../ConsumeNextKeyTypedOnModalShowTest.java | 3 ++- .../ContainerFocusAutoTransferTest.java | 3 ++- .../DeiconifiedFrameLoosesFocus.html | 3 ++- .../DisposeDialogNotActivateOwnerTest.html | 3 ++- .../FocusOwnerFrameOnClick.java | 3 ++- .../FocusSubRequestTest.html | 3 ++- .../FocusTraversalPolicy/DefaultFTPTest.java | 3 ++- .../FocusTraversalPolicy/InitialFTP.java | 3 ++- .../FocusTraversalPolicy/LayoutFTPTest.java | 3 ++- .../FrameJumpingToMouse.java | 19 ++++++++-------- .../FrameMinimizeTest/FrameMinimizeTest.java | 3 ++- .../IconifiedFrameFocusChangeTest.java | 3 ++- .../InputVerifierTest3.java | 3 ++- .../ModalBlockedStealsFocusTest.html | 3 ++- .../ModalDialogInitialFocusTest.html | 3 ++- .../ModalExcludedWindowClickTest.html | 3 ++- .../NoAutotransferToDisabledCompTest.java | 3 ++- .../NonFocusableBlockedOwnerTest.html | 3 ++- .../NonFocusableResizableTooSmall.java | 3 ++- .../NonFocusableWindowTest/NoEventsTest.java | 3 ++- .../NonfocusableOwnerTest.java | 3 ++- .../OwnedWindowFocusIMECrashTest.java | 3 ++- .../RequestFocusAndHideTest.java | 3 ++- .../RequestFocusToDisabledCompTest.java | 3 ++- .../RequestOnCompWithNullParent1.java | 3 ++- .../ResetMostRecentFocusOwnerTest.java | 3 ++- .../RestoreFocusOnDisabledComponentTest.java | 3 ++- .../ShowFrameCheckForegroundTest.java | 3 ++- .../Focus/ToFrontFocusTest/ToFrontFocus.html | 3 ++- .../WindowInitialFocusTest.html | 3 ++- .../WindowIsFocusableAccessByThreadsTest.java | 1 + .../WindowUpdateFocusabilityTest.html | 3 ++- .../WrongKeyTypedConsumedTest.java | 3 ++- .../awt/FontClass/CreateFont/bigfont.html | 3 ++- .../java/awt/Frame/7024749/bug7024749.java | 3 ++- .../DisposeStressTest/DisposeStressTest.html | 1 + .../Frame/DynamicLayout/DynamicLayout.java | 3 ++- .../Frame/FrameLocation/FrameLocation.java | 3 ++- .../ShowChildWhileResizingTest.java | 13 ++++++----- .../FrameSetSizeStressTest.java | 3 ++- .../awt/Frame/FrameSize/TestFrameSize.java | 3 ++- .../Frame/HideMaximized/HideMaximized.java | 3 ++- .../java/awt/Frame/HugeFrame/HugeFrame.java | 3 ++- .../Frame/InvisibleOwner/InvisibleOwner.java | 3 ++- .../LayoutOnMaximizeTest.java | 3 ++- .../MaximizedNormalBoundsUndecoratedTest.java | 3 ++- .../MaximizedToIconified.java | 3 ++- .../MaximizedToMaximized.java | 3 ++- .../MaximizedUndecorated.java | 3 ++- .../UndecoratedInitiallyIconified.java | 3 ++- .../NonEDT_GUI_Deadlock.html | 3 ++- .../ResizeAfterSetFont.java | 3 ++- .../ShownOffScreenOnWin98Test.java | 3 ++- .../SlideNotResizableTest.java | 3 ++- .../UnfocusableMaximizedFrameResizablity.java | 3 ++- .../awt/FullScreen/8013581/bug8013581.java | 3 ++- .../AltTabCrashTest/AltTabCrashTest.java | 1 + .../BufferStrategyExceptionTest.java | 3 ++- .../DisplayChangeVITest.java | 3 ++- .../FullScreenInsets/FullScreenInsets.java | 3 ++- .../MultimonDeadlockTest.java | 1 + .../NoResizeEventOnDMChangeTest.java | 3 ++- .../NonExistentDisplayModeTest.java | 3 ++- .../awt/FullScreen/SetFSWindow/FSFrame.java | 3 ++- .../GradientPaint/GradientTransformTest.java | 3 ++- .../LinearColorSpaceGradientTest.java | 3 ++- jdk/test/java/awt/Graphics/LineClipTest.java | 3 ++- .../Graphics2D/DrawString/DrawStrSuper.java | 3 ++- .../Graphics2D/DrawString/LCDTextSrcEa.java | 3 ++- .../DrawString/ScaledLCDTextMetrics.java | 3 ++- .../DrawString/TextRenderingTest.java | 3 ++- .../DrawString/XRenderElt254TextTest.java | 3 ++- .../FillTexturePaint/FillTexturePaint.java | 3 ++- .../FlipDrawImage/FlipDrawImage.java | 3 ++- .../TransformSetGet/TransformSetGet.java | 3 ++- .../NormalizingTransformTest.java | 3 ++- .../awt/GraphicsDevice/CheckDisplayModes.java | 3 ++- .../awt/GraphicsDevice/CloneConfigsTest.java | 3 ++- .../IncorrectDisplayModeExitFullscreen.java | 3 ++- .../LoadLock/GE_init3.java | 3 ++- .../GridBagLayoutIpadXYTest.html | 3 ++- .../LayoutExtraGaps/LayoutExtraGaps.java | 3 ++- .../java/awt/Insets/CombinedTestApp1.java | 3 ++- .../ConsumeForModalDialogTest.html | 3 ++- .../ConsumeNextMnemonicKeyTypedTest.html | 3 ++- .../DefaultPolicyChange_AWT.java | 3 ++- .../ButtonActionKeyTest.html | 3 ++- .../EnqueueWithDialogButtonTest.java | 15 +++++++------ .../EnqueueWithDialogTest.java | 15 +++++++------ .../TypeAhead/FreezeTest/FreezeTest.java | 15 +++++++------ .../MenuItemActivatedTest.html | 3 ++- .../SubMenuShowTest/SubMenuShowTest.html | 3 ++- .../TypeAhead/TestDialogTypeAhead.html | 3 ++- .../ActionAfterRemove/ActionAfterRemove.java | 3 ++- .../FirstItemRemoveTest.html | 3 ++- .../FocusEmptyListTest.html | 3 ++- .../awt/List/KeyEventsTest/KeyEventsTest.html | 3 ++- .../AwtListGarbageCollectionTest.java | 3 ++- .../List/ListPeer/R2303044ListSelection.java | 3 ++- .../awt/List/ScrollOutside/ScrollOut.java | 3 ++- .../SingleModeDeselect.java | 3 ++- .../NullMenuLabelTest/NullMenuLabelTest.java | 16 ++++++++------ .../Menu/OpensWithNoGrab/OpensWithNoGrab.java | 3 ++- .../MenuBar/DeadlockTest1/DeadlockTest1.java | 3 ++- .../RemoveHelpMenu/RemoveHelpMenu.java | 1 + .../HierarchyBoundsListenerMixingTest.java | 13 ++++++----- .../JButtonInGlassPaneOverlapping.java | 15 +++++++------ .../Mixing/AWT_Mixing/JButtonOverlapping.java | 14 ++++++------ .../AWT_Mixing/JColorChooserOverlapping.java | 15 +++++++------ .../AWT_Mixing/JComboBoxOverlapping.java | 15 +++++++------ .../JEditorPaneInGlassPaneOverlapping.java | 15 +++++++------ .../AWT_Mixing/JEditorPaneOverlapping.java | 15 +++++++------ .../JGlassPaneInternalFrameOverlapping.java | 17 +++++++------- .../AWT_Mixing/JGlassPaneMoveOverlapping.java | 17 +++++++------- .../JInternalFrameMoveOverlapping.java | 17 +++++++------- .../AWT_Mixing/JInternalFrameOverlapping.java | 15 +++++++------ .../JLabelInGlassPaneOverlapping.java | 15 +++++++------ .../Mixing/AWT_Mixing/JLabelOverlapping.java | 15 +++++++------ .../JListInGlassPaneOverlapping.java | 15 +++++++------ .../Mixing/AWT_Mixing/JListOverlapping.java | 15 +++++++------ .../AWT_Mixing/JMenuBarOverlapping.java | 15 +++++++------ .../JPanelInGlassPaneOverlapping.java | 15 +++++++------ .../Mixing/AWT_Mixing/JPanelOverlapping.java | 15 +++++++------ .../AWT_Mixing/JPopupMenuOverlapping.java | 15 +++++++------ .../JProgressBarInGlassPaneOverlapping.java | 15 +++++++------ .../AWT_Mixing/JProgressBarOverlapping.java | 15 +++++++------ .../JScrollBarInGlassPaneOverlapping.java | 15 +++++++------ .../AWT_Mixing/JScrollBarOverlapping.java | 15 +++++++------ .../AWT_Mixing/JScrollPaneOverlapping.java | 15 +++++++------ .../JSliderInGlassPaneOverlapping.java | 15 +++++++------ .../Mixing/AWT_Mixing/JSliderOverlapping.java | 15 +++++++------ .../JSpinnerInGlassPaneOverlapping.java | 15 +++++++------ .../AWT_Mixing/JSpinnerOverlapping.java | 15 +++++++------ .../AWT_Mixing/JSplitPaneOverlapping.java | 17 +++++++------- .../JTableInGlassPaneOverlapping.java | 15 +++++++------ .../Mixing/AWT_Mixing/JTableOverlapping.java | 16 ++++++++------ .../JTextAreaInGlassPaneOverlapping.java | 16 ++++++++------ .../AWT_Mixing/JTextAreaOverlapping.java | 16 ++++++++------ .../JTextFieldInGlassPaneOverlapping.java | 16 ++++++++------ .../AWT_Mixing/JTextFieldOverlapping.java | 16 ++++++++------ .../JToggleButtonInGlassPaneOverlapping.java | 16 ++++++++------ .../AWT_Mixing/JToggleButtonOverlapping.java | 16 ++++++++------ .../AWT_Mixing/MixingFrameResizing.java | 18 ++++++++------- .../AWT_Mixing/MixingPanelsResizing.java | 19 ++++++++-------- .../Mixing/AWT_Mixing/OpaqueOverlapping.java | 16 ++++++++------ .../AWT_Mixing/OpaqueOverlappingChoice.java | 16 ++++++++------ .../AWT_Mixing/ViewportOverlapping.java | 18 ++++++++------- jdk/test/java/awt/Mixing/HWDisappear.java | 3 ++- .../java/awt/Mixing/JButtonInGlassPane.java | 3 ++- jdk/test/java/awt/Mixing/LWComboBox.java | 3 ++- jdk/test/java/awt/Mixing/LWPopupMenu.java | 3 ++- jdk/test/java/awt/Mixing/MixingInHwPanel.java | 3 ++- jdk/test/java/awt/Mixing/MixingOnDialog.java | 3 ++- .../awt/Mixing/MixingOnShrinkingHWButton.java | 3 ++- .../awt/Mixing/NonOpaqueInternalFrame.java | 3 ++- jdk/test/java/awt/Mixing/OpaqueTest.java | 3 ++- .../java/awt/Mixing/OverlappingButtons.java | 3 ++- jdk/test/java/awt/Mixing/ValidBounds.java | 3 ++- jdk/test/java/awt/Mixing/Validating.java | 3 ++- .../java/awt/Mixing/setComponentZOrder.java | 3 ++- .../awt/Modal/LWModalTest/LWModalTest.java | 3 ++- .../ModalDialogOrderingTest.java | 3 ++- .../ModalitySettingsTest.java | 3 ++- .../awt/Modal/NpeOnClose/NpeOnCloseTest.java | 3 ++- .../Modal/SupportedTest/SupportedTest.java | 3 ++- .../ExtraMouseClick/ExtraMouseClick.html | 3 ++- .../MaximizedFrameTest.java | 1 + .../ExtraButtonDrag.java | 3 ++- .../MouseModifiersUnitTest_Extra.java | 3 ++- .../MouseModifiersUnitTest_Standard.java | 3 ++- .../TitleBarDoubleClick.html | 3 ++- .../awt/MouseInfo/GetPointerInfoTest.java | 3 ++- .../awt/MouseInfo/MultiscreenPointerInfo.java | 3 ++- .../MouseEventTest/MouseEventTest.java | 3 ++- .../MultiScreenInsetsTest.java | 3 ++- .../MultiScreenLocationTest.java | 3 ++- .../UpdateGCTest/UpdateGCTest.java | 3 ++- .../WPanelPeerPerf/WPanelPeerPerf.java | 3 ++- .../WindowGCChangeTest.html | 3 ++- jdk/test/java/awt/Paint/ButtonRepaint.java | 3 ++- jdk/test/java/awt/Paint/CheckboxRepaint.java | 3 ++- ...ComponentIsNotDrawnAfterRemoveAddTest.java | 13 ++++++----- jdk/test/java/awt/Paint/LabelRepaint.java | 3 ++- jdk/test/java/awt/Paint/ListRepaint.java | 3 ++- .../awt/PrintJob/MultipleEnd/MultipleEnd.java | 3 ++- .../PrintJob/PrintArcTest/PrintArcTest.java | 13 ++++++----- .../QuoteAndBackslashTest.java | 3 ++- .../RoundedRectTest/RoundedRectTest.java | 3 ++- .../PrintJob/Security/SecurityDialogTest.java | 3 ++- .../java/awt/Robot/CtorTest/CtorTest.java | 3 ++- .../RobotExtraButton/RobotExtraButton.java | 3 ++- .../Robot/RobotWheelTest/RobotWheelTest.java | 5 +++-- .../ScrollPanePreferredSize.java | 3 ++- .../java/awt/ScrollPane/bug8077409Test.java | 14 +++++++----- .../MultiResolutionSplashTest.java | 3 ++- .../awt/TextArea/Mixing/TextAreaMixing.java | 6 +++-- .../ScrollbarIntersectionTest.java | 3 ++- .../TextAreaTwicePack/TextAreaTwicePack.java | 3 ++- .../SelectionAutoscrollTest.java | 1 + .../SelectionInvisibleTest.java | 3 ++- .../awt/Toolkit/DynamicLayout/bug7172833.java | 3 ++- .../awt/Toolkit/RealSync/RealSyncOnEDT.java | 3 ++- .../ScreenInsetsTest/ScreenInsetsTest.java | 3 ++- .../ToolkitPropertyTest/SystemPropTest_1.java | 3 ++- .../ToolkitPropertyTest/SystemPropTest_2.java | 3 ++- .../ToolkitPropertyTest/SystemPropTest_3.java | 3 ++- .../ToolkitPropertyTest/SystemPropTest_4.java | 3 ++- .../ToolkitPropertyTest/SystemPropTest_5.java | 3 ++- .../ToolkitPropertyTest_Disable.java | 3 ++- .../ToolkitPropertyTest_Enable.java | 3 ++- .../AlwaysOnTop/AlwaysOnTopEvenOfWindow.java | 3 ++- .../AlwaysOnTop/SyncAlwaysOnTopFieldTest.java | 3 ++- .../TestAlwaysOnTopBeforeShow.java | 15 +++++++------ .../BackgroundIsNotUpdated.java | 3 ++- .../Window/GetWindowsTest/GetWindowsTest.java | 3 ++- jdk/test/java/awt/Window/Grab/GrabTest.java | 3 ++- .../awt/Window/GrabSequence/GrabSequence.java | 3 ++- .../HandleWindowDestroyTest.html | 1 + .../LocationByPlatformTest.java | 3 ++- .../OwnedWindowsLeak/OwnedWindowsLeak.java | 3 ++- ...opertyChangeListenerLockSerialization.java | 3 ++- .../SetBackgroundNPE/SetBackgroundNPE.java | 3 ++- .../FocusAWTTest.java | 3 ++- .../ShapedAndTranslucentWindows/SetShape.java | 3 ++- .../SetShapeAndClick.java | 3 ++- .../SetShapeDynamicallyAndClick.java | 3 ++- .../ShapedAndTranslucentWindows/Shaped.java | 3 ++- .../ShapedByAPI.java | 3 ++- .../ShapedTranslucent.java | 3 ++- .../ShapedTranslucentWindowClick.java | 3 ++- .../StaticallyShaped.java | 3 ++- .../Translucent.java | 3 ++- .../TranslucentChoice.java | 3 ++- .../TranslucentWindowClick.java | 3 ++- .../WindowClosedEventOnDispose.java | 3 ++- .../awt/Window/WindowType/WindowType.java | 3 ++- .../SetLocationRelativeToTest.java | 21 +++++++++--------- .../Clipboard/GetContentsInterruptedTest.java | 3 ++- .../ClipboardInterVMTest.java | 1 + .../CustomClassLoaderTransferTest.java | 1 + .../DragUnicodeBetweenJVMTest.html | 3 ++- .../ImageTransfer/ImageTransferTest.java | 3 ++- .../Independence/IndependenceAWTTest.java | 3 ++- .../Independence/IndependenceSwingTest.java | 3 ++- .../MissedHtmlAndRtfBug.html | 3 ++- .../SystemSelectionAWTTest.java | 3 ++- .../SystemSelectionSwingTest.java | 3 ++- .../dnd/Button2DragTest/Button2DragTest.java | 1 + .../DragInterceptorAppletTest.html | 3 ++- .../DragSourceListenerSerializationTest.java | 3 ++- .../FileListBetweenJVMsTest.html | 3 ++- .../ImageDecoratedDnDInOut.html | 3 ++- .../ImageDecoratedDnDNegative.html | 3 ++- .../ImageTransferTest/ImageTransferTest.java | 3 ++- .../InterJVMGetDropSuccessTest.html | 3 ++- .../MissingEventsOnModalDialogTest.java | 1 + .../NoFormatsCrashTest.html | 3 ++- .../URIListBetweenJVMsTest.html | 3 ++- .../URIListToFileListBetweenJVMsTest.html | 3 ++- .../MovedResizedTardyEventTest.html | 3 ++- .../AncestorResized/AncestorResized.java | 3 ++- .../ButtonArraysEquality.java | 3 ++- .../EventWhenTest/EventWhenTest.java | 3 ++- .../DeadKey/DeadKeySystemAssertionDialog.java | 3 ++- .../event/KeyEvent/KeyChar/KeyCharTest.java | 3 ++- .../event/KeyEvent/KeyTyped/CtrlASCII.html | 3 ++- .../AcceptExtraButton/AcceptExtraButton.java | 3 ++- .../CheckGetMaskForButton.java | 3 ++- .../ClickDuringKeypress.java | 3 ++- .../EventTimeInFuture/EventTimeInFuture.java | 3 ++- .../FrameMouseEventAbsoluteCoordsTest.html | 3 ++- .../MenuDragMouseEventAbsoluteCoordsTest.html | 3 ++- .../MouseClickTest/MouseClickTest.html | 3 ++- .../MouseWheelEventAbsoluteCoordsTest.html | 3 ++- .../MouseEvent/RobotLWTest/RobotLWTest.html | 3 ++- .../DisabledComponent/DisabledComponent.java | 3 ++- .../InfiniteRecursion_2.html | 3 ++- .../InfiniteRecursion_3.html | 3 ++- .../event/OtherEvents/UngrabID/UngrabID.java | 3 ++- jdk/test/java/awt/font/Rotate/Shear.java | 3 ++- .../awt/font/Underline/UnderlineTest.java | 3 ++- .../EmbeddedFrameTest1.java | 3 ++- .../grab/MenuDragEvents/MenuDragEvents.html | 3 ++- .../awt/im/InputContext/InputContextTest.java | 6 +++-- .../java/awt/im/InputContext/bug4625203.java | 3 ++- .../java/awt/image/DrawImage/EABlitTest.java | 3 ++- .../IncorrectAlphaConversionBicubic.java | 3 ++- .../DrawImage/IncorrectAlphaSurface2SW.java | 3 ++- .../awt/image/DrawImage/IncorrectBounds.java | 3 ++- .../DrawImage/IncorrectClipSurface2SW.java | 3 ++- .../IncorrectClipXorModeSW2Surface.java | 3 ++- .../IncorrectClipXorModeSurface2Surface.java | 1 + .../DrawImage/IncorrectDestinationOffset.java | 3 ++- .../awt/image/DrawImage/IncorrectOffset.java | 3 ++- .../DrawImage/IncorrectSourceOffset.java | 3 ++- .../IncorrectUnmanagedImageRotatedClip.java | 3 ++- .../UnmanagedDrawImagePerformance.java | 3 ++- .../VolatileImage/BitmaskVolatileImage.java | 1 + .../image/VolatileImage/VolatileImageBug.java | 1 + .../java/awt/print/PageFormat/NullPaper.java | 3 ++- .../PageFormat/ReverseLandscapeTest.java | 3 ++- .../PaintSetEnabledDeadlock.java | 3 ++- .../java/awt/print/PrinterJob/PrintToDir.java | 15 ++++++++----- jdk/test/java/awt/security/Permissions.java | 6 +++-- .../java/awt/xembed/server/RunTestXEmbed.java | 3 ++- .../swing/JColorChooser/Test4165217.java | 3 ++- .../swing/JColorChooser/Test4177735.java | 3 ++- .../swing/JColorChooser/Test4193384.java | 3 ++- .../swing/JColorChooser/Test4234761.java | 3 ++- .../swing/JColorChooser/Test4461329.java | 3 ++- .../swing/JColorChooser/Test4711996.java | 3 ++- .../swing/JColorChooser/Test6524757.java | 3 ++- .../swing/JColorChooser/Test6707406.java | 3 ++- .../swing/JComponent/6683775/bug6683775.java | 16 ++++++++------ .../JFileChooser/6520101/bug6520101.java | 3 ++- .../swing/JFrame/4962534/bug4962534.html | 3 ++- .../javax/swing/JMenu/8071705/bug8071705.java | 1 + .../swing/JMenuItem/7036148/bug7036148.java | 3 ++- .../swing/JPopupMenu/4634626/bug4634626.java | 22 +++++++++++-------- .../swing/JSlider/6794836/bug6794836.java | 6 +++-- .../swing/JSpinner/5012888/bug5012888.java | 17 ++++++++------ .../PerPixelTranslucent.java | 3 ++- .../PerPixelTranslucentGradient.java | 3 ++- .../PerPixelTranslucentSwing.java | 3 ++- .../SetShapeAndClickSwing.java | 3 ++- .../ShapedPerPixelTranslucentGradient.java | 3 ++- ...ranslucentPerPixelTranslucentGradient.java | 3 ++- .../TranslucentJComboBox.java | 3 ++- ...ranslucentPerPixelTranslucentGradient.java | 3 ++- .../TranslucentWindowClickSwing.java | 3 ++- .../swing/LookAndFeel/8145547/DemandGTK.java | 1 + .../swing/LookAndFeel/8145547/DemandGTK2.sh | 1 + .../swing/LookAndFeel/8145547/DemandGTK3.sh | 1 + .../MultiUIDefaults/4300666/bug4300666.java | 16 ++++++++------ .../RepaintManager/6608456/bug6608456.java | 6 +++-- .../SwingUtilities/7170657/bug7170657.java | 3 ++- .../javax/swing/plaf/synth/Test6660049.java | 3 ++- .../StyledEditorKit/4506788/bug4506788.java | 15 ++++++++----- .../parser/Parser/7165725/bug7165725.java | 16 ++++++++------ .../sun/java2d/AcceleratedXORModeTest.java | 15 +++++++------ .../AccelPaintsTest/AccelPaintsTest.java | 3 ++- .../AcceleratedScaleTest.java | 3 ++- .../DirectX/DrawBitmaskToSurfaceTest.java | 3 ++- .../InfiniteValidationLoopTest.java | 3 ++- .../OnScreenRenderingResizeTest.java | 3 ++- .../OpaqueImageToSurfaceBlitTest.java | 3 ++- .../OverriddenInsetsTest.java | 3 ++- .../RenderingToCachedGraphicsTest.java | 3 ++- .../StrikeDisposalCrashTest.java | 3 ++- .../SwingOnScreenScrollingTest.java | 3 ++- .../TransformedPaintTest.java | 3 ++- .../java2d/DrawCachedImageAndTransform.java | 3 ++- jdk/test/sun/java2d/DrawXORModeTest.java | 3 ++- .../java2d/GdiRendering/InsetClipping.java | 3 ++- jdk/test/sun/java2d/OpenGL/CopyAreaOOB.java | 1 + .../java2d/OpenGL/CustomCompositeTest.java | 3 ++- jdk/test/sun/java2d/OpenGL/DrawBufImgOp.java | 3 ++- .../sun/java2d/OpenGL/DrawHugeImageTest.java | 3 ++- .../sun/java2d/OpenGL/GradientPaints.java | 3 ++- jdk/test/sun/java2d/OpenGL/bug7181438.java | 3 ++- .../SunGraphics2D/DrawImageBilinear.java | 3 ++- .../SunGraphics2D/EmptyClipRenderingTest.java | 3 ++- .../java2d/SunGraphics2D/PolyVertTest.java | 3 ++- .../SunGraphics2D/SimplePrimQuality.java | 3 ++- .../DrawImageBgTest/DrawImageBgTest.java | 3 ++- jdk/test/sun/java2d/XRenderBlitsTest.java | 15 +++++++------ .../ConstructorsNullTest.html | 3 ++- .../java2d/pipe/InterpolationQualityTest.java | 3 ++- .../MutableColorTest/MutableColorTest.java | 3 ++- .../java2d/pipe/hw/RSLAPITest/RSLAPITest.java | 3 ++- .../RSLContextInvalidationTest.java | 3 ++- 412 files changed, 1225 insertions(+), 780 deletions(-) diff --git a/jdk/test/com/sun/awt/SecurityWarning/GetSizeShouldNotReturnZero.java b/jdk/test/com/sun/awt/SecurityWarning/GetSizeShouldNotReturnZero.java index bf4cdc5bb3a..2c4e8f54459 100644 --- a/jdk/test/com/sun/awt/SecurityWarning/GetSizeShouldNotReturnZero.java +++ b/jdk/test/com/sun/awt/SecurityWarning/GetSizeShouldNotReturnZero.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009, 2013, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2009, 2016, 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 @@ -23,6 +23,7 @@ /* @test %W% %E% + @key headful @bug 6818312 @summary The size returned by SecurityWarning.getSize() should not be zero @author anthony.petrov@sun.com: area=awt.toplevel diff --git a/jdk/test/com/sun/awt/Translucency/WindowOpacity.java b/jdk/test/com/sun/awt/Translucency/WindowOpacity.java index a8391503238..f10182131f3 100644 --- a/jdk/test/com/sun/awt/Translucency/WindowOpacity.java +++ b/jdk/test/com/sun/awt/Translucency/WindowOpacity.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2008, 2016, 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 @@ -23,6 +23,7 @@ /* @test %W% %E% + @key headful @bug 6594131 @summary Tests the AWTUtilities.get/setWindowOpacity() methods @author anthony.petrov@...: area=awt.toplevel diff --git a/jdk/test/java/awt/Choice/ChoiceKeyEventReaction/ChoiceKeyEventReaction.html b/jdk/test/java/awt/Choice/ChoiceKeyEventReaction/ChoiceKeyEventReaction.html index 9b8277d1d16..d1d92a0ac2e 100644 --- a/jdk/test/java/awt/Choice/ChoiceKeyEventReaction/ChoiceKeyEventReaction.html +++ b/jdk/test/java/awt/Choice/ChoiceKeyEventReaction/ChoiceKeyEventReaction.html @@ -1,5 +1,5 @@