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

6786238: api/javax_swing/DefaultDesktopManager/descriptions.html#xxxFrame Fails with NPE since 6u12 b02

Browse Source 
Reviewed-by: rupashka
This commit is contained in:
Alexander Potochkin 2010-05-25 20:22:44 +04:00
parent f5b5248994
commit 9aca53da76
1 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
jdk/src/share/classes/javax/swing/DefaultDesktopManager.java
View File

@ -26,17 +26,13 @@
package javax.swing; package javax.swing;
import java.awt.*; import com.sun.awt.AWTUtilities;
import java.beans.PropertyVetoException;
import java.beans.PropertyChangeEvent;
import javax.swing.border.Border;
import java.awt.event.ComponentListener;
import java.awt.event.ComponentAdapter;
import java.awt.event.ComponentEvent;
import sun.awt.AWTAccessor; import sun.awt.AWTAccessor;
import sun.awt.SunToolkit; import sun.awt.SunToolkit;
import java.awt.*;
import java.beans.PropertyVetoException;
/** This is an implementation of the <code>DesktopManager</code>. /** This is an implementation of the <code>DesktopManager</code>.
* It currently implements the basic behaviors for managing * It currently implements the basic behaviors for managing
* <code>JInternalFrame</code>s in an arbitrary parent. * <code>JInternalFrame</code>s in an arbitrary parent.
@ -318,7 +314,10 @@ public class DefaultDesktopManager implements DesktopManager, java.io.Serializab
dragMode = DEFAULT_DRAG_MODE; dragMode = DEFAULT_DRAG_MODE;
if (p != null) { if (p != null) {
String mode = (String)p.getClientProperty("JDesktopPane.dragMode"); String mode = (String)p.getClientProperty("JDesktopPane.dragMode");
if (mode != null && mode.equals("outline")) { Window window = SwingUtilities.getWindowAncestor(f);
if (window != null && !AWTUtilities.isWindowOpaque(window)) {
dragMode = DEFAULT_DRAG_MODE;
} else if (mode != null && mode.equals("outline")) {
dragMode = OUTLINE_DRAG_MODE; dragMode = OUTLINE_DRAG_MODE;
} else if (mode != null && mode.equals("faster") } else if (mode != null && mode.equals("faster")
&& f instanceof JInternalFrame && f instanceof JInternalFrame