yggdrasil/gcc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[multiple changes]

Browse Source 
2004-03-12  Graydon Hoare  <graydon@redhat.com>

	* gnu/java/awt/peer/gtk/GdkGraphics2D.java: Clipping fixes.
	* javax/swing/JComponent.java (paint): Use persistent double buffer.
	* javax/swing/JList.java (ListListener): Revalidate on changes.
	* javax/swing/JScrollPane.java: Reimplement.
	* javax/swing/JViewport.java: Reimplement.
	* javax/swing/ScrollPaneLayout.java: Reimplement.
	* javax/swing/ViewportLayout.java: Tidy up.
	* javax/swing/plaf/basic/BasicButtonListener.java: Remove printlns.
	* javax/swing/plaf/basic/BasicScrollPaneUI.java: Reimplement.
	* javax/swing/plaf/basic/BasicSliderUI.java: Handle missing labels.
	* javax/swing/plaf/basic/BasicViewportUI.java: Implement in terms of
	backing store only.

2004-03-11  Thomas Fitzsimmons  <fitzsim@redhat.com>

	* jni/gtk-peer/gnu_java_awt_peer_gtk_GtkWindowPeer.c
	(window_wm_protocols_filter): New function.
	(window_focus_in_cb): Remove function.
	(window_focus_out_cb): Likewise.
	(window_focus_or_active_state_change_cb): New function.
	(create): Add filter that removes WM_TAKE_FOCUS client messages.
	(connectSignals): Don't attach handlers to focus-in-event or
	focus-out-event signals.  Handle notify signal.

2004-03-11  David Jee  <djee@redhat.com>

	* gnu/java/awt/peer/gtk/GtkCheckboxPeer.java
	(gtkSetLabel): New native method declaration.
	(setLabel): Use gtkSetLabel.
	* jni/gtk-peer/gnu_java_awt_peer_gtk_GtkCheckboxPeer.c
	(Java_gnu_java_awt_peer_gtk_GtkCheckboxPeer_gtkSetLabel): New method.

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

	* gnu/java/awt/peer/gtk/GdkGraphics.java (setColor): Default to
	black when color argument is null.

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

	* java/awt/Container.java: Remove check
	for drag events.

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

	* java/awt/Container.java: (visitChild):
	Remove candidate clip. Use the component
	clip to intersect.
	* gnu/java/awt/peer/gtk/GtkComponentPeer.java:
	(handleEvent): Use the PaintEvent's clip.

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

	* gnu/java/awt/peer/gtk/GtkComponentPeer.java:
	(handleEvent): Don't set the clip for the
	Graphics object.

2004-03-09  Graydon Hoare  <graydon@redhat.com>

	* jni/gtk-peer/gnu_java_awt_peer_gtk_GdkGlyphVector.c:
	Fix double <-> fixed macros, reset font transform.
	* jni/gtk-peer/gnu_java_awt_peer_gtk_GdkClasspathFontPeerMetrics.c:
	Likewise.

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

	* java/awt/Container.java: (visitChild): Move
	the x and y coordinate of the component rectangle
	to correct position.
	(handleEvent): Forward drag events to the pressed
	component.
	* javax/swing/plaf/basic/BasicScrollBarUI.java:
	Fix comments.
	(ArrowButtonListener::mousePressed): Stop the
	existing timer.
	(mouseDragged): Implement.
	(TrackListener::mousePressed): Only react if
	the press doesn't occur on the thumb, otherwise
	just set the offset.
	(TrackListener::mouseReleased): Unset the isAdjusting
	value.
	(createIncreaseIcon): Switch icon.
	(createDecreaseIcon): Switch icon.
	(calculatePreferredSize): Use width.
	(getThumbBounds): Use the top as the lower value.
	(layoutVScrollBar): Switch the button locations.
	(paintIncreaseHighlight): Paint correct side of thumb.
	(paintDecreaseHighlight): ditto.
	(valueForYPosition): Use top as the lower value.
	* javax/swing/plaf/basic/BasicSliderUI.java:
	Fix comments.
	(mouseDragged): Implement.
	(mousePressed): Only react when the thumb isn't
	pressed, otherwise just set offset.
	(mouseReleased): Handle a release of the thumb.
	(scrollDueToClickInTrack): Stop the timer first.
	* javax/swing/JProgressBar.java:
	(setString): Fix change condition.
	* javax/swing/JSeparator.java:
	Remove println's.

2004-03-08  David Jee  <djee@redhat.com>

	* java/awt/image/AffineTransformOp.java:
	(filter): Use Graphics2D interface instead of directly using the
	GdkGraphics2D peer.

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

	* gnu/java/awt/peer/gtk/GtkButtonPeer.java
	(handleEvent): Action events are generated upon MOUSE_RELEASED.
	* java/awt/Container.java
	(acquireComponentForMouseEvent): Fixed.
	(handleEvent): Fixed.
	* jni/gtk-peer/gnu_java_awt_peer_gtk_GtkEvents.c
	(state_to_awt_mods_with_button_states): New method.
	(pre_event_handler): Fixed mouse event generation.

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

	gnu/java/awt/peer/gtk/GdkGraphics2D.java
	(GdkGraphics2D (BufferedImage)): Initialize
	pixmap associated with specified BufferedImage.
	(setPaint): Changed implementation of Texture
	Paint to use AffineTransformOp.
	* java/awt/image/AffineTransformOp.java
	(createCompatibleDestRaster): Throw RasterFormatException
	if resulting width or height of raster is 0.

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

	* java/awt/image/AffineTransformOp.java:
	Removed unnecessary field interpolationType.
	Formatted some of the lines to be consistent with
	the GNU style.
	(AffineTransformOp): Create new RenderingHints
	containing specified interpolation type.
	(createCompatibleDestImage): Implemented.
	(createCompatibleDestRaster): Implemented.
	(filter): Implemented.
	(getBounds2D(BufferedImage)): Implemented.
	(getBounds2D(Raster)): Implemented.
	(getInterpolationType): Get interpolation value from
	rendering hints.

2004-03-04  David Jee  <djee@redhat.com>

	* gnu/java/awt/peer/gtk/GtkContainerPeer.java
	(setFont): Check if child peers are null.

2004-03-04  Graydon Hoare  <graydon@redhat.com>

	* testsuite/lib/libjava.exp (libjava_find_lib): Don't include
	.libs in -L option.
	(libjava_arguments): Add new libraries to argument list.

2004-03-04  Tom Tromey  <tromey@redhat.com>

	* Makefile.in: Rebuilt.
	* Makefile.am (toolexeclib_LTLIBRARIES): Added lib-java-awt.la,
	lib-javax-swing.la, lib-java-applet.la, lib-java-beans.la.
	(misc_java_source_files): New macro.
	(swing_java_source_files): Likewise.
	(awt_java_source_files): Pruned.
	(applet_java_source_files): New macro.
	(beans_java_source_files): Likewise.
	(lib_java_applet_la_SOURCES): Likewise.
	(lib_java_awt_la_SOURCES): Likewise.
	(lib_javax_swing_la_SOURCES): Likewise.
	(lib_java_beans_la_SOURCES): Likewise.
	(all_java_object_files): Likewise.
	(%.lo: %.java): Use all_java_object_files.
	(all_java_source_files): Added new _SOURCES.
	(ordinary_java_source_files): Removed awt_java_source_files.

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

	* Makefile.am: Added java/awt/image/AffineTransformOp.java
	* Makefile.in: Re-generated.
	* java/awt/image/AffineTransformOp.java: New Class.

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

	* gnu/java/awt/peer/gtk/GdkGraphics2D.java
	(setPaint): Interpret correctly TexturePaint's
	anchor rectangle.
	(drawImage): Fixed scale factors of the affine
	transform.

