gcc/libjava/javax/swing/plaf/basic/BasicScrollBarUI.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

1395 lines
38 KiB
Java

/* BasicScrollBarUI.java
Copyright (C) 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.Point;
import java.awt.Polygon;
import java.awt.Rectangle;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
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.BoundedRangeModel;
import javax.swing.Icon;
import javax.swing.JButton;
import javax.swing.JComponent;
import javax.swing.JScrollBar;
import javax.swing.SwingConstants;
import javax.swing.SwingUtilities;
import javax.swing.Timer;
import javax.swing.UIDefaults;
import javax.swing.UIManager;
import javax.swing.event.ChangeEvent;
import javax.swing.event.ChangeListener;
import javax.swing.plaf.ComponentUI;
import javax.swing.plaf.ScrollBarUI;
/**
* The Basic Look and Feel UI delegate for JScrollBar.
*/
public class BasicScrollBarUI extends ScrollBarUI implements LayoutManager,
SwingConstants
{
/**
* A helper class that listens to the two JButtons on each end
* of the JScrollBar.
*/
protected class ArrowButtonListener extends MouseAdapter
{
/**
* Move the thumb in the direction specified by the
* button's arrow. If this button is held down, then
* it should keep moving the thumb.
*
* @param e The MouseEvent fired by the JButton.
*/
public void mousePressed(MouseEvent e)
{
scrollTimer.stop();
scrollListener.setScrollByBlock(false);
if (e.getSource() == incrButton)
scrollListener.setDirection(POSITIVE_SCROLL);
else
scrollListener.setDirection(NEGATIVE_SCROLL);
scrollTimer.start();
}
/**
* Stops the thumb when the JButton is released.
*
* @param e The MouseEvent fired by the JButton.
*/
public void mouseReleased(MouseEvent e)
{
scrollTimer.stop();
}
}
/**
* A helper class that listens to the ScrollBar's model
* for ChangeEvents.
*/
protected class ModelListener implements ChangeListener
{
/**
* Called when the model changes.
*
* @param e The ChangeEvent fired by the model.
*/
public void stateChanged(ChangeEvent e)
{
// System.err.println(this + ".stateChanged()");
calculatePreferredSize();
layoutContainer(scrollbar);
getThumbBounds();
scrollbar.repaint();
}
}
/**
* A helper class that listens to the ScrollBar's properties.
*/
public class PropertyChangeHandler implements PropertyChangeListener
{
/**
* Called when one of the ScrollBar's properties change.
*
* @param e The PropertyChangeEvent fired by the ScrollBar.
*/
public void propertyChange(PropertyChangeEvent e)
{
if (e.getPropertyName().equals(JScrollBar.MODEL_CHANGED_PROPERTY))
{
((BoundedRangeModel) e.getOldValue()).removeChangeListener(modelListener);
scrollbar.getModel().addChangeListener(modelListener);
getThumbBounds();
}
else if (e.getPropertyName().equals(JScrollBar.ORIENTATION_CHANGED_PROPERTY))
{
incrButton.removeMouseListener(buttonListener);
decrButton.removeMouseListener(buttonListener);
incrButton = createIncreaseButton(scrollbar.getOrientation());
decrButton = createDecreaseButton(scrollbar.getOrientation());
incrButton.addMouseListener(buttonListener);
decrButton.addMouseListener(buttonListener);
calculatePreferredSize();
layoutContainer(scrollbar);
}
layoutContainer(scrollbar);
scrollbar.repaint();
}
}
/**
* A helper class that listens for events from
* the timer that is used to move the thumb.
*/
protected class ScrollListener implements ActionListener
{
/** The direction the thumb moves in. */
private transient int direction;
/** Whether movement will be in blocks. */
private transient boolean block;
/**
* Creates a new ScrollListener object.
* The default is scrolling positively with block movement.
*/
public ScrollListener()
{
direction = POSITIVE_SCROLL;
block = true;
}
/**
* Creates a new ScrollListener object using
* the given direction and block.
*
* @param dir The direction to move in.
* @param block Whether movement will be in blocks.
*/
public ScrollListener(int dir, boolean block)
{
direction = dir;
this.block = block;
}
/**
* Sets the direction to scroll in.
*
* @param direction The direction to scroll in.
*/
public void setDirection(int direction)
{
this.direction = direction;
}
/**
* Sets whether scrolling will be done in blocks.
*
* @param block Whether scrolling will be in blocks.
*/
public void setScrollByBlock(boolean block)
{
this.block = block;
}
/**
* Called every time the timer reaches its interval.
*
* @param e The ActionEvent fired by the timer.
*/
public void actionPerformed(ActionEvent e)
{
if (block)
{
// Only need to check it if it's block scrolling
// We only block scroll if the click occurs
// in the track.
if (!trackListener.shouldScroll(direction))
{
trackHighlight = NO_HIGHLIGHT;
scrollbar.repaint();
return;
}
scrollByBlock(direction);
}
else
scrollByUnit(direction);
}
}
/**
* Helper class that listens for movement on the track.
*/
protected class TrackListener extends MouseAdapter
implements MouseMotionListener
{
/** The current X coordinate of the mouse. */
protected int currentMouseX;
/** The current Y coordinate of the mouse. */
protected int currentMouseY;
/** The offset between the current mouse cursor and the
current value of the scrollbar. */
protected int offset;
/**
* This method is called when the mouse is being
* dragged.
*
* @param e The MouseEvent given.
*/
public void mouseDragged(MouseEvent e)
{
currentMouseX = e.getX();
currentMouseY = e.getY();
if (scrollbar.getValueIsAdjusting())
{
int value;
if (scrollbar.getOrientation() == SwingConstants.HORIZONTAL)
value = valueForXPosition(currentMouseX) - offset;
else
value = valueForYPosition(currentMouseY) - offset;
scrollbar.setValue(value);
}
}
/**
* This method is called when the mouse is moved.
*
* @param e The MouseEvent given.
*/
public void mouseMoved(MouseEvent e)
{
// Not interested in where the mouse
// is unless it is being dragged.
}
/**
* This method is called when the mouse is
* pressed. When it is pressed, the thumb should
* move in blocks towards the cursor.
*
* @param e The MouseEvent given.
*/
public void mousePressed(MouseEvent e)
{
currentMouseX = e.getX();
currentMouseY = e.getY();
int value;
if (scrollbar.getOrientation() == SwingConstants.HORIZONTAL)
value = valueForXPosition(currentMouseX);
else
value = valueForYPosition(currentMouseY);
if (value == scrollbar.getValue())
return;
if (!thumbRect.contains(e.getPoint()))
{
scrollTimer.stop();
scrollListener.setScrollByBlock(true);
if (value > scrollbar.getValue())
{
trackHighlight = INCREASE_HIGHLIGHT;
scrollListener.setDirection(POSITIVE_SCROLL);
}
else
{
trackHighlight = DECREASE_HIGHLIGHT;
scrollListener.setDirection(NEGATIVE_SCROLL);
}
scrollTimer.start();
}
else
{
// We'd like to keep track of where the cursor
// is inside the thumb.
// This works because the scrollbar's value represents
// "lower" edge of the thumb. The value at which
// the cursor is at must be greater or equal
// to that value.
scrollbar.setValueIsAdjusting(true);
offset = value - scrollbar.getValue();
}
scrollbar.repaint();
}
/**
* This method is called when the mouse is released.
* It should stop movement on the thumb
*
* @param e The MouseEvent given.
*/
public void mouseReleased(MouseEvent e)
{
trackHighlight = NO_HIGHLIGHT;
scrollTimer.stop();
if (scrollbar.getValueIsAdjusting())
scrollbar.setValueIsAdjusting(false);
scrollbar.repaint();
}
/**
* A helper method that decides whether we should
* keep scrolling in the given direction.
*
* @param direction The direction to check for.
*
* @return Whether the thumb should keep scrolling.
*/
public boolean shouldScroll (int direction)
{
int value;
if (scrollbar.getOrientation() == HORIZONTAL)
value = valueForXPosition(currentMouseX);
else
value = valueForYPosition(currentMouseY);
if (direction == POSITIVE_SCROLL)
return (value > scrollbar.getValue());
else
return (value < scrollbar.getValue());
}
}
/** The listener that listens to the JButtons. */
protected ArrowButtonListener buttonListener;
/** The listener that listens to the model. */
protected ModelListener modelListener;
/** The listener that listens to the scrollbar for property
changes. */
protected PropertyChangeListener propertyChangeListener;
/** The listener that listens to the timer. */
protected ScrollListener scrollListener;
/** The listener that listens for MouseEvents on the track. */
protected TrackListener trackListener;
/** The JButton that decrements the scrollbar's value. */
protected JButton decrButton;
/** The JButton that increments the scrollbar's value. */
protected JButton incrButton;
/** The dimensions of the maximum thumb size. */
protected static Dimension maximumThumbSize;
/** The dimensions of the minimum thumb size. */
protected static Dimension minimumThumbSize;
/** The color of the thumb. */
protected Color thumbColor;
/** The outer shadow of the thumb. */
protected Color thumbDarkShadowColor;
/** The top and left edge color for the thumb. */
protected Color thumbHighlightColor;
/** The outer light shadow for the thumb. */
protected Color thumbLightShadowColor;
/** The color that is used when the mouse press
occurs in the track. */
protected Color trackHighlightColor;
/** The color of the track. */
protected Color trackColor;
/** The size and position of the track. */
protected Rectangle trackRect;
/** The size and position of the thumb. */
protected Rectangle thumbRect;
/** Indicates that the decrease highlight should be painted. */
protected static int DECREASE_HIGHLIGHT = 1;
/** Indicates that the increase highlight should be painted. */
protected static int INCREASE_HIGHLIGHT = 2;
/** Indicates that no highlight should be painted. */
protected static int NO_HIGHLIGHT = 0;
/** Indicates that the scrolling direction is positive. */
private static int POSITIVE_SCROLL = 1;
/** Indicates that the scrolling direction is negative. */
private static int NEGATIVE_SCROLL = -1;
/** The cached preferred size for the scrollbar. */
private transient Dimension preferredSize;
/** The current highlight status. */
protected int trackHighlight;
/** FIXME: Use this for something (presumably mouseDragged) */
protected boolean isDragging;
/** The timer used to move the thumb when the mouse is held. */
protected Timer scrollTimer;
/** The scrollbar this UI is acting for. */
protected JScrollBar scrollbar;
/**
* A helper class that allows us to draw icons for
* the JButton.
*/
private static class arrowIcon implements Icon
{
/** The polygon that describes the icon. */
private Polygon arrow;
/**
* Creates a new arrowIcon object.
*
* @param arrow The polygon that describes the arrow.
*/
public arrowIcon(Polygon arrow)
{
this.arrow = arrow;
}
/**
* Returns the height of the icon.
*
* @return The height of the icon.
*/
public int getIconHeight()
{
return 10;
}
/**
* Returns the width of the icon.
*
* @return The width of the icon.
*/
public int getIconWidth()
{
return 10;
}
/**
* Paints the icon.
*
* @param c The Component to paint for.
* @param g The Graphics object to draw with.
* @param x The X coordinate to draw at.
* @param y The Y coordinate to draw at.
*/
public void paintIcon(Component c, Graphics g, int x, int y)
{
g.translate(x, y);
Color saved = g.getColor();
g.setColor(Color.BLACK);
g.fillPolygon(arrow);
g.setColor(saved);
g.translate(-x, -y);
}
}
/** The Icon that points up. */
private static Icon upIcon = new arrowIcon(new Polygon(new int[] { 2, 5, 8 },
new int[] { 7, 3, 7 },
3));
/** The Icon that points down. */
private static Icon downIcon = new arrowIcon(new Polygon(new int[] { 2, 5, 8 },
new int[] { 3, 7, 3 },
3));
/** The Icon that points left. */
private static Icon leftIcon = new arrowIcon(new Polygon(new int[] { 7, 3, 7 },
new int[] { 2, 5, 8 },
3));
/** The Icon that points right. */
private static Icon rightIcon = new arrowIcon(new Polygon(new int[]
{
3, 7, 3
},
new int[]
{
2, 5, 8
}, 3));
/**
* This method adds a component to the layout.
*
* @param name The name to associate with the component that is added.
* @param child The Component to add.
*/
public void addLayoutComponent(String name, Component child)
{
// You should not be adding stuff to this component.
// The contents are fixed.
}
/**
* This method configures the scrollbar's colors. This can be
* done by looking up the standard colors from the L&F defaults.
*/
protected void configureScrollBarColors()
{
UIDefaults defaults = UIManager.getLookAndFeelDefaults();
trackColor = defaults.getColor("ScrollBar.track");
trackHighlightColor = defaults.getColor("ScrollBar.trackHighlight");
thumbColor = defaults.getColor("ScrollBar.thumb");
thumbHighlightColor = defaults.getColor("ScrollBar.thumbHighlight");
thumbDarkShadowColor = defaults.getColor("ScrollBar.thumbDarkShadow");
thumbLightShadowColor = defaults.getColor("ScrollBar.thumbLightShadow");
}
/**
* This method creates an ArrowButtonListener.
*
* @return A new ArrowButtonListener.
*/
protected ArrowButtonListener createArrowButtonListener()
{
return new ArrowButtonListener();
}
/**
* This method creates a new JButton with the appropriate
* icon for the orientation.
*
* @param orientation The orientation this JButton uses.
*
* @return The increase JButton.
*/
protected JButton createIncreaseButton(int orientation)
{
if (incrButton == null)
incrButton = new JButton();
if (orientation == SwingConstants.HORIZONTAL)
incrButton.setIcon(rightIcon);
else
incrButton.setIcon(downIcon);
return incrButton;
}
/**
* This method creates a new JButton with the appropriate
* icon for the orientation.
*
* @param orientation The orientation this JButton uses.
*
* @return The decrease JButton.
*/
protected JButton createDecreaseButton(int orientation)
{
if (decrButton == null)
decrButton = new JButton();
if (orientation == SwingConstants.HORIZONTAL)
decrButton.setIcon(leftIcon);
else
decrButton.setIcon(upIcon);
return decrButton;
}
/**
* This method creates a new ModelListener.
*
* @return A new ModelListener.
*/
protected ModelListener createModelListener()
{
return new ModelListener();
}
/**
* This method creates a new PropertyChangeListener.
*
* @return A new PropertyChangeListener.
*/
protected PropertyChangeListener createPropertyChangeListener()
{
return new PropertyChangeHandler();
}
/**
* This method creates a new ScrollListener.
*
* @return A new ScrollListener.
*/
protected ScrollListener createScrollListener()
{
return new ScrollListener();
}
/**
* This method creates a new TrackListener.
*
* @return A new TrackListener.
*/
protected TrackListener createTrackListener()
{
return new TrackListener();
}
/**
* This method returns a new BasicScrollBarUI.
*
* @param c The JComponent to create a UI for.
*
* @return A new BasicScrollBarUI.
*/
public static ComponentUI createUI(JComponent c)
{
return new BasicScrollBarUI();
}
/**
* This method returns the maximum size for this JComponent.
*
* @param c The JComponent to measure the maximum size for.
*
* @return The maximum size for the component.
*/
public Dimension getMaximumSize(JComponent c)
{
return getPreferredSize(c);
}
/**
* This method returns the maximum thumb size.
*
* @return The maximum thumb size.
*/
protected Dimension getMaximumThumbSize()
{
return maximumThumbSize;
}
/**
* This method returns the minimum size for this JComponent.
*
* @param c The JComponent to measure the minimum size for.
*
* @return The minimum size for the component.
*/
public Dimension getMinimumSize(JComponent c)
{
return getPreferredSize(c);
}
/**
* This method returns the minimum thumb size.
*
* @return The minimum thumb size.
*/
protected Dimension getMinimumThumbSize()
{
return minimumThumbSize;
}
/**
* This method calculates the preferred size since
* calling getPreferredSize() returns a cached value.
*/
private void calculatePreferredSize()
{
// System.err.println(this + ".calculatePreferredSize()");
int height;
int width;
height = width = 0;
if (scrollbar.getOrientation() == SwingConstants.HORIZONTAL)
{
width += incrButton.getPreferredSize().getWidth();
width += decrButton.getPreferredSize().getWidth();
width += (scrollbar.getMaximum() - scrollbar.getMinimum());
height = Math.max(incrButton.getPreferredSize().height,
decrButton.getPreferredSize().height);
height = Math.max(getMinimumThumbSize().height, height);
height = Math.max(20, height);
height = Math.min(getMaximumThumbSize().height, height);
}
else
{
height += incrButton.getPreferredSize().getHeight();
height += decrButton.getPreferredSize().getHeight();
height += (scrollbar.getMaximum() - scrollbar.getMinimum());
width = Math.max(incrButton.getPreferredSize().width,
decrButton.getPreferredSize().width);
width = Math.max(getMinimumThumbSize().width, width);
width = Math.max(20, width);
width = Math.min(getMaximumThumbSize().width, width);
}
Insets insets = scrollbar.getInsets();
height += insets.top + insets.bottom;
width += insets.left + insets.right;
preferredSize = new Dimension(width, height);
}
/**
* This method returns a cached value of the preferredSize.
* The only restrictions are: If the scrollbar is horizontal, the
* height should be the maximum of the height of the JButtons and
* the minimum width of the thumb. For vertical scrollbars, the
* calculation is similar (swap width for height and vice versa).
*
* @param c The JComponent to measure.
*
* @return The preferredSize.
*/
public Dimension getPreferredSize(JComponent c)
{
layoutContainer(scrollbar);
return preferredSize;
}
/**
* This method returns the thumb's bounds based on the
* current value of the scrollbar. This method updates the
* cached value and returns that.
*
* @return The thumb bounds.
*/
protected Rectangle getThumbBounds()
{
int max = scrollbar.getMaximum();
int min = scrollbar.getMinimum();
int value = scrollbar.getValue();
int extent = scrollbar.getVisibleAmount();
// System.err.println(this + ".getThumbBounds()");
if (max == min)
{
thumbRect.x = trackRect.x;
thumbRect.y = trackRect.y;
if (scrollbar.getOrientation() == HORIZONTAL)
{
thumbRect.width = getMinimumThumbSize().width;
thumbRect.height = trackRect.height;
}
else
{
thumbRect.width = trackRect.width;
thumbRect.height = getMinimumThumbSize().height;
}
return thumbRect;
}
if (scrollbar.getOrientation() == HORIZONTAL)
{
thumbRect.x = trackRect.x;
thumbRect.x += (value - min) * trackRect.width / (max - min);
thumbRect.y = trackRect.y;
thumbRect.width = extent * trackRect.width / (max - min);
thumbRect.height = trackRect.height;
}
else
{
thumbRect.x = trackRect.x;
thumbRect.y = trackRect.y
+ value * trackRect.height / (max - min);
thumbRect.width = trackRect.width;
thumbRect.height = extent * trackRect.height / (max - min);
}
return thumbRect;
}
/**
* This method calculates the bounds of the track. This method
* updates the cached value and returns it.
*
* @return The track's bounds.
*/
protected Rectangle getTrackBounds()
{
SwingUtilities.calculateInnerArea(scrollbar, trackRect);
if (scrollbar.getOrientation() == SwingConstants.HORIZONTAL)
{
trackRect.width -= incrButton.getPreferredSize().getWidth();
trackRect.width -= decrButton.getPreferredSize().getWidth();
trackRect.x += decrButton.getPreferredSize().getWidth();
}
else
{
trackRect.height -= incrButton.getPreferredSize().getHeight();
trackRect.height -= decrButton.getPreferredSize().getHeight();
trackRect.y += incrButton.getPreferredSize().getHeight();
}
return trackRect;
}
/**
* This method installs any addition Components that
* are a part of or related to this scrollbar.
*/
protected void installComponents()
{
incrButton = createIncreaseButton(scrollbar.getOrientation());
scrollbar.add(incrButton);
decrButton = createDecreaseButton(scrollbar.getOrientation());
scrollbar.add(decrButton);
}
/**
* This method installs the defaults for the scrollbar specified
* by the Basic L&F.
*/
protected void installDefaults()
{
UIDefaults defaults = UIManager.getLookAndFeelDefaults();
scrollbar.setForeground(defaults.getColor("ScrollBar.foreground"));
scrollbar.setBackground(defaults.getColor("ScrollBar.background"));
scrollbar.setBorder(defaults.getBorder("ScrollBar.border"));
scrollbar.setOpaque(true);
maximumThumbSize = defaults.getDimension("ScrollBar.maximumThumbSize");
minimumThumbSize = defaults.getDimension("ScrollBar.minimumThumbSize");
}
/**
* This method installs the keyboard actions for the scrollbar.
*/
protected void installKeyboardActions()
{
// FIXME: implement.
}
/**
* This method installs any listeners for the scrollbar.
* This method also installs listeners for things such as
* the JButtons and the timer.
*/
protected void installListeners()
{
scrollListener = createScrollListener();
trackListener = createTrackListener();
buttonListener = createArrowButtonListener();
modelListener = createModelListener();
propertyChangeListener = createPropertyChangeListener();
scrollbar.addMouseMotionListener(trackListener);
scrollbar.addMouseListener(trackListener);
incrButton.addMouseListener(buttonListener);
decrButton.addMouseListener(buttonListener);
scrollbar.addPropertyChangeListener(propertyChangeListener);
scrollbar.getModel().addChangeListener(modelListener);
scrollTimer.addActionListener(scrollListener);
}
/**
* This method installs the UI for the component.
* This can include setting up listeners, defaults,
* and components. This also includes initializing any data
* objects.
*
* @param c The JComponent to install.
*/
public void installUI(JComponent c)
{
super.installUI(c);
if (c instanceof JScrollBar)
{
scrollbar = (JScrollBar) c;
trackRect = new Rectangle();
thumbRect = new Rectangle();
scrollTimer = new Timer();
scrollTimer.setDelay(200);
scrollTimer.setRepeats(true);
installComponents();
installListeners();
installDefaults();
configureScrollBarColors();
calculatePreferredSize();
layoutContainer(scrollbar);
}
}
/**
* This method lays out the scrollbar.
*
* @param scrollbarContainer The Container to layout.
*/
public void layoutContainer(Container scrollbarContainer)
{
if (scrollbarContainer instanceof JScrollBar)
{
if (scrollbar.getOrientation() == SwingConstants.HORIZONTAL)
layoutHScrollbar((JScrollBar) scrollbarContainer);
else
layoutVScrollbar((JScrollBar) scrollbarContainer);
}
}
/**
* This method lays out the scrollbar horizontally.
*
* @param sb The JScrollBar to layout.
*/
protected void layoutHScrollbar(JScrollBar sb)
{
// All we have to do is layout the 2 buttons?
Rectangle vr = new Rectangle();
SwingUtilities.calculateInnerArea(scrollbar, vr);
// Update the rectangles.
getTrackBounds();
getThumbBounds();
Dimension incrDims = incrButton.getPreferredSize();
Dimension decrDims = decrButton.getPreferredSize();
decrButton.setBounds(vr.x, vr.y, decrDims.width, trackRect.height);
incrButton.setBounds(trackRect.x + trackRect.width, vr.y, incrDims.width,
trackRect.height);
}
/**
* This method lays out the scrollbar vertically.
*
* @param sb The JScrollBar to layout.
*/
protected void layoutVScrollbar(JScrollBar sb)
{
Rectangle vr = new Rectangle();
SwingUtilities.calculateInnerArea(scrollbar, vr);
// Update rectangles
getTrackBounds();
getThumbBounds();
Dimension incrDims = incrButton.getPreferredSize();
Dimension decrDims = decrButton.getPreferredSize();
decrButton.setBounds(vr.x, vr.y, trackRect.width, decrDims.height);
incrButton.setBounds(vr.x, trackRect.y + trackRect.height,
trackRect.width, incrDims.height);
}
/**
* This method returns the minimum size required for the layout.
*
* @param scrollbarContainer The Container that is laid out.
*
* @return The minimum size.
*/
public Dimension minimumLayoutSize(Container scrollbarContainer)
{
return preferredLayoutSize(scrollbarContainer);
}
/**
* This method is called when the component is painted.
*
* @param g The Graphics object to paint with.
* @param c The JComponent to paint.
*/
public void paint(Graphics g, JComponent c)
{
layoutContainer(scrollbar);
paintTrack(g, c, getTrackBounds());
paintThumb(g, c, getThumbBounds());
if (trackHighlight == INCREASE_HIGHLIGHT)
paintIncreaseHighlight(g);
else if (trackHighlight == DECREASE_HIGHLIGHT)
paintDecreaseHighlight(g);
}
/**
* This method is called when repainting and the mouse is
* pressed in the track. It paints the track below the thumb
* with the trackHighlight color.
*
* @param g The Graphics object to paint with.
*/
protected void paintDecreaseHighlight(Graphics g)
{
Color saved = g.getColor();
g.setColor(trackHighlightColor);
if (scrollbar.getOrientation() == HORIZONTAL)
g.fillRect(trackRect.x, trackRect.y, thumbRect.x - trackRect.x,
trackRect.height);
else
g.fillRect(trackRect.x, trackRect.y, trackRect.width,
thumbRect.y - trackRect.y);
g.setColor(saved);
}
/**
* This method is called when repainting and the mouse is
* pressed in the track. It paints the track above the thumb
* with the trackHighlight color.
*
* @param g The Graphics objet to paint with.
*/
protected void paintIncreaseHighlight(Graphics g)
{
Color saved = g.getColor();
g.setColor(trackHighlightColor);
if (scrollbar.getOrientation() == HORIZONTAL)
g.fillRect(thumbRect.x + thumbRect.width, trackRect.y,
trackRect.x + trackRect.width - thumbRect.x - thumbRect.width,
trackRect.height);
else
g.fillRect(trackRect.x, thumbRect.y + thumbRect.height,
trackRect.width,
trackRect.y + trackRect.height - thumbRect.y -
thumbRect.height);
g.setColor(saved);
}
/**
* This method paints the thumb.
*
* @param g The Graphics object to paint with.
* @param c The Component that is being painted.
* @param thumbBounds The thumb bounds.
*/
protected void paintThumb(Graphics g, JComponent c, Rectangle thumbBounds)
{
Color saved = g.getColor();
Point x;
Point y;
Point z;
Polygon lines;
g.setColor(thumbHighlightColor);
x = new Point(thumbBounds.x + 1, thumbBounds.y + 1);
y = new Point(x);
y.translate(thumbBounds.width - 2, 0);
z = new Point(x);
z.translate(0, thumbBounds.height - 2);
lines = new Polygon(new int[] { x.x, y.x, z.x },
new int[] { x.y, y.y, z.y }, 3);
g.drawPolygon(lines);
g.setColor(thumbLightShadowColor);
x = new Point(thumbBounds.x + thumbBounds.width - 1,
thumbBounds.y + thumbBounds.height - 1);
y = new Point(x);
y.translate(-(thumbBounds.width - 2), 0);
z = new Point(x);
z.translate(0, -(thumbBounds.height - 2));
lines = new Polygon(new int[] { x.x, y.x, z.x },
new int[] { x.y, y.y, z.y }, 3);
g.drawPolygon(lines);
g.setColor(thumbDarkShadowColor);
x = new Point(thumbBounds.x + thumbBounds.width,
thumbBounds.y + thumbBounds.height);
y = new Point(x);
y.translate(-thumbBounds.width, 0);
z = new Point(x);
z.translate(0, -thumbBounds.height);
lines = new Polygon(new int[] { x.x, y.x, z.x },
new int[] { x.y, y.y, z.y }, 3);
g.drawPolygon(lines);
g.setColor(thumbColor);
g.fillRect(thumbBounds.x, thumbBounds.y, thumbBounds.width,
thumbBounds.height);
g.setColor(saved);
}
/**
* This method paints the track.
*
* @param g The Graphics object to paint with.
* @param c The JComponent being painted.
* @param trackBounds The track's bounds.
*/
protected void paintTrack(Graphics g, JComponent c, Rectangle trackBounds)
{
Color saved = g.getColor();
g.setColor(trackColor);
g.fill3DRect(trackBounds.x, trackBounds.y, trackBounds.width,
trackBounds.height, false);
g.setColor(saved);
}
/**
* This method returns the preferred size for the layout.
*
* @param scrollbarContainer The Container to find a size for.
*
* @return The preferred size for the layout.
*/
public Dimension preferredLayoutSize(Container scrollbarContainer)
{
if (scrollbarContainer instanceof JComponent)
return getPreferredSize((JComponent) scrollbarContainer);
else
return null;
}
/**
* This method removes a child component from the layout.
*
* @param child The child to remove.
*/
public void removeLayoutComponent(Component child)
{
// You should not be removing stuff from this component.
}
/**
* The method scrolls the thumb by a block in the
* direction specified.
*
* @param direction The direction to scroll.
*/
protected void scrollByBlock(int direction)
{
scrollbar.setValue(scrollbar.getValue() + scrollbar.getBlockIncrement(direction));
}
/**
* The method scrolls the thumb by a unit in the
* direction specified.
*
* @param direction The direction to scroll.
*/
protected void scrollByUnit(int direction)
{
scrollbar.setValue(scrollbar.getValue() + scrollbar.getUnitIncrement(direction));
}
/**
* This method sets the thumb's bounds.
*
* @param x The X position of the thumb.
* @param y The Y position of the thumb.
* @param width The width of the thumb.
* @param height The height of the thumb.
*/
protected void setThumbBounds(int x, int y, int width, int height)
{
thumbRect.x = x;
thumbRect.y = y;
thumbRect.width = width;
thumbRect.height = height;
}
/**
* This method uninstalls any components that
* are a part of or related to this scrollbar.
*/
protected void uninstallComponents()
{
scrollbar.remove(incrButton);
scrollbar.remove(decrButton);
incrButton = null;
decrButton = null;
}
/**
* This method uninstalls any defaults that this
* scrollbar acquired from the Basic L&F defaults.
*/
protected void uninstallDefaults()
{
scrollbar.setForeground(null);
scrollbar.setBackground(null);
scrollbar.setBorder(null);
}
/**
* This method uninstalls any keyboard
* actions this scrollbar acquired during install.
*/
protected void uninstallKeyboardActions()
{
// FIXME: implement.
}
/**
* This method uninstalls any listeners that
* were registered during install.
*/
protected void uninstallListeners()
{
scrollTimer.removeActionListener(scrollListener);
scrollbar.getModel().removeChangeListener(modelListener);
scrollbar.removePropertyChangeListener(propertyChangeListener);
decrButton.removeMouseListener(buttonListener);
incrButton.removeMouseListener(buttonListener);
scrollbar.removeMouseListener(trackListener);
scrollbar.removeMouseMotionListener(trackListener);
propertyChangeListener = null;
modelListener = null;
buttonListener = null;
trackListener = null;
scrollListener = null;
}
/**
* This method uninstalls the UI. This includes
* removing any defaults, listeners, and components
* that this UI may have initialized. It also nulls
* any instance data.
*
* @param c The Component to uninstall for.
*/
public void uninstallUI(JComponent c)
{
uninstallDefaults();
uninstallListeners();
uninstallComponents();
scrollTimer = null;
thumbRect = null;
trackRect = null;
trackColor = null;
trackHighlightColor = null;
thumbColor = null;
thumbHighlightColor = null;
thumbDarkShadowColor = null;
thumbLightShadowColor = null;
scrollbar = null;
}
/**
* This method returns the value in the scrollbar's range given the y
* coordinate. If the value is out of range, it will return the closest
* legal value.
*
* @param yPos The y coordinate to calculate a value for.
*
* @return The value for the y coordinate.
*/
private int valueForYPosition(int yPos)
{
int min = scrollbar.getMinimum();
int max = scrollbar.getMaximum();
int len = trackRect.height;
int value;
// If the length is 0, you shouldn't be able to even see where the thumb is.
// This really shouldn't ever happen, but just in case, we'll return the middle.
if (len == 0)
return ((max - min) / 2);
value = ((yPos - trackRect.y) * (max - min) / len + min);
// If this isn't a legal value, then we'll have to move to one now.
if (value > max)
value = max;
else if (value < min)
value = min;
return value;
}
/**
* This method returns the value in the scrollbar's range given the x
* coordinate. If the value is out of range, it will return the closest
* legal value.
*
* @param xPos The x coordinate to calculate a value for.
*
* @return The value for the x coordinate.
*/
private int valueForXPosition(int xPos)
{
int min = scrollbar.getMinimum();
int max = scrollbar.getMaximum();
int len = trackRect.width;
int value;
// If the length is 0, you shouldn't be able to even see where the slider is.
// This really shouldn't ever happen, but just in case, we'll return the middle.
if (len == 0)
return ((max - min) / 2);
value = ((xPos - trackRect.x) * (max - min) / len + min);
// If this isn't a legal value, then we'll have to move to one now.
if (value > max)
value = max;
else if (value < min)
value = min;
return value;
}
}