gcc/libjava/javax/swing/plaf/basic/BasicSplitPaneDivider.java
Graydon Hoare c5d2de6b4c [multiple changes]
2004-05-25  David Jee  <djee@redhat.com>

	* java/awt/Container.java
	(remove): Set component's parent to null only after we removed the
	component from its parent's layout manager.

2004-05-25  David Jee  <djee@redhat.com>

	* gnu/java/awt/peer/gtk/GtkComponentPeer.java
	(GtkComponentPeer): Set bounds regardless of whether awtComponent
	is valid.
	* gnu/java/awt/peer/gtk/GtkListPeer.java
	(getSize): Change native method declaration.
	(minimumSize): Pass visible row count into getSize().
	(preferredSize): Likewise.
	* jni/gtk-peer/gnu_java_awt_peer_gtk_GtkListPeer.c
	(Java_gnu_java_awt_peer_gtk_GtkListPeer_getSize): Use scroll window's
	natural size. Use visible row count to determine the final height
	value to return.

2004-05-21  Graydon Hoare  <graydon@redhat.com>

	* gnu/java/awt/peer/gtk/GdkGraphics2D.java
	(setClip): Minor correction to order of operations.

	* javax/swing/JScrollPane.java: Extend sketchy implementation.
	* javax/swing/ScrollPaneLayout.java: Likewise.
	* javax/swing/JViewPort.java: Likewise.
	* javax/swing/ViewportLayout.java: Likewise.

	* javax/swing/JComponent.java: Rewrite.
	* javax/swing/RepaintManager.java: Likewise.

	* javax/swing/JLayeredPane.java: Change validate() to revalidate().
	* javax/swing/JList.java
	(setSelectedIndices):
	(getSelectedIndices):
	(getSelectedValues): New functions.
	(getPreferredScrollableViewportSize): Return preferred size.
	(getScrollableUnitIncrement):
	(getScrollableBlockIncrement): Initial implementations.
	* javax/swing/JRootPane.java: Clean up slightly.
	(getUI):
	(setUI):
	(updateUI):
	(getUIClassID):
	(isValidateRoot): Add overrides from JComponent.
	* javax/swing/JScrollBar.java: Set default orientation to VERTICAL.
	* javax/swing/UIManager.java (getDimension): Return the dimension.

	* javax/swing/plaf/basic/BasicButtonUI.java: Set component opaque.
	* javax/swing/plaf/basic/BasicLabelUI.java: Likewise.
	* javax/swing/plaf/basic/BasicMenuItemUI.java: Likewise.
	* javax/swing/plaf/basic/BasicProgressBarUI.java: Likewise.
	* javax/swing/plaf/basic/BasicSeparatorUI.java: Likewise.
	* javax/swing/plaf/basic/BasicSliderUI.java: Likewise.
	* javax/swing/plaf/basic/BasicTabbedPaneUI.java: Likewise.
	* javax/swing/plaf/basic/BasicRootPaneUI.java:
	Likewise, and set background.
	* javax/swing/plaf/basic/BasicListUI.java:
	Likewise, and improve a bit.
	* javax/swing/plaf/basic/BasicScrollBarUI.java:
	Likewise, and adjust calculations.
	* javax/swing/plaf/basic/BasicViewportUI.java:
	Likewise, and improve a bit.
	* javax/swing/plaf/basic/BasicLookAndFeel.java
	(Button.margin): Shrink.

	* jni/gtk-peer/gnu_java_awt_peer_gtk_GdkGlyphVector.c:
	Hack to set horizontal always, workaround pango.

	* jni/gtk-peer/gtkcairopeer.h: Change to match pattern API.
	* jni/gtk-peer/gnu_java_awt_peer_gtk_GdkGraphics2D.c:
	Synchronize more often, check cairo status after ops,
	handle changes to cairo pattern API, check for disposal.

2004-05-21  Olga Rodimina  <rodimina@redhat.com>

	* javax/swing/plaf/basic/BasicMenuItemUI.java:
	(BasicMenuItemUI): Create propertyChangeListener.
	(getPath):Implemented.
	(installListeners): Add propertyChangeListener to menuItem.
	(uninstallListeners): Remove propertyChangeListener from menuItem.
	(update): Implemented.
	* javax/swing/plaf/basic/BasicMenuUI.MouseInputHandler:
	(mouseEntered): Take insets of popup menu into account when
	calculating position of popup menu.

2004-05-18  Olga Rodimina  <rodimina@redhat.com>

	* Makefile.am: Added new file.
	* Makefile.in: Regenerate.
	* javax/swing/JMenuBar.java:
	Started implementation.
	* javax/swing/JPopupMenu.java:
	(setVisible): Fixed location of lightweight/mediumweight
	popup menu.
	(show): Fixed location of PopupMenu.
	* javax/swing/plaf/basic/BasicMenuBarUI.java:
	New file. UI Delegate for JMenuBar.
	* javax/swing/plaf/basic/BasicMenuUI.MouseInputHandler:
	(mouseEntered): Corrected position of the submenu.

2004-05-18  Thomas Fitzsimmons  <fitzsim@redhat.com>

	* jni/gtk-peer/gnu_java_awt_peer_gtk_GtkMenuPeer.c: Remove calls
	to _gtk_accel_group_attach.
	* jni/gtk-peer/gnu_java_awt_peer_gtk_GtkPopupMenuPeer.c:
	Likewise.

	* gnu/java/awt/peer/gtk/GtkButtonPeer.java: Give gtkSetFont
	package access.  Don't override setFont.
	* gnu/java/awt/peer/gtk/GtkCheckboxPeer.java: Likewise.
	* gnu/java/awt/peer/gtk/GtkComponentPeer.java: Give
	gtkWidgetRequestFocus package access.
	* gnu/java/awt/peer/gtk/GtkLabelPeer.java: Don't override
	setFont.
	* gnu/java/awt/peer/gtk/GtkListPeer.java: Override gtkSetFont.
	Give gtkWidgetRequestFocus package access.
	* gnu/java/awt/peer/gtk/GtkTextAreaPeer.java: Give
	gtkWidgetRequestFocus package access.  Don't override setFont.
	* gnu/java/awt/peer/gtk/GtkTextFieldPeer.java: Don't override
	setFont.
	* jni/gtk-peer/gnu_java_awt_peer_gtk_GtkButtonPeer.c
	(gtkSetLabel): Move call to gtk_bin_get_child into GDK critical
	region.
	(gtkSetFont): Likewise.
	* jni/gtk-peer/gnu_java_awt_peer_gtk_GtkListPeer.c (gtkSetFont):
	Implement.
	* jni/gtk-peer/gnu_java_awt_peer_gtk_GtkTextAreaPeer.c
	(gtkSetFont): Whitespace fix.

	* jni/gtk-peer/gnu_java_awt_peer_gtk_GtkComponentPeer.c
	(gtkWidgetSetUsize): Remove method.

