Code drop from //branches/cupcake/...@124589
diff --git a/awt/javax/imageio/IIOImage.java b/awt/javax/imageio/IIOImage.java
index e17a9fc..e9e5130 100644
--- a/awt/javax/imageio/IIOImage.java
+++ b/awt/javax/imageio/IIOImage.java
@@ -18,6 +18,7 @@
* @author Rustem V. Rafikov
* @version $Revision: 1.3 $
*/
+
package javax.imageio;
import javax.imageio.metadata.IIOMetadata;
@@ -27,33 +28,47 @@
import java.util.List;
/**
- * The IIOImage class combines the image, image's thumbnail and image's metadata.
- * The image can be presented as RenderedImage or Raster object.
+ * The IIOImage class combines the image, image's thumbnail and image's
+ * metadata. The image can be presented as RenderedImage or Raster object.
+ *
+ * @since Android 1.0
*/
public class IIOImage {
- /** The image of this IIOImage. */
+ /**
+ * The image of this IIOImage.
+ */
protected RenderedImage image;
-
- /** The raster of this IIOImage. */
+
+ /**
+ * The raster of this IIOImage.
+ */
protected Raster raster;
-
- /** The list with thumbnails associated with the image. */
+
+ /**
+ * The list with thumbnails associated with the image.
+ */
protected List<? extends BufferedImage> thumbnails;
-
- /** The metadata associated with the image. */
+
+ /**
+ * The metadata associated with the image.
+ */
protected IIOMetadata metadata;
/**
- * Instantiates a new IIOImage with the specified RenderedImage,
- * list of thumbnails and metadata.
+ * Instantiates a new IIOImage with the specified RenderedImage, list of
+ * thumbnails and metadata.
*
- * @param image the image specified by RenderedImage.
- * @param thumbnails the list of BufferedImage objects which
- * represent the thumbnails of the image.
- * @param metadata the metadata of the image.
+ * @param image
+ * the image specified by RenderedImage.
+ * @param thumbnails
+ * the list of BufferedImage objects which represent the
+ * thumbnails of the image.
+ * @param metadata
+ * the metadata of the image.
*/
- public IIOImage(RenderedImage image, List<? extends BufferedImage> thumbnails, IIOMetadata metadata) {
+ public IIOImage(RenderedImage image, List<? extends BufferedImage> thumbnails,
+ IIOMetadata metadata) {
if (image == null) {
throw new IllegalArgumentException("image should not be NULL");
}
@@ -64,13 +79,16 @@
}
/**
- * Instantiates a new IIOImage with the specified Raster, list of
- * thumbnails and metadata.
+ * Instantiates a new IIOImage with the specified Raster, list of thumbnails
+ * and metadata.
*
- * @param raster the Raster.
- * @param thumbnails the list of BufferedImage objects which
- * represent the thumbnails of Raster data.
- * @param metadata the metadata.
+ * @param raster
+ * the Raster.
+ * @param thumbnails
+ * the list of BufferedImage objects which represent the
+ * thumbnails of Raster data.
+ * @param metadata
+ * the metadata.
*/
public IIOImage(Raster raster, List<? extends BufferedImage> thumbnails, IIOMetadata metadata) {
if (raster == null) {
@@ -83,11 +101,11 @@
}
/**
- * Gets the RenderedImage object or returns null if this IIOImage
- * object is associated with a Raster.
+ * Gets the RenderedImage object or returns null if this IIOImage object is
+ * associated with a Raster.
*
- * @return the RenderedImage object or null if this IIOImage
- * object is associated with a Raster.
+ * @return the RenderedImage object or null if this IIOImage object is
+ * associated with a Raster.
*/
public RenderedImage getRenderedImage() {
return image;
@@ -96,7 +114,8 @@
/**
* Sets the RenderedImage to this IIOImage object.
*
- * @param image the RenderedImage to be set to this IIOImage.
+ * @param image
+ * the RenderedImage to be set to this IIOImage.
*/
public void setRenderedImage(RenderedImage image) {
if (image == null) {
@@ -107,11 +126,11 @@
}
/**
- * Returns true if the IIOImage object associated with a Raster, or
- * false if it's associated with a RenderedImage.
+ * Returns true if the IIOImage object associated with a Raster, or false if
+ * it's associated with a RenderedImage.
*
- * @return true if the IIOImage object associated with a Raster, or
- * false if it's associated with a RenderedImage.
+ * @return true, if the IIOImage object associated with a Raster, or false
+ * if it's associated with a RenderedImage.
*/
public boolean hasRaster() {
return raster != null;
@@ -121,8 +140,8 @@
* Gets the Raster object or returns null if this IIOImage object is
* associated with a RenderedImage.
*
- * @return the Raster or null if this IIOImage object
- * is associated with a RenderedImage.
+ * @return the Raster or null if this IIOImage object is associated with a
+ * RenderedImage.
*/
public Raster getRaster() {
return raster;
@@ -131,7 +150,8 @@
/**
* Sets the Raster to the IIOImage.
*
- * @param raster the new Raster to the IIOImage.
+ * @param raster
+ * the new Raster to the IIOImage.
*/
public void setRaster(Raster raster) {
if (raster == null) {
@@ -153,8 +173,8 @@
/**
* Gets the thumbnail with the specified index in the list.
*
- * @param index the index of the thumbnail in the list.
- *
+ * @param index
+ * the index of the thumbnail in the list.
* @return the thumbnail with the specified index in the list.
*/
public BufferedImage getThumbnail(int index) {
@@ -176,8 +196,8 @@
/**
* Sets the list of thumbnails images to this IIOImage object.
*
- * @param thumbnails the list of BufferedImage which represent
- * thumbnails.
+ * @param thumbnails
+ * the list of BufferedImage which represent thumbnails.
*/
public void setThumbnails(List<? extends BufferedImage> thumbnails) {
this.thumbnails = thumbnails;
@@ -195,7 +215,8 @@
/**
* Sets the metadata to this IIOImage object.
*
- * @param metadata the IIOMetadata, or null.
+ * @param metadata
+ * the IIOMetadata, or null.
*/
public void setMetadata(IIOMetadata metadata) {
this.metadata = metadata;