diff options
Diffstat (limited to 'libjava/java/awt/image')
| -rw-r--r-- | libjava/java/awt/image/ImageConsumer.java | 32 | ||||
| -rw-r--r-- | libjava/java/awt/image/ImageObserver.java | 18 | ||||
| -rw-r--r-- | libjava/java/awt/image/ImageProducer.java | 10 | ||||
| -rw-r--r-- | libjava/java/awt/image/RGBImageFilter.java | 4 | ||||
| -rw-r--r-- | libjava/java/awt/image/RasterOp.java | 2 | ||||
| -rw-r--r-- | libjava/java/awt/image/renderable/RenderableImage.java | 5 |
6 files changed, 37 insertions, 34 deletions
diff --git a/libjava/java/awt/image/ImageConsumer.java b/libjava/java/awt/image/ImageConsumer.java index 25073ff..330f21f 100644 --- a/libjava/java/awt/image/ImageConsumer.java +++ b/libjava/java/awt/image/ImageConsumer.java @@ -54,21 +54,21 @@ public interface ImageConsumer * * @see #setHints */ - public static final int RANDOMPIXELORDER = 1; + int RANDOMPIXELORDER = 1; /** * The pixel order is top-down, left-right. * * @see #setHints */ - public static final int TOPDOWNLEFTRIGHT = 2; + int TOPDOWNLEFTRIGHT = 2; /** * The pixel order is in multiples of complete scanlines. * * @see #setHints */ - public static final int COMPLETESCANLINES = 4; + int COMPLETESCANLINES = 4; /** * The pixels will be delivered in a single pass. There is at @@ -77,7 +77,7 @@ public interface ImageConsumer * @see #setHints * @see #setPixels */ - public static final int SINGLEPASS = 8; + int SINGLEPASS = 8; /** * The pixels will be delivered with multiple calls to @@ -91,35 +91,35 @@ public interface ImageConsumer * @see #setHints * @see #imageComplete */ - public static final int SINGLEFRAME = 16; + int SINGLEFRAME = 16; /** * Indicates an error occurred while producing an image. * * @see #imageComplete */ - public static final int IMAGEERROR = 1; + int IMAGEERROR = 1; /** * A single frame is complete but more will follow. * * @see #imageComplete */ - public static final int SINGLEFRAMEDONE = 2; + int SINGLEFRAMEDONE = 2; /** * The image is complete and no more pixels or frames will follow. * * @see #imageComplete */ - public static final int STATICIMAGEDONE = 3; + int STATICIMAGEDONE = 3; /** * Production of the image has been aborted. * * @see #imageComplete */ - public static final int IMAGEABORTED = 4; + int IMAGEABORTED = 4; /** * An <code>ImageProducer</code> indicates the size of the image @@ -128,7 +128,7 @@ public interface ImageConsumer * @param width the width of the image * @param height the height of the image */ - public abstract void setDimensions(int width, int height); + void setDimensions(int width, int height); /** * An <code>ImageProducer</code> can set a list of properties @@ -136,7 +136,7 @@ public interface ImageConsumer * * @param props the list of properties associated with this image */ - public abstract void setProperties(Hashtable props); + void setProperties(Hashtable props); /** * This <code>ColorModel</code> should indicate the model used by @@ -147,7 +147,7 @@ public interface ImageConsumer * @param model the color model to be used most often by setPixels * @see ColorModel */ - public abstract void setColorModel(ColorModel model); + void setColorModel(ColorModel model); /** * The <code>ImageProducer</code> should call this method with a @@ -157,14 +157,14 @@ public interface ImageConsumer * * @param flags a bit mask of hints */ - public abstract void setHints(int flags); + void setHints(int flags); /** * This function delivers a rectangle of pixels where any * pixel(m,n) is stored in the array as a <code>byte</code> at * index (n * scansize + m + offset). */ - public abstract void setPixels(int x, int y, int w, int h, + void setPixels(int x, int y, int w, int h, ColorModel model, byte[] pixels, int offset, int scansize); /** @@ -172,7 +172,7 @@ public interface ImageConsumer * pixel(m,n) is stored in the array as an <code>int</code> at * index (n * scansize + m + offset). */ - public abstract void setPixels(int x, int y, int w, int h, + void setPixels(int x, int y, int w, int h, ColorModel model, int[] pixels, int offset, int scansize); /** @@ -181,6 +181,6 @@ public interface ImageConsumer * also used to indicate an error in loading or producing the * image. */ - public abstract void imageComplete(int status); + void imageComplete(int status); } diff --git a/libjava/java/awt/image/ImageObserver.java b/libjava/java/awt/image/ImageObserver.java index 6c4673e..738e08a 100644 --- a/libjava/java/awt/image/ImageObserver.java +++ b/libjava/java/awt/image/ImageObserver.java @@ -56,7 +56,7 @@ public interface ImageObserver * * @see #imageUpdate */ - public static final int WIDTH = 1; + int WIDTH = 1; /** * The height of the image has been provided as the @@ -64,7 +64,7 @@ public interface ImageObserver * * @see #imageUpdate */ - public static final int HEIGHT = 2; + int HEIGHT = 2; /** * The properties of the image have been provided. @@ -72,7 +72,7 @@ public interface ImageObserver * @see #imageUpdate * @see java.awt.Image#getProperty (java.lang.String, java.awt.image.ImageObserver) */ - public static final int PROPERTIES = 4; + int PROPERTIES = 4; /** * More pixels are now available for drawing a scaled variation of @@ -80,7 +80,7 @@ public interface ImageObserver * * @see #imageUpdate */ - public static final int SOMEBITS = 8; + int SOMEBITS = 8; /** * All the pixels needed to draw a complete frame of a multi-frame @@ -88,28 +88,28 @@ public interface ImageObserver * * @see #imageUpdate */ - public static final int FRAMEBITS = 16; + int FRAMEBITS = 16; /** * An image with a single frame, a static image, is complete. * * @see #imageUpdate */ - public static final int ALLBITS = 32; + int ALLBITS = 32; /** * An error was encountered while producing the image. * * @see #imageUpdate */ - public static final int ERROR = 64; + int ERROR = 64; /** * Production of the image was aborted. * * @see #imageUpdate */ - public static final int ABORT = 128; + int ABORT = 128; /** * This is a callback method for an asynchronous image producer to @@ -124,6 +124,6 @@ public interface ImageObserver * * @see java.awt.Image */ - public abstract boolean imageUpdate(Image image, int flags, int x, + boolean imageUpdate(Image image, int flags, int x, int y, int width, int height); } diff --git a/libjava/java/awt/image/ImageProducer.java b/libjava/java/awt/image/ImageProducer.java index 1bc1736..47530f1 100644 --- a/libjava/java/awt/image/ImageProducer.java +++ b/libjava/java/awt/image/ImageProducer.java @@ -53,19 +53,19 @@ public interface ImageProducer * Used to register an <code>ImageConsumer</code> with this * <code>ImageProducer</code>. */ - public abstract void addConsumer(ImageConsumer ic); + void addConsumer(ImageConsumer ic); /** * Used to determine if the given <code>ImageConsumer</code> is * already registered with this <code>ImageProducer</code>. */ - public abstract boolean isConsumer(ImageConsumer ic); + boolean isConsumer(ImageConsumer ic); /** * Used to remove an <code>ImageConsumer</code> from the list of * registered consumers for this <code>ImageProducer</code>. */ - public abstract void removeConsumer(ImageConsumer ic); + void removeConsumer(ImageConsumer ic); /** * Used to register an <code>ImageConsumer</code> with this @@ -73,13 +73,13 @@ public interface ImageProducer * reconstruction of the image data to be delivered to all * registered consumers. */ - public abstract void startProduction(ImageConsumer ic); + void startProduction(ImageConsumer ic); /** * Used to register an <code>ImageConsumer</code> with this * <code>ImageProducer</code> and then request that this producer * resend the image data in the order top-down, left-right. */ - public abstract void requestTopDownLeftRightResend(ImageConsumer ic); + void requestTopDownLeftRightResend(ImageConsumer ic); } diff --git a/libjava/java/awt/image/RGBImageFilter.java b/libjava/java/awt/image/RGBImageFilter.java index f682cd8..b15fe25 100644 --- a/libjava/java/awt/image/RGBImageFilter.java +++ b/libjava/java/awt/image/RGBImageFilter.java @@ -149,7 +149,7 @@ public abstract class RGBImageFilter extends ImageFilter int off, int scansize) { - int xp, yp, i; + int xp, yp; for( xp = x; xp < ( x + w); xp++ ) for( yp = y; yp < (y + h); yp++ ) @@ -212,7 +212,7 @@ public abstract class RGBImageFilter extends ImageFilter private void convertColorModelToDefault( int x, int y, int w, int h, ColorModel model, int pixels[], int offset, int scansize) { - int xp, yp, i; + int xp, yp; for( xp = x; xp < ( x + w); xp++ ) for( yp = y; yp < (y + h); yp++ ) diff --git a/libjava/java/awt/image/RasterOp.java b/libjava/java/awt/image/RasterOp.java index 32d9f9e..5796180 100644 --- a/libjava/java/awt/image/RasterOp.java +++ b/libjava/java/awt/image/RasterOp.java @@ -50,6 +50,6 @@ public interface RasterOp { Point2D getPoint2D(Point2D srcPoint, Point2D destPoint); - public RenderingHints getRenderingHints(); + RenderingHints getRenderingHints(); } diff --git a/libjava/java/awt/image/renderable/RenderableImage.java b/libjava/java/awt/image/renderable/RenderableImage.java index f79442e..c953914 100644 --- a/libjava/java/awt/image/renderable/RenderableImage.java +++ b/libjava/java/awt/image/renderable/RenderableImage.java @@ -44,7 +44,8 @@ import java.util.Vector; public interface RenderableImage { - static final String HINTS_OBSERVED = "HINTS_OBSERVED"; + String HINTS_OBSERVED = "HINTS_OBSERVED"; + Vector getSources(); Object getProperty(String name); String[] getPropertyNames(); @@ -56,4 +57,6 @@ public interface RenderableImage RenderedImage createScaledRendering(int w, int h, RenderingHints hints); RenderedImage createDefaultRendering(); RenderedImage createRendering(RenderContext context); + } // interface RenderableImage + |