BitMaskExtent.java, [...]: Removed Latin-1 copyright symbols.
* gnu/gcj/awt/BitMaskExtent.java, gnu/gcj/awt/Buffers.java,
gnu/gcj/awt/ComponentDataBlitOp.java,
gnu/gcj/awt/GLightweightPeer.java, java/awt/Graphics2D.java,
java/awt/RenderingHints.java, java/awt/color/ColorSpace.java,
java/awt/color/ICC_ColorSpace.java,
java/awt/color/ICC_Profile.java,
java/awt/image/BufferedImage.java, java/awt/image/ColorModel.java,
java/awt/image/ComponentColorModel.java,
java/awt/image/ComponentSampleModel.java,
java/awt/image/DataBuffer.java,
java/awt/image/DataBufferByte.java,
java/awt/image/DataBufferInt.java,
java/awt/image/DataBufferUShort.java,
java/awt/image/DirectColorModel.java,
java/awt/image/IndexColorModel.java,
java/awt/image/PackedColorModel.java, java/awt/image/Raster.java,
java/awt/image/RasterOp.java, java/awt/image/SampleModel.java,
java/awt/image/SinglePixelPackedSampleModel.java,
java/awt/image/WritableRaster.java, java/util/zip/ZipFile.java:
Removed Latin-1 copyright symbols.
* java/util/zip/ZipFile.java: Indentation fixes.
From-SVN: r36027
2000-08-29 05:23:57 +02:00
|
|
|
/* Copyright (C) 2000 Free Software Foundation
|
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
|
|
|
|
|
|
|
This file is part of libgcj.
|
|
|
|
|
|
|
|
This software is copyrighted work licensed under the terms of the
|
|
|
|
Libgcj License. Please consult the file "LIBGCJ_LICENSE" for
|
|
|
|
details. */
|
|
|
|
|
|
|
|
package gnu.gcj.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");
|
|
|
|
}
|
|
|
|
}
|