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

822 lines
23 KiB
Java

/* BasicProgressBarUI.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.Dimension;
import java.awt.Font;
import java.awt.FontMetrics;
import java.awt.Graphics;
import java.awt.Insets;
import java.awt.Point;
import java.awt.Rectangle;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import java.beans.PropertyChangeEvent;
import java.beans.PropertyChangeListener;
import javax.swing.JComponent;
import javax.swing.JProgressBar;
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.ProgressBarUI;
/**
* The Basic Look and Feel UI delegate for the
* JProgressBar.
*/
public class BasicProgressBarUI extends ProgressBarUI
{
/**
* A helper class that listens for ChangeEvents
* from the progressBar's model.
*/
protected class ChangeHandler implements ChangeListener
{
/**
* Called every time the state of the model changes.
*
* @param e The ChangeEvent given by the model.
*/
public void stateChanged(ChangeEvent e)
{
// Nothing to do but repaint.
progressBar.repaint();
}
}
/**
* This helper class is used to listen for
* PropertyChangeEvents from the progressBar.
*/
private class PropertyChangeHandler implements PropertyChangeListener
{
/**
* Called every time the properties of the
* progressBar change.
*
* @param e The PropertyChangeEvent given by the progressBar.
*/
public void propertyChange(PropertyChangeEvent e)
{
// Only need to listen for indeterminate changes.
// All other things are done on a repaint.
if (e.getPropertyName().equals(JProgressBar.INDETERMINATE_CHANGED_PROPERTY))
if (((Boolean) e.getNewValue()).booleanValue())
startAnimationTimer();
else
stopAnimationTimer();
else
progressBar.repaint();
}
}
/**
* This helper class is used to listen for
* the animationTimer's intervals. On every interval,
* the bouncing box should move.
*/
private class Animator implements ActionListener
{
/**
* Called every time the animationTimer reaches
* its interval.
*
* @param e The ActionEvent given by the timer.
*/
public void actionPerformed(ActionEvent e)
{
// Incrementing the animation index will cause
// a repaint.
incrementAnimationIndex();
}
}
/** The timer used to move the bouncing box. */
private transient Timer animationTimer = new Timer();
// The total number of frames must be an even number.
// The total number of frames is calculated from
// the cycleTime and repaintInterval given by
// the basic L&F's defaults.
//
// +-----------------------------------------------+
// | frame0 | frame1 | frame2 | frame 3 | frame 4 |
// | | frame7 | frame6 | frame 5 | |
// +-----------------------------------------------+
/** The current animation index. */
private transient int animationIndex;
/** The total number of frames.*/
private transient int numFrames;
/** The helper that moves the bouncing box. */
private transient Animator animation;
/** The helper that listens for property change events. */
private transient PropertyChangeHandler propertyListener;
/** The Listener for the model. */
protected ChangeListener changeListener;
/** The progressBar for this UI. */
protected JProgressBar progressBar;
/** The length of the cell. The cell is the painted part. */
private transient int cellLength;
/** The gap between cells. */
private transient int cellSpacing;
/** The color of the text when the bar is not over it.*/
private transient Color selectionBackground;
/** The color of the text when the bar is over it. */
private transient Color selectionForeground;
/**
* Creates a new BasicProgressBarUI object.
*/
public BasicProgressBarUI()
{
super();
}
/**
* Creates a new BasicProgressBarUI for the component.
*
* @param x The JComponent to create the UI for.
*
* @return A new BasicProgressBarUI.
*/
public static ComponentUI createUI(JComponent x)
{
return new BasicProgressBarUI();
}
/**
* This method returns the length of the bar (from the minimum)
* in pixels (or units that the Graphics object draws in) based
* on the progressBar's getPercentComplete() value.
*
* @param b The insets of the progressBar.
* @param width The width of the progressBar.
* @param height The height of the progressBar.
*
* @return The length of the bar that should be painted in pixels.
*/
protected int getAmountFull(Insets b, int width, int height)
{
double percentDone = progressBar.getPercentComplete();
if (progressBar.getOrientation() == JProgressBar.HORIZONTAL)
return (int) (percentDone * (width - b.left - b.right));
else
return (int) (percentDone * (height - b.top - b.bottom));
}
/**
* The current animation index.
*
* @return The current animation index.
*/
protected int getAnimationIndex()
{
return animationIndex;
}
/**
* This method returns the size and position of the bouncing box
* for the current animation index. It stores the values in the
* given rectangle and returns it. It returns null if no box should
* be drawn.
*
* @param r The bouncing box rectangle.
*
* @return The bouncing box rectangle.
*/
protected Rectangle getBox(Rectangle r)
{
if (!progressBar.isIndeterminate())
return null;
//numFrames has to be an even number as defined by spec.
int iterations = numFrames / 2 + 1;
double boxDependent;
double boxIndependent;
if (progressBar.getOrientation() == JProgressBar.HORIZONTAL)
{
Dimension dims = getPreferredInnerHorizontal();
boxDependent = (double) dims.width / iterations;
boxIndependent = dims.height;
}
else
{
Dimension dims = getPreferredInnerVertical();
boxDependent = (double) dims.height / iterations;
boxIndependent = dims.width;
}
Rectangle vr = new Rectangle();
SwingUtilities.calculateInnerArea(progressBar, vr);
int index = getAnimationIndex();
if (animationIndex > (numFrames + 1) / 2)
index = numFrames - getAnimationIndex();
if (progressBar.getOrientation() == JProgressBar.HORIZONTAL)
{
r.x = vr.x + (int) (index * boxDependent);
r.y = vr.y;
r.width = (int) boxDependent;
r.height = (int) boxIndependent;
}
else
{
index++;
r.x = vr.x;
r.y = vr.height - (int) (index * boxDependent) + vr.y;
r.width = (int) boxIndependent;
r.height = (int) boxDependent;
}
return r;
}
/**
* This method returns the length of the cells.
*
* @return The cell length.
*/
protected int getCellLength()
{
return cellLength;
}
/**
* This method returns the spacing between cells.
*
* @return The cell gap.
*/
protected int getCellSpacing()
{
return cellSpacing;
}
/**
* This method returns the maximum size of the JComponent.
* If it returns null, it is up to the LayoutManager
* to give it a size.
*
* @param c The component to find a maximum size for.
*
* @return The maximum size.
*/
public Dimension getMaximumSize(JComponent c)
{
return getPreferredSize(c);
}
/**
* This method returns the minimum size of the JComponent.
* If it returns null, it is up to the LayoutManager to
* give it a size.
*
* @param c The component to find a minimum size for.
*
* @return The minimum size.
*/
public Dimension getMinimumSize(JComponent c)
{
return getPreferredSize(c);
}
/**
* This method returns the preferred size of the inner
* rectangle (the bounds without the insets) if the
* progressBar is horizontal.
*
* @return The preferred size of the progressBar minus
* insets if it's horizontal.
*/
protected Dimension getPreferredInnerHorizontal()
{
Rectangle vr = new Rectangle();
SwingUtilities.calculateInnerArea(progressBar, vr);
return new Dimension(vr.width, vr.height);
}
/**
* This method returns the preferred size of the inner
* rectangle (the bounds without insets) if the
* progressBar is vertical.
*
* @return The preferred size of the progressBar minus
* insets if it's vertical.
*/
protected Dimension getPreferredInnerVertical()
{
Rectangle vr = new Rectangle();
SwingUtilities.calculateInnerArea(progressBar, vr);
return new Dimension(vr.width, vr.height);
}
/**
* This method returns the preferred size of the
* given JComponent. If it returns null, then it
* is up to the LayoutManager to give it a size.
*
* @param c The component to find the preferred size for.
*
* @return The preferred size of the component.
*/
public Dimension getPreferredSize(JComponent c)
{
// The only thing we need to worry about is
// the text size.
Graphics g = progressBar.getGraphics();
Insets insets = c.getInsets();
FontMetrics fm = g.getFontMetrics(c.getFont());
int textW = fm.stringWidth(progressBar.getString());
int textH = fm.getHeight();
g.dispose();
if (progressBar.getOrientation() == JProgressBar.HORIZONTAL)
{
if (textH < 20)
textH = 20;
if (textW < 200)
textW = 200;
}
else
{
if (textH < 200)
textH = 200;
if (textW < 20)
textW = 20;
}
textW += insets.left + insets.right;
textH += insets.top + insets.bottom;
return new Dimension(textW, textH);
}
/**
* This method returns the Color that the text is shown in when the bar is
* not over the text.
*
* @return The color of the text when the bar is not over it.
*/
protected Color getSelectionBackground()
{
return selectionBackground;
}
/**
* This method returns the Color that the text is shown in when the bar is
* over the text.
*
* @return The color of the text when the bar is over it.
*/
protected Color getSelectionForeground()
{
return selectionForeground;
}
/**
* This method returns the point (the top left of the bounding box)
* where the text should be painted.
*
* @param g The Graphics object to measure FontMetrics with.
* @param progressString The string to paint.
* @param x The x coordinate of the overall bounds box.
* @param y The y coordinate of the overall bounds box.
* @param width The width of the overall bounds box.
* @param height The height of the overall bounds box.
*
* @return The top left of the bounding box where text should be painted.
*/
protected Point getStringPlacement(Graphics g, String progressString, int x,
int y, int width, int height)
{
Rectangle tr = new Rectangle();
Rectangle vr = new Rectangle(x, y, width, height);
Rectangle ir = new Rectangle();
Font f = g.getFont();
FontMetrics fm = g.getFontMetrics(f);
SwingUtilities.layoutCompoundLabel(progressBar, fm, progressString, null,
SwingConstants.CENTER,
SwingConstants.CENTER,
SwingConstants.CENTER,
SwingConstants.CENTER, vr, ir, tr, 0);
return new Point(tr.x, tr.y);
}
/**
* This method increments the animation index.
*/
public void incrementAnimationIndex()
{
animationIndex++;
//numFrames is like string length, it should be named numFrames or something
if (animationIndex >= numFrames)
animationIndex = 0;
progressBar.repaint();
}
/**
* This method paints the progressBar. It delegates its responsibilities
* to paintDeterminate and paintIndeterminate.
*
* @param g The Graphics object to paint with.
* @param c The JComponent to paint.
*/
public void paint(Graphics g, JComponent c)
{
if (! progressBar.isIndeterminate())
paintDeterminate(g, c);
else
paintIndeterminate(g, c);
if (progressBar.isBorderPainted())
progressBar.getBorder().paintBorder(progressBar, g, 0, 0,
progressBar.getWidth(),
progressBar.getHeight());
}
/**
* This method is called if the painting to be done is
* for a determinate progressBar.
*
* @param g The Graphics object to paint with.
* @param c The JComponent to paint.
*/
protected void paintDeterminate(Graphics g, JComponent c)
{
Color saved = g.getColor();
int space = getCellSpacing();
int len = getCellLength();
int max = progressBar.getMaximum();
int min = progressBar.getMinimum();
int value = progressBar.getValue();
Rectangle vr = new Rectangle();
SwingUtilities.calculateInnerArea(c, vr);
Rectangle or = c.getBounds();
Insets insets = c.getInsets();
int amountFull = getAmountFull(insets, or.width, or.height);
g.setColor(c.getBackground());
g.fill3DRect(vr.x, vr.y, vr.width, vr.height, false);
if (max != min && len != 0 && value > min)
{
int iterations = value / (space + len);
if (progressBar.getOrientation() == JProgressBar.HORIZONTAL)
{
double spaceInUnits = space * (double) vr.width / (max - min);
double lenInUnits = len * (double) vr.width / (max - min);
double currX = vr.x;
g.setColor(c.getForeground());
g.fill3DRect(vr.x, vr.y, amountFull, vr.height, true);
g.setColor(c.getBackground());
if (spaceInUnits != 0)
{
for (int i = 0; i < iterations; i++)
{
currX += lenInUnits;
g.fill3DRect((int) currX, vr.y, (int) spaceInUnits,
vr.height, true);
currX += spaceInUnits;
}
}
}
else
{
double currY = vr.y;
double spaceInUnits = space * (double) vr.height / (max - min);
double lenInUnits = len * (double) vr.height / (max - min);
g.setColor(c.getForeground());
g.fill3DRect(vr.x, vr.y + vr.height - amountFull, vr.width,
amountFull, true);
g.setColor(c.getBackground());
if (spaceInUnits != 0)
{
for (int i = 0; i < iterations; i++)
{
currY -= lenInUnits + spaceInUnits;
g.fill3DRect(vr.x, (int) currY, vr.width,
(int) spaceInUnits, true);
}
}
}
}
if (progressBar.isStringPainted() && !progressBar.getString().equals(""))
paintString(g, 0, 0, or.width, or.height, amountFull, insets);
g.setColor(saved);
}
/**
* This method is called if the painting to be done is for
* an indeterminate progressBar.
*
* @param g The Graphics object to paint with.
* @param c The JComponent to paint.
*/
protected void paintIndeterminate(Graphics g, JComponent c)
{
//need to paint the box at it's current position. no text is painted since
//all we're doing is bouncing back and forth
Color saved = g.getColor();
Insets insets = c.getInsets();
Rectangle or = c.getBounds();
Rectangle vr = new Rectangle();
SwingUtilities.calculateInnerArea(c, vr);
g.setColor(c.getBackground());
g.fill3DRect(vr.x, vr.y, vr.width, vr.height, false);
Rectangle box = new Rectangle();
getBox(box);
g.setColor(c.getForeground());
g.fill3DRect(box.x, box.y, box.width, box.height, true);
if (progressBar.isStringPainted() && !progressBar.getString().equals(""))
paintString(g, 0, 0, or.width, or.height,
getAmountFull(insets, or.width, or.height), insets);
g.setColor(saved);
}
/**
* This method paints the string for the progressBar.
*
* @param g The Graphics object to paint with.
* @param x The x coordinate of the progressBar.
* @param y The y coordinate of the progressBar.
* @param width The width of the progressBar.
* @param height The height of the progressBar.
* @param amountFull The amount of the progressBar that has its bar filled.
* @param b The insets of the progressBar.
*/
protected void paintString(Graphics g, int x, int y, int width, int height,
int amountFull, Insets b)
{
// We want to place in the exact center of the bar.
Point placement = getStringPlacement(g, progressBar.getString(),
x + b.left, y + b.top,
width - b.left - b.right,
height - b.top - b.bottom);
Color saved = g.getColor();
// FIXME: The Color of the text should use selectionForeground and selectionBackground
// but that can't be done right now, so we'll use white in the mean time.
g.setColor(Color.WHITE);
FontMetrics fm = g.getFontMetrics(progressBar.getFont());
g.drawString(progressBar.getString(), placement.x,
placement.y + fm.getAscent());
g.setColor(saved);
}
/**
* This method sets the current animation index. If the index
* is greater than the number of frames, it resets to 0.
*
* @param newValue The new animation index.
*/
protected void setAnimationIndex(int newValue)
{
animationIndex = (newValue <= numFrames) ? newValue : 0;
progressBar.repaint();
}
/**
* This method sets the cell length.
*
* @param cellLen The cell length.
*/
protected void setCellLength(int cellLen)
{
cellLength = cellLen;
}
/**
* This method sets the cell spacing.
*
* @param cellSpace The cell spacing.
*/
protected void setCellSpacing(int cellSpace)
{
cellSpacing = cellSpace;
}
/**
* This method starts the animation timer. It is called
* when the propertyChangeListener detects that the progressBar
* has changed to indeterminate mode.
*/
protected void startAnimationTimer()
{
if (animationTimer != null)
animationTimer.start();
}
/**
* This method stops the animation timer. It is called when
* the propertyChangeListener detects that the progressBar
* has changed to determinate mode.
*/
protected void stopAnimationTimer()
{
if (animationTimer != null)
animationTimer.stop();
setAnimationIndex(0);
}
/**
* This method changes the settings for the progressBar to
* the defaults provided by the current Look and Feel.
*/
protected void installDefaults()
{
UIDefaults defaults = UIManager.getLookAndFeelDefaults();
progressBar.setFont(defaults.getFont("ProgressBar.font"));
progressBar.setForeground(defaults.getColor("ProgressBar.foreground"));
progressBar.setBackground(defaults.getColor("ProgressBar.background"));
progressBar.setBorder(defaults.getBorder("ProgressBar.border"));
progressBar.setOpaque(true);
selectionForeground = defaults.getColor("ProgressBar.selectionForeground");
selectionBackground = defaults.getColor("ProgressBar.selectionBackground");
cellLength = defaults.getInt("ProgressBar.cellLength");
cellSpacing = defaults.getInt("ProgressBar.cellSpacing");
int repaintInterval = defaults.getInt("ProgressBar.repaintInterval");
int cycleTime = defaults.getInt("ProgressBar.cycleTime");
if (cycleTime % repaintInterval != 0
&& (cycleTime / repaintInterval) % 2 != 0)
{
int div = (cycleTime / repaintInterval) + 2;
div /= 2;
div *= 2;
cycleTime = div * repaintInterval;
}
setAnimationIndex(0);
numFrames = cycleTime / repaintInterval;
animationTimer.setDelay(repaintInterval);
}
/**
* The method uninstalls any defaults that were
* set by the current Look and Feel.
*/
protected void uninstallDefaults()
{
progressBar.setFont(null);
progressBar.setForeground(null);
progressBar.setBackground(null);
selectionForeground = null;
selectionBackground = null;
}
/**
* This method registers listeners to all the
* components that this UI delegate needs to listen to.
*/
protected void installListeners()
{
changeListener = new ChangeHandler();
propertyListener = new PropertyChangeHandler();
animation = new Animator();
progressBar.addChangeListener(changeListener);
progressBar.addPropertyChangeListener(propertyListener);
animationTimer.addActionListener(animation);
}
/**
* This method unregisters listeners to all the
* components that were listened to.
*/
protected void uninstallListeners()
{
progressBar.removeChangeListener(changeListener);
progressBar.removePropertyChangeListener(propertyListener);
animationTimer.removeActionListener(animation);
changeListener = null;
propertyListener = null;
animation = null;
}
/**
* This method installs the UI for the given JComponent.
* This includes setting up defaults and listeners as
* well as initializing any values or objects that
* the UI may need.
*
* @param c The JComponent that is having this UI installed.
*/
public void installUI(JComponent c)
{
super.installUI(c);
if (c instanceof JProgressBar)
{
progressBar = (JProgressBar) c;
animationTimer = new Timer();
animationTimer.setRepeats(true);
installDefaults();
installListeners();
}
}
/**
* This method removes the UI for the given JComponent.
* This includes removing any listeners or defaults
* that the installUI may have set up.
*
* @param c The JComponent that is having this UI uninstalled.
*/
public void uninstallUI(JComponent c)
{
super.uninstallUI(c);
uninstallListeners();
uninstallDefaults();
animationTimer = null;
progressBar = null;
}
}