infernap12/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2026-02-28 19:20:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

6206439: JInternalFrame.setLayer(Integer layer) should throw NullPointerException when layer=null

Browse Source 
Reviewed-by: ant, alexsch
This commit is contained in:
Sergey Bylokhov 2015-07-30 19:10:23 +03:00
parent 9f39d1674f
commit 7e31b6a900
2 changed files with 56 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
jdk/src/java.desktop/share/classes/javax/swing/JInternalFrame.java
View File

@ -1247,6 +1247,7 @@ public class JInternalFrame extends JComponent implements
*
* @param layer an <code>Integer</code> object specifying this
* frame's desktop layer
* @throws NullPointerException if {@code layer} is {@code null}
* @see JLayeredPane
* @beaninfo
* expert: true

55
jdk/test/javax/swing/JInternalFrame/SetLayerNPE/SetLayerNPE.java Normal file
View File

@ -0,0 +1,55 @@
/*
* 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.EventQueue;
import javax.swing.JDesktopPane;
import javax.swing.JInternalFrame;
/**
* @test
* @bug 6206439
*/
public final class SetLayerNPE {
public static void main(final String[] args) throws Exception {
EventQueue.invokeAndWait(() -> {
try {
// JInternalFrame without parent
new JInternalFrame("My Frame").setLayer(null);
throw new AssertionError("expected NPE was not thrown");
} catch (final NullPointerException ignored) {
}
});
EventQueue.invokeAndWait(() -> {
try {
// JInternalFrame with parent
JInternalFrame jif = new JInternalFrame("My Frame");
new JDesktopPane().add(jif);
jif.setLayer(null);
throw new AssertionError("expected NPE was not thrown");
} catch (final NullPointerException ignored) {
}
});
}
}