2004-05-18  David Jee  <djee@redhat.com>

	* java/awt/image/MemoryImageSource.java
	(newPixels(int,int,int,int,boolean)): Set only the specified
	rectangle of pixels.
	(newPixels(byte[],ColorModel,int,int)): Implement.
	(newPixels(int[],ColorModel,int,int)): Implement.

2004-05-18  Olga Rodimina  <rodimina@redhat.com>

	* Makefile.am: Added new file.
	* Makefile.in: Regenerate.
	* javax/swing/JMenu.java: Started
	implementation.
	* javax/swing/JPopupMenu.java:
	(insert): If specified index is -1, then
	add component at the end.
	(isPopupTrigger): Reimplemented.
	(JPopupMenu.LightWeightPopup): setBounds
	of the lightWeightPopup before adding it
	to the layeredPane.
	(javax/swing/plaf/basic/BasicIconFactory.java):
	(getMenuArrowIcon): Implemented.
	* javax/swing/plaf/basic/BasicMenuItemUI.java:
	(getPreferredSize): Add size of the arrow icon
	if this menu item is instance of JMenu.
	(paintMenuItem): Paint arrow icon if this
	menu item is a submenu.
	* javax/swing/plaf/basic/BasicMenuUI.java:
	New File. UI Delegate for JMenu.

2004-05-17  Thomas Fitzsimmons  <fitzsim@redhat.com>

	* gnu/java/awt/peer/gtk/GtkComponentPeer.java (postKeyEvent):
	Post KEY_TYPED events.
	* jni/gtk-peer/gnu_java_awt_peer_gtk_GtkEvents.c
	(generates_key_typed_event): Remove function.

2004-05-17  Olga Rodimina  <rodimina@redhat.com>

	* javax/swing/JRootPane.java
	(JRootPane.RootLayout): Reimplemented to
	set bounds of contentPane and menuBar.
	(setJMenuBar): Add menu bar to the layered pane.
	(createLayeredPane): Set layout of layeredPane
	to null.
	* javax/swing/JLayeredPane.java:
	(addImpl): Calculate index of the component in the
	layeredPane according to the specified position within
	the layer.

2004-05-17  David Jee  <djee@redhat.com>

	* gnu/java/awt/peer/gtk/GtkImagePainter.java
	(setPixels): Change color model to the default model after
	converting pixels.
	* java/awt/image/MemoryImageSource.java
	(newPixels): Set only the specified rectangle of pixels.

2004-05-13  Thomas Fitzsimmons  <fitzsim@redhat.com>

	* libgcj.spec.in (lib): Add -l-java-awt -l-java-applet
	-l-java-beans -l-javax-accessibility -l-javax-swing.

	* java/awt/AWTEvent.java (toString): Print source's name rather
	than the source itself.

2004-05-12  Thomas Fitzsimmons  <fitzsim@redhat.com>

	* gnu/java/awt/peer/gtk/GtkToolkit.java (loadSystemColors): Make
	native.
	* jni/gtk-peer/gnu_java_awt_peer_gtk_GtkToolkit.c
	(gdk_color_to_java_color): New function.
	* jni/gtk-peer/gtkpeer.h: Add SystemColor defines.

2004-05-12  David Jee  <djee@redhat.com>

	* java/awt/image/RGBImageFilter.java:
	Initialize origmodel as null.
	(makeColor): Fix pixel component order.
	(filterRGBPixels): Fix pixel iteration.
	(setPixels): Add extra checks for index color model. Convert pixels
	to default color model if necessary.
	(convertColorModelToDefault): New override method for byte pixels.
	(convertColorModelToDefault): For int pixels, fix pixel iteration.
	(makeColorbyDefaultCM): New override method for byte pixels.
	(makeColorbyDefaultCM): For int pixel, add color model as argument.
	(makeColor): Fix pixel component order.

2004-05-11  Kim Ho  <kho@redhat.com>

	* javax/swing/Box.java:
	Comment out more parts of Box.Filler.

2004-05-11  Kim Ho  <kho@redhat.com>

	* javax/swing/Box.java:
	Remove reference to AccessibleAWTComponent so
	it compiles again.

2004-05-10  Thomas Fitzsimmons  <fitzsim@redhat.com>

	* gnu/java/awt/peer/gtk/GtkListPeer.java,
	jni/gtk-peer/gnu_java_awt_peer_gtk_GtkListPeer.c: Update
	implementation of list peer to use GtkTreeView instead of
	deprecated GtkCList.

2004-05-07  Thomas Fitzsimmons  <fitzsim@redhat.com>

	* gnu/java/awt/peer/gtk/GtkComponentPeer.java
	(gtkWidgetDispatchKeyEvent): Remove keyChar parameter.
	(handleEvent): Remove keyChar argument to
	gtkWidgetDispatchKeyEvent calls.
	* jni/gtk-peer/gnu_java_awt_peer_gtk_GtkComponentPeer.c: Fix
	compiler warnings.
	* jni/gtk-peer/gnu_java_awt_peer_gtk_GtkEvents.c: Likewise.
	* jni/gtk-peer/gnu_java_awt_peer_gtk_GtkMenuPeer.c: Likewise.
	* jni/gtk-peer/gnu_java_awt_peer_gtk_GtkTextComponentPeer.c:
	Likewise.

