Start of AWT merge with Classpath:
* Makefile.in: Rebuilt.
* Makefile.am (awt_java_source_files): Reference files in
gnu/java/awt, not gnu/gcj/awt.
* java/awt/image/BufferedImage.java: Updated copyright.
* java/awt/image/ComponentColorModel.java: Updated copyright.
* java/awt/image/ComponentSampleModel.java: Updated copyright.
* java/awt/image/DataBuffer.java: Updated copyright.
* java/awt/image/DataBufferByte.java: Updated copyright.
* java/awt/image/DataBufferInt.java: Updated copyright.
* java/awt/image/DataBufferUShort.java: Updated copyright.
* java/awt/image/IndexColorModel.java: Updated copyright.
* java/awt/image/PackedColorModel.java: Updated copyright.
* java/awt/image/Raster.java: Updated copyright.
* java/awt/image/RasterOp.java: Updated copyright.
* java/awt/image/SampleModel.java: Updated copyright.
* java/awt/image/SinglePixelPackedSampleModel.java: Updated copyright.
* java/awt/image/WritableRaster.java: Updated copyright.
* java/awt/color/ColorSpace.java: Updated copyright.
* java/awt/color/ICC_ColorSpace.java: Updated copyright
* java/awt/color/ICC_Profile.java: Updated copyright.
* java/awt/event/HierarchyBoundsAdapter.java: Updated copyright.
* java/awt/event/HierarchyBoundsListener.java: Updated copyright.
* java/awt/event/HierarchyEvent.java: Updated copyright.
* java/awt/event/HierarchyListener.java: Updated copyright.
* java/awt/geom/AffineTransform.java: Updated copyright.
* java/awt/geom/Dimension2D.java: Updated copyright.
* java/awt/geom/Ellipse2D.java: Updated copyright.
* java/awt/geom/IllegalPathStateException.java: Updated copyright.
* java/awt/geom/Line2D.java: Updated copyright.
* java/awt/geom/NoninvertibleTransformException.java: Updated
copyright.
* java/awt/geom/PathIterator.java: Updated copyright.
* java/awt/geom/Point2D.java: Updated copyright.
* java/awt/geom/Rectangle2D.java: Updated copyright.
* java/awt/geom/RectangularShape.java: Updated copyright.
* java/awt/geom/RoundRectangle2D.java: Updated copyright.
* java/awt/Toolkit.java: Updated import for file moves.
* java/awt/Rectangle.java: Updated copyright; added javadoc from
Classpath.
(hashCode): New method from Classpath.
* java/awt/Graphics2D.java: Updated copyright.
* java/awt/Transparency.java: Updated copyright.
* java/awt/Paint.java: Updated copyright.
* java/awt/Graphics.java: New version from Classpath.
* java/awt/EventDispatchThread.java: Updated copyright.
* java/awt/CardLayout.java (layoutContainer): Don't skip invisible
children.
(gotoComponent): Wrap around on next/previous.
* gnu/gcj/awt/BitMaskExtent.java: Removed.
* gnu/gcj/awt/Buffers.java: Removed.
* gnu/gcj/awt/ComponentDataBlitOp.java: Removed.
* gnu/gcj/awt/GLightweightPeer.java: Removed.
* gnu/java/awt/BitMaskExtent.java: Added.
* gnu/java/awt/Buffers.java: Added.
* gnu/java/awt/ComponentDataBlitOp.java: Added.
* gnu/java/awt/GLightweightPeer.java: Added.
* java/awt/geom/Line2D.java (clone): Ignore
CloneNotSupportedException.
* gnu/gcj/awt/GLightweightPeer.java (getColorModel): New method.
* java/awt/Frame.java: Merged with Classpath.
* java/awt/RenderingHints.java: Copyright update.
* java/awt/Paint.java: Copyright update.
* java/awt/image/DirectColorModel.java: Merged with Classpath.
* java/awt/image/ColorModel.java: Merged with Classpath.
* java/awt/Window.java (show): New Implementation from Classpath.
(isShowing): Use super.isShowing().
* java/awt/EventQueue.java: Merged with Classpath.
* java/awt/AWTEventMulticaster.java (save): Throw
RuntimeException.
(saveInternal): Likewise.
* java/awt/AWTEvent.java: Now implements Serializable.
* java/awt/Event.java: Copyright update.
* java/awt/peer/ComponentPeer.java: Merged with Classpath.
* java/awt/image/BufferedImage.java: Copyright update.
* java/awt/GraphicsConfiguration.java: Copyright update.
* java/awt/Component.java: (addNotify): Don't call
addNotifyContainerChildren().
(addNotifyContainerChildren): Removed.
(setPeer): New method from Classpath.
(setTreeLock): Likewise.
(setVisible): Rewrote.
(show): Use it.
(hide): Likewise.
(validate): Set `valid'.
(checkImage(Image,ImageObserver)): Implementation from Classpath.
(createImage(ImageProducer)): Likewise.
(prepareImage): Likewise.
* java/awt/Container.java (addImpl): Handle case where constraint
is not a String. Post event via system event queue.
(remove): Post event via system event queue.
(validateTree): Only validate child if it is invalid.
(getAlignmentX): Call super method as default.
(getAlignmentY): Likewise.
(addContainerListener): Now synchronized.
(removeContainerListener): Likewise.
(addNotifyContainerChildren): Now private.
* java/awt/ComponentOrientation.java: Updated copyright. Added
@author.
* java/awt/FlowLayout.java (serialVersionUID): New field.
(setAlignment): Better exception message.
(layoutContainer): Don't compute component's preferred size unless
we're going to use it.
* java/awt/BorderLayout.java (AFTER_LAST_LINE, AFTER_LINE_ENDS,
BEFORE_FIRST_LINE, BEFORE_LINE_BEGINS): New constants.
(firstLine, lastLine, firstItem, lastItem): New fields.
(addLayoutComponent): Handle case where constraints is null.
Also, handle relative locations.
(removeLayoutComponent): Handle relative locations.
(MIN, MAX, PREF): New constants.
(calcCompSize): New method.
(calcSize): New method.
(minimumLayoutSize): Use it.
(preferredLayoutSize): Likewise.
(maximumLayoutSize): Likewise.
(toString): Include more information.
(setBounds): New method.
(layoutContainer): Use libgcj implementation; extended to handle
relative locations.
From-SVN: r48896
2002-01-16 04:21:35 +00:00
|
|
|
/* BorderLayout.java -- A layout manager class
|
|
|
|
Copyright (C) 1999, 2002 Free Software Foundation, Inc.
|
1999-05-05 04:05:57 -07:00
|
|
|
|
Start of AWT merge with Classpath:
* Makefile.in: Rebuilt.
* Makefile.am (awt_java_source_files): Reference files in
gnu/java/awt, not gnu/gcj/awt.
* java/awt/image/BufferedImage.java: Updated copyright.
* java/awt/image/ComponentColorModel.java: Updated copyright.
* java/awt/image/ComponentSampleModel.java: Updated copyright.
* java/awt/image/DataBuffer.java: Updated copyright.
* java/awt/image/DataBufferByte.java: Updated copyright.
* java/awt/image/DataBufferInt.java: Updated copyright.
* java/awt/image/DataBufferUShort.java: Updated copyright.
* java/awt/image/IndexColorModel.java: Updated copyright.
* java/awt/image/PackedColorModel.java: Updated copyright.
* java/awt/image/Raster.java: Updated copyright.
* java/awt/image/RasterOp.java: Updated copyright.
* java/awt/image/SampleModel.java: Updated copyright.
* java/awt/image/SinglePixelPackedSampleModel.java: Updated copyright.
* java/awt/image/WritableRaster.java: Updated copyright.
* java/awt/color/ColorSpace.java: Updated copyright.
* java/awt/color/ICC_ColorSpace.java: Updated copyright
* java/awt/color/ICC_Profile.java: Updated copyright.
* java/awt/event/HierarchyBoundsAdapter.java: Updated copyright.
* java/awt/event/HierarchyBoundsListener.java: Updated copyright.
* java/awt/event/HierarchyEvent.java: Updated copyright.
* java/awt/event/HierarchyListener.java: Updated copyright.
* java/awt/geom/AffineTransform.java: Updated copyright.
* java/awt/geom/Dimension2D.java: Updated copyright.
* java/awt/geom/Ellipse2D.java: Updated copyright.
* java/awt/geom/IllegalPathStateException.java: Updated copyright.
* java/awt/geom/Line2D.java: Updated copyright.
* java/awt/geom/NoninvertibleTransformException.java: Updated
copyright.
* java/awt/geom/PathIterator.java: Updated copyright.
* java/awt/geom/Point2D.java: Updated copyright.
* java/awt/geom/Rectangle2D.java: Updated copyright.
* java/awt/geom/RectangularShape.java: Updated copyright.
* java/awt/geom/RoundRectangle2D.java: Updated copyright.
* java/awt/Toolkit.java: Updated import for file moves.
* java/awt/Rectangle.java: Updated copyright; added javadoc from
Classpath.
(hashCode): New method from Classpath.
* java/awt/Graphics2D.java: Updated copyright.
* java/awt/Transparency.java: Updated copyright.
* java/awt/Paint.java: Updated copyright.
* java/awt/Graphics.java: New version from Classpath.
* java/awt/EventDispatchThread.java: Updated copyright.
* java/awt/CardLayout.java (layoutContainer): Don't skip invisible
children.
(gotoComponent): Wrap around on next/previous.
* gnu/gcj/awt/BitMaskExtent.java: Removed.
* gnu/gcj/awt/Buffers.java: Removed.
* gnu/gcj/awt/ComponentDataBlitOp.java: Removed.
* gnu/gcj/awt/GLightweightPeer.java: Removed.
* gnu/java/awt/BitMaskExtent.java: Added.
* gnu/java/awt/Buffers.java: Added.
* gnu/java/awt/ComponentDataBlitOp.java: Added.
* gnu/java/awt/GLightweightPeer.java: Added.
* java/awt/geom/Line2D.java (clone): Ignore
CloneNotSupportedException.
* gnu/gcj/awt/GLightweightPeer.java (getColorModel): New method.
* java/awt/Frame.java: Merged with Classpath.
* java/awt/RenderingHints.java: Copyright update.
* java/awt/Paint.java: Copyright update.
* java/awt/image/DirectColorModel.java: Merged with Classpath.
* java/awt/image/ColorModel.java: Merged with Classpath.
* java/awt/Window.java (show): New Implementation from Classpath.
(isShowing): Use super.isShowing().
* java/awt/EventQueue.java: Merged with Classpath.
* java/awt/AWTEventMulticaster.java (save): Throw
RuntimeException.
(saveInternal): Likewise.
* java/awt/AWTEvent.java: Now implements Serializable.
* java/awt/Event.java: Copyright update.
* java/awt/peer/ComponentPeer.java: Merged with Classpath.
* java/awt/image/BufferedImage.java: Copyright update.
* java/awt/GraphicsConfiguration.java: Copyright update.
* java/awt/Component.java: (addNotify): Don't call
addNotifyContainerChildren().
(addNotifyContainerChildren): Removed.
(setPeer): New method from Classpath.
(setTreeLock): Likewise.
(setVisible): Rewrote.
(show): Use it.
(hide): Likewise.
(validate): Set `valid'.
(checkImage(Image,ImageObserver)): Implementation from Classpath.
(createImage(ImageProducer)): Likewise.
(prepareImage): Likewise.
* java/awt/Container.java (addImpl): Handle case where constraint
is not a String. Post event via system event queue.
(remove): Post event via system event queue.
(validateTree): Only validate child if it is invalid.
(getAlignmentX): Call super method as default.
(getAlignmentY): Likewise.
(addContainerListener): Now synchronized.
(removeContainerListener): Likewise.
(addNotifyContainerChildren): Now private.
* java/awt/ComponentOrientation.java: Updated copyright. Added
@author.
* java/awt/FlowLayout.java (serialVersionUID): New field.
(setAlignment): Better exception message.
(layoutContainer): Don't compute component's preferred size unless
we're going to use it.
* java/awt/BorderLayout.java (AFTER_LAST_LINE, AFTER_LINE_ENDS,
BEFORE_FIRST_LINE, BEFORE_LINE_BEGINS): New constants.
(firstLine, lastLine, firstItem, lastItem): New fields.
(addLayoutComponent): Handle case where constraints is null.
Also, handle relative locations.
(removeLayoutComponent): Handle relative locations.
(MIN, MAX, PREF): New constants.
(calcCompSize): New method.
(calcSize): New method.
(minimumLayoutSize): Use it.
(preferredLayoutSize): Likewise.
(maximumLayoutSize): Likewise.
(toString): Include more information.
(setBounds): New method.
(layoutContainer): Use libgcj implementation; extended to handle
relative locations.
From-SVN: r48896
2002-01-16 04:21:35 +00:00
|
|
|
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.
|
|
|
|
|
2002-01-22 22:40:42 +00:00
|
|
|
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. */
|
1999-05-05 04:05:57 -07:00
|
|
|
|
|
|
|
|
|
|
|
package java.awt;
|
|
|
|
|
Start of AWT merge with Classpath:
* Makefile.in: Rebuilt.
* Makefile.am (awt_java_source_files): Reference files in
gnu/java/awt, not gnu/gcj/awt.
* java/awt/image/BufferedImage.java: Updated copyright.
* java/awt/image/ComponentColorModel.java: Updated copyright.
* java/awt/image/ComponentSampleModel.java: Updated copyright.
* java/awt/image/DataBuffer.java: Updated copyright.
* java/awt/image/DataBufferByte.java: Updated copyright.
* java/awt/image/DataBufferInt.java: Updated copyright.
* java/awt/image/DataBufferUShort.java: Updated copyright.
* java/awt/image/IndexColorModel.java: Updated copyright.
* java/awt/image/PackedColorModel.java: Updated copyright.
* java/awt/image/Raster.java: Updated copyright.
* java/awt/image/RasterOp.java: Updated copyright.
* java/awt/image/SampleModel.java: Updated copyright.
* java/awt/image/SinglePixelPackedSampleModel.java: Updated copyright.
* java/awt/image/WritableRaster.java: Updated copyright.
* java/awt/color/ColorSpace.java: Updated copyright.
* java/awt/color/ICC_ColorSpace.java: Updated copyright
* java/awt/color/ICC_Profile.java: Updated copyright.
* java/awt/event/HierarchyBoundsAdapter.java: Updated copyright.
* java/awt/event/HierarchyBoundsListener.java: Updated copyright.
* java/awt/event/HierarchyEvent.java: Updated copyright.
* java/awt/event/HierarchyListener.java: Updated copyright.
* java/awt/geom/AffineTransform.java: Updated copyright.
* java/awt/geom/Dimension2D.java: Updated copyright.
* java/awt/geom/Ellipse2D.java: Updated copyright.
* java/awt/geom/IllegalPathStateException.java: Updated copyright.
* java/awt/geom/Line2D.java: Updated copyright.
* java/awt/geom/NoninvertibleTransformException.java: Updated
copyright.
* java/awt/geom/PathIterator.java: Updated copyright.
* java/awt/geom/Point2D.java: Updated copyright.
* java/awt/geom/Rectangle2D.java: Updated copyright.
* java/awt/geom/RectangularShape.java: Updated copyright.
* java/awt/geom/RoundRectangle2D.java: Updated copyright.
* java/awt/Toolkit.java: Updated import for file moves.
* java/awt/Rectangle.java: Updated copyright; added javadoc from
Classpath.
(hashCode): New method from Classpath.
* java/awt/Graphics2D.java: Updated copyright.
* java/awt/Transparency.java: Updated copyright.
* java/awt/Paint.java: Updated copyright.
* java/awt/Graphics.java: New version from Classpath.
* java/awt/EventDispatchThread.java: Updated copyright.
* java/awt/CardLayout.java (layoutContainer): Don't skip invisible
children.
(gotoComponent): Wrap around on next/previous.
* gnu/gcj/awt/BitMaskExtent.java: Removed.
* gnu/gcj/awt/Buffers.java: Removed.
* gnu/gcj/awt/ComponentDataBlitOp.java: Removed.
* gnu/gcj/awt/GLightweightPeer.java: Removed.
* gnu/java/awt/BitMaskExtent.java: Added.
* gnu/java/awt/Buffers.java: Added.
* gnu/java/awt/ComponentDataBlitOp.java: Added.
* gnu/java/awt/GLightweightPeer.java: Added.
* java/awt/geom/Line2D.java (clone): Ignore
CloneNotSupportedException.
* gnu/gcj/awt/GLightweightPeer.java (getColorModel): New method.
* java/awt/Frame.java: Merged with Classpath.
* java/awt/RenderingHints.java: Copyright update.
* java/awt/Paint.java: Copyright update.
* java/awt/image/DirectColorModel.java: Merged with Classpath.
* java/awt/image/ColorModel.java: Merged with Classpath.
* java/awt/Window.java (show): New Implementation from Classpath.
(isShowing): Use super.isShowing().
* java/awt/EventQueue.java: Merged with Classpath.
* java/awt/AWTEventMulticaster.java (save): Throw
RuntimeException.
(saveInternal): Likewise.
* java/awt/AWTEvent.java: Now implements Serializable.
* java/awt/Event.java: Copyright update.
* java/awt/peer/ComponentPeer.java: Merged with Classpath.
* java/awt/image/BufferedImage.java: Copyright update.
* java/awt/GraphicsConfiguration.java: Copyright update.
* java/awt/Component.java: (addNotify): Don't call
addNotifyContainerChildren().
(addNotifyContainerChildren): Removed.
(setPeer): New method from Classpath.
(setTreeLock): Likewise.
(setVisible): Rewrote.
(show): Use it.
(hide): Likewise.
(validate): Set `valid'.
(checkImage(Image,ImageObserver)): Implementation from Classpath.
(createImage(ImageProducer)): Likewise.
(prepareImage): Likewise.
* java/awt/Container.java (addImpl): Handle case where constraint
is not a String. Post event via system event queue.
(remove): Post event via system event queue.
(validateTree): Only validate child if it is invalid.
(getAlignmentX): Call super method as default.
(getAlignmentY): Likewise.
(addContainerListener): Now synchronized.
(removeContainerListener): Likewise.
(addNotifyContainerChildren): Now private.
* java/awt/ComponentOrientation.java: Updated copyright. Added
@author.
* java/awt/FlowLayout.java (serialVersionUID): New field.
(setAlignment): Better exception message.
(layoutContainer): Don't compute component's preferred size unless
we're going to use it.
* java/awt/BorderLayout.java (AFTER_LAST_LINE, AFTER_LINE_ENDS,
BEFORE_FIRST_LINE, BEFORE_LINE_BEGINS): New constants.
(firstLine, lastLine, firstItem, lastItem): New fields.
(addLayoutComponent): Handle case where constraints is null.
Also, handle relative locations.
(removeLayoutComponent): Handle relative locations.
(MIN, MAX, PREF): New constants.
(calcCompSize): New method.
(calcSize): New method.
(minimumLayoutSize): Use it.
(preferredLayoutSize): Likewise.
(maximumLayoutSize): Likewise.
(toString): Include more information.
(setBounds): New method.
(layoutContainer): Use libgcj implementation; extended to handle
relative locations.
From-SVN: r48896
2002-01-16 04:21:35 +00:00
|
|
|
/**
|
|
|
|
* This class implements a layout manager that positions components
|
|
|
|
* in certain sectors of the parent container.
|
|
|
|
*
|
|
|
|
* @author Aaron M. Renn (arenn@urbanophile.com)
|
|
|
|
* @author Rolf W. Rasmussen <rolfwr@ii.uib.no>
|
|
|
|
*/
|
ComponentDataBlitOp.java: New file.
* gnu/gcj/awt/ComponentDataBlitOp.java: New file.
* gnu/gcj/awt/GLightweightPeer.java: New file.
* java/awt/BorderLayout.java: Implemented all methods.
* java/awt/Button.java (actionListener, actionCommand): Renamed
and modifier change.
(addNotify): Call super.
(dispatchEventImpl): New method.
(getListeners): New method.
(label): Made package-private, not private.
* java/awt/Canvas.java: Implemented class body.
* java/awt/Color.java (brighter): New method.
(darker): New method.
(hashCode): New method.
* java/awt/Component.java (visible, enabled, eventMask): Set defaults.
(getGraphicsConfiguration): Delegate to
getGraphicsConfigurationImpl().
(getGraphicsConfigurationImpl): New method.
(getToolkit): Only return value from peer if not null.
(isDisplayable): Check with parent.
(isShowing): No parent implies not showing.
(getForeground): Check parent property if local is null.
(getBackground): Likewise.
(getFont): Likewise.
(setForeground): Inform peer.
(setBackground): Likewise
(setLocale): Invalidate component.
(getColorModel): Implemented.
(setLocation): Invalidate, or ignore if no change.
(setSize): Invalidate, or ignore if no change.
(setBounds): Invalidate, or ignore if no change.
(isOpaque): By default, heavyweight implies opaque.
(isLightweight): Implemented.
(getMaximumSize): Implemented.
(doLayout): Implemented, NOP.
(validate): Implemented, NOP.
(invalidate): Only propagate to parent if parent was valid.
(getGraphics): Implemented.
(getFontMetrics): Implemented.
(update): Implemented.
(paintAll): Implemented.
(repaint): Implemented all repaint methods.
(print): Implemented.
(printAll): Implemented.
(createImage): Implemented.
(dispatchEvent): Give the peer a chance to handle the event.
(dispatchEventImpl): Dispatch paint events.
(enableEvents): Lightweights enable events on parent component.
(coalesceEvents): Coalesce paint events, and select event type
using a switch.
(coalescePaintEvents): New method.
(processEvent): Fix unfortunate ordering of statements, and call
correct method for MOUSE_CLICKED.
(processPaintEvent): New method.
(addNotify): Allow container to notify children before event
mask is set in peer.
(addNotifyContainerChildren): New method.
(removeNotify): Visibility should not change on removeNotify.
(paramString): Implemented.
(list): Implemented two of the list methods.
* Container (myInsets): Removed, insets are managed by peer.
(getInsets): Query peer.
(addImpl): Fix reparenting, enable events for lightweights,
initialize component array.
(validate): Call doLayout in validateTree() instead.
(validateTree): Do nothing if already valid. Call beginValidate(),
endValidate() on peer. Call validateTree() instead of validate()
for children that are containers. Mark valid after validation of
children.
(setFont): Partial implementation.
(paint): Implemented.
(visitChildren): New method.
(visitChild): New method.
(update): Implemented.
(print): Implemented.
(paintComponents): Implemented.
(printComponents): Consider translation and clipping.
(getComponentAt): Ignore invisible children. Return this if no
child match.
(addNotify): Call super.
(addNotifyContainerChildren): New method.
(paramString): Implemented.
(list): Implemented.
* java/awt/EventQueue (invokeAndWait): Get system event queue the
right way.
(invokeLater): Likewise.
(isDispatchThread): Likewise.
* java/awt/FontMetrics (getLeading): Formula change.
(getDescent): Consider leading also.
(getMaxAscent): Default to getAscent().
(getMaxDescent): Default to getDescent.
(getMaxAdvance): Return value signifying unknown.
(charWidth): Both methods implemented.
(charsWidth): Implemented.
(bytesWidth): Implemented.
(getWidths): Implemented.
* java/awt/Frame.java (NORMAL, ICONIFIED, iconImage, isResizable,
state): New fields.
(Frame): Rearragend constuctor chaining to disallow null being
passed as a graphics configuration.
(getTitle): Return empty string if null.
(dispose): Removed.
(getIconImage): New method.
(setIconImage): New method.
(finalize): New method.
(setMenuBar): Notify peer.
(isResizable): New method.
(setResizable): New method.
(getState): New method.
(getFont): Removed.
(remove): Implemented.
(removeNotify): New method.
(getFrames): New method.
* java/awt/Graphics.java: Implemented body of class.
* java/awt/Graphics2D.java: New file.
* java/awt/GraphicsConfiguration.java: Enabled part of the API.
* java/awt/Image.java: Implemented body of class.
* java/awt/Panel.java (Panel): Call correct super constructor.
(addNotify): Implemented.
* java/awt/Rectangle.java (isEmpty): Fixed reversed logic.
* java/awt/RenderingHints.java: New file.
* java/awt/Toolkit.java (createComponent): Implemented.
(getSystemEventQueue): Delegate to getSystemEventQueueImpl().
* java/awt/Window.java (Window): Two new constructors. Reordered
constructor chaining.
(getGraphicsConfigurationImpl): New method.
(finalize): Call super.
(addNotify): Call super.
(pack): Do layout stuff.
(show): Ensure that peer exists and that component is valid.
(dispose): Dispose owned children.
(getOwner): Simplify code, casting null pointers is valid.
(getGraphicsConfiguration): Ask peer if local value is null.
* java/awt/event/ActionEvent.java (getActionCommand): Renamed from
getcmd().
* java/awt/image/BufferedImage.java: New file.
* java/awt/image/RasterOp.java: New file.
* java/awt/peer/ComponentPeer.java (getGraphicsConfiguration):
More powerfull replacement for getColorModel().
(getColorModel) Removed.
(setEventMask) New method.
* Makefile.am: Added new files.
* Makefile.in: Rebuilt.
From-SVN: r35748
2000-08-16 20:03:48 +02:00
|
|
|
public class BorderLayout implements LayoutManager2, java.io.Serializable
|
1999-05-05 04:05:57 -07:00
|
|
|
{
|
Start of AWT merge with Classpath:
* Makefile.in: Rebuilt.
* Makefile.am (awt_java_source_files): Reference files in
gnu/java/awt, not gnu/gcj/awt.
* java/awt/image/BufferedImage.java: Updated copyright.
* java/awt/image/ComponentColorModel.java: Updated copyright.
* java/awt/image/ComponentSampleModel.java: Updated copyright.
* java/awt/image/DataBuffer.java: Updated copyright.
* java/awt/image/DataBufferByte.java: Updated copyright.
* java/awt/image/DataBufferInt.java: Updated copyright.
* java/awt/image/DataBufferUShort.java: Updated copyright.
* java/awt/image/IndexColorModel.java: Updated copyright.
* java/awt/image/PackedColorModel.java: Updated copyright.
* java/awt/image/Raster.java: Updated copyright.
* java/awt/image/RasterOp.java: Updated copyright.
* java/awt/image/SampleModel.java: Updated copyright.
* java/awt/image/SinglePixelPackedSampleModel.java: Updated copyright.
* java/awt/image/WritableRaster.java: Updated copyright.
* java/awt/color/ColorSpace.java: Updated copyright.
* java/awt/color/ICC_ColorSpace.java: Updated copyright
* java/awt/color/ICC_Profile.java: Updated copyright.
* java/awt/event/HierarchyBoundsAdapter.java: Updated copyright.
* java/awt/event/HierarchyBoundsListener.java: Updated copyright.
* java/awt/event/HierarchyEvent.java: Updated copyright.
* java/awt/event/HierarchyListener.java: Updated copyright.
* java/awt/geom/AffineTransform.java: Updated copyright.
* java/awt/geom/Dimension2D.java: Updated copyright.
* java/awt/geom/Ellipse2D.java: Updated copyright.
* java/awt/geom/IllegalPathStateException.java: Updated copyright.
* java/awt/geom/Line2D.java: Updated copyright.
* java/awt/geom/NoninvertibleTransformException.java: Updated
copyright.
* java/awt/geom/PathIterator.java: Updated copyright.
* java/awt/geom/Point2D.java: Updated copyright.
* java/awt/geom/Rectangle2D.java: Updated copyright.
* java/awt/geom/RectangularShape.java: Updated copyright.
* java/awt/geom/RoundRectangle2D.java: Updated copyright.
* java/awt/Toolkit.java: Updated import for file moves.
* java/awt/Rectangle.java: Updated copyright; added javadoc from
Classpath.
(hashCode): New method from Classpath.
* java/awt/Graphics2D.java: Updated copyright.
* java/awt/Transparency.java: Updated copyright.
* java/awt/Paint.java: Updated copyright.
* java/awt/Graphics.java: New version from Classpath.
* java/awt/EventDispatchThread.java: Updated copyright.
* java/awt/CardLayout.java (layoutContainer): Don't skip invisible
children.
(gotoComponent): Wrap around on next/previous.
* gnu/gcj/awt/BitMaskExtent.java: Removed.
* gnu/gcj/awt/Buffers.java: Removed.
* gnu/gcj/awt/ComponentDataBlitOp.java: Removed.
* gnu/gcj/awt/GLightweightPeer.java: Removed.
* gnu/java/awt/BitMaskExtent.java: Added.
* gnu/java/awt/Buffers.java: Added.
* gnu/java/awt/ComponentDataBlitOp.java: Added.
* gnu/java/awt/GLightweightPeer.java: Added.
* java/awt/geom/Line2D.java (clone): Ignore
CloneNotSupportedException.
* gnu/gcj/awt/GLightweightPeer.java (getColorModel): New method.
* java/awt/Frame.java: Merged with Classpath.
* java/awt/RenderingHints.java: Copyright update.
* java/awt/Paint.java: Copyright update.
* java/awt/image/DirectColorModel.java: Merged with Classpath.
* java/awt/image/ColorModel.java: Merged with Classpath.
* java/awt/Window.java (show): New Implementation from Classpath.
(isShowing): Use super.isShowing().
* java/awt/EventQueue.java: Merged with Classpath.
* java/awt/AWTEventMulticaster.java (save): Throw
RuntimeException.
(saveInternal): Likewise.
* java/awt/AWTEvent.java: Now implements Serializable.
* java/awt/Event.java: Copyright update.
* java/awt/peer/ComponentPeer.java: Merged with Classpath.
* java/awt/image/BufferedImage.java: Copyright update.
* java/awt/GraphicsConfiguration.java: Copyright update.
* java/awt/Component.java: (addNotify): Don't call
addNotifyContainerChildren().
(addNotifyContainerChildren): Removed.
(setPeer): New method from Classpath.
(setTreeLock): Likewise.
(setVisible): Rewrote.
(show): Use it.
(hide): Likewise.
(validate): Set `valid'.
(checkImage(Image,ImageObserver)): Implementation from Classpath.
(createImage(ImageProducer)): Likewise.
(prepareImage): Likewise.
* java/awt/Container.java (addImpl): Handle case where constraint
is not a String. Post event via system event queue.
(remove): Post event via system event queue.
(validateTree): Only validate child if it is invalid.
(getAlignmentX): Call super method as default.
(getAlignmentY): Likewise.
(addContainerListener): Now synchronized.
(removeContainerListener): Likewise.
(addNotifyContainerChildren): Now private.
* java/awt/ComponentOrientation.java: Updated copyright. Added
@author.
* java/awt/FlowLayout.java (serialVersionUID): New field.
(setAlignment): Better exception message.
(layoutContainer): Don't compute component's preferred size unless
we're going to use it.
* java/awt/BorderLayout.java (AFTER_LAST_LINE, AFTER_LINE_ENDS,
BEFORE_FIRST_LINE, BEFORE_LINE_BEGINS): New constants.
(firstLine, lastLine, firstItem, lastItem): New fields.
(addLayoutComponent): Handle case where constraints is null.
Also, handle relative locations.
(removeLayoutComponent): Handle relative locations.
(MIN, MAX, PREF): New constants.
(calcCompSize): New method.
(calcSize): New method.
(minimumLayoutSize): Use it.
(preferredLayoutSize): Likewise.
(maximumLayoutSize): Likewise.
(toString): Include more information.
(setBounds): New method.
(layoutContainer): Use libgcj implementation; extended to handle
relative locations.
From-SVN: r48896
2002-01-16 04:21:35 +00:00
|
|
|
|
|
|
|
/*
|
|
|
|
* Static Variables
|
|
|
|
*/
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Constant indicating the top of the container
|
|
|
|
*/
|
|
|
|
public static final String NORTH = "North";
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Constant indicating the bottom of the container
|
|
|
|
*/
|
|
|
|
public static final String SOUTH = "South";
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Constant indicating the right side of the container
|
|
|
|
*/
|
|
|
|
public static final String EAST = "East";
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Constant indicating the left side of the container
|
|
|
|
*/
|
|
|
|
public static final String WEST = "West";
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Constant indicating the center of the container
|
|
|
|
*/
|
|
|
|
public static final String CENTER = "Center";
|
|
|
|
|
|
|
|
|
2002-08-09 04:26:17 +00:00
|
|
|
/**
|
|
|
|
* The constant indicating the position before the first line of the
|
|
|
|
* layout. The exact position depends on the writing system: For a
|
|
|
|
* top-to-bottom orientation, it is the same as {@link #NORTH}, for
|
|
|
|
* a bottom-to-top orientation, it is the same as {@link #SOUTH}.
|
|
|
|
*
|
|
|
|
* <p>This constant is an older name for {@link #PAGE_START} which
|
|
|
|
* has exactly the same value.
|
|
|
|
*
|
|
|
|
* @since 1.2
|
|
|
|
*/
|
|
|
|
public static final String BEFORE_FIRST_LINE = "First";
|
|
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
* The constant indicating the position after the last line of the
|
|
|
|
* layout. The exact position depends on the writing system: For a
|
|
|
|
* top-to-bottom orientation, it is the same as {@link #SOUTH}, for
|
|
|
|
* a bottom-to-top orientation, it is the same as {@link #NORTH}.
|
|
|
|
*
|
|
|
|
* <p>This constant is an older name for {@link #PAGE_END} which
|
|
|
|
* has exactly the same value.
|
|
|
|
*
|
|
|
|
* @since 1.2
|
|
|
|
*/
|
|
|
|
public static final String AFTER_LAST_LINE = "Last";
|
|
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
* The constant indicating the position before the first item of the
|
|
|
|
* layout. The exact position depends on the writing system: For a
|
|
|
|
* left-to-right orientation, it is the same as {@link #WEST}, for
|
|
|
|
* a right-to-left orientation, it is the same as {@link #EAST}.
|
|
|
|
*
|
|
|
|
* <p>This constant is an older name for {@link #LINE_START} which
|
|
|
|
* has exactly the same value.
|
|
|
|
*
|
|
|
|
* @since 1.2
|
|
|
|
*/
|
|
|
|
public static final String BEFORE_LINE_BEGINS = "Before";
|
|
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
* The constant indicating the position after the last item of the
|
|
|
|
* layout. The exact position depends on the writing system: For a
|
|
|
|
* left-to-right orientation, it is the same as {@link #EAST}, for
|
|
|
|
* a right-to-left orientation, it is the same as {@link #WEST}.
|
|
|
|
*
|
|
|
|
* <p>This constant is an older name for {@link #LINE_END} which
|
|
|
|
* has exactly the same value.
|
|
|
|
*
|
|
|
|
* @since 1.2
|
|
|
|
*/
|
|
|
|
public static final String AFTER_LINE_ENDS = "After";
|
|
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
* The constant indicating the position before the first line of the
|
|
|
|
* layout. The exact position depends on the writing system: For a
|
|
|
|
* top-to-bottom orientation, it is the same as {@link #NORTH}, for
|
|
|
|
* a bottom-to-top orientation, it is the same as {@link #SOUTH}.
|
|
|
|
*
|
|
|
|
* @since 1.4
|
|
|
|
*/
|
|
|
|
public static final String PAGE_START = BEFORE_FIRST_LINE;
|
|
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
* The constant indicating the position after the last line of the
|
|
|
|
* layout. The exact position depends on the writing system: For a
|
|
|
|
* top-to-bottom orientation, it is the same as {@link #SOUTH}, for
|
|
|
|
* a bottom-to-top orientation, it is the same as {@link #NORTH}.
|
|
|
|
*
|
|
|
|
* @since 1.4
|
|
|
|
*/
|
|
|
|
public static final String PAGE_END = AFTER_LAST_LINE;
|
|
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
* The constant indicating the position before the first item of the
|
|
|
|
* layout. The exact position depends on the writing system: For a
|
|
|
|
* left-to-right orientation, it is the same as {@link #WEST}, for
|
|
|
|
* a right-to-left orientation, it is the same as {@link #EAST}.
|
|
|
|
*
|
|
|
|
* @since 1.4
|
|
|
|
*/
|
|
|
|
public static final String LINE_START = BEFORE_LINE_BEGINS;
|
|
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
* The constant indicating the position after the last item of the
|
|
|
|
* layout. The exact position depends on the writing system: For a
|
|
|
|
* left-to-right orientation, it is the same as {@link #EAST}, for
|
|
|
|
* a right-to-left orientation, it is the same as {@link #WEST}.
|
|
|
|
*
|
|
|
|
* @since 1.4
|
|
|
|
*/
|
|
|
|
public static final String LINE_END = AFTER_LINE_ENDS;
|
Start of AWT merge with Classpath:
* Makefile.in: Rebuilt.
* Makefile.am (awt_java_source_files): Reference files in
gnu/java/awt, not gnu/gcj/awt.
* java/awt/image/BufferedImage.java: Updated copyright.
* java/awt/image/ComponentColorModel.java: Updated copyright.
* java/awt/image/ComponentSampleModel.java: Updated copyright.
* java/awt/image/DataBuffer.java: Updated copyright.
* java/awt/image/DataBufferByte.java: Updated copyright.
* java/awt/image/DataBufferInt.java: Updated copyright.
* java/awt/image/DataBufferUShort.java: Updated copyright.
* java/awt/image/IndexColorModel.java: Updated copyright.
* java/awt/image/PackedColorModel.java: Updated copyright.
* java/awt/image/Raster.java: Updated copyright.
* java/awt/image/RasterOp.java: Updated copyright.
* java/awt/image/SampleModel.java: Updated copyright.
* java/awt/image/SinglePixelPackedSampleModel.java: Updated copyright.
* java/awt/image/WritableRaster.java: Updated copyright.
* java/awt/color/ColorSpace.java: Updated copyright.
* java/awt/color/ICC_ColorSpace.java: Updated copyright
* java/awt/color/ICC_Profile.java: Updated copyright.
* java/awt/event/HierarchyBoundsAdapter.java: Updated copyright.
* java/awt/event/HierarchyBoundsListener.java: Updated copyright.
* java/awt/event/HierarchyEvent.java: Updated copyright.
* java/awt/event/HierarchyListener.java: Updated copyright.
* java/awt/geom/AffineTransform.java: Updated copyright.
* java/awt/geom/Dimension2D.java: Updated copyright.
* java/awt/geom/Ellipse2D.java: Updated copyright.
* java/awt/geom/IllegalPathStateException.java: Updated copyright.
* java/awt/geom/Line2D.java: Updated copyright.
* java/awt/geom/NoninvertibleTransformException.java: Updated
copyright.
* java/awt/geom/PathIterator.java: Updated copyright.
* java/awt/geom/Point2D.java: Updated copyright.
* java/awt/geom/Rectangle2D.java: Updated copyright.
* java/awt/geom/RectangularShape.java: Updated copyright.
* java/awt/geom/RoundRectangle2D.java: Updated copyright.
* java/awt/Toolkit.java: Updated import for file moves.
* java/awt/Rectangle.java: Updated copyright; added javadoc from
Classpath.
(hashCode): New method from Classpath.
* java/awt/Graphics2D.java: Updated copyright.
* java/awt/Transparency.java: Updated copyright.
* java/awt/Paint.java: Updated copyright.
* java/awt/Graphics.java: New version from Classpath.
* java/awt/EventDispatchThread.java: Updated copyright.
* java/awt/CardLayout.java (layoutContainer): Don't skip invisible
children.
(gotoComponent): Wrap around on next/previous.
* gnu/gcj/awt/BitMaskExtent.java: Removed.
* gnu/gcj/awt/Buffers.java: Removed.
* gnu/gcj/awt/ComponentDataBlitOp.java: Removed.
* gnu/gcj/awt/GLightweightPeer.java: Removed.
* gnu/java/awt/BitMaskExtent.java: Added.
* gnu/java/awt/Buffers.java: Added.
* gnu/java/awt/ComponentDataBlitOp.java: Added.
* gnu/java/awt/GLightweightPeer.java: Added.
* java/awt/geom/Line2D.java (clone): Ignore
CloneNotSupportedException.
* gnu/gcj/awt/GLightweightPeer.java (getColorModel): New method.
* java/awt/Frame.java: Merged with Classpath.
* java/awt/RenderingHints.java: Copyright update.
* java/awt/Paint.java: Copyright update.
* java/awt/image/DirectColorModel.java: Merged with Classpath.
* java/awt/image/ColorModel.java: Merged with Classpath.
* java/awt/Window.java (show): New Implementation from Classpath.
(isShowing): Use super.isShowing().
* java/awt/EventQueue.java: Merged with Classpath.
* java/awt/AWTEventMulticaster.java (save): Throw
RuntimeException.
(saveInternal): Likewise.
* java/awt/AWTEvent.java: Now implements Serializable.
* java/awt/Event.java: Copyright update.
* java/awt/peer/ComponentPeer.java: Merged with Classpath.
* java/awt/image/BufferedImage.java: Copyright update.
* java/awt/GraphicsConfiguration.java: Copyright update.
* java/awt/Component.java: (addNotify): Don't call
addNotifyContainerChildren().
(addNotifyContainerChildren): Removed.
(setPeer): New method from Classpath.
(setTreeLock): Likewise.
(setVisible): Rewrote.
(show): Use it.
(hide): Likewise.
(validate): Set `valid'.
(checkImage(Image,ImageObserver)): Implementation from Classpath.
(createImage(ImageProducer)): Likewise.
(prepareImage): Likewise.
* java/awt/Container.java (addImpl): Handle case where constraint
is not a String. Post event via system event queue.
(remove): Post event via system event queue.
(validateTree): Only validate child if it is invalid.
(getAlignmentX): Call super method as default.
(getAlignmentY): Likewise.
(addContainerListener): Now synchronized.
(removeContainerListener): Likewise.
(addNotifyContainerChildren): Now private.
* java/awt/ComponentOrientation.java: Updated copyright. Added
@author.
* java/awt/FlowLayout.java (serialVersionUID): New field.
(setAlignment): Better exception message.
(layoutContainer): Don't compute component's preferred size unless
we're going to use it.
* java/awt/BorderLayout.java (AFTER_LAST_LINE, AFTER_LINE_ENDS,
BEFORE_FIRST_LINE, BEFORE_LINE_BEGINS): New constants.
(firstLine, lastLine, firstItem, lastItem): New fields.
(addLayoutComponent): Handle case where constraints is null.
Also, handle relative locations.
(removeLayoutComponent): Handle relative locations.
(MIN, MAX, PREF): New constants.
(calcCompSize): New method.
(calcSize): New method.
(minimumLayoutSize): Use it.
(preferredLayoutSize): Likewise.
(maximumLayoutSize): Likewise.
(toString): Include more information.
(setBounds): New method.
(layoutContainer): Use libgcj implementation; extended to handle
relative locations.
From-SVN: r48896
2002-01-16 04:21:35 +00:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
// Serialization constant
|
|
|
|
private static final long serialVersionUID = -8658291919501921765L;
|
|
|
|
|
|
|
|
/*************************************************************************/
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Instance Variables
|
|
|
|
*/
|
|
|
|
|
|
|
|
/**
|
|
|
|
* @serial
|
|
|
|
*/
|
|
|
|
private Component north;
|
|
|
|
|
|
|
|
/**
|
|
|
|
* @serial
|
|
|
|
*/
|
|
|
|
private Component south;
|
|
|
|
|
|
|
|
/**
|
|
|
|
* @serial
|
|
|
|
*/
|
|
|
|
private Component east;
|
|
|
|
|
|
|
|
/**
|
|
|
|
* @serial
|
|
|
|
*/
|
|
|
|
private Component west;
|
|
|
|
|
|
|
|
/**
|
|
|
|
* @serial
|
|
|
|
*/
|
|
|
|
private Component center;
|
|
|
|
|
|
|
|
/**
|
|
|
|
* @serial
|
|
|
|
*/
|
|
|
|
private Component firstLine;
|
|
|
|
|
|
|
|
/**
|
|
|
|
* @serial
|
|
|
|
*/
|
|
|
|
private Component lastLine;
|
|
|
|
|
|
|
|
/**
|
|
|
|
* @serial
|
|
|
|
*/
|
|
|
|
private Component firstItem;
|
|
|
|
|
|
|
|
/**
|
|
|
|
* @serial
|
|
|
|
*/
|
|
|
|
private Component lastItem;
|
|
|
|
|
|
|
|
/**
|
|
|
|
* @serial The horizontal gap between components
|
|
|
|
*/
|
|
|
|
private int hgap;
|
|
|
|
|
|
|
|
/**
|
|
|
|
* @serial The vertical gap between components
|
|
|
|
*/
|
|
|
|
private int vgap;
|
|
|
|
|
|
|
|
/*************************************************************************/
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Constructors
|
|
|
|
*/
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Initializes a new instance of <code>BorderLayout</code> with no
|
|
|
|
* horiztonal or vertical gaps between components.
|
|
|
|
*/
|
|
|
|
public
|
|
|
|
BorderLayout()
|
|
|
|
{
|
|
|
|
this(0,0);
|
|
|
|
}
|
|
|
|
|
|
|
|
/*************************************************************************/
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Initializes a new instance of <code>BorderLayout</code> with the
|
|
|
|
* specified horiztonal and vertical gaps between components.
|
|
|
|
*
|
|
|
|
* @param hgap The horizontal gap between components.
|
|
|
|
* @param vgap The vertical gap between components.
|
|
|
|
*/
|
|
|
|
public
|
|
|
|
BorderLayout(int hgap, int vgap)
|
|
|
|
{
|
|
|
|
this.hgap = hgap;
|
|
|
|
this.vgap = vgap;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*************************************************************************/
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Instance Variables
|
|
|
|
*/
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Returns the horitzontal gap value.
|
|
|
|
*
|
|
|
|
* @return The horitzontal gap value.
|
|
|
|
*/
|
|
|
|
public int
|
|
|
|
getHgap()
|
|
|
|
{
|
|
|
|
return(hgap);
|
|
|
|
}
|
|
|
|
|
|
|
|
/*************************************************************************/
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Sets the horizontal gap to the specified value.
|
|
|
|
*
|
|
|
|
* @param hgap The new horizontal gap.
|
|
|
|
*/
|
|
|
|
public void
|
|
|
|
setHgap(int hgap)
|
|
|
|
{
|
|
|
|
this.hgap = hgap;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*************************************************************************/
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Returns the vertical gap value.
|
|
|
|
*
|
|
|
|
* @return The vertical gap value.
|
|
|
|
*/
|
|
|
|
public int
|
|
|
|
getVgap()
|
|
|
|
{
|
|
|
|
return(vgap);
|
|
|
|
}
|
|
|
|
|
|
|
|
/*************************************************************************/
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Sets the vertical gap to the specified value.
|
|
|
|
*
|
|
|
|
* @param vgap The new vertical gap value.
|
|
|
|
*/
|
|
|
|
public void
|
|
|
|
setVgap(int vgap)
|
|
|
|
{
|
|
|
|
this.vgap = vgap;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*************************************************************************/
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Adds a component to the layout in the specified constraint position,
|
|
|
|
* which must be one of the string constants defined in this class.
|
|
|
|
*
|
|
|
|
* @param component The component to add.
|
|
|
|
* @param constraints The constraint string.
|
|
|
|
*
|
|
|
|
* @exception IllegalArgumentException If the constraint object is not
|
|
|
|
* a string, or is not one of the specified constants in this class.
|
|
|
|
*/
|
|
|
|
public void
|
|
|
|
addLayoutComponent(Component component, Object constraints)
|
|
|
|
{
|
|
|
|
if (constraints != null && ! (constraints instanceof String))
|
|
|
|
throw new IllegalArgumentException("Constraint must be a string");
|
|
|
|
|
GtkListPeer.java, [...]: Fix handling of alias methods...
2004-02-03 Thomas Fitzsimmons <fitzsim@redhat.com>
* gnu/java/awt/peer/gtk/GtkListPeer.java,
java/awt/BorderLayout.java, java/awt/CardLayout.java,
java/awt/CheckboxGroup.java, java/awt/Choice.java,
java/awt/Component.java, java/awt/Container.java,
java/awt/FontMetrics.java, java/awt/GridBagLayout.java,
java/awt/LayoutManager2.java, java/awt/List.java,
java/awt/Menu.java, java/awt/MenuBar.java,
java/awt/MenuItem.java, java/awt/Polygon.java,
java/awt/Rectangle.java, java/awt/ScrollPane.java,
java/awt/Scrollbar.java, java/awt/TextArea.java,
java/awt/TextField.java,
java/awt/image/renderable/RenderContext.java,
javax/swing/JApplet.java: Fix handling of alias methods, where a
method has been deprecated in favour of a new one with the same
funtion but a different name. Put the method implementation in
the deprecated method and have the new method call the
deprecated one. Make all other code call the new method.
From-SVN: r77178
2004-02-03 17:10:56 +00:00
|
|
|
addLayoutComponent((String) constraints, component);
|
|
|
|
}
|
|
|
|
|
|
|
|
/*************************************************************************/
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Adds a component to the layout in the specified constraint position,
|
|
|
|
* which must be one of the string constants defined in this class.
|
|
|
|
*
|
|
|
|
* @param constraints The constraint string.
|
|
|
|
* @param component The component to add.
|
|
|
|
*
|
|
|
|
* @exception IllegalArgumentException If the constraint object is not
|
|
|
|
* one of the specified constants in this class.
|
|
|
|
*
|
|
|
|
* @deprecated This method is deprecated in favor of
|
|
|
|
* <code>addLayoutComponent(Component, Object)</code>.
|
|
|
|
*/
|
|
|
|
public void
|
|
|
|
addLayoutComponent(String constraints, Component component)
|
|
|
|
{
|
|
|
|
String str = constraints;
|
Start of AWT merge with Classpath:
* Makefile.in: Rebuilt.
* Makefile.am (awt_java_source_files): Reference files in
gnu/java/awt, not gnu/gcj/awt.
* java/awt/image/BufferedImage.java: Updated copyright.
* java/awt/image/ComponentColorModel.java: Updated copyright.
* java/awt/image/ComponentSampleModel.java: Updated copyright.
* java/awt/image/DataBuffer.java: Updated copyright.
* java/awt/image/DataBufferByte.java: Updated copyright.
* java/awt/image/DataBufferInt.java: Updated copyright.
* java/awt/image/DataBufferUShort.java: Updated copyright.
* java/awt/image/IndexColorModel.java: Updated copyright.
* java/awt/image/PackedColorModel.java: Updated copyright.
* java/awt/image/Raster.java: Updated copyright.
* java/awt/image/RasterOp.java: Updated copyright.
* java/awt/image/SampleModel.java: Updated copyright.
* java/awt/image/SinglePixelPackedSampleModel.java: Updated copyright.
* java/awt/image/WritableRaster.java: Updated copyright.
* java/awt/color/ColorSpace.java: Updated copyright.
* java/awt/color/ICC_ColorSpace.java: Updated copyright
* java/awt/color/ICC_Profile.java: Updated copyright.
* java/awt/event/HierarchyBoundsAdapter.java: Updated copyright.
* java/awt/event/HierarchyBoundsListener.java: Updated copyright.
* java/awt/event/HierarchyEvent.java: Updated copyright.
* java/awt/event/HierarchyListener.java: Updated copyright.
* java/awt/geom/AffineTransform.java: Updated copyright.
* java/awt/geom/Dimension2D.java: Updated copyright.
* java/awt/geom/Ellipse2D.java: Updated copyright.
* java/awt/geom/IllegalPathStateException.java: Updated copyright.
* java/awt/geom/Line2D.java: Updated copyright.
* java/awt/geom/NoninvertibleTransformException.java: Updated
copyright.
* java/awt/geom/PathIterator.java: Updated copyright.
* java/awt/geom/Point2D.java: Updated copyright.
* java/awt/geom/Rectangle2D.java: Updated copyright.
* java/awt/geom/RectangularShape.java: Updated copyright.
* java/awt/geom/RoundRectangle2D.java: Updated copyright.
* java/awt/Toolkit.java: Updated import for file moves.
* java/awt/Rectangle.java: Updated copyright; added javadoc from
Classpath.
(hashCode): New method from Classpath.
* java/awt/Graphics2D.java: Updated copyright.
* java/awt/Transparency.java: Updated copyright.
* java/awt/Paint.java: Updated copyright.
* java/awt/Graphics.java: New version from Classpath.
* java/awt/EventDispatchThread.java: Updated copyright.
* java/awt/CardLayout.java (layoutContainer): Don't skip invisible
children.
(gotoComponent): Wrap around on next/previous.
* gnu/gcj/awt/BitMaskExtent.java: Removed.
* gnu/gcj/awt/Buffers.java: Removed.
* gnu/gcj/awt/ComponentDataBlitOp.java: Removed.
* gnu/gcj/awt/GLightweightPeer.java: Removed.
* gnu/java/awt/BitMaskExtent.java: Added.
* gnu/java/awt/Buffers.java: Added.
* gnu/java/awt/ComponentDataBlitOp.java: Added.
* gnu/java/awt/GLightweightPeer.java: Added.
* java/awt/geom/Line2D.java (clone): Ignore
CloneNotSupportedException.
* gnu/gcj/awt/GLightweightPeer.java (getColorModel): New method.
* java/awt/Frame.java: Merged with Classpath.
* java/awt/RenderingHints.java: Copyright update.
* java/awt/Paint.java: Copyright update.
* java/awt/image/DirectColorModel.java: Merged with Classpath.
* java/awt/image/ColorModel.java: Merged with Classpath.
* java/awt/Window.java (show): New Implementation from Classpath.
(isShowing): Use super.isShowing().
* java/awt/EventQueue.java: Merged with Classpath.
* java/awt/AWTEventMulticaster.java (save): Throw
RuntimeException.
(saveInternal): Likewise.
* java/awt/AWTEvent.java: Now implements Serializable.
* java/awt/Event.java: Copyright update.
* java/awt/peer/ComponentPeer.java: Merged with Classpath.
* java/awt/image/BufferedImage.java: Copyright update.
* java/awt/GraphicsConfiguration.java: Copyright update.
* java/awt/Component.java: (addNotify): Don't call
addNotifyContainerChildren().
(addNotifyContainerChildren): Removed.
(setPeer): New method from Classpath.
(setTreeLock): Likewise.
(setVisible): Rewrote.
(show): Use it.
(hide): Likewise.
(validate): Set `valid'.
(checkImage(Image,ImageObserver)): Implementation from Classpath.
(createImage(ImageProducer)): Likewise.
(prepareImage): Likewise.
* java/awt/Container.java (addImpl): Handle case where constraint
is not a String. Post event via system event queue.
(remove): Post event via system event queue.
(validateTree): Only validate child if it is invalid.
(getAlignmentX): Call super method as default.
(getAlignmentY): Likewise.
(addContainerListener): Now synchronized.
(removeContainerListener): Likewise.
(addNotifyContainerChildren): Now private.
* java/awt/ComponentOrientation.java: Updated copyright. Added
@author.
* java/awt/FlowLayout.java (serialVersionUID): New field.
(setAlignment): Better exception message.
(layoutContainer): Don't compute component's preferred size unless
we're going to use it.
* java/awt/BorderLayout.java (AFTER_LAST_LINE, AFTER_LINE_ENDS,
BEFORE_FIRST_LINE, BEFORE_LINE_BEGINS): New constants.
(firstLine, lastLine, firstItem, lastItem): New fields.
(addLayoutComponent): Handle case where constraints is null.
Also, handle relative locations.
(removeLayoutComponent): Handle relative locations.
(MIN, MAX, PREF): New constants.
(calcCompSize): New method.
(calcSize): New method.
(minimumLayoutSize): Use it.
(preferredLayoutSize): Likewise.
(maximumLayoutSize): Likewise.
(toString): Include more information.
(setBounds): New method.
(layoutContainer): Use libgcj implementation; extended to handle
relative locations.
From-SVN: r48896
2002-01-16 04:21:35 +00:00
|
|
|
|
|
|
|
if (str == null || str.equals(CENTER))
|
|
|
|
center = component;
|
2002-01-24 06:39:29 +00:00
|
|
|
else if (str.equals(NORTH))
|
Start of AWT merge with Classpath:
* Makefile.in: Rebuilt.
* Makefile.am (awt_java_source_files): Reference files in
gnu/java/awt, not gnu/gcj/awt.
* java/awt/image/BufferedImage.java: Updated copyright.
* java/awt/image/ComponentColorModel.java: Updated copyright.
* java/awt/image/ComponentSampleModel.java: Updated copyright.
* java/awt/image/DataBuffer.java: Updated copyright.
* java/awt/image/DataBufferByte.java: Updated copyright.
* java/awt/image/DataBufferInt.java: Updated copyright.
* java/awt/image/DataBufferUShort.java: Updated copyright.
* java/awt/image/IndexColorModel.java: Updated copyright.
* java/awt/image/PackedColorModel.java: Updated copyright.
* java/awt/image/Raster.java: Updated copyright.
* java/awt/image/RasterOp.java: Updated copyright.
* java/awt/image/SampleModel.java: Updated copyright.
* java/awt/image/SinglePixelPackedSampleModel.java: Updated copyright.
* java/awt/image/WritableRaster.java: Updated copyright.
* java/awt/color/ColorSpace.java: Updated copyright.
* java/awt/color/ICC_ColorSpace.java: Updated copyright
* java/awt/color/ICC_Profile.java: Updated copyright.
* java/awt/event/HierarchyBoundsAdapter.java: Updated copyright.
* java/awt/event/HierarchyBoundsListener.java: Updated copyright.
* java/awt/event/HierarchyEvent.java: Updated copyright.
* java/awt/event/HierarchyListener.java: Updated copyright.
* java/awt/geom/AffineTransform.java: Updated copyright.
* java/awt/geom/Dimension2D.java: Updated copyright.
* java/awt/geom/Ellipse2D.java: Updated copyright.
* java/awt/geom/IllegalPathStateException.java: Updated copyright.
* java/awt/geom/Line2D.java: Updated copyright.
* java/awt/geom/NoninvertibleTransformException.java: Updated
copyright.
* java/awt/geom/PathIterator.java: Updated copyright.
* java/awt/geom/Point2D.java: Updated copyright.
* java/awt/geom/Rectangle2D.java: Updated copyright.
* java/awt/geom/RectangularShape.java: Updated copyright.
* java/awt/geom/RoundRectangle2D.java: Updated copyright.
* java/awt/Toolkit.java: Updated import for file moves.
* java/awt/Rectangle.java: Updated copyright; added javadoc from
Classpath.
(hashCode): New method from Classpath.
* java/awt/Graphics2D.java: Updated copyright.
* java/awt/Transparency.java: Updated copyright.
* java/awt/Paint.java: Updated copyright.
* java/awt/Graphics.java: New version from Classpath.
* java/awt/EventDispatchThread.java: Updated copyright.
* java/awt/CardLayout.java (layoutContainer): Don't skip invisible
children.
(gotoComponent): Wrap around on next/previous.
* gnu/gcj/awt/BitMaskExtent.java: Removed.
* gnu/gcj/awt/Buffers.java: Removed.
* gnu/gcj/awt/ComponentDataBlitOp.java: Removed.
* gnu/gcj/awt/GLightweightPeer.java: Removed.
* gnu/java/awt/BitMaskExtent.java: Added.
* gnu/java/awt/Buffers.java: Added.
* gnu/java/awt/ComponentDataBlitOp.java: Added.
* gnu/java/awt/GLightweightPeer.java: Added.
* java/awt/geom/Line2D.java (clone): Ignore
CloneNotSupportedException.
* gnu/gcj/awt/GLightweightPeer.java (getColorModel): New method.
* java/awt/Frame.java: Merged with Classpath.
* java/awt/RenderingHints.java: Copyright update.
* java/awt/Paint.java: Copyright update.
* java/awt/image/DirectColorModel.java: Merged with Classpath.
* java/awt/image/ColorModel.java: Merged with Classpath.
* java/awt/Window.java (show): New Implementation from Classpath.
(isShowing): Use super.isShowing().
* java/awt/EventQueue.java: Merged with Classpath.
* java/awt/AWTEventMulticaster.java (save): Throw
RuntimeException.
(saveInternal): Likewise.
* java/awt/AWTEvent.java: Now implements Serializable.
* java/awt/Event.java: Copyright update.
* java/awt/peer/ComponentPeer.java: Merged with Classpath.
* java/awt/image/BufferedImage.java: Copyright update.
* java/awt/GraphicsConfiguration.java: Copyright update.
* java/awt/Component.java: (addNotify): Don't call
addNotifyContainerChildren().
(addNotifyContainerChildren): Removed.
(setPeer): New method from Classpath.
(setTreeLock): Likewise.
(setVisible): Rewrote.
(show): Use it.
(hide): Likewise.
(validate): Set `valid'.
(checkImage(Image,ImageObserver)): Implementation from Classpath.
(createImage(ImageProducer)): Likewise.
(prepareImage): Likewise.
* java/awt/Container.java (addImpl): Handle case where constraint
is not a String. Post event via system event queue.
(remove): Post event via system event queue.
(validateTree): Only validate child if it is invalid.
(getAlignmentX): Call super method as default.
(getAlignmentY): Likewise.
(addContainerListener): Now synchronized.
(removeContainerListener): Likewise.
(addNotifyContainerChildren): Now private.
* java/awt/ComponentOrientation.java: Updated copyright. Added
@author.
* java/awt/FlowLayout.java (serialVersionUID): New field.
(setAlignment): Better exception message.
(layoutContainer): Don't compute component's preferred size unless
we're going to use it.
* java/awt/BorderLayout.java (AFTER_LAST_LINE, AFTER_LINE_ENDS,
BEFORE_FIRST_LINE, BEFORE_LINE_BEGINS): New constants.
(firstLine, lastLine, firstItem, lastItem): New fields.
(addLayoutComponent): Handle case where constraints is null.
Also, handle relative locations.
(removeLayoutComponent): Handle relative locations.
(MIN, MAX, PREF): New constants.
(calcCompSize): New method.
(calcSize): New method.
(minimumLayoutSize): Use it.
(preferredLayoutSize): Likewise.
(maximumLayoutSize): Likewise.
(toString): Include more information.
(setBounds): New method.
(layoutContainer): Use libgcj implementation; extended to handle
relative locations.
From-SVN: r48896
2002-01-16 04:21:35 +00:00
|
|
|
north = component;
|
|
|
|
else if (str.equals(SOUTH))
|
|
|
|
south = component;
|
|
|
|
else if (str.equals(EAST))
|
|
|
|
east = component;
|
|
|
|
else if (str.equals(WEST))
|
|
|
|
west = component;
|
|
|
|
else if (str.equals(BEFORE_FIRST_LINE))
|
|
|
|
firstLine = component;
|
|
|
|
else if (str.equals(AFTER_LAST_LINE))
|
|
|
|
lastLine = component;
|
|
|
|
else if (str.equals(BEFORE_LINE_BEGINS))
|
|
|
|
firstItem = component;
|
|
|
|
else if (str.equals(AFTER_LINE_ENDS))
|
|
|
|
lastItem = component;
|
|
|
|
else
|
|
|
|
throw new IllegalArgumentException("Constraint value not valid: " + str);
|
|
|
|
}
|
|
|
|
|
|
|
|
/*************************************************************************/
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Removes the specified component from the layout.
|
|
|
|
*
|
|
|
|
* @param component The component to remove from the layout.
|
|
|
|
*/
|
|
|
|
public void
|
|
|
|
removeLayoutComponent(Component component)
|
|
|
|
{
|
|
|
|
if (north == component)
|
|
|
|
north = null;
|
|
|
|
if (south == component)
|
|
|
|
south = null;
|
|
|
|
if (east == component)
|
|
|
|
east = null;
|
|
|
|
if (west == component)
|
|
|
|
west = null;
|
|
|
|
if (center == component)
|
|
|
|
center = null;
|
|
|
|
if (firstItem == component)
|
|
|
|
firstItem = null;
|
|
|
|
if (lastItem == component)
|
|
|
|
lastItem = null;
|
|
|
|
if (firstLine == component)
|
|
|
|
firstLine = null;
|
|
|
|
if (lastLine == component)
|
|
|
|
lastLine = null;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*************************************************************************/
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Returns the minimum size of the specified container using this layout.
|
|
|
|
*
|
|
|
|
* @param target The container to calculate the minimum size for.
|
|
|
|
*
|
|
|
|
* @return The minimum size of the container
|
|
|
|
*/
|
|
|
|
public Dimension
|
|
|
|
minimumLayoutSize(Container target)
|
|
|
|
{
|
|
|
|
return calcSize(target, MIN);
|
|
|
|
}
|
|
|
|
|
|
|
|
/*************************************************************************/
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Returns the preferred size of the specified container using this layout.
|
|
|
|
*
|
|
|
|
* @param target The container to calculate the preferred size for.
|
|
|
|
*
|
|
|
|
* @return The preferred size of the container
|
|
|
|
*/
|
|
|
|
public Dimension
|
|
|
|
preferredLayoutSize(Container target)
|
|
|
|
{
|
|
|
|
return calcSize(target, PREF);
|
|
|
|
}
|
|
|
|
|
|
|
|
/*************************************************************************/
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Returns the maximum size of the specified container using this layout.
|
|
|
|
*
|
|
|
|
* @param target The container to calculate the maximum size for.
|
|
|
|
*
|
|
|
|
* @return The maximum size of the container
|
|
|
|
*/
|
|
|
|
public Dimension
|
|
|
|
maximumLayoutSize(Container target)
|
|
|
|
{
|
|
|
|
return calcSize(target, MAX);
|
|
|
|
}
|
|
|
|
|
|
|
|
/*************************************************************************/
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Returns the X axis alignment, which is a <code>float</code> indicating
|
|
|
|
* where along the X axis this container wishs to position its layout.
|
|
|
|
* 0 indicates align to the left, 1 indicates align to the right, and 0.5
|
|
|
|
* indicates align to the center.
|
|
|
|
*
|
|
|
|
* @param parent The parent container.
|
|
|
|
*
|
|
|
|
* @return The X alignment value.
|
|
|
|
*/
|
|
|
|
public float
|
|
|
|
getLayoutAlignmentX(Container parent)
|
|
|
|
{
|
|
|
|
return(parent.getAlignmentX());
|
|
|
|
}
|
|
|
|
|
|
|
|
/*************************************************************************/
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Returns the Y axis alignment, which is a <code>float</code> indicating
|
|
|
|
* where along the Y axis this container wishs to position its layout.
|
|
|
|
* 0 indicates align to the top, 1 indicates align to the bottom, and 0.5
|
|
|
|
* indicates align to the center.
|
|
|
|
*
|
|
|
|
* @param parent The parent container.
|
|
|
|
*
|
|
|
|
* @return The Y alignment value.
|
|
|
|
*/
|
|
|
|
public float
|
|
|
|
getLayoutAlignmentY(Container parent)
|
|
|
|
{
|
|
|
|
return(parent.getAlignmentY());
|
|
|
|
}
|
|
|
|
|
|
|
|
/*************************************************************************/
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Instructs this object to discard any layout information it might
|
|
|
|
* have cached.
|
|
|
|
*
|
|
|
|
* @param parent The parent container.
|
|
|
|
*/
|
|
|
|
public void
|
|
|
|
invalidateLayout(Container parent)
|
|
|
|
{
|
|
|
|
}
|
|
|
|
|
|
|
|
/*************************************************************************/
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Lays out the specified container according to the constraints
|
|
|
|
* in this object.
|
|
|
|
*
|
|
|
|
* @param target The container to lay out.
|
|
|
|
*/
|
|
|
|
public void
|
|
|
|
layoutContainer(Container target)
|
|
|
|
{
|
2002-11-10 23:11:21 +00:00
|
|
|
synchronized (target.getTreeLock ())
|
Start of AWT merge with Classpath:
* Makefile.in: Rebuilt.
* Makefile.am (awt_java_source_files): Reference files in
gnu/java/awt, not gnu/gcj/awt.
* java/awt/image/BufferedImage.java: Updated copyright.
* java/awt/image/ComponentColorModel.java: Updated copyright.
* java/awt/image/ComponentSampleModel.java: Updated copyright.
* java/awt/image/DataBuffer.java: Updated copyright.
* java/awt/image/DataBufferByte.java: Updated copyright.
* java/awt/image/DataBufferInt.java: Updated copyright.
* java/awt/image/DataBufferUShort.java: Updated copyright.
* java/awt/image/IndexColorModel.java: Updated copyright.
* java/awt/image/PackedColorModel.java: Updated copyright.
* java/awt/image/Raster.java: Updated copyright.
* java/awt/image/RasterOp.java: Updated copyright.
* java/awt/image/SampleModel.java: Updated copyright.
* java/awt/image/SinglePixelPackedSampleModel.java: Updated copyright.
* java/awt/image/WritableRaster.java: Updated copyright.
* java/awt/color/ColorSpace.java: Updated copyright.
* java/awt/color/ICC_ColorSpace.java: Updated copyright
* java/awt/color/ICC_Profile.java: Updated copyright.
* java/awt/event/HierarchyBoundsAdapter.java: Updated copyright.
* java/awt/event/HierarchyBoundsListener.java: Updated copyright.
* java/awt/event/HierarchyEvent.java: Updated copyright.
* java/awt/event/HierarchyListener.java: Updated copyright.
* java/awt/geom/AffineTransform.java: Updated copyright.
* java/awt/geom/Dimension2D.java: Updated copyright.
* java/awt/geom/Ellipse2D.java: Updated copyright.
* java/awt/geom/IllegalPathStateException.java: Updated copyright.
* java/awt/geom/Line2D.java: Updated copyright.
* java/awt/geom/NoninvertibleTransformException.java: Updated
copyright.
* java/awt/geom/PathIterator.java: Updated copyright.
* java/awt/geom/Point2D.java: Updated copyright.
* java/awt/geom/Rectangle2D.java: Updated copyright.
* java/awt/geom/RectangularShape.java: Updated copyright.
* java/awt/geom/RoundRectangle2D.java: Updated copyright.
* java/awt/Toolkit.java: Updated import for file moves.
* java/awt/Rectangle.java: Updated copyright; added javadoc from
Classpath.
(hashCode): New method from Classpath.
* java/awt/Graphics2D.java: Updated copyright.
* java/awt/Transparency.java: Updated copyright.
* java/awt/Paint.java: Updated copyright.
* java/awt/Graphics.java: New version from Classpath.
* java/awt/EventDispatchThread.java: Updated copyright.
* java/awt/CardLayout.java (layoutContainer): Don't skip invisible
children.
(gotoComponent): Wrap around on next/previous.
* gnu/gcj/awt/BitMaskExtent.java: Removed.
* gnu/gcj/awt/Buffers.java: Removed.
* gnu/gcj/awt/ComponentDataBlitOp.java: Removed.
* gnu/gcj/awt/GLightweightPeer.java: Removed.
* gnu/java/awt/BitMaskExtent.java: Added.
* gnu/java/awt/Buffers.java: Added.
* gnu/java/awt/ComponentDataBlitOp.java: Added.
* gnu/java/awt/GLightweightPeer.java: Added.
* java/awt/geom/Line2D.java (clone): Ignore
CloneNotSupportedException.
* gnu/gcj/awt/GLightweightPeer.java (getColorModel): New method.
* java/awt/Frame.java: Merged with Classpath.
* java/awt/RenderingHints.java: Copyright update.
* java/awt/Paint.java: Copyright update.
* java/awt/image/DirectColorModel.java: Merged with Classpath.
* java/awt/image/ColorModel.java: Merged with Classpath.
* java/awt/Window.java (show): New Implementation from Classpath.
(isShowing): Use super.isShowing().
* java/awt/EventQueue.java: Merged with Classpath.
* java/awt/AWTEventMulticaster.java (save): Throw
RuntimeException.
(saveInternal): Likewise.
* java/awt/AWTEvent.java: Now implements Serializable.
* java/awt/Event.java: Copyright update.
* java/awt/peer/ComponentPeer.java: Merged with Classpath.
* java/awt/image/BufferedImage.java: Copyright update.
* java/awt/GraphicsConfiguration.java: Copyright update.
* java/awt/Component.java: (addNotify): Don't call
addNotifyContainerChildren().
(addNotifyContainerChildren): Removed.
(setPeer): New method from Classpath.
(setTreeLock): Likewise.
(setVisible): Rewrote.
(show): Use it.
(hide): Likewise.
(validate): Set `valid'.
(checkImage(Image,ImageObserver)): Implementation from Classpath.
(createImage(ImageProducer)): Likewise.
(prepareImage): Likewise.
* java/awt/Container.java (addImpl): Handle case where constraint
is not a String. Post event via system event queue.
(remove): Post event via system event queue.
(validateTree): Only validate child if it is invalid.
(getAlignmentX): Call super method as default.
(getAlignmentY): Likewise.
(addContainerListener): Now synchronized.
(removeContainerListener): Likewise.
(addNotifyContainerChildren): Now private.
* java/awt/ComponentOrientation.java: Updated copyright. Added
@author.
* java/awt/FlowLayout.java (serialVersionUID): New field.
(setAlignment): Better exception message.
(layoutContainer): Don't compute component's preferred size unless
we're going to use it.
* java/awt/BorderLayout.java (AFTER_LAST_LINE, AFTER_LINE_ENDS,
BEFORE_FIRST_LINE, BEFORE_LINE_BEGINS): New constants.
(firstLine, lastLine, firstItem, lastItem): New fields.
(addLayoutComponent): Handle case where constraints is null.
Also, handle relative locations.
(removeLayoutComponent): Handle relative locations.
(MIN, MAX, PREF): New constants.
(calcCompSize): New method.
(calcSize): New method.
(minimumLayoutSize): Use it.
(preferredLayoutSize): Likewise.
(maximumLayoutSize): Likewise.
(toString): Include more information.
(setBounds): New method.
(layoutContainer): Use libgcj implementation; extended to handle
relative locations.
From-SVN: r48896
2002-01-16 04:21:35 +00:00
|
|
|
{
|
2002-11-10 23:11:21 +00:00
|
|
|
Insets i = target.getInsets();
|
|
|
|
|
|
|
|
ComponentOrientation orient = target.getComponentOrientation ();
|
|
|
|
boolean left_to_right = orient.isLeftToRight ();
|
|
|
|
|
|
|
|
Component my_north = north;
|
|
|
|
Component my_east = east;
|
|
|
|
Component my_south = south;
|
|
|
|
Component my_west = west;
|
|
|
|
|
|
|
|
// Note that we currently don't handle vertical layouts. Neither
|
|
|
|
// does JDK 1.3.
|
|
|
|
if (firstLine != null)
|
|
|
|
my_north = firstLine;
|
|
|
|
if (lastLine != null)
|
|
|
|
my_south = lastLine;
|
|
|
|
if (firstItem != null)
|
|
|
|
{
|
|
|
|
if (left_to_right)
|
|
|
|
my_west = firstItem;
|
|
|
|
else
|
|
|
|
my_east = firstItem;
|
|
|
|
}
|
|
|
|
if (lastItem != null)
|
|
|
|
{
|
|
|
|
if (left_to_right)
|
|
|
|
my_east = lastItem;
|
|
|
|
else
|
|
|
|
my_west = lastItem;
|
|
|
|
}
|
|
|
|
|
|
|
|
Dimension c = calcCompSize(center, PREF);
|
|
|
|
Dimension n = calcCompSize(my_north, PREF);
|
|
|
|
Dimension s = calcCompSize(my_south, PREF);
|
|
|
|
Dimension e = calcCompSize(my_east, PREF);
|
|
|
|
Dimension w = calcCompSize(my_west, PREF);
|
|
|
|
Dimension t = target.getSize();
|
|
|
|
|
|
|
|
/*
|
|
|
|
<-> hgap <-> hgap
|
|
|
|
+----------------------------+ }
|
|
|
|
|t | } i.top
|
|
|
|
| +----------------------+ | --- y1 }
|
|
|
|
| |n | |
|
|
|
|
| +----------------------+ | } vgap
|
|
|
|
| +---+ +----------+ +---+ | --- y2 } }
|
|
|
|
| |w | |c | |e | | } hh
|
|
|
|
| +---+ +----------+ +---+ | } vgap }
|
|
|
|
| +----------------------+ | --- y3 }
|
|
|
|
| |s | |
|
|
|
|
| +----------------------+ | }
|
|
|
|
| | } i.bottom
|
|
|
|
+----------------------------+ }
|
|
|
|
|x1 |x2 |x3
|
|
|
|
<---------------------->
|
|
|
|
<--> ww <-->
|
|
|
|
i.left i.right
|
|
|
|
*/
|
|
|
|
|
|
|
|
int x1 = i.left;
|
|
|
|
int x2 = x1 + w.width + hgap;
|
[multiple changes]
2004-06-17 Michael Koch <konqueror@gmx.de>
* javax/swing/JToolBar.java
(name): Removed.
(JToolBar): Use Component.setName(String) instead of doing it all
alone.
* javax/swing/Timer.java
(queueEvent): Added missing modifier.
2004-06-17 Olga Rodimina <rodimina@redhat.coom>
* Makefile.am: Added new file.
* Makefile.in: Re-generate.
* javax/swing/JMenu.java:
(insertSeparator): Implemented.
* javax/swing/JPopupMenu.java:
(JPopupMenu.Separator): Implemented.
* javax/swing/MenuSelectionManager.java:
(processMouseEvent): Use java.awt.Component
for event source instead of javax.swing.JComponent.
* javax/swing/plaf/basic/BasicPopupMenuSeparatorUI.java:
New File. Implemented.
2004-06-16 David Jee <djee@redhat.com>
* java/awt/GridBagLayout.java
(GetLayoutInfo): Adjust cell sizes iff parent size is not zero.
Make sure pos_x and pos_y are never negative.
2004-04-16 Andrew Overholt <overholt@redhat.com>
* Makefile.am: Add new file.
* Makefile.in: Re-generate.
* javax/swing/JToolBar.java
Partially implemented.
* javax/swing/plaf/basic/BasicToolBarUI.java
New file. Partially implemented.
2004-06-16 Graydon Hoare <graydon@redhat.com>
* gnu/java/awt/peer/gtk/GdkGraphics2D.java
(setComposite): Accept AlphaComposite arguments.
* gnu/java/awt/peer/gtk/GdkPixbufDecoder.java
(createBufferedImage): Add new overloads.
* gnu/java/awt/peer/gtk/GtkToolkit.java
(createImage): Use GdkPixbufDecoder.createBufferedImage
when useGraphics2D() is true.
(getImage): Delegate to createImage.
* javax/swing/JList.java
(isSelectionEmpty):
(getFirstVisibleIndex):
(getLastVisibleIndex):
(setSelectedValue):
(ensureIndexIsVisible): New methods.
* javax/swing/Timer.java: Reimplement.
2004-06-16 Michael Koch <konqueror@gmx.de>
* javax/swing/text/AbstractDocument.java
(AbstracElement): Made public, implements java.io.Serializable.
(AttributeContext): Made public.
(BranchElement): Likewise.
(Content): Likewise.
(DefaultDocumentEvent): Made public, extends
javax.swing.undo.CompoundEdit.
(ElementEdit): Made public, extends
javax.swing.undo.AbstractUndoableEdit.
(LeafElement): Made public.
(LeafElement.LeafElement): Made public.
2004-06-16 Michael Koch <konqueror@gmx.de>
* javax/swing/text/JTextComponent.java: Totally reworked. Removed many
methods (that were obviously never be intended to get included hi this
class. Added some methods too.
2004-06-16 Michael Koch <konqueror@gmx.de>
* javax/swing/text/PlainDocument.java
(serialVersionUID): New constant.
(lineLimitAttribute): Likewise.
(tabSizeAttribute): Likewise.
(tabSize): New field.
(PlainDocument): Made public.
(PlainDocument): New constructor.
2004-06-16 Michael Koch <konqueror@gmx.de>
* javax/swing/text/AbstractDocument.java
(insertString): Throws BadLocationException.
* javax/swing/text/Document.java
(insertString): Likewise.
* javax/swing/text/JTextComponent.java:
Javadocs and comments cleaned up.
2004-06-16 Michael Koch <konqueror@gmx.de>
* javax/swing/event/UndoableEditListener.java: Reformatted.
* javax/swing/text/AbstractDocument.java
(AbstractDocument): Implements java.io.Serializable.
(doc_list): Removed.
(undo_list): Removed.
(AbstractElement.serialVerionUID): New field.
(BranchElement.serialVerionUID): Likewise.
(DefaultDocumentEvent.serialVerionUID): Likewise.
(ElementEdit.serialVerionUID): Likewise.
(LeafElement.serialVerionUID): Likewise.
(serialVerionUID): Likewise.
(BAD_LOCATION): New constant.
(BidiElementName): Likewise.
(ContentElementName): Likewise.
(ParagraphElementName): Likewise.
(SectionElementName): Likewise.
(ElementNameAttribute): Likewise.
(AbstractDocument): Made protected.
(AbstractDocument): New construtor.
(listenerList): New field.
(fireChangedUpdate): Implemented.
(fireInsertUpdate): Likewise.
(fireRemoveUpdate): Likewise.
(fireUndoableEditUpdate): Likewise.
(getListeners): Likewise.
(addDocumentListener): Likewise.
(removeDocumentListener): Likewise.
(addUndoableEditListener): Likewise.
(removeUndoableEditListener): Likewise.
(getDocumentListeners): New method.
(getUndoableEditListeners): Likewise.
(getAsynchronousLoadPriority): Made public.
(getBidiRootElement): Likewise.
(setAsynchronousLoadPriority): Likewise.
(setDocumentProperties): Likewise.
* javax/swing/text/BadLocationException.java
(serialVerionUID): New field.
* javax/swing/text/DefaultCaret.java
(changeEvent): New field.
(listenerList): Likewise.
(changes): Removed.
(addChangeListener): Reimplemented.
(removeChangeListener): Likewise.
(getListeners): New method.
(getChangeListeners): Likwise.
(getComponent): Likewise.
* javax/swing/text/GapContent.java
(GapContent): Implements java.io.Serializable.
(serialVerionUID): New field.
2004-06-16 Michael Koch <konqueror@gmx.de>
* javax/swing/JTree.java
(treeModel): New field.
(JTree): New constructors, one existing one made public.
(createTreeModel): New method.
(addTreeExpansionListener): Likewise.
(removeTreeExpansionListener): Likewise.
(getTreeExpansionListeners): Likewise.
(fireTreeCollapsed): Likewise.
(fireTreeExpanded): Likewise.
(addTreeSelectionListener): Likewise.
(removeTreeSelectionListener): Likewise.
(getTreeSelectionListeners): Likewise.
(fireValueChanged): Likewise.
(addTreeWillExpandListener): Likewise.
(removeTreeWillExpandListener): Likewise.
(getTreeWillExpandListeners): Likewise.
(fireTreeWillCollapse): Likewise.
(fireTreeWillExpand): Likewise.
2004-06-16 Michael Koch <konqueror@gmx.de>
* javax/swing/JTree.java: Reformatted.
2004-06-16 Michael Koch <konqueror@gmx.de>
* javax/swing/JTextArea.java: New file.
* javax/swing/JTextField.java
(actions): Removed.
(notifyAction): New constant.
(columns): New field.
(JTextField): New constructors.
(createDefaultModel): New method.
(addActionListener): Reimplmemented.
(removeActionListener): Reimplemented.
(getActionListeners): New method.
(fireActionPerformed): New method.
(getColumns): New method.
(setColumne): New method.
* javax/swing/text/JTextComponent.java
(AccessibleJTextComponent.serialVersionUID): New field.
(serialVersionUID): Likewise.
(DEFAULT_KEYMAP): Likewise.
(FOCUS_ACCELERATOR_KEY): Likewise.
(doc): Made private.
(icon_gap): Likewise.
(icon): Likewise.
(align): Likewise.
(JTextComponent): Some constructors removed.
(getScrollableTracksViewportHeight): New method.
(getScrollableTracksViewportWidth): Likewise.
* Makefile.am: Added javax/swing/JTextArea.java.
* Makefile.in: Regenerated.
2004-06-15 Graydon Hoare <graydon@redhat.com>
* javax/swing/ImageIcon.java (ImageIcon): New constructor.
* javax/swing/JFrame.java (defaultLookAndFeelDecorated): New property.
* javax/swing/JViewport.java
(getExtentSize): Return size rather than preferred size.
(toViewCoordinates): New methods.
(getViewSize): Return size rather than preferred size.
(setViewSize): Note view size as set.
* javax/swing/ViewportLayout.java (layoutContainer): Reimplement.
* javax/swing/plaf/basic/BasicScrollBarUI.java
(getPreferredSize): Don't redo layout.
* javax/swing/plaf/basic/BasicViewportUI.java
(paint): Translate image properly and eat exceptions.
2004-06-15 Kim Ho <kho@redhat.com>
* javax/swing/JTabbedPane.java
(setComponent): Remove old component and
add new component.
(setSelectedIndex): Don't operate on the
components if they're null. Don't set index
on the model if the index is the same.
(insertTab): Don't add or hide the component
if it's null. Repaint the container.
* javax/swing/plaf/basic/BasicLookAndFeel.java
Change colors for TabbedPane.
* javax/swing/plaf/basic/BasicTabbedPaneUI.java
(mousePressed): Re-layout and paint the component.
(layoutContainer): Don't set location on the view.
(ScrollingViewport::paint): Remove.
2004-06-14 Thomas Fitzsimmons <fitzsim@redhat.com>
* jni/gtk-peer/gnu_java_awt_peer_gtk_GtkComponentPeer.c
(gtkWidgetDispatchKeyEvent): Change warning message to comment.
* jni/gtk-peer/gnu_java_awt_peer_gtk_GdkGraphics.c (drawString):
Wrap baseline y value in PANGO_PIXELS macro, rather than simply
dividing by PANGO_SCALE. Call gdk_flush before leaving GDK
critical region.
(drawLine): Call gdk_flush before leaving GDK critical region.
(fillRect): Likewise.
(drawRect): Likewise.
(copyArea): Likewise.
(copyPixmap): Likewise.
(clearRect): Likewise.
(drawArc): Likewise.
(drawPolyline): Likewise.
(drawPolygon): Likewise.
(fillPolygon): Likewise.
(fillArc): Likewise.
(drawOval): Likewise.
(fillOval): Likewise.
* gnu/java/awt/peer/gtk/GdkFontMetrics.java (initState): Add
style parameter.
(GdkFontMetrics): Add style argument to initState call.
(stringWidth(String,int,int,String)): Add style parameter.
(stringWidth(String)): Add style argument to stringWidth call.
* jni/gtk-peer/gnu_java_awt_peer_gtk_GdkFontMetrics.c
(initState): Set pango font style and weight based on AWT style
parameter. Pass default GTK language to
pango_context_get_metrics. Use PANGO_PIXELS macro rather than
simply dividing by PANGO_SCALE.
(stringWidth): Set pango font style and weight based on AWT style
parameter.
* java/awt/Button.java (next_button_number): New field.
(paramString): Change output.
(generateName): New method.
(getUniqueLong): New method.
2004-06-14 Kim Ho <kho@redhat.com>
* javax/swing/JTabbedPane.java:
(setComponentAt): Set the component, not
the enabled status.
* javax/swing/plaf/basic/BasicDesktopIconUI.java
(actionPerformed): Let deiconize catch exception.
2004-06-14 Olga Rodimina <rodimina@redhat.com>
* javax/swing/JPopupMenu.java:
(setVisible): Corrected location of a
heavyweight popup menu.
2004-06-14 Olga Rodimina <rodimina@redhat.com>
* javax/swing/MenuSelectionManager.java:
Ran through jalopy to fix formatting style.
2004-06-14 Olga Rodimina <rodimina@redhat.com>
* javax/swing/JLayeredPane.java:
(remove): Revalidate and repaint layered pane after
the component was removed.
javax/swing/JMenu.java:
(setVisible): Display popup menu at the user location,
if one was set by the user.
(setMenuLocation): Reimplemented. Fixed javadoc.
* javax/swing/JMenuBar.java: Added javadoc.
(BORDER_PAINTED_CHANGED_PROPERTY): New Property.
(MODEL_CHANGED_PROPERTY): New Property.
(isSelected): Implemented.
(setBorderPainted): Fire PropertyChangeEvent
if paintBorder property changes.
(setSelected): Implemented.
(setSelectionModel): Implemented.
* javax/swing/JPopupMenu.java: Added Javadoc
(pack): Implemented.
(setVisible): Reimplemented.
(show): Fixed location.
(JPopupMenu.LigthWeightPopup): Reimplemented to use
Container instead of JPanel.
* javax/swing/MenuSelectionManager.java: Added Javadocs.
(clearSelectedPath): Reimplemented to clear selectedPath
in reverse order.
(processMouseEvent): Reimplemented.
(setSelectedPath): Fire stateChange event indicating that
selected menu path has changed.
(getPath): Change to use ArrayList instead of Vector.
* javax/swing/plaf/basic/BasicMenuBarUI.java:
(installUI): call installKeyboardActions().
(uninstallUI): call uninstallKeyboardActions().
2004-06-13 Michael Koch <konqueror@gmx.de>
* javax/swing/text/DefaultCaret.java,
javax/swing/text/BadLocationException.java:
Reformatted.
2004-06-12 Thomas Fitzsimmons <fitzsim@redhat.com>
* gnu/java/awt/peer/gtk/GtkTextAreaPeer.java (DEFAULT_ROWS,
DEFAULT_COLS): New variables.
(create): Don't allow 0 rows or 0 columns. Instead, set the
values to DEFAULT_ROWS or DEFAULT_COLS.
(getMinimumSize): Likewise.
(getPreferredSize): Likewise.
(minimumSize): Likewise.
(preferredSize): Likewise.
(create): Set peer's editable state.
* java/awt/TextArea.java (TextArea()): Set rows and columns to
zero. Update javadocs.
(TextArea(String)): Likewise.
(TextArea(int,int)): Fix javadocs.
(TextArea(String,int,int,int)): Only throw exception if one of
rows or columns is zero. Fix javadocs.
2004-06-11 Thomas Fitzsimmons <fitzsim@redhat.com>
* java/awt/AWTEvent.java (toString): Handle MenuComponents in
addition to Components.
* java/awt/MenuItem.java (dispatchEventImpl): If the event
wasn't consumed by normal processing, send it to the parent
menu.
* gnu/java/awt/peer/gtk/GtkImagePainter.java
(setPixels(int,int,int,int,ColorModel,int[],int,int)): Remove
translation.
2004-06-11 David Jee <djee@redhat.com>
* java/awt/MediaTracker.java
(addImage(Image,int)): Call imageUpdate() to udpate image status.
(addImage(Image,int,int,int)): Likewise.
2004-06-11 Michael Koch <konqueror@gmx.de>
* javax/swing/text/AbstractDocument.java,
javax/swing/text/Document.java,
javax/swing/text/GapContent.java,
javax/swing/text/JTextComponent.java,
javax/swing/text/PlainDocument.java:
Reformatted.
2004-06-11 Michael Koch <konqueror@gmx.de>
* javax/swing/JRootPane.java
(AccessibleJRootPane.serialVersionUID): New field.
(AccessibleJRootPane.AccessibleJRootPane): New constructor.
(AccessibleJRootPane.getAccessibleRole): New method.
(RootLayout): Implements Serializable.
(RootLayout.serialVersionUID): New field.
(RootLayout.RootLayout): New constructor.
(setJMenuBar): Made public.
(getJMenuBar): Likewise.
(JRootPane): Likewise.
(createContentPane): Likewise.
(createGlassPane): Likewise.
(createLayeredPane): Likewise.
2004-06-11 Michael Koch <konqueror@gmx.de>
* javax/swing/SwingUtilities.java
(isLeftMouseButton): Fixed javadoc.
(isMiddleMouseButton): Likewise.
(isRightMouseButton): Likewise.
2004-06-11 Michael Koch <konqueror@gmx.de>
* javax/swing/JScrollPane.java
(serialVersionUID): New field.
(columnHeader): Made protected.
(rowHeader): Likewise.
(lowerLeft): Likewise.
(lowerRight): Likewise.
(upperLeft): Likewise.
(upperRight): Likewise.
(horizontalScrollBar): Likewise.
(horizontalScrollBarPolicy): Likewise.
(verticalScrollBar): Likewise.
(verticalScrollBarPolicy): Likewise.
(viewport): Likewise.
2004-06-11 Michael Koch <konqueror@gmx.de>
* javax/swing/LookAndFeel.java: Fixed javadocs.
2004-06-11 Michael Koch <konqueror@gmx.de>
* javax/swing/JEditorPane.java: Fixed javadocs.
(JEditorPane): Removed redundant call to to this().
(fireHyperlinkUpdate): Implemented.
2004-06-10 Olga Rodimina <rodimina@redhat.com>
* javax/swing/JMenu.java: Fixed file name
in the file comment.
2004-06-10 Olga Rodimina <rodimina@redhat.com>
* javax/swing/JMenu.java: Added javadoc.
(JMenu): Added MenuChangeListener to listen to
ChangeEvents occuring in menu's model.
(insert): Throw IllegalArgumentException if
index is less than 0
(setSelected): Reimplement.
(setPopupMenuVisible): Call menu's model isEnabled()
(setDelay): Throw IllegalArgumentException if
given amount of delay is less than 0.
(createActionComponent): Implemented.
(createActionChangeListener): Implemented.
(addSeparator): Implemented.
(getItem): Throw IllegalArgumentException if index is
less than 0.
(getItemCount): Implemented.
(fireMenuSelected): Changed to use menuEvent.
(fireMenuDeselected): Likewise.
(fireMenuCanceled): Likewise.
(setAccelerator): Changed to throw an error if this
method is used.
(doClick): Implemented.
(JMenu.ActionChangedListener): New inner class to handle
PropertyChangeEvents occuring in the actions associated with menu.
* javax/swing/plaf/basic/BasicMenuUI.java: Added javadoc.
(BasicMenuUI): Added PropertyChangeListener to the menu.
(createChangeListener): Implemented.
(createMenuDragMouseListener): Likewise.
(createMenuKeyListener): Likewise.
(createPropertyChangeListener): Likewise.
(uninstallListeners): Likewise.
(BasicMenuUI.MouseInputHandler): Reimplemented.
(BasicMenuUI.PropertyChangeHandler): New class. Not implemented yet.
(BasicMenuUI.ChangeHandler): Likewise.
(BasicMenuUI.MenuDragMouseHandler): Likewise.
(BasicMenuUI.MenuKeyHandler): Likewise.
2004-06-10 David Jee <djee@redhat.com>
* java/awt/MediaTracker.java
(imageUpdate): Only do notifyAll() if the image is complete.
2004-06-10 Olga Rodimina <rodimina@redhat.com>
* javax/swing/JApplet.java:
(getJMenuBar): Made public.
(setJMenuBar): Likewise.
* javax/swing/JFrame.java:
(getJMenuBar): Made public.
(setJMenuBar): Likewise.
* javax/swing/JWindow.java:
(getJMenuBar): Removed.
(setJMenuBar): Removed.
2004-06-10 Michael Koch <konqueror@gmx.de>
* javax/swing/JEditorPane.java
(createEditorKitForContentType): Fixed visibility.
(fireHyperlinkUpdate): Likewise.
(getContentType): Likewise.
(getEditorKit): Likewise.
(getEditorKitForContentType): Likewise.
(getPage): Likewise.
(read): Likewise.
(registerEditorKitForContentTyoe): Likewise.
(replaceSelection): Likewise.
(setContentType): Likewise.
(setEditorKit): Likewise.
(setPage): Likewise.
2004-06-10 Michael Koch <konqueror@gmx.de>
* javax/swing/Timer.java
(Timer): New constructor.
* javax/swing/plaf/basic/BasicProgressBarUI.java
(animationTimer): Don't initialize at construction.
(startAnimationTimer): Added since tag.
(stopAnimationTimer): Likewise.
(installUI): Use new Timer constructor.
* javax/swing/plaf/basic/BasicScrollBarUI.java
(installUI): Likewise.
* javax/swing/plaf/basic/BasicSliderUI.java
(installUI): Likewise.
2004-06-10 Michael Koch <konqueror@gmx.de>
* javax/swing/ButtonGroup.java
(serialVersionUID): Made private.
(buttons): Renamed from v, added javadoc.
(sel): Added javadoc.
(ButtonGroup): Likewise.
(add): Likewise.
(remove): Likewise.
(getElements): Likewise.
(getSelection): Likewise.
(setSelected): Likewise.
(isSelected): Likewise.
(getButtonCount): Likewise.
2004-06-10 Michael Koch <konqueror@gmx.de>
* javax/swing/ButtonGroup.java,
javax/swing/ImageIcon.java,
javax/swing/JEditorPane.java,
javax/swing/JRootPane.java,
javax/swing/JTextField.java,
javax/swing/LookAndFeel.java,
javax/swing/plaf/basic/BasicTextUI.java:
Reindented.
2004-06-10 Michael Koch <konqueror@gmx.de>
* javax/swing/text/Style.java: Added javadocs.
2004-06-10 Michael Koch <konqueror@gmx.de>
* javax/swing/JComponent.java
(fireVetoableChange): Removed redundant cast.
* javax/swing/JLabel.java
(getDisabledIcon): Save icon for next call.
2004-06-10 Michael Koch <konqueror@gmx.de>
* javax/swing/KeyStroke.java
(getKeyStroke(char,boolean)): Marked deprecated.
2004-06-10 Michael Koch <konqueror@gmx.de>
* javax/swing/DefaultCellEditor.java,
javax/swing/GrayFilter.java,
javax/swing/event/DocumentEvent.java,
javax/swing/text/JTextComponent.java,
javax/swing/text/MutableAttributeSet.java:
Reindented.
2004-06-10 Michael Koch <konqueror@gmx.de>
* javax/swing/plaf/BorderUIResource.java:
Added serialVersionUID all over.
2004-06-10 Sascha Brawer <brawer@dandelis.ch>
* javax/swing/undo/UndoManager.java: Re-written from scratch.
2004-06-10 Michael Koch <konqueror@gmx.de>
* javax/swing/table/DefaultTableCellRenderer.java
(noFocusBorder): Initialize directly.
2004-06-10 Michael Koch <konqueror@gmx.de>
* javax/swing/plaf/basic/BasicArrowButton.java
(setDirection): Use method argument.
2004-06-10 Michael Koch <konqueror@gmx.de>
* javax/swing/plaf/BorderUIResource.java,
javax/swing/plaf/ComponentUI.java,
javax/swing/undo/CompoundEdit.java,
javax/swing/undo/StateEdit.java:
Fixed javadocs all over.
2004-06-10 Michael Koch <konqueror@gmx.de>
* javax/swing/DefaultButtonModel.java
(ARMED): Made public final, fixed value.
(ENABLED): Likewise.
(PRESSED): Likewise.
(ROLLOVER): Likewise.
(SELECTED): Likewise.
(stateMask): Initialize directly.
(listenerList): Likewise.
(mnemonic): Likewise.
(fireStateChanged): Removed argument, use changeEvent as event.
All places where this method is called are fixed too.
(getActionCommant): Fixed javadoc.
(setGroup): Fixed javadoc.
(getGroup): New method.
2004-06-09 Olga Rodimina <rodimina@redhat.com>
* javax/swing/AbstractButton.java
(AbstractButton): Use init() to initialize the button.
(init): New Method. Initializes AbstractButton.
* javax/swing/JMenuItem.java: Documented.
(JMenuItem): Reimplemented.
(init): Implemented.
(setEnabled): Changed to call super.setEnabled()
(processMouseEvent): Reimplemented.
(fireMenuKeyPressed): Implemented.
(fireMenuKeyReleased): Implemented.
(fireMenuKeyTyped): Implemented.
(menuSelectionChanged): disarm the model if the menu item was
deselected.
* javax/swing/plaf/basic/BasicMenuItemUI.java:Documented.
(getPath): Change to use ArrayList instead of Vector.
(getPreferredSize): Renamed variable.
(paintMenuItem): Paint margin area of menu item.
(MouseInputHandler.mouseEntered): Set selection in MenuSelectionManager.
(MouseInputHandler.mouseReleased): Check if mouse was pressed inside
menu item's bounds before clearing the selection.
2004-06-09 David Jee <djee@redhat.com>
* gnu/java/awt/peer/gtk/GtkTextComponentPeer.java
(GtkTextComponentPeer): Set caret position to 0.
* java/awt/TextComponent.java
(setText): Set caret position to 0.
* jni/gtk-peer/gnu_java_awt_peer_gtk_GtkComponentPeer.c
(Java_gnu_java_awt_peer_gtk_GtkComponentPeer_addExposeFilter):
Handle GtkScrolledWindow separately. Fix signal handler blocking.
(Java_gnu_java_awt_peer_gtk_GtkComponentPeer_removeExposeFilter):
Likewise.
* jni/gtk-peer/gnu_java_awt_peer_gtk_GtkTextAreaPeer.c
(Java_gnu_java_awt_peer_gtk_GtkTextAreaPeer_create): Make cursor
visible.
2004-06-09 Kim Ho <kho@redhat.com>
* Makefile.am: New files
* Makefile.in: Regenerated
* java/awt/Container.java
(getComponentAt): Removed.
* javax/swing/AbstractAction.java
(ENABLED_PROPERTY): New property.
(putValue): Fire PropertyChangeEvents.
(setEnabled): ditto.
(firePropertyChange): Javadoc and implement
convenience method.
* javax/swing/AbstractButton.java
(setAction): Don't create PropertyChangeListener
if new Action is null.
(setIcon): Don't set icon till after comparing
it.
(configurePropertiesFromAction): Check mnemonic
key before calling intValue().
(createActionPropertyChangeListener): Check
properties rather than bulk change.
* javax/swing/DefaultDesktopManager.java:
Implement.
* javax/swing/DesktopManager.java:
Jalopy and javadoc.
* javax/swing/JComponent.java
(fireVetoableChange): Implement.
(paintImmediately): Use root component.
* javax/swing/JDesktopPane.java: Implement
* javax/swing/JInternalFrame.java: Implement
* javax/swing/JLabel.java
(getDisabledIcon): Return grayscaled icon if
no disabled icon specified.
* javax/swing/JMenuBar.java
(getComponentAtIndex): Use getComponent
* javax/swing/JOptionPane.java
(getDesktopPaneForComponent): Use SwingUtilities'
getAncestorOfClass
(getFrameForComponent): ditto.
* javax/swing/JSplitPane.java
(remove): Use getComponent.
* javax/swing/SwingUtilities.java
(convertPoint): Implement.
* javax/swing/plaf/basic/BasicButtonUI.java
(paintButtonNormal): Check opaqueness before
filling background.
* javax/swing/plaf/basic/BasicDesktopIconUI.java:
Implement
* javax/swing/plaf/basic/BasicDesktopPaneUI.java:
Implement.
* javax/swing/plaf/basic/BasicInternalFrameTitlePane.java:
Implement.
* javax/swing/plaf/basic/BasicInternalFrameUI.java:
Implement.
* javax/swing/plaf/basic/BasicLookAndFeel.java:
Change InternalFrame and Desktop colors.
2004-06-09 David Jee <djee@redhat.com>
* java/awt/Container.java
(remove): Do not set component to invisible.
2004-06-09 Michael Koch <konqueror@gmx.de>
* javax/swing/tree/DefaultMutableTreeNode.java
(getLeafCount): Renamed enum to e.
2004-06-09 Michael Koch <konqueror@gmx.de>
* javax/swing/plaf/basic/BasicSplitPaneDivider.java
(positionForMouseEvent): Removed redundant semicolon.
(continueDrag): Use method arguments.
2004-06-09 Michael Koch <konqueror@gmx.de>
* javax/swing/border/TitledBorder.java,
javax/swing/filechooser/FileSystemView.java,
javax/swing/plaf/basic/BasicButtonListener.java,
javax/swing/plaf/basic/BasicGraphicsUtils.java,
javax/swing/plaf/basic/BasicLabelUI.java,
javax/swing/plaf/basic/BasicRadioButtonMenuItemUI.java,
javax/swing/plaf/basic/BasicScrollBarUI.java,
javax/swing/plaf/basic/BasicScrollPaneUI.java,
javax/swing/plaf/basic/BasicSliderUI.java,
javax/swing/plaf/basic/BasicTabbedPaneUI.java,
javax/swing/plaf/basic/BasicToggleButtonUI.java,
javax/swing/table/JTableHeader.java,
javax/swing/text/AbstractDocument.java,
javax/swing/text/DefaultCaret.java,
javax/swing/text/StyledEditorKit.java,
javax/swing/tree/DefaultTreeCellEditor.java:
Reworked import statements.
2004-06-08 Graydon Hoare <graydon@redhat.com>
* javax/swing/Box.java: Temporarily comment out code
broken due to visibility bug.
2004-06-09 Michael Koch <konqueror@gmx.de>
* javax/swing/ImageIcon.java
(ImageIcon): Added missing constructor.
2004-06-08 Michael Koch <konqueror@gmx.de>
* javax/swing/JToggleButton.java
(JToggleButton): New constructor.
(getAccessibleContext): Moved documentation into javadoc.
(getUIClassID): Likewise.
2004-06-08 Michael Koch <konqueror@gmx.de>
* javax/swing/AbstractButton.java
(getDisabledIcon): Create disabled icon if none exists yet.
2004-06-08 Michael Koch <konqueror@gmx.de>
* javax/swing/plaf/basic/BasicLookAndFeel.java
(initClassDefaults): Added FormattedTextFieldUI.
(loadResourceBundle): Renamed enum to e.
2004-06-08 Michael Koch <konqueror@gmx.de>
* javax/swing/plaf/basic/BasicButtonUI.java
(paintIcon): Simplified.
(paintText): Paint disabled button correctly.
2004-06-08 Michael Koch <konqueror@gmx.de>
* javax/swing/JComponent.java
(createToolTip): Use official JToolTip API.
2004-06-08 Michael Koch <konqueror@gmx.de>
* javax/swing/JToolTip.java
(JToolTip): No arguments in API.
(setTipText): New method.
2004-06-08 Michael Koch <konqueror@gmx.de>
* javax/swing/SwingUtilities.java
(isLeftMouseButton): New method.
(isMiddleMouseButton): New method.
(isRightMouseButton): New method.
2004-06-08 Michael Koch <konqueror@gmx.de>
* javax/swing/AbstractButton.java,
javax/swing/CellRendererPane.java,
javax/swing/JCheckBoxMenuItem.java,
javax/swing/JColorChooser.java,
javax/swing/JComboBox.java,
javax/swing/JComponent.java,
javax/swing/JDesktopPane.java,
javax/swing/JFileChooser.java,
javax/swing/JMenu.java,
javax/swing/JMenuItem.java,
javax/swing/JOptionPane.java,
javax/swing/JPasswordField.java,
javax/swing/JPopupMenu.java,
javax/swing/JProgressBar.java,
javax/swing/JRadioButtonMenuItem.java,
javax/swing/JScrollBar.java,
javax/swing/JSeparator.java,
javax/swing/JSlider.java,
javax/swing/JSplitPane.java,
javax/swing/JTabbedPane.java,
javax/swing/JTextField.java,
javax/swing/JToolBar.java,
javax/swing/text/JTextComponent.java:
Fixed all constructors of accessibility classes.
2004-06-08 Michael Koch <konqueror@gmx.de>
* javax/swing/ScrollPaneLayout.java: Renamed all memeber variables all
over.
2004-06-08 Michael Koch <konqueror@gmx.de>
* javax/swing/Box.java
(AccessibleBoxFiller): Extends AccessibleAWTComponent.
(AccessibleBoxFiller.serialVersionUID): New member variable.
* javax/swing/DefaultButtonModel.java
(stateMask): Made protected.
(listenerList): Likewise.
(changeEvent): Likewise.
(group): Likewise.
(mnemonic): Likewise.
(actionCommand): Likewise.
(getListeners): New method.
(getActionListeners): New method.
(getItemListeners): New method.
(getChangeListeners): New method.
(fireItemStateChanged): Simplified.
(fireActionPerformed): Simplified.
(fireStateChanged): Simplified.
* javax/swing/JFrame.java
(JFrame): Implements WindowContants.
(HIDE_ON_CLOSE): Removed.
(EXIT_ON_CLOSE): Removed.
(DISPOSE_ON_CLOSE): Removed.
(DO_NOTHING_ON_CLOSE): Removed.
(processWindowEvent): Exit with code 0.
(setDefaultCloseOperation): Do security check before setting value.
* javax/swing/JOptionPane.java
(message): Initialize only in constructor.
* javax/swing/JToolTip.java: Removed unused imports.
* javax/swing/JViewport.java
(serialVersionUID): New member variable.
(SIMPLE_SCROLL_MODE): Made final, fixed value.
(BLIT_SCROLL_MODE): Likewise.
(BACKINGSTORE_SCROLL_MODE): Likewise.
(scrollUnderway): Made protected.
(isViewSizeSet): Likewise.
* javax/swing/ListModel.java: Fixed javadoc.
* javax/swing/Popup.java: Likewise.
* javax/swing/RepaintManager.java
(paintDirtyRegions): Don't use internal classes of
java.util.AbstractMap.
* javax/swing/ScrollPaneConstants.java: Reindented.
* javax/swing/ScrollPaneLayout.java
(viewport): Made protected.
(verticalScrollBar): Made protected, renamed to vsb.
(horizontalScrollBar): Made protected, renamed to hsb.
(rowHeader): Made protected, renamed to rowHead.
(columnHeader): Made protected, renamed to colHead.
(lowerLeft): Made protected.
(lowerRight): Made protected.
(upperLeft): Made protected.
(upperRight): Made protected.
(verticalScrollBarPolicy): Made protected, renamed to vsbPolicy.
(horizontalScrollBarPolicy): Made protected, renamed to hsbPolicy.
2004-06-07 Bernd Schmidt <bernds@btinternet.com>
* java/awt/MediaTracker.java (imageUpdate): Only set status to
LOADING if flags has SOMEBITS set.
2004-06-07 Michael Koch <konqueror@gmx.de>
* javax/swing/AbstractButton.java: Reorganized imports.
* javax/swing/ActionMap.java: Likewise.
* javax/swing/DefaultButtonModel.java: Likewise.
* javax/swing/DefaultListModel.java: Likewise.
* javax/swing/ImageIcon.java: Likewise.
(serialVersionUID): New member variable.
* javax/swing/JComboBox.java: Reorganized imports.
* javax/swing/JComponent.java: Likewise.
(ui): Made protected.
(listenerList): Made protected.
(TOOL_TIP_TEXT_KEY): New constant.
(scrollRectToVisible): Removed redundant null check.
* javax/swing/JFrame.java: Reorganized imports.
* javax/swing/JInternalFrame.java: Reorganized imports.
* javax/swing/JProgressBar.java: Likewise.
* javax/swing/JRootPane.java: Likewise.
* javax/swing/JScrollBar.java: Likewise.
* javax/swing/JSeparator.java: Likewise.
* javax/swing/JSlider.java: Likewise.
* javax/swing/JTabbedPane.java: Likewise.
* javax/swing/JTextField.java: Likewise.
* javax/swing/JToolBar.java: Likewise.
* javax/swing/JTree.java: Likewise.
* javax/swing/JViewport.java: Likewise.
* javax/swing/JWindow.java: Likewise.
* javax/swing/KeyStroke.java: Likewise.
* javax/swing/LookAndFeel.java: Likewise.
* javax/swing/MenuSelectionManager.java: Likewise.
* javax/swing/SwingUtilities.java: Likewise.
* javax/swing/Timer.java: Likewise.
* javax/swing/DefaultBoundedRangeModel.java: Fixed javadoc.
* javax/swing/JList.java
(HORIZONTAL_WRAP): Made final, fixed value.
(VERTICAL): Likewise.
(VERTICAL_WRAP): Likewise.
2004-06-07 Michael Koch <konqueror@gmx.de>
* javax/swing/AbstractButton.java
(serialVersionUID): New member variable.
(AccessibleAbstractButton.serialVersionUID): Likewise.
(AbstractButton): Made public.
* javax/swing/Box.java
(AccessibleBox.serialVersionUID): New member variable.
(Filler.serialVersionUID): Likewise.
* javax/swing/DefaultListSelectionModel.java
(serialVersionUID): Likewise.
* javax/swing/JApplet.java
(serialVersionUID): Likewise.
* javax/swing/JCheckBox.java
(serialVersionUID): Likewise.
* javax/swing/JCheckBoxMenuItem.java
(serialVersionUID): Likewise.
(AccessibleJCheckBoxMenuItem.serialVersionUID): Likewise.
* javax/swing/JColorChooser.java
(serialVersionUID): Likewise.
(AccessibleJColorChooser.serialVersionUID): Likewise.
* javax/swing/JComponent.java
(serialVersionUID): Made private.
(AccessibleJComponent.serialVersionUID): New member variable.
* javax/swing/JDesktopPane.java
(serialVersionUID): Likewise.
* javax/swing/JDialog.java
(serialVersionUID): Likewise.
* javax/swing/JFormattedTextField.java
(serialVersionUID): Fixed value.
* javax/swing/JFrame.java
(serialVersionUID): New member variable.
(getDefaultCloseOpertation): Made public.
* javax/swing/JLayeredPane.java
(serialVersionUID): Likewise.
(LAYER_PROPERTY): Made final, fixed value.
(JLayeredPane): Made public.
* javax/swing/JMenu.java
(AccessibleJMenu.serialVersionUID): New member variable.
(WinListener.serialVersionUID): Likewise.
* javax/swing/JMenuBar.java
(serialVersionUID): Likewise.
(getComponentAtIndex): Added @deprecated tag.
* javax/swing/JMenuItem.java
(serialVersionUID): New member variable.
(AccessibleJMenuItem.serialVersionUID): Likewise.
* javax/swing/JOptionPane.java
(serialVersionUID): Likewise.
(AccessibleJOptionPane.serialVersionUID): Likewise.
* javax/swing/JPopupMenu.java
(serialVersionUID): Likewise.
(AccessibleJPopupMenu.serialVersionUID): Likewise.
(getPopupMenuListeners): New method.
(getComponentAtIndex): Added @deprecated tag.
* javax/swing/JProgressBar.java
(serialVersionUID): New member variable.
(AccessibleJProgressBar.serialVersionUID): Likewise.
* javax/swing/JRadioButton.java
(serialVersionUID): Likewise.
* javax/swing/JRadioButtonMenuItem.java
(serialVersionUID): Likewise.
(AccessibleJRadioButtonMenuItem.serialVersionUID): Likewise.
* javax/swing/JScrollBar.java
(serialVersionUID): Likewise.
(AccessibleJScrollBar.serialVersionUID): Likewise.
* javax/swing/JSeparator.java
(serialVersionUID): Likewise.
(AccessibleJSeparator.serialVersionUID): Likewise.
* javax/swing/JSlider.java: Fixed javadocs.
(AccessibleJSlider.serialVersionUID): New member variable.
* javax/swing/JSplitPane.java: Added copyright statement.
(serialVersionUID): New member variable.
(AccessibleJSplitPane.serialVersionUID): Likewise.
* javax/swing/JTabbedPane.java
(serialVersionUID): Likewise.
(AccessibleJTabbedPane.serialVersionUID): Likewise.
(ModelListener.serialVersionUID): Likewise.
(ModelListener.ModelListener): New constructor.
(SCROLL_TAB_LAYOUT): Made public final, fixed value.
(WRAP_TAB_LAYOUT): Likewise.
* javax/swing/JTable.java
(serialVersionUID): New member variable.
* javax/swing/JToggleButton.java
(serialVersionUID): Likewise.
(ToggleButtonModel): Made static.
(ToggleButtonModel.serialVersionUID): New member variable.
* javax/swing/JToolTip.java
(serialVersionUID): Likewise.
* javax/swing/JTree.java
(serialVersionUID): Likewise.
* javax/swing/JWindow.java
(serialVersionUID): Likewise.
* javax/swing/Timer.java
(serialVersionUID): Likewise.
2004-06-06 Michael Koch <konqueror@gmx.de>
* javax/swing/SwingConstants.java
(NEXT): New constant.
(PREVIOUS): Likewise.
* javax/swing/UIManager.java
(LookAndFeel): Made public.
(LookAndFeel.getClassName): Likewise.
(LookAndFeel.getName): Likewise.
2004-06-02 Olga Rodimina <rodimina@redhat.com>
* javax/swing/JCheckBoxMenuItem.java:
Removed CVS tags.
* javax/swing/JMenu.java: Likewise.
* javax/swing/JMenuBar.java: Likewise.
* javax/swing/JMenuItem.java: Likewise.
* javax/swing/JPopupMenu.java: Likewise.
* javax/swing/JRadioButtonMenuItem.java: Likewise.
* javax/swing/plaf/basic/BasicCheckBoxMenuItemUI.java:Likewise.
* javax/swing/plaf/basic/BasicMenuBarUI.java: Likewise.
* javax/swing/plaf/basic/BasicMenuItemUI.java: Likewise.
* javax/swing/plaf/basic/BasicMenuUI.java: Likewise.
* javax/swing/plaf/basic/BasicPopupMenuUI.java: Likewise.
* javax/swing/plaf/basic/BasicRadioButtonMenuItemUI.java: Likewise.
2004-05-31 Olga Rodimina <rodimina@redhat.com>
* javax/swing/plaf/basic/BasicMenuUI.java:
(MouseEntered): Do not call getPath() from MenuSelectionManager.
Call getPath() from super class instead.
2004-05-31 David Jee <djee@redhat.com>
* java/awt/Container.java
(remove): Set component visibility to false after removing it.
2004-05-27 Thomas Fitzsimmons <fitzsim@redhat.com>
* java/awt/Component.java (getForeground): Return SystemColor if
parent is null.
(getBackground): Likewise.
* jni/gtk-peer/gnu_java_awt_peer_gtk_GtkListPeer.c
(item_highlighted): New function.
(connectSignals): Set item_highlighted as list's select
function.
* java/applet/Applet.java: Revert changes from 2004-04-29,
2004-03-15 and 2004-03-14.
* jni/gtk-peer/gnu_java_awt_peer_gtk_GdkGraphics.c (drawString):
Divide baseline y coordinate by PANGO_SCALE, not DPI conversion
factor.
* gnu/java/awt/peer/gtk/GtkTextAreaPeer.java (create): Set
"Dialog" as the default font.
* gnu/java/awt/peer/gtk/GtkTextFieldPeer.java (create):
Likewise.
* java/awt/Component.java (getFont): Return "Dialog" font by
default.
* jni/gtk-peer/gnu_java_awt_peer_gtk_GdkClasspathFontPeer.c:
Multiply size argument to pango_font_description_set_size by the
DPI conversion factor rather than by PANGO_SCALE.
* jni/gtk-peer/gnu_java_awt_peer_gtk_GdkFontMetrics.c: Likewise.
* jni/gtk-peer/gnu_java_awt_peer_gtk_GdkGraphics.c: Likewise.
* jni/gtk-peer/gnu_java_awt_peer_gtk_GtkButtonPeer.c: Likewise.
* jni/gtk-peer/gnu_java_awt_peer_gtk_GtkCheckboxPeer.c: Likewise.
* jni/gtk-peer/gnu_java_awt_peer_gtk_GtkComponentPeer.c: Likewise.
* jni/gtk-peer/gnu_java_awt_peer_gtk_GtkLabelPeer.c: Likewise.
* jni/gtk-peer/gnu_java_awt_peer_gtk_GtkListPeer.c: Likewise.
* jni/gtk-peer/gnu_java_awt_peer_gtk_GtkTextAreaPeer.c: Likewise.
* jni/gtk-peer/gnu_java_awt_peer_gtk_GtkTextFieldPeer.c: Likewise.
* jni/gtk-peer/gnu_java_awt_peer_gtk_GdkGraphics.c (drawString):
Divide baseline y coordinate by DPI conversion factor rather
than by PANGO_SCALE.
* jni/gtk-peer/gnu_java_awt_peer_gtk_GdkPixbufDecoder.c
(area_prepared): Fix typo.
* jni/gtk-peer/gnu_java_awt_peer_gtk_GtkLabelPeer.c
(gtkSetFont): Move gtk_bin_get_child inside GDK critical region.
* jni/gtk-peer/gnu_java_awt_peer_gtk_GtkMainThread.c
(dpi_conversion_factor): New global variable.
(init_dpi_conversion_factor): New function to calculate and
track DPI conversion factor.
(dpi_changed_cb): New callback.
* jni/gtk-peer/gtkpeer.h (dpi_conversion_factor): Declare.
2004-05-27 David Jee <djee@redhat.com>
* gnu/java/awt/peer/gtk/GtkComponentPeer.java
(getGraphics): Return a new GdkGraphics instance.
* gnu/java/awt/peer/gtk/GtkContainerPeer.java
(getGraphics): Call super.getGraphics().
2004-05-26 Thomas Fitzsimmons <fitzsim@redhat.com>
* jni/gtk-peer/gnu_java_awt_peer_gtk_GtkComponentPeer.c
(setNativeBounds): Clamp width and height values to >= 0.
* jni/gtk-peer/gnu_java_awt_peer_gtk_GtkComponentPeer.c
(find_fg_color_widget): Handle GtkOptionMenu specially.
* jni/gtk-peer/gnu_java_awt_peer_gtk_GtkEvents.c
(pre_event_handler): Only post configure events to visible
top-level windows.
2004-05-26 David Jee <djee@redhat.com>
* java/awt/BorderLayout.java
(layoutContainer): Fix size calculations.
2004-05-26 Thomas Fitzsimmons <fitzsim@redhat.com>
* jni/gtk-peer/gnu_java_awt_peer_gtk_GtkWindowPeer.c
(window_wm_protocols_filter): Remove function.
(create): Remove filter that removes WM_TAKE_FOCUS client
messages.
From-SVN: r83324
2004-06-17 23:43:16 +00:00
|
|
|
int x3;
|
|
|
|
if (t.width <= i.right + e.width)
|
|
|
|
x3 = x2 + w.width + hgap;
|
|
|
|
else
|
|
|
|
x3 = t.width - i.right - e.width;
|
2002-11-10 23:11:21 +00:00
|
|
|
int ww = t.width - i.right - i.left;
|
|
|
|
|
|
|
|
int y1 = i.top;
|
|
|
|
int y2 = y1 + n.height + vgap;
|
[multiple changes]
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
2004-03-17 21:29:02 +00:00
|
|
|
int midh = Math.max(e.height, Math.max(w.height, c.height));
|
[multiple changes]
2004-06-17 Michael Koch <konqueror@gmx.de>
* javax/swing/JToolBar.java
(name): Removed.
(JToolBar): Use Component.setName(String) instead of doing it all
alone.
* javax/swing/Timer.java
(queueEvent): Added missing modifier.
2004-06-17 Olga Rodimina <rodimina@redhat.coom>
* Makefile.am: Added new file.
* Makefile.in: Re-generate.
* javax/swing/JMenu.java:
(insertSeparator): Implemented.
* javax/swing/JPopupMenu.java:
(JPopupMenu.Separator): Implemented.
* javax/swing/MenuSelectionManager.java:
(processMouseEvent): Use java.awt.Component
for event source instead of javax.swing.JComponent.
* javax/swing/plaf/basic/BasicPopupMenuSeparatorUI.java:
New File. Implemented.
2004-06-16 David Jee <djee@redhat.com>
* java/awt/GridBagLayout.java
(GetLayoutInfo): Adjust cell sizes iff parent size is not zero.
Make sure pos_x and pos_y are never negative.
2004-04-16 Andrew Overholt <overholt@redhat.com>
* Makefile.am: Add new file.
* Makefile.in: Re-generate.
* javax/swing/JToolBar.java
Partially implemented.
* javax/swing/plaf/basic/BasicToolBarUI.java
New file. Partially implemented.
2004-06-16 Graydon Hoare <graydon@redhat.com>
* gnu/java/awt/peer/gtk/GdkGraphics2D.java
(setComposite): Accept AlphaComposite arguments.
* gnu/java/awt/peer/gtk/GdkPixbufDecoder.java
(createBufferedImage): Add new overloads.
* gnu/java/awt/peer/gtk/GtkToolkit.java
(createImage): Use GdkPixbufDecoder.createBufferedImage
when useGraphics2D() is true.
(getImage): Delegate to createImage.
* javax/swing/JList.java
(isSelectionEmpty):
(getFirstVisibleIndex):
(getLastVisibleIndex):
(setSelectedValue):
(ensureIndexIsVisible): New methods.
* javax/swing/Timer.java: Reimplement.
2004-06-16 Michael Koch <konqueror@gmx.de>
* javax/swing/text/AbstractDocument.java
(AbstracElement): Made public, implements java.io.Serializable.
(AttributeContext): Made public.
(BranchElement): Likewise.
(Content): Likewise.
(DefaultDocumentEvent): Made public, extends
javax.swing.undo.CompoundEdit.
(ElementEdit): Made public, extends
javax.swing.undo.AbstractUndoableEdit.
(LeafElement): Made public.
(LeafElement.LeafElement): Made public.
2004-06-16 Michael Koch <konqueror@gmx.de>
* javax/swing/text/JTextComponent.java: Totally reworked. Removed many
methods (that were obviously never be intended to get included hi this
class. Added some methods too.
2004-06-16 Michael Koch <konqueror@gmx.de>
* javax/swing/text/PlainDocument.java
(serialVersionUID): New constant.
(lineLimitAttribute): Likewise.
(tabSizeAttribute): Likewise.
(tabSize): New field.
(PlainDocument): Made public.
(PlainDocument): New constructor.
2004-06-16 Michael Koch <konqueror@gmx.de>
* javax/swing/text/AbstractDocument.java
(insertString): Throws BadLocationException.
* javax/swing/text/Document.java
(insertString): Likewise.
* javax/swing/text/JTextComponent.java:
Javadocs and comments cleaned up.
2004-06-16 Michael Koch <konqueror@gmx.de>
* javax/swing/event/UndoableEditListener.java: Reformatted.
* javax/swing/text/AbstractDocument.java
(AbstractDocument): Implements java.io.Serializable.
(doc_list): Removed.
(undo_list): Removed.
(AbstractElement.serialVerionUID): New field.
(BranchElement.serialVerionUID): Likewise.
(DefaultDocumentEvent.serialVerionUID): Likewise.
(ElementEdit.serialVerionUID): Likewise.
(LeafElement.serialVerionUID): Likewise.
(serialVerionUID): Likewise.
(BAD_LOCATION): New constant.
(BidiElementName): Likewise.
(ContentElementName): Likewise.
(ParagraphElementName): Likewise.
(SectionElementName): Likewise.
(ElementNameAttribute): Likewise.
(AbstractDocument): Made protected.
(AbstractDocument): New construtor.
(listenerList): New field.
(fireChangedUpdate): Implemented.
(fireInsertUpdate): Likewise.
(fireRemoveUpdate): Likewise.
(fireUndoableEditUpdate): Likewise.
(getListeners): Likewise.
(addDocumentListener): Likewise.
(removeDocumentListener): Likewise.
(addUndoableEditListener): Likewise.
(removeUndoableEditListener): Likewise.
(getDocumentListeners): New method.
(getUndoableEditListeners): Likewise.
(getAsynchronousLoadPriority): Made public.
(getBidiRootElement): Likewise.
(setAsynchronousLoadPriority): Likewise.
(setDocumentProperties): Likewise.
* javax/swing/text/BadLocationException.java
(serialVerionUID): New field.
* javax/swing/text/DefaultCaret.java
(changeEvent): New field.
(listenerList): Likewise.
(changes): Removed.
(addChangeListener): Reimplemented.
(removeChangeListener): Likewise.
(getListeners): New method.
(getChangeListeners): Likwise.
(getComponent): Likewise.
* javax/swing/text/GapContent.java
(GapContent): Implements java.io.Serializable.
(serialVerionUID): New field.
2004-06-16 Michael Koch <konqueror@gmx.de>
* javax/swing/JTree.java
(treeModel): New field.
(JTree): New constructors, one existing one made public.
(createTreeModel): New method.
(addTreeExpansionListener): Likewise.
(removeTreeExpansionListener): Likewise.
(getTreeExpansionListeners): Likewise.
(fireTreeCollapsed): Likewise.
(fireTreeExpanded): Likewise.
(addTreeSelectionListener): Likewise.
(removeTreeSelectionListener): Likewise.
(getTreeSelectionListeners): Likewise.
(fireValueChanged): Likewise.
(addTreeWillExpandListener): Likewise.
(removeTreeWillExpandListener): Likewise.
(getTreeWillExpandListeners): Likewise.
(fireTreeWillCollapse): Likewise.
(fireTreeWillExpand): Likewise.
2004-06-16 Michael Koch <konqueror@gmx.de>
* javax/swing/JTree.java: Reformatted.
2004-06-16 Michael Koch <konqueror@gmx.de>
* javax/swing/JTextArea.java: New file.
* javax/swing/JTextField.java
(actions): Removed.
(notifyAction): New constant.
(columns): New field.
(JTextField): New constructors.
(createDefaultModel): New method.
(addActionListener): Reimplmemented.
(removeActionListener): Reimplemented.
(getActionListeners): New method.
(fireActionPerformed): New method.
(getColumns): New method.
(setColumne): New method.
* javax/swing/text/JTextComponent.java
(AccessibleJTextComponent.serialVersionUID): New field.
(serialVersionUID): Likewise.
(DEFAULT_KEYMAP): Likewise.
(FOCUS_ACCELERATOR_KEY): Likewise.
(doc): Made private.
(icon_gap): Likewise.
(icon): Likewise.
(align): Likewise.
(JTextComponent): Some constructors removed.
(getScrollableTracksViewportHeight): New method.
(getScrollableTracksViewportWidth): Likewise.
* Makefile.am: Added javax/swing/JTextArea.java.
* Makefile.in: Regenerated.
2004-06-15 Graydon Hoare <graydon@redhat.com>
* javax/swing/ImageIcon.java (ImageIcon): New constructor.
* javax/swing/JFrame.java (defaultLookAndFeelDecorated): New property.
* javax/swing/JViewport.java
(getExtentSize): Return size rather than preferred size.
(toViewCoordinates): New methods.
(getViewSize): Return size rather than preferred size.
(setViewSize): Note view size as set.
* javax/swing/ViewportLayout.java (layoutContainer): Reimplement.
* javax/swing/plaf/basic/BasicScrollBarUI.java
(getPreferredSize): Don't redo layout.
* javax/swing/plaf/basic/BasicViewportUI.java
(paint): Translate image properly and eat exceptions.
2004-06-15 Kim Ho <kho@redhat.com>
* javax/swing/JTabbedPane.java
(setComponent): Remove old component and
add new component.
(setSelectedIndex): Don't operate on the
components if they're null. Don't set index
on the model if the index is the same.
(insertTab): Don't add or hide the component
if it's null. Repaint the container.
* javax/swing/plaf/basic/BasicLookAndFeel.java
Change colors for TabbedPane.
* javax/swing/plaf/basic/BasicTabbedPaneUI.java
(mousePressed): Re-layout and paint the component.
(layoutContainer): Don't set location on the view.
(ScrollingViewport::paint): Remove.
2004-06-14 Thomas Fitzsimmons <fitzsim@redhat.com>
* jni/gtk-peer/gnu_java_awt_peer_gtk_GtkComponentPeer.c
(gtkWidgetDispatchKeyEvent): Change warning message to comment.
* jni/gtk-peer/gnu_java_awt_peer_gtk_GdkGraphics.c (drawString):
Wrap baseline y value in PANGO_PIXELS macro, rather than simply
dividing by PANGO_SCALE. Call gdk_flush before leaving GDK
critical region.
(drawLine): Call gdk_flush before leaving GDK critical region.
(fillRect): Likewise.
(drawRect): Likewise.
(copyArea): Likewise.
(copyPixmap): Likewise.
(clearRect): Likewise.
(drawArc): Likewise.
(drawPolyline): Likewise.
(drawPolygon): Likewise.
(fillPolygon): Likewise.
(fillArc): Likewise.
(drawOval): Likewise.
(fillOval): Likewise.
* gnu/java/awt/peer/gtk/GdkFontMetrics.java (initState): Add
style parameter.
(GdkFontMetrics): Add style argument to initState call.
(stringWidth(String,int,int,String)): Add style parameter.
(stringWidth(String)): Add style argument to stringWidth call.
* jni/gtk-peer/gnu_java_awt_peer_gtk_GdkFontMetrics.c
(initState): Set pango font style and weight based on AWT style
parameter. Pass default GTK language to
pango_context_get_metrics. Use PANGO_PIXELS macro rather than
simply dividing by PANGO_SCALE.
(stringWidth): Set pango font style and weight based on AWT style
parameter.
* java/awt/Button.java (next_button_number): New field.
(paramString): Change output.
(generateName): New method.
(getUniqueLong): New method.
2004-06-14 Kim Ho <kho@redhat.com>
* javax/swing/JTabbedPane.java:
(setComponentAt): Set the component, not
the enabled status.
* javax/swing/plaf/basic/BasicDesktopIconUI.java
(actionPerformed): Let deiconize catch exception.
2004-06-14 Olga Rodimina <rodimina@redhat.com>
* javax/swing/JPopupMenu.java:
(setVisible): Corrected location of a
heavyweight popup menu.
2004-06-14 Olga Rodimina <rodimina@redhat.com>
* javax/swing/MenuSelectionManager.java:
Ran through jalopy to fix formatting style.
2004-06-14 Olga Rodimina <rodimina@redhat.com>
* javax/swing/JLayeredPane.java:
(remove): Revalidate and repaint layered pane after
the component was removed.
javax/swing/JMenu.java:
(setVisible): Display popup menu at the user location,
if one was set by the user.
(setMenuLocation): Reimplemented. Fixed javadoc.
* javax/swing/JMenuBar.java: Added javadoc.
(BORDER_PAINTED_CHANGED_PROPERTY): New Property.
(MODEL_CHANGED_PROPERTY): New Property.
(isSelected): Implemented.
(setBorderPainted): Fire PropertyChangeEvent
if paintBorder property changes.
(setSelected): Implemented.
(setSelectionModel): Implemented.
* javax/swing/JPopupMenu.java: Added Javadoc
(pack): Implemented.
(setVisible): Reimplemented.
(show): Fixed location.
(JPopupMenu.LigthWeightPopup): Reimplemented to use
Container instead of JPanel.
* javax/swing/MenuSelectionManager.java: Added Javadocs.
(clearSelectedPath): Reimplemented to clear selectedPath
in reverse order.
(processMouseEvent): Reimplemented.
(setSelectedPath): Fire stateChange event indicating that
selected menu path has changed.
(getPath): Change to use ArrayList instead of Vector.
* javax/swing/plaf/basic/BasicMenuBarUI.java:
(installUI): call installKeyboardActions().
(uninstallUI): call uninstallKeyboardActions().
2004-06-13 Michael Koch <konqueror@gmx.de>
* javax/swing/text/DefaultCaret.java,
javax/swing/text/BadLocationException.java:
Reformatted.
2004-06-12 Thomas Fitzsimmons <fitzsim@redhat.com>
* gnu/java/awt/peer/gtk/GtkTextAreaPeer.java (DEFAULT_ROWS,
DEFAULT_COLS): New variables.
(create): Don't allow 0 rows or 0 columns. Instead, set the
values to DEFAULT_ROWS or DEFAULT_COLS.
(getMinimumSize): Likewise.
(getPreferredSize): Likewise.
(minimumSize): Likewise.
(preferredSize): Likewise.
(create): Set peer's editable state.
* java/awt/TextArea.java (TextArea()): Set rows and columns to
zero. Update javadocs.
(TextArea(String)): Likewise.
(TextArea(int,int)): Fix javadocs.
(TextArea(String,int,int,int)): Only throw exception if one of
rows or columns is zero. Fix javadocs.
2004-06-11 Thomas Fitzsimmons <fitzsim@redhat.com>
* java/awt/AWTEvent.java (toString): Handle MenuComponents in
addition to Components.
* java/awt/MenuItem.java (dispatchEventImpl): If the event
wasn't consumed by normal processing, send it to the parent
menu.
* gnu/java/awt/peer/gtk/GtkImagePainter.java
(setPixels(int,int,int,int,ColorModel,int[],int,int)): Remove
translation.
2004-06-11 David Jee <djee@redhat.com>
* java/awt/MediaTracker.java
(addImage(Image,int)): Call imageUpdate() to udpate image status.
(addImage(Image,int,int,int)): Likewise.
2004-06-11 Michael Koch <konqueror@gmx.de>
* javax/swing/text/AbstractDocument.java,
javax/swing/text/Document.java,
javax/swing/text/GapContent.java,
javax/swing/text/JTextComponent.java,
javax/swing/text/PlainDocument.java:
Reformatted.
2004-06-11 Michael Koch <konqueror@gmx.de>
* javax/swing/JRootPane.java
(AccessibleJRootPane.serialVersionUID): New field.
(AccessibleJRootPane.AccessibleJRootPane): New constructor.
(AccessibleJRootPane.getAccessibleRole): New method.
(RootLayout): Implements Serializable.
(RootLayout.serialVersionUID): New field.
(RootLayout.RootLayout): New constructor.
(setJMenuBar): Made public.
(getJMenuBar): Likewise.
(JRootPane): Likewise.
(createContentPane): Likewise.
(createGlassPane): Likewise.
(createLayeredPane): Likewise.
2004-06-11 Michael Koch <konqueror@gmx.de>
* javax/swing/SwingUtilities.java
(isLeftMouseButton): Fixed javadoc.
(isMiddleMouseButton): Likewise.
(isRightMouseButton): Likewise.
2004-06-11 Michael Koch <konqueror@gmx.de>
* javax/swing/JScrollPane.java
(serialVersionUID): New field.
(columnHeader): Made protected.
(rowHeader): Likewise.
(lowerLeft): Likewise.
(lowerRight): Likewise.
(upperLeft): Likewise.
(upperRight): Likewise.
(horizontalScrollBar): Likewise.
(horizontalScrollBarPolicy): Likewise.
(verticalScrollBar): Likewise.
(verticalScrollBarPolicy): Likewise.
(viewport): Likewise.
2004-06-11 Michael Koch <konqueror@gmx.de>
* javax/swing/LookAndFeel.java: Fixed javadocs.
2004-06-11 Michael Koch <konqueror@gmx.de>
* javax/swing/JEditorPane.java: Fixed javadocs.
(JEditorPane): Removed redundant call to to this().
(fireHyperlinkUpdate): Implemented.
2004-06-10 Olga Rodimina <rodimina@redhat.com>
* javax/swing/JMenu.java: Fixed file name
in the file comment.
2004-06-10 Olga Rodimina <rodimina@redhat.com>
* javax/swing/JMenu.java: Added javadoc.
(JMenu): Added MenuChangeListener to listen to
ChangeEvents occuring in menu's model.
(insert): Throw IllegalArgumentException if
index is less than 0
(setSelected): Reimplement.
(setPopupMenuVisible): Call menu's model isEnabled()
(setDelay): Throw IllegalArgumentException if
given amount of delay is less than 0.
(createActionComponent): Implemented.
(createActionChangeListener): Implemented.
(addSeparator): Implemented.
(getItem): Throw IllegalArgumentException if index is
less than 0.
(getItemCount): Implemented.
(fireMenuSelected): Changed to use menuEvent.
(fireMenuDeselected): Likewise.
(fireMenuCanceled): Likewise.
(setAccelerator): Changed to throw an error if this
method is used.
(doClick): Implemented.
(JMenu.ActionChangedListener): New inner class to handle
PropertyChangeEvents occuring in the actions associated with menu.
* javax/swing/plaf/basic/BasicMenuUI.java: Added javadoc.
(BasicMenuUI): Added PropertyChangeListener to the menu.
(createChangeListener): Implemented.
(createMenuDragMouseListener): Likewise.
(createMenuKeyListener): Likewise.
(createPropertyChangeListener): Likewise.
(uninstallListeners): Likewise.
(BasicMenuUI.MouseInputHandler): Reimplemented.
(BasicMenuUI.PropertyChangeHandler): New class. Not implemented yet.
(BasicMenuUI.ChangeHandler): Likewise.
(BasicMenuUI.MenuDragMouseHandler): Likewise.
(BasicMenuUI.MenuKeyHandler): Likewise.
2004-06-10 David Jee <djee@redhat.com>
* java/awt/MediaTracker.java
(imageUpdate): Only do notifyAll() if the image is complete.
2004-06-10 Olga Rodimina <rodimina@redhat.com>
* javax/swing/JApplet.java:
(getJMenuBar): Made public.
(setJMenuBar): Likewise.
* javax/swing/JFrame.java:
(getJMenuBar): Made public.
(setJMenuBar): Likewise.
* javax/swing/JWindow.java:
(getJMenuBar): Removed.
(setJMenuBar): Removed.
2004-06-10 Michael Koch <konqueror@gmx.de>
* javax/swing/JEditorPane.java
(createEditorKitForContentType): Fixed visibility.
(fireHyperlinkUpdate): Likewise.
(getContentType): Likewise.
(getEditorKit): Likewise.
(getEditorKitForContentType): Likewise.
(getPage): Likewise.
(read): Likewise.
(registerEditorKitForContentTyoe): Likewise.
(replaceSelection): Likewise.
(setContentType): Likewise.
(setEditorKit): Likewise.
(setPage): Likewise.
2004-06-10 Michael Koch <konqueror@gmx.de>
* javax/swing/Timer.java
(Timer): New constructor.
* javax/swing/plaf/basic/BasicProgressBarUI.java
(animationTimer): Don't initialize at construction.
(startAnimationTimer): Added since tag.
(stopAnimationTimer): Likewise.
(installUI): Use new Timer constructor.
* javax/swing/plaf/basic/BasicScrollBarUI.java
(installUI): Likewise.
* javax/swing/plaf/basic/BasicSliderUI.java
(installUI): Likewise.
2004-06-10 Michael Koch <konqueror@gmx.de>
* javax/swing/ButtonGroup.java
(serialVersionUID): Made private.
(buttons): Renamed from v, added javadoc.
(sel): Added javadoc.
(ButtonGroup): Likewise.
(add): Likewise.
(remove): Likewise.
(getElements): Likewise.
(getSelection): Likewise.
(setSelected): Likewise.
(isSelected): Likewise.
(getButtonCount): Likewise.
2004-06-10 Michael Koch <konqueror@gmx.de>
* javax/swing/ButtonGroup.java,
javax/swing/ImageIcon.java,
javax/swing/JEditorPane.java,
javax/swing/JRootPane.java,
javax/swing/JTextField.java,
javax/swing/LookAndFeel.java,
javax/swing/plaf/basic/BasicTextUI.java:
Reindented.
2004-06-10 Michael Koch <konqueror@gmx.de>
* javax/swing/text/Style.java: Added javadocs.
2004-06-10 Michael Koch <konqueror@gmx.de>
* javax/swing/JComponent.java
(fireVetoableChange): Removed redundant cast.
* javax/swing/JLabel.java
(getDisabledIcon): Save icon for next call.
2004-06-10 Michael Koch <konqueror@gmx.de>
* javax/swing/KeyStroke.java
(getKeyStroke(char,boolean)): Marked deprecated.
2004-06-10 Michael Koch <konqueror@gmx.de>
* javax/swing/DefaultCellEditor.java,
javax/swing/GrayFilter.java,
javax/swing/event/DocumentEvent.java,
javax/swing/text/JTextComponent.java,
javax/swing/text/MutableAttributeSet.java:
Reindented.
2004-06-10 Michael Koch <konqueror@gmx.de>
* javax/swing/plaf/BorderUIResource.java:
Added serialVersionUID all over.
2004-06-10 Sascha Brawer <brawer@dandelis.ch>
* javax/swing/undo/UndoManager.java: Re-written from scratch.
2004-06-10 Michael Koch <konqueror@gmx.de>
* javax/swing/table/DefaultTableCellRenderer.java
(noFocusBorder): Initialize directly.
2004-06-10 Michael Koch <konqueror@gmx.de>
* javax/swing/plaf/basic/BasicArrowButton.java
(setDirection): Use method argument.
2004-06-10 Michael Koch <konqueror@gmx.de>
* javax/swing/plaf/BorderUIResource.java,
javax/swing/plaf/ComponentUI.java,
javax/swing/undo/CompoundEdit.java,
javax/swing/undo/StateEdit.java:
Fixed javadocs all over.
2004-06-10 Michael Koch <konqueror@gmx.de>
* javax/swing/DefaultButtonModel.java
(ARMED): Made public final, fixed value.
(ENABLED): Likewise.
(PRESSED): Likewise.
(ROLLOVER): Likewise.
(SELECTED): Likewise.
(stateMask): Initialize directly.
(listenerList): Likewise.
(mnemonic): Likewise.
(fireStateChanged): Removed argument, use changeEvent as event.
All places where this method is called are fixed too.
(getActionCommant): Fixed javadoc.
(setGroup): Fixed javadoc.
(getGroup): New method.
2004-06-09 Olga Rodimina <rodimina@redhat.com>
* javax/swing/AbstractButton.java
(AbstractButton): Use init() to initialize the button.
(init): New Method. Initializes AbstractButton.
* javax/swing/JMenuItem.java: Documented.
(JMenuItem): Reimplemented.
(init): Implemented.
(setEnabled): Changed to call super.setEnabled()
(processMouseEvent): Reimplemented.
(fireMenuKeyPressed): Implemented.
(fireMenuKeyReleased): Implemented.
(fireMenuKeyTyped): Implemented.
(menuSelectionChanged): disarm the model if the menu item was
deselected.
* javax/swing/plaf/basic/BasicMenuItemUI.java:Documented.
(getPath): Change to use ArrayList instead of Vector.
(getPreferredSize): Renamed variable.
(paintMenuItem): Paint margin area of menu item.
(MouseInputHandler.mouseEntered): Set selection in MenuSelectionManager.
(MouseInputHandler.mouseReleased): Check if mouse was pressed inside
menu item's bounds before clearing the selection.
2004-06-09 David Jee <djee@redhat.com>
* gnu/java/awt/peer/gtk/GtkTextComponentPeer.java
(GtkTextComponentPeer): Set caret position to 0.
* java/awt/TextComponent.java
(setText): Set caret position to 0.
* jni/gtk-peer/gnu_java_awt_peer_gtk_GtkComponentPeer.c
(Java_gnu_java_awt_peer_gtk_GtkComponentPeer_addExposeFilter):
Handle GtkScrolledWindow separately. Fix signal handler blocking.
(Java_gnu_java_awt_peer_gtk_GtkComponentPeer_removeExposeFilter):
Likewise.
* jni/gtk-peer/gnu_java_awt_peer_gtk_GtkTextAreaPeer.c
(Java_gnu_java_awt_peer_gtk_GtkTextAreaPeer_create): Make cursor
visible.
2004-06-09 Kim Ho <kho@redhat.com>
* Makefile.am: New files
* Makefile.in: Regenerated
* java/awt/Container.java
(getComponentAt): Removed.
* javax/swing/AbstractAction.java
(ENABLED_PROPERTY): New property.
(putValue): Fire PropertyChangeEvents.
(setEnabled): ditto.
(firePropertyChange): Javadoc and implement
convenience method.
* javax/swing/AbstractButton.java
(setAction): Don't create PropertyChangeListener
if new Action is null.
(setIcon): Don't set icon till after comparing
it.
(configurePropertiesFromAction): Check mnemonic
key before calling intValue().
(createActionPropertyChangeListener): Check
properties rather than bulk change.
* javax/swing/DefaultDesktopManager.java:
Implement.
* javax/swing/DesktopManager.java:
Jalopy and javadoc.
* javax/swing/JComponent.java
(fireVetoableChange): Implement.
(paintImmediately): Use root component.
* javax/swing/JDesktopPane.java: Implement
* javax/swing/JInternalFrame.java: Implement
* javax/swing/JLabel.java
(getDisabledIcon): Return grayscaled icon if
no disabled icon specified.
* javax/swing/JMenuBar.java
(getComponentAtIndex): Use getComponent
* javax/swing/JOptionPane.java
(getDesktopPaneForComponent): Use SwingUtilities'
getAncestorOfClass
(getFrameForComponent): ditto.
* javax/swing/JSplitPane.java
(remove): Use getComponent.
* javax/swing/SwingUtilities.java
(convertPoint): Implement.
* javax/swing/plaf/basic/BasicButtonUI.java
(paintButtonNormal): Check opaqueness before
filling background.
* javax/swing/plaf/basic/BasicDesktopIconUI.java:
Implement
* javax/swing/plaf/basic/BasicDesktopPaneUI.java:
Implement.
* javax/swing/plaf/basic/BasicInternalFrameTitlePane.java:
Implement.
* javax/swing/plaf/basic/BasicInternalFrameUI.java:
Implement.
* javax/swing/plaf/basic/BasicLookAndFeel.java:
Change InternalFrame and Desktop colors.
2004-06-09 David Jee <djee@redhat.com>
* java/awt/Container.java
(remove): Do not set component to invisible.
2004-06-09 Michael Koch <konqueror@gmx.de>
* javax/swing/tree/DefaultMutableTreeNode.java
(getLeafCount): Renamed enum to e.
2004-06-09 Michael Koch <konqueror@gmx.de>
* javax/swing/plaf/basic/BasicSplitPaneDivider.java
(positionForMouseEvent): Removed redundant semicolon.
(continueDrag): Use method arguments.
2004-06-09 Michael Koch <konqueror@gmx.de>
* javax/swing/border/TitledBorder.java,
javax/swing/filechooser/FileSystemView.java,
javax/swing/plaf/basic/BasicButtonListener.java,
javax/swing/plaf/basic/BasicGraphicsUtils.java,
javax/swing/plaf/basic/BasicLabelUI.java,
javax/swing/plaf/basic/BasicRadioButtonMenuItemUI.java,
javax/swing/plaf/basic/BasicScrollBarUI.java,
javax/swing/plaf/basic/BasicScrollPaneUI.java,
javax/swing/plaf/basic/BasicSliderUI.java,
javax/swing/plaf/basic/BasicTabbedPaneUI.java,
javax/swing/plaf/basic/BasicToggleButtonUI.java,
javax/swing/table/JTableHeader.java,
javax/swing/text/AbstractDocument.java,
javax/swing/text/DefaultCaret.java,
javax/swing/text/StyledEditorKit.java,
javax/swing/tree/DefaultTreeCellEditor.java:
Reworked import statements.
2004-06-08 Graydon Hoare <graydon@redhat.com>
* javax/swing/Box.java: Temporarily comment out code
broken due to visibility bug.
2004-06-09 Michael Koch <konqueror@gmx.de>
* javax/swing/ImageIcon.java
(ImageIcon): Added missing constructor.
2004-06-08 Michael Koch <konqueror@gmx.de>
* javax/swing/JToggleButton.java
(JToggleButton): New constructor.
(getAccessibleContext): Moved documentation into javadoc.
(getUIClassID): Likewise.
2004-06-08 Michael Koch <konqueror@gmx.de>
* javax/swing/AbstractButton.java
(getDisabledIcon): Create disabled icon if none exists yet.
2004-06-08 Michael Koch <konqueror@gmx.de>
* javax/swing/plaf/basic/BasicLookAndFeel.java
(initClassDefaults): Added FormattedTextFieldUI.
(loadResourceBundle): Renamed enum to e.
2004-06-08 Michael Koch <konqueror@gmx.de>
* javax/swing/plaf/basic/BasicButtonUI.java
(paintIcon): Simplified.
(paintText): Paint disabled button correctly.
2004-06-08 Michael Koch <konqueror@gmx.de>
* javax/swing/JComponent.java
(createToolTip): Use official JToolTip API.
2004-06-08 Michael Koch <konqueror@gmx.de>
* javax/swing/JToolTip.java
(JToolTip): No arguments in API.
(setTipText): New method.
2004-06-08 Michael Koch <konqueror@gmx.de>
* javax/swing/SwingUtilities.java
(isLeftMouseButton): New method.
(isMiddleMouseButton): New method.
(isRightMouseButton): New method.
2004-06-08 Michael Koch <konqueror@gmx.de>
* javax/swing/AbstractButton.java,
javax/swing/CellRendererPane.java,
javax/swing/JCheckBoxMenuItem.java,
javax/swing/JColorChooser.java,
javax/swing/JComboBox.java,
javax/swing/JComponent.java,
javax/swing/JDesktopPane.java,
javax/swing/JFileChooser.java,
javax/swing/JMenu.java,
javax/swing/JMenuItem.java,
javax/swing/JOptionPane.java,
javax/swing/JPasswordField.java,
javax/swing/JPopupMenu.java,
javax/swing/JProgressBar.java,
javax/swing/JRadioButtonMenuItem.java,
javax/swing/JScrollBar.java,
javax/swing/JSeparator.java,
javax/swing/JSlider.java,
javax/swing/JSplitPane.java,
javax/swing/JTabbedPane.java,
javax/swing/JTextField.java,
javax/swing/JToolBar.java,
javax/swing/text/JTextComponent.java:
Fixed all constructors of accessibility classes.
2004-06-08 Michael Koch <konqueror@gmx.de>
* javax/swing/ScrollPaneLayout.java: Renamed all memeber variables all
over.
2004-06-08 Michael Koch <konqueror@gmx.de>
* javax/swing/Box.java
(AccessibleBoxFiller): Extends AccessibleAWTComponent.
(AccessibleBoxFiller.serialVersionUID): New member variable.
* javax/swing/DefaultButtonModel.java
(stateMask): Made protected.
(listenerList): Likewise.
(changeEvent): Likewise.
(group): Likewise.
(mnemonic): Likewise.
(actionCommand): Likewise.
(getListeners): New method.
(getActionListeners): New method.
(getItemListeners): New method.
(getChangeListeners): New method.
(fireItemStateChanged): Simplified.
(fireActionPerformed): Simplified.
(fireStateChanged): Simplified.
* javax/swing/JFrame.java
(JFrame): Implements WindowContants.
(HIDE_ON_CLOSE): Removed.
(EXIT_ON_CLOSE): Removed.
(DISPOSE_ON_CLOSE): Removed.
(DO_NOTHING_ON_CLOSE): Removed.
(processWindowEvent): Exit with code 0.
(setDefaultCloseOperation): Do security check before setting value.
* javax/swing/JOptionPane.java
(message): Initialize only in constructor.
* javax/swing/JToolTip.java: Removed unused imports.
* javax/swing/JViewport.java
(serialVersionUID): New member variable.
(SIMPLE_SCROLL_MODE): Made final, fixed value.
(BLIT_SCROLL_MODE): Likewise.
(BACKINGSTORE_SCROLL_MODE): Likewise.
(scrollUnderway): Made protected.
(isViewSizeSet): Likewise.
* javax/swing/ListModel.java: Fixed javadoc.
* javax/swing/Popup.java: Likewise.
* javax/swing/RepaintManager.java
(paintDirtyRegions): Don't use internal classes of
java.util.AbstractMap.
* javax/swing/ScrollPaneConstants.java: Reindented.
* javax/swing/ScrollPaneLayout.java
(viewport): Made protected.
(verticalScrollBar): Made protected, renamed to vsb.
(horizontalScrollBar): Made protected, renamed to hsb.
(rowHeader): Made protected, renamed to rowHead.
(columnHeader): Made protected, renamed to colHead.
(lowerLeft): Made protected.
(lowerRight): Made protected.
(upperLeft): Made protected.
(upperRight): Made protected.
(verticalScrollBarPolicy): Made protected, renamed to vsbPolicy.
(horizontalScrollBarPolicy): Made protected, renamed to hsbPolicy.
2004-06-07 Bernd Schmidt <bernds@btinternet.com>
* java/awt/MediaTracker.java (imageUpdate): Only set status to
LOADING if flags has SOMEBITS set.
2004-06-07 Michael Koch <konqueror@gmx.de>
* javax/swing/AbstractButton.java: Reorganized imports.
* javax/swing/ActionMap.java: Likewise.
* javax/swing/DefaultButtonModel.java: Likewise.
* javax/swing/DefaultListModel.java: Likewise.
* javax/swing/ImageIcon.java: Likewise.
(serialVersionUID): New member variable.
* javax/swing/JComboBox.java: Reorganized imports.
* javax/swing/JComponent.java: Likewise.
(ui): Made protected.
(listenerList): Made protected.
(TOOL_TIP_TEXT_KEY): New constant.
(scrollRectToVisible): Removed redundant null check.
* javax/swing/JFrame.java: Reorganized imports.
* javax/swing/JInternalFrame.java: Reorganized imports.
* javax/swing/JProgressBar.java: Likewise.
* javax/swing/JRootPane.java: Likewise.
* javax/swing/JScrollBar.java: Likewise.
* javax/swing/JSeparator.java: Likewise.
* javax/swing/JSlider.java: Likewise.
* javax/swing/JTabbedPane.java: Likewise.
* javax/swing/JTextField.java: Likewise.
* javax/swing/JToolBar.java: Likewise.
* javax/swing/JTree.java: Likewise.
* javax/swing/JViewport.java: Likewise.
* javax/swing/JWindow.java: Likewise.
* javax/swing/KeyStroke.java: Likewise.
* javax/swing/LookAndFeel.java: Likewise.
* javax/swing/MenuSelectionManager.java: Likewise.
* javax/swing/SwingUtilities.java: Likewise.
* javax/swing/Timer.java: Likewise.
* javax/swing/DefaultBoundedRangeModel.java: Fixed javadoc.
* javax/swing/JList.java
(HORIZONTAL_WRAP): Made final, fixed value.
(VERTICAL): Likewise.
(VERTICAL_WRAP): Likewise.
2004-06-07 Michael Koch <konqueror@gmx.de>
* javax/swing/AbstractButton.java
(serialVersionUID): New member variable.
(AccessibleAbstractButton.serialVersionUID): Likewise.
(AbstractButton): Made public.
* javax/swing/Box.java
(AccessibleBox.serialVersionUID): New member variable.
(Filler.serialVersionUID): Likewise.
* javax/swing/DefaultListSelectionModel.java
(serialVersionUID): Likewise.
* javax/swing/JApplet.java
(serialVersionUID): Likewise.
* javax/swing/JCheckBox.java
(serialVersionUID): Likewise.
* javax/swing/JCheckBoxMenuItem.java
(serialVersionUID): Likewise.
(AccessibleJCheckBoxMenuItem.serialVersionUID): Likewise.
* javax/swing/JColorChooser.java
(serialVersionUID): Likewise.
(AccessibleJColorChooser.serialVersionUID): Likewise.
* javax/swing/JComponent.java
(serialVersionUID): Made private.
(AccessibleJComponent.serialVersionUID): New member variable.
* javax/swing/JDesktopPane.java
(serialVersionUID): Likewise.
* javax/swing/JDialog.java
(serialVersionUID): Likewise.
* javax/swing/JFormattedTextField.java
(serialVersionUID): Fixed value.
* javax/swing/JFrame.java
(serialVersionUID): New member variable.
(getDefaultCloseOpertation): Made public.
* javax/swing/JLayeredPane.java
(serialVersionUID): Likewise.
(LAYER_PROPERTY): Made final, fixed value.
(JLayeredPane): Made public.
* javax/swing/JMenu.java
(AccessibleJMenu.serialVersionUID): New member variable.
(WinListener.serialVersionUID): Likewise.
* javax/swing/JMenuBar.java
(serialVersionUID): Likewise.
(getComponentAtIndex): Added @deprecated tag.
* javax/swing/JMenuItem.java
(serialVersionUID): New member variable.
(AccessibleJMenuItem.serialVersionUID): Likewise.
* javax/swing/JOptionPane.java
(serialVersionUID): Likewise.
(AccessibleJOptionPane.serialVersionUID): Likewise.
* javax/swing/JPopupMenu.java
(serialVersionUID): Likewise.
(AccessibleJPopupMenu.serialVersionUID): Likewise.
(getPopupMenuListeners): New method.
(getComponentAtIndex): Added @deprecated tag.
* javax/swing/JProgressBar.java
(serialVersionUID): New member variable.
(AccessibleJProgressBar.serialVersionUID): Likewise.
* javax/swing/JRadioButton.java
(serialVersionUID): Likewise.
* javax/swing/JRadioButtonMenuItem.java
(serialVersionUID): Likewise.
(AccessibleJRadioButtonMenuItem.serialVersionUID): Likewise.
* javax/swing/JScrollBar.java
(serialVersionUID): Likewise.
(AccessibleJScrollBar.serialVersionUID): Likewise.
* javax/swing/JSeparator.java
(serialVersionUID): Likewise.
(AccessibleJSeparator.serialVersionUID): Likewise.
* javax/swing/JSlider.java: Fixed javadocs.
(AccessibleJSlider.serialVersionUID): New member variable.
* javax/swing/JSplitPane.java: Added copyright statement.
(serialVersionUID): New member variable.
(AccessibleJSplitPane.serialVersionUID): Likewise.
* javax/swing/JTabbedPane.java
(serialVersionUID): Likewise.
(AccessibleJTabbedPane.serialVersionUID): Likewise.
(ModelListener.serialVersionUID): Likewise.
(ModelListener.ModelListener): New constructor.
(SCROLL_TAB_LAYOUT): Made public final, fixed value.
(WRAP_TAB_LAYOUT): Likewise.
* javax/swing/JTable.java
(serialVersionUID): New member variable.
* javax/swing/JToggleButton.java
(serialVersionUID): Likewise.
(ToggleButtonModel): Made static.
(ToggleButtonModel.serialVersionUID): New member variable.
* javax/swing/JToolTip.java
(serialVersionUID): Likewise.
* javax/swing/JTree.java
(serialVersionUID): Likewise.
* javax/swing/JWindow.java
(serialVersionUID): Likewise.
* javax/swing/Timer.java
(serialVersionUID): Likewise.
2004-06-06 Michael Koch <konqueror@gmx.de>
* javax/swing/SwingConstants.java
(NEXT): New constant.
(PREVIOUS): Likewise.
* javax/swing/UIManager.java
(LookAndFeel): Made public.
(LookAndFeel.getClassName): Likewise.
(LookAndFeel.getName): Likewise.
2004-06-02 Olga Rodimina <rodimina@redhat.com>
* javax/swing/JCheckBoxMenuItem.java:
Removed CVS tags.
* javax/swing/JMenu.java: Likewise.
* javax/swing/JMenuBar.java: Likewise.
* javax/swing/JMenuItem.java: Likewise.
* javax/swing/JPopupMenu.java: Likewise.
* javax/swing/JRadioButtonMenuItem.java: Likewise.
* javax/swing/plaf/basic/BasicCheckBoxMenuItemUI.java:Likewise.
* javax/swing/plaf/basic/BasicMenuBarUI.java: Likewise.
* javax/swing/plaf/basic/BasicMenuItemUI.java: Likewise.
* javax/swing/plaf/basic/BasicMenuUI.java: Likewise.
* javax/swing/plaf/basic/BasicPopupMenuUI.java: Likewise.
* javax/swing/plaf/basic/BasicRadioButtonMenuItemUI.java: Likewise.
2004-05-31 Olga Rodimina <rodimina@redhat.com>
* javax/swing/plaf/basic/BasicMenuUI.java:
(MouseEntered): Do not call getPath() from MenuSelectionManager.
Call getPath() from super class instead.
2004-05-31 David Jee <djee@redhat.com>
* java/awt/Container.java
(remove): Set component visibility to false after removing it.
2004-05-27 Thomas Fitzsimmons <fitzsim@redhat.com>
* java/awt/Component.java (getForeground): Return SystemColor if
parent is null.
(getBackground): Likewise.
* jni/gtk-peer/gnu_java_awt_peer_gtk_GtkListPeer.c
(item_highlighted): New function.
(connectSignals): Set item_highlighted as list's select
function.
* java/applet/Applet.java: Revert changes from 2004-04-29,
2004-03-15 and 2004-03-14.
* jni/gtk-peer/gnu_java_awt_peer_gtk_GdkGraphics.c (drawString):
Divide baseline y coordinate by PANGO_SCALE, not DPI conversion
factor.
* gnu/java/awt/peer/gtk/GtkTextAreaPeer.java (create): Set
"Dialog" as the default font.
* gnu/java/awt/peer/gtk/GtkTextFieldPeer.java (create):
Likewise.
* java/awt/Component.java (getFont): Return "Dialog" font by
default.
* jni/gtk-peer/gnu_java_awt_peer_gtk_GdkClasspathFontPeer.c:
Multiply size argument to pango_font_description_set_size by the
DPI conversion factor rather than by PANGO_SCALE.
* jni/gtk-peer/gnu_java_awt_peer_gtk_GdkFontMetrics.c: Likewise.
* jni/gtk-peer/gnu_java_awt_peer_gtk_GdkGraphics.c: Likewise.
* jni/gtk-peer/gnu_java_awt_peer_gtk_GtkButtonPeer.c: Likewise.
* jni/gtk-peer/gnu_java_awt_peer_gtk_GtkCheckboxPeer.c: Likewise.
* jni/gtk-peer/gnu_java_awt_peer_gtk_GtkComponentPeer.c: Likewise.
* jni/gtk-peer/gnu_java_awt_peer_gtk_GtkLabelPeer.c: Likewise.
* jni/gtk-peer/gnu_java_awt_peer_gtk_GtkListPeer.c: Likewise.
* jni/gtk-peer/gnu_java_awt_peer_gtk_GtkTextAreaPeer.c: Likewise.
* jni/gtk-peer/gnu_java_awt_peer_gtk_GtkTextFieldPeer.c: Likewise.
* jni/gtk-peer/gnu_java_awt_peer_gtk_GdkGraphics.c (drawString):
Divide baseline y coordinate by DPI conversion factor rather
than by PANGO_SCALE.
* jni/gtk-peer/gnu_java_awt_peer_gtk_GdkPixbufDecoder.c
(area_prepared): Fix typo.
* jni/gtk-peer/gnu_java_awt_peer_gtk_GtkLabelPeer.c
(gtkSetFont): Move gtk_bin_get_child inside GDK critical region.
* jni/gtk-peer/gnu_java_awt_peer_gtk_GtkMainThread.c
(dpi_conversion_factor): New global variable.
(init_dpi_conversion_factor): New function to calculate and
track DPI conversion factor.
(dpi_changed_cb): New callback.
* jni/gtk-peer/gtkpeer.h (dpi_conversion_factor): Declare.
2004-05-27 David Jee <djee@redhat.com>
* gnu/java/awt/peer/gtk/GtkComponentPeer.java
(getGraphics): Return a new GdkGraphics instance.
* gnu/java/awt/peer/gtk/GtkContainerPeer.java
(getGraphics): Call super.getGraphics().
2004-05-26 Thomas Fitzsimmons <fitzsim@redhat.com>
* jni/gtk-peer/gnu_java_awt_peer_gtk_GtkComponentPeer.c
(setNativeBounds): Clamp width and height values to >= 0.
* jni/gtk-peer/gnu_java_awt_peer_gtk_GtkComponentPeer.c
(find_fg_color_widget): Handle GtkOptionMenu specially.
* jni/gtk-peer/gnu_java_awt_peer_gtk_GtkEvents.c
(pre_event_handler): Only post configure events to visible
top-level windows.
2004-05-26 David Jee <djee@redhat.com>
* java/awt/BorderLayout.java
(layoutContainer): Fix size calculations.
2004-05-26 Thomas Fitzsimmons <fitzsim@redhat.com>
* jni/gtk-peer/gnu_java_awt_peer_gtk_GtkWindowPeer.c
(window_wm_protocols_filter): Remove function.
(create): Remove filter that removes WM_TAKE_FOCUS client
messages.
From-SVN: r83324
2004-06-17 23:43:16 +00:00
|
|
|
int y3;
|
|
|
|
if (t.height <= i.bottom + s.height)
|
|
|
|
y3 = y2 + midh + vgap;
|
|
|
|
else
|
|
|
|
y3 = t.height - i.bottom - s.height;
|
2002-11-10 23:11:21 +00:00
|
|
|
int hh = y3-y2-vgap;
|
|
|
|
|
|
|
|
setBounds(center, x2, y2, x3-x2-hgap, hh);
|
|
|
|
setBounds(my_north, x1, y1, ww, n.height);
|
|
|
|
setBounds(my_south, x1, y3, ww, s.height);
|
|
|
|
setBounds(my_west, x1, y2, w.width, hh);
|
|
|
|
setBounds(my_east, x3, y2, e.width, hh);
|
Start of AWT merge with Classpath:
* Makefile.in: Rebuilt.
* Makefile.am (awt_java_source_files): Reference files in
gnu/java/awt, not gnu/gcj/awt.
* java/awt/image/BufferedImage.java: Updated copyright.
* java/awt/image/ComponentColorModel.java: Updated copyright.
* java/awt/image/ComponentSampleModel.java: Updated copyright.
* java/awt/image/DataBuffer.java: Updated copyright.
* java/awt/image/DataBufferByte.java: Updated copyright.
* java/awt/image/DataBufferInt.java: Updated copyright.
* java/awt/image/DataBufferUShort.java: Updated copyright.
* java/awt/image/IndexColorModel.java: Updated copyright.
* java/awt/image/PackedColorModel.java: Updated copyright.
* java/awt/image/Raster.java: Updated copyright.
* java/awt/image/RasterOp.java: Updated copyright.
* java/awt/image/SampleModel.java: Updated copyright.
* java/awt/image/SinglePixelPackedSampleModel.java: Updated copyright.
* java/awt/image/WritableRaster.java: Updated copyright.
* java/awt/color/ColorSpace.java: Updated copyright.
* java/awt/color/ICC_ColorSpace.java: Updated copyright
* java/awt/color/ICC_Profile.java: Updated copyright.
* java/awt/event/HierarchyBoundsAdapter.java: Updated copyright.
* java/awt/event/HierarchyBoundsListener.java: Updated copyright.
* java/awt/event/HierarchyEvent.java: Updated copyright.
* java/awt/event/HierarchyListener.java: Updated copyright.
* java/awt/geom/AffineTransform.java: Updated copyright.
* java/awt/geom/Dimension2D.java: Updated copyright.
* java/awt/geom/Ellipse2D.java: Updated copyright.
* java/awt/geom/IllegalPathStateException.java: Updated copyright.
* java/awt/geom/Line2D.java: Updated copyright.
* java/awt/geom/NoninvertibleTransformException.java: Updated
copyright.
* java/awt/geom/PathIterator.java: Updated copyright.
* java/awt/geom/Point2D.java: Updated copyright.
* java/awt/geom/Rectangle2D.java: Updated copyright.
* java/awt/geom/RectangularShape.java: Updated copyright.
* java/awt/geom/RoundRectangle2D.java: Updated copyright.
* java/awt/Toolkit.java: Updated import for file moves.
* java/awt/Rectangle.java: Updated copyright; added javadoc from
Classpath.
(hashCode): New method from Classpath.
* java/awt/Graphics2D.java: Updated copyright.
* java/awt/Transparency.java: Updated copyright.
* java/awt/Paint.java: Updated copyright.
* java/awt/Graphics.java: New version from Classpath.
* java/awt/EventDispatchThread.java: Updated copyright.
* java/awt/CardLayout.java (layoutContainer): Don't skip invisible
children.
(gotoComponent): Wrap around on next/previous.
* gnu/gcj/awt/BitMaskExtent.java: Removed.
* gnu/gcj/awt/Buffers.java: Removed.
* gnu/gcj/awt/ComponentDataBlitOp.java: Removed.
* gnu/gcj/awt/GLightweightPeer.java: Removed.
* gnu/java/awt/BitMaskExtent.java: Added.
* gnu/java/awt/Buffers.java: Added.
* gnu/java/awt/ComponentDataBlitOp.java: Added.
* gnu/java/awt/GLightweightPeer.java: Added.
* java/awt/geom/Line2D.java (clone): Ignore
CloneNotSupportedException.
* gnu/gcj/awt/GLightweightPeer.java (getColorModel): New method.
* java/awt/Frame.java: Merged with Classpath.
* java/awt/RenderingHints.java: Copyright update.
* java/awt/Paint.java: Copyright update.
* java/awt/image/DirectColorModel.java: Merged with Classpath.
* java/awt/image/ColorModel.java: Merged with Classpath.
* java/awt/Window.java (show): New Implementation from Classpath.
(isShowing): Use super.isShowing().
* java/awt/EventQueue.java: Merged with Classpath.
* java/awt/AWTEventMulticaster.java (save): Throw
RuntimeException.
(saveInternal): Likewise.
* java/awt/AWTEvent.java: Now implements Serializable.
* java/awt/Event.java: Copyright update.
* java/awt/peer/ComponentPeer.java: Merged with Classpath.
* java/awt/image/BufferedImage.java: Copyright update.
* java/awt/GraphicsConfiguration.java: Copyright update.
* java/awt/Component.java: (addNotify): Don't call
addNotifyContainerChildren().
(addNotifyContainerChildren): Removed.
(setPeer): New method from Classpath.
(setTreeLock): Likewise.
(setVisible): Rewrote.
(show): Use it.
(hide): Likewise.
(validate): Set `valid'.
(checkImage(Image,ImageObserver)): Implementation from Classpath.
(createImage(ImageProducer)): Likewise.
(prepareImage): Likewise.
* java/awt/Container.java (addImpl): Handle case where constraint
is not a String. Post event via system event queue.
(remove): Post event via system event queue.
(validateTree): Only validate child if it is invalid.
(getAlignmentX): Call super method as default.
(getAlignmentY): Likewise.
(addContainerListener): Now synchronized.
(removeContainerListener): Likewise.
(addNotifyContainerChildren): Now private.
* java/awt/ComponentOrientation.java: Updated copyright. Added
@author.
* java/awt/FlowLayout.java (serialVersionUID): New field.
(setAlignment): Better exception message.
(layoutContainer): Don't compute component's preferred size unless
we're going to use it.
* java/awt/BorderLayout.java (AFTER_LAST_LINE, AFTER_LINE_ENDS,
BEFORE_FIRST_LINE, BEFORE_LINE_BEGINS): New constants.
(firstLine, lastLine, firstItem, lastItem): New fields.
(addLayoutComponent): Handle case where constraints is null.
Also, handle relative locations.
(removeLayoutComponent): Handle relative locations.
(MIN, MAX, PREF): New constants.
(calcCompSize): New method.
(calcSize): New method.
(minimumLayoutSize): Use it.
(preferredLayoutSize): Likewise.
(maximumLayoutSize): Likewise.
(toString): Include more information.
(setBounds): New method.
(layoutContainer): Use libgcj implementation; extended to handle
relative locations.
From-SVN: r48896
2002-01-16 04:21:35 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/*************************************************************************/
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Returns a string representation of this layout manager.
|
|
|
|
*
|
|
|
|
* @return A string representation of this object.
|
|
|
|
*/
|
|
|
|
public String
|
|
|
|
toString()
|
|
|
|
{
|
|
|
|
return getClass().getName() + "[hgap=" + hgap + ",vgap=" + vgap + "]";
|
|
|
|
}
|
|
|
|
|
|
|
|
private void
|
|
|
|
setBounds(Component comp, int x, int y, int w, int h)
|
|
|
|
{
|
|
|
|
if (comp == null)
|
|
|
|
return;
|
|
|
|
comp.setBounds(x, y, w, h);
|
|
|
|
}
|
|
|
|
|
|
|
|
// Some constants for use with calcSize().
|
|
|
|
private static final int MIN = 0;
|
|
|
|
private static final int MAX = 1;
|
|
|
|
private static final int PREF = 2;
|
|
|
|
|
|
|
|
private Dimension
|
|
|
|
calcCompSize(Component comp, int what)
|
|
|
|
{
|
2004-02-10 18:57:22 +00:00
|
|
|
if (comp == null || !comp.isVisible())
|
Start of AWT merge with Classpath:
* Makefile.in: Rebuilt.
* Makefile.am (awt_java_source_files): Reference files in
gnu/java/awt, not gnu/gcj/awt.
* java/awt/image/BufferedImage.java: Updated copyright.
* java/awt/image/ComponentColorModel.java: Updated copyright.
* java/awt/image/ComponentSampleModel.java: Updated copyright.
* java/awt/image/DataBuffer.java: Updated copyright.
* java/awt/image/DataBufferByte.java: Updated copyright.
* java/awt/image/DataBufferInt.java: Updated copyright.
* java/awt/image/DataBufferUShort.java: Updated copyright.
* java/awt/image/IndexColorModel.java: Updated copyright.
* java/awt/image/PackedColorModel.java: Updated copyright.
* java/awt/image/Raster.java: Updated copyright.
* java/awt/image/RasterOp.java: Updated copyright.
* java/awt/image/SampleModel.java: Updated copyright.
* java/awt/image/SinglePixelPackedSampleModel.java: Updated copyright.
* java/awt/image/WritableRaster.java: Updated copyright.
* java/awt/color/ColorSpace.java: Updated copyright.
* java/awt/color/ICC_ColorSpace.java: Updated copyright
* java/awt/color/ICC_Profile.java: Updated copyright.
* java/awt/event/HierarchyBoundsAdapter.java: Updated copyright.
* java/awt/event/HierarchyBoundsListener.java: Updated copyright.
* java/awt/event/HierarchyEvent.java: Updated copyright.
* java/awt/event/HierarchyListener.java: Updated copyright.
* java/awt/geom/AffineTransform.java: Updated copyright.
* java/awt/geom/Dimension2D.java: Updated copyright.
* java/awt/geom/Ellipse2D.java: Updated copyright.
* java/awt/geom/IllegalPathStateException.java: Updated copyright.
* java/awt/geom/Line2D.java: Updated copyright.
* java/awt/geom/NoninvertibleTransformException.java: Updated
copyright.
* java/awt/geom/PathIterator.java: Updated copyright.
* java/awt/geom/Point2D.java: Updated copyright.
* java/awt/geom/Rectangle2D.java: Updated copyright.
* java/awt/geom/RectangularShape.java: Updated copyright.
* java/awt/geom/RoundRectangle2D.java: Updated copyright.
* java/awt/Toolkit.java: Updated import for file moves.
* java/awt/Rectangle.java: Updated copyright; added javadoc from
Classpath.
(hashCode): New method from Classpath.
* java/awt/Graphics2D.java: Updated copyright.
* java/awt/Transparency.java: Updated copyright.
* java/awt/Paint.java: Updated copyright.
* java/awt/Graphics.java: New version from Classpath.
* java/awt/EventDispatchThread.java: Updated copyright.
* java/awt/CardLayout.java (layoutContainer): Don't skip invisible
children.
(gotoComponent): Wrap around on next/previous.
* gnu/gcj/awt/BitMaskExtent.java: Removed.
* gnu/gcj/awt/Buffers.java: Removed.
* gnu/gcj/awt/ComponentDataBlitOp.java: Removed.
* gnu/gcj/awt/GLightweightPeer.java: Removed.
* gnu/java/awt/BitMaskExtent.java: Added.
* gnu/java/awt/Buffers.java: Added.
* gnu/java/awt/ComponentDataBlitOp.java: Added.
* gnu/java/awt/GLightweightPeer.java: Added.
* java/awt/geom/Line2D.java (clone): Ignore
CloneNotSupportedException.
* gnu/gcj/awt/GLightweightPeer.java (getColorModel): New method.
* java/awt/Frame.java: Merged with Classpath.
* java/awt/RenderingHints.java: Copyright update.
* java/awt/Paint.java: Copyright update.
* java/awt/image/DirectColorModel.java: Merged with Classpath.
* java/awt/image/ColorModel.java: Merged with Classpath.
* java/awt/Window.java (show): New Implementation from Classpath.
(isShowing): Use super.isShowing().
* java/awt/EventQueue.java: Merged with Classpath.
* java/awt/AWTEventMulticaster.java (save): Throw
RuntimeException.
(saveInternal): Likewise.
* java/awt/AWTEvent.java: Now implements Serializable.
* java/awt/Event.java: Copyright update.
* java/awt/peer/ComponentPeer.java: Merged with Classpath.
* java/awt/image/BufferedImage.java: Copyright update.
* java/awt/GraphicsConfiguration.java: Copyright update.
* java/awt/Component.java: (addNotify): Don't call
addNotifyContainerChildren().
(addNotifyContainerChildren): Removed.
(setPeer): New method from Classpath.
(setTreeLock): Likewise.
(setVisible): Rewrote.
(show): Use it.
(hide): Likewise.
(validate): Set `valid'.
(checkImage(Image,ImageObserver)): Implementation from Classpath.
(createImage(ImageProducer)): Likewise.
(prepareImage): Likewise.
* java/awt/Container.java (addImpl): Handle case where constraint
is not a String. Post event via system event queue.
(remove): Post event via system event queue.
(validateTree): Only validate child if it is invalid.
(getAlignmentX): Call super method as default.
(getAlignmentY): Likewise.
(addContainerListener): Now synchronized.
(removeContainerListener): Likewise.
(addNotifyContainerChildren): Now private.
* java/awt/ComponentOrientation.java: Updated copyright. Added
@author.
* java/awt/FlowLayout.java (serialVersionUID): New field.
(setAlignment): Better exception message.
(layoutContainer): Don't compute component's preferred size unless
we're going to use it.
* java/awt/BorderLayout.java (AFTER_LAST_LINE, AFTER_LINE_ENDS,
BEFORE_FIRST_LINE, BEFORE_LINE_BEGINS): New constants.
(firstLine, lastLine, firstItem, lastItem): New fields.
(addLayoutComponent): Handle case where constraints is null.
Also, handle relative locations.
(removeLayoutComponent): Handle relative locations.
(MIN, MAX, PREF): New constants.
(calcCompSize): New method.
(calcSize): New method.
(minimumLayoutSize): Use it.
(preferredLayoutSize): Likewise.
(maximumLayoutSize): Likewise.
(toString): Include more information.
(setBounds): New method.
(layoutContainer): Use libgcj implementation; extended to handle
relative locations.
From-SVN: r48896
2002-01-16 04:21:35 +00:00
|
|
|
return new Dimension(0, 0);
|
|
|
|
if (what == MIN)
|
ComponentDataBlitOp.java: New file.
* gnu/gcj/awt/ComponentDataBlitOp.java: New file.
* gnu/gcj/awt/GLightweightPeer.java: New file.
* java/awt/BorderLayout.java: Implemented all methods.
* java/awt/Button.java (actionListener, actionCommand): Renamed
and modifier change.
(addNotify): Call super.
(dispatchEventImpl): New method.
(getListeners): New method.
(label): Made package-private, not private.
* java/awt/Canvas.java: Implemented class body.
* java/awt/Color.java (brighter): New method.
(darker): New method.
(hashCode): New method.
* java/awt/Component.java (visible, enabled, eventMask): Set defaults.
(getGraphicsConfiguration): Delegate to
getGraphicsConfigurationImpl().
(getGraphicsConfigurationImpl): New method.
(getToolkit): Only return value from peer if not null.
(isDisplayable): Check with parent.
(isShowing): No parent implies not showing.
(getForeground): Check parent property if local is null.
(getBackground): Likewise.
(getFont): Likewise.
(setForeground): Inform peer.
(setBackground): Likewise
(setLocale): Invalidate component.
(getColorModel): Implemented.
(setLocation): Invalidate, or ignore if no change.
(setSize): Invalidate, or ignore if no change.
(setBounds): Invalidate, or ignore if no change.
(isOpaque): By default, heavyweight implies opaque.
(isLightweight): Implemented.
(getMaximumSize): Implemented.
(doLayout): Implemented, NOP.
(validate): Implemented, NOP.
(invalidate): Only propagate to parent if parent was valid.
(getGraphics): Implemented.
(getFontMetrics): Implemented.
(update): Implemented.
(paintAll): Implemented.
(repaint): Implemented all repaint methods.
(print): Implemented.
(printAll): Implemented.
(createImage): Implemented.
(dispatchEvent): Give the peer a chance to handle the event.
(dispatchEventImpl): Dispatch paint events.
(enableEvents): Lightweights enable events on parent component.
(coalesceEvents): Coalesce paint events, and select event type
using a switch.
(coalescePaintEvents): New method.
(processEvent): Fix unfortunate ordering of statements, and call
correct method for MOUSE_CLICKED.
(processPaintEvent): New method.
(addNotify): Allow container to notify children before event
mask is set in peer.
(addNotifyContainerChildren): New method.
(removeNotify): Visibility should not change on removeNotify.
(paramString): Implemented.
(list): Implemented two of the list methods.
* Container (myInsets): Removed, insets are managed by peer.
(getInsets): Query peer.
(addImpl): Fix reparenting, enable events for lightweights,
initialize component array.
(validate): Call doLayout in validateTree() instead.
(validateTree): Do nothing if already valid. Call beginValidate(),
endValidate() on peer. Call validateTree() instead of validate()
for children that are containers. Mark valid after validation of
children.
(setFont): Partial implementation.
(paint): Implemented.
(visitChildren): New method.
(visitChild): New method.
(update): Implemented.
(print): Implemented.
(paintComponents): Implemented.
(printComponents): Consider translation and clipping.
(getComponentAt): Ignore invisible children. Return this if no
child match.
(addNotify): Call super.
(addNotifyContainerChildren): New method.
(paramString): Implemented.
(list): Implemented.
* java/awt/EventQueue (invokeAndWait): Get system event queue the
right way.
(invokeLater): Likewise.
(isDispatchThread): Likewise.
* java/awt/FontMetrics (getLeading): Formula change.
(getDescent): Consider leading also.
(getMaxAscent): Default to getAscent().
(getMaxDescent): Default to getDescent.
(getMaxAdvance): Return value signifying unknown.
(charWidth): Both methods implemented.
(charsWidth): Implemented.
(bytesWidth): Implemented.
(getWidths): Implemented.
* java/awt/Frame.java (NORMAL, ICONIFIED, iconImage, isResizable,
state): New fields.
(Frame): Rearragend constuctor chaining to disallow null being
passed as a graphics configuration.
(getTitle): Return empty string if null.
(dispose): Removed.
(getIconImage): New method.
(setIconImage): New method.
(finalize): New method.
(setMenuBar): Notify peer.
(isResizable): New method.
(setResizable): New method.
(getState): New method.
(getFont): Removed.
(remove): Implemented.
(removeNotify): New method.
(getFrames): New method.
* java/awt/Graphics.java: Implemented body of class.
* java/awt/Graphics2D.java: New file.
* java/awt/GraphicsConfiguration.java: Enabled part of the API.
* java/awt/Image.java: Implemented body of class.
* java/awt/Panel.java (Panel): Call correct super constructor.
(addNotify): Implemented.
* java/awt/Rectangle.java (isEmpty): Fixed reversed logic.
* java/awt/RenderingHints.java: New file.
* java/awt/Toolkit.java (createComponent): Implemented.
(getSystemEventQueue): Delegate to getSystemEventQueueImpl().
* java/awt/Window.java (Window): Two new constructors. Reordered
constructor chaining.
(getGraphicsConfigurationImpl): New method.
(finalize): Call super.
(addNotify): Call super.
(pack): Do layout stuff.
(show): Ensure that peer exists and that component is valid.
(dispose): Dispose owned children.
(getOwner): Simplify code, casting null pointers is valid.
(getGraphicsConfiguration): Ask peer if local value is null.
* java/awt/event/ActionEvent.java (getActionCommand): Renamed from
getcmd().
* java/awt/image/BufferedImage.java: New file.
* java/awt/image/RasterOp.java: New file.
* java/awt/peer/ComponentPeer.java (getGraphicsConfiguration):
More powerfull replacement for getColorModel().
(getColorModel) Removed.
(setEventMask) New method.
* Makefile.am: Added new files.
* Makefile.in: Rebuilt.
From-SVN: r35748
2000-08-16 20:03:48 +02:00
|
|
|
return comp.getMinimumSize();
|
Start of AWT merge with Classpath:
* Makefile.in: Rebuilt.
* Makefile.am (awt_java_source_files): Reference files in
gnu/java/awt, not gnu/gcj/awt.
* java/awt/image/BufferedImage.java: Updated copyright.
* java/awt/image/ComponentColorModel.java: Updated copyright.
* java/awt/image/ComponentSampleModel.java: Updated copyright.
* java/awt/image/DataBuffer.java: Updated copyright.
* java/awt/image/DataBufferByte.java: Updated copyright.
* java/awt/image/DataBufferInt.java: Updated copyright.
* java/awt/image/DataBufferUShort.java: Updated copyright.
* java/awt/image/IndexColorModel.java: Updated copyright.
* java/awt/image/PackedColorModel.java: Updated copyright.
* java/awt/image/Raster.java: Updated copyright.
* java/awt/image/RasterOp.java: Updated copyright.
* java/awt/image/SampleModel.java: Updated copyright.
* java/awt/image/SinglePixelPackedSampleModel.java: Updated copyright.
* java/awt/image/WritableRaster.java: Updated copyright.
* java/awt/color/ColorSpace.java: Updated copyright.
* java/awt/color/ICC_ColorSpace.java: Updated copyright
* java/awt/color/ICC_Profile.java: Updated copyright.
* java/awt/event/HierarchyBoundsAdapter.java: Updated copyright.
* java/awt/event/HierarchyBoundsListener.java: Updated copyright.
* java/awt/event/HierarchyEvent.java: Updated copyright.
* java/awt/event/HierarchyListener.java: Updated copyright.
* java/awt/geom/AffineTransform.java: Updated copyright.
* java/awt/geom/Dimension2D.java: Updated copyright.
* java/awt/geom/Ellipse2D.java: Updated copyright.
* java/awt/geom/IllegalPathStateException.java: Updated copyright.
* java/awt/geom/Line2D.java: Updated copyright.
* java/awt/geom/NoninvertibleTransformException.java: Updated
copyright.
* java/awt/geom/PathIterator.java: Updated copyright.
* java/awt/geom/Point2D.java: Updated copyright.
* java/awt/geom/Rectangle2D.java: Updated copyright.
* java/awt/geom/RectangularShape.java: Updated copyright.
* java/awt/geom/RoundRectangle2D.java: Updated copyright.
* java/awt/Toolkit.java: Updated import for file moves.
* java/awt/Rectangle.java: Updated copyright; added javadoc from
Classpath.
(hashCode): New method from Classpath.
* java/awt/Graphics2D.java: Updated copyright.
* java/awt/Transparency.java: Updated copyright.
* java/awt/Paint.java: Updated copyright.
* java/awt/Graphics.java: New version from Classpath.
* java/awt/EventDispatchThread.java: Updated copyright.
* java/awt/CardLayout.java (layoutContainer): Don't skip invisible
children.
(gotoComponent): Wrap around on next/previous.
* gnu/gcj/awt/BitMaskExtent.java: Removed.
* gnu/gcj/awt/Buffers.java: Removed.
* gnu/gcj/awt/ComponentDataBlitOp.java: Removed.
* gnu/gcj/awt/GLightweightPeer.java: Removed.
* gnu/java/awt/BitMaskExtent.java: Added.
* gnu/java/awt/Buffers.java: Added.
* gnu/java/awt/ComponentDataBlitOp.java: Added.
* gnu/java/awt/GLightweightPeer.java: Added.
* java/awt/geom/Line2D.java (clone): Ignore
CloneNotSupportedException.
* gnu/gcj/awt/GLightweightPeer.java (getColorModel): New method.
* java/awt/Frame.java: Merged with Classpath.
* java/awt/RenderingHints.java: Copyright update.
* java/awt/Paint.java: Copyright update.
* java/awt/image/DirectColorModel.java: Merged with Classpath.
* java/awt/image/ColorModel.java: Merged with Classpath.
* java/awt/Window.java (show): New Implementation from Classpath.
(isShowing): Use super.isShowing().
* java/awt/EventQueue.java: Merged with Classpath.
* java/awt/AWTEventMulticaster.java (save): Throw
RuntimeException.
(saveInternal): Likewise.
* java/awt/AWTEvent.java: Now implements Serializable.
* java/awt/Event.java: Copyright update.
* java/awt/peer/ComponentPeer.java: Merged with Classpath.
* java/awt/image/BufferedImage.java: Copyright update.
* java/awt/GraphicsConfiguration.java: Copyright update.
* java/awt/Component.java: (addNotify): Don't call
addNotifyContainerChildren().
(addNotifyContainerChildren): Removed.
(setPeer): New method from Classpath.
(setTreeLock): Likewise.
(setVisible): Rewrote.
(show): Use it.
(hide): Likewise.
(validate): Set `valid'.
(checkImage(Image,ImageObserver)): Implementation from Classpath.
(createImage(ImageProducer)): Likewise.
(prepareImage): Likewise.
* java/awt/Container.java (addImpl): Handle case where constraint
is not a String. Post event via system event queue.
(remove): Post event via system event queue.
(validateTree): Only validate child if it is invalid.
(getAlignmentX): Call super method as default.
(getAlignmentY): Likewise.
(addContainerListener): Now synchronized.
(removeContainerListener): Likewise.
(addNotifyContainerChildren): Now private.
* java/awt/ComponentOrientation.java: Updated copyright. Added
@author.
* java/awt/FlowLayout.java (serialVersionUID): New field.
(setAlignment): Better exception message.
(layoutContainer): Don't compute component's preferred size unless
we're going to use it.
* java/awt/BorderLayout.java (AFTER_LAST_LINE, AFTER_LINE_ENDS,
BEFORE_FIRST_LINE, BEFORE_LINE_BEGINS): New constants.
(firstLine, lastLine, firstItem, lastItem): New fields.
(addLayoutComponent): Handle case where constraints is null.
Also, handle relative locations.
(removeLayoutComponent): Handle relative locations.
(MIN, MAX, PREF): New constants.
(calcCompSize): New method.
(calcSize): New method.
(minimumLayoutSize): Use it.
(preferredLayoutSize): Likewise.
(maximumLayoutSize): Likewise.
(toString): Include more information.
(setBounds): New method.
(layoutContainer): Use libgcj implementation; extended to handle
relative locations.
From-SVN: r48896
2002-01-16 04:21:35 +00:00
|
|
|
else if (what == MAX)
|
|
|
|
return comp.getMaximumSize();
|
|
|
|
return comp.getPreferredSize();
|
|
|
|
}
|
|
|
|
|
|
|
|
// This is a helper function used to compute the various sizes for
|
|
|
|
// this layout.
|
|
|
|
private Dimension
|
|
|
|
calcSize(Container target, int what)
|
|
|
|
{
|
2002-11-10 23:11:21 +00:00
|
|
|
synchronized (target.getTreeLock ())
|
Start of AWT merge with Classpath:
* Makefile.in: Rebuilt.
* Makefile.am (awt_java_source_files): Reference files in
gnu/java/awt, not gnu/gcj/awt.
* java/awt/image/BufferedImage.java: Updated copyright.
* java/awt/image/ComponentColorModel.java: Updated copyright.
* java/awt/image/ComponentSampleModel.java: Updated copyright.
* java/awt/image/DataBuffer.java: Updated copyright.
* java/awt/image/DataBufferByte.java: Updated copyright.
* java/awt/image/DataBufferInt.java: Updated copyright.
* java/awt/image/DataBufferUShort.java: Updated copyright.
* java/awt/image/IndexColorModel.java: Updated copyright.
* java/awt/image/PackedColorModel.java: Updated copyright.
* java/awt/image/Raster.java: Updated copyright.
* java/awt/image/RasterOp.java: Updated copyright.
* java/awt/image/SampleModel.java: Updated copyright.
* java/awt/image/SinglePixelPackedSampleModel.java: Updated copyright.
* java/awt/image/WritableRaster.java: Updated copyright.
* java/awt/color/ColorSpace.java: Updated copyright.
* java/awt/color/ICC_ColorSpace.java: Updated copyright
* java/awt/color/ICC_Profile.java: Updated copyright.
* java/awt/event/HierarchyBoundsAdapter.java: Updated copyright.
* java/awt/event/HierarchyBoundsListener.java: Updated copyright.
* java/awt/event/HierarchyEvent.java: Updated copyright.
* java/awt/event/HierarchyListener.java: Updated copyright.
* java/awt/geom/AffineTransform.java: Updated copyright.
* java/awt/geom/Dimension2D.java: Updated copyright.
* java/awt/geom/Ellipse2D.java: Updated copyright.
* java/awt/geom/IllegalPathStateException.java: Updated copyright.
* java/awt/geom/Line2D.java: Updated copyright.
* java/awt/geom/NoninvertibleTransformException.java: Updated
copyright.
* java/awt/geom/PathIterator.java: Updated copyright.
* java/awt/geom/Point2D.java: Updated copyright.
* java/awt/geom/Rectangle2D.java: Updated copyright.
* java/awt/geom/RectangularShape.java: Updated copyright.
* java/awt/geom/RoundRectangle2D.java: Updated copyright.
* java/awt/Toolkit.java: Updated import for file moves.
* java/awt/Rectangle.java: Updated copyright; added javadoc from
Classpath.
(hashCode): New method from Classpath.
* java/awt/Graphics2D.java: Updated copyright.
* java/awt/Transparency.java: Updated copyright.
* java/awt/Paint.java: Updated copyright.
* java/awt/Graphics.java: New version from Classpath.
* java/awt/EventDispatchThread.java: Updated copyright.
* java/awt/CardLayout.java (layoutContainer): Don't skip invisible
children.
(gotoComponent): Wrap around on next/previous.
* gnu/gcj/awt/BitMaskExtent.java: Removed.
* gnu/gcj/awt/Buffers.java: Removed.
* gnu/gcj/awt/ComponentDataBlitOp.java: Removed.
* gnu/gcj/awt/GLightweightPeer.java: Removed.
* gnu/java/awt/BitMaskExtent.java: Added.
* gnu/java/awt/Buffers.java: Added.
* gnu/java/awt/ComponentDataBlitOp.java: Added.
* gnu/java/awt/GLightweightPeer.java: Added.
* java/awt/geom/Line2D.java (clone): Ignore
CloneNotSupportedException.
* gnu/gcj/awt/GLightweightPeer.java (getColorModel): New method.
* java/awt/Frame.java: Merged with Classpath.
* java/awt/RenderingHints.java: Copyright update.
* java/awt/Paint.java: Copyright update.
* java/awt/image/DirectColorModel.java: Merged with Classpath.
* java/awt/image/ColorModel.java: Merged with Classpath.
* java/awt/Window.java (show): New Implementation from Classpath.
(isShowing): Use super.isShowing().
* java/awt/EventQueue.java: Merged with Classpath.
* java/awt/AWTEventMulticaster.java (save): Throw
RuntimeException.
(saveInternal): Likewise.
* java/awt/AWTEvent.java: Now implements Serializable.
* java/awt/Event.java: Copyright update.
* java/awt/peer/ComponentPeer.java: Merged with Classpath.
* java/awt/image/BufferedImage.java: Copyright update.
* java/awt/GraphicsConfiguration.java: Copyright update.
* java/awt/Component.java: (addNotify): Don't call
addNotifyContainerChildren().
(addNotifyContainerChildren): Removed.
(setPeer): New method from Classpath.
(setTreeLock): Likewise.
(setVisible): Rewrote.
(show): Use it.
(hide): Likewise.
(validate): Set `valid'.
(checkImage(Image,ImageObserver)): Implementation from Classpath.
(createImage(ImageProducer)): Likewise.
(prepareImage): Likewise.
* java/awt/Container.java (addImpl): Handle case where constraint
is not a String. Post event via system event queue.
(remove): Post event via system event queue.
(validateTree): Only validate child if it is invalid.
(getAlignmentX): Call super method as default.
(getAlignmentY): Likewise.
(addContainerListener): Now synchronized.
(removeContainerListener): Likewise.
(addNotifyContainerChildren): Now private.
* java/awt/ComponentOrientation.java: Updated copyright. Added
@author.
* java/awt/FlowLayout.java (serialVersionUID): New field.
(setAlignment): Better exception message.
(layoutContainer): Don't compute component's preferred size unless
we're going to use it.
* java/awt/BorderLayout.java (AFTER_LAST_LINE, AFTER_LINE_ENDS,
BEFORE_FIRST_LINE, BEFORE_LINE_BEGINS): New constants.
(firstLine, lastLine, firstItem, lastItem): New fields.
(addLayoutComponent): Handle case where constraints is null.
Also, handle relative locations.
(removeLayoutComponent): Handle relative locations.
(MIN, MAX, PREF): New constants.
(calcCompSize): New method.
(calcSize): New method.
(minimumLayoutSize): Use it.
(preferredLayoutSize): Likewise.
(maximumLayoutSize): Likewise.
(toString): Include more information.
(setBounds): New method.
(layoutContainer): Use libgcj implementation; extended to handle
relative locations.
From-SVN: r48896
2002-01-16 04:21:35 +00:00
|
|
|
{
|
2002-11-10 23:11:21 +00:00
|
|
|
Insets ins = target.getInsets();
|
|
|
|
|
|
|
|
ComponentOrientation orient = target.getComponentOrientation ();
|
|
|
|
boolean left_to_right = orient.isLeftToRight ();
|
|
|
|
|
|
|
|
Component my_north = north;
|
|
|
|
Component my_east = east;
|
|
|
|
Component my_south = south;
|
|
|
|
Component my_west = west;
|
|
|
|
|
|
|
|
// Note that we currently don't handle vertical layouts. Neither
|
|
|
|
// does JDK 1.3.
|
|
|
|
if (firstLine != null)
|
|
|
|
my_north = firstLine;
|
|
|
|
if (lastLine != null)
|
|
|
|
my_south = lastLine;
|
|
|
|
if (firstItem != null)
|
|
|
|
{
|
|
|
|
if (left_to_right)
|
|
|
|
my_west = firstItem;
|
|
|
|
else
|
|
|
|
my_east = firstItem;
|
|
|
|
}
|
|
|
|
if (lastItem != null)
|
|
|
|
{
|
|
|
|
if (left_to_right)
|
|
|
|
my_east = lastItem;
|
|
|
|
else
|
|
|
|
my_west = lastItem;
|
|
|
|
}
|
Start of AWT merge with Classpath:
* Makefile.in: Rebuilt.
* Makefile.am (awt_java_source_files): Reference files in
gnu/java/awt, not gnu/gcj/awt.
* java/awt/image/BufferedImage.java: Updated copyright.
* java/awt/image/ComponentColorModel.java: Updated copyright.
* java/awt/image/ComponentSampleModel.java: Updated copyright.
* java/awt/image/DataBuffer.java: Updated copyright.
* java/awt/image/DataBufferByte.java: Updated copyright.
* java/awt/image/DataBufferInt.java: Updated copyright.
* java/awt/image/DataBufferUShort.java: Updated copyright.
* java/awt/image/IndexColorModel.java: Updated copyright.
* java/awt/image/PackedColorModel.java: Updated copyright.
* java/awt/image/Raster.java: Updated copyright.
* java/awt/image/RasterOp.java: Updated copyright.
* java/awt/image/SampleModel.java: Updated copyright.
* java/awt/image/SinglePixelPackedSampleModel.java: Updated copyright.
* java/awt/image/WritableRaster.java: Updated copyright.
* java/awt/color/ColorSpace.java: Updated copyright.
* java/awt/color/ICC_ColorSpace.java: Updated copyright
* java/awt/color/ICC_Profile.java: Updated copyright.
* java/awt/event/HierarchyBoundsAdapter.java: Updated copyright.
* java/awt/event/HierarchyBoundsListener.java: Updated copyright.
* java/awt/event/HierarchyEvent.java: Updated copyright.
* java/awt/event/HierarchyListener.java: Updated copyright.
* java/awt/geom/AffineTransform.java: Updated copyright.
* java/awt/geom/Dimension2D.java: Updated copyright.
* java/awt/geom/Ellipse2D.java: Updated copyright.
* java/awt/geom/IllegalPathStateException.java: Updated copyright.
* java/awt/geom/Line2D.java: Updated copyright.
* java/awt/geom/NoninvertibleTransformException.java: Updated
copyright.
* java/awt/geom/PathIterator.java: Updated copyright.
* java/awt/geom/Point2D.java: Updated copyright.
* java/awt/geom/Rectangle2D.java: Updated copyright.
* java/awt/geom/RectangularShape.java: Updated copyright.
* java/awt/geom/RoundRectangle2D.java: Updated copyright.
* java/awt/Toolkit.java: Updated import for file moves.
* java/awt/Rectangle.java: Updated copyright; added javadoc from
Classpath.
(hashCode): New method from Classpath.
* java/awt/Graphics2D.java: Updated copyright.
* java/awt/Transparency.java: Updated copyright.
* java/awt/Paint.java: Updated copyright.
* java/awt/Graphics.java: New version from Classpath.
* java/awt/EventDispatchThread.java: Updated copyright.
* java/awt/CardLayout.java (layoutContainer): Don't skip invisible
children.
(gotoComponent): Wrap around on next/previous.
* gnu/gcj/awt/BitMaskExtent.java: Removed.
* gnu/gcj/awt/Buffers.java: Removed.
* gnu/gcj/awt/ComponentDataBlitOp.java: Removed.
* gnu/gcj/awt/GLightweightPeer.java: Removed.
* gnu/java/awt/BitMaskExtent.java: Added.
* gnu/java/awt/Buffers.java: Added.
* gnu/java/awt/ComponentDataBlitOp.java: Added.
* gnu/java/awt/GLightweightPeer.java: Added.
* java/awt/geom/Line2D.java (clone): Ignore
CloneNotSupportedException.
* gnu/gcj/awt/GLightweightPeer.java (getColorModel): New method.
* java/awt/Frame.java: Merged with Classpath.
* java/awt/RenderingHints.java: Copyright update.
* java/awt/Paint.java: Copyright update.
* java/awt/image/DirectColorModel.java: Merged with Classpath.
* java/awt/image/ColorModel.java: Merged with Classpath.
* java/awt/Window.java (show): New Implementation from Classpath.
(isShowing): Use super.isShowing().
* java/awt/EventQueue.java: Merged with Classpath.
* java/awt/AWTEventMulticaster.java (save): Throw
RuntimeException.
(saveInternal): Likewise.
* java/awt/AWTEvent.java: Now implements Serializable.
* java/awt/Event.java: Copyright update.
* java/awt/peer/ComponentPeer.java: Merged with Classpath.
* java/awt/image/BufferedImage.java: Copyright update.
* java/awt/GraphicsConfiguration.java: Copyright update.
* java/awt/Component.java: (addNotify): Don't call
addNotifyContainerChildren().
(addNotifyContainerChildren): Removed.
(setPeer): New method from Classpath.
(setTreeLock): Likewise.
(setVisible): Rewrote.
(show): Use it.
(hide): Likewise.
(validate): Set `valid'.
(checkImage(Image,ImageObserver)): Implementation from Classpath.
(createImage(ImageProducer)): Likewise.
(prepareImage): Likewise.
* java/awt/Container.java (addImpl): Handle case where constraint
is not a String. Post event via system event queue.
(remove): Post event via system event queue.
(validateTree): Only validate child if it is invalid.
(getAlignmentX): Call super method as default.
(getAlignmentY): Likewise.
(addContainerListener): Now synchronized.
(removeContainerListener): Likewise.
(addNotifyContainerChildren): Now private.
* java/awt/ComponentOrientation.java: Updated copyright. Added
@author.
* java/awt/FlowLayout.java (serialVersionUID): New field.
(setAlignment): Better exception message.
(layoutContainer): Don't compute component's preferred size unless
we're going to use it.
* java/awt/BorderLayout.java (AFTER_LAST_LINE, AFTER_LINE_ENDS,
BEFORE_FIRST_LINE, BEFORE_LINE_BEGINS): New constants.
(firstLine, lastLine, firstItem, lastItem): New fields.
(addLayoutComponent): Handle case where constraints is null.
Also, handle relative locations.
(removeLayoutComponent): Handle relative locations.
(MIN, MAX, PREF): New constants.
(calcCompSize): New method.
(calcSize): New method.
(minimumLayoutSize): Use it.
(preferredLayoutSize): Likewise.
(maximumLayoutSize): Likewise.
(toString): Include more information.
(setBounds): New method.
(layoutContainer): Use libgcj implementation; extended to handle
relative locations.
From-SVN: r48896
2002-01-16 04:21:35 +00:00
|
|
|
|
2002-11-10 23:11:21 +00:00
|
|
|
Dimension ndim = calcCompSize(my_north, what);
|
|
|
|
Dimension sdim = calcCompSize(my_south, what);
|
|
|
|
Dimension edim = calcCompSize(my_east, what);
|
|
|
|
Dimension wdim = calcCompSize(my_west, what);
|
|
|
|
Dimension cdim = calcCompSize(center, what);
|
Start of AWT merge with Classpath:
* Makefile.in: Rebuilt.
* Makefile.am (awt_java_source_files): Reference files in
gnu/java/awt, not gnu/gcj/awt.
* java/awt/image/BufferedImage.java: Updated copyright.
* java/awt/image/ComponentColorModel.java: Updated copyright.
* java/awt/image/ComponentSampleModel.java: Updated copyright.
* java/awt/image/DataBuffer.java: Updated copyright.
* java/awt/image/DataBufferByte.java: Updated copyright.
* java/awt/image/DataBufferInt.java: Updated copyright.
* java/awt/image/DataBufferUShort.java: Updated copyright.
* java/awt/image/IndexColorModel.java: Updated copyright.
* java/awt/image/PackedColorModel.java: Updated copyright.
* java/awt/image/Raster.java: Updated copyright.
* java/awt/image/RasterOp.java: Updated copyright.
* java/awt/image/SampleModel.java: Updated copyright.
* java/awt/image/SinglePixelPackedSampleModel.java: Updated copyright.
* java/awt/image/WritableRaster.java: Updated copyright.
* java/awt/color/ColorSpace.java: Updated copyright.
* java/awt/color/ICC_ColorSpace.java: Updated copyright
* java/awt/color/ICC_Profile.java: Updated copyright.
* java/awt/event/HierarchyBoundsAdapter.java: Updated copyright.
* java/awt/event/HierarchyBoundsListener.java: Updated copyright.
* java/awt/event/HierarchyEvent.java: Updated copyright.
* java/awt/event/HierarchyListener.java: Updated copyright.
* java/awt/geom/AffineTransform.java: Updated copyright.
* java/awt/geom/Dimension2D.java: Updated copyright.
* java/awt/geom/Ellipse2D.java: Updated copyright.
* java/awt/geom/IllegalPathStateException.java: Updated copyright.
* java/awt/geom/Line2D.java: Updated copyright.
* java/awt/geom/NoninvertibleTransformException.java: Updated
copyright.
* java/awt/geom/PathIterator.java: Updated copyright.
* java/awt/geom/Point2D.java: Updated copyright.
* java/awt/geom/Rectangle2D.java: Updated copyright.
* java/awt/geom/RectangularShape.java: Updated copyright.
* java/awt/geom/RoundRectangle2D.java: Updated copyright.
* java/awt/Toolkit.java: Updated import for file moves.
* java/awt/Rectangle.java: Updated copyright; added javadoc from
Classpath.
(hashCode): New method from Classpath.
* java/awt/Graphics2D.java: Updated copyright.
* java/awt/Transparency.java: Updated copyright.
* java/awt/Paint.java: Updated copyright.
* java/awt/Graphics.java: New version from Classpath.
* java/awt/EventDispatchThread.java: Updated copyright.
* java/awt/CardLayout.java (layoutContainer): Don't skip invisible
children.
(gotoComponent): Wrap around on next/previous.
* gnu/gcj/awt/BitMaskExtent.java: Removed.
* gnu/gcj/awt/Buffers.java: Removed.
* gnu/gcj/awt/ComponentDataBlitOp.java: Removed.
* gnu/gcj/awt/GLightweightPeer.java: Removed.
* gnu/java/awt/BitMaskExtent.java: Added.
* gnu/java/awt/Buffers.java: Added.
* gnu/java/awt/ComponentDataBlitOp.java: Added.
* gnu/java/awt/GLightweightPeer.java: Added.
* java/awt/geom/Line2D.java (clone): Ignore
CloneNotSupportedException.
* gnu/gcj/awt/GLightweightPeer.java (getColorModel): New method.
* java/awt/Frame.java: Merged with Classpath.
* java/awt/RenderingHints.java: Copyright update.
* java/awt/Paint.java: Copyright update.
* java/awt/image/DirectColorModel.java: Merged with Classpath.
* java/awt/image/ColorModel.java: Merged with Classpath.
* java/awt/Window.java (show): New Implementation from Classpath.
(isShowing): Use super.isShowing().
* java/awt/EventQueue.java: Merged with Classpath.
* java/awt/AWTEventMulticaster.java (save): Throw
RuntimeException.
(saveInternal): Likewise.
* java/awt/AWTEvent.java: Now implements Serializable.
* java/awt/Event.java: Copyright update.
* java/awt/peer/ComponentPeer.java: Merged with Classpath.
* java/awt/image/BufferedImage.java: Copyright update.
* java/awt/GraphicsConfiguration.java: Copyright update.
* java/awt/Component.java: (addNotify): Don't call
addNotifyContainerChildren().
(addNotifyContainerChildren): Removed.
(setPeer): New method from Classpath.
(setTreeLock): Likewise.
(setVisible): Rewrote.
(show): Use it.
(hide): Likewise.
(validate): Set `valid'.
(checkImage(Image,ImageObserver)): Implementation from Classpath.
(createImage(ImageProducer)): Likewise.
(prepareImage): Likewise.
* java/awt/Container.java (addImpl): Handle case where constraint
is not a String. Post event via system event queue.
(remove): Post event via system event queue.
(validateTree): Only validate child if it is invalid.
(getAlignmentX): Call super method as default.
(getAlignmentY): Likewise.
(addContainerListener): Now synchronized.
(removeContainerListener): Likewise.
(addNotifyContainerChildren): Now private.
* java/awt/ComponentOrientation.java: Updated copyright. Added
@author.
* java/awt/FlowLayout.java (serialVersionUID): New field.
(setAlignment): Better exception message.
(layoutContainer): Don't compute component's preferred size unless
we're going to use it.
* java/awt/BorderLayout.java (AFTER_LAST_LINE, AFTER_LINE_ENDS,
BEFORE_FIRST_LINE, BEFORE_LINE_BEGINS): New constants.
(firstLine, lastLine, firstItem, lastItem): New fields.
(addLayoutComponent): Handle case where constraints is null.
Also, handle relative locations.
(removeLayoutComponent): Handle relative locations.
(MIN, MAX, PREF): New constants.
(calcCompSize): New method.
(calcSize): New method.
(minimumLayoutSize): Use it.
(preferredLayoutSize): Likewise.
(maximumLayoutSize): Likewise.
(toString): Include more information.
(setBounds): New method.
(layoutContainer): Use libgcj implementation; extended to handle
relative locations.
From-SVN: r48896
2002-01-16 04:21:35 +00:00
|
|
|
|
2002-11-10 23:11:21 +00:00
|
|
|
int width = edim.width + cdim.width + wdim.width + (hgap * 2);
|
|
|
|
if (ndim.width > width)
|
|
|
|
width = ndim.width;
|
|
|
|
if (sdim.width > width)
|
|
|
|
width = sdim.width;
|
Start of AWT merge with Classpath:
* Makefile.in: Rebuilt.
* Makefile.am (awt_java_source_files): Reference files in
gnu/java/awt, not gnu/gcj/awt.
* java/awt/image/BufferedImage.java: Updated copyright.
* java/awt/image/ComponentColorModel.java: Updated copyright.
* java/awt/image/ComponentSampleModel.java: Updated copyright.
* java/awt/image/DataBuffer.java: Updated copyright.
* java/awt/image/DataBufferByte.java: Updated copyright.
* java/awt/image/DataBufferInt.java: Updated copyright.
* java/awt/image/DataBufferUShort.java: Updated copyright.
* java/awt/image/IndexColorModel.java: Updated copyright.
* java/awt/image/PackedColorModel.java: Updated copyright.
* java/awt/image/Raster.java: Updated copyright.
* java/awt/image/RasterOp.java: Updated copyright.
* java/awt/image/SampleModel.java: Updated copyright.
* java/awt/image/SinglePixelPackedSampleModel.java: Updated copyright.
* java/awt/image/WritableRaster.java: Updated copyright.
* java/awt/color/ColorSpace.java: Updated copyright.
* java/awt/color/ICC_ColorSpace.java: Updated copyright
* java/awt/color/ICC_Profile.java: Updated copyright.
* java/awt/event/HierarchyBoundsAdapter.java: Updated copyright.
* java/awt/event/HierarchyBoundsListener.java: Updated copyright.
* java/awt/event/HierarchyEvent.java: Updated copyright.
* java/awt/event/HierarchyListener.java: Updated copyright.
* java/awt/geom/AffineTransform.java: Updated copyright.
* java/awt/geom/Dimension2D.java: Updated copyright.
* java/awt/geom/Ellipse2D.java: Updated copyright.
* java/awt/geom/IllegalPathStateException.java: Updated copyright.
* java/awt/geom/Line2D.java: Updated copyright.
* java/awt/geom/NoninvertibleTransformException.java: Updated
copyright.
* java/awt/geom/PathIterator.java: Updated copyright.
* java/awt/geom/Point2D.java: Updated copyright.
* java/awt/geom/Rectangle2D.java: Updated copyright.
* java/awt/geom/RectangularShape.java: Updated copyright.
* java/awt/geom/RoundRectangle2D.java: Updated copyright.
* java/awt/Toolkit.java: Updated import for file moves.
* java/awt/Rectangle.java: Updated copyright; added javadoc from
Classpath.
(hashCode): New method from Classpath.
* java/awt/Graphics2D.java: Updated copyright.
* java/awt/Transparency.java: Updated copyright.
* java/awt/Paint.java: Updated copyright.
* java/awt/Graphics.java: New version from Classpath.
* java/awt/EventDispatchThread.java: Updated copyright.
* java/awt/CardLayout.java (layoutContainer): Don't skip invisible
children.
(gotoComponent): Wrap around on next/previous.
* gnu/gcj/awt/BitMaskExtent.java: Removed.
* gnu/gcj/awt/Buffers.java: Removed.
* gnu/gcj/awt/ComponentDataBlitOp.java: Removed.
* gnu/gcj/awt/GLightweightPeer.java: Removed.
* gnu/java/awt/BitMaskExtent.java: Added.
* gnu/java/awt/Buffers.java: Added.
* gnu/java/awt/ComponentDataBlitOp.java: Added.
* gnu/java/awt/GLightweightPeer.java: Added.
* java/awt/geom/Line2D.java (clone): Ignore
CloneNotSupportedException.
* gnu/gcj/awt/GLightweightPeer.java (getColorModel): New method.
* java/awt/Frame.java: Merged with Classpath.
* java/awt/RenderingHints.java: Copyright update.
* java/awt/Paint.java: Copyright update.
* java/awt/image/DirectColorModel.java: Merged with Classpath.
* java/awt/image/ColorModel.java: Merged with Classpath.
* java/awt/Window.java (show): New Implementation from Classpath.
(isShowing): Use super.isShowing().
* java/awt/EventQueue.java: Merged with Classpath.
* java/awt/AWTEventMulticaster.java (save): Throw
RuntimeException.
(saveInternal): Likewise.
* java/awt/AWTEvent.java: Now implements Serializable.
* java/awt/Event.java: Copyright update.
* java/awt/peer/ComponentPeer.java: Merged with Classpath.
* java/awt/image/BufferedImage.java: Copyright update.
* java/awt/GraphicsConfiguration.java: Copyright update.
* java/awt/Component.java: (addNotify): Don't call
addNotifyContainerChildren().
(addNotifyContainerChildren): Removed.
(setPeer): New method from Classpath.
(setTreeLock): Likewise.
(setVisible): Rewrote.
(show): Use it.
(hide): Likewise.
(validate): Set `valid'.
(checkImage(Image,ImageObserver)): Implementation from Classpath.
(createImage(ImageProducer)): Likewise.
(prepareImage): Likewise.
* java/awt/Container.java (addImpl): Handle case where constraint
is not a String. Post event via system event queue.
(remove): Post event via system event queue.
(validateTree): Only validate child if it is invalid.
(getAlignmentX): Call super method as default.
(getAlignmentY): Likewise.
(addContainerListener): Now synchronized.
(removeContainerListener): Likewise.
(addNotifyContainerChildren): Now private.
* java/awt/ComponentOrientation.java: Updated copyright. Added
@author.
* java/awt/FlowLayout.java (serialVersionUID): New field.
(setAlignment): Better exception message.
(layoutContainer): Don't compute component's preferred size unless
we're going to use it.
* java/awt/BorderLayout.java (AFTER_LAST_LINE, AFTER_LINE_ENDS,
BEFORE_FIRST_LINE, BEFORE_LINE_BEGINS): New constants.
(firstLine, lastLine, firstItem, lastItem): New fields.
(addLayoutComponent): Handle case where constraints is null.
Also, handle relative locations.
(removeLayoutComponent): Handle relative locations.
(MIN, MAX, PREF): New constants.
(calcCompSize): New method.
(calcSize): New method.
(minimumLayoutSize): Use it.
(preferredLayoutSize): Likewise.
(maximumLayoutSize): Likewise.
(toString): Include more information.
(setBounds): New method.
(layoutContainer): Use libgcj implementation; extended to handle
relative locations.
From-SVN: r48896
2002-01-16 04:21:35 +00:00
|
|
|
|
2002-11-10 23:11:21 +00:00
|
|
|
width += (ins.left + ins.right);
|
Start of AWT merge with Classpath:
* Makefile.in: Rebuilt.
* Makefile.am (awt_java_source_files): Reference files in
gnu/java/awt, not gnu/gcj/awt.
* java/awt/image/BufferedImage.java: Updated copyright.
* java/awt/image/ComponentColorModel.java: Updated copyright.
* java/awt/image/ComponentSampleModel.java: Updated copyright.
* java/awt/image/DataBuffer.java: Updated copyright.
* java/awt/image/DataBufferByte.java: Updated copyright.
* java/awt/image/DataBufferInt.java: Updated copyright.
* java/awt/image/DataBufferUShort.java: Updated copyright.
* java/awt/image/IndexColorModel.java: Updated copyright.
* java/awt/image/PackedColorModel.java: Updated copyright.
* java/awt/image/Raster.java: Updated copyright.
* java/awt/image/RasterOp.java: Updated copyright.
* java/awt/image/SampleModel.java: Updated copyright.
* java/awt/image/SinglePixelPackedSampleModel.java: Updated copyright.
* java/awt/image/WritableRaster.java: Updated copyright.
* java/awt/color/ColorSpace.java: Updated copyright.
* java/awt/color/ICC_ColorSpace.java: Updated copyright
* java/awt/color/ICC_Profile.java: Updated copyright.
* java/awt/event/HierarchyBoundsAdapter.java: Updated copyright.
* java/awt/event/HierarchyBoundsListener.java: Updated copyright.
* java/awt/event/HierarchyEvent.java: Updated copyright.
* java/awt/event/HierarchyListener.java: Updated copyright.
* java/awt/geom/AffineTransform.java: Updated copyright.
* java/awt/geom/Dimension2D.java: Updated copyright.
* java/awt/geom/Ellipse2D.java: Updated copyright.
* java/awt/geom/IllegalPathStateException.java: Updated copyright.
* java/awt/geom/Line2D.java: Updated copyright.
* java/awt/geom/NoninvertibleTransformException.java: Updated
copyright.
* java/awt/geom/PathIterator.java: Updated copyright.
* java/awt/geom/Point2D.java: Updated copyright.
* java/awt/geom/Rectangle2D.java: Updated copyright.
* java/awt/geom/RectangularShape.java: Updated copyright.
* java/awt/geom/RoundRectangle2D.java: Updated copyright.
* java/awt/Toolkit.java: Updated import for file moves.
* java/awt/Rectangle.java: Updated copyright; added javadoc from
Classpath.
(hashCode): New method from Classpath.
* java/awt/Graphics2D.java: Updated copyright.
* java/awt/Transparency.java: Updated copyright.
* java/awt/Paint.java: Updated copyright.
* java/awt/Graphics.java: New version from Classpath.
* java/awt/EventDispatchThread.java: Updated copyright.
* java/awt/CardLayout.java (layoutContainer): Don't skip invisible
children.
(gotoComponent): Wrap around on next/previous.
* gnu/gcj/awt/BitMaskExtent.java: Removed.
* gnu/gcj/awt/Buffers.java: Removed.
* gnu/gcj/awt/ComponentDataBlitOp.java: Removed.
* gnu/gcj/awt/GLightweightPeer.java: Removed.
* gnu/java/awt/BitMaskExtent.java: Added.
* gnu/java/awt/Buffers.java: Added.
* gnu/java/awt/ComponentDataBlitOp.java: Added.
* gnu/java/awt/GLightweightPeer.java: Added.
* java/awt/geom/Line2D.java (clone): Ignore
CloneNotSupportedException.
* gnu/gcj/awt/GLightweightPeer.java (getColorModel): New method.
* java/awt/Frame.java: Merged with Classpath.
* java/awt/RenderingHints.java: Copyright update.
* java/awt/Paint.java: Copyright update.
* java/awt/image/DirectColorModel.java: Merged with Classpath.
* java/awt/image/ColorModel.java: Merged with Classpath.
* java/awt/Window.java (show): New Implementation from Classpath.
(isShowing): Use super.isShowing().
* java/awt/EventQueue.java: Merged with Classpath.
* java/awt/AWTEventMulticaster.java (save): Throw
RuntimeException.
(saveInternal): Likewise.
* java/awt/AWTEvent.java: Now implements Serializable.
* java/awt/Event.java: Copyright update.
* java/awt/peer/ComponentPeer.java: Merged with Classpath.
* java/awt/image/BufferedImage.java: Copyright update.
* java/awt/GraphicsConfiguration.java: Copyright update.
* java/awt/Component.java: (addNotify): Don't call
addNotifyContainerChildren().
(addNotifyContainerChildren): Removed.
(setPeer): New method from Classpath.
(setTreeLock): Likewise.
(setVisible): Rewrote.
(show): Use it.
(hide): Likewise.
(validate): Set `valid'.
(checkImage(Image,ImageObserver)): Implementation from Classpath.
(createImage(ImageProducer)): Likewise.
(prepareImage): Likewise.
* java/awt/Container.java (addImpl): Handle case where constraint
is not a String. Post event via system event queue.
(remove): Post event via system event queue.
(validateTree): Only validate child if it is invalid.
(getAlignmentX): Call super method as default.
(getAlignmentY): Likewise.
(addContainerListener): Now synchronized.
(removeContainerListener): Likewise.
(addNotifyContainerChildren): Now private.
* java/awt/ComponentOrientation.java: Updated copyright. Added
@author.
* java/awt/FlowLayout.java (serialVersionUID): New field.
(setAlignment): Better exception message.
(layoutContainer): Don't compute component's preferred size unless
we're going to use it.
* java/awt/BorderLayout.java (AFTER_LAST_LINE, AFTER_LINE_ENDS,
BEFORE_FIRST_LINE, BEFORE_LINE_BEGINS): New constants.
(firstLine, lastLine, firstItem, lastItem): New fields.
(addLayoutComponent): Handle case where constraints is null.
Also, handle relative locations.
(removeLayoutComponent): Handle relative locations.
(MIN, MAX, PREF): New constants.
(calcCompSize): New method.
(calcSize): New method.
(minimumLayoutSize): Use it.
(preferredLayoutSize): Likewise.
(maximumLayoutSize): Likewise.
(toString): Include more information.
(setBounds): New method.
(layoutContainer): Use libgcj implementation; extended to handle
relative locations.
From-SVN: r48896
2002-01-16 04:21:35 +00:00
|
|
|
|
2002-11-10 23:11:21 +00:00
|
|
|
int height = edim.height;
|
|
|
|
if (cdim.height > height)
|
|
|
|
height = cdim.height;
|
|
|
|
if (wdim.height > height)
|
|
|
|
height = wdim.height;
|
Start of AWT merge with Classpath:
* Makefile.in: Rebuilt.
* Makefile.am (awt_java_source_files): Reference files in
gnu/java/awt, not gnu/gcj/awt.
* java/awt/image/BufferedImage.java: Updated copyright.
* java/awt/image/ComponentColorModel.java: Updated copyright.
* java/awt/image/ComponentSampleModel.java: Updated copyright.
* java/awt/image/DataBuffer.java: Updated copyright.
* java/awt/image/DataBufferByte.java: Updated copyright.
* java/awt/image/DataBufferInt.java: Updated copyright.
* java/awt/image/DataBufferUShort.java: Updated copyright.
* java/awt/image/IndexColorModel.java: Updated copyright.
* java/awt/image/PackedColorModel.java: Updated copyright.
* java/awt/image/Raster.java: Updated copyright.
* java/awt/image/RasterOp.java: Updated copyright.
* java/awt/image/SampleModel.java: Updated copyright.
* java/awt/image/SinglePixelPackedSampleModel.java: Updated copyright.
* java/awt/image/WritableRaster.java: Updated copyright.
* java/awt/color/ColorSpace.java: Updated copyright.
* java/awt/color/ICC_ColorSpace.java: Updated copyright
* java/awt/color/ICC_Profile.java: Updated copyright.
* java/awt/event/HierarchyBoundsAdapter.java: Updated copyright.
* java/awt/event/HierarchyBoundsListener.java: Updated copyright.
* java/awt/event/HierarchyEvent.java: Updated copyright.
* java/awt/event/HierarchyListener.java: Updated copyright.
* java/awt/geom/AffineTransform.java: Updated copyright.
* java/awt/geom/Dimension2D.java: Updated copyright.
* java/awt/geom/Ellipse2D.java: Updated copyright.
* java/awt/geom/IllegalPathStateException.java: Updated copyright.
* java/awt/geom/Line2D.java: Updated copyright.
* java/awt/geom/NoninvertibleTransformException.java: Updated
copyright.
* java/awt/geom/PathIterator.java: Updated copyright.
* java/awt/geom/Point2D.java: Updated copyright.
* java/awt/geom/Rectangle2D.java: Updated copyright.
* java/awt/geom/RectangularShape.java: Updated copyright.
* java/awt/geom/RoundRectangle2D.java: Updated copyright.
* java/awt/Toolkit.java: Updated import for file moves.
* java/awt/Rectangle.java: Updated copyright; added javadoc from
Classpath.
(hashCode): New method from Classpath.
* java/awt/Graphics2D.java: Updated copyright.
* java/awt/Transparency.java: Updated copyright.
* java/awt/Paint.java: Updated copyright.
* java/awt/Graphics.java: New version from Classpath.
* java/awt/EventDispatchThread.java: Updated copyright.
* java/awt/CardLayout.java (layoutContainer): Don't skip invisible
children.
(gotoComponent): Wrap around on next/previous.
* gnu/gcj/awt/BitMaskExtent.java: Removed.
* gnu/gcj/awt/Buffers.java: Removed.
* gnu/gcj/awt/ComponentDataBlitOp.java: Removed.
* gnu/gcj/awt/GLightweightPeer.java: Removed.
* gnu/java/awt/BitMaskExtent.java: Added.
* gnu/java/awt/Buffers.java: Added.
* gnu/java/awt/ComponentDataBlitOp.java: Added.
* gnu/java/awt/GLightweightPeer.java: Added.
* java/awt/geom/Line2D.java (clone): Ignore
CloneNotSupportedException.
* gnu/gcj/awt/GLightweightPeer.java (getColorModel): New method.
* java/awt/Frame.java: Merged with Classpath.
* java/awt/RenderingHints.java: Copyright update.
* java/awt/Paint.java: Copyright update.
* java/awt/image/DirectColorModel.java: Merged with Classpath.
* java/awt/image/ColorModel.java: Merged with Classpath.
* java/awt/Window.java (show): New Implementation from Classpath.
(isShowing): Use super.isShowing().
* java/awt/EventQueue.java: Merged with Classpath.
* java/awt/AWTEventMulticaster.java (save): Throw
RuntimeException.
(saveInternal): Likewise.
* java/awt/AWTEvent.java: Now implements Serializable.
* java/awt/Event.java: Copyright update.
* java/awt/peer/ComponentPeer.java: Merged with Classpath.
* java/awt/image/BufferedImage.java: Copyright update.
* java/awt/GraphicsConfiguration.java: Copyright update.
* java/awt/Component.java: (addNotify): Don't call
addNotifyContainerChildren().
(addNotifyContainerChildren): Removed.
(setPeer): New method from Classpath.
(setTreeLock): Likewise.
(setVisible): Rewrote.
(show): Use it.
(hide): Likewise.
(validate): Set `valid'.
(checkImage(Image,ImageObserver)): Implementation from Classpath.
(createImage(ImageProducer)): Likewise.
(prepareImage): Likewise.
* java/awt/Container.java (addImpl): Handle case where constraint
is not a String. Post event via system event queue.
(remove): Post event via system event queue.
(validateTree): Only validate child if it is invalid.
(getAlignmentX): Call super method as default.
(getAlignmentY): Likewise.
(addContainerListener): Now synchronized.
(removeContainerListener): Likewise.
(addNotifyContainerChildren): Now private.
* java/awt/ComponentOrientation.java: Updated copyright. Added
@author.
* java/awt/FlowLayout.java (serialVersionUID): New field.
(setAlignment): Better exception message.
(layoutContainer): Don't compute component's preferred size unless
we're going to use it.
* java/awt/BorderLayout.java (AFTER_LAST_LINE, AFTER_LINE_ENDS,
BEFORE_FIRST_LINE, BEFORE_LINE_BEGINS): New constants.
(firstLine, lastLine, firstItem, lastItem): New fields.
(addLayoutComponent): Handle case where constraints is null.
Also, handle relative locations.
(removeLayoutComponent): Handle relative locations.
(MIN, MAX, PREF): New constants.
(calcCompSize): New method.
(calcSize): New method.
(minimumLayoutSize): Use it.
(preferredLayoutSize): Likewise.
(maximumLayoutSize): Likewise.
(toString): Include more information.
(setBounds): New method.
(layoutContainer): Use libgcj implementation; extended to handle
relative locations.
From-SVN: r48896
2002-01-16 04:21:35 +00:00
|
|
|
|
2002-11-10 23:11:21 +00:00
|
|
|
height += (ndim.height + sdim.height + (vgap * 2) + ins.top + ins.bottom);
|
Start of AWT merge with Classpath:
* Makefile.in: Rebuilt.
* Makefile.am (awt_java_source_files): Reference files in
gnu/java/awt, not gnu/gcj/awt.
* java/awt/image/BufferedImage.java: Updated copyright.
* java/awt/image/ComponentColorModel.java: Updated copyright.
* java/awt/image/ComponentSampleModel.java: Updated copyright.
* java/awt/image/DataBuffer.java: Updated copyright.
* java/awt/image/DataBufferByte.java: Updated copyright.
* java/awt/image/DataBufferInt.java: Updated copyright.
* java/awt/image/DataBufferUShort.java: Updated copyright.
* java/awt/image/IndexColorModel.java: Updated copyright.
* java/awt/image/PackedColorModel.java: Updated copyright.
* java/awt/image/Raster.java: Updated copyright.
* java/awt/image/RasterOp.java: Updated copyright.
* java/awt/image/SampleModel.java: Updated copyright.
* java/awt/image/SinglePixelPackedSampleModel.java: Updated copyright.
* java/awt/image/WritableRaster.java: Updated copyright.
* java/awt/color/ColorSpace.java: Updated copyright.
* java/awt/color/ICC_ColorSpace.java: Updated copyright
* java/awt/color/ICC_Profile.java: Updated copyright.
* java/awt/event/HierarchyBoundsAdapter.java: Updated copyright.
* java/awt/event/HierarchyBoundsListener.java: Updated copyright.
* java/awt/event/HierarchyEvent.java: Updated copyright.
* java/awt/event/HierarchyListener.java: Updated copyright.
* java/awt/geom/AffineTransform.java: Updated copyright.
* java/awt/geom/Dimension2D.java: Updated copyright.
* java/awt/geom/Ellipse2D.java: Updated copyright.
* java/awt/geom/IllegalPathStateException.java: Updated copyright.
* java/awt/geom/Line2D.java: Updated copyright.
* java/awt/geom/NoninvertibleTransformException.java: Updated
copyright.
* java/awt/geom/PathIterator.java: Updated copyright.
* java/awt/geom/Point2D.java: Updated copyright.
* java/awt/geom/Rectangle2D.java: Updated copyright.
* java/awt/geom/RectangularShape.java: Updated copyright.
* java/awt/geom/RoundRectangle2D.java: Updated copyright.
* java/awt/Toolkit.java: Updated import for file moves.
* java/awt/Rectangle.java: Updated copyright; added javadoc from
Classpath.
(hashCode): New method from Classpath.
* java/awt/Graphics2D.java: Updated copyright.
* java/awt/Transparency.java: Updated copyright.
* java/awt/Paint.java: Updated copyright.
* java/awt/Graphics.java: New version from Classpath.
* java/awt/EventDispatchThread.java: Updated copyright.
* java/awt/CardLayout.java (layoutContainer): Don't skip invisible
children.
(gotoComponent): Wrap around on next/previous.
* gnu/gcj/awt/BitMaskExtent.java: Removed.
* gnu/gcj/awt/Buffers.java: Removed.
* gnu/gcj/awt/ComponentDataBlitOp.java: Removed.
* gnu/gcj/awt/GLightweightPeer.java: Removed.
* gnu/java/awt/BitMaskExtent.java: Added.
* gnu/java/awt/Buffers.java: Added.
* gnu/java/awt/ComponentDataBlitOp.java: Added.
* gnu/java/awt/GLightweightPeer.java: Added.
* java/awt/geom/Line2D.java (clone): Ignore
CloneNotSupportedException.
* gnu/gcj/awt/GLightweightPeer.java (getColorModel): New method.
* java/awt/Frame.java: Merged with Classpath.
* java/awt/RenderingHints.java: Copyright update.
* java/awt/Paint.java: Copyright update.
* java/awt/image/DirectColorModel.java: Merged with Classpath.
* java/awt/image/ColorModel.java: Merged with Classpath.
* java/awt/Window.java (show): New Implementation from Classpath.
(isShowing): Use super.isShowing().
* java/awt/EventQueue.java: Merged with Classpath.
* java/awt/AWTEventMulticaster.java (save): Throw
RuntimeException.
(saveInternal): Likewise.
* java/awt/AWTEvent.java: Now implements Serializable.
* java/awt/Event.java: Copyright update.
* java/awt/peer/ComponentPeer.java: Merged with Classpath.
* java/awt/image/BufferedImage.java: Copyright update.
* java/awt/GraphicsConfiguration.java: Copyright update.
* java/awt/Component.java: (addNotify): Don't call
addNotifyContainerChildren().
(addNotifyContainerChildren): Removed.
(setPeer): New method from Classpath.
(setTreeLock): Likewise.
(setVisible): Rewrote.
(show): Use it.
(hide): Likewise.
(validate): Set `valid'.
(checkImage(Image,ImageObserver)): Implementation from Classpath.
(createImage(ImageProducer)): Likewise.
(prepareImage): Likewise.
* java/awt/Container.java (addImpl): Handle case where constraint
is not a String. Post event via system event queue.
(remove): Post event via system event queue.
(validateTree): Only validate child if it is invalid.
(getAlignmentX): Call super method as default.
(getAlignmentY): Likewise.
(addContainerListener): Now synchronized.
(removeContainerListener): Likewise.
(addNotifyContainerChildren): Now private.
* java/awt/ComponentOrientation.java: Updated copyright. Added
@author.
* java/awt/FlowLayout.java (serialVersionUID): New field.
(setAlignment): Better exception message.
(layoutContainer): Don't compute component's preferred size unless
we're going to use it.
* java/awt/BorderLayout.java (AFTER_LAST_LINE, AFTER_LINE_ENDS,
BEFORE_FIRST_LINE, BEFORE_LINE_BEGINS): New constants.
(firstLine, lastLine, firstItem, lastItem): New fields.
(addLayoutComponent): Handle case where constraints is null.
Also, handle relative locations.
(removeLayoutComponent): Handle relative locations.
(MIN, MAX, PREF): New constants.
(calcCompSize): New method.
(calcSize): New method.
(minimumLayoutSize): Use it.
(preferredLayoutSize): Likewise.
(maximumLayoutSize): Likewise.
(toString): Include more information.
(setBounds): New method.
(layoutContainer): Use libgcj implementation; extended to handle
relative locations.
From-SVN: r48896
2002-01-16 04:21:35 +00:00
|
|
|
|
2002-11-10 23:11:21 +00:00
|
|
|
return(new Dimension(width, height));
|
|
|
|
}
|
1999-05-05 04:05:57 -07:00
|
|
|
}
|
Start of AWT merge with Classpath:
* Makefile.in: Rebuilt.
* Makefile.am (awt_java_source_files): Reference files in
gnu/java/awt, not gnu/gcj/awt.
* java/awt/image/BufferedImage.java: Updated copyright.
* java/awt/image/ComponentColorModel.java: Updated copyright.
* java/awt/image/ComponentSampleModel.java: Updated copyright.
* java/awt/image/DataBuffer.java: Updated copyright.
* java/awt/image/DataBufferByte.java: Updated copyright.
* java/awt/image/DataBufferInt.java: Updated copyright.
* java/awt/image/DataBufferUShort.java: Updated copyright.
* java/awt/image/IndexColorModel.java: Updated copyright.
* java/awt/image/PackedColorModel.java: Updated copyright.
* java/awt/image/Raster.java: Updated copyright.
* java/awt/image/RasterOp.java: Updated copyright.
* java/awt/image/SampleModel.java: Updated copyright.
* java/awt/image/SinglePixelPackedSampleModel.java: Updated copyright.
* java/awt/image/WritableRaster.java: Updated copyright.
* java/awt/color/ColorSpace.java: Updated copyright.
* java/awt/color/ICC_ColorSpace.java: Updated copyright
* java/awt/color/ICC_Profile.java: Updated copyright.
* java/awt/event/HierarchyBoundsAdapter.java: Updated copyright.
* java/awt/event/HierarchyBoundsListener.java: Updated copyright.
* java/awt/event/HierarchyEvent.java: Updated copyright.
* java/awt/event/HierarchyListener.java: Updated copyright.
* java/awt/geom/AffineTransform.java: Updated copyright.
* java/awt/geom/Dimension2D.java: Updated copyright.
* java/awt/geom/Ellipse2D.java: Updated copyright.
* java/awt/geom/IllegalPathStateException.java: Updated copyright.
* java/awt/geom/Line2D.java: Updated copyright.
* java/awt/geom/NoninvertibleTransformException.java: Updated
copyright.
* java/awt/geom/PathIterator.java: Updated copyright.
* java/awt/geom/Point2D.java: Updated copyright.
* java/awt/geom/Rectangle2D.java: Updated copyright.
* java/awt/geom/RectangularShape.java: Updated copyright.
* java/awt/geom/RoundRectangle2D.java: Updated copyright.
* java/awt/Toolkit.java: Updated import for file moves.
* java/awt/Rectangle.java: Updated copyright; added javadoc from
Classpath.
(hashCode): New method from Classpath.
* java/awt/Graphics2D.java: Updated copyright.
* java/awt/Transparency.java: Updated copyright.
* java/awt/Paint.java: Updated copyright.
* java/awt/Graphics.java: New version from Classpath.
* java/awt/EventDispatchThread.java: Updated copyright.
* java/awt/CardLayout.java (layoutContainer): Don't skip invisible
children.
(gotoComponent): Wrap around on next/previous.
* gnu/gcj/awt/BitMaskExtent.java: Removed.
* gnu/gcj/awt/Buffers.java: Removed.
* gnu/gcj/awt/ComponentDataBlitOp.java: Removed.
* gnu/gcj/awt/GLightweightPeer.java: Removed.
* gnu/java/awt/BitMaskExtent.java: Added.
* gnu/java/awt/Buffers.java: Added.
* gnu/java/awt/ComponentDataBlitOp.java: Added.
* gnu/java/awt/GLightweightPeer.java: Added.
* java/awt/geom/Line2D.java (clone): Ignore
CloneNotSupportedException.
* gnu/gcj/awt/GLightweightPeer.java (getColorModel): New method.
* java/awt/Frame.java: Merged with Classpath.
* java/awt/RenderingHints.java: Copyright update.
* java/awt/Paint.java: Copyright update.
* java/awt/image/DirectColorModel.java: Merged with Classpath.
* java/awt/image/ColorModel.java: Merged with Classpath.
* java/awt/Window.java (show): New Implementation from Classpath.
(isShowing): Use super.isShowing().
* java/awt/EventQueue.java: Merged with Classpath.
* java/awt/AWTEventMulticaster.java (save): Throw
RuntimeException.
(saveInternal): Likewise.
* java/awt/AWTEvent.java: Now implements Serializable.
* java/awt/Event.java: Copyright update.
* java/awt/peer/ComponentPeer.java: Merged with Classpath.
* java/awt/image/BufferedImage.java: Copyright update.
* java/awt/GraphicsConfiguration.java: Copyright update.
* java/awt/Component.java: (addNotify): Don't call
addNotifyContainerChildren().
(addNotifyContainerChildren): Removed.
(setPeer): New method from Classpath.
(setTreeLock): Likewise.
(setVisible): Rewrote.
(show): Use it.
(hide): Likewise.
(validate): Set `valid'.
(checkImage(Image,ImageObserver)): Implementation from Classpath.
(createImage(ImageProducer)): Likewise.
(prepareImage): Likewise.
* java/awt/Container.java (addImpl): Handle case where constraint
is not a String. Post event via system event queue.
(remove): Post event via system event queue.
(validateTree): Only validate child if it is invalid.
(getAlignmentX): Call super method as default.
(getAlignmentY): Likewise.
(addContainerListener): Now synchronized.
(removeContainerListener): Likewise.
(addNotifyContainerChildren): Now private.
* java/awt/ComponentOrientation.java: Updated copyright. Added
@author.
* java/awt/FlowLayout.java (serialVersionUID): New field.
(setAlignment): Better exception message.
(layoutContainer): Don't compute component's preferred size unless
we're going to use it.
* java/awt/BorderLayout.java (AFTER_LAST_LINE, AFTER_LINE_ENDS,
BEFORE_FIRST_LINE, BEFORE_LINE_BEGINS): New constants.
(firstLine, lastLine, firstItem, lastItem): New fields.
(addLayoutComponent): Handle case where constraints is null.
Also, handle relative locations.
(removeLayoutComponent): Handle relative locations.
(MIN, MAX, PREF): New constants.
(calcCompSize): New method.
(calcSize): New method.
(minimumLayoutSize): Use it.
(preferredLayoutSize): Likewise.
(maximumLayoutSize): Likewise.
(toString): Include more information.
(setBounds): New method.
(layoutContainer): Use libgcj implementation; extended to handle
relative locations.
From-SVN: r48896
2002-01-16 04:21:35 +00:00
|
|
|
} // class BorderLayout
|