2004-02-27  David Jee  <djee@redhat.com>

	* gnu/java/awt/peer/gtk/GdkGraphics.java
	(GdkGraphics(Component)): Inherit font from component.
	(drawString): Use font style.
	* gnu/java/awt/peer/gtk/GtkCheckboxPeer.java
	(gtkSetFont): New native method declaration.
	(setFont): New method.
	* gnu/java/awt/peer/gtk/GtkComponentPeer.java
	(gtkSetFont): New native method declaration.
	(setFont): Call new native method gtkSetFont.
	* gnu/java/awt/peer/gtk/GtkContainerPeer.java
	(setFont): For all child components who do not their fonts set,
        set their peers' fonts with this container's font.
	* gnu/java/awt/peer/gtk/GtkLabelPeer.java:
	Move all native method declarations to the top for readability.
	(gtkSetFont): New native method declaration.
	(setFont): New method.
	* java/awt/Component.java
	(setFont): Invalidate after setting the font.
	* java/awt/Container.java
	(invalidateTree): New method.
	(setFont): Invalidate the container tree after setting the font.
	* jni/gtk-peer/gnu_java_awt_peer_gtk_GdkGraphics.c
	(Java_gnu_java_awt_peer_gtk_GdkGraphics_drawString): Use font style.
	* jni/gtk-peer/gnu_java_awt_peer_gtk_GtkCheckboxPeer.c
	(Java_gnu_java_awt_peer_gtk_GtkCheckboxPeer_gtkSetFont): New method.
	* jni/gtk-peer/gnu_java_awt_peer_gtk_GtkComponentPeer.c
	(Java_gnu_java_awt_peer_gtk_GtkComponentPeer_gtkSetFont): New method.
	* jni/gtk-peer/gnu_java_awt_peer_gtk_GtkLabelPeer.c
	(Java_gnu_java_awt_peer_gtk_GtkLabelPeer_gtkSetFont): New method.

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

	* gnu/java/awt/peer/gtk/GdkGraphics2D.java
	(updateBufferedImage): New helper function.
	Updates BufferedImage in memory if it was changed.
	(draw): changed to update BufferedImage in memory after
	this drawing operation
	(fill): Ditto.
	(draw3DRect): Ditto.
	(fill3DRect): Ditto.
	(clearRect): Ditto.
	(drawRaster): Ditto.
	(drawImage) : Ditto. Update only in case of GtkOffScreenImage with
	no affine transformation.
	(drawGlyphVector): Ditto.

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

	* gnu/java/awt/peer/gtk/GdkGraphics2D.java
	(isBufferedImageGraphics): New Helper function.
	Returns true if this graphics2d can be used to draw
	into buffered image and false otherwise.
	(updateImagePixels): New Helper function.
	Updates pixels in the BufferedImage.
	* jni/gtk-peer/gnu_java_awt_peer_gtk_GdkGraphics2D.c
	(getImagePixels): New function. Returns pixels
	of the buffered image associated with
	this Graphics2D.

2004-02-26  David Jee  <djee@redhat.com>

	* java/awt/BorderLayout.java
	(layoutContainer): Fix width and height calculations to ensure
	that they're non-negative.
	* java/awt/Component.java
	(setBackground): If c is null, inherit from closest ancestor whose
	background color is set.

2004-02-26�� Kim Ho�� <kho@redhat.com>

	* Makefile.am: Add new files.
	* Makefile.in: Re-generate.
	* javax/swing/JProgressBar.java:
	(JProgressBar(int, int int)): Throw
	IllegalArgumentException if orientation is
	invalid.
	(JProgressBar(BoundedRangeModel)): Create
	ChangeListener and register it. UpdateUI.
	(getChangeListeners): Implement.
	(setModel): Reset ChangeListener.
	* javax/swing/JScrollBar.java: Implement.
	* javax/swing/JSeparator.java: Implement.
	* javax/swing/JSlider.java:
	(JSlider(int, int, int, int)): Throw
	IllegalArgumentException if orientation
	is invalid.
	(getChangeListeners): Fix method name.
	* javax/swing/SwingUtilities.java:
	(layoutCompoundLabel): If there is no text,
	set the text rectangle dimensions to 0.
	* javax/swing/plaf/basic/BasicButtonUI.java:
	(paint): If there is no text, don't paint it.
	* javax/swing/plaf/basic/BasicScrollBarUI.java:
	Implement.
	* javax/swing/plaf/basic/BasicSeparatorUI.java:
	Implement.
	* javax/swing/plaf/basic/BasicSliderUI.java:
	(propertyChange): If the model changes, change
	the listeners accordingly.

2004-02-25  Graydon Hoare  <graydon@redhat.com>

	* javax/swing/AbstractButton.java: Add "final" qualifiers.
	* javax/swing/JList.java: Reimplement.
	* javax/swing/DefaultListSelectionModel.java: Reimplement.
	* javax/swing/plaf/basic/BasicListUI.java: Reimplement.
	* javax/swing/plaf/basic/BasicLookAndFeel.java: Add "purple" values.
	* javax/swing/ListModel.java: Javadoc.
	* javax/swing/ListSelectionModel.java: Add missing methods.
	* javax/swing/AbstractListModel.java: Javadoc and corrections.
	* javax/swing/DefaultListModel.java: Javadoc and corrections.
	* javax/swing/ListModel.java: Javadoc and corrections.
	* javax/swing/DefaultListCellRenderer.java: Minor tidying.

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

	* gnu/java/awt/peer/gtk/GtkFontPeer.java
	(GtkFontPeer): Change default size to 12.
	* gnu/java/awt/peer/gtk/GtkToolkit.java
	(getFontPeer): Change default size to 12.
	(getClasspathFontPeer): Likewise. Set default name to "Default".
	* java/awt/Font.java
	(Font(Map)): Call Font(String,Map).
	(Font(String,Map)): If attrs is null, initialize it as an empty
	HashMap, which will ensure that the Font will get default attributes.

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

	* gnu/java/awt/peer/gtk/GtkFontPeer.java
	(GtkFontPeer(String,int)): Call the new constructor with size 1.
	(GtkFontPeer(String,int,int)): New constructor with size attribute.
	* gnu/java/awt/peer/gtk/GtkToolkit.java
	(getFontPeer(String,int)): Call the new overload method with size 1.
	(getFontPeer(String,int,int)): New method. Overloaded with size
	attribute.
	(getClasspathFontPeer): Set the size of the font.

2004-02-24  Olga Rodimina  <rodimina@redhat.com>

	* gnu/java/awt/peer/gtk/GdkGraphics2D.java
	(bimage): New field.
	(GdkGraphics2D): New Constructor. Constructs Graphics
	object that can be used to draw into the Buffered Image.
	* gnu/java/awt/peer/gtk/GdkGraphicsEnvironment.java:
	(GdkGraphicsEnvironment): Fixed to include public
	keyword.
	(createGraphics): Implemented.
	* gnu/java/awt/peer/gtk/GtkToolkit.java
	(getLocalGraphicsEnvironment): Implemented.
	* java/awt/GraphicsEnvironment.java:
	(getLocalGraphicsEnvironment): Implemented.
	* java/awt/image/BufferedImage.java:
	(createGraphics): Implemented.

2004-02-24  David Jee  <djee@redhat.com>

	* java/awt/Component.java
	(eventTypeEnabled): Add MOUSE_MOVED and MOUSE_DRAGGED event types.
	* java/awt/Container.java
	(addNotifyContainerChildren): Fix event enabling.

