提交 54e6ab14 编写于 作者: S serb

6521706: A switch operator in JFrame.processWindowEvent() should be rewritten

Reviewed-by: azvegint, alexsch
上级 b80f4795
...@@ -24,14 +24,22 @@ ...@@ -24,14 +24,22 @@
*/ */
package javax.swing; package javax.swing;
import java.awt.*; import java.awt.AWTEvent;
import java.awt.event.*; import java.awt.BorderLayout;
import java.beans.PropertyChangeListener; import java.awt.Component;
import java.util.Locale; import java.awt.Container;
import java.util.Vector; import java.awt.Frame;
import java.io.Serializable; import java.awt.Graphics;
import java.awt.GraphicsConfiguration;
import javax.accessibility.*; import java.awt.HeadlessException;
import java.awt.Image;
import java.awt.LayoutManager;
import java.awt.event.WindowEvent;
import javax.accessibility.Accessible;
import javax.accessibility.AccessibleContext;
import javax.accessibility.AccessibleState;
import javax.accessibility.AccessibleStateSet;
/** /**
...@@ -293,33 +301,28 @@ public class JFrame extends Frame implements WindowConstants, ...@@ -293,33 +301,28 @@ public class JFrame extends Frame implements WindowConstants,
* @see #setDefaultCloseOperation * @see #setDefaultCloseOperation
* @see java.awt.Window#processWindowEvent * @see java.awt.Window#processWindowEvent
*/ */
protected void processWindowEvent(WindowEvent e) { protected void processWindowEvent(final WindowEvent e) {
super.processWindowEvent(e); super.processWindowEvent(e);
if (e.getID() == WindowEvent.WINDOW_CLOSING) { if (e.getID() == WindowEvent.WINDOW_CLOSING) {
switch(defaultCloseOperation) { switch (defaultCloseOperation) {
case HIDE_ON_CLOSE: case HIDE_ON_CLOSE:
setVisible(false); setVisible(false);
break; break;
case DISPOSE_ON_CLOSE: case DISPOSE_ON_CLOSE:
dispose(); dispose();
break; break;
case DO_NOTHING_ON_CLOSE: case EXIT_ON_CLOSE:
default: // This needs to match the checkExit call in
break; // setDefaultCloseOperation
case EXIT_ON_CLOSE: System.exit(0);
// This needs to match the checkExit call in break;
// setDefaultCloseOperation case DO_NOTHING_ON_CLOSE:
System.exit(0); default:
break;
} }
} }
} }
// public void setMenuBar(MenuBar menu) {
// throw new IllegalComponentStateException("Please use setJMenuBar() with JFrame.");
// }
/** /**
* Sets the operation that will happen by default when * Sets the operation that will happen by default when
* the user initiates a "close" on this frame. * the user initiates a "close" on this frame.
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册