mirror of
https://github.com/openjdk/jdk.git
synced 2026-07-19 23:48:50 +00:00
6521706: A switch operator in JFrame.processWindowEvent() should be rewritten
Reviewed-by: azvegint, alexsch
This commit is contained in:
parent
0c7b59878e
commit
e9a294c5aa
@ -24,14 +24,22 @@
|
||||
*/
|
||||
package javax.swing;
|
||||
|
||||
import java.awt.*;
|
||||
import java.awt.event.*;
|
||||
import java.beans.PropertyChangeListener;
|
||||
import java.util.Locale;
|
||||
import java.util.Vector;
|
||||
import java.io.Serializable;
|
||||
import java.awt.AWTEvent;
|
||||
import java.awt.BorderLayout;
|
||||
import java.awt.Component;
|
||||
import java.awt.Container;
|
||||
import java.awt.Frame;
|
||||
import java.awt.Graphics;
|
||||
import java.awt.GraphicsConfiguration;
|
||||
import java.awt.HeadlessException;
|
||||
import java.awt.Image;
|
||||
import java.awt.LayoutManager;
|
||||
import java.awt.event.WindowEvent;
|
||||
|
||||
import javax.accessibility.*;
|
||||
import javax.accessibility.Accessible;
|
||||
import javax.accessibility.AccessibleContext;
|
||||
import javax.accessibility.AccessibleState;
|
||||
import javax.accessibility.AccessibleStateSet;
|
||||
|
||||
|
||||
/**
|
||||
@ -297,33 +305,28 @@ public class JFrame extends Frame implements WindowConstants,
|
||||
* @see #setDefaultCloseOperation
|
||||
* @see java.awt.Window#processWindowEvent
|
||||
*/
|
||||
protected void processWindowEvent(WindowEvent e) {
|
||||
protected void processWindowEvent(final WindowEvent e) {
|
||||
super.processWindowEvent(e);
|
||||
|
||||
if (e.getID() == WindowEvent.WINDOW_CLOSING) {
|
||||
switch(defaultCloseOperation) {
|
||||
case HIDE_ON_CLOSE:
|
||||
setVisible(false);
|
||||
break;
|
||||
case DISPOSE_ON_CLOSE:
|
||||
dispose();
|
||||
break;
|
||||
case DO_NOTHING_ON_CLOSE:
|
||||
default:
|
||||
break;
|
||||
case EXIT_ON_CLOSE:
|
||||
// This needs to match the checkExit call in
|
||||
// setDefaultCloseOperation
|
||||
System.exit(0);
|
||||
break;
|
||||
switch (defaultCloseOperation) {
|
||||
case HIDE_ON_CLOSE:
|
||||
setVisible(false);
|
||||
break;
|
||||
case DISPOSE_ON_CLOSE:
|
||||
dispose();
|
||||
break;
|
||||
case EXIT_ON_CLOSE:
|
||||
// This needs to match the checkExit call in
|
||||
// setDefaultCloseOperation
|
||||
System.exit(0);
|
||||
break;
|
||||
case DO_NOTHING_ON_CLOSE:
|
||||
default:
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// public void setMenuBar(MenuBar menu) {
|
||||
// throw new IllegalComponentStateException("Please use setJMenuBar() with JFrame.");
|
||||
// }
|
||||
|
||||
/**
|
||||
* Sets the operation that will happen by default when
|
||||
* the user initiates a "close" on this frame.
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user