Skip to content

Commit 20b4c70

Browse files
committed
8072678: Wrong exception messages in java.awt.color.ICC_ColorSpace
Backport-of: f4fa68a2a795ca073409b76332037cc601e66b13
1 parent 764dbd5 commit 20b4c70

File tree

2 files changed

+63
-2
lines changed

2 files changed

+63
-2
lines changed

jdk/src/share/classes/java/awt/color/ICC_ColorSpace.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -558,7 +558,7 @@ public float[] fromCIEXYZ(float[] colorvalue) {
558558
public float getMinValue(int component) {
559559
if ((component < 0) || (component > this.getNumComponents() - 1)) {
560560
throw new IllegalArgumentException(
561-
"Component index out of range: + component");
561+
"Component index out of range: " + component);
562562
}
563563
return minVal[component];
564564
}
@@ -583,7 +583,7 @@ public float getMinValue(int component) {
583583
public float getMaxValue(int component) {
584584
if ((component < 0) || (component > this.getNumComponents() - 1)) {
585585
throw new IllegalArgumentException(
586-
"Component index out of range: + component");
586+
"Component index out of range: " + component);
587587
}
588588
return maxVal[component];
589589
}
Lines changed: 61 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,61 @@
1+
/*
2+
* Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
3+
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
4+
*
5+
* This code is free software; you can redistribute it and/or modify it
6+
* under the terms of the GNU General Public License version 2 only, as
7+
* published by the Free Software Foundation.
8+
*
9+
* This code is distributed in the hope that it will be useful, but WITHOUT
10+
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
11+
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
12+
* version 2 for more details (a copy is included in the LICENSE file that
13+
* accompanied this code).
14+
*
15+
* You should have received a copy of the GNU General Public License version
16+
* 2 along with this work; if not, write to the Free Software Foundation,
17+
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
18+
*
19+
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
20+
* or visit www.oracle.com if you need additional information or have any
21+
* questions.
22+
*/
23+
import java.awt.color.ColorSpace;
24+
import java.awt.color.ICC_ColorSpace;
25+
import java.awt.color.ICC_Profile;
26+
import java.io.IOException;
27+
28+
/**
29+
* @test
30+
* @bug 8072678
31+
* @author Prasanta Sadhukhan
32+
*/
33+
34+
public class GetMinMaxValue_ICC_ColorSpace {
35+
36+
public static void main(String[] a) throws Exception {
37+
ICC_Profile cmyk_profile = ICC_Profile.getInstance(ColorSpace.CS_sRGB);
38+
ICC_ColorSpace colorSpace = new ICC_ColorSpace(cmyk_profile);
39+
String minstr = null;
40+
String maxstr = null;
41+
42+
colorSpace.fromRGB(new float[]{4.3f,3.1f,2.2f});
43+
try {
44+
System.out.println("minvalue " + colorSpace.getMinValue(3));
45+
} catch (IllegalArgumentException iae) {
46+
minstr = iae.toString();
47+
}
48+
try {
49+
System.out.println("maxvalue " + colorSpace.getMaxValue(3));
50+
} catch (IllegalArgumentException iae) {
51+
maxstr = iae.toString();
52+
}
53+
54+
if (minstr.endsWith("+ component") || maxstr.endsWith("+ component")) {
55+
System.out.println("Test failed");
56+
throw new RuntimeException("IllegalArgumentException contains incorrect text message");
57+
} else {
58+
System.out.println("Test passed");
59+
}
60+
}
61+
}

0 commit comments

Comments
 (0)