
* 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
140 lines
4.3 KiB
Java
140 lines
4.3 KiB
Java
/* Copyright (C) 2000, 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. */
|
|
|
|
package gnu.java.awt;
|
|
|
|
import java.awt.geom.*;
|
|
import java.awt.image.*;
|
|
import java.awt.RenderingHints;
|
|
|
|
/**
|
|
* This raster copy operation assumes that both source and destination
|
|
* sample models are tightly pixel packed and contain the same number
|
|
* of bands.
|
|
*
|
|
* @throws java.lang.ClassCastException if the sample models of the
|
|
* rasters are not of type ComponentSampleModel.
|
|
*
|
|
* @author Rolf W. Rasmussen <rolfwr@ii.uib.no>
|
|
*/
|
|
public class ComponentDataBlitOp implements RasterOp
|
|
{
|
|
public static ComponentDataBlitOp INSTANCE = new ComponentDataBlitOp();
|
|
|
|
public WritableRaster filter(Raster src, WritableRaster dest)
|
|
{
|
|
if (dest == null)
|
|
dest = createCompatibleDestRaster(src);
|
|
|
|
DataBuffer srcDB = src.getDataBuffer();
|
|
DataBuffer destDB = dest.getDataBuffer();
|
|
|
|
ComponentSampleModel srcSM = (ComponentSampleModel) src.getSampleModel();
|
|
ComponentSampleModel destSM = (ComponentSampleModel) dest.getSampleModel();
|
|
|
|
|
|
// Calculate offset to data in the underlying arrays:
|
|
|
|
int srcScanlineStride = srcSM.getScanlineStride();
|
|
int destScanlineStride = destSM.getScanlineStride();
|
|
int srcX = src.getMinX() - src.getSampleModelTranslateX();
|
|
int srcY = src.getMinY() - src.getSampleModelTranslateY();
|
|
int destX = dest.getMinX() - dest.getSampleModelTranslateX();
|
|
int destY = dest.getMinY() - dest.getSampleModelTranslateY();
|
|
|
|
int numBands = srcSM.getNumBands();
|
|
|
|
/* We can't use getOffset(x, y) from the sample model since we
|
|
don't want the band offset added in. */
|
|
|
|
int srcOffset =
|
|
numBands*srcX + srcScanlineStride*srcY + // from sample model
|
|
srcDB.getOffset(); // from data buffer
|
|
|
|
int destOffset =
|
|
numBands*destX + destScanlineStride*destY + // from sample model
|
|
destDB.getOffset(); // from data buffer
|
|
|
|
// Determine how much, and how many times to blit.
|
|
|
|
int rowSize = src.getWidth()*numBands;
|
|
int h = src.getHeight();
|
|
|
|
if ((rowSize == srcScanlineStride) &&
|
|
(rowSize == destScanlineStride))
|
|
{
|
|
// collapse scan line blits to one large blit.
|
|
rowSize *= h;
|
|
h = 1;
|
|
}
|
|
|
|
|
|
// Do blitting
|
|
|
|
Object srcArray = Buffers.getData(srcDB);
|
|
Object destArray = Buffers.getData(destDB);
|
|
|
|
for (int yd = 0; yd<h; yd++)
|
|
{
|
|
System.arraycopy(srcArray, srcOffset,
|
|
destArray, destOffset,
|
|
rowSize);
|
|
srcOffset += srcScanlineStride;
|
|
destOffset += destScanlineStride;
|
|
}
|
|
|
|
|
|
return dest;
|
|
}
|
|
|
|
public Rectangle2D getBounds2D(Raster src)
|
|
{
|
|
return src.getBounds();
|
|
}
|
|
|
|
public WritableRaster createCompatibleDestRaster(Raster src) {
|
|
|
|
/* FIXME: Maybe we should explicitly create a raster with a
|
|
tightly pixel packed sample model, rather than assuming
|
|
that the createCompatibleWritableRaster() method in Raster
|
|
will create one. */
|
|
|
|
return src.createCompatibleWritableRaster();
|
|
}
|
|
|
|
public Point2D getPoint2D(Point2D srcPoint, Point2D destPoint)
|
|
{
|
|
if (destPoint == null)
|
|
return (Point2D) srcPoint.clone();
|
|
|
|
destPoint.setLocation(srcPoint);
|
|
return destPoint;
|
|
}
|
|
|
|
public RenderingHints getRenderingHints()
|
|
{
|
|
throw new UnsupportedOperationException("not implemented");
|
|
}
|
|
}
|