2004-05-06  Thomas Fitzsimmons  <fitzsim@redhat.com>

	* gnu/java/awt/peer/gtk/GtkComponentPeer.java
	(gtkWidgetRequestFocus): Mark protected.
	(GtkComponentPeer): Only set the peer's bounds if its component
	is valid.
	* java/awt/Component.java (static): Set the default keyboard
	focus manager.
	(requestFocus(), requestFocus(boolean), requestFocusInWindow(),
	requestFocusInWindow(temporary)): Don't request focus if the
	component is not showing.  Get tree lock before traversing
	component hierarchy.
	* java/awt/DefaultKeyboardFocusManager.java (dispatchEvent):
	Only set the global focus owner if it is not a Window.
	(processKeyEvent): Consume keystrokes associated with the focus
	traversal keystroke.
	(focusPreviousComponent, focusNextComponent, upFocusCycle,
	downFocusCycle): Call requestFocusInWindow instead of
	requestFocus.
	* java/awt/EventDispatchThread.java (run): Move setting of
	default keyboard focus manager to Component.java.
	* jni/gtk-peer/gnu_java_awt_peer_gtk_GtkComponentPeer.c
	(awt_keycode_to_keysym): New function.
	(gtkWidgetDispatchKeyEvent): Finish implementation.
	* jni/gtk-peer/gnu_java_awt_peer_gtk_GtkEvents.c
	(pre_event_handler): Add FIXME comment.

	* gnu/java/awt/peer/gtk/GtkTextAreaPeer.java,
	jni/gtk-peer/gnu_java_awt_peer_gtk_GtkTextAreaPeer.c
	(gtkWidgetRequestFocus): New method.
	* java/awt/TextArea.java (TextArea): Set focus traversal keys to
	disable Tab and Shift-Tab keystrokes.
	(addNotify, appendText, insertText, replaceText): Simplify peer
	retrieval code.
	* jni/gtk-peer/gnu_java_awt_peer_gtk_GtkTextComponentPeer.c
	(connectSignals): Remove connections to "commit" signals.
	Remove C++-style comments.

	* gnu/java/awt/peer/gtk/GtkButtonPeer.java,
	jni/gtk-peer/gnu_java_awt_peer_gtk_GtkButtonPeer.c
	(handleEvent): Activate GTK button when the space bar key is
	pressed.
	(gtkActivate): New method.

2004-05-06  David Jee  <djee@redhat.com>

	* java/awt/image/CropImageFilter.java
	(setPixels): Implement for byte array pixels.
	* java/awt/image/ReplicateScaleFilter.java
	(setPixels): Implement for byte array pixels.
	(replicatePixels): Overload for byte array pixels.

2004-05-06  Kim Ho  <kho@redhat.com>

	* javax/swing/Box.java:
	(getAccessibleContext): Return an instance of the
	correct class.

2004-05-05  David Jee  <djee@redhat.com>

	* gnu/java/awt/peer/gtk/GdkGraphics.java
	(drawImage): When component is null, use SystemColor.window as
	the default bgcolor.
	* gnu/java/awt/peer/gtk/GtkImage.java
	(setPixels): We can avoid iterating through the pixel rows only
	when height is 1.
	* java/awt/Image.java
	(getScaledInstance): Partially implement.
	* java/awt/image/CropImageFilter.java
	(setProperties): Fix "filter" property.
	(setPixels): Implement.
	* java/awt/image/ReplicateScaleFilter.java
	(setDimensions): Use scaled dimensions.
	(setPixels): Implement.
	(replicatePixels): New method.

2004-05-05  David Jee  <djee@redhat.com>

	* gnu/java/awt/peer/gtk/GtkImagePainter.java
	(convertPixels): If either pixels or model is null, return null.
	* jni/gtk-peer/gnu_java_awt_peer_gtk_GtkImagePainter.c
	(Java_gnu_java_awt_peer_gtk_GtkImagePainter_drawPixels): If jpixels
	is null, do nothing and return.

2004-05-03  Kim Ho  <kho@redhat.com>

	* gnu/java/awt/peer/gtk/GtkDialogPeer.java:
	(getGraphics): Like GtkFramePeer, the Graphics
	object needs to be translate to account for
	window decorations.
	(postMouseEvent): New method. Account for
	translation.
	(postExposeEvent): ditto.
	* javax/swing/Box.java: Stubbed.
	* javax/swing/JDialog.java: Ran through jalopy
	to fix indentation.
	(JDialog): Call SwingUtilities' getOwnerFrame
	for null owners.
	(setLayout): Check isRootPaneCheckingEnabled
	* javax/swing/JOptionPane.java: Re-implemented.
	* javax/swing/SwingUtilities.java:
	(getOwnerFrame): Static method to grab a default
	owner frame for Dialogs that don't specify owners.
	* javax/swing/event/SwingPropertyChangeSupport.java:
	(firePropertyChange): Fix early exit condition.
	* javax/swing/plaf/basic/BasicLabelUI.java:
	(paint): Avoid painting text if it is null
	or empty.
	* javax/swing/plaf/basic/BasicOptionPaneUI.java:
	Implement.

2004-05-03  Olga Rodimina  <rodimina@redhat.com>

	* Makefile.am: Added new file.
	* Makefile.in: Regenerate.
	* javax/swing/JPopupMenu.java:
	Started implementation.
	* javax/swing/JWindow.java
	(JWindow): call super() if parent for window
	is not specified.
	* javax/swing/plaf/basic/BasicPopupMenuUI.java:
	New File. UI Delegate for JPopupMenu.

2004-04-30  Olga Rodimina  <rodimina@redhat.com>

	* javax/swing/JApplet.java: Indicated that JApplet
	implements RootPaneContainer and made method of this
	interface public.
	* javax/swing/JFrame.java: Ditto.
	* javax/swing/JWindow.java: Ditto.

