gcc/libjava/javax/swing/JSlider.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

940 lines
26 KiB
Java

/* JSlider.java --
Copyright (C) 2002, 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;
import java.awt.Dimension;
import java.awt.MenuContainer;
import java.awt.image.ImageObserver;
import java.io.Serializable;
import java.util.Dictionary;
import java.util.Enumeration;
import java.util.Hashtable;
import javax.accessibility.Accessible;
import javax.accessibility.AccessibleContext;
import javax.accessibility.AccessibleRole;
import javax.accessibility.AccessibleStateSet;
import javax.accessibility.AccessibleValue;
import javax.swing.event.ChangeEvent;
import javax.swing.event.ChangeListener;
import javax.swing.plaf.SliderUI;
/**
* <p>
* The JSlider is a Swing component that allows selection of a value within a
* range by adjusting a thumb in a track. The values for the minimum,
* maximum, extent and value are stored in a {@link
* DefaultBoundedRangeModel}.
* </p>
*
* <p>
* JSliders have the following properties:
* </p>
*
* <table>
* <tr><th> Property </th><th> Stored in </th><th> Bound? </th></tr>
* <tr><td> extent </td><td> model </td><td> no </td></tr>
* <tr><td> inverted </td><td> slider </td><td> yes </td></tr>
* <tr><td> labelTable </td><td> slider </td><td> yes </td></tr>
* <tr><td> majorTickSpacing </td><td> slider </td><td> yes </td></tr>
* <tr><td> maximum </td><td> model </td><td> no </td></tr>
* <tr><td> minimum </td><td> model </td><td> no </td></tr>
* <tr><td> minorTickSpacing </td><td> slider </td><td> yes </td></tr>
* <tr><td> model </td><td> slider </td><td> yes </td></tr>
* <tr><td> orientation </td><td> slider </td><td> yes </td></tr>
* <tr><td> paintLabels </td><td> slider </td><td> yes </td></tr>
* <tr><td> paintTicks </td><td> slider </td><td> yes </td></tr>
* <tr><td> snapToTicks </td><td> slider </td><td> no </td></tr>
* <tr><td> value </td><td> model </td><td> no </td></tr>
* <tr><td> valueIsAdjusting </td><td> model </td><td> no </td></tr>
* </table>
*
* <p>
* The various behavioral aspects of these properties follows:
* </p>
*
* <ul>
* <li>
* When non-bound properties stored in the slider change, the slider fires
* ChangeEvents to its ChangeListeners.
* </li>
* <li>
* When bound properties stored in the slider change, the slider fires
* PropertyChangeEvents to its PropertyChangeListeners
* </li>
* <li>
* If any of the model's properties change, it fires a ChangeEvent to its
* ChangeListeners, which include the slider.
* </li>
* <li>
* If the slider receives a ChangeEvent from its model, it will propagate the
* ChangeEvent to its ChangeListeners, with the ChangeEvent's "source"
* property set to refer to the slider, rather than the model.
* </li>
* </ul>
*/
public class JSlider extends JComponent implements SwingConstants, Accessible,
ImageObserver,
MenuContainer, Serializable
{
/** DOCUMENT ME! */
static final long serialVersionUID = -1441275936141218479L;
/**
* DOCUMENT ME!
*/
protected class AccessibleJSlider extends JComponent.AccessibleJComponent
implements AccessibleValue
{
/**
* Creates a new AccessibleJSlider object.
*
* @param value0 DOCUMENT ME!
*/
protected AccessibleJSlider(JSlider value0)
{
super(value0);
}
/**
* DOCUMENT ME!
*
* @return DOCUMENT ME!
*/
public AccessibleStateSet getAccessibleStateSet()
{
return null;
}
/**
* DOCUMENT ME!
*
* @return DOCUMENT ME!
*/
public AccessibleRole getAccessibleRole()
{
return null;
}
/**
* DOCUMENT ME!
*
* @return DOCUMENT ME!
*/
public AccessibleValue getAccessibleValue()
{
return null;
}
/**
* DOCUMENT ME!
*
* @return DOCUMENT ME!
*/
public Number getCurrentAccessibleValue()
{
return null;
}
/**
* setCurrentAccessibleValue
*
* @param value0 TODO
*
* @return boolean
*/
public boolean setCurrentAccessibleValue(Number value0)
{
return false;
}
/**
* getMinimumAccessibleValue
*
* @return Number
*/
public Number getMinimumAccessibleValue()
{
return null;
}
/**
* getMaximumAccessibleValue
*
* @return Number
*/
public Number getMaximumAccessibleValue()
{
return null;
}
}
/** Fired in a PropertyChangeEvent when the "inverted" property changes. */
public static final String INVERTED_CHANGED_PROPERTY = "inverted";
/** Fired in a PropertyChangeEvent when the "labelTable" property changes. */
public static final String LABEL_TABLE_CHANGED_PROPERTY = "labelTable";
/**
* Fired in a PropertyChangeEvent when the "majorTickSpacing" property
* changes.
*/
public static final String MAJOR_TICK_SPACING_CHANGED_PROPERTY = "majorTickSpacing";
/**
* Fired in a PropertyChangeEvent when the "minorTickSpacing" property
* changes.
*/
public static final String MINOR_TICK_SPACING_CHANGED_PROPERTY = "minorTickSpacing";
/** Fired in a PropertyChangeEvent when the "model" property changes. */
public static final String MODEL_CHANGED_PROPERTY = "model";
/** Fired in a PropertyChangeEvent when the "orientation" property changes. */
public static final String ORIENTATION_CHANGED_PROPERTY = "orientation";
/** Fired in a PropertyChangeEvent when the "paintLabels" property changes. */
public static final String PAINT_LABELS_CHANGED_PROPERTY = "paintLabels";
/** Fired in a PropertyChangeEvent when the "paintTicks" property changes. */
public static final String PAINT_TICKS_CHANGED_PROPERTY = "paintTicks";
/** Whether or not this slider paints its ticks. */
private transient boolean paintTicks = false;
/** Whether or not this slider paints its track. */
private transient boolean paintTrack = true;
/** Whether or not this slider paints its labels. */
private transient boolean paintLabels = false;
/**
* A dictionary of (Integer, Component) pairs where each Component is a
* JLabel and the Integer determines where the label will be painted.
*/
private transient Dictionary labelTable;
/** The model used to describe the slider. */
protected BoundedRangeModel sliderModel;
/** The space between major ticks. */
protected int majorTickSpacing;
/** The space between minor ticks. */
protected int minorTickSpacing;
/** Whether the slider snaps its values to ticks. */
protected boolean snapToTicks = true;
/** The orientation of the slider. */
protected int orientation = HORIZONTAL;
/** Whether the slider is inverted. */
private transient boolean isInverted;
/** The ChangeListener that listens to the model. */
protected ChangeListener changeListener;
/** The ChangeEvent that is passed to all listeners of this slider. */
protected transient ChangeEvent changeEvent;
/**
* Creates a new horizontal JSlider object with a minimum of 0, a maximum of
* 100, and a value of 50.
*/
public JSlider()
{
this(HORIZONTAL, 0, 100, 50);
}
/**
* Creates a new JSlider object with the given orientation and a minimum of
* 0, a maximum of 100, and a value of 50.
*
* @param orientation The orientation of the slider.
*/
public JSlider(int orientation)
{
this(orientation, 0, 100, 50);
}
/**
* Creates a new horizontal JSlider object with the given maximum and
* minimum and a value that is halfway between the minimum and the
* maximum.
*
* @param minimum The minimum value of the JSlider.
* @param maximum The maximum value of the JSlider.
*/
public JSlider(int minimum, int maximum)
{
this(HORIZONTAL, minimum, maximum, (maximum + minimum) / 2);
}
/**
* Creates a new horizontal JSlider object with the given minimum, maximum,
* and value.
*
* @param minimum The minimum value of the JSlider.
* @param maximum The maximum value of the JSlider.
* @param value The initial value of the JSlider.
*/
public JSlider(int minimum, int maximum, int value)
{
this(HORIZONTAL, minimum, maximum, value);
}
/**
* Creates a new JSlider object with the given orientation, minimum,
* maximum, and value.
*
* @param orientation The orientation of the JSlider.
* @param minimum The minimum value of the JSlider.
* @param maximum The maximum value of the JSlider.
* @param value The initial value of the JSlider.
*/
public JSlider(int orientation, int minimum, int maximum, int value)
{
sliderModel = new DefaultBoundedRangeModel(value, 0, minimum, maximum);
if (orientation != HORIZONTAL && orientation != VERTICAL)
throw new IllegalArgumentException(orientation + " is not a legal orientation");
this.orientation = orientation;
changeListener = createChangeListener();
sliderModel.addChangeListener(changeListener);
updateUI();
}
/**
* Creates a new horizontal JSlider object with the given model.
*
* @param model The model the slider will be created with.
*/
public JSlider(BoundedRangeModel model)
{
if (model == null)
sliderModel = new DefaultBoundedRangeModel(50, 0, 0, 100);
else
sliderModel = model;
changeListener = createChangeListener();
sliderModel.addChangeListener(changeListener);
updateUI();
}
/**
* This method returns the current value of the slider.
*
* @return The value of the slider stored in the model.
*/
public int getValue()
{
return sliderModel.getValue();
}
/**
* This method sets the value of the slider.
*
* @param value The slider's new value.
*/
public void setValue(int value)
{
sliderModel.setValue(value);
}
/**
* This method returns the slider's UI delegate.
*
* @return The slider's UI delegate.
*/
public SliderUI getUI()
{
return (SliderUI) ui;
}
/**
* This method sets the slider's UI delegate.
*
* @param ui A SliderUI object to use with this slider.
*/
public void setUI(SliderUI ui)
{
super.setUI(ui);
}
/**
* This method sets this slider's UI to the UIManager's default for the
* current look and feel.
*/
public void updateUI()
{
setUI((SliderUI) UIManager.getUI(this));
invalidate();
repaint();
}
/**
* This method returns a name to identify which look and feel class will be
* the UI delegate for the slider.
*
* @return The Look and Feel classID. "SliderUI"
*/
public String getUIClassID()
{
return "SliderUI";
}
/**
* Creates a ChangeListener for this Slider.
*
* @return A new ChangeListener.
*/
protected ChangeListener createChangeListener()
{
return new ChangeListener()
{
public void stateChanged(ChangeEvent ce)
{
// No need to trigger a repaint since the UI listens to the model
// as well. All we need to do is pass on the stateChanged event
// to our listeners.
fireStateChanged();
}
};
}
/**
* This method registers a listener to this slider. The listener will be
* informed of new ChangeEvents.
*
* @param listener The listener to register.
*/
public void addChangeListener(ChangeListener listener)
{
listenerList.add(ChangeListener.class, listener);
}
/**
* This method removes a listener from this slider.
*
* @param listener The listener to remove.
*/
public void removeChangeListener(ChangeListener listener)
{
listenerList.remove(ChangeListener.class, listener);
}
/**
* This method is called whenever the model fires a ChangeEvent. It should
* propagate the ChangeEvent to its listeners with a new ChangeEvent that
* identifies the slider as the source.
*/
protected void fireStateChanged()
{
Object[] changeListeners = listenerList.getListenerList();
if (changeEvent == null)
changeEvent = new ChangeEvent(this);
for (int i = changeListeners.length - 2; i >= 0; i -= 2)
{
if (changeListeners[i] == ChangeListener.class)
((ChangeListener) changeListeners[i + 1]).stateChanged(changeEvent);
}
}
/**
* This method returns an array of all ChangeListeners listening to this
* slider.
*
* @return An array of ChangeListeners listening to this slider.
*/
public ChangeListener[] getChangeListeners()
{
return (ChangeListener[]) listenerList.getListeners(ChangeListener.class);
}
/**
* This method returns the model of the slider.
*
* @return The slider's model.
*/
public BoundedRangeModel getModel()
{
return sliderModel;
}
/**
* This method changes the "model" property. It also needs to unregister
* any listeners to the old model and register any listeners to the new
* model.
*
* @param model The model to use with the slider.
*/
public void setModel(BoundedRangeModel model)
{
// I didn't do the null pointer check on purpose.
// If you try it with Sun's, it'll go ahead and set it to null
// and bork the next time it tries to access the model.
if (model != sliderModel)
{
BoundedRangeModel oldModel = sliderModel;
sliderModel = model;
oldModel.removeChangeListener(changeListener);
sliderModel.addChangeListener(changeListener);
firePropertyChange(MODEL_CHANGED_PROPERTY, oldModel, sliderModel);
}
}
/**
* This method returns the minimum value of the slider.
*
* @return The minimum value of the slider.
*/
public int getMinimum()
{
return sliderModel.getMinimum();
}
/**
* This method sets the minimum value of the slider.
*
* @param minimum The minimum value of the slider.
*/
public void setMinimum(int minimum)
{
sliderModel.setMinimum(minimum);
}
/**
* This method returns the maximum value of the slider.
*
* @return The maximum value of the slider.
*/
public int getMaximum()
{
return sliderModel.getMaximum();
}
/**
* This method sets the maximum value of the slider.
*
* @param maximum The maximum value of the slider.
*/
public void setMaximum(int maximum)
{
sliderModel.setMaximum(maximum);
}
/**
* This method returns this slider's isAdjusting value which is true if the
* thumb is being dragged.
*
* @return The slider's isAdjusting value.
*/
public boolean getValueIsAdjusting()
{
return sliderModel.getValueIsAdjusting();
}
/**
* This method sets the isAdjusting value for the slider.
*
* @param adjusting The slider's isAdjusting value.
*/
public void setValueIsAdjusting(boolean adjusting)
{
sliderModel.setValueIsAdjusting(adjusting);
}
/**
* This method returns the extent value for this slider.
*
* @return The extent value for this slider.
*/
public int getExtent()
{
return sliderModel.getExtent();
}
/**
* This method sets the extent value for this slider.
*
* @param extent The extent value for this slider.
*/
public void setExtent(int extent)
{
sliderModel.setExtent(extent);
}
/**
* This method returns the slider orientation.
*
* @return The orientation of the slider.
*/
public int getOrientation()
{
return orientation;
}
/**
* This method changes the "orientation" property of this slider. If the
* orientation is not VERTICAL or HORIZONTAL, this method does nothing.
*
* @param orientation The orientation of this slider.
*/
public void setOrientation(int orientation)
{
if (orientation != VERTICAL && orientation != HORIZONTAL)
throw new IllegalArgumentException("orientation must be one of: VERTICAL, HORIZONTAL");
if (orientation != this.orientation)
{
int oldOrientation = this.orientation;
this.orientation = orientation;
firePropertyChange(ORIENTATION_CHANGED_PROPERTY, oldOrientation,
this.orientation);
}
}
/**
* This method returns the label table for this slider.
*
* @return The label table for this slider.
*/
public Dictionary getLabelTable()
{
return labelTable;
}
/**
* This method changes the "labelTable" property of this slider.
*
* @param table The label table for this slider.
*/
public void setLabelTable(Dictionary table)
{
if (table != labelTable)
{
Dictionary oldTable = labelTable;
labelTable = table;
firePropertyChange(LABEL_TABLE_CHANGED_PROPERTY, oldTable, labelTable);
}
}
/**
* This method is called to reset UI delegates for the labels in the
* labelTable to a default for the current look and feel.
*/
protected void updateLabelUIs()
{
if (labelTable == null)
return;
for (Enumeration list = labelTable.elements(); list.hasMoreElements();)
{
JLabel label = (JLabel) list.nextElement();
label.updateUI();
}
}
/**
* Creates a hashtable of (Integer, JLabel) pairs that can be used as a
* label table for this slider. The labels will start from the sliders
* minimum and increase by the increment. Each label will have a text
* string indicating their integer value.
*
* @param increment The increment to between labels.
*
* @return A hashtable with the labels and their keys.
*/
public Hashtable createStandardLabels(int increment)
{
return createStandardLabels(increment, sliderModel.getMinimum());
}
/**
* Creates a hashtable of (Integer, JLabel) pairs that can be used as a
* label table for this slider. The labels will start from the given start
* value and increase by the increment. Each label will have a text string
* indicating their integer value.
*
* @param increment The increment to between labels.
* @param start The value to start from.
*
* @return A hashtable with the labels and their keys.
*/
public Hashtable createStandardLabels(int increment, int start)
{
Hashtable table = new Hashtable();
JLabel label;
Dimension dim;
int max = sliderModel.getMaximum();
for (int i = start; i <= max; i += increment)
{
label = new JLabel(String.valueOf(i));
label.setVerticalAlignment(CENTER);
label.setHorizontalAlignment(CENTER);
// Make sure these labels have the width and height
// they want.
dim = label.getPreferredSize();
label.setBounds(label.getX(), label.getY(),
(int) dim.getWidth(),
(int) dim.getHeight());
table.put(new Integer(i), label);
}
return table;
}
/**
* This method returns whether the slider is inverted. Horizontal sliders
* that are not inverted will have the minimums on the left. If they are
* inverted, the minimums will be on the right. Vertical sliders that are
* not inverted will have the minimums at the bottom. If they are inverted,
* the minimums will be at the top.
*
* @return Whether this slider is inverted.
*/
public boolean getInverted()
{
return isInverted;
}
/**
* This method changes the "inverted" property for this slider.Horizontal
* sliders that are not inverted will have the minimums on the left. If
* they are inverted, the minimums will be on the right. Vertical sliders
* that are not inverted will have the minimums at the bottom. If they are
* inverted, the minimums will be at the top. However, if the slider's
* componentOrientation is set to RIGHT_TO_LEFT, then everything gets
* reversed again.
*
* @param inverted Whether the slider should be inverted.
*/
public void setInverted(boolean inverted)
{
if (isInverted != inverted)
{
boolean oldInverted = isInverted;
isInverted = inverted;
firePropertyChange(INVERTED_CHANGED_PROPERTY, oldInverted, isInverted);
}
}
/**
* This method returns the amount of units between each major tick mark.
*
* @return The amount of units between each major tick mark.
*/
public int getMajorTickSpacing()
{
return majorTickSpacing;
}
/**
* This method changes the "majorTickSpacing" property for this slider. The
* major tick spacing is the amount of units between each major tick mark.
*
* @param spacing The amount of units between each major tick mark.
*/
public void setMajorTickSpacing(int spacing)
{
if (majorTickSpacing != spacing)
{
int oldSpacing = majorTickSpacing;
majorTickSpacing = spacing;
firePropertyChange(MAJOR_TICK_SPACING_CHANGED_PROPERTY, oldSpacing,
majorTickSpacing);
}
}
/**
* This method returns the amount of units between each minor tick mark.
*
* @return The amount of units between each minor tick mark.
*/
public int getMinorTickSpacing()
{
return minorTickSpacing;
}
/**
* This method changes the "minorTickSpacing" property for this slider. The
* minor tick spacing is the amount of units between each minor tick mark.
*
* @param spacing The amount of units between each minor tick mark.
*/
public void setMinorTickSpacing(int spacing)
{
if (minorTickSpacing != spacing)
{
int oldSpacing = minorTickSpacing;
minorTickSpacing = spacing;
firePropertyChange(MINOR_TICK_SPACING_CHANGED_PROPERTY, oldSpacing,
minorTickSpacing);
}
}
/**
* This method returns whether this slider is snapping to ticks. Sliders
* that snap to ticks will automatically move the thumb to the nearest tick
* mark.
*
* @return Whether this slider snaps to ticks.
*/
public boolean getSnapToTicks()
{
return snapToTicks;
}
/**
* This method sets whether this slider will snap to ticks. Sliders that
* snap to ticks will automatically move the thumb to the nearest tick
* mark.
*
* @param snap Whether this slider snaps to ticks.
*/
public void setSnapToTicks(boolean snap)
{
if (snap != snapToTicks)
{
snapToTicks = snap;
fireStateChanged();
}
}
/**
* This method returns whether the slider will paint its tick marks. In
* addition to setting this property to true, one of minor tick spacing or
* major tick spacing must be set to a value greater than 0 in order for
* ticks to be painted.
*
* @return Whether ticks will be painted.
*/
public boolean getPaintTicks()
{
return paintTicks;
}
/**
* This method changes the "paintTicks" property for this slider. In
* addition to setting this property to true, one of minor tick spacing or
* major tick spacing must be set to a value greater than 0 in order for
* ticks to be painted.
*
* @param paint Whether ticks will be painted.
*/
public void setPaintTicks(boolean paint)
{
if (paint != paintTicks)
{
boolean oldPaintTicks = paintTicks;
paintTicks = paint;
firePropertyChange(PAINT_TICKS_CHANGED_PROPERTY, oldPaintTicks,
paintTicks);
}
}
/**
* This method returns whether the track will be painted.
*
* @return Whether the track will be painted.
*/
public boolean getPaintTrack()
{
return paintTrack;
}
/**
* This method sets whether the track will be painted.
*
* @param paint Whether the track will be painted.
*/
public void setPaintTrack(boolean paint)
{
paintTrack = paint;
}
/**
* This method returns whether labels will be painted.
*
* @return Whether labels will be painted.
*/
public boolean getPaintLabels()
{
return paintLabels;
}
/**
* This method changes the "paintLabels" property.
*
* @param paint Whether labels will be painted.
*/
public void setPaintLabels(boolean paint)
{
if (paint != paintLabels)
{
boolean oldPaintLabels = paintLabels;
paintLabels = paint;
firePropertyChange(PAINT_LABELS_CHANGED_PROPERTY, oldPaintLabels,
paintLabels);
}
}
/**
* This method is used primarily for debugging purposes and returns a string
* that can be used to represent this slider.
*
* @return A string representing this slider.
*/
protected String paramString()
{
return "JSlider";
}
/**
* DOCUMENT ME!
*
* @return DOCUMENT ME!
*/
public AccessibleContext getAccessibleContext()
{
if (accessibleContext == null)
accessibleContext = new AccessibleJSlider(this);
return accessibleContext;
}
}