From 9399c41550e32c6bd8ea2d299a09f7151f9dc7dd Mon Sep 17 00:00:00 2001 From: Andrew John Hughes Date: Sun, 5 Jun 2005 19:36:35 +0000 Subject: 2005-06-05 Andrew John Hughes * Merge from HEAD-->generics-branch for 2005/05/26 - 2005/06/05. Changelog: 2005-06-04 Tom Tromey * javax/swing/plaf/basic/BasicListUI.java (focusListener): Use correct type. (listDataListener, listSelectionListener, mouseInputListener, propertyChangeListener): Likewise. * javax/swing/plaf/basic/BasicMenuUI.java (ChangeHandler): Now public and deprecated. * javax/swing/plaf/basic/BasicTabbedPaneUI.java (TabbedPaneLayout): Now public. * javax/swing/plaf/basic/BasicOptionPaneUI.java (ButtonActionListener): Now public. (PropertyChangeHandler): Likewise. (ButtonAreaLayout): Likewise. * javax/swing/plaf/basic/BasicInternalFrameTitlePane.java (TitlePaneLayout): Now public. (PropertyChangeHandler): Likewise. * javax/swing/plaf/basic/BasicCheckBoxUI.java (getPropertyPrefix): New method. * javax/swing/plaf/basic/BasicProgressBarUI.java (ChangeHandler): Now public. * javax/swing/plaf/basic/BasicSliderUI.java (ComponentHandler): Now public. * javax/swing/plaf/basic/BasicSplitPaneUI.java (BasicVerticalLayoutManager): Now public. (FocusHandler): Likewise. (BasicHorizontalLayoutManager): Likewise. * javax/swing/plaf/basic/BasicFileChooserUI.java (AcceptAllFileFilter): New public constructor. (BasicFileView): Likewise. * javax/swing/plaf/basic/BasicInternalFrameUI.java (BorderListener.RESIZE_NONE): Now final. 2005-06-04 Audrius Meskauskas * org/omg/CORBA/DefinitionKindHelper.java, org/omg/CORBA/FieldNameHelper.java, org/omg/CORBA/IdentifierHelper.java, org/omg/CORBA/ParameterMode.java, org/omg/CORBA/ParameterModeHelper.java, org/omg/CORBA/ParameterModeHolder.java, org/omg/CORBA/RepositoryIdHelper.java, org/omg/CORBA/SetOverrideTypeHelper.java, org/omg/CORBA/VersionSpecHelper.java, gnu/CORBA/SetOverrideTypeHolder.java, gnu/CORBA/DefinitionKindHolder.java: New files. 2005-06-04 Audrius Meskauskas * org/omg/stub/java/rmi/_Remote_Stub.java, org/omg/stub/java/rmi/package.html: New package. 2005-06-04 Audrius Meskauskas * org/omg/Messaging/SyncScopeHelper.java org/omg/Messaging/SYNC_WITH_TRANSPORT.java org/omg/Messaging/package.html: New package. 2005-06-04 Michael Koch * native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkImage.c (Java_gnu_java_awt_peer_gtk_GtkImage_loadPixbuf): Fixed method declaration format. (Java_gnu_java_awt_peer_gtk_GtkImage_drawPixelsScaled): Likewise. 2005-06-03 Audrius Meskauskas * AUTHORS (Roman Kennke): New author. 2005-06-03 Audrius Meskauskas * org/omg/CORBA/portable/BoxedValueHelper.java, org/omg/CORBA_2_3/portable/OutputStream.java, org/omg/CORBA_2_3/portable/Delegate.java, org/omg/CORBA_2_3/portable/ObjectImpl.java, org/omg/CORBA_2_3/portable/package.html: New files. 2005-06-03 Audrius Meskauskas * org/omg/CosNaming/NamingContextPackage/AlreadyBound.java, org/omg/CosNaming/NamingContextPackage/CannotProceed.java, org/omg/CosNaming/NamingContextPackage/InvalidName.java, org/omg/CosNaming/NamingContextPackage/NotEmpty.java, org/omg/CosNaming/NamingContextPackage/NotFound.java, org/omg/CosNaming/NamingContextPackage/NotFoundReason.java: Added SerialVersionUID. 2005-06-03 Audrius Meskauskas * gnu/CORBA/GIOP/uncObjectInputStream.java, gnu/CORBA/GIOP/uncObjectInputStream/uncObjectOutputStream.java: Deleting files. * gnu/CORBA/CDR/uncObjectInputStream.java, gnu/CORBA/CDR/uncObjectInputStream/uncObjectOutputStream.java: Adding files. 2005-06-03 Audrius Meskauskas * gnu/CORBA/Functional_ORB.java, gnu/CORBA/IOR_Delegate.java, gnu/CORBA/Simple_delegate.java, gnu/CORBA/universalHolder.java, gnu/CORBA/CDR/aligningInputStream.java, gnu/CORBA/CDR/aligningOutputStream.java, gnu/CORBA/CDR/cdrInput.java, gnu/CORBA/CDR/cdrOutput.java, gnu/CORBA/CDR/encapsulatedOutput.java, gnu/CORBA/GIOP/ErrorMessage.java, gnu/CORBA/GIOP/MessageHeader.java, gnu/CORBA/GIOP/cxCodeSet.java, gnu/CORBA/GIOP/v1_2/RequestHeader.java, org/omg/CosNaming/BindingIteratorHelper.java, org/omg/CosNaming/BindingListHelper.java, org/omg/CosNaming/BindingTypeHelper.java, org/omg/CosNaming/NameComponentHelper.java, org/omg/CosNaming/NameHelper.java, org/omg/CosNaming/NamingContextExtHelper.java, org/omg/CosNaming/NamingContextHelper.java: Initialise instances of org.omg.SystemException, thrown after catching the other exception, with InitCause. 2005-06-03 Roman Kennke * javax/swing/plaf/basic/BasicListUI.java (damageLayout): Check for list beeing null before revalidating it. 2005-06-03 Roman Kennke * javax/swing/text/PlainDocument.java (removeUpdate): Fixed indices in text buffer access. * javax/swing/text/PlainView.java (drawLine): Simplified element access. 2005-06-03 Roman Kennke * javax/swing/JTextArea.java (constructor): Set preferredSize to a sane default. 2005-06-03 Audrius Meskauskas * gnu/CORBA/GIOP/uncObjectInputStream.java, gnu/CORBA/GIOP/uncObjectInputStream/uncObjectOutputStream.java: New streams. * org/omg/CORBA/ValueBaseHelper.java: Removing inner classes, using uncObjectInputStream, uncObjectOutputStream instead. * org/omg/CORBA_2_3/portable (read_value): Delegate call to ValueBaseHelper. 2005-06-03 Audrius Meskauskas * org/omg/CORBA/SendingContext/Runtime.java, org/omg/CORBA/SendingContext/RunTimeOperations.java: Fixing the package statement. 2005-06-03 Roman Kennke * javax/swing/SwingUtilites.java (replaceUIActionMap): Fixed loop again. Now correctly, I hope. * javax/swing/ActionMap.java (setParent): Make sure we don't build a loop. * javax/swing/plaf/basic/BasicTextUI.java (createActionMap): Create ActionMapUIResource instead of plain ActionMap. 2005-06-03 Sven de Marothy * gnu/java/awt/peer/gtk/GdkGraphics.java: Removed declarations for the previously removed native methods. 2005-06-03 Roman Kennke * javax/swing/SwingUtilites.java (replaceUIActionMap): Fixed condition in while loop that caused infinite looping. 2005-06-03 Roman Kennke * javax/swing/plaf/basic/BasicTableUI.java (uninstallDefault): Don't set properties to null, this corrupts component state. 2005-06-02 Andrew John Hughes * lib/Makefile.am: Fix permissions problem with creation of META-INF tree. 2005-06-02 Sven de Marothy * java/awt/Component.java (setBackgroundColor): Return if the color equals the existing bgcolor. 2005-06-02 Sven de Marothy * gnu/java/awt/peer/gtk/GdkGraphics2D.java: (drawImage): Remove reference to GtkOffScreenImage. * gnu/java/awt/peer/gtk/GtkImageConsumer.java: Add additional comments. 2005-06-02 Sven de Marothy * gnu/java/awt/peer/gtk/GdkGraphics.java: (GdkGraphics): New constructor. (drawImage): Reimplemented. * gnu/java/awt/peer/gtk/GtkComponentPeer.java: (checkImage,createImage): Reimplemented. (prepareImage): Just call the GdkToolkit method. * gnu/java/awt/peer/gtk/GtkFramePeer.java: (setIconImage): Reimplemented. * gnu/java/awt/peer/gtk/GtkImage.java: Reimplemented. * gnu/java/awt/peer/gtk/GtkToolkit.java: (checkImage): Change handling of GtkImage. (createImage): Reimplemented for GtkImage. (getColorModel): Return the actual native color model. (prepareImage): Reimplemented. * include/Makefile.am, * native/jni/gtk-peer/Makefile.am: Removed old files, added new ones. * include/gnu_java_awt_peer_gtk_GdkGraphics.h, * native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkGraphics.c: (initFromImage): New method. (copyPixmap, flip_pixbuf, copyAndScalePixmap): Removed. * include/gnu_java_awt_peer_gtk_GtkFramePeer.h, * native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkFramePeer.c: (nativeSetIconImage): New method. (nativeSetIconImageFromData,nativeSetIconImageFromDecoder): Removed. * gnu/java/awt/peer/gtk/GtkImageConsumer.java, * include/gnu_java_awt_peer_gtk_GtkImage.h, * native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkImage.c: New files. * gnu/java/awt/peer/gtk/GtkImagePainter.java, * gnu/java/awt/peer/gtk/GtkOffScreenImage.java, * include/gnu_java_awt_peer_gtk_GtkImagePainter.h, * native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkImagePainter.c: Removed files. 2005-06-01 Tom Tromey * java/io/ObjectInputStream.java (currentLoader): Fixed typo. 2005-06-01 Tom Tromey * org/omg/CosNaming/IstringHelper.java: Changed non-ascii characters. 2005-06-01 Audrius Meskauskas * org/omg/SendingContext/package.html, org/omg/SendingContext/RunTimeOperations.java, org/omg/SendingContext/Runtime.java: New package. 2005-06-01 Roman Kennke * javax/swing/text/DefaultStyledDocument.java (setLogicalStyle): Implemented this method. 2005-06-01 Sven de Marothy * java/util/GregorianCalendar.java (setTimeInMillis): Recompute time fields. 2005-06-01 Audrius Meskauskas * org/omg/CosNaming/BindingType.java, org/omg/CosNaming/NameComponent.java, org/omg/CosNaming/_BindingIteratorStub.java, org/omg/CosNaming/_NamingContextStub.java, org/omg/CosNaming/_NamingContextExtStub.java, org/omg/CosNaming/_BindingIteratorImplBase.java, org/omg/CosNaming/_NamingContextImplBase.java: Added SerialVersionUID. 2005-06-01 Audrius Meskauskas * org/omg/CosNaming/IstringHelper.java: New class. 2005-06-01 Audrius Meskauskas * gnu/CORBA/CDR/cdrInput.java (read_wstring): Correcting check for native encoding. 2005-06-01 Roman Kennke * javax/swing/plaf/basic/BasicFileChooserUI.java (installComponents): Changed layout of main panel from GridBagLayout to BorderLayout (as is the case in Suns JDK). This fixes bug#13244. 2005-06-01 Audrius Meskauskas * gnu/CORBA/Functional_ORB.java (serveStep), gnu/CORBA/gnuRequest.java (submit), gnu/CORBA/CDR/cdrInput.java (read_encapsulation): Correcting data read loop. 2005-06-01 Audrius Meskauskas * gnu/CORBA/Functional_ORG.java (getFreePort): Remember the port number in the local variable. 2005-06-01 Audrius Meskauskas * examples/gnu/classpath/examples/CORBA/SimpleCommunication/ communication/ourUserExceptionHelper.java (extract): New method. * examples/gnu/classpath/examples/CORBA/SimpleCommunication/ communication/RequestTest.java:Use helper extract method. 2005-06-01 Roman Kennke * javax/swing/JPopupMenu.java (insert): Do not check for index == -1 at this point, this is done in java.awt.Container. Catching -1 indices here disturbes the Container.addImpl which leads to bug #13247 for example. 2005-06-01 Roman Kennke * javax/swing/text/PlainDocument.java (removeUpdate): Fixed indices in call to rootElement.replace(). 2005-06-01 Roman Kennke * javax/swing/JComponent.java (processKeyEvent): Call super.processKeyEvent() so that KeyEvents are delivered to registered KeyListeners. 2005-05-31 Audrius Meskauskas * org/omg/CORBA_2_3/ORB.java, org/omg/CORBA_2_3/portable/InputStream.java, org/omg/CORBA/portable/ValueFactory.java: New classes. 2005-05-31 Audrius Meskauskas * org/omg.CORBA/DynValue.java (declaration): Inherit from DynAny, org.omg.CORBA.Object. (set_members): Declare it may throw InvalidSeq. 2005-06-01 Sven de Marothy * java/util/TimeZone (getDefaultTimeZone): Reimplemented. (parseTime, getDateParams): New private methods. 2005-06-01 David Gilbert * gnu/java/awt/GradientPaintContext.java: New file. * java/awt/GradientPaint.java: Implemented. * java/awt/image/IndexColorModel.java: Reimplemented. 2005-05-31 Audrius Meskauskas * gnu/CORBA/CDR/BigEndianInputStream.java, gnu/CORBA/CDR/BigEndianOutputStream.java, gnu/CORBA/CDR/LittleEndianInputStream.java, gnu/CORBA/CDR/LittleEndianOutputStream.java: New streams. gnu/CORBA/CDR/abstractDataInputStream.java, gnu/CORBA/CDR/abstractDataOutputStream.java: New interfaces. * gnu/CORBA/IOR.java: Implemented parsing of the Little Endian encoded IOR references. * gnu/CORBA/Functional_ORB.java, gnu/CORBA/binaryReply.java, gnu/CORBA/gnuRequest.java, gnu/CORBA/CDR/cdrInput.java, gnu/CORBA/CDR/cdrOutput.java, gnu/CORBA/CDR/encapsulatedOutput.java, gnu/CORBA/GIOP/MessageHeader.java: Implemented support for Big and Little Endian. * org/omg/CORBA/package.html: Documentation update. 2005-05-31 Jeroen Frijters * java/net/ServerSocket.java (bound): Removed. (local): New field. (bind): Cache local socket address. (getInetAddress, getLocalPort, getLocalSocketAddress, isBound): Use cached local socket address. (close): bound field was removed. 2005-05-31 Jeroen Frijters * gnu/java/nio/channels/FileChannelImpl.java (FileChannelImpl()): Removed. (FileChannelImpl(File,int)): Made private. (create): New method. * java/io/FileInputStream.java, java/io/FileOutputStream.java, java/io/RandomAccessFile.java: Updated construction of FileChannelImpl instance. 2005-05-31 Sven de Marothy * java/awt/image/BufferedImage.java: (ImageProducer): Use Vector instead of HashMap. * java/awt/image/DirectColorModel.java: (getAlpha): Default to 255 (opaque). 2005-05-30 Roman Kennke * javax/swing/JTree.java (getNextMatch): Implemented new method. 2005-05-30 Roman Kennke * javax/swing/plaf/metal/MetalSplitPaneUI.java: (createUI): Do not share one instance of MetalSplitPaneUI between multiple JSplitPanes. 2005-05-30 Roman Kennke * javax/swing/JComponent.java: Made JComponent.AccessibleJComponent implement AccessibleExtendedComponent. 2005-05-30 Roman Kennke * javax/swing/JButton.java (constructor): Set initial actionCommand equal to the buttons label. 2005-05-30 Roman Kennke * javax/swing/JList.java (getNextMatch): Implemented new method. (getCellBounds): Implemented new method. 2005-05-30 Audrius Meskauskas * gnu/CORBA/Functional_ORB.java (serve, portServer, serveStep): Implemented support for the subsequent invocations reusing the same socket. * gnu/CORBA/GIOP/MessageHeader.java (read): throw NO_IMPLEMENT, not MARSHAL for Little Endian request. 2005-05-30 Roman Kennke * javax/swing/JLayeredPane.java (putLayer): Implemented new method. 2005-05-30 Roman Kennke * javax/swing/JFileChooser.java: Fixed values of some constant fields. 2005-05-30 Roman Kennke * javax/swing/SwingUtilities.java: (getWindowAncestor): This method has to be static instead of non-static. 2005-05-29 Michael Koch * java/util/LinkedHashMap.java (access): Set 'root.pred'. 2005-05-29 Audrius Meskauskas * org/omg/CosNaming/_BindingIteratorImplBase.java , org/omg/CosNaming/_NamingContextExtImplBase.java, org/omg/CosNaming/_NamingContextImplBase.java: Inherit from DynamicImplementation. * gnu/CORBA/ServiceRequestAdapter.java: New class. * gnu/CORBA/gnuNVList.java (add, add_item): Replacing null by constructed instance. 2005-05-29 Audrius Meskauskas * org/omg/CORBA/Functional_ORB.java (serve, useProperties, init): Implementing the property-configurable time-outs. 2005-05-29 Audrius Meskauskas * gnu/CORBA/gnuRequest.java (p_invoke): Wrap the received UserException into UnknownUserException. * gnu/CORBA/streamReadyHolder.java: New wrapper for UserException. * org/omg/CORBA/UnknownUserException.java: New exception. 2005-05-27 Roman Kennke * javax/swing/AbstractButton.java: Bumped up serialVersionUID(s) to JDK1.4 compatibility. * javax/swing/ImageIcon.java: Likewise. * javax/swing/JFileChooser.java: Likewise. * javax/swing/JInternalFrame.java: Likewise. * javax/swing/JMenu.java: Likewise. * javax/swing/JRadioButton.java: Likewise. * javax/swing/JScrollPane.java: Likewise. * javax/swing/JSpinner.java: Likewise. * javax/swing/JTabbedPane.java: Likewise. * javax/swing/ImageIcons.java: Likewise. * javax/swing/JToggleButton.java: Likewise. * javax/swing/JToolTip.java: Likewise. * javax/swing/JViewPort.java: Likewise. * javax/swing/LayoutFocusTraversalPolicy.java: Likewise. * javax/swing/SpinnerDateModel.java: Likewise. * javax/swing/TransferHandler.java: Likewise. 2005-05-27 Thomas Fitzsimmons * gnu/java/awt/peer/gtk/GtkContainerPeer.java (setFont): Handle lightweight peers specially. 2005-05-27 Audrius Meskauskas * omg/org/CORBA/ORB.java (create_recursive_sequence_tc): New method. 2005-05-27 Audrius Meskauskas * omg/org/CORBA/DynValue.java: New interface. 2005-05-27 Audrius Meskauskas * omg/org/CORBA/package.html: Documentation update. 2005-05-26 Audrius Meskauskas * org/omg/CORBA/ORB.java (create_basic_dyn_any): Declare it may throw an InconsistentTypeCode. (create_dyn_any): Remove wrong exception declaration. (create_operation_list, create_abstract_interface_tc, create_native_tc, get_service_information): Implementing these methods. * org/omg/CORBA/ServerRequest.java (result, except, params, op_name): Marking deprecated. --- javax/swing/plaf/basic/BasicCheckBoxUI.java | 10 ++++- javax/swing/plaf/basic/BasicFileChooserUI.java | 25 ++++++------ .../plaf/basic/BasicInternalFrameTitlePane.java | 40 +++++++++++++++++++- javax/swing/plaf/basic/BasicInternalFrameUI.java | 4 +- javax/swing/plaf/basic/BasicListUI.java | 14 ++++--- javax/swing/plaf/basic/BasicMenuUI.java | 7 +++- javax/swing/plaf/basic/BasicOptionPaneUI.java | 21 ++++++++--- javax/swing/plaf/basic/BasicProgressBarUI.java | 6 ++- javax/swing/plaf/basic/BasicSliderUI.java | 22 ++++++++++- javax/swing/plaf/basic/BasicSplitPaneUI.java | 44 ++++++++++++++++++++-- javax/swing/plaf/basic/BasicTabbedPaneUI.java | 22 ++++++++++- javax/swing/plaf/basic/BasicTableUI.java | 22 ++++++++--- javax/swing/plaf/basic/BasicTextUI.java | 3 +- javax/swing/plaf/metal/MetalSplitPaneUI.java | 22 ++++++++--- 14 files changed, 210 insertions(+), 52 deletions(-) (limited to 'javax/swing/plaf') diff --git a/javax/swing/plaf/basic/BasicCheckBoxUI.java b/javax/swing/plaf/basic/BasicCheckBoxUI.java index 0efc7ab35..5e1e0f5a9 100644 --- a/javax/swing/plaf/basic/BasicCheckBoxUI.java +++ b/javax/swing/plaf/basic/BasicCheckBoxUI.java @@ -1,5 +1,5 @@ /* BasicCheckBoxUI.java - Copyright (C) 2002, 2004 Free Software Foundation, Inc. + Copyright (C) 2002, 2004, 2005 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -59,7 +59,13 @@ public class BasicCheckBoxUI extends BasicRadioButtonUI public void installUI(final JComponent c) { super.installUI(c); - } + } + + // Overridden to change method access. + public String getPropertyPrefix() + { + return super.getPropertyPrefix(); + } } diff --git a/javax/swing/plaf/basic/BasicFileChooserUI.java b/javax/swing/plaf/basic/BasicFileChooserUI.java index 517d4ecec..d425ad324 100644 --- a/javax/swing/plaf/basic/BasicFileChooserUI.java +++ b/javax/swing/plaf/basic/BasicFileChooserUI.java @@ -101,6 +101,10 @@ public class BasicFileChooserUI extends FileChooserUI */ protected class AcceptAllFileFilter extends FileFilter { + public AcceptAllFileFilter() + { + } + /** * DOCUMENT ME! * @@ -168,6 +172,10 @@ public class BasicFileChooserUI extends FileChooserUI /** DOCUMENT ME! */ protected Hashtable iconCache = new Hashtable(); + public BasicFileView() + { + } + /** * DOCUMENT ME! * @@ -1299,19 +1307,10 @@ public class BasicFileChooserUI extends FileChooserUI c.anchor = GridBagConstraints.EAST; bottomPanel.add(closePanel, c); - filechooser.setLayout(new GridBagLayout()); - - c.anchor = GridBagConstraints.WEST; - c.gridx = 0; - c.gridy = 0; - filechooser.add(topPanel, c); - - c.gridy = 1; - filechooser.add(centrePanel, c); - - c.gridy = 2; - c.fill = GridBagConstraints.HORIZONTAL; - filechooser.add(bottomPanel, c); + filechooser.setLayout(new BorderLayout()); + filechooser.add(topPanel, BorderLayout.NORTH); + filechooser.add(centrePanel, BorderLayout.CENTER); + filechooser.add(bottomPanel, BorderLayout.SOUTH); } /** diff --git a/javax/swing/plaf/basic/BasicInternalFrameTitlePane.java b/javax/swing/plaf/basic/BasicInternalFrameTitlePane.java index 75de12811..f3939ac6b 100644 --- a/javax/swing/plaf/basic/BasicInternalFrameTitlePane.java +++ b/javax/swing/plaf/basic/BasicInternalFrameTitlePane.java @@ -77,6 +77,10 @@ public class BasicInternalFrameTitlePane extends JComponent { /** * The Action responsible for closing the JInternalFrame. + * + * @specnote Apparently this class was intended to be protected, + * but was made public by a compiler bug and is now + * public for compatibility. */ public class CloseAction extends AbstractAction { @@ -102,6 +106,10 @@ public class BasicInternalFrameTitlePane extends JComponent /** * This Action is responsible for iconifying the JInternalFrame. + * + * @specnote Apparently this class was intended to be protected, + * but was made public by a compiler bug and is now + * public for compatibility. */ public class IconifyAction extends AbstractAction { @@ -128,6 +136,10 @@ public class BasicInternalFrameTitlePane extends JComponent /** * This Action is responsible for maximizing the JInternalFrame. + * + * @specnote Apparently this class was intended to be protected, + * but was made public by a compiler bug and is now + * public for compatibility. */ public class MaximizeAction extends AbstractAction { @@ -154,6 +166,10 @@ public class BasicInternalFrameTitlePane extends JComponent /** * This Action is responsible for dragging the JInternalFrame. + * + * @specnote Apparently this class was intended to be protected, + * but was made public by a compiler bug and is now + * public for compatibility. */ public class MoveAction extends AbstractAction { @@ -171,6 +187,10 @@ public class BasicInternalFrameTitlePane extends JComponent /** * This Action is responsible for restoring the JInternalFrame. Restoring * the JInternalFrame is the same as setting the maximum property to false. + * + * @specnote Apparently this class was intended to be protected, + * but was made public by a compiler bug and is now + * public for compatibility. */ public class RestoreAction extends AbstractAction { @@ -197,6 +217,10 @@ public class BasicInternalFrameTitlePane extends JComponent /** * This action is responsible for sizing the JInternalFrame. + * + * @specnote Apparently this class was intended to be protected, + * but was made public by a compiler bug and is now + * public for compatibility. */ public class SizeAction extends AbstractAction { @@ -214,8 +238,12 @@ public class BasicInternalFrameTitlePane extends JComponent /** * This class is responsible for handling property change events from the * JInternalFrame and adjusting the Title Pane as necessary. + * + * @specnote Apparently this class was intended to be protected, + * but was made public by a compiler bug and is now + * public for compatibility. */ - protected class PropertyChangeHandler implements PropertyChangeListener + public class PropertyChangeHandler implements PropertyChangeListener { /** * This method is called when a PropertyChangeEvent is received by the @@ -236,6 +264,10 @@ public class BasicInternalFrameTitlePane extends JComponent /** * This class acts as the MenuBar for the TitlePane. Clicking on the Frame * Icon in the top left corner will activate it. + * + * @specnote Apparently this class was intended to be protected, + * but was made public by a compiler bug and is now + * public for compatibility. */ public class SystemMenuBar extends JMenuBar { @@ -284,8 +316,12 @@ public class BasicInternalFrameTitlePane extends JComponent /** * This class acts as the Layout Manager for the TitlePane. + * + * @specnote Apparently this class was intended to be protected, + * but was made public by a compiler bug and is now + * public for compatibility. */ - protected class TitlePaneLayout implements LayoutManager + public class TitlePaneLayout implements LayoutManager { /** * Creates a new TitlePaneLayout object. diff --git a/javax/swing/plaf/basic/BasicInternalFrameUI.java b/javax/swing/plaf/basic/BasicInternalFrameUI.java index 594bb7ecf..088c26272 100644 --- a/javax/swing/plaf/basic/BasicInternalFrameUI.java +++ b/javax/swing/plaf/basic/BasicInternalFrameUI.java @@ -1,5 +1,5 @@ /* BasicInternalFrameUI.java -- - Copyright (C) 2004 Free Software Foundation, Inc. + Copyright (C) 2004, 2005 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -162,7 +162,7 @@ public class BasicInternalFrameUI extends InternalFrameUI implements SwingConstants { /** FIXME: Use for something. */ - protected int RESIZE_NONE; + protected final int RESIZE_NONE = 0; /** The x offset from the top left corner of the JInternalFrame. */ private transient int xOffset = 0; diff --git a/javax/swing/plaf/basic/BasicListUI.java b/javax/swing/plaf/basic/BasicListUI.java index 589ec9d43..baaa04655 100644 --- a/javax/swing/plaf/basic/BasicListUI.java +++ b/javax/swing/plaf/basic/BasicListUI.java @@ -304,19 +304,20 @@ public class BasicListUI extends ListUI } /** The current focus listener. */ - protected FocusHandler focusListener; + protected FocusListener focusListener; /** The data listener listening to the model. */ - protected ListDataHandler listDataListener; + protected ListDataListener listDataListener; /** The selection listener listening to the selection model. */ - protected ListSelectionHandler listSelectionListener; + protected ListSelectionListener listSelectionListener; /** The mouse listener listening to the list. */ - protected MouseInputHandler mouseInputListener; + protected MouseInputListener mouseInputListener; /** The property change listener listening to the list. */ - protected PropertyChangeHandler propertyChangeListener; + protected PropertyChangeListener propertyChangeListener; + /** The component listener that receives notification for resizing the * JList component.*/ @@ -498,7 +499,8 @@ public class BasicListUI extends ListUI void damageLayout() { updateLayoutStateNeeded = 1; - list.revalidate(); + if (list != null) + list.revalidate(); } /** diff --git a/javax/swing/plaf/basic/BasicMenuUI.java b/javax/swing/plaf/basic/BasicMenuUI.java index 932024aa9..89daf3245 100644 --- a/javax/swing/plaf/basic/BasicMenuUI.java +++ b/javax/swing/plaf/basic/BasicMenuUI.java @@ -1,5 +1,5 @@ /* BasicMenuUI.java - Copyright (C) 2002, 2004 Free Software Foundation, Inc. + Copyright (C) 2002, 2004, 2005 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -424,7 +424,10 @@ public class BasicMenuUI extends BasicMenuItemUI } } - protected class ChangeHandler implements ChangeListener + /** + * @deprecated + */ + public class ChangeHandler implements ChangeListener { public void stateChanged(ChangeEvent e) { diff --git a/javax/swing/plaf/basic/BasicOptionPaneUI.java b/javax/swing/plaf/basic/BasicOptionPaneUI.java index e0cabce0d..21bdf33ae 100644 --- a/javax/swing/plaf/basic/BasicOptionPaneUI.java +++ b/javax/swing/plaf/basic/BasicOptionPaneUI.java @@ -85,8 +85,12 @@ public class BasicOptionPaneUI extends OptionPaneUI /** * This is a helper class that listens to the buttons located at the bottom * of the JOptionPane. + * + * @specnote Apparently this class was intended to be protected, + * but was made public by a compiler bug and is now + * public for compatibility. */ - protected class ButtonActionListener implements ActionListener + public class ButtonActionListener implements ActionListener { /** The index of the option this button represents. */ protected int buttonIndex; @@ -152,8 +156,13 @@ public class BasicOptionPaneUI extends OptionPaneUI * This helper layout manager is responsible for the layout of the button * area. The button area is the panel that holds the buttons which * represent the options. + * + * @specnote Apparently this class was intended to be protected, + * but was made public by a compiler bug and is now + * public for compatibility. */ - protected class ButtonAreaLayout implements LayoutManager + // FIXME: should be static + public class ButtonAreaLayout implements LayoutManager { /** Whether this layout will center the buttons. */ protected boolean centersChildren = true; @@ -366,6 +375,10 @@ public class BasicOptionPaneUI extends OptionPaneUI /** * This helper class handles property change events from the JOptionPane. + * + * @specnote Apparently this class was intended to be protected, + * but was made public by a compiler bug and is now + * public for compatibility. */ public class PropertyChangeHandler implements PropertyChangeListener { @@ -453,19 +466,15 @@ public class BasicOptionPaneUI extends OptionPaneUI private transient Border buttonBorder; /** The string used to describe OK buttons. */ - // FIXME: wrong name for a constant. private static final String OK_STRING = "OK"; /** The string used to describe Yes buttons. */ - // FIXME: wrong name for a constant. private static final String YES_STRING = "Yes"; /** The string used to describe No buttons. */ - // FIXME: wrong name for a constant. private static final String NO_STRING = "No"; /** The string used to describe Cancel buttons. */ - // FIXME: wrong name for a constant. private static final String CANCEL_STRING = "Cancel"; /** The container for the message area. diff --git a/javax/swing/plaf/basic/BasicProgressBarUI.java b/javax/swing/plaf/basic/BasicProgressBarUI.java index cf71ffb3e..acf6a97d7 100644 --- a/javax/swing/plaf/basic/BasicProgressBarUI.java +++ b/javax/swing/plaf/basic/BasicProgressBarUI.java @@ -75,8 +75,12 @@ public class BasicProgressBarUI extends ProgressBarUI /** * A helper class that listens for ChangeEvents * from the progressBar's model. + * + * @specnote Apparently this class was intended to be protected, + * but was made public by a compiler bug and is now + * public for compatibility. */ - protected class ChangeHandler implements ChangeListener + public class ChangeHandler implements ChangeListener { /** * Called every time the state of the model changes. diff --git a/javax/swing/plaf/basic/BasicSliderUI.java b/javax/swing/plaf/basic/BasicSliderUI.java index 9879d8ddb..9169a6bb7 100644 --- a/javax/swing/plaf/basic/BasicSliderUI.java +++ b/javax/swing/plaf/basic/BasicSliderUI.java @@ -138,6 +138,10 @@ public class BasicSliderUI extends SliderUI { /** * Helper class that listens to the {@link JSlider}'s model for changes. + * + * @specnote Apparently this class was intended to be protected, + * but was made public by a compiler bug and is now + * public for compatibility. */ public class ChangeHandler implements ChangeListener { @@ -160,8 +164,12 @@ public class BasicSliderUI extends SliderUI /** * Helper class that listens for resize events. + * + * @specnote Apparently this class was intended to be protected, + * but was made public by a compiler bug and is now + * public for compatibility. */ - protected class ComponentHandler extends ComponentAdapter + public class ComponentHandler extends ComponentAdapter { /** * Called when the size of the component changes. The UI delegate should @@ -181,6 +189,10 @@ public class BasicSliderUI extends SliderUI /** * Helper class that listens for focus events. + * + * @specnote Apparently this class was intended to be protected, + * but was made public by a compiler bug and is now + * public for compatibility. */ public class FocusHandler implements FocusListener { @@ -246,6 +258,10 @@ public class BasicSliderUI extends SliderUI * Helper class that listens to our swing timer. This class is responsible * for listening to the timer and moving the thumb in the proper direction * every interval. + * + * @specnote Apparently this class was intended to be protected, + * but was made public by a compiler bug and is now + * public for compatibility. */ public class ScrollListener implements ActionListener { @@ -320,6 +336,10 @@ public class BasicSliderUI extends SliderUI /** * Helper class that listens for mouse events. + * + * @specnote Apparently this class was intended to be protected, + * but was made public by a compiler bug and is now + * public for compatibility. */ public class TrackListener extends MouseInputAdapter { diff --git a/javax/swing/plaf/basic/BasicSplitPaneUI.java b/javax/swing/plaf/basic/BasicSplitPaneUI.java index e6270d8f0..b701a63d6 100644 --- a/javax/swing/plaf/basic/BasicSplitPaneUI.java +++ b/javax/swing/plaf/basic/BasicSplitPaneUI.java @@ -1,5 +1,5 @@ /* BasicSplitPaneUI.java -- - Copyright (C) 2003, 2004 Free Software Foundation, Inc. + Copyright (C) 2003, 2004, 2005 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -71,8 +71,12 @@ public class BasicSplitPaneUI extends SplitPaneUI /** * This Layout Manager controls the position and size of the components when * the JSplitPane's orientation is HORIZONTAL_SPLIT. + * + * @specnote Apparently this class was intended to be protected, + * but was made public by a compiler bug and is now + * public for compatibility. */ - protected class BasicHorizontalLayoutManager implements LayoutManager2 + public class BasicHorizontalLayoutManager implements LayoutManager2 { // 3 components at a time. // LEFT/TOP = 0 @@ -485,8 +489,12 @@ public class BasicSplitPaneUI extends SplitPaneUI /** * This class is the Layout Manager for the JSplitPane when the orientation * is VERTICAL_SPLIT. + * + * @specnote Apparently this class was intended to be protected, + * but was made public by a compiler bug and is now + * public for compatibility. */ - protected class BasicVerticalLayoutManager + public class BasicVerticalLayoutManager extends BasicHorizontalLayoutManager { /** @@ -653,8 +661,12 @@ public class BasicSplitPaneUI extends SplitPaneUI /** * This class handles FocusEvents from the JComponent. + * + * @specnote Apparently this class was intended to be protected, + * but was made public by a compiler bug and is now + * public for compatibility. */ - protected class FocusHandler extends FocusAdapter + public class FocusHandler extends FocusAdapter { /** * This method is called when the JSplitPane gains focus. @@ -680,6 +692,10 @@ public class BasicSplitPaneUI extends SplitPaneUI /** * This is a deprecated class. It is supposed to be used for handling down * and right key presses. + * + * @specnote Apparently this class was intended to be protected, + * but was made public by a compiler bug and is now + * public for compatibility. */ public class KeyboardDownRightHandler implements ActionListener { @@ -697,6 +713,10 @@ public class BasicSplitPaneUI extends SplitPaneUI /** * This is a deprecated class. It is supposed to be used for handling end * key presses. + * + * @specnote Apparently this class was intended to be protected, + * but was made public by a compiler bug and is now + * public for compatibility. */ public class KeyboardEndHandler implements ActionListener { @@ -714,6 +734,10 @@ public class BasicSplitPaneUI extends SplitPaneUI /** * This is a deprecated class. It is supposed to be used for handling home * key presses. + * + * @specnote Apparently this class was intended to be protected, + * but was made public by a compiler bug and is now + * public for compatibility. */ public class KeyboardHomeHandler implements ActionListener { @@ -731,6 +755,10 @@ public class BasicSplitPaneUI extends SplitPaneUI /** * This is a deprecated class. It is supposed to be used for handling resize * toggles. + * + * @specnote Apparently this class was intended to be protected, + * but was made public by a compiler bug and is now + * public for compatibility. */ public class KeyboardResizeToggleHandler implements ActionListener { @@ -748,6 +776,10 @@ public class BasicSplitPaneUI extends SplitPaneUI /** * This is a deprecated class. It is supposed to be used for handler up and * left key presses. + * + * @specnote Apparently this class was intended to be protected, + * but was made public by a compiler bug and is now + * public for compatibility. */ public class KeyboardUpLeftHandler implements ActionListener { @@ -765,6 +797,10 @@ public class BasicSplitPaneUI extends SplitPaneUI /** * This helper class handles PropertyChangeEvents from the JSplitPane. When * a property changes, this will update the UI accordingly. + * + * @specnote Apparently this class was intended to be protected, + * but was made public by a compiler bug and is now + * public for compatibility. */ public class PropertyHandler implements PropertyChangeListener { diff --git a/javax/swing/plaf/basic/BasicTabbedPaneUI.java b/javax/swing/plaf/basic/BasicTabbedPaneUI.java index aca704987..9ea653e7f 100644 --- a/javax/swing/plaf/basic/BasicTabbedPaneUI.java +++ b/javax/swing/plaf/basic/BasicTabbedPaneUI.java @@ -83,6 +83,10 @@ public class BasicTabbedPaneUI extends TabbedPaneUI implements SwingConstants { /** * A helper class that handles focus. + * + * @specnote Apparently this class was intended to be protected, + * but was made public by a compiler bug and is now + * public for compatibility. */ public class FocusHandler extends FocusAdapter { @@ -111,6 +115,10 @@ public class BasicTabbedPaneUI extends TabbedPaneUI implements SwingConstants * A helper class for determining if mouse presses occur inside tabs and * sets the index appropriately. In SCROLL_TAB_MODE, this class also * handles the mouse clicks on the scrolling buttons. + * + * @specnote Apparently this class was intended to be protected, + * but was made public by a compiler bug and is now + * public for compatibility. */ public class MouseHandler extends MouseAdapter { @@ -173,6 +181,10 @@ public class BasicTabbedPaneUI extends TabbedPaneUI implements SwingConstants /** * This class handles PropertyChangeEvents fired from the JTabbedPane. + * + * @specnote Apparently this class was intended to be protected, + * but was made public by a compiler bug and is now + * public for compatibility. */ public class PropertyChangeHandler implements PropertyChangeListener { @@ -205,8 +217,12 @@ public class BasicTabbedPaneUI extends TabbedPaneUI implements SwingConstants * A LayoutManager responsible for placing all the tabs and the visible * component inside the JTabbedPane. This class is only used for * WRAP_TAB_LAYOUT. + * + * @specnote Apparently this class was intended to be protected, + * but was made public by a compiler bug and is now + * public for compatibility. */ - protected class TabbedPaneLayout implements LayoutManager + public class TabbedPaneLayout implements LayoutManager { /** * This method is called when a component is added to the JTabbedPane. @@ -1101,6 +1117,10 @@ public class BasicTabbedPaneUI extends TabbedPaneUI implements SwingConstants /** * This class handles ChangeEvents from the JTabbedPane. + * + * @specnote Apparently this class was intended to be protected, + * but was made public by a compiler bug and is now + * public for compatibility. */ public class TabSelectionHandler implements ChangeListener { diff --git a/javax/swing/plaf/basic/BasicTableUI.java b/javax/swing/plaf/basic/BasicTableUI.java index 9be6d60e9..93483804c 100644 --- a/javax/swing/plaf/basic/BasicTableUI.java +++ b/javax/swing/plaf/basic/BasicTableUI.java @@ -209,12 +209,22 @@ public class BasicTableUI protected void uninstallDefaults() { - table.setFont(null); - table.setGridColor(null); - table.setForeground(null); - table.setBackground(null); - table.setSelectionForeground(null); - table.setSelectionBackground(null); + // TODO: this method used to do the following which is not + // quite right (at least it breaks apps that run fine with the + // JDK): + // + // table.setFont(null); + // table.setGridColor(null); + // table.setForeground(null); + // table.setBackground(null); + // table.setSelectionForeground(null); + // table.setSelectionBackground(null); + // + // This would leave the component in a corrupt state, which is + // not acceptable. A possible solution would be to have component + // level defaults installed, that get overridden by the UI defaults + // and get restored in this method. I am not quite sure about this + // though. / Roman Kennke } protected void uninstallKeyboardActions() diff --git a/javax/swing/plaf/basic/BasicTextUI.java b/javax/swing/plaf/basic/BasicTextUI.java index 7033a0a03..1bb0fe4b2 100644 --- a/javax/swing/plaf/basic/BasicTextUI.java +++ b/javax/swing/plaf/basic/BasicTextUI.java @@ -59,6 +59,7 @@ import javax.swing.UIDefaults; import javax.swing.UIManager; import javax.swing.event.DocumentEvent; import javax.swing.event.DocumentListener; +import javax.swing.plaf.ActionMapUIResource; import javax.swing.plaf.TextUI; import javax.swing.plaf.UIResource; import javax.swing.text.BadLocationException; @@ -416,7 +417,7 @@ public abstract class BasicTextUI extends TextUI ActionMap createActionMap() { Action[] actions = textComponent.getActions(); - ActionMap am = new ActionMap(); + ActionMap am = new ActionMapUIResource(); for (int i = 0; i < actions.length; ++i) { String name = (String) actions[i].getValue(Action.NAME); diff --git a/javax/swing/plaf/metal/MetalSplitPaneUI.java b/javax/swing/plaf/metal/MetalSplitPaneUI.java index 5c2e141b1..eda17f508 100644 --- a/javax/swing/plaf/metal/MetalSplitPaneUI.java +++ b/javax/swing/plaf/metal/MetalSplitPaneUI.java @@ -38,6 +38,8 @@ exception statement from your version. */ package javax.swing.plaf.metal; +import java.util.HashMap; + import javax.swing.JComponent; import javax.swing.plaf.ComponentUI; import javax.swing.plaf.basic.BasicSplitPaneUI; @@ -46,9 +48,8 @@ public class MetalSplitPaneUI extends BasicSplitPaneUI { - // FIXME: maybe replace by a Map of instances when this becomes stateful - /** The shared UI instance for MetalSplitPaneUIs */ - private static MetalSplitPaneUI instance = null; + /** The UI instances for MetalSplitPaneUIs */ + private static HashMap instances; /** * Constructs a new instance of MetalSplitPaneUI. @@ -67,8 +68,19 @@ public class MetalSplitPaneUI */ public static ComponentUI createUI(JComponent component) { - if (instance == null) - instance = new MetalSplitPaneUI(); + if (instances == null) + instances = new HashMap(); + + Object o = instances.get(component); + MetalSplitPaneUI instance; + if (o == null) + { + instance = new MetalSplitPaneUI(); + instances.put(component, instance); + } + else + instance = (MetalSplitPaneUI) o; + return instance; } } -- cgit v1.2.1