stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

6625450: javax.swing.border.TitledBorder.getBaseline() doesn't throw IAE when width is < 0

Browse Source 
Necessary check is added

Reviewed-by: peterz, alexp
This commit is contained in:
Sergey Malenkov 2008-05-07 16:08:31 +04:00
parent f8f23e46ab
commit cc169e2b9d
2 changed files with 71 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
jdk/src/share/classes/javax/swing/border/TitledBorder.java
View File

@ -1,5 +1,5 @@
/*
* Copyright 1997-2007 Sun Microsystems, Inc. All Rights Reserved.
* Copyright 1997-2008 Sun Microsystems, Inc. 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
@ -642,6 +642,9 @@ public class TitledBorder extends AbstractBorder
if (c == null) {
throw new NullPointerException("Must supply non-null component");
}
if (width < 0) {
throw new IllegalArgumentException("Width must be >= 0");
}
if (height < 0) {
throw new IllegalArgumentException("Height must be >= 0");
}

67
jdk/test/javax/swing/border/Test6625450.java Normal file
View File

@ -0,0 +1,67 @@
/*
* Copyright 2008 Sun Microsystems, Inc. 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
* CA 95054 USA or visit www.sun.com if you need additional information or
* have any questions.
*/
/*
* @test
* @bug 6625450
* @summary Tests the baseline of the titled border
* @author Sergey Malenkov
*/
import java.awt.Component;
import javax.swing.border.TitledBorder;
public class Test6625450 {
public static void main(String[] args) {
// test height
test(false, 0, Integer.MAX_VALUE);
test(false, 0, 1);
test(true, 0, -1);
test(true, 0, Integer.MIN_VALUE);
// test width
test(false, Integer.MAX_VALUE, 0);
test(false, 1, 0);
test(true, -1, 0);
test(true, Integer.MIN_VALUE, 0);
}
private static final TitledBorder BORDER = new TitledBorder("123");
private static final Component COMPONENT = new Component() {
};
private static void test(boolean expected, int width, int height) {
try {
BORDER.getBaseline(COMPONENT, width, height);
if (expected) {
throw new Error("expected IllegalArgumentException");
}
}
catch (IllegalArgumentException exception) {
if (!expected) {
throw new Error("unexpected exception", exception);
}
}
}
}