2004-04-29  Thomas Fitzsimmons  <fitzsim@redhat.com>

	* jni/gtk-peer/gnu_java_awt_peer_gtk_GtkWindowPeer.c
	(nativeSetBounds): Call gdk_window_move in addition to
	gtk_window_move.

	* java/applet/Applet.java (preferredSize): Call parent's
	preferredSize if the applet stub is null.
	(minimumSize): Likewise for parent's minimumSize.

2004-04-27  Olga Rodimina  <rodimina@redhat.com>

	* javax/swing/JMenuItem.java
	(createActionPropertyChangeListener): Implemented.
	(processMouseEvent): Ditto.
	(fireMenuDragMouseEntered): Ditto.
	(fireMenuDragMouseExited): Ditto.
	(fireMenuDragMouseDragged): Ditto.
	(fireMenuDragMouseReleased): Ditto.
	(menuSelectionChanged): Ditto.
	(getSubElements): Ditto.
	(getComponent): Ditto.
	(addMenuDragMouseListener): Ditto.
	(removeMenuDragMouseListener):Ditto.
	(addMenuKeyListener): Ditto.
	(removeMenuKeyListener): Ditto.
	* javax/swing/plaf/basic/BasicMenuItemUI.java
	(doClick): Imlemented.
	* javax/swing/plaf/basic/BasicMenuItemUI.MouseInputHandler:
	Don't handle mouse events here. Pass them to
	MenuSelectionManager.

2004-04-26  Olga Rodimina  <rodimina@redhat.com>
	Used correct version of jalopy configuration
	file to fix style in the files below.

2004-04-26  Olga Rodimina  <rodimina@redhat.com>

	* javax/swing/JCheckBoxMenuItem.java:
	Fixed style and removed unnecessary comments.
	* javax/swing/JMenuItem.java: Ditto.
	* javax/swing/JRadioButtonMenuItem.java: Ditto.
	* javax/swing/plaf/basic/BasicCheckBoxMenuItemUI.java: Ditto.
	* javax/swing/plaf/basic/BasicMenuItemUI.java: Ditto.
	* javax/swing/plaf/basic/BasicRadioButtonMenuItemUI.java: Ditto.

2004-04-23  Thomas Fitzsimmons  <fitzsim@redhat.com>

	* gnu_java_awt_peer_gtk_GtkWindowPeer.c: Change FIXME comment to
	C-style.

	* gnu_java_awt_peer_gtk_GtkWindowPeer.c: Add FIXME comment.

	* java/awt/ContainerOrderFocusTraversalPolicy.java
	(getComponentAfter): Start from current component and work up
	the component hierarchy until an acceptable component is found.
	Synchronize on tree lock.
	(getComponentBefore): Likewise.

2004-04-22  Thomas Fitzsimmons  <fitzsim@redhat.com>

	* gnu/java/awt/peer/gtk/GtkComponentPeer.java: Remove
	focus-related debugging messages.
	* java/awt/DefaultKeyboardFocusManager.java: Likewise.
	* java/awt/EventDispatchThread.java: Likewise.
	* java/awt/KeyboardFocusManager.java: Likewise.
	* java/awt/Window.java: Likewise.
	* jni/gtk-peer/gnu_java_awt_peer_gtk_GtkComponentPeer.c: Likewise.
	* jni/gtk-peer/gnu_java_awt_peer_gtk_GtkEvents.c: Likewise.

	* jni/gtk-peer/gnu_java_awt_peer_gtk_GtkComponentPeer.c: Change
	new C++-style comments to C-style comments.
	* jni/gtk-peer/gnu_java_awt_peer_gtk_GtkEvents.c: Likewise.

	* gnu/java/awt/peer/gtk/GtkComponentPeer.java,
	jni/gtk-peer/gnu_java_awt_peer_gtk_GtkComponentPeer.c
	(handleEvent): Dispatch key press and key release events to
	backing widget.
	(requestFocus): Post a FOCUS_GAINED event to the event queue.
	(gtkWidgetRequestFocus): New method.
	(gtkWidgetDispatchKeyEvent): Likewise.
	* java/awt/Component.java (requestFocus, requestFocus(boolean),
	requestFocusInWindow, requestFocusInWindow(boolean),
	getFocusCycleRootAncestor, nextFocus, transferFocus,
	transferFocusBackward, transferFocusUpCycle, hasFocus,
	isFocusOwner): Implement and document focus-handling methods.
	(setFocusTraversalKeys): Inherit focus traversal keys when
	keystrokes argument is null.  Fix focus-handling documentation
	throughout class.
	* java/awt/Container.java (setFocusTraversalKeys,
	getFocusTraversalKeys, areFocusTraversalKeysSet,
	isFocusCycleRoot, setFocusTraversalPolicy,
	getFocusTraversalPolicy, isFocusTraversalPolicySet,
	setFocusCycleRoot, isFocusCycleRoot, transferFocusDownCycle):
	Implement and document focus-handling methods.
	(transferFocusBackward): Remove method.
	(readObject, writeObject): Implement and document serialization
	methods.
	* java/awt/ContainerOrderFocusTraversalPolicy.java: Implement
	and document.
	* java/awt/DefaultFocusTraversalPolicy.java: Implement and
	document.
	* java/awt/DefaultKeyboardFocusManager.java: Implement and
	partially document.
	* java/awt/EventDispatchThread.java (run): Set default keyboard
	focus manager.  Attempt to dispatch each event to the keyboard
	focus manager before normal dispatch.
	* java/awt/KeyboardFocusManager.java: Implement and partially
	document.
	* java/awt/Window.java (Window): Set focusCycleRoot to true.
	(show): Focus initial component when window is shown for the
	first time.
	* jni/gtk-peer/gnu_java_awt_peer_gtk_GtkEvents.c
	(pre_event_handler): Replace complex key press and key release
	logic with simple callbacks into GtkComponentPeer.
	* jni/gtk-peer/gtkpeer.h: Fix FOCUS_GAINED/FOCUS_LOST reversal.

