--- a/make/data/fontconfig/windows.fontconfig.properties Fri Oct 18 11:36:35 2019 -0400
+++ b/make/data/fontconfig/windows.fontconfig.properties Fri Oct 18 09:25:06 2019 -0700
@@ -1,6 +1,6 @@
#
#
-# Copyright (c) 2003, 2018, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2003, 2019, 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
@@ -48,6 +48,7 @@
allfonts.telugu=Gautami
allfonts.khmer=Khmer UI
allfonts.mongolian=Mongolian Baiti
+allfonts.myanmar=Myanmar Text
allfonts.dingbats=Wingdings
allfonts.symbol=Symbol
allfonts.symbols=Segoe UI Symbol
@@ -251,7 +252,8 @@
chinese-ms950,chinese-hkscs,chinese-ms936,chinese-gb18030,\
japanese,korean,chinese-ms950-extb,chinese-ms936-extb,\
georgian,devanagari,bengali,gujarati,gurmukhi,kannada,\
- malayalam,oriya,sinhala,tamil,telugu,thai,khmer,mongolian
+ malayalam,oriya,sinhala,tamil,telugu,thai,khmer,mongolian,\
+ myanmar
# Exclusion Ranges
@@ -318,6 +320,7 @@
filename.DokChampa=dokchamp.ttf
filename.Khmer_UI=KhmerUI.ttf
filename.Mongolian_Baiti=monbaiti.ttf
+filename.Myanmar_Text=mmrtext.ttf
filename.Symbol=SYMBOL.TTF
filename.Wingdings=WINGDING.TTF
--- a/src/java.desktop/macosx/classes/apple/laf/JRSUIUtils.java Fri Oct 18 11:36:35 2019 -0400
+++ b/src/java.desktop/macosx/classes/apple/laf/JRSUIUtils.java Fri Oct 18 09:25:06 2019 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2019, 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
@@ -36,6 +36,11 @@
static boolean isLeopard = isMacOSXLeopard();
static boolean isSnowLeopardOrBelow = isMacOSXSnowLeopardOrBelow();
+ static boolean isCatalinaOrAbove = isMacOSXCatalinaOrAbove();
+
+ static boolean isMacOSXCatalinaOrAbove() {
+ return currentMacOSXVersionMatchesGivenVersionRange(15, true, false, true);
+ }
static boolean isMacOSXLeopard() {
return isCurrentMacOSXVersion(5);
@@ -74,6 +79,12 @@
return false;
}
+ public static class TaskBar {
+ public static boolean isIconBadgeSupported() {
+ return !isCatalinaOrAbove;
+ }
+ }
+
public static class TabbedPane {
public static boolean useLegacyTabs() {
return isLeopard;
--- a/src/java.desktop/macosx/classes/sun/lwawt/macosx/CTaskbarPeer.java Fri Oct 18 11:36:35 2019 -0400
+++ b/src/java.desktop/macosx/classes/sun/lwawt/macosx/CTaskbarPeer.java Fri Oct 18 09:25:06 2019 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2019, 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
@@ -25,12 +25,14 @@
package sun.lwawt.macosx;
-import com.apple.eawt.Application;
import java.awt.Image;
import java.awt.PopupMenu;
import java.awt.Taskbar.Feature;
import java.awt.peer.TaskbarPeer;
+import apple.laf.JRSUIUtils;
+import com.apple.eawt.Application;
+
final public class CTaskbarPeer implements TaskbarPeer {
CTaskbarPeer() {}
@@ -40,6 +42,7 @@
switch(feature) {
case ICON_BADGE_TEXT:
case ICON_BADGE_NUMBER:
+ return JRSUIUtils.TaskBar.isIconBadgeSupported();
case ICON_IMAGE:
case MENU:
case PROGRESS_VALUE:
--- a/src/java.desktop/share/classes/sun/font/FontUtilities.java Fri Oct 18 11:36:35 2019 -0400
+++ b/src/java.desktop/share/classes/sun/font/FontUtilities.java Fri Oct 18 09:25:06 2019 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2008, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2019, 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
@@ -266,6 +266,9 @@
else if (code <= 0x0fff) { // U+0F00 - U+0FFF Tibetan
return true;
}
+ else if (code < 0x10A0) { // U+1000 - U+109F Myanmar
+ return true;
+ }
else if (code < 0x1100) {
return false;
}
--- a/test/jdk/java/awt/Color/AlphaColorTest.java Fri Oct 18 11:36:35 2019 -0400
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,89 +0,0 @@
-/*
- * Copyright (c) 2018, 2019, 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
- * @key headful
- * @bug 8204931 8227392 8224825
- * @summary test alpha colors are blended with background.
- */
-
-import java.awt.Color;
-import java.awt.Component;
-import java.awt.Dimension;
-import java.awt.Frame;
-import java.awt.Graphics;
-import java.awt.Robot;
-import javax.swing.SwingUtilities;
-
-public class AlphaColorTest extends Component {
-
- private Color color;
-
- public AlphaColorTest(Color c) {
- this.color = c;
- }
-
- public void paint(Graphics g) {
- g.setColor(color);
- g.fillRect(0, 0, getSize().width, getSize().height);
- }
-
- public Dimension getPreferredSize() {
- return getSize();
- }
-
- public Dimension getSize() {
- return new Dimension(200, 200);
- }
-
- public static void main(String args[]) throws Exception {
- SwingUtilities.invokeAndWait(() -> createAndShowGUI());
- Robot robot = new Robot();
- robot.delay(5000);
- robot.waitForIdle();
- Color c = robot.getPixelColor(frame.getX() + 100, frame.getY() + 100);
- int red = c.getRed();
- frame.dispose();
- // Should be 126-128, but be tolerant of gamma correction.
- if (red < 122 || red > 132) {
- throw new RuntimeException("Color is not as expected. Got " + c);
- }
- }
-
- static Frame frame;
- private static void createAndShowGUI() {
- frame = new Frame("Alpha Color Test") {
- @Override
- public void paint(Graphics g) {
- g.setColor(Color.black);
- g.fillRect(0, 0, getWidth(), getHeight());
- super.paint(g);
- }
- };
- Color color = new Color(255, 255, 255, 127);
- frame.add("Center", new AlphaColorTest(color));
- frame.pack();
- frame.setVisible(true);
- }
-}
--- a/test/jdk/java/awt/Color/GetMinMaxValue_ICC_ColorSpace.java Fri Oct 18 11:36:35 2019 -0400
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,61 +0,0 @@
-/*
- * Copyright (c) 2015, 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.
- */
-import java.awt.color.ColorSpace;
-import java.awt.color.ICC_ColorSpace;
-import java.awt.color.ICC_Profile;
-import java.io.IOException;
-
-/**
- * @test
- * @bug 8072678
- * @author Prasanta Sadhukhan
- */
-
-public class GetMinMaxValue_ICC_ColorSpace {
-
- public static void main(String[] a) throws Exception {
- ICC_Profile cmyk_profile = ICC_Profile.getInstance(ColorSpace.CS_sRGB);
- ICC_ColorSpace colorSpace = new ICC_ColorSpace(cmyk_profile);
- String minstr = null;
- String maxstr = null;
-
- colorSpace.fromRGB(new float[]{4.3f,3.1f,2.2f});
- try {
- System.out.println("minvalue " + colorSpace.getMinValue(3));
- } catch (IllegalArgumentException iae) {
- minstr = iae.toString();
- }
- try {
- System.out.println("maxvalue " + colorSpace.getMaxValue(3));
- } catch (IllegalArgumentException iae) {
- maxstr = iae.toString();
- }
-
- if (minstr.endsWith("+ component") || maxstr.endsWith("+ component")) {
- System.out.println("Test failed");
- throw new RuntimeException("IllegalArgumentException contains incorrect text message");
- } else {
- System.out.println("Test passed");
- }
- }
-}
--- a/test/jdk/java/awt/Color/HeadlessColor.java Fri Oct 18 11:36:35 2019 -0400
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,225 +0,0 @@
-/*
- * Copyright (c) 2007, 2014, 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.
- */
-
-import java.awt.*;
-import java.awt.color.ColorSpace;
-
-/*
- * @test
- * @summary Check Color constructors and methods works correctly in headless mode
- * @run main/othervm -Djava.awt.headless=true HeadlessColor
- */
-
-public class HeadlessColor {
- public static void main(String args[]) {
- Color c;
-
- // Constructors without exceptions
- c = new Color(1, 2, 3);
- c = new Color(1, 2, 3, 4);
- c = new Color((1 << 16) | (2 << 8) | (3));
- c = new Color((1 << 24) | (1 << 16) | (2 << 8) | (3));
- c = new Color((1 << 24) | (2 << 16) | (3 << 8) | (4), true);
- c = new Color((2 << 16) | (3 << 8) | (4), false);
- c = new Color(0.8f, 0.8f, 0.3f);
- c = new Color(0.999f, 0.8f, 0.8f, 0.3f);
- c = new Color(ColorSpace.getInstance(ColorSpace.CS_sRGB),
- new float[]{0.8f, 0.8f, 0.3f}, 1f);
-
- // Constructors with exceptions
- boolean exceptions = false;
- try {
- c = new Color(409, 400, 400);
- } catch (IllegalArgumentException e) {
- exceptions = true;
- }
- if (!exceptions)
- throw new RuntimeException("Constructor did not throw IllegalArgumentException " +
- "when expected in headless mode");
-
- exceptions = false;
- try {
- c = new Color(400, 3003, 400, 400);
- } catch (IllegalArgumentException e) {
- exceptions = true;
- }
- if (!exceptions)
- throw new RuntimeException("Constructor did not throw IllegalArgumentException " +
- "when expected in headless mode");
-
- exceptions = false;
- try {
- c = new Color(8f, 8f, 3f);
- } catch (IllegalArgumentException e) {
- exceptions = true;
- }
- if (!exceptions)
- throw new RuntimeException("Constructor did not throw IllegalArgumentException " +
- "when expected in headless mode");
-
- exceptions = false;
- try {
- c = new Color(-8f, -8f, -3f);
- } catch (IllegalArgumentException e) {
- exceptions = true;
- }
- if (!exceptions)
- throw new RuntimeException("Constructor did not throw IllegalArgumentException " +
- "when expected in headless mode");
-
- exceptions = false;
- try {
- c = new Color(0.999f, 8f, 8f, 3f);
- } catch (IllegalArgumentException e) {
- exceptions = true;
- }
- if (!exceptions)
- throw new RuntimeException("Constructor did not throw IllegalArgumentException " +
- "when expected in headless mode");
-
- exceptions = false;
- try {
- c = new Color(20f, 8f, 8f, 3f);
- } catch (IllegalArgumentException e) {
- exceptions = true;
- }
- if (!exceptions)
- throw new RuntimeException("Constructor did not throw IllegalArgumentException " +
- "when expected in headless mode");
-
- exceptions = false;
- try {
- c = new Color(-20f, -8f, -8f, -3f);
- } catch (IllegalArgumentException e) {
- exceptions = true;
- }
- if (!exceptions)
- throw new RuntimeException("Constructor did not throw IllegalArgumentException " +
- "when expected in headless mode");
-
- exceptions = false;
- try {
- c = new Color(ColorSpace.getInstance(ColorSpace.CS_sRGB),
- new float[]{-8f, -8f, -3f}, 1f);
- } catch (IllegalArgumentException e) {
- exceptions = true;
- }
- if (!exceptions)
- throw new RuntimeException("Constructor did not throw IllegalArgumentException " +
- "when expected in headless mode");
-
- exceptions = false;
- try {
- c = new Color(ColorSpace.getInstance(ColorSpace.CS_sRGB),
- new float[]{-8f, -8f, -3f}, -1f);
- } catch (IllegalArgumentException e) {
- exceptions = true;
- }
- if (!exceptions)
- throw new RuntimeException("Constructor did not throw IllegalArgumentException " +
- "when expected in headless mode");
-
-
- c = new Color(1, 2, 3);
- c.hashCode();
- c.toString();
- if (c.getRed() != 1)
- throw new RuntimeException("Incorrect red value");
- if (c.getGreen() != 2)
- throw new RuntimeException("Incorrect green value");
- if (c.getBlue() != 3)
- throw new RuntimeException("Incorrect bluevalue");
- if (c.getAlpha() != 255)
- throw new RuntimeException("Incorrect alpha value");
- if (c.getRGB() != ((255 << 24) | (1 << 16) | (2 << 8) | (3)))
- throw new RuntimeException("Incorrect rgb value");
-
- int rgb = c.getRGB();
- c.brighter();
- if (rgb != c.getRGB())
- throw new RuntimeException("Color object changed RGB value after brighter() called");
-
- rgb = c.getRGB();
- c.darker();
- if (rgb != c.getRGB())
- throw new RuntimeException("Color object changed RGB value after brighter() called");
-
- c = new Color(1, 2, 3, 4);
- c.hashCode();
- c.toString();
- if (c.getRed() != 1)
- throw new RuntimeException("Incorrect red value");
- if (c.getGreen() != 2)
- throw new RuntimeException("Incorrect green value");
- if (c.getBlue() != 3)
- throw new RuntimeException("Incorrect bluevalue");
- if (c.getAlpha() != 4)
- throw new RuntimeException("Incorrect alpha value");
- if (c.getRGB() != ((4 << 24) | (1 << 16) | (2 << 8) | (3)))
- throw new RuntimeException("Incorrect rgb value");
-
- rgb = c.getRGB();
- c.brighter();
- if (rgb != c.getRGB())
- throw new RuntimeException("Color object changed RGB value after brighter() called");
-
- rgb = c.getRGB();
- c.darker();
- if (rgb != c.getRGB())
- throw new RuntimeException("Color object changed RGB value after brighter() called");
-
-
- if (!(new Color(1, 2, 3).equals(new Color(1, 2, 3))))
- throw new RuntimeException("Inequality in colors when equality expected");
- if (new Color(1, 2, 3).equals(new Color(3, 2, 1)))
- throw new RuntimeException("Equality in colors when NO equality expected");
-
- if (!(new Color(1, 2, 3, 4).equals(new Color(1, 2, 3, 4))))
- throw new RuntimeException("Inequality in colors when equality expected");
- if (new Color(1, 2, 3, 4).equals(new Color(4, 3, 2, 1)))
- throw new RuntimeException("Equality in colors when NO equality expected");
-
- c = Color.decode("0xffffff");
- c = Color.getColor("65535");
- c = Color.getColor("65535", Color.black);
- c = Color.getColor("65535", 0xffffff);
-
- int hsb_value = Color.HSBtoRGB(0.1f, 0.2f, 0.3f);
- float[] rgb_value = Color.RGBtoHSB(1, 2, 3, null);
-
- c = Color.getHSBColor(0.3f, 0.4f, 0.6f);
- c = Color.getHSBColor(-0.3f, -0.4f, -0.6f);
- c = Color.getHSBColor(30, 40, 60);
-
- float[] comps;
- comps = Color.black.getRGBComponents(null);
- comps = Color.black.getRGBColorComponents(null);
- comps = Color.black.getComponents(null);
- comps = Color.black.getColorComponents(null);
- comps = Color.black.getComponents(ColorSpace.getInstance(ColorSpace.CS_sRGB), null);
- comps = Color.black.getColorComponents(ColorSpace.getInstance(ColorSpace.CS_sRGB), null);
-
- Color.black.getColorSpace();
- Color.black.getTransparency();
- }
-}
--- a/test/jdk/java/awt/Color/LoadProfileWithSM.java Fri Oct 18 11:36:35 2019 -0400
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,43 +0,0 @@
-/*
- * Copyright (c) 2014, 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.
- */
-
-import java.awt.color.*;
-
-/*
- * @test
- * @bug 8058969 8178708
- * @summary test standard profiles loads with SecurityManager installed.
- * @run main/othervm LoadProfileWithSM
- */
-
-public class LoadProfileWithSM {
-
- public static void main(String[] args) {
- System.setSecurityManager(new SecurityManager());
- ICC_Profile profile =
- ((ICC_ColorSpace)(ColorSpace.getInstance(
- ColorSpace.CS_GRAY))).getProfile();
- /* request profile data in order to force profile loading */
- profile.getData();
- }
-}
--- a/test/jdk/java/awt/Color/LoadStandardProfilesTest.java Fri Oct 18 11:36:35 2019 -0400
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,54 +0,0 @@
-/*
- * Copyright (c) 2014, 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 8039271
- * @summary test all standard profiles load correctly.
- */
-
-import java.awt.color.ICC_Profile;
-
-public class LoadStandardProfilesTest {
-
- public static void main(String args[]) {
- try {
- ICC_Profile sRGB = ICC_Profile.getInstance("sRGB.pf");
- ICC_Profile gray = ICC_Profile.getInstance("GRAY.pf");
- ICC_Profile pycc = ICC_Profile.getInstance("PYCC.pf");
- ICC_Profile ciexyz = ICC_Profile.getInstance("CIEXYZ.pf");
- ICC_Profile linearRGB = ICC_Profile.getInstance("LINEAR_RGB.pf");
-
- if (sRGB == null ||
- gray == null ||
- pycc == null ||
- ciexyz == null ||
- linearRGB == null)
- {
- throw new RuntimeException("null profile.");
- }
- } catch (Exception e) {
- throw new RuntimeException(e);
- }
- }
-}
--- a/test/jdk/java/awt/Color/OpacityChange/OpacityChange.java Fri Oct 18 11:36:35 2019 -0400
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,54 +0,0 @@
-/*
- * Copyright (c) 2010, 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 6783910
- @summary java.awt.Color.brighter()/darker() methods make color opaque
- @author Andrei Dmitriev: area=awt-color
- @run main OpacityChange
-*/
-
-import java.awt.*;
-
-public class OpacityChange {
- private final static int INITIAL_ALPHA = 125;
-
- public static void main(String argv[]) {
- Color color = new Color(20, 20, 20, INITIAL_ALPHA);
- System.out.println("Initial alpha: " + color.getAlpha());
- Color colorBrighter = color.brighter();
- System.out.println("New alpha (after brighter): " + colorBrighter.getAlpha());
-
- Color colorDarker = color.darker();
- System.out.println("New alpha (after darker): " + colorDarker.getAlpha());
-
-
- if (INITIAL_ALPHA != colorBrighter.getAlpha()) {
- throw new RuntimeException("Brighter color alpha has changed from : " +INITIAL_ALPHA + " to " + colorBrighter.getAlpha());
- }
- if (INITIAL_ALPHA != colorDarker.getAlpha()) {
- throw new RuntimeException("Darker color alpha has changed from : " +INITIAL_ALPHA + " to " + colorDarker.getAlpha());
- }
- }
-}
--- a/test/jdk/java/awt/Color/XRenderTranslucentColorDrawTest.java Fri Oct 18 11:36:35 2019 -0400
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,81 +0,0 @@
-/*
- * Copyright (c) 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
- * 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
- * @key headful
- * @bug 8176795
- * @summary Test verifies that we get proper color when we draw translucent
- * color over an opaque color using X Render extension in Linux.
- * @requires (os.family == "linux")
- * @run main XRenderTranslucentColorDrawTest -Dsun.java2d.xrender=true
- */
-
-import java.awt.Color;
-import java.awt.Graphics2D;
-import java.awt.GraphicsConfiguration;
-import java.awt.GraphicsDevice;
-import java.awt.GraphicsEnvironment;
-import java.awt.image.BufferedImage;
-import java.awt.image.VolatileImage;
-
-public class XRenderTranslucentColorDrawTest {
-
- public static void main(String[] args) throws Exception {
- GraphicsEnvironment env = GraphicsEnvironment.
- getLocalGraphicsEnvironment();
- GraphicsConfiguration translucentGC = null;
- SCREENS: for (GraphicsDevice screen : env.getScreenDevices()) {
- for (GraphicsConfiguration gc : screen.getConfigurations()) {
- if (gc.isTranslucencyCapable()) {
- translucentGC = gc;
- break SCREENS;
- }
- }
- }
- if (translucentGC == null) {
- throw new RuntimeException("No suitable gc found.");
- }
- int width = 10;
- int height = 10;
- VolatileImage image = translucentGC.
- createCompatibleVolatileImage(width, height);
- Graphics2D g = image.createGraphics();
- // draw opaque black color
- g.setColor(new Color(0xff000000, true));
- g.fillRect(0, 0, width, height);
- // draw translucent white color over opaque black color
- g.setColor(new Color(0x80ffffff, true));
- g.fillRect(0, 0, width, height);
- g.dispose();
- // Get snapshot of VolatileImage to pick color and verify the same
- BufferedImage snapshot = image.getSnapshot();
- int argb = snapshot.getRGB(width / 2, height / 2);
- // we expect the resultant rgb hex value to be ff808080
- if (!(Integer.toHexString(argb).equals("ff808080"))) {
- throw new RuntimeException("Using X Render extension for drawing"
- + " translucent color is not giving expected results.");
- }
- }
-}
-
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/test/jdk/java/awt/ColorClass/AlphaColorTest.java Fri Oct 18 09:25:06 2019 -0700
@@ -0,0 +1,89 @@
+/*
+ * Copyright (c) 2018, 2019, 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
+ * @key headful
+ * @bug 8204931 8227392 8224825
+ * @summary test alpha colors are blended with background.
+ */
+
+import java.awt.Color;
+import java.awt.Component;
+import java.awt.Dimension;
+import java.awt.Frame;
+import java.awt.Graphics;
+import java.awt.Robot;
+import javax.swing.SwingUtilities;
+
+public class AlphaColorTest extends Component {
+
+ private Color color;
+
+ public AlphaColorTest(Color c) {
+ this.color = c;
+ }
+
+ public void paint(Graphics g) {
+ g.setColor(color);
+ g.fillRect(0, 0, getSize().width, getSize().height);
+ }
+
+ public Dimension getPreferredSize() {
+ return getSize();
+ }
+
+ public Dimension getSize() {
+ return new Dimension(200, 200);
+ }
+
+ public static void main(String args[]) throws Exception {
+ SwingUtilities.invokeAndWait(() -> createAndShowGUI());
+ Robot robot = new Robot();
+ robot.delay(5000);
+ robot.waitForIdle();
+ Color c = robot.getPixelColor(frame.getX() + 100, frame.getY() + 100);
+ int red = c.getRed();
+ frame.dispose();
+ // Should be 126-128, but be tolerant of gamma correction.
+ if (red < 122 || red > 132) {
+ throw new RuntimeException("Color is not as expected. Got " + c);
+ }
+ }
+
+ static Frame frame;
+ private static void createAndShowGUI() {
+ frame = new Frame("Alpha Color Test") {
+ @Override
+ public void paint(Graphics g) {
+ g.setColor(Color.black);
+ g.fillRect(0, 0, getWidth(), getHeight());
+ super.paint(g);
+ }
+ };
+ Color color = new Color(255, 255, 255, 127);
+ frame.add("Center", new AlphaColorTest(color));
+ frame.pack();
+ frame.setVisible(true);
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/test/jdk/java/awt/ColorClass/HeadlessColor.java Fri Oct 18 09:25:06 2019 -0700
@@ -0,0 +1,225 @@
+/*
+ * Copyright (c) 2007, 2014, 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.
+ */
+
+import java.awt.*;
+import java.awt.color.ColorSpace;
+
+/*
+ * @test
+ * @summary Check Color constructors and methods works correctly in headless mode
+ * @run main/othervm -Djava.awt.headless=true HeadlessColor
+ */
+
+public class HeadlessColor {
+ public static void main(String args[]) {
+ Color c;
+
+ // Constructors without exceptions
+ c = new Color(1, 2, 3);
+ c = new Color(1, 2, 3, 4);
+ c = new Color((1 << 16) | (2 << 8) | (3));
+ c = new Color((1 << 24) | (1 << 16) | (2 << 8) | (3));
+ c = new Color((1 << 24) | (2 << 16) | (3 << 8) | (4), true);
+ c = new Color((2 << 16) | (3 << 8) | (4), false);
+ c = new Color(0.8f, 0.8f, 0.3f);
+ c = new Color(0.999f, 0.8f, 0.8f, 0.3f);
+ c = new Color(ColorSpace.getInstance(ColorSpace.CS_sRGB),
+ new float[]{0.8f, 0.8f, 0.3f}, 1f);
+
+ // Constructors with exceptions
+ boolean exceptions = false;
+ try {
+ c = new Color(409, 400, 400);
+ } catch (IllegalArgumentException e) {
+ exceptions = true;
+ }
+ if (!exceptions)
+ throw new RuntimeException("Constructor did not throw IllegalArgumentException " +
+ "when expected in headless mode");
+
+ exceptions = false;
+ try {
+ c = new Color(400, 3003, 400, 400);
+ } catch (IllegalArgumentException e) {
+ exceptions = true;
+ }
+ if (!exceptions)
+ throw new RuntimeException("Constructor did not throw IllegalArgumentException " +
+ "when expected in headless mode");
+
+ exceptions = false;
+ try {
+ c = new Color(8f, 8f, 3f);
+ } catch (IllegalArgumentException e) {
+ exceptions = true;
+ }
+ if (!exceptions)
+ throw new RuntimeException("Constructor did not throw IllegalArgumentException " +
+ "when expected in headless mode");
+
+ exceptions = false;
+ try {
+ c = new Color(-8f, -8f, -3f);
+ } catch (IllegalArgumentException e) {
+ exceptions = true;
+ }
+ if (!exceptions)
+ throw new RuntimeException("Constructor did not throw IllegalArgumentException " +
+ "when expected in headless mode");
+
+ exceptions = false;
+ try {
+ c = new Color(0.999f, 8f, 8f, 3f);
+ } catch (IllegalArgumentException e) {
+ exceptions = true;
+ }
+ if (!exceptions)
+ throw new RuntimeException("Constructor did not throw IllegalArgumentException " +
+ "when expected in headless mode");
+
+ exceptions = false;
+ try {
+ c = new Color(20f, 8f, 8f, 3f);
+ } catch (IllegalArgumentException e) {
+ exceptions = true;
+ }
+ if (!exceptions)
+ throw new RuntimeException("Constructor did not throw IllegalArgumentException " +
+ "when expected in headless mode");
+
+ exceptions = false;
+ try {
+ c = new Color(-20f, -8f, -8f, -3f);
+ } catch (IllegalArgumentException e) {
+ exceptions = true;
+ }
+ if (!exceptions)
+ throw new RuntimeException("Constructor did not throw IllegalArgumentException " +
+ "when expected in headless mode");
+
+ exceptions = false;
+ try {
+ c = new Color(ColorSpace.getInstance(ColorSpace.CS_sRGB),
+ new float[]{-8f, -8f, -3f}, 1f);
+ } catch (IllegalArgumentException e) {
+ exceptions = true;
+ }
+ if (!exceptions)
+ throw new RuntimeException("Constructor did not throw IllegalArgumentException " +
+ "when expected in headless mode");
+
+ exceptions = false;
+ try {
+ c = new Color(ColorSpace.getInstance(ColorSpace.CS_sRGB),
+ new float[]{-8f, -8f, -3f}, -1f);
+ } catch (IllegalArgumentException e) {
+ exceptions = true;
+ }
+ if (!exceptions)
+ throw new RuntimeException("Constructor did not throw IllegalArgumentException " +
+ "when expected in headless mode");
+
+
+ c = new Color(1, 2, 3);
+ c.hashCode();
+ c.toString();
+ if (c.getRed() != 1)
+ throw new RuntimeException("Incorrect red value");
+ if (c.getGreen() != 2)
+ throw new RuntimeException("Incorrect green value");
+ if (c.getBlue() != 3)
+ throw new RuntimeException("Incorrect bluevalue");
+ if (c.getAlpha() != 255)
+ throw new RuntimeException("Incorrect alpha value");
+ if (c.getRGB() != ((255 << 24) | (1 << 16) | (2 << 8) | (3)))
+ throw new RuntimeException("Incorrect rgb value");
+
+ int rgb = c.getRGB();
+ c.brighter();
+ if (rgb != c.getRGB())
+ throw new RuntimeException("Color object changed RGB value after brighter() called");
+
+ rgb = c.getRGB();
+ c.darker();
+ if (rgb != c.getRGB())
+ throw new RuntimeException("Color object changed RGB value after brighter() called");
+
+ c = new Color(1, 2, 3, 4);
+ c.hashCode();
+ c.toString();
+ if (c.getRed() != 1)
+ throw new RuntimeException("Incorrect red value");
+ if (c.getGreen() != 2)
+ throw new RuntimeException("Incorrect green value");
+ if (c.getBlue() != 3)
+ throw new RuntimeException("Incorrect bluevalue");
+ if (c.getAlpha() != 4)
+ throw new RuntimeException("Incorrect alpha value");
+ if (c.getRGB() != ((4 << 24) | (1 << 16) | (2 << 8) | (3)))
+ throw new RuntimeException("Incorrect rgb value");
+
+ rgb = c.getRGB();
+ c.brighter();
+ if (rgb != c.getRGB())
+ throw new RuntimeException("Color object changed RGB value after brighter() called");
+
+ rgb = c.getRGB();
+ c.darker();
+ if (rgb != c.getRGB())
+ throw new RuntimeException("Color object changed RGB value after brighter() called");
+
+
+ if (!(new Color(1, 2, 3).equals(new Color(1, 2, 3))))
+ throw new RuntimeException("Inequality in colors when equality expected");
+ if (new Color(1, 2, 3).equals(new Color(3, 2, 1)))
+ throw new RuntimeException("Equality in colors when NO equality expected");
+
+ if (!(new Color(1, 2, 3, 4).equals(new Color(1, 2, 3, 4))))
+ throw new RuntimeException("Inequality in colors when equality expected");
+ if (new Color(1, 2, 3, 4).equals(new Color(4, 3, 2, 1)))
+ throw new RuntimeException("Equality in colors when NO equality expected");
+
+ c = Color.decode("0xffffff");
+ c = Color.getColor("65535");
+ c = Color.getColor("65535", Color.black);
+ c = Color.getColor("65535", 0xffffff);
+
+ int hsb_value = Color.HSBtoRGB(0.1f, 0.2f, 0.3f);
+ float[] rgb_value = Color.RGBtoHSB(1, 2, 3, null);
+
+ c = Color.getHSBColor(0.3f, 0.4f, 0.6f);
+ c = Color.getHSBColor(-0.3f, -0.4f, -0.6f);
+ c = Color.getHSBColor(30, 40, 60);
+
+ float[] comps;
+ comps = Color.black.getRGBComponents(null);
+ comps = Color.black.getRGBColorComponents(null);
+ comps = Color.black.getComponents(null);
+ comps = Color.black.getColorComponents(null);
+ comps = Color.black.getComponents(ColorSpace.getInstance(ColorSpace.CS_sRGB), null);
+ comps = Color.black.getColorComponents(ColorSpace.getInstance(ColorSpace.CS_sRGB), null);
+
+ Color.black.getColorSpace();
+ Color.black.getTransparency();
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/test/jdk/java/awt/ColorClass/OpacityChange/OpacityChange.java Fri Oct 18 09:25:06 2019 -0700
@@ -0,0 +1,54 @@
+/*
+ * Copyright (c) 2010, 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 6783910
+ @summary java.awt.Color.brighter()/darker() methods make color opaque
+ @author Andrei Dmitriev: area=awt-color
+ @run main OpacityChange
+*/
+
+import java.awt.*;
+
+public class OpacityChange {
+ private final static int INITIAL_ALPHA = 125;
+
+ public static void main(String argv[]) {
+ Color color = new Color(20, 20, 20, INITIAL_ALPHA);
+ System.out.println("Initial alpha: " + color.getAlpha());
+ Color colorBrighter = color.brighter();
+ System.out.println("New alpha (after brighter): " + colorBrighter.getAlpha());
+
+ Color colorDarker = color.darker();
+ System.out.println("New alpha (after darker): " + colorDarker.getAlpha());
+
+
+ if (INITIAL_ALPHA != colorBrighter.getAlpha()) {
+ throw new RuntimeException("Brighter color alpha has changed from : " +INITIAL_ALPHA + " to " + colorBrighter.getAlpha());
+ }
+ if (INITIAL_ALPHA != colorDarker.getAlpha()) {
+ throw new RuntimeException("Darker color alpha has changed from : " +INITIAL_ALPHA + " to " + colorDarker.getAlpha());
+ }
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/test/jdk/java/awt/ColorClass/XRenderTranslucentColorDrawTest.java Fri Oct 18 09:25:06 2019 -0700
@@ -0,0 +1,81 @@
+/*
+ * Copyright (c) 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
+ * 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
+ * @key headful
+ * @bug 8176795
+ * @summary Test verifies that we get proper color when we draw translucent
+ * color over an opaque color using X Render extension in Linux.
+ * @requires (os.family == "linux")
+ * @run main XRenderTranslucentColorDrawTest -Dsun.java2d.xrender=true
+ */
+
+import java.awt.Color;
+import java.awt.Graphics2D;
+import java.awt.GraphicsConfiguration;
+import java.awt.GraphicsDevice;
+import java.awt.GraphicsEnvironment;
+import java.awt.image.BufferedImage;
+import java.awt.image.VolatileImage;
+
+public class XRenderTranslucentColorDrawTest {
+
+ public static void main(String[] args) throws Exception {
+ GraphicsEnvironment env = GraphicsEnvironment.
+ getLocalGraphicsEnvironment();
+ GraphicsConfiguration translucentGC = null;
+ SCREENS: for (GraphicsDevice screen : env.getScreenDevices()) {
+ for (GraphicsConfiguration gc : screen.getConfigurations()) {
+ if (gc.isTranslucencyCapable()) {
+ translucentGC = gc;
+ break SCREENS;
+ }
+ }
+ }
+ if (translucentGC == null) {
+ throw new RuntimeException("No suitable gc found.");
+ }
+ int width = 10;
+ int height = 10;
+ VolatileImage image = translucentGC.
+ createCompatibleVolatileImage(width, height);
+ Graphics2D g = image.createGraphics();
+ // draw opaque black color
+ g.setColor(new Color(0xff000000, true));
+ g.fillRect(0, 0, width, height);
+ // draw translucent white color over opaque black color
+ g.setColor(new Color(0x80ffffff, true));
+ g.fillRect(0, 0, width, height);
+ g.dispose();
+ // Get snapshot of VolatileImage to pick color and verify the same
+ BufferedImage snapshot = image.getSnapshot();
+ int argb = snapshot.getRGB(width / 2, height / 2);
+ // we expect the resultant rgb hex value to be ff808080
+ if (!(Integer.toHexString(argb).equals("ff808080"))) {
+ throw new RuntimeException("Using X Render extension for drawing"
+ + " translucent color is not giving expected results.");
+ }
+ }
+}
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/test/jdk/java/awt/color/GetMinMaxValue_ICC_ColorSpace.java Fri Oct 18 09:25:06 2019 -0700
@@ -0,0 +1,61 @@
+/*
+ * Copyright (c) 2015, 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.
+ */
+import java.awt.color.ColorSpace;
+import java.awt.color.ICC_ColorSpace;
+import java.awt.color.ICC_Profile;
+import java.io.IOException;
+
+/**
+ * @test
+ * @bug 8072678
+ * @author Prasanta Sadhukhan
+ */
+
+public class GetMinMaxValue_ICC_ColorSpace {
+
+ public static void main(String[] a) throws Exception {
+ ICC_Profile cmyk_profile = ICC_Profile.getInstance(ColorSpace.CS_sRGB);
+ ICC_ColorSpace colorSpace = new ICC_ColorSpace(cmyk_profile);
+ String minstr = null;
+ String maxstr = null;
+
+ colorSpace.fromRGB(new float[]{4.3f,3.1f,2.2f});
+ try {
+ System.out.println("minvalue " + colorSpace.getMinValue(3));
+ } catch (IllegalArgumentException iae) {
+ minstr = iae.toString();
+ }
+ try {
+ System.out.println("maxvalue " + colorSpace.getMaxValue(3));
+ } catch (IllegalArgumentException iae) {
+ maxstr = iae.toString();
+ }
+
+ if (minstr.endsWith("+ component") || maxstr.endsWith("+ component")) {
+ System.out.println("Test failed");
+ throw new RuntimeException("IllegalArgumentException contains incorrect text message");
+ } else {
+ System.out.println("Test passed");
+ }
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/test/jdk/java/awt/color/LoadProfileWithSM.java Fri Oct 18 09:25:06 2019 -0700
@@ -0,0 +1,43 @@
+/*
+ * Copyright (c) 2014, 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.
+ */
+
+import java.awt.color.*;
+
+/*
+ * @test
+ * @bug 8058969 8178708
+ * @summary test standard profiles loads with SecurityManager installed.
+ * @run main/othervm LoadProfileWithSM
+ */
+
+public class LoadProfileWithSM {
+
+ public static void main(String[] args) {
+ System.setSecurityManager(new SecurityManager());
+ ICC_Profile profile =
+ ((ICC_ColorSpace)(ColorSpace.getInstance(
+ ColorSpace.CS_GRAY))).getProfile();
+ /* request profile data in order to force profile loading */
+ profile.getData();
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/test/jdk/java/awt/color/LoadStandardProfilesTest.java Fri Oct 18 09:25:06 2019 -0700
@@ -0,0 +1,54 @@
+/*
+ * Copyright (c) 2014, 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 8039271
+ * @summary test all standard profiles load correctly.
+ */
+
+import java.awt.color.ICC_Profile;
+
+public class LoadStandardProfilesTest {
+
+ public static void main(String args[]) {
+ try {
+ ICC_Profile sRGB = ICC_Profile.getInstance("sRGB.pf");
+ ICC_Profile gray = ICC_Profile.getInstance("GRAY.pf");
+ ICC_Profile pycc = ICC_Profile.getInstance("PYCC.pf");
+ ICC_Profile ciexyz = ICC_Profile.getInstance("CIEXYZ.pf");
+ ICC_Profile linearRGB = ICC_Profile.getInstance("LINEAR_RGB.pf");
+
+ if (sRGB == null ||
+ gray == null ||
+ pycc == null ||
+ ciexyz == null ||
+ linearRGB == null)
+ {
+ throw new RuntimeException("null profile.");
+ }
+ } catch (Exception e) {
+ throw new RuntimeException(e);
+ }
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/test/jdk/java/awt/font/Fallback/MyanmarFallbackTest.java Fri Oct 18 09:25:06 2019 -0700
@@ -0,0 +1,57 @@
+/*
+ * Copyright (c) 2019, 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 8223558
+ * @summary Verifies Dialog logical font falls back to "Myanmar Text"
+ * @requires (os.family == "windows")
+ */
+
+import java.awt.Font;
+import java.awt.GraphicsEnvironment;
+import java.util.Arrays;
+
+public class MyanmarFallbackTest {
+
+ public static void main(String[] args) {
+ if (!System.getProperty("os.name").toLowerCase().contains("windows")) {
+ System.err.println("This test is for Windows only");
+ return;
+ }
+
+ String[] fontFamilyNames = GraphicsEnvironment
+ .getLocalGraphicsEnvironment()
+ .getAvailableFontFamilyNames();
+ if (Arrays.stream(fontFamilyNames)
+ .noneMatch("Myanmar Text"::equals)) {
+ System.err.println("Myanmar Text font is not installed");
+ return;
+ }
+
+ Font dialog = new Font(Font.DIALOG, Font.PLAIN, 12);
+ if (-1 != dialog.canDisplayUpTo("\u1000\u103C")) {
+ throw new RuntimeException("Cannot display Myanmar characters");
+ }
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/test/jdk/java/awt/font/TextLayout/MyanmarTextTest.java Fri Oct 18 09:25:06 2019 -0700
@@ -0,0 +1,151 @@
+/*
+ * Copyright (c) 2019, 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 8223558
+ * @key headful
+ * @summary Verifies that Myanmar script is rendered correctly:
+ * two characters combined into one glyph
+ * @run main MyanmarTextTest
+ */
+
+import java.awt.Font;
+import java.awt.GraphicsEnvironment;
+import java.util.Arrays;
+import javax.swing.BorderFactory;
+import javax.swing.BoxLayout;
+import javax.swing.JFrame;
+import javax.swing.JPanel;
+import javax.swing.JTextField;
+import javax.swing.SwingConstants;
+import javax.swing.SwingUtilities;
+import javax.swing.WindowConstants;
+import javax.swing.plaf.TextUI;
+import javax.swing.text.BadLocationException;
+import javax.swing.text.Position;
+
+public class MyanmarTextTest {
+ private static final String TEXT = "\u1000\u103C";
+
+ private static final String FONT_WINDOWS = "Myanmar Text";
+ private static final String FONT_LINUX = "Padauk";
+ private static final String FONT_MACOS = "Myanmar MN";
+
+ private static final String FONT_NAME = selectFontName();
+
+ private final JFrame frame;
+ private final JTextField myanmarTF;
+
+ private static volatile MyanmarTextTest mtt;
+
+ public static void main(String[] args) throws Exception {
+ if (FONT_NAME == null) {
+ System.err.println("Unsupported OS: exiting");
+ return;
+ }
+ if (!fontExists()) {
+ System.err.println("Required font is not installed: " + FONT_NAME);
+ return;
+ }
+
+ try {
+ SwingUtilities.invokeAndWait(MyanmarTextTest::createUI);
+ SwingUtilities.invokeAndWait(mtt::checkPositions);
+ } finally {
+ SwingUtilities.invokeAndWait(mtt::dispose);
+ }
+ }
+
+ private static void createUI() {
+ mtt = new MyanmarTextTest();
+ mtt.show();
+ }
+
+ private MyanmarTextTest() {
+ frame = new JFrame("Myanmar Text");
+ frame.setDefaultCloseOperation(WindowConstants.EXIT_ON_CLOSE);
+
+ myanmarTF = new JTextField(TEXT);
+ myanmarTF.setFont(new Font(FONT_NAME, Font.PLAIN, 40));
+
+ JPanel main = new JPanel();
+ main.setLayout(new BoxLayout(main, BoxLayout.Y_AXIS));
+ main.add(myanmarTF);
+
+ main.setBorder(BorderFactory.createEmptyBorder(7, 7, 7, 7));
+
+ frame.getContentPane().add(main);
+ }
+
+ private void show() {
+ frame.pack();
+ frame.setLocationByPlatform(true);
+ frame.setVisible(true);
+ }
+
+ private void dispose() {
+ frame.dispose();
+ }
+
+ private void checkPositions() {
+ final TextUI ui = myanmarTF.getUI();
+ final Position.Bias[] biasRet = new Position.Bias[1];
+ try {
+ if (2 != ui.getNextVisualPositionFrom(myanmarTF, 0,
+ Position.Bias.Forward, SwingConstants.EAST, biasRet)) {
+ throw new RuntimeException("For 0, next position should be 2");
+ }
+ if (2 != ui.getNextVisualPositionFrom(myanmarTF, 1,
+ Position.Bias.Forward, SwingConstants.EAST, biasRet)) {
+ throw new RuntimeException("For 1, next position should be 2");
+ }
+ if (0 != ui.getNextVisualPositionFrom(myanmarTF, 2,
+ Position.Bias.Forward, SwingConstants.WEST, biasRet)) {
+ throw new RuntimeException("For 2, prev position should be 0");
+ }
+ } catch (BadLocationException e) {
+ throw new RuntimeException(e);
+ }
+ }
+
+ private static String selectFontName() {
+ String osName = System.getProperty("os.name").toLowerCase();
+ if (osName.contains("windows")) {
+ return FONT_WINDOWS;
+ } else if (osName.contains("linux")) {
+ return FONT_LINUX;
+ } else if (osName.contains("mac")) {
+ return FONT_MACOS;
+ } else {
+ return null;
+ }
+ }
+
+ private static boolean fontExists() {
+ String[] fontFamilyNames = GraphicsEnvironment
+ .getLocalGraphicsEnvironment()
+ .getAvailableFontFamilyNames();
+ return Arrays.asList(fontFamilyNames).contains(FONT_NAME);
+ }
+}