8072678: Wrong exception messages in java.awt.color.ICC_ColorSpace
Reviewed-by: prr, serb
Contributed-by: prasanta.sadhukhan@oracle.com
--- a/jdk/src/java.desktop/share/classes/java/awt/color/ICC_ColorSpace.java Thu Feb 12 14:56:30 2015 -0800
+++ b/jdk/src/java.desktop/share/classes/java/awt/color/ICC_ColorSpace.java Sat Feb 14 21:05:41 2015 +0300
@@ -546,7 +546,7 @@
public float getMinValue(int component) {
if ((component < 0) || (component > this.getNumComponents() - 1)) {
throw new IllegalArgumentException(
- "Component index out of range: + component");
+ "Component index out of range: " + component);
}
return minVal[component];
}
@@ -571,7 +571,7 @@
public float getMaxValue(int component) {
if ((component < 0) || (component > this.getNumComponents() - 1)) {
throw new IllegalArgumentException(
- "Component index out of range: + component");
+ "Component index out of range: " + component);
}
return maxVal[component];
}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/test/java/awt/Color/GetMinMaxValue_ICC_ColorSpace.java Sat Feb 14 21:05:41 2015 +0300
@@ -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");
+ }
+ }
+}