2004-04-21  Olga Rodimina  <rodimina@redhat.com>

	* javax/swing/MenuSelectionManager.java
	(componentForPoint): Added new method.
	(defaultManager): New Method. Implemented.
	(getSelectedPath): Ditto.
	(isComponentPartOfCurrentMenu): Ditto.
	(processKeyEvent): Added new method.
	(processMouseEvent): New Method. Implemented.
	(setSelectedPath): Ditto.
	(getPath): Ditto.

2004-04-19  Kim Ho  <kho@redhat.com>

	* java/awt/Container.java:
	(remove): Set the component's parent to null.
	(getComponentAt): Implement.
	* javax/swing/JComponent.java:
	(JComponent): Initialize defaultLocale
	(getDefaultLocale): Implement.
	(setDefaultLocale): ditto.
	* javax/swing/JSlider.java:
	(JSlider): Fix calculation of value.
	* javax/swing/JSplitPane.java: Implement.
	* javax/swing/plaf/basic/BasicLookAndFeel.java:
	Change SplitPane's default divider size.
	* javax/swing/plaf/basic/BasicScrollBarUI.java:
	(paint): Remove unused code.
	* javax/swing/plaf/basic/BasicSplitPaneDivider.java:
	Added comments and ran through jalopy.
	(setBasicSplitPaneUI): Get reference to hidden divider
	and set up one touch buttons if necessary.
	(setBorder): Fire propertyChangeEvent only if
	borders are different.
	(getPreferredSize): Defer to layout manager.
	(propertyChange): Implement.
	(oneTouchExpandableChanged): ditto.
	(createLeftOneTouchButton): Use BasicArrowButton.
	(createRightOneTouchButton): ditto.
	(moveDividerTo): New method. Moves the divider
	to a set location based on the last divider location.
	(BasicSplitPaneDivider::MouseHandler): Implement.
	(BasicSplitPaneDivider::OneTouchButton): Removed.
	(BasicSplitPaneDivider::DragController): Implement.
	(BasicSplitPaneDivider::VerticalDragController):
	ditto.
	(BasicSplitPaneDivider::DividerLayout): ditto.
	* javax/swing/plaf/basic/BasicSplitPaneUI.java: Reimplement.
	* javax/swing/plaf/basic/BasicTabbedPaneUI.java:
	(calculateLayoutInfo): Don't show component if it's
	null.
	(paintTab): Fix title paint logic.

From-SVN: r82314
2004-05-27 06:17:44 +00:00

883 lines
23 KiB
Java

