2005-06-22 Anthony Balkissoon <abalkiss@redhat.com>

	* javax/swing/JDialog.java:
	(setDefaultCloseOperation): Removed validity check for
	operation code.  Validity is handled in processWindowEvent.
	* javax/swing/JFrame.java:
	(setDefaultCloseOperation): Changed error message to be more
	descriptive and similar to reference implementation.
	* javax/swing/JInternalFrame.java:
	(setDefaultCloseOperation): Removed validity check for
	operation code.
	* javax/swing/plaf/basic/BasicInternalFrameUI.java:
	(InternalFramePropertyListener): Added implementation of
	VetoableChangeListener.
	(InternalFramePropertyListener.vetoableChange): New method.
	(InternalFramePropertyListener.propertyChange): Removed
	check for JInternalFrame.IS_CLOSED_PROPERTY.  This is now
	handled in vetoableChange.
	(getDesktopManager): Added a check for null pointer from
	JInternalFrame.getDesktopPane().

1 files changed, 4 insertions, 4 deletions

diff --git a/javax/swing/JInternalFrame.java b/javax/swing/JInternalFrame.java
index 19e0a11ff..3bd2ae26a 100644
--- a/javax/swing/JInternalFrame.java
+++ b/javax/swing/JInternalFrame.java
@@ -1305,10 +1305,10 @@ public class JInternalFrame extends JComponent implements Accessible,
    */
   public void setDefaultCloseOperation(int operation)
   {
-    if (operation != DO_NOTHING_ON_CLOSE
-	&& operation != HIDE_ON_CLOSE
-        && operation != DISPOSE_ON_CLOSE)
-      throw new Error("Close operation must be one of DO_NOTHING_ON_CLOSE, HIDE_ON_CLOSE, or DISPOSE_ON_CLOSE");
+    /* Reference implementation allows invalid operations to be specified.
+       In that case, behaviour defaults to DO_NOTHING_ON_CLOSE.
+       processWindowEvent handles the behaviour. getDefaultCloseOperation
+       must return the invalid operator code. */
     defaultCloseOperation = operation;
   }