OSDN Git Service

Start of AWT merge with Classpath:
authortromey <tromey@138bc75d-0d04-0410-961f-82ee72b054a4>
Wed, 16 Jan 2002 04:21:35 +0000 (04:21 +0000)
committertromey <tromey@138bc75d-0d04-0410-961f-82ee72b054a4>
Wed, 16 Jan 2002 04:21:35 +0000 (04:21 +0000)
commit986e6497bc6dd83edc49a48bb527ccf3a5e62f7b
treea0f126a62903beed11548538a3c963a7e0a7f669
parent9e55cc17c514e90df7d264f9fe0dd7b35dec9b46
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.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@48896 138bc75d-0d04-0410-961f-82ee72b054a4
65 files changed:
libjava/ChangeLog
libjava/Makefile.am
libjava/Makefile.in
libjava/gnu/awt/xlib/XGraphicsConfiguration.java
libjava/gnu/gcj/awt/BitMaskExtent.java [deleted file]
libjava/gnu/java/awt/BitMaskExtent.java [new file with mode: 0644]
libjava/gnu/java/awt/Buffers.java [moved from libjava/gnu/gcj/awt/Buffers.java with 79% similarity]
libjava/gnu/java/awt/ComponentDataBlitOp.java [moved from libjava/gnu/gcj/awt/ComponentDataBlitOp.java with 74% similarity]
libjava/gnu/java/awt/GLightweightPeer.java [moved from libjava/gnu/gcj/awt/GLightweightPeer.java with 64% similarity]
libjava/include/config.h.in
libjava/java/awt/AWTEvent.java
libjava/java/awt/AWTEventMulticaster.java
libjava/java/awt/BorderLayout.java
libjava/java/awt/CardLayout.java
libjava/java/awt/Component.java
libjava/java/awt/ComponentOrientation.java
libjava/java/awt/Container.java
libjava/java/awt/Event.java
libjava/java/awt/EventDispatchThread.java
libjava/java/awt/EventQueue.java
libjava/java/awt/FlowLayout.java
libjava/java/awt/Frame.java
libjava/java/awt/Graphics.java
libjava/java/awt/Graphics2D.java
libjava/java/awt/GraphicsConfiguration.java
libjava/java/awt/Paint.java
libjava/java/awt/Rectangle.java
libjava/java/awt/RenderingHints.java
libjava/java/awt/Toolkit.java
libjava/java/awt/Transparency.java
libjava/java/awt/Window.java
libjava/java/awt/color/ColorSpace.java
libjava/java/awt/color/ICC_ColorSpace.java
libjava/java/awt/color/ICC_Profile.java
libjava/java/awt/event/HierarchyBoundsAdapter.java
libjava/java/awt/event/HierarchyBoundsListener.java
libjava/java/awt/event/HierarchyEvent.java
libjava/java/awt/event/HierarchyListener.java
libjava/java/awt/geom/AffineTransform.java
libjava/java/awt/geom/Dimension2D.java
libjava/java/awt/geom/Ellipse2D.java
libjava/java/awt/geom/IllegalPathStateException.java
libjava/java/awt/geom/Line2D.java
libjava/java/awt/geom/NoninvertibleTransformException.java
libjava/java/awt/geom/PathIterator.java
libjava/java/awt/geom/Point2D.java
libjava/java/awt/geom/Rectangle2D.java
libjava/java/awt/geom/RectangularShape.java
libjava/java/awt/geom/RoundRectangle2D.java
libjava/java/awt/image/BufferedImage.java
libjava/java/awt/image/ColorModel.java
libjava/java/awt/image/ComponentColorModel.java
libjava/java/awt/image/ComponentSampleModel.java
libjava/java/awt/image/DataBuffer.java
libjava/java/awt/image/DataBufferByte.java
libjava/java/awt/image/DataBufferInt.java
libjava/java/awt/image/DataBufferUShort.java
libjava/java/awt/image/DirectColorModel.java
libjava/java/awt/image/IndexColorModel.java
libjava/java/awt/image/PackedColorModel.java
libjava/java/awt/image/Raster.java
libjava/java/awt/image/RasterOp.java
libjava/java/awt/image/SampleModel.java
libjava/java/awt/image/SinglePixelPackedSampleModel.java
libjava/java/awt/image/WritableRaster.java