2004-02-23  Olga Rodimina  <rodimina@redhat.com>

	* Makefile.am: Added
	gnu/java/awt/peer/gtk/GdkGraphicsEnvironment.java
	* Makefile.in: Re-generated.
	* gnu/java/awt/peer/gtk/GdkGraphicsEnvironment.java:
	New Class.

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

	* Makefile.am: Add BasicProgressBarUI
	* Makefile.in: Regenerate.
	* javax/swing/JProgressBar.java:
	Re-implement.
	* javax/swing/plaf/basic/BasicLookAndFeel.java
	Add constants for JProgressBar.
	* javax/swing/plaf/basic/BasicProgressBarUI.java
	Implement.
	* javax/swing/plaf/basic/BasicSliderUI.java
	Change comments.
	(calculateGeometry): New method
	(paint): Remove unnecessary size calculations.

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

	* gnu/java/awt/peer/gtk/GdkGraphics2D.java
	(drawRaster): Fixed small error that caused
	imageToUser transformation to be set incorrectly.
	(toString): Implemented.

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

	* java/awt/CardLayout.java
	(addLayoutComponent): Show the first component added as the default.
	(removeLayoutComponent): After removing, show the next component.
	(gotoComponent): If there is only one component, show it and return.

2004-02-18  Kim Ho  <kho@redhat.com>

	* javax/swing/JSlider.java: Re-order
	modifiers.
	* javax/swing/JLabel.java: Re-order
	modifiers.
	* javax/swing/JComponent.java:
	(addPropertyChangeListener):
	Implement.
	(removePropertyChangeListener):
	ditto.
	(firePropertyChangeEvent):
	ditto.

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

	* java/awt/Component.java
	(show): Dispatch ComponentEvent via system event queue.
	(hide): Likewise.
	(move): Likewise.
	(resize): Likewise.
	(reshape): Likewise.
	* java/awt/Window.java
	(setBoundsCallback): Likewise.

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

	* jni/gtk-peer/gnu_java_awt_peer_gtk_GtkComponentPeer.c
	(Java_gnu_java_awt_peer_gtk_GtkComponentPeer_setNativeBounds):
	Use gtk_widget_set_size_request() instead of the deprecated
	gtk_widget_set_usize().

2004-02-17  Kim Ho  <kho@redhat.com>

	* javax/swing/JSlider.java: Fix comments and
	make property strings constants.
	(createStandardLabels): Use the labels
	preferred size as bounds.
	* javax/swing/plaf/basic/BasicSliderUI.java
	Fix comments.
	(ScrollHandler::actionPerformed): Don't
	calculate the timer stop value. Let the
	MouseListeners find the stop location.
	(getPreferredHorizontalSize): Re-implement.
	(getPreferredVerticalSize): ditto.
	(getMinimumHorizontalSize): ditto.
	(getMinimumVerticalSize): ditto.
	(getPreferredSize): ditto.
	(getMinimumSize): ditto.
	(getMaximumSize): ditto.
	(paintTicks): Use doubles to find the
	tick location.
	(paintHorizontalLabel):�� Use preferredSize
	as initial width and height.
	(paintVerticalLabel): ditto.

2004-02-17  Kim Ho  <kho@redhat.com>

	* javax/swing/JLabel.java: Changed
	property strings to constants.
	(DISPLAYED_MNEMONIC_INDEX_CHANGED_PROPERTY):
	New property.
	(setText): Change mnemonic index if
	text is too short.
	(setDisplayedMnemonicIndex): Fire property
	change event.
	(getDisplayedMnemonicIndex): Remove check
	against short text.

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

	* gnu/java/awt/peer/gtk/GdkGraphics2D.java:
	(drawImage(img,xform,obs)): Invert xform before
	passing the xform to cairo.
	(drawImage(img,x,y,bgcolor,obs)): Implemented.
	(drawImage (img,x,y,w,h,bgcolor,obs)): Partly
	implemented.
	(drawImage (img,x,y,w,h,obs)): Implemented.
	(drawImage (img,dx1,dy1,dx2,dy2,sx1,sy1,sx2,sy2,
	bgcolor,obs)): Partly implemented.
	(drawImage (img,dx1,dy1,dx2,dy2,sx1,sy1,sx2,sy2,obs)):
	Implemented.
	* java/awt/image/BufferedImage.java:
	(copyData): if dest is null, create raster with same
	dimensions as the current image.

2004-02-16  Graydon Hoare  <graydon@redhat.com>

	* javax/swing/plaf/basic/BasicLabelUI.java
	(getPreferredSize): Use layoutCL.
	* javax/swing/plaf/basic/BasicGraphicsUtils.java
	(getPreferredButtonSize): Start with empty view rect, layout using
	component's preferred alignment.
	* javax/swing/plaf/basic/BasicLookAndFeel.java: Add some Label and
	List defaults.

2004-02-16  David Jee  <djee@redhat.com>

	* java/awt/Component.java
	(show): Dispatch COMPONENT_SHOWN ComponentEvent.
	(hide): Dispatch COMPONENT_HIDDEN ComponentEvent.
	(move): Erase old bounds and repaint new bounds. Dispatch
	COMPONENT_MOVED ComponentEvent.
	(resize): Erase old bounds and repaint new bounds. Dispatch
	COMPONENT_RESIZED ComponentEvent.
	(reshape): Dispatch COMPONENT_RESIZED and COMPONENT_MOVED
	ComponentEvents.
	* java/awt/Window.java
	(setBoundsCallback): Dispatch COMPONENT_RESIZED and COMPONENT_MOVED
	ComponentEvents.

2004-02-16  Olga Rodimina  <rodimina@redhat.com>

	* gnu/java/awt/peer/gtk/GdkGraphics2D.java:
	(setRenderingHint): Added implementation of
	Interpolation rendering hints.
	(setRenderingHints): Ditto.
	* jni/gtk-peer/gnu_java_awt_peer_gtk_GdkGraphics2D.c:
	(drawPixels): fixed to allow user to choose type
	of filtering that should be used when displaying images.
	(cairoSurfaceSetFilter): New method. Sets filter type for
	interpolation of pixel values.

2004-02-16  David Jee  <djee@redhat.com>

	* java/awt/GridBagLayout.java
	(calcCellSizes): Rows or columns with zero sizes should still be
	considered for extra space distribution.

2004-02-16  Kim Ho  <kho@redhat.com>

	* javax/swing/JLabel.java: Re-implement.
	* javax/swing/plaf/basic/BasicLabelUI.java
	Re-implement.
	* javax/swing/plaf/basic/BasicLookAndFeel.java:
	Added constant.

2004-02-16�� Kim Ho�� <kho@redhat.com>

	* javax/swing/JSlider.java: Fix indentation and comments.
	(setModel): Remove null check to conform with Sun's.
	(setOrientation): Throw exception if not
	HORIZONTAL or VERTICAL.
	(getInverted): Use private variable instead of
	ComponentOrientation.
	(setInverted): ditto.
	* javax/swing/plaf/basic/BasicSliderUI.java:
	Fix indentation and comments.
	(propertyChange): Remove check for inverted slider, handle
	in main paint.
	(getMinimumSize): Return preferred size.
	(getMaximumSize): ditto.
	(calculateFocusRect): Don't relocate rectangle.
	(drawInverted): Return XOR of the slider's inversion and
	the component's orientation.
	(paint): Update leftToRightCache

2004-02-13  David Jee  <djee@redhat.com>

	* java/awt/GridBagLayout.java
	(GetLayoutInfo): Fix weight and size distribution. Relocate repeated
	code to helper methods.
	(sortBySpan): New helper method.
	(distributeSizeAndWeight): Likewise.
	(calcCellWeights): Likewise.
	(calcCellSizes): Add comments.

2004-02-13  David Jee  <djee@redhat.com>

	* java/awt/Component.java
        (show): Only do something if component is invisible at the moment.
        (hide): Only do something if component is visible at the moment.
        (reshape): If lightweight, erase old bounds and repaint new bounds.

2004-02-13�� Kim Ho�� <kho@redhat.com>

	* Makefile.am: Updated for new file.
	* Makefile.in: Regenerated.
	* javax/swing/JSlider.java: Reimplement.
	* javax/swing/SwingUtilities.java
	(layoutCompoundLabel): Use icon height
	instead of width.
	(paintComponent): Implement.
	* javax/swing/plaf/basic/BasicLookAndFeel.java:
	Add JSlider defaults.
	* javax/swing/plaf/basic/BasicSliderUI.java:
	Implement. New file.

