2006-01-27 Roman Kennke <[EMAIL PROTECTED]>
* javax/swing/plaf/basic/BasicInternalFrameUI.java
(InternalFramePropertyChangeListener): Don't implement
VetoableChangeListener.
(InternalFramePropertyChangeListener.vetoableChange): Removed.
(internalFrameVetoableChangeListener): Removed unneeded field.
(installListeners): Don't install vetoableChangeListener.
* javax/swing/event/DocumentEvent.java
(EventType): Made class final.
/Roman
Index: javax/swing/plaf/basic/BasicInternalFrameUI.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/swing/plaf/basic/BasicInternalFrameUI.java,v
retrieving revision 1.24
diff -u -r1.24 BasicInternalFrameUI.java
--- javax/swing/plaf/basic/BasicInternalFrameUI.java 18 Nov 2005 14:57:46 -0000 1.24
+++ javax/swing/plaf/basic/BasicInternalFrameUI.java 27 Jan 2006 10:21:51 -0000
@@ -891,40 +891,12 @@
* This helper class listens for PropertyChangeEvents from the
* JInternalFrame.
*/
- public class InternalFramePropertyChangeListener implements
- PropertyChangeListener, VetoableChangeListener
+ public class InternalFramePropertyChangeListener
+ implements PropertyChangeListener
{
/**
* This method is called when one of the JInternalFrame's properties change.
- * This method is to allow JInternalFrame to veto an attempt to close the
- * internal frame. This allows JInternalFrame to honour its
- * defaultCloseOperation if that is DO_NOTHING_ON_CLOSE.
- */
- public void vetoableChange(PropertyChangeEvent e)
- throws PropertyVetoException
- {
- if (e.getPropertyName().equals(JInternalFrame.IS_CLOSED_PROPERTY))
- {
- if (frame.getDefaultCloseOperation() == JInternalFrame.HIDE_ON_CLOSE)
- {
- frame.setVisible(false);
- frame.getDesktopPane().repaint();
- throw new PropertyVetoException(
- "close operation is HIDE_ON_CLOSE\n",
- e);
- }
- else if (frame.getDefaultCloseOperation() == JInternalFrame.DISPOSE_ON_CLOSE)
- closeFrame(frame);
- else
- throw new PropertyVetoException(
- "close operation is DO_NOTHING_ON_CLOSE\n",
- e);
- }
- }
-
- /**
- * This method is called when one of the JInternalFrame's properties change.
*
* @param evt
* The PropertyChangeEvent.
@@ -1091,13 +1063,6 @@
*/
protected PropertyChangeListener propertyChangeListener;
- /**
- * The VetoableChangeListener. Listens to PropertyChangeEvents
- * from the JInternalFrame and allows the JInternalFrame to
- * veto attempts to close it.
- */
- private VetoableChangeListener internalFrameVetoableChangeListener;
-
/** The InternalFrameListener that listens to the JInternalFrame. */
private transient BasicInternalFrameListener internalFrameListener;
@@ -1238,13 +1203,11 @@
borderListener = createBorderListener(frame);
componentListener = createComponentListener();
propertyChangeListener = createPropertyChangeListener();
- internalFrameVetoableChangeListener = new InternalFramePropertyChangeListener();
frame.addMouseListener(borderListener);
frame.addMouseMotionListener(borderListener);
frame.addInternalFrameListener(internalFrameListener);
frame.addPropertyChangeListener(propertyChangeListener);
- frame.addVetoableChangeListener(internalFrameVetoableChangeListener);
frame.getRootPane().getGlassPane().addMouseListener(glassPaneDispatcher);
frame.getRootPane().getGlassPane().addMouseMotionListener(glassPaneDispatcher);
}
Index: javax/swing/event/DocumentEvent.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/swing/event/DocumentEvent.java,v
retrieving revision 1.8
diff -u -r1.8 DocumentEvent.java
--- javax/swing/event/DocumentEvent.java 5 Sep 2005 14:08:03 -0000 1.8
+++ javax/swing/event/DocumentEvent.java 27 Jan 2006 10:21:51 -0000
@@ -81,7 +81,7 @@
/**
* EventType
*/
- class EventType
+ final class EventType
{
/**
* INSERT
