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 12:21:35 +08:00
|
|
|
/* Copyright (C) 2000, 2001, 2002 Free Software Foundation
|
|
|
|
|
|
|
|
This file is part of GNU Classpath.
|
|
|
|
|
|
|
|
GNU Classpath is free software; you can redistribute it and/or modify
|
|
|
|
it under the terms of the GNU General Public License as published by
|
|
|
|
the Free Software Foundation; either version 2, or (at your option)
|
|
|
|
any later version.
|
|
|
|
|
|
|
|
GNU Classpath is distributed in the hope that it will be useful, but
|
|
|
|
WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
|
|
General Public License for more details.
|
|
|
|
|
|
|
|
You should have received a copy of the GNU General Public License
|
|
|
|
along with GNU Classpath; see the file COPYING. If not, write to the
|
|
|
|
Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
|
|
|
|
02111-1307 USA.
|
|
|
|
|
|
|
|
As a special exception, if you link this library with other files to
|
|
|
|
produce an executable, this library does not by itself cause the
|
|
|
|
resulting executable to be covered by the GNU General Public License.
|
|
|
|
This exception does not however invalidate any other reasons why the
|
|
|
|
executable file might be covered by the GNU General Public License. */
|
|
|
|
|
|
|
|
/**
|
|
|
|
* @author Bryce McKinlay <bryce@albatross.co.nz>
|
|
|
|
*/
|
2000-07-12 11:32:07 +08:00
|
|
|
|
|
|
|
/* Status: Incomplete. Needs a Locale lookup table. */
|
|
|
|
|
|
|
|
package java.awt;
|
|
|
|
|
|
|
|
import java.util.Locale;
|
|
|
|
import java.util.ResourceBundle;
|
|
|
|
|
2001-04-22 11:05:39 +08:00
|
|
|
public final class ComponentOrientation implements java.io.Serializable
|
2000-07-12 11:32:07 +08:00
|
|
|
{
|
2000-08-09 21:01:44 +08:00
|
|
|
// Here is a wild guess.
|
|
|
|
private static int HORIZONTAL_ID = 1 << 0,
|
|
|
|
LEFT_TO_RIGHT_ID = 1 << 1;
|
|
|
|
|
2000-07-12 11:32:07 +08:00
|
|
|
public static final ComponentOrientation LEFT_TO_RIGHT
|
|
|
|
= new ComponentOrientation(HORIZONTAL_ID & LEFT_TO_RIGHT_ID);
|
|
|
|
public static final ComponentOrientation RIGHT_TO_LEFT
|
|
|
|
= new ComponentOrientation(HORIZONTAL_ID);
|
|
|
|
public static final ComponentOrientation UNKNOWN
|
|
|
|
= new ComponentOrientation(0);
|
|
|
|
|
|
|
|
// FIXME: This field is from the serialization spec, but what are the
|
|
|
|
// correct values?
|
|
|
|
int orientation;
|
2001-04-22 11:05:39 +08:00
|
|
|
|
2000-07-12 11:32:07 +08:00
|
|
|
ComponentOrientation(int orientation)
|
|
|
|
{
|
|
|
|
this.orientation = orientation;
|
|
|
|
}
|
|
|
|
|
|
|
|
public boolean isHorizontal()
|
|
|
|
{
|
|
|
|
return ((orientation & HORIZONTAL_ID) != 0);
|
|
|
|
}
|
|
|
|
|
|
|
|
public boolean isLeftToRight()
|
|
|
|
{
|
|
|
|
return ((orientation & LEFT_TO_RIGHT_ID) != 0);
|
|
|
|
}
|
|
|
|
|
|
|
|
public static ComponentOrientation getOrientation(Locale locale)
|
|
|
|
{
|
|
|
|
// FIXME: Use a table to look this up.
|
|
|
|
return LEFT_TO_RIGHT;
|
|
|
|
}
|
|
|
|
|
|
|
|
public static ComponentOrientation getOrientation(ResourceBundle bdl)
|
|
|
|
{
|
|
|
|
ComponentOrientation r;
|
2001-04-22 11:05:39 +08:00
|
|
|
|
2000-07-12 11:32:07 +08:00
|
|
|
try
|
|
|
|
{
|
|
|
|
Object obj = bdl.getObject("Orientation");
|
|
|
|
r = (ComponentOrientation) obj;
|
|
|
|
if (r != null)
|
|
|
|
return r;
|
|
|
|
}
|
|
|
|
catch (Exception x)
|
|
|
|
{
|
|
|
|
// Fall through
|
|
|
|
}
|
|
|
|
|
|
|
|
try
|
|
|
|
{
|
|
|
|
Locale l = bdl.getLocale();
|
|
|
|
r = getOrientation(l);
|
|
|
|
if (r != null)
|
|
|
|
return r;
|
|
|
|
}
|
|
|
|
catch (Exception x)
|
|
|
|
{
|
|
|
|
// Fall through
|
|
|
|
}
|
|
|
|
|
|
|
|
return (getOrientation (Locale.getDefault ()));
|
|
|
|
}
|
|
|
|
}
|