From-SVN: r79607
This commit is contained in:
Graydon Hoare
2004-03-17 21:29:02 +00:00
parent ab3533d655
commit 86881a7b54
65 changed files with 14340 additions and 3671 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libjava/java/awt/BorderLayout.java
+3 -2
View File
@@ -592,12 +592,13 @@ layoutContainer(Container target)
int x1 = i.left;
int x2 = x1 + w.width + hgap;
int x3 = t.width - i.right - e.width;
int x3 = Math.max(x2 + w.width + hgap, t.width - i.right - e.width);
int ww = t.width - i.right - i.left;
int y1 = i.top;
int y2 = y1 + n.height + vgap;
int y3 = t.height - i.bottom - s.height;
int midh = Math.max(e.height, Math.max(w.height, c.height));
int y3 = Math.max(y2 + midh + vgap, t.height - i.bottom - s.height);
int hh = y3-y2-vgap;
setBounds(center, x2, y2, x3-x2-hgap, hh);
libjava/java/awt/CardLayout.java
+14
View File
@@ -103,6 +103,11 @@ public class CardLayout implements LayoutManager2, Serializable
public void addLayoutComponent (String name, Component comp)
{
tab.put (name, comp);
// First component added is the default component.
if (tab.size() == 1)
comp.setVisible(true);
else
comp.setVisible(false);
}
/** Cause the first component in the container to be displayed.
@@ -243,6 +248,8 @@ public class CardLayout implements LayoutManager2, Serializable
if (tab.get (key) == comp)
{
tab.remove (key);
Container parent = comp.getParent();
next(parent);
break;
}
}
@@ -311,6 +318,13 @@ public class CardLayout implements LayoutManager2, Serializable
int num = parent.ncomponents;
// This is more efficient than calling getComponents().
Component[] comps = parent.component;
if (num == 1)
{
comps[0].setVisible(true);
return;
}
int choice = -1;
if (what == FIRST)
libjava/java/awt/Component.java
+90 -9
View File
@@ -876,10 +876,16 @@ public abstract class Component
// case lightweight components are not initially painted --
// Container.paint first calls isShowing () before painting itself
// and its children.
this.visible = true;
if (peer != null)
peer.setVisible(true);
invalidate();
if(!isVisible())
{
this.visible = true;
if (peer != null)
peer.setVisible(true);
invalidate();
ComponentEvent ce =
new ComponentEvent(this,ComponentEvent.COMPONENT_SHOWN);
getToolkit().getSystemEventQueue().postEvent(ce);
}
}
/**
@@ -903,10 +909,16 @@ public abstract class Component
*/
public void hide()
{
if (peer != null)
peer.setVisible(false);
this.visible = false;
invalidate();
if (isVisible())
{
if (peer != null)
peer.setVisible(false);
this.visible = false;
invalidate();
ComponentEvent ce =
new ComponentEvent(this,ComponentEvent.COMPONENT_HIDDEN);
getToolkit().getSystemEventQueue().postEvent(ce);
}
}
/**
@@ -974,8 +986,11 @@ public abstract class Component
*/
public void setBackground(Color c)
{
// If c is null, inherit from closest ancestor whose bg is set.
if (c == null && parent != null)
c = parent.getBackground();
firePropertyChange("background", background, c);
if (peer != null)
if (peer != null && c != null)
peer.setBackground(c);
background = c;
}
@@ -1022,6 +1037,7 @@ public abstract class Component
firePropertyChange("font", font, f);
if (peer != null)
peer.setFont(f);
invalidate();
font = f;
}
@@ -1150,6 +1166,9 @@ public abstract class Component
*/
public void move(int x, int y)
{
int oldx = this.x;
int oldy = this.y;
if (this.x == x && this.y == y)
return;
invalidate ();
@@ -1157,6 +1176,20 @@ public abstract class Component
this.y = y;
if (peer != null)
peer.setBounds (x, y, width, height);
// Erase old bounds and repaint new bounds for lightweights.
if (isLightweight() && width != 0 && height !=0)
{
parent.repaint(oldx, oldy, width, height);
repaint();
}
if (oldx != x || oldy != y)
{
ComponentEvent ce = new ComponentEvent(this,
ComponentEvent.COMPONENT_MOVED);
getToolkit().getSystemEventQueue().postEvent(ce);
}
}
/**
@@ -1220,6 +1253,9 @@ public abstract class Component
*/
public void resize(int width, int height)
{
int oldwidth = this.width;
int oldheight = this.height;
if (this.width == width && this.height == height)
return;
invalidate ();
@@ -1227,6 +1263,22 @@ public abstract class Component
this.height = height;
if (peer != null)
peer.setBounds (x, y, width, height);
// Erase old bounds and repaint new bounds for lightweights.
if (isLightweight())
{
if (oldwidth != 0 && oldheight != 0 && parent != null)
parent.repaint(x, y, oldwidth, oldheight);
if (width != 0 && height != 0)
repaint();
}
if (oldwidth != width || oldheight != height)
{
ComponentEvent ce =
new ComponentEvent(this, ComponentEvent.COMPONENT_RESIZED);
getToolkit().getSystemEventQueue().postEvent(ce);
}
}
/**
@@ -1315,6 +1367,11 @@ public abstract class Component
*/
public void reshape(int x, int y, int width, int height)
{
int oldx = this.x;
int oldy = this.y;
int oldwidth = this.width;
int oldheight = this.height;
if (this.x == x && this.y == y
&& this.width == width && this.height == height)
return;
@@ -1325,6 +1382,28 @@ public abstract class Component
this.height = height;
if (peer != null)
peer.setBounds (x, y, width, height);
// Erase old bounds and repaint new bounds for lightweights.
if (isLightweight())
{
if (oldwidth != 0 && oldheight != 0 && parent != null)
parent.repaint(oldx, oldy, oldwidth, oldheight);
if (width != 0 && height != 0)
repaint();
}
if (oldx != x || oldy != y)
{
ComponentEvent ce = new ComponentEvent(this,
ComponentEvent.COMPONENT_MOVED);
getToolkit().getSystemEventQueue().postEvent(ce);
}
if (oldwidth != width || oldheight != height)
{
ComponentEvent ce = new ComponentEvent(this,
ComponentEvent.COMPONENT_RESIZED);
getToolkit().getSystemEventQueue().postEvent(ce);
}
}
/**
@@ -4172,6 +4251,8 @@ p * <li>the set of backward traversal keys
case MouseEvent.MOUSE_EXITED:
case MouseEvent.MOUSE_PRESSED:
case MouseEvent.MOUSE_RELEASED:
case MouseEvent.MOUSE_MOVED:
case MouseEvent.MOUSE_DRAGGED:
return (mouseListener != null
|| mouseMotionListener != null
|| (eventMask & AWTEvent.MOUSE_EVENT_MASK) != 0);
libjava/java/awt/Container.java
+98 -46
View File
@@ -501,6 +501,20 @@ public class Container extends Component
}
}
/**
* Recursively invalidates the container tree.
*/
private void invalidateTree()
{
for (int i = 0; i < ncomponents; i++)
{
Component comp = component[i];
comp.invalidate();
if (comp instanceof Container)
((Container) comp).invalidateTree();
}
}
/**
* Recursively validates the container tree, recomputing any invalid
* layouts.
@@ -546,7 +560,10 @@ public class Container extends Component
public void setFont(Font f)
{
super.setFont(f);
// FIXME, should invalidate all children with font == null
// FIXME: Although it might make more sense to invalidate only
// those children whose font == null, Sun invalidates all children.
// So we'll do the same.
invalidateTree();
}
/**
@@ -1234,6 +1251,7 @@ public class Container extends Component
Rectangle oldClip = gfx.getClipBounds();
if (oldClip == null)
oldClip = bounds;
Rectangle clip = oldClip.intersection(bounds);
if (clip.isEmpty()) return;
@@ -1337,10 +1355,10 @@ public class Container extends Component
// If we're not lightweight, and we just got a lightweight
// child, we need a lightweight dispatcher to feed it events.
if (! this.isLightweight()
&& dispatcher == null)
if (! this.isLightweight())
{
dispatcher = new LightweightDispatcher (this);
if (dispatcher == null)
dispatcher = new LightweightDispatcher (this);
dispatcher.enableEvents (component[i].eventMask);
}
@@ -1536,6 +1554,9 @@ class LightweightDispatcher implements Serializable
private long eventMask;
private transient Component mouseEventTarget;
private transient Component pressedComponent;
private transient Component lastComponentEntered;
private transient int pressCount;
LightweightDispatcher(Container c)
{
@@ -1551,46 +1572,37 @@ class LightweightDispatcher implements Serializable
{
int x = me.getX ();
int y = me.getY ();
Component candidate = mouseEventTarget;
while(candidate != null)
// Find the candidate which should receive this event.
Component parent = nativeContainer;
Component candidate = null;
Point p = me.getPoint();
while (candidate == null && parent != null)
{
if (candidate.isShowing())
{
// Convert our point to the candidate's parent's space.
Point cp = SwingUtilities.convertPoint(nativeContainer, x, y, candidate);
// If the event lands inside candidate, we have a hit.
if (candidate.contains(cp.x, cp.y))
{
// If candidate has children, we refine the hit.
if (candidate instanceof Container &&
((Container)candidate).getComponentCount() > 0)
candidate = SwingUtilities.getDeepestComponentAt(candidate, cp.x, cp.y);
break;
}
}
// If candidate isn't showing or doesn't contain point, we back out a level.
candidate = candidate.getParent();
}
if (candidate == null)
{
// We either lost, or never had, a candidate; acquire from our native.
candidate =
SwingUtilities.getDeepestComponentAt(nativeContainer, x, y);
candidate =
SwingUtilities.getDeepestComponentAt(parent, p.x, p.y);
if (candidate == null)
{
p = SwingUtilities.convertPoint(parent, p.x, p.y, parent.parent);
parent = parent.parent;
}
}
// If the only candidate we found was the native container itself,
// don't dispatch any event at all. We only care about the lightweight
// children here.
if (candidate == nativeContainer)
candidate = null;
// If our candidate is new, inform the old target we're leaving.
if (mouseEventTarget != null
&& mouseEventTarget.isShowing()
&& mouseEventTarget != candidate)
if (lastComponentEntered != null
&& lastComponentEntered.isShowing()
&& lastComponentEntered != candidate)
{
Point tp =
SwingUtilities.convertPoint(nativeContainer,
x, y, mouseEventTarget);
MouseEvent exited = new MouseEvent (mouseEventTarget,
x, y, lastComponentEntered);
MouseEvent exited = new MouseEvent (lastComponentEntered,
MouseEvent.MOUSE_EXITED,
me.getWhen (),
me.getModifiers (),
@@ -1598,22 +1610,23 @@ class LightweightDispatcher implements Serializable
me.getClickCount (),
me.isPopupTrigger (),
me.getButton ());
mouseEventTarget.dispatchEvent (exited);
mouseEventTarget = null;
lastComponentEntered.dispatchEvent (exited);
lastComponentEntered = null;
}
// If we have a candidate, maybe enter it.
if (candidate != null)
{
mouseEventTarget = candidate;
if (candidate.isLightweight()
&& candidate.isShowing()
&& candidate != nativeContainer
&& candidate != mouseEventTarget)
&& candidate != lastComponentEntered)
{
mouseEventTarget = candidate;
lastComponentEntered = mouseEventTarget;
Point cp = SwingUtilities.convertPoint(nativeContainer,
x, y, candidate);
MouseEvent entered = new MouseEvent (mouseEventTarget,
x, y, lastComponentEntered);
MouseEvent entered = new MouseEvent (lastComponentEntered,
MouseEvent.MOUSE_ENTERED,
me.getWhen (),
me.getModifiers (),
@@ -1621,9 +1634,29 @@ class LightweightDispatcher implements Serializable
me.getClickCount (),
me.isPopupTrigger (),
me.getButton ());
mouseEventTarget.dispatchEvent (entered);
lastComponentEntered.dispatchEvent (entered);
}
}
if (me.getID() == MouseEvent.MOUSE_RELEASED
|| me.getID() == MouseEvent.MOUSE_PRESSED && pressCount > 0
|| me.getID() == MouseEvent.MOUSE_DRAGGED)
// If any of the following events occur while a button is held down,
// they should be dispatched to the same component to which the
// original MOUSE_PRESSED event was dispatched:
// - MOUSE_RELEASED
// - MOUSE_PRESSED: another button pressed while the first is held down
// - MOUSE_DRAGGED
mouseEventTarget = pressedComponent;
else if (me.getID() == MouseEvent.MOUSE_CLICKED)
{
// Don't dispatch CLICKED events whose target is not the same as the
// target for the original PRESSED event.
if (candidate != pressedComponent)
mouseEventTarget = null;
else if (pressCount == 0)
pressedComponent = null;
}
}
boolean handleEvent(AWTEvent e)
@@ -1634,17 +1667,36 @@ class LightweightDispatcher implements Serializable
if (e instanceof MouseEvent)
{
MouseEvent me = (MouseEvent) e;
acquireComponentForMouseEvent(me);
// Avoid dispatching an ENTERED event twice.
acquireComponentForMouseEvent(me);
// Avoid dispatching ENTERED and EXITED events twice.
if (mouseEventTarget != null
&& mouseEventTarget.isShowing()
&& e.getID() != MouseEvent.MOUSE_ENTERED)
&& e.getID() != MouseEvent.MOUSE_ENTERED
&& e.getID() != MouseEvent.MOUSE_EXITED)
{
MouseEvent newEvt =
SwingUtilities.convertMouseEvent(nativeContainer, me,
mouseEventTarget);
mouseEventTarget.dispatchEvent(newEvt);
switch (e.getID())
{
case MouseEvent.MOUSE_PRESSED:
if (pressCount++ == 0)
pressedComponent = mouseEventTarget;
break;
case MouseEvent.MOUSE_RELEASED:
// Clear our memory of the original PRESSED event, only if
// we're not expecting a CLICKED event after this. If
// there is a CLICKED event after this, it will do clean up.
if (--pressCount == 0
&& mouseEventTarget != pressedComponent)
pressedComponent = null;
break;
}
}
}
else if (e instanceof KeyEvent && focus != null)
libjava/java/awt/Font.java
+9 -5
View File
@@ -330,16 +330,20 @@ private static final long serialVersionUID = -4206021311591459213L;
}
public Font (Map attrs)
{
this.peer = getPeerFromToolkit (null, attrs);
}
{
this(null, attrs);
}
/* This extra constructor is here to permit ClasspathToolkit and to build
a font with a "logical name" as well as attrs. */
public Font (String name, Map attrs)
{
{
// If attrs is null, setting it to an empty HashMap will give this
// Font default attributes.
if (attrs == null)
attrs = new HashMap();
this.peer = getPeerFromToolkit (name, attrs);
}
}
/*************************************************************************/
libjava/java/awt/GraphicsEnvironment.java
+4 -1
View File
@@ -40,6 +40,7 @@ package java.awt;
import java.awt.image.BufferedImage;
import java.util.Locale;
import gnu.java.awt.ClasspathToolkit;
/**
* This descibes the collection of GraphicsDevice and Font objects available
@@ -70,7 +71,9 @@ public abstract class GraphicsEnvironment
*/
public static GraphicsEnvironment getLocalGraphicsEnvironment()
{
throw new Error("not implemented");
ClasspathToolkit tk;
tk = ((ClasspathToolkit) Toolkit.getDefaultToolkit ());
return tk.getLocalGraphicsEnvironment ();
}
/**
libjava/java/awt/GridBagLayout.java
+266 -153
View File
@@ -39,6 +39,7 @@ exception statement from your version. */
package java.awt;
import java.io.Serializable;
import java.util.ArrayList;
import java.util.Hashtable;
import java.util.HashMap;
@@ -468,8 +469,15 @@ public class GridBagLayout
HashMap lastInRow = new HashMap();
HashMap lastInCol = new HashMap();
// STEP 1: first we figure out how many rows/columns
Component[] components = parent.getComponents();
// Components sorted by gridwidths/heights,
// smallest to largest, with REMAINDER and RELATIVE at the end.
// These are useful when determining sizes and weights.
ArrayList sortedByWidth = new ArrayList(components.length);
ArrayList sortedByHeight = new ArrayList(components.length);
// STEP 1: first we figure out how many rows/columns
for (int i = 0; i < components.length; i++)
{
Component component = components [i];
@@ -578,6 +586,9 @@ public class GridBagLayout
max_y = Math.max(max_y,
constraints.gridy + Math.max(1, constraints.gridheight));
sortBySpan(component, constraints.gridwidth, sortedByWidth, true);
sortBySpan(component, constraints.gridheight, sortedByHeight, false);
// Update our reference points for RELATIVE gridx and gridy.
if(constraints.gridwidth == GridBagConstraints.REMAINDER)
{
@@ -621,85 +632,6 @@ public class GridBagLayout
}
} // end of STEP 1
boolean[] colIsOccupied = new boolean[max_x];
boolean[] rowIsOccupied = new boolean[max_y];
// STEP 2: Determine which cells the components occupy.
for (int i = 0; i < components.length; i++)
{
Component component = components [i];
// If component is not visible we dont have to care about it.
if (!component.isVisible())
continue;
GridBagConstraints constraints = lookupInternalConstraints (component);
// Fix up any REMAINDER and RELATIVE cells.
if(constraints.gridwidth == GridBagConstraints.REMAINDER)
{
for (int y = constraints.gridy; y < constraints.gridy + Math.max(1, constraints.gridheight); y++)
{
if (lastInRow.containsKey(new Integer(y)))
{
Component lastComponent = (Component) lastInRow.get(new Integer(y));
GridBagConstraints lastConstraints = lookupInternalConstraints(lastComponent);
if (lastConstraints.gridwidth == GridBagConstraints.RELATIVE)
{
constraints.gridx = max_x - 1;
break;
}
else
{
constraints.gridx = Math.max (constraints.gridx,
lastConstraints.gridx + Math.max (1, lastConstraints.gridwidth));
}
}
}
constraints.gridwidth = max_x - constraints.gridx;
}
else if (constraints.gridwidth == GridBagConstraints.RELATIVE)
{
constraints.gridwidth = max_x - constraints.gridx - 1;
}
if(constraints.gridheight == GridBagConstraints.REMAINDER)
{
for (int x = constraints.gridx; x < constraints.gridx + Math.max(1, constraints.gridwidth); x++)
{
if (lastInCol.containsKey(new Integer(x)))
{
Component lastComponent = (Component) lastInRow.get(new Integer(x));
GridBagConstraints lastConstraints = lookupInternalConstraints(lastComponent);
if (lastConstraints.gridheight == GridBagConstraints.RELATIVE)
{
constraints.gridy = max_y - 1;
break;
}
else
{
constraints.gridy = Math.max (constraints.gridy,
lastConstraints.gridy + Math.max (1, lastConstraints.gridheight));
}
}
}
constraints.gridheight = max_y - constraints.gridy;
}
else if (constraints.gridheight == GridBagConstraints.RELATIVE)
{
constraints.gridheight = max_y - constraints.gridy - 1;
}
// For now, a row or a column is "occupied" iff a component
// both begins and ends in that row or column.
if (constraints.gridwidth == 1)
colIsOccupied[constraints.gridx] = true;
if (constraints.gridheight == 1)
rowIsOccupied[constraints.gridy] = true;
} // end of STEP 2
GridBagLayoutInfo info = new GridBagLayoutInfo(max_x, max_y);
// Check if column widths and row heights are overridden.
@@ -720,19 +652,98 @@ public class GridBagLayout
info.rowWeights[y] = rowWeights[y];
}
// STEP 3: Distribute the weights and min sizes among rows/columns.
// STEP 2: Fix up any cells with width/height as REMAINDER/RELATIVE.
for (int i = 0; i < components.length; i++)
{
Component component = components [i];
// If component is not visible we dont have to care about it.
if (!component.isVisible())
continue;
GridBagConstraints constraints = lookupInternalConstraints (component);
if(constraints.gridwidth == GridBagConstraints.REMAINDER || constraints.gridwidth == GridBagConstraints.RELATIVE)
{
if(constraints.gridwidth == GridBagConstraints.REMAINDER)
{
for (int y = constraints.gridy; y < constraints.gridy + Math.max(1, constraints.gridheight); y++)
{
if (lastInRow.containsKey(new Integer(y)))
{
Component lastComponent = (Component) lastInRow.get(new Integer(y));
GridBagConstraints lastConstraints = lookupInternalConstraints(lastComponent);
if (lastConstraints.gridwidth == GridBagConstraints.RELATIVE)
{
constraints.gridx = max_x - 1;
break;
}
else
{
constraints.gridx = Math.max (constraints.gridx,
lastConstraints.gridx + Math.max (1, lastConstraints.gridwidth));
}
}
}
constraints.gridwidth = max_x - constraints.gridx;
}
else if (constraints.gridwidth == GridBagConstraints.RELATIVE)
{
constraints.gridwidth = max_x - constraints.gridx - 1;
}
// Re-sort
sortedByWidth.remove(sortedByWidth.indexOf(component));
sortBySpan(component, constraints.gridwidth, sortedByWidth, true);
}
if(constraints.gridheight == GridBagConstraints.REMAINDER || constraints.gridheight == GridBagConstraints.RELATIVE)
{
if(constraints.gridheight == GridBagConstraints.REMAINDER)
{
for (int x = constraints.gridx; x < constraints.gridx + Math.max(1, constraints.gridwidth); x++)
{
if (lastInCol.containsKey(new Integer(x)))
{
Component lastComponent = (Component) lastInRow.get(new Integer(x));
GridBagConstraints lastConstraints = lookupInternalConstraints(lastComponent);
if (lastConstraints.gridheight == GridBagConstraints.RELATIVE)
{
constraints.gridy = max_y - 1;
break;
}
else
{
constraints.gridy = Math.max (constraints.gridy,
lastConstraints.gridy + Math.max (1, lastConstraints.gridheight));
}
}
}
constraints.gridheight = max_y - constraints.gridy;
}
else if (constraints.gridheight == GridBagConstraints.RELATIVE)
{
constraints.gridheight = max_y - constraints.gridy - 1;
}
// Re-sort
sortedByHeight.remove(sortedByHeight.indexOf(component));
sortBySpan(component, constraints.gridheight, sortedByHeight, false);
}
} // end of STEP 2
// STEP 3: Determine sizes and weights for columns.
for (int i = 0; i < sortedByWidth.size(); i++)
{
Component component = (Component) sortedByWidth.get(i);
// If component is not visible we dont have to care about it.
if (!component.isVisible())
continue;
GridBagConstraints constraints = lookupInternalConstraints (component);
GridBagConstraints originalConstraints = lookupConstraints (component);
// Distribute the width.
int width = (sizeflag == PREFERREDSIZE) ?
component.getPreferredSize().width :
@@ -743,35 +754,24 @@ public class GridBagLayout
width += constraints.ipadx;
int occupiedCols = constraints.gridwidth;
int lastOccupiedCol = -1;
distributeSizeAndWeight(width,
constraints.weightx,
constraints.gridx,
constraints.gridwidth,
info.colWidths,
info.colWeights);
} // end of STEP 3
for(int w = constraints.gridx; w < constraints.gridx + constraints.gridwidth; w++)
{
if(colIsOccupied[w])
lastOccupiedCol = w;
else
occupiedCols--;
}
// STEP 4: Determine sizes and weights for rows.
for (int i = 0; i < sortedByHeight.size(); i++)
{
Component component = (Component) sortedByHeight.get(i);
// If component is not visible we dont have to care about it.
if (!component.isVisible())
continue;
// A component needs to occupy at least one column.
if(occupiedCols == 0)
{
colIsOccupied[constraints.gridx + constraints.gridwidth - 1] = true;
lastOccupiedCol = constraints.gridx + constraints.gridwidth - 1;
}
for(int w = constraints.gridx; w < constraints.gridx + constraints.gridwidth - 1; w++)
{
if(colIsOccupied[w])
width -= info.colWidths[w];
}
info.colWidths[lastOccupiedCol] = Math.max(info.colWidths[lastOccupiedCol], width);
info.colWeights[lastOccupiedCol] = Math.max(info.colWeights[lastOccupiedCol], constraints.weightx);
// Distribute the height.
GridBagConstraints constraints = lookupInternalConstraints (component);
int height = (sizeflag == PREFERREDSIZE) ?
component.getPreferredSize().height :
@@ -782,34 +782,13 @@ public class GridBagLayout
height += constraints.ipady;
int occupiedRows = constraints.gridheight;
int lastOccupiedRow = -1;
for(int h = constraints.gridy; h < constraints.gridy + constraints.gridheight; h++)
{
if(rowIsOccupied[h])
lastOccupiedRow = h;
else
occupiedRows--;
}
// A component needs to occupy at least one row.
if(occupiedRows == 0)
{
rowIsOccupied[constraints.gridy + constraints.gridheight - 1] = true;
lastOccupiedRow = constraints.gridy + constraints.gridheight - 1;
}
for(int h = constraints.gridy; h < constraints.gridy + constraints.gridheight; h++)
{
if(rowIsOccupied[h])
height -= info.rowHeights[h];
}
info.rowHeights[lastOccupiedRow] = Math.max(info.rowHeights[lastOccupiedRow], height);
info.rowWeights[lastOccupiedRow] = Math.max(info.rowWeights[lastOccupiedRow], constraints.weighty);
} // end of STEP 3
distributeSizeAndWeight(height,
constraints.weighty,
constraints.gridy,
constraints.gridheight,
info.rowHeights,
info.rowWeights);
} // end of STEP 4
calcCellSizes (info.colWidths, info.colWeights, parentDim.width);
calcCellSizes (info.rowHeights, info.rowWeights, parentDim.height);
@@ -847,18 +826,156 @@ public class GridBagLayout
return GetMinSize (parent, info);
}
/**
* Helper method used by GetLayoutInfo to keep components sorted, either
* by gridwidth or gridheight.
*
* @param component Component to add to the sorted list.
* @param span Either the component's gridwidth or gridheight.
* @param list <code>ArrayList</code> of components, sorted by
* their span.
* @param sortByWidth Flag indicating sorting index. If true, sort by
* width. Otherwise, sort by height.
* FIXME: Use a better sorting algorithm.
*/
private void sortBySpan (Component component, int span, ArrayList list, boolean sortByWidth)
{
if (span == GridBagConstraints.REMAINDER
|| span == GridBagConstraints.RELATIVE)
{
// Put all RELATIVE and REMAINDER components at the end.
list.add(component);
}
else
{
int i = 0;
if (list.size() > 0)
{
GridBagConstraints gbc = lookupInternalConstraints((Component) list.get(i));
int otherspan = sortByWidth ?
gbc.gridwidth :
gbc.gridheight;
while (otherspan != GridBagConstraints.REMAINDER
&& otherspan != GridBagConstraints.RELATIVE
&& span >= otherspan)
{
i++;
if (i < list.size())
{
gbc = lookupInternalConstraints((Component) list.get(i));
otherspan = sortByWidth ?
gbc.gridwidth :
gbc.gridheight;
}
else
break;
}
}
list.add(i, component);
}
}
/**
* Helper method used by GetLayoutInfo to distribute a component's size
* and weight.
*
* @param size Preferred size of component, with inset and padding
* already added.
* @param weight Weight of component.
* @param start Starting position of component. Either
* constraints.gridx or gridy.
* @param span Span of component. either contraints.gridwidth or
* gridheight.
* @param sizes Sizes of rows or columns.
* @param weights Weights of rows or columns.
*/
private void distributeSizeAndWeight (int size, double weight,
int start, int span,
int[] sizes, double[] weights)
{
if (span == 1)
{
sizes[start] = Math.max(sizes[start], size);
weights[start] = Math.max(weights[start], weight);
}
else
{
int numOccupied = span;
int lastOccupied = -1;
for(int i = start; i < start + span; i++)
{
if (sizes[i] == 0.0)
numOccupied--;
else
{
size -= sizes[i];
lastOccupied = i;
}
}
// A component needs to occupy at least one row.
if(numOccupied == 0)
sizes[start + span - 1] = size;
else if (size > 0)
sizes[lastOccupied] += size;
calcCellWeights(weight, weights, start, span);
}
}
/**
* Helper method used by GetLayoutInfo to calculate weight distribution.
* @param weight Weight of component.
* @param weights Weights of rows/columns.
* @param start Starting position of component in grid (gridx/gridy).
* @param span Span of component (gridwidth/gridheight).
*/
private void calcCellWeights (double weight, double[] weights, int start, int span)
{
double totalWeight = 0.0;
for(int k = start; k < start + span; k++)
totalWeight += weights[k];
if(weight > totalWeight)
{
if (totalWeight == 0.0)
{
weights[start + span - 1] += weight;
}
else
{
double diff = weight - totalWeight ;
double remaining = diff;
for(int k = start; k < start + span; k++)
{
double extraWeight = diff * weights[k] / totalWeight;
weights[k] += extraWeight;
remaining -= extraWeight;
}
if (remaining > 0.0 && weights[start + span - 1] != 0.0)
{
weights[start + span - 1] += remaining;
}
}
}
}
/**
* Helper method used by GetLayoutInfo to distribute extra space
* based on weight distribution.
*
* @param sizes Sizes of rows/columns.
* @param weights Weights of rows/columns.
* @param range Dimension of container.
*/
private void calcCellSizes (int[] sizes, double[] weights, int range)
{
int totalSize = sumIntArray (sizes);
double totalWeight = sumDoubleArray (weights);
// Rows or columns with size 0 should not be weighted in the calculation.
for (int i = 0; i < weights.length; i++)
{
if (sizes[i] == 0)
totalWeight -= weights[i];
}
int diff = range - totalSize;
if (diff == 0)
@@ -866,14 +983,10 @@ public class GridBagLayout
for (int i = 0; i < sizes.length; i++)
{
// A row or column with zero size cannot all of a sudden gain size.
if (sizes[i] != 0.0)
{
int newsize = (int) (sizes[i] + (((double) diff) * weights [i] / totalWeight ));
int newsize = (int) (sizes[i] + (((double) diff) * weights [i] / totalWeight ));
if (newsize > 0)
sizes[i] = newsize;
}
if (newsize > 0)
sizes[i] = newsize;
}
}
libjava/java/awt/Window.java
+15
View File
@@ -38,6 +38,7 @@ exception statement from your version. */
package java.awt;
import java.awt.event.ComponentEvent;
import java.awt.event.WindowEvent;
import java.awt.event.WindowFocusListener;
import java.awt.event.WindowListener;
@@ -784,9 +785,23 @@ public class Window extends Container implements Accessible
if (this.x == x && this.y == y && width == w && height == h)
return;
invalidate();
boolean resized = width != w || height != h;
boolean moved = this.x != x || this.y != y;
this.x = x;
this.y = y;
width = w;
height = h;
if (resized)
{
ComponentEvent ce =
new ComponentEvent(this, ComponentEvent.COMPONENT_RESIZED);
getToolkit().getSystemEventQueue().postEvent(ce);
}
if (moved)
{
ComponentEvent ce =
new ComponentEvent(this, ComponentEvent.COMPONENT_MOVED);
getToolkit().getSystemEventQueue().postEvent(ce);
}
}
}
libjava/java/awt/image/AffineTransformOp.java
+278
View File
@@ -0,0 +1,278 @@
/* AffineTransformOp.java -- This class performs affine
* transformation between two images or rasters in 2
* dimensions. Copyright (C) 2004 Free Software Foundation
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 java.awt.image;
import java.awt.*;
import java.awt.Graphics;
import java.awt.Graphics2D;
import java.awt.geom.*;
/**
* This class performs affine transformation between two images or
* rasters in 2 dimensions.
*
* @author Olga Rodimina <rodimina@redhat.com>
*/
public class AffineTransformOp implements BufferedImageOp, RasterOp
{
public static final int TYPE_BILINEAR = 0;
public static final int TYPE_NEAREST_NEIGHBOR = 1;
private AffineTransform transform;
private RenderingHints hints;
/**
* Construct AffineTransformOp with the given xform and interpolationType.
* Interpolation type can be either TYPE_BILINEAR or TYPE_NEAREST_NEIGHBOR.
*
* @param xform AffineTransform that will applied to the source image
* @param interpolationType type of interpolation used
*/
AffineTransformOp (AffineTransform xform, int interpolationType)
{
this.transform = xform;
if (interpolationType == 0)
hints = new RenderingHints (RenderingHints.KEY_INTERPOLATION,
RenderingHints.VALUE_INTERPOLATION_BILINEAR);
else
hints = new RenderingHints (RenderingHints.KEY_INTERPOLATION,
RenderingHints.VALUE_INTERPOLATION_NEAREST_NEIGHBOR);
}
/**
* Construct AffineTransformOp with the given xform and rendering hints.
*
* @param xform AffineTransform that will applied to the source image
* @param hints rendering hints that will be used during transformation
*/
AffineTransformOp (AffineTransform xform, RenderingHints hints)
{
this.transform = xform;
this.hints = hints;
}
/**
* Creates empty BufferedImage with the size equal to that of the
* transformed image and correct number of bands. The newly created
* image is created with the specified ColorModel.
* If the ColorModel is equal to null, then image is created
* with the ColorModel of the source image.
*
* @param src source image
* @param destCM color model for the destination image
* @return new compatible destination image
*/
public BufferedImage createCompatibleDestImage (BufferedImage src,
ColorModel destCM)
{
// if destCm is not specified, use color model of the source image
if (destCM == null)
destCM = src.getColorModel ();
return new BufferedImage (destCM,
createCompatibleDestRaster (src.getRaster ()),
src.isAlphaPremultiplied (),
null);
}
/**
* Creates empty WritableRaster with the size equal to the transformed
* source raster and correct number of bands
*
* @param src source raster
* @throws RasterFormatException if resulting width or height of raster is 0
* @return new compatible raster
*/
public WritableRaster createCompatibleDestRaster (Raster src)
{
Rectangle rect = (Rectangle) getBounds2D (src);
// throw RasterFormatException if resulting width or height of the
// transformed raster is 0
if (rect.getWidth () == 0 || rect.getHeight () == 0)
throw new RasterFormatException("width or height is 0");
return src.createCompatibleWritableRaster ((int) rect.getWidth (),
(int) rect.getHeight ());
}
/**
* Transforms source image using transform specified at the constructor.
* The resulting transformed image is stored in the destination image.
*
* @param src source image
* @param dst destination image
* @return transformed source image
*/
public BufferedImage filter (BufferedImage src, BufferedImage dst)
{
if (dst == src)
throw new IllegalArgumentException ("src image cannot be the same as the dst image");
// If the destination image is null, then BufferedImage is
// created with ColorModel of the source image
if (dst == null)
dst = createCompatibleDestImage(src, src.getColorModel ());
// FIXME: Must check if color models of src and dst images are the same.
// If it is not, then source image should be converted to color model
// of the destination image
Graphics2D gr = (Graphics2D) dst.createGraphics ();
gr.setRenderingHints (hints);
gr.drawImage (src, transform, null);
return dst;
}
/**
* Transforms source raster using transform specified at the constructor.
* The resulting raster is stored in the destination raster.
*
* @param src source raster
* @param dst destination raster
* @return transformed raster
*/
public WritableRaster filter (Raster src, WritableRaster dst)
{
throw new UnsupportedOperationException ("not implemented yet");
}
/**
* Transforms source image using transform specified at the constructor and
* returns bounds of the transformed image.
*
* @param src image to be transformed
* @return bounds of the transformed image.
*/
public Rectangle2D getBounds2D (BufferedImage src)
{
return getBounds2D (src.getRaster());
}
/**
* Returns bounds of the transformed raster.
*
* @param src raster to be transformed
* @return bounds of the transformed raster.
*/
public Rectangle2D getBounds2D (Raster src)
{
// determine new size for the transformed raster.
// Need to calculate transformed coordinates of the lower right
// corner of the raster. The upper left corner is always (0,0)
double x2 = (double) src.getWidth () + src.getMinX ();
double y2 = (double) src.getHeight () + src.getMinY ();
Point2D p2 = getPoint2D (new Point2D.Double (x2,y2), null);
Rectangle2D rect = new Rectangle (0, 0, (int) p2.getX (), (int) p2.getY ());
return rect.getBounds ();
}
/**
* Returns interpolation type used during transformations
*
* @return interpolation type
*/
public int getInterpolationType ()
{
if(hints.containsValue (RenderingHints.VALUE_INTERPOLATION_BILINEAR))
return TYPE_BILINEAR;
else
return TYPE_NEAREST_NEIGHBOR;
}
/**
* Returns location of the transformed source point. The resulting point
* is stored in the dstPt if one is specified.
*
* @param srcPt point to be transformed
* @param dstPt destination point
* @return the location of the transformed source point.
*/
public Point2D getPoint2D (Point2D srcPt, Point2D dstPt)
{
return transform.transform (srcPt, dstPt);
}
/** Returns rendering hints that are used during transformation.
*
* @return rendering hints
*/
public RenderingHints getRenderingHints ()
{
return hints;
}
/** Returns transform used in transformation between source and destination
* image.
*
* @return transform
*/
public AffineTransform getTransform ()
{
return transform;
}
}
libjava/java/awt/image/BufferedImage.java
+6 -3
View File
@@ -39,6 +39,7 @@ package java.awt.image;
import java.awt.Graphics;
import java.awt.Graphics2D;
import java.awt.GraphicsEnvironment;
import java.awt.Image;
import java.awt.Point;
import java.awt.Rectangle;
@@ -255,7 +256,8 @@ public class BufferedImage extends Image
public WritableRaster copyData(WritableRaster dest)
{
if (dest == null)
dest = raster.createCompatibleWritableRaster();
dest = raster.createCompatibleWritableRaster(getMinX(), getMinY(),
getWidth(),getHeight());
int x = dest.getMinX();
int y = dest.getMinY();
@@ -282,8 +284,9 @@ public class BufferedImage extends Image
public Graphics2D createGraphics()
{
throw new UnsupportedOperationException("not implemented");
// will require a lot of effort to implement
GraphicsEnvironment env;
env = GraphicsEnvironment.getLocalGraphicsEnvironment ();
return env.createGraphics (this);
}
public void flush() {