/* BasicSplitPaneDivider.java
Copyright (C) 2003, 2004 Free Software Foundation, Inc.
This file is part of GNU Classpath.
GNU Classpath is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2, or (at your option)
any later version.
GNU Classpath is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
General Public License for more details.
You should have received a copy of the GNU General Public License
along with GNU Classpath; see the file COPYING. If not, write to the
Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
02111-1307 USA.
Linking this library statically or dynamically with other modules is
making a combined work based on this library. Thus, the terms and
conditions of the GNU General Public License cover the whole
combination.
As a special exception, the copyright holders of this library give you
permission to link this library with independent modules to produce an
executable, regardless of the license terms of these independent
modules, and to copy and distribute the resulting executable under
terms of your choice, provided that you also meet, for each linked
independent module, the terms and conditions of the license of that
module. An independent module is a module which is not derived from
or based on this library. If you modify this library, you may extend
this exception to your version of the library, but you are not
obligated to do so. If you do not wish to do so, delete this
exception statement from your version. */
package javax.swing.plaf.basic;
import java.awt.Color;
import java.awt.Component;
import java.awt.Container;
import java.awt.Dimension;
import java.awt.Graphics;
import java.awt.Insets;
import java.awt.LayoutManager;
import java.awt.event.MouseAdapter;
import java.awt.event.MouseEvent;
import java.awt.event.MouseMotionListener;
import java.beans.PropertyChangeEvent;
import java.beans.PropertyChangeListener;
import javax.swing.JButton;
import javax.swing.JSplitPane;
import javax.swing.SwingConstants;
import javax.swing.border.Border;
/**
* The divider that separates the two parts of a JSplitPane in the Basic look
* and feel.
*
* <p>
* Implementation status: We do not have a real implementation yet. Currently,
* it is mostly a stub to allow compiling other parts of the
* javax.swing.plaf.basic package, although some parts are already
* functional.
* </p>
*
* @author Sascha Brawer (brawer_AT_dandelis.ch)
*/
public class BasicSplitPaneDivider extends Container
implements PropertyChangeListener
{
/**
* Determined using the <code>serialver</code> tool of Apple/Sun JDK 1.3.1
* on MacOS X 10.1.5.
*/
static final long serialVersionUID = 1463404307042803342L;
/**
* The width and height of the little buttons for showing and hiding parts
* of a JSplitPane in a single mouse click.
*/
protected static final int ONE_TOUCH_SIZE = 6;
/** The distance the one touch buttons will sit from the divider's edges. */
protected static final int ONE_TOUCH_OFFSET = 2;
/**
* An object that performs the tasks associated with an ongoing drag
* operation, or <code>null</code> if the user is currently not dragging
* the divider.
*/
protected DragController dragger;
/**
* The delegate object that is responsible for the UI of the
* <code>JSplitPane</code> that contains this divider.
*/
protected BasicSplitPaneUI splitPaneUI;
/** The thickness of the divider in pixels. */
protected int dividerSize;
/** A divider that is used for layout purposes. */
protected Component hiddenDivider;
/** The JSplitPane containing this divider. */
protected JSplitPane splitPane;
/**
* The listener for handling mouse events from both the divider and the
* containing <code>JSplitPane</code>.
*
* <p>
* The reason for also handling MouseEvents from the containing
* <code>JSplitPane</code> is that users should be able to start a drag
* gesture from inside the JSplitPane, but slightly outisde the divider.
* </p>
*/
protected MouseHandler mouseHandler = new MouseHandler();
/**
* The current orientation of the containing <code>JSplitPane</code>, which
* is either {@link javax.swing.JSplitPane#HORIZONTAL_SPLIT} or {@link
* javax.swing.JSplitPane#VERTICAL_SPLIT}.
*/
protected int orientation;
/**
* The button for showing and hiding the left (or top) component of the
* <code>JSplitPane</code>.
*/
protected JButton leftButton;
/**
* The button for showing and hiding the right (or bottom) component of the
* <code>JSplitPane</code>.
*/
protected JButton rightButton;
/**
* The border of this divider. Typically, this will be an instance of {@link
* javax.swing.plaf.basic.BasicBorders.SplitPaneDividerBorder}.
*
* @see #getBorder()
* @see #setBorder(javax.swing.border.Border)
*/
private Border border;
// This is not a pixel count.
// This int should be able to take 3 values.
// left (top), middle, right(bottom)
// 0 1 2
/** Keeps track of where the divider should be placed when using one touch expand
* buttons. */
private transient int currentDividerLocation = 1;
/**
* Constructs a new divider.
*
* @param ui the UI delegate of the enclosing <code>JSplitPane</code>.
*/
public BasicSplitPaneDivider(BasicSplitPaneUI ui)
{
setLayout(new DividerLayout());
setBasicSplitPaneUI(ui);
setDividerSize(splitPane.getDividerSize());
}
/**
* Sets the delegate object that is responsible for the UI of the {@link
* javax.swing.JSplitPane} containing this divider.
*
* @param newUI the UI delegate, or <code>null</code> to release the
* connection to the current delegate.
*/
public void setBasicSplitPaneUI(BasicSplitPaneUI newUI)
{
/* Remove the connection to the existing JSplitPane. */
if (splitPane != null)
{
splitPane.removePropertyChangeListener(this);
splitPane.removeMouseListener(mouseHandler);
splitPane.removeMouseMotionListener(mouseHandler);
removeMouseListener(mouseHandler);
removeMouseMotionListener(mouseHandler);
splitPane = null;
hiddenDivider = null;
}
/* Establish the connection to the new JSplitPane. */
splitPaneUI = newUI;
if (splitPaneUI != null)
splitPane = newUI.getSplitPane();
if (splitPane != null)
{
splitPane.addPropertyChangeListener(this);
splitPane.addMouseListener(mouseHandler);
splitPane.addMouseMotionListener(mouseHandler);
addMouseListener(mouseHandler);
addMouseMotionListener(mouseHandler);
hiddenDivider = splitPaneUI.getNonContinuousLayoutDivider();
orientation = splitPane.getOrientation();
oneTouchExpandableChanged();
}
}
/**
* Returns the delegate object that is responsible for the UI of the {@link
* javax.swing.JSplitPane} containing this divider.
*
* @return The UI for the JSplitPane.
*/
public BasicSplitPaneUI getBasicSplitPaneUI()
{
return splitPaneUI;
}
/**
* Sets the thickness of the divider.
*
* @param newSize the new width or height in pixels.
*/
public void setDividerSize(int newSize)
{
this.dividerSize = newSize;
}
/**
* Retrieves the thickness of the divider.
*
* @return The thickness of the divider.
*/
public int getDividerSize()
{
return dividerSize;
}
/**
* Sets the border of this divider.
*
* @param border the new border. Typically, this will be an instance of
* {@link
* javax.swing.plaf.basic.BasicBorders.SplitPaneDividerBorder}.
*
* @since 1.3
*/
public void setBorder(Border border)
{
if (border != this.border)
{
Border oldValue = this.border;
this.border = border;
firePropertyChange("border", oldValue, border);
}
}
/**
* Retrieves the border of this divider.
*
* @return the current border, or <code>null</code> if no border has been
* set.
*
* @since 1.3
*/
public Border getBorder()
{
return border;
}
/**
* Retrieves the insets of the divider. If a border has been installed on
* the divider, the result of calling its <code>getBorderInsets</code>
* method is returned. Otherwise, the inherited implementation will be
* invoked.
*
* @see javax.swing.border.Border#getBorderInsets(java.awt.Component)
*/
public Insets getInsets()
{
if (border != null)
return border.getBorderInsets(this);
else
return super.getInsets();
}
/**
* Returns the preferred size of this divider, which is
* <code>dividerSize</code> by <code>dividerSize</code> pixels.
*
* @return The preferred size of the divider.
*/
public Dimension getPreferredSize()
{
return getLayout().preferredLayoutSize(this);
}
/**
* Returns the minimal size of this divider, which is
* <code>dividerSize</code> by <code>dividerSize</code> pixels.
*
* @return The minimal size of the divider.
*/
public Dimension getMinimumSize()
{
return getPreferredSize();
}
/**
* Processes events from the <code>JSplitPane</code> that contains this
* divider.
*
* @param e The PropertyChangeEvent.
*/
public void propertyChange(PropertyChangeEvent e)
{
if (e.getPropertyName().equals(JSplitPane.ONE_TOUCH_EXPANDABLE_PROPERTY))
oneTouchExpandableChanged();
else if (e.getPropertyName().equals(JSplitPane.ORIENTATION_PROPERTY))
{
orientation = splitPane.getOrientation();
if (splitPane.isOneTouchExpandable())
{
layout();
repaint();
}
}
else if (e.getPropertyName().equals(JSplitPane.DIVIDER_SIZE_PROPERTY))
dividerSize = splitPane.getDividerSize();
}
/**
* Paints the divider by painting its border.
*
* @param g The Graphics Object to paint with.
*/
public void paint(Graphics g)
{
Dimension dividerSize;
super.paint(g);
if (border != null)
{
dividerSize = getSize();
border.paintBorder(this, g, 0, 0, dividerSize.width, dividerSize.height);
}
}
/**
* Reacts to changes of the <code>oneToughExpandable</code> property of the
* containing <code>JSplitPane</code>.
*/
protected void oneTouchExpandableChanged()
{
if (splitPane.isOneTouchExpandable())
{
leftButton = createLeftOneTouchButton();
rightButton = createRightOneTouchButton();
add(leftButton);
add(rightButton);
leftButton.addMouseListener(mouseHandler);
rightButton.addMouseListener(mouseHandler);
// Set it to 1.
currentDividerLocation = 1;
}
else
{
if (leftButton != null && rightButton != null)
{
leftButton.removeMouseListener(mouseHandler);
rightButton.removeMouseListener(mouseHandler);
remove(leftButton);
remove(rightButton);
leftButton = null;
rightButton = null;
}
}
layout();
repaint();
}
/**
* Creates a button for showing and hiding the left (or top) part of a
* <code>JSplitPane</code>.
*
* @return The left one touch button.
*/
protected JButton createLeftOneTouchButton()
{
int dir = SwingConstants.WEST;
if (orientation == JSplitPane.VERTICAL_SPLIT)
dir = SwingConstants.NORTH;
JButton button = new BasicArrowButton(dir);
button.setBorderPainted(false);
return button;
}
/**
* Creates a button for showing and hiding the right (or bottom) part of a
* <code>JSplitPane</code>.
*
* @return The right one touch button.
*/
protected JButton createRightOneTouchButton()
{
int dir = SwingConstants.EAST;
if (orientation == JSplitPane.VERTICAL_SPLIT)
dir = SwingConstants.SOUTH;
JButton button = new BasicArrowButton(dir);
button.setBorderPainted(false);
return button;
}
/**
* Prepares the divider for dragging by calling the
* <code>startDragging</code> method of the UI delegate of the enclosing
* <code>JSplitPane</code>.
*
* @see BasicSplitPaneUI#startDragging()
*/
protected void prepareForDragging()
{
if (splitPaneUI != null)
splitPaneUI.startDragging();
}
/**
* Drags the divider to a given location by calling the
* <code>dragDividerTo</code> method of the UI delegate of the enclosing
* <code>JSplitPane</code>.
*
* @param location the new location of the divider.
*
* @see BasicSplitPaneUI#dragDividerTo(int location)
*/
protected void dragDividerTo(int location)
{
if (splitPaneUI != null)
splitPaneUI.dragDividerTo(location);
}
/**
* Finishes a dragging gesture by calling the <code>finishDraggingTo</code>
* method of the UI delegate of the enclosing <code>JSplitPane</code>.
*
* @param location the new, final location of the divider.
*
* @see BasicSplitPaneUI#finishDraggingTo(int location)
*/
protected void finishDraggingTo(int location)
{
if (splitPaneUI != null)
splitPaneUI.finishDraggingTo(location);
}
/**
* This helper method moves the divider to one of the
* three locations when using one touch expand buttons.
* Location 0 is the left (or top) most location.
* Location 1 is the middle.
* Location 2 is the right (or bottom) most location.
*
* @param locationIndex The location to move to.
*/
private void moveDividerTo(int locationIndex)
{
Insets insets = splitPane.getInsets();
switch (locationIndex)
{
case 1:
splitPane.setDividerLocation(splitPane.getLastDividerLocation());
break;
case 0:
int top = (orientation == JSplitPane.HORIZONTAL_SPLIT) ? insets.left
: insets.top;
splitPane.setDividerLocation(top);
break;
case 2:
int bottom;
if (orientation == JSplitPane.HORIZONTAL_SPLIT)
bottom = splitPane.getBounds().width - insets.right - dividerSize;
else
bottom = splitPane.getBounds().height - insets.bottom - dividerSize;
splitPane.setDividerLocation(bottom);
break;
}
}
/**
* The listener for handling mouse events from both the divider and the
* containing <code>JSplitPane</code>.
*
* <p>
* The reason for also handling MouseEvents from the containing
* <code>JSplitPane</code> is that users should be able to start a drag
* gesture from inside the JSplitPane, but slightly outisde the divider.
* </p>
*
* @author Sascha Brawer (brawer_AT_dandelis.ch)
*/
protected class MouseHandler extends MouseAdapter
implements MouseMotionListener
{
/** Keeps track of whether a drag is occurring. */
private transient boolean isDragging;
/**
* This method is called when the mouse is pressed.
*
* @param e The MouseEvent.
*/
public void mousePressed(MouseEvent e)
{
if (splitPane.isOneTouchExpandable())
{
if (e.getSource() == leftButton)
{
currentDividerLocation--;
if (currentDividerLocation < 0)
currentDividerLocation = 0;
moveDividerTo(currentDividerLocation);
return;
}
else if (e.getSource() == rightButton)
{
currentDividerLocation++;
if (currentDividerLocation > 2)
currentDividerLocation = 2;
moveDividerTo(currentDividerLocation);
return;
}
}
isDragging = true;
currentDividerLocation = 1;
if (orientation == JSplitPane.HORIZONTAL_SPLIT)
dragger = new DragController(e);
else
dragger = new VerticalDragController(e);
prepareForDragging();
}
/**
* This method is called when the mouse is released.
*
* @param e The MouseEvent.
*/
public void mouseReleased(MouseEvent e)
{
if (isDragging)
dragger.completeDrag(e);
isDragging = false;
}
/**
* Repeatedly invoked when the user is dragging the mouse cursor while
* having pressed a mouse button.
*
* @param e The MouseEvent.
*/
public void mouseDragged(MouseEvent e)
{
if (dragger != null)
dragger.continueDrag(e);
}
/**
* Repeatedly invoked when the user is dragging the mouse cursor without
* having pressed a mouse button.
*
* @param e The MouseEvent.
*/
public void mouseMoved(MouseEvent e)
{
// Do nothing.
}
}
/**
* Performs the tasks associated with an ongoing drag operation.
*
* @author Sascha Brawer (brawer_AT_dandelis.ch)
*/
protected class DragController
{
/** The difference between where the mouse is clicked and the
* initial divider location. */
transient int offset;
/**
* Creates a new DragController object.
*
* @param e The MouseEvent to initialize with.
*/
protected DragController(MouseEvent e)
{
offset = e.getX();
}
/**
* This method returns true if the divider can move.
*
* @return True if dragging is allowed.
*/
protected boolean isValid()
{
// Views can always be resized?
return true;
}
/**
* Returns a position for the divider given the MouseEvent.
*
* @param e MouseEvent.
*
* @return The position for the divider to move to.
*/
protected int positionForMouseEvent(MouseEvent e)
{
return e.getX() + getX() - offset;
;
}
/**
* This method returns one of the two paramters
* for the orientation. In this case, it returns x.
*
* @param x The x coordinate.
* @param y The y coordinate.
*
* @return The x coordinate.
*/
protected int getNeededLocation(int x, int y)
{
return x;
}
/**
* This method is called to pass on the drag information
* to the UI through dragDividerTo.
*
* @param newX The x coordinate of the MouseEvent.
* @param newY The y coordinate of the MouseEvent.
*/
protected void continueDrag(int newX, int newY)
{
if (isValid())
dragDividerTo(adjust(x, y));
}
/**
* This method is called to pass on the drag information
* to the UI through dragDividerTo.
*
* @param e The MouseEvent.
*/
protected void continueDrag(MouseEvent e)
{
if (isValid())
dragDividerTo(positionForMouseEvent(e));
}
/**
* This method is called to finish the drag session
* by calling finishDraggingTo.
*
* @param x The x coordinate of the MouseEvent.
* @param y The y coordinate of the MouseEvent.
*/
protected void completeDrag(int x, int y)
{
finishDraggingTo(adjust(x, y));
}
/**
* This method is called to finish the drag session
* by calling finishDraggingTo.
*
* @param e The MouseEvent.
*/
protected void completeDrag(MouseEvent e)
{
finishDraggingTo(positionForMouseEvent(e));
}
/**
* This is a helper method that includes the offset
* in the needed location.
*
* @param x The x coordinate of the MouseEvent.
* @param y The y coordinate of the MouseEvent.
*
* @return The needed location adjusted by the offsets.
*/
int adjust(int x, int y)
{
return getNeededLocation(x, y) + getX() - offset;
}
}
/**
* This is a helper class that controls dragging when
* the orientation is VERTICAL_SPLIT.
*/
protected class VerticalDragController extends DragController
{
/**
* Creates a new VerticalDragController object.
*
* @param e The MouseEvent to initialize with.
*/
protected VerticalDragController(MouseEvent e)
{
super(e);
offset = e.getY();
}
/**
* This method returns one of the two parameters given
* the orientation. In this case, it returns y.
*
* @param x The x coordinate of the MouseEvent.
* @param y The y coordinate of the MouseEvent.
*
* @return The y coordinate.
*/
protected int getNeededLocation(int x, int y)
{
return y;
}
/**
* This method returns the new location of the divider
* given a MouseEvent.
*
* @param e The MouseEvent.
*
* @return The new location of the divider.
*/
protected int positionForMouseEvent(MouseEvent e)
{
return e.getY() + getY() - offset;
}
/**
* This is a helper method that includes the offset
* in the needed location.
*
* @param x The x coordinate of the MouseEvent.
* @param y The y coordinate of the MouseEvent.
*
* @return The needed location adjusted by the offsets.
*/
int adjust(int x, int y)
{
return getNeededLocation(x, y) + getY() - offset;
}
}
/**
* This helper class acts as the Layout Manager for
* the divider.
*/
protected class DividerLayout implements LayoutManager
{
/**
* Creates a new DividerLayout object.
*/
protected DividerLayout()
{
}
/**
* This method is called when a Component is added.
*
* @param string The constraints string.
* @param c The Component to add.
*/
public void addLayoutComponent(String string, Component c)
{
// Do nothing.
}
/**
* This method is called to lay out the container.
*
* @param c The container to lay out.
*/
public void layoutContainer(Container c)
{
if (splitPane.isOneTouchExpandable())
{
changeButtonOrientation();
positionButtons();
}
}
/**
* This method returns the minimum layout size.
*
* @param c The container to calculate for.
*
* @return The minimum layout size.
*/
public Dimension minimumLayoutSize(Container c)
{
return preferredLayoutSize(c);
}
/**
* This method returns the preferred layout size.
*
* @param c The container to calculate for.
*
* @return The preferred layout size.
*/
public Dimension preferredLayoutSize(Container c)
{
return new Dimension(dividerSize, dividerSize);
}
/**
* This method is called when a component is removed.
*
* @param c The component to remove.
*/
public void removeLayoutComponent(Component c)
{
// Do nothing.
}
/**
* This method changes the button orientation when
* the orientation of the SplitPane changes.
*/
private void changeButtonOrientation()
{
if (orientation == JSplitPane.HORIZONTAL_SPLIT)
{
((BasicArrowButton) rightButton).setDirection(SwingConstants.EAST);
((BasicArrowButton) leftButton).setDirection(SwingConstants.WEST);
}
else
{
((BasicArrowButton) rightButton).setDirection(SwingConstants.SOUTH);
((BasicArrowButton) leftButton).setDirection(SwingConstants.NORTH);
}
}
/**
* This method sizes and positions the buttons.
*/
private void positionButtons()
{
int w = 0;
int h = 0;
if (orientation == JSplitPane.HORIZONTAL_SPLIT)
{
rightButton.setLocation(ONE_TOUCH_OFFSET, ONE_TOUCH_OFFSET);
leftButton.setLocation(ONE_TOUCH_OFFSET,
ONE_TOUCH_OFFSET + 2 * ONE_TOUCH_SIZE);
w = dividerSize - 2 * ONE_TOUCH_OFFSET;
h = 2 * ONE_TOUCH_SIZE;
}
else
{
leftButton.setLocation(ONE_TOUCH_OFFSET, ONE_TOUCH_OFFSET);
rightButton.setLocation(ONE_TOUCH_OFFSET + 2 * ONE_TOUCH_SIZE,
ONE_TOUCH_OFFSET);
h = dividerSize - 2 * ONE_TOUCH_OFFSET;
w = 2 * ONE_TOUCH_SIZE;
}
Dimension dims = new Dimension(w, h);
leftButton.setSize(dims);
rightButton.setSize(dims);
}
}
}