mirror of
git://gcc.gnu.org/git/gcc.git
synced 2024-12-29 08:04:39 +08:00
3bd483f2a1
* 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
252 lines
6.9 KiB
Java
252 lines
6.9 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 java.awt.image;
|
|
|
|
import java.awt.*;
|
|
|
|
/**
|
|
* @author Rolf W. Rasmussen <rolfwr@ii.uib.no>
|
|
*/
|
|
public class WritableRaster extends Raster
|
|
{
|
|
protected WritableRaster(SampleModel sampleModel, Point origin)
|
|
{
|
|
this(sampleModel, sampleModel.createDataBuffer(), origin);
|
|
}
|
|
|
|
protected WritableRaster(SampleModel sampleModel,
|
|
DataBuffer dataBuffer, Point origin)
|
|
{
|
|
this(sampleModel, dataBuffer,
|
|
new Rectangle(origin.x, origin.y,
|
|
sampleModel.getWidth(), sampleModel.getHeight()),
|
|
origin,
|
|
null);
|
|
}
|
|
|
|
protected WritableRaster(SampleModel sampleModel,
|
|
DataBuffer dataBuffer,
|
|
Rectangle aRegion,
|
|
Point sampleModelTranslate,
|
|
WritableRaster parent)
|
|
{
|
|
super(sampleModel, dataBuffer, aRegion, sampleModelTranslate,
|
|
parent);
|
|
}
|
|
|
|
public WritableRaster getWritableParent()
|
|
{
|
|
return (WritableRaster) getParent();
|
|
}
|
|
|
|
public WritableRaster createWritableTranslatedChild(int childMinX,
|
|
int childMinY)
|
|
{
|
|
// This mirrors the code from the super class
|
|
int tcx = sampleModelTranslateX - minX + childMinX;
|
|
int tcy = sampleModelTranslateY - minY + childMinY;
|
|
|
|
return new WritableRaster(sampleModel, dataBuffer,
|
|
new Rectangle(childMinX, childMinY,
|
|
width, height),
|
|
new Point(tcx, tcy),
|
|
this);
|
|
}
|
|
|
|
public WritableRaster createWritableChild(int parentX,
|
|
int parentY,
|
|
int w, int h,
|
|
int childMinX,
|
|
int childMinY,
|
|
int[] bandList)
|
|
{
|
|
// This mirrors the code from the super class
|
|
|
|
// FIXME: Throw RasterFormatException if child bounds extends
|
|
// beyond the bounds of this raster.
|
|
|
|
SampleModel sm = (bandList == null) ?
|
|
sampleModel :
|
|
sampleModel.createSubsetSampleModel(bandList);
|
|
|
|
return new
|
|
WritableRaster(sm, dataBuffer,
|
|
new Rectangle(childMinX, childMinY,
|
|
w, h),
|
|
new Point(sampleModelTranslateX+childMinX-parentX,
|
|
sampleModelTranslateY+childMinY-parentY),
|
|
this);
|
|
}
|
|
|
|
public void setDataElements(int x, int y, Object inData)
|
|
{
|
|
sampleModel.setDataElements(x-sampleModelTranslateX,
|
|
y-sampleModelTranslateY,
|
|
inData, dataBuffer);
|
|
}
|
|
|
|
public void setDataElements(int x, int y, Raster inRaster)
|
|
{
|
|
Object dataElements = getDataElements(0, 0,
|
|
inRaster.getWidth(),
|
|
inRaster.getHeight(),
|
|
null);
|
|
setDataElements(x, y, dataElements);
|
|
}
|
|
|
|
public void setDataElements(int x, int y, int w, int h,
|
|
Object inData)
|
|
{
|
|
sampleModel.setDataElements(x-sampleModelTranslateX,
|
|
y-sampleModelTranslateY,
|
|
w, h, inData, dataBuffer);
|
|
}
|
|
|
|
public void setRect(Raster srcRaster)
|
|
{
|
|
setRect(srcRaster, 0, 0);
|
|
}
|
|
|
|
public void setRect(Raster srcRaster, int dx, int dy)
|
|
{
|
|
Rectangle targetUnclipped = new Rectangle(srcRaster.getMinX()+dx,
|
|
srcRaster.getMinY()+dy,
|
|
srcRaster.getWidth(),
|
|
srcRaster.getHeight());
|
|
|
|
Rectangle target = getBounds().intersection(targetUnclipped);
|
|
|
|
if (target.isEmpty()) return;
|
|
|
|
int sx = target.x - dx;
|
|
int sy = target.y - dy;
|
|
|
|
// FIXME: Do tests on rasters and use get/set data instead.
|
|
|
|
/* The JDK documentation seems to imply this implementation.
|
|
(the trucation of higher bits), but an implementation using
|
|
get/setDataElements would be more efficient. None of the
|
|
implementations would do anything sensible when the sample
|
|
models don't match.
|
|
|
|
But this is probably not the place to consider such
|
|
optimizations.*/
|
|
|
|
int[] pixels = srcRaster.getPixels(sx, sy,
|
|
target.width, target.height,
|
|
(int[]) null);
|
|
|
|
setPixels(target.x, target.y, target.width, target.height, pixels);
|
|
}
|
|
|
|
public void setPixel(int x, int y, int[] iArray)
|
|
{
|
|
sampleModel.setPixel(x-sampleModelTranslateX,
|
|
y-sampleModelTranslateY,
|
|
iArray, dataBuffer);
|
|
}
|
|
|
|
public void setPixel(int x, int y, float[] fArray)
|
|
{
|
|
sampleModel.setPixel(x-sampleModelTranslateX,
|
|
y-sampleModelTranslateY,
|
|
fArray, dataBuffer);
|
|
}
|
|
|
|
public void setPixel(int x, int y, double[] dArray)
|
|
{
|
|
sampleModel.setPixel(x-sampleModelTranslateX,
|
|
y-sampleModelTranslateY,
|
|
dArray, dataBuffer);
|
|
}
|
|
|
|
public void setPixels(int x, int y, int w, int h, int[] iArray)
|
|
{
|
|
sampleModel.setPixels(x-sampleModelTranslateX,
|
|
y-sampleModelTranslateY,
|
|
w, h, iArray, dataBuffer);
|
|
}
|
|
|
|
public void setPixels(int x, int y, int w, int h, float[] fArray)
|
|
{
|
|
sampleModel.setPixels(x-sampleModelTranslateX,
|
|
y-sampleModelTranslateY,
|
|
w, h, fArray, dataBuffer);
|
|
}
|
|
|
|
public void setPixels(int x, int y, int w, int h, double[] dArray)
|
|
{
|
|
sampleModel.setPixels(x-sampleModelTranslateX,
|
|
y-sampleModelTranslateY,
|
|
w, h, dArray, dataBuffer);
|
|
}
|
|
|
|
public void setSample(int x, int y, int b, int s)
|
|
{
|
|
sampleModel.setSample(x-sampleModelTranslateX,
|
|
y-sampleModelTranslateY,
|
|
b, s, dataBuffer);
|
|
}
|
|
|
|
public void setSample(int x, int y, int b, float s)
|
|
{
|
|
sampleModel.setSample(x-sampleModelTranslateX,
|
|
y-sampleModelTranslateY,
|
|
b, s, dataBuffer);
|
|
}
|
|
|
|
public void setSample(int x, int y, int b, double s)
|
|
{
|
|
sampleModel.setSample(x-sampleModelTranslateX,
|
|
y-sampleModelTranslateY,
|
|
b, s, dataBuffer);
|
|
}
|
|
|
|
public void setSamples(int x, int y, int w, int h, int b,
|
|
int[] iArray)
|
|
{
|
|
sampleModel.setSamples(x-sampleModelTranslateX,
|
|
y-sampleModelTranslateY,
|
|
w, h, b, iArray, dataBuffer);
|
|
}
|
|
|
|
public void setSamples(int x, int y, int w, int h, int b,
|
|
float[] fArray)
|
|
{
|
|
sampleModel.setSamples(x-sampleModelTranslateX,
|
|
y-sampleModelTranslateY,
|
|
w, h, b, fArray, dataBuffer);
|
|
}
|
|
|
|
public void setSamples(int x, int y, int w, int h, int b,
|
|
double[] dArray)
|
|
{
|
|
sampleModel.setSamples(x-sampleModelTranslateX,
|
|
y-sampleModelTranslateY,
|
|
w, h, b, dArray, dataBuffer);
|
|
}
|
|
}
|