infernap12/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2026-02-17 22:05:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

6632810: javax.swing.plaf.basic.BasicScrollPaneUI.getBaseline(JComponent, int, int) doesn't throw NPE and IAE

Browse Source 
Reviewed-by: alexp
This commit is contained in:
Pavel Porvatov 2010-10-25 19:24:50 +04:00
parent e5836e6721
commit 00b0b853c8
2 changed files with 80 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
jdk/src/share/classes/javax/swing/plaf/basic/BasicScrollPaneUI.java
View File

@ -362,6 +362,14 @@ public class BasicScrollPaneUI
* @since 1.6
*/
public int getBaseline(JComponent c, int width, int height) {
if (c == null) {
throw new NullPointerException("Component must be non-null");
}
if (width < 0 || height < 0) {
throw new IllegalArgumentException("Width and height must be >= 0");
}
JViewport viewport = scrollpane.getViewport();
Insets spInsets = scrollpane.getInsets();
int y = spInsets.top;

72
jdk/test/javax/swing/plaf/basic/BasicScrollPaneUI/Test6632810.java Normal file
View File

@ -0,0 +1,72 @@
/*
* 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 6632810
* @summary javax.swing.plaf.basic.BasicScrollPaneUI.getBaseline(JComponent, int, int) doesn't throw NPE and IAE
* @author Pavel Porvatov
*/
import javax.swing.*;
import javax.swing.plaf.basic.BasicScrollPaneUI;
public class Test6632810 {
public static void main(String[] args) {
SwingUtilities.invokeLater(new Runnable() {
public void run() {
BasicScrollPaneUI ui = new BasicScrollPaneUI();
ui.installUI(new JScrollPane());
try {
ui.getBaseline(null, 1, 1);
throw new RuntimeException("getBaseline(null, 1, 1) does not throw NPE");
} catch (NullPointerException e) {
// Ok
}
int[][] illegelParams = new int[][]{
{-1, 1,},
{1, -1,},
{-1, -1,},
};
for (int[] illegelParam : illegelParams) {
try {
int width = illegelParam[0];
int height = illegelParam[1];
ui.getBaseline(new JScrollPane(), width, height);
throw new RuntimeException("getBaseline(new JScrollPane(), " + width + ", " + height +
") does not throw IAE");
} catch (IllegalArgumentException e) {
// Ok
}
}
}
});
}
}