Code drop from //branches/cupcake/...@124589
diff --git a/awt/javax/imageio/stream/FileCacheImageInputStream.java b/awt/javax/imageio/stream/FileCacheImageInputStream.java
index 47bc189..710ac66 100644
--- a/awt/javax/imageio/stream/FileCacheImageInputStream.java
+++ b/awt/javax/imageio/stream/FileCacheImageInputStream.java
@@ -15,38 +15,43 @@
* limitations under the License.
*/
-
package javax.imageio.stream;
import java.io.*;
/**
- * The FileCacheImageInputStream class is an implementation of
- * ImageInputStream which reads from its InputStream
- * and uses a temporary file as a cache.
+ * The FileCacheImageInputStream class is an implementation of ImageInputStream
+ * which reads from its InputStream and uses a temporary file as a cache.
+ *
+ * @since Android 1.0
*/
public class FileCacheImageInputStream extends ImageInputStreamImpl {
-
- /** The is. */
- private InputStream is;
-
- /** The file. */
- private File file;
-
- /** The raf. */
- private RandomAccessFile raf;
-
/**
- * Instantiates a new FileCacheImageInputStream from
- * the specified InputStream and using the specified
- * File as its cache directory.
+ * The is.
+ */
+ private InputStream is;
+
+ /**
+ * The file.
+ */
+ private File file;
+
+ /**
+ * The raf.
+ */
+ private RandomAccessFile raf;
+
+ /**
+ * Instantiates a new FileCacheImageInputStream from the specified
+ * InputStream and using the specified File as its cache directory.
*
- * @param stream the InputStream for reading.
- * @param cacheDir the cache directory where the chache file
- * will be created.
- *
- * @throws IOException Signals that an I/O exception has occurred.
+ * @param stream
+ * the InputStream for reading.
+ * @param cacheDir
+ * the cache directory where the cache file will be created.
+ * @throws IOException
+ * if an I/O exception has occurred.
*/
public FileCacheImageInputStream(InputStream stream, File cacheDir) throws IOException {
if (stream == null) {
@@ -55,7 +60,8 @@
is = stream;
if (cacheDir == null || cacheDir.isDirectory()) {
- file = File.createTempFile(FileCacheImageOutputStream.IIO_TEMP_FILE_PREFIX, null, cacheDir);
+ file = File.createTempFile(FileCacheImageOutputStream.IIO_TEMP_FILE_PREFIX, null,
+ cacheDir);
file.deleteOnExit();
} else {
throw new IllegalArgumentException("Not a directory!");
diff --git a/awt/javax/imageio/stream/FileCacheImageOutputStream.java b/awt/javax/imageio/stream/FileCacheImageOutputStream.java
index ae48585..135afab 100644
--- a/awt/javax/imageio/stream/FileCacheImageOutputStream.java
+++ b/awt/javax/imageio/stream/FileCacheImageOutputStream.java
@@ -15,7 +15,6 @@
* limitations under the License.
*/
-
package javax.imageio.stream;
import java.io.IOException;
@@ -24,35 +23,48 @@
import java.io.RandomAccessFile;
/**
- * The FileCacheImageOutputStream class is an implementation of
- * ImageOutputStream that writes to its OutputStream
- * using a temporary file as a cache.
+ * The FileCacheImageOutputStream class is an implementation of
+ * ImageOutputStream that writes to its OutputStream using a temporary file as a
+ * cache.
+ *
+ * @since Android 1.0
*/
public class FileCacheImageOutputStream extends ImageOutputStreamImpl {
-
- /** The Constant IIO_TEMP_FILE_PREFIX. */
+
+ /**
+ * The Constant IIO_TEMP_FILE_PREFIX.
+ */
static final String IIO_TEMP_FILE_PREFIX = "iioCache";
-
- /** The Constant MAX_BUFFER_LEN. */
+
+ /**
+ * The Constant MAX_BUFFER_LEN.
+ */
static final int MAX_BUFFER_LEN = 1048575; // 1 MB - is it not too much?
- /** The os. */
+ /**
+ * The os.
+ */
private OutputStream os;
-
- /** The file. */
+
+ /**
+ * The file.
+ */
private File file;
-
- /** The raf. */
+
+ /**
+ * The raf.
+ */
private RandomAccessFile raf;
/**
* Instantiates a FileCacheImageOutputStream.
*
- * @param stream the OutputStream for writing.
- * @param cacheDir the cache directory where the chache file
- * will be created.
- *
- * @throws IOException Signals that an I/O exception has occurred.
+ * @param stream
+ * the OutputStream for writing.
+ * @param cacheDir
+ * the cache directory where the cache file will be created.
+ * @throws IOException
+ * if an I/O exception has occurred.
*/
public FileCacheImageOutputStream(OutputStream stream, File cacheDir) throws IOException {
if (stream == null) {
@@ -96,7 +108,7 @@
@Override
public void write(int b) throws IOException {
flushBits(); // See the flushBits method description
-
+
raf.write(b);
streamPos++;
}
@@ -148,7 +160,7 @@
} else {
byte buffer[] = new byte[MAX_BUFFER_LEN];
while (bytesToRead > 0) {
- int count = (int) Math.min(MAX_BUFFER_LEN, bytesToRead);
+ int count = (int)Math.min(MAX_BUFFER_LEN, bytesToRead);
raf.readFully(buffer, 0, count);
os.write(buffer, 0, count);
bytesToRead -= count;
@@ -169,7 +181,7 @@
}
raf.seek(pos);
- streamPos = raf.getFilePointer();
+ streamPos = raf.getFilePointer();
bitOffset = 0;
}
@@ -177,7 +189,7 @@
public long length() {
try {
return raf.length();
- } catch(IOException e) {
+ } catch (IOException e) {
return -1L;
}
}
diff --git a/awt/javax/imageio/stream/FileImageInputStream.java b/awt/javax/imageio/stream/FileImageInputStream.java
index 6680ae0..b9b6002 100644
--- a/awt/javax/imageio/stream/FileImageInputStream.java
+++ b/awt/javax/imageio/stream/FileImageInputStream.java
@@ -15,7 +15,6 @@
* limitations under the License.
*/
-
package javax.imageio.stream;
import java.io.IOException;
@@ -24,24 +23,31 @@
import java.io.FileNotFoundException;
/**
- * The FileImageInputStream class implements ImageInputStream
- * and obtains its input data from a File or RandomAccessFile.
+ * The FileImageInputStream class implements ImageInputStream and obtains its
+ * input data from a File or RandomAccessFile.
+ *
+ * @since Android 1.0
*/
public class FileImageInputStream extends ImageInputStreamImpl {
-
- /** The raf. */
+
+ /**
+ * The raf.
+ */
RandomAccessFile raf;
/**
* Instantiates a new FileImageInputStream from the specified File.
*
- * @param f the File of input data.
- *
- * @throws FileNotFoundException if the specified file
- * doesn't exist.
- * @throws IOException Signals that an I/O exception has occurred.
+ * @param f
+ * the File of input data.
+ * @throws FileNotFoundException
+ * if the specified file doesn't exist.
+ * @throws IOException
+ * if an I/O exception has occurred.
*/
- @SuppressWarnings({"DuplicateThrows"})
+ @SuppressWarnings( {
+ "DuplicateThrows"
+ })
public FileImageInputStream(File f) throws FileNotFoundException, IOException {
if (f == null) {
throw new IllegalArgumentException("f == null!");
@@ -51,10 +57,11 @@
}
/**
- * Instantiates a new FileImageInputStream from the specified
+ * Instantiates a new FileImageInputStream from the specified
* RandomAccessFile.
*
- * @param raf the RandomAccessFile of input data.
+ * @param raf
+ * the RandomAccessFile of input data.
*/
public FileImageInputStream(RandomAccessFile raf) {
if (raf == null) {
@@ -91,7 +98,7 @@
public long length() {
try {
return raf.length();
- } catch(IOException e) {
+ } catch (IOException e) {
return -1L;
}
}
diff --git a/awt/javax/imageio/stream/FileImageOutputStream.java b/awt/javax/imageio/stream/FileImageOutputStream.java
index eaafe14..2730ba6 100644
--- a/awt/javax/imageio/stream/FileImageOutputStream.java
+++ b/awt/javax/imageio/stream/FileImageOutputStream.java
@@ -18,39 +18,44 @@
* @author Rustem V. Rafikov
* @version $Revision: 1.3 $
*/
+
package javax.imageio.stream;
import java.io.*;
/**
- * The FileImageOutputStream class implements ImageOutputStream
- * and writes the output data to a File or RandomAccessFile.
+ * The FileImageOutputStream class implements ImageOutputStream and writes the
+ * output data to a File or RandomAccessFile.
+ *
+ * @since Android 1.0
*/
public class FileImageOutputStream extends ImageOutputStreamImpl {
- /** The file. */
+ /**
+ * The file.
+ */
RandomAccessFile file;
/**
- * Instantiates a new FileImageOutputStream with the specified
- * File.
+ * Instantiates a new FileImageOutputStream with the specified File.
*
- * @param f the output File.
- *
- * @throws FileNotFoundException if the file not found.
- * @throws IOException Signals that an I/O exception has occurred.
+ * @param f
+ * the output File.
+ * @throws FileNotFoundException
+ * if the file not found.
+ * @throws IOException
+ * if an I/O exception has occurred.
*/
public FileImageOutputStream(File f) throws FileNotFoundException, IOException {
- this(f != null
- ? new RandomAccessFile(f, "rw")
- : null);
+ this(f != null ? new RandomAccessFile(f, "rw") : null);
}
/**
* Instantiates a new FileImageOutputStream with the specified
* RandomAccessFile.
*
- * @param raf the output RandomAccessFile.
+ * @param raf
+ * the output RandomAccessFile.
*/
public FileImageOutputStream(RandomAccessFile raf) {
if (raf == null) {
@@ -102,14 +107,14 @@
try {
checkClosed();
return file.length();
- } catch(IOException e) {
+ } catch (IOException e) {
return super.length(); // -1L
}
}
@Override
public void seek(long pos) throws IOException {
- //-- checkClosed() is performed in super.seek()
+ // -- checkClosed() is performed in super.seek()
super.seek(pos);
file.seek(pos);
streamPos = file.getFilePointer();
diff --git a/awt/javax/imageio/stream/IIOByteBuffer.java b/awt/javax/imageio/stream/IIOByteBuffer.java
index 961a7b3..867d808 100644
--- a/awt/javax/imageio/stream/IIOByteBuffer.java
+++ b/awt/javax/imageio/stream/IIOByteBuffer.java
@@ -18,35 +18,46 @@
* @author Sergey I. Salishev
* @version $Revision: 1.2 $
*/
+
package javax.imageio.stream;
-/**
-* @author Sergey I. Salishev
-* @version $Revision: 1.2 $
-*/
+//
+// @author Sergey I. Salishev
+// @version $Revision: 1.2 $
+//
/**
- * The IIOByteBuffer class represents a byte array with offset and
- * length that is used by ImageInputStream for obtaining a sequence
- * of bytes.
+ * The IIOByteBuffer class represents a byte array with offset and length that
+ * is used by ImageInputStream for obtaining a sequence of bytes.
+ *
+ * @since Android 1.0
*/
public class IIOByteBuffer {
-
- /** The data. */
+
+ /**
+ * The data.
+ */
private byte[] data;
-
- /** The offset. */
+
+ /**
+ * The offset.
+ */
private int offset;
-
- /** The length. */
+
+ /**
+ * The length.
+ */
private int length;
/**
* Instantiates a new IIOByteBuffer.
*
- * @param data the byte array.
- * @param offset the offset in the array.
- * @param length the length of array.
+ * @param data
+ * the byte array.
+ * @param offset
+ * the offset in the array.
+ * @param length
+ * the length of array.
*/
public IIOByteBuffer(byte[] data, int offset, int length) {
this.data = data;
@@ -84,7 +95,8 @@
/**
* Sets the new data array to this IIOByteBuffer object.
*
- * @param data the new data array.
+ * @param data
+ * the new data array.
*/
public void setData(byte[] data) {
this.data = data;
@@ -93,7 +105,8 @@
/**
* Sets the length of data which will be used.
*
- * @param length the new length.
+ * @param length
+ * the new length.
*/
public void setLength(int length) {
this.length = length;
@@ -102,10 +115,10 @@
/**
* Sets the offset in the data array of this IIOByteBuffer.
*
- * @param offset the new offset.
+ * @param offset
+ * the new offset.
*/
public void setOffset(int offset) {
this.offset = offset;
}
}
-
diff --git a/awt/javax/imageio/stream/ImageInputStream.java b/awt/javax/imageio/stream/ImageInputStream.java
index 771e9ff..3dec5d2 100644
--- a/awt/javax/imageio/stream/ImageInputStream.java
+++ b/awt/javax/imageio/stream/ImageInputStream.java
@@ -18,6 +18,7 @@
* @author Rustem V. Rafikov
* @version $Revision: 1.2 $
*/
+
package javax.imageio.stream;
import java.io.DataInput;
@@ -25,21 +26,24 @@
import java.nio.ByteOrder;
/**
- * The ImageInputStream represents input stream interface that is
- * used by ImageReaders.
+ * The ImageInputStream represents input stream interface that is used by
+ * ImageReaders.
+ *
+ * @since Android 1.0
*/
public interface ImageInputStream extends DataInput {
/**
- * Sets the specified byte order for reading of data values
- * from this stream.
+ * Sets the specified byte order for reading of data values from this
+ * stream.
*
- * @param byteOrder the byte order.
+ * @param byteOrder
+ * the byte order.
*/
void setByteOrder(ByteOrder byteOrder);
/**
- * Gets the byte order.
+ * Gets the byte order.
*
* @return the byte order.
*/
@@ -48,158 +52,151 @@
/**
* Reads a byte from the stream.
*
- * @return the byte of the stream, or -1 for EOF indicating.
- *
- * @throws IOException Signals that an I/O exception has occurred.
+ * @return the byte of the stream, or -1 for EOF indicating.
+ * @throws IOException
+ * if an I/O exception has occurred.
*/
int read() throws IOException;
/**
- * Reads number of bytes which is equal to the specified array's length
- * and stores a result to this array.
+ * Reads number of bytes which is equal to the specified array's length and
+ * stores a result to this array.
*
- * @param b the byte array.
- *
+ * @param b
+ * the byte array.
* @return the number of read bytes, or -1 indicated EOF.
- *
- * @throws IOException Signals that an I/O exception has occurred.
+ * @throws IOException
+ * if an I/O exception has occurred.
*/
int read(byte[] b) throws IOException;
/**
- * Reads the number of bytes specified by len parameter from
- * the stream and stores a result to the specified array
- * with the specified offset.
+ * Reads the number of bytes specified by len parameter from the stream and
+ * stores a result to the specified array with the specified offset.
*
- * @param b the byte array.
- * @param off the offset.
- * @param len the number of bytes to be read.
- *
+ * @param b
+ * the byte array.
+ * @param off
+ * the offset.
+ * @param len
+ * the number of bytes to be read.
* @return the number of read bytes, or -1 indicated EOF.
- *
- * @throws IOException Signals that an I/O exception has occurred.
+ * @throws IOException
+ * if an I/O exception has occurred.
*/
int read(byte[] b, int off, int len) throws IOException;
/**
- * Reads the number of bytes specified by len parameter
- * from the stream, and modifies the specified IIOByteBuffer
- * with the byte array, offset, and length.
+ * Reads the number of bytes specified by len parameter from the stream, and
+ * modifies the specified IIOByteBuffer with the byte array, offset, and
+ * length.
*
- * @param buf the IIOByteBuffer.
- * @param len the number of bytes to be read.
- *
- * @throws IOException Signals that an I/O exception has occurred.
+ * @param buf
+ * the IIOByteBuffer.
+ * @param len
+ * the number of bytes to be read.
+ * @throws IOException
+ * if an I/O exception has occurred.
*/
void readBytes(IIOByteBuffer buf, int len) throws IOException;
/**
- * Reads a byte from the stream and returns a boolean true value
- * if it is non zero, false if it is zero.
+ * Reads a byte from the stream and returns a boolean true value if it is
+ * non zero, false if it is zero.
*
- * @return a boolean value for read byte.
- *
- * @throws IOException Signals that an I/O exception has occurred.
+ * @return the boolean value for read byte.
+ * @throws IOException
+ * if an I/O exception has occurred.
*/
boolean readBoolean() throws IOException;
/**
- * Reads a byte from the stream and returns its value
- * as signed byte.
+ * Reads a byte from the stream and returns its value as signed byte.
*
- * @return a signed byte value for read byte.
- *
- * @throws IOException Signals that an I/O exception has occurred.
+ * @return the signed byte value for read byte.
+ * @throws IOException
+ * if an I/O exception has occurred.
*/
byte readByte() throws IOException;
/**
- * Reads a byte from the stream and returns its value
- * as int.
+ * Reads a byte from the stream and returns its value as an integer.
*
- * @return a unsigned byte value for read byte as int.
- *
- * @throws IOException Signals that an I/O exception has occurred.
+ * @return the unsigned byte value for read byte as an integer.
+ * @throws IOException
+ * if an I/O exception has occurred.
*/
int readUnsignedByte() throws IOException;
/**
- * Reads 2 bytes from the stream, and returns the result
- * as a short.
+ * Reads 2 bytes from the stream, and returns the result as a short.
*
* @return the signed short value from the stream.
- *
- * @throws IOException Signals that an I/O exception has occurred.
+ * @throws IOException
+ * if an I/O exception has occurred.
*/
short readShort() throws IOException;
/**
- * Reads 2 bytes from the stream and returns its value
- * as an unsigned short.
+ * Reads 2 bytes from the stream and returns its value as an unsigned short.
*
- * @return a unsigned short value coded in an int.
- *
- * @throws IOException Signals that an I/O exception has occurred.
+ * @return a unsigned short value coded in an integer.
+ * @throws IOException
+ * if an I/O exception has occurred.
*/
int readUnsignedShort() throws IOException;
/**
- * Reads 2 bytes from the stream and returns their
- * unsigned char value.
+ * Reads 2 bytes from the stream and returns their unsigned char value.
*
* @return the unsigned char value.
- *
- * @throws IOException Signals that an I/O exception has occurred.
+ * @throws IOException
+ * if an I/O exception has occurred.
*/
char readChar() throws IOException;
/**
- * Reads 4 bytes from the stream, and returns the result
- * as an int.
+ * Reads 4 bytes from the stream, and returns the result as an integer.
*
- * @return the signed int value from the stream.
- *
- * @throws IOException Signals that an I/O exception has occurred.
+ * @return the signed integer value from the stream.
+ * @throws IOException
+ * if an I/O exception has occurred.
*/
int readInt() throws IOException;
/**
- * Reads 4 bytes from the stream and returns its value
- * as long.
+ * Reads 4 bytes from the stream and returns its value as long.
*
- * @return a unsigned int value as long.
- *
- * @throws IOException Signals that an I/O exception has occurred.
+ * @return the unsigned integer value as long.
+ * @throws IOException
+ * if an I/O exception has occurred.
*/
long readUnsignedInt() throws IOException;
/**
- * Reads 8 bytes from the stream, and returns the result
- * as a long.
+ * Reads 8 bytes from the stream, and returns the result as a long.
*
* @return the long value from the stream.
- *
- * @throws IOException Signals that an I/O exception has occurred.
+ * @throws IOException
+ * if an I/O exception has occurred.
*/
long readLong() throws IOException;
/**
- * Reads 4 bytes from the stream, and returns the result
- * as a float.
+ * Reads 4 bytes from the stream, and returns the result as a float.
*
* @return the float value from the stream.
- *
- * @throws IOException Signals that an I/O exception has occurred.
+ * @throws IOException
+ * if an I/O exception has occurred.
*/
float readFloat() throws IOException;
/**
- * Reads 8 bytes from the stream, and returns the result
- * as a double.
+ * Reads 8 bytes from the stream, and returns the result as a double.
*
* @return the double value from the stream.
- *
- * @throws IOException Signals that an I/O exception has occurred.
+ * @throws IOException
+ * if an I/O exception has occurred.
*/
double readDouble() throws IOException;
@@ -207,120 +204,134 @@
* Reads a line from the stream.
*
* @return the string contained the line from the stream.
- *
- * @throws IOException Signals that an I/O exception has occurred.
+ * @throws IOException
+ * if an I/O exception has occurred.
*/
String readLine() throws IOException;
/**
- * Reads bytes from the stream in a string that has been encoded
- * in a modified UTF-8 format.
+ * Reads bytes from the stream in a string that has been encoded in a
+ * modified UTF-8 format.
*
* @return the string read from stream and modified UTF-8 format.
- *
- * @throws IOException Signals that an I/O exception has occurred.
+ * @throws IOException
+ * if an I/O exception has occurred.
*/
String readUTF() throws IOException;
/**
- * Reads the specified number of bytes from the stream,
- * and stores the result into the specified array starting at
- * the specified index offset.
+ * Reads the specified number of bytes from the stream, and stores the
+ * result into the specified array starting at the specified index offset.
*
- * @param b the byte array.
- * @param off the offset.
- * @param len the number of bytes to be read.
- *
- * @throws IOException Signals that an I/O exception has occurred.
+ * @param b
+ * the byte array.
+ * @param off
+ * the offset.
+ * @param len
+ * the number of bytes to be read.
+ * @throws IOException
+ * if an I/O exception has occurred.
*/
void readFully(byte[] b, int off, int len) throws IOException;
/**
- * Reads number of bytes from the stream which is equal to
- * the specified array's length, and stores them into
- * this array.
+ * Reads number of bytes from the stream which is equal to the specified
+ * array's length, and stores them into this array.
*
- * @param b the byte array.
- *
- * @throws IOException Signals that an I/O exception has occurred.
+ * @param b
+ * the byte array.
+ * @throws IOException
+ * if an I/O exception has occurred.
*/
void readFully(byte[] b) throws IOException;
/**
- * Reads the specified number of shorts from the stream,
- * and stores the result into the specified array starting at
- * the specified index offset.
+ * Reads the specified number of shorts from the stream, and stores the
+ * result into the specified array starting at the specified index offset.
*
- * @param s the short array.
- * @param off the offset.
- * @param len the number of shorts to be read.
- *
- * @throws IOException Signals that an I/O exception has occurred.
+ * @param s
+ * the short array.
+ * @param off
+ * the offset.
+ * @param len
+ * the number of shorts to be read.
+ * @throws IOException
+ * if an I/O exception has occurred.
*/
void readFully(short[] s, int off, int len) throws IOException;
/**
- * Reads the specified number of chars from the stream,
- * and stores the result into the specified array starting at
- * the specified index offset.
+ * Reads the specified number of chars from the stream, and stores the
+ * result into the specified array starting at the specified index offset.
*
- * @param c the char array.
- * @param off the offset.
- * @param len the number of chars to be read.
- *
- * @throws IOException Signals that an I/O exception has occurred.
+ * @param c
+ * the char array.
+ * @param off
+ * the offset.
+ * @param len
+ * the number of chars to be read.
+ * @throws IOException
+ * if an I/O exception has occurred.
*/
void readFully(char[] c, int off, int len) throws IOException;
/**
- * Reads the specified number of ints from the stream,
- * and stores the result into the specified array starting at
- * the specified index offset.
+ * Reads the specified number of integer from the stream, and stores the
+ * result into the specified array starting at the specified index offset.
*
- * @param i the int array.
- * @param off the offset.
- * @param len the number of ints to be read.
- *
- * @throws IOException Signals that an I/O exception has occurred.
+ * @param i
+ * the integer array.
+ * @param off
+ * the offset.
+ * @param len
+ * the number of integer to be read.
+ * @throws IOException
+ * if an I/O exception has occurred.
*/
void readFully(int[] i, int off, int len) throws IOException;
/**
- * Reads the specified number of longs from the stream,
- * and stores the result into the specified array starting at
- * the specified index offset.
+ * Reads the specified number of longs from the stream, and stores the
+ * result into the specified array starting at the specified index offset.
*
- * @param l the long array.
- * @param off the offset.
- * @param len the number of longs to be read.
- *
- * @throws IOException Signals that an I/O exception has occurred.
+ * @param l
+ * the long array.
+ * @param off
+ * the offset.
+ * @param len
+ * the number of longs to be read.
+ * @throws IOException
+ * if an I/O exception has occurred.
*/
void readFully(long[] l, int off, int len) throws IOException;
/**
- * Reads the specified number of floats from the stream,
- * and stores the result into the specified array starting at
- * the specified index offset.
+ * Reads the specified number of floats from the stream, and stores the
+ * result into the specified array starting at the specified index offset.
*
- * @param f the float array.
- * @param off the offset.
- * @param len the number of floats to be read.
- *
- * @throws IOException Signals that an I/O exception has occurred.
+ * @param f
+ * the float array.
+ * @param off
+ * the offset.
+ * @param len
+ * the number of floats to be read.
+ * @throws IOException
+ * if an I/O exception has occurred.
*/
void readFully(float[] f, int off, int len) throws IOException;
/**
- * Reads the specified number of doubles from the stream,
- * and stores the result into the specified array starting at
- * the specified index offset.
+ * Reads the specified number of doubles from the stream, and stores the
+ * result into the specified array starting at the specified index offset.
*
- * @param d the double array.
- * @param off the offset.
- * @param len the number of doubles to be read.
- *
- * @throws IOException Signals that an I/O exception has occurred.
+ * @param d
+ * the double array.
+ * @param off
+ * the offset.
+ * @param len
+ * the number of doubles to be read.
+ * @throws IOException
+ * if an I/O exception has occurred.
*/
void readFully(double[] d, int off, int len) throws IOException;
@@ -328,8 +339,8 @@
* Gets the stream position.
*
* @return the stream position.
- *
- * @throws IOException Signals that an I/O exception has occurred.
+ * @throws IOException
+ * if an I/O exception has occurred.
*/
long getStreamPosition() throws IOException;
@@ -337,17 +348,18 @@
* Gets the bit offset.
*
* @return the bit offset.
- *
- * @throws IOException Signals that an I/O exception has occurred.
+ * @throws IOException
+ * if an I/O exception has occurred.
*/
int getBitOffset() throws IOException;
/**
- * Sets the bit offset to an integer between 0 and 7.
+ * Sets the bit offset to an integer between 0 and 7.
*
- * @param bitOffset the bit offset.
- *
- * @throws IOException Signals that an I/O exception has occurred.
+ * @param bitOffset
+ * the bit offset.
+ * @throws IOException
+ * if an I/O exception has occurred.
*/
void setBitOffset(int bitOffset) throws IOException;
@@ -355,90 +367,94 @@
* Reads a bit from the stream and returns the value 0 or 1.
*
* @return the value of single bit: 0 or 1.
- *
- * @throws IOException Signals that an I/O exception has occurred.
+ * @throws IOException
+ * if an I/O exception has occurred.
*/
int readBit() throws IOException;
/**
* Read the specified number of bits and returns their values as long.
*
- * @param numBits the number of bits to be read.
- *
+ * @param numBits
+ * the number of bits to be read.
* @return the bit string as a long.
- *
- * @throws IOException Signals that an I/O exception has occurred.
+ * @throws IOException
+ * if an I/O exception has occurred.
*/
long readBits(int numBits) throws IOException;
/**
- * Returns the length of the stream.
- *
- * @return the length of the stream, or -1 if unknown.
+ * Returns the length of the stream.
*
- * @throws IOException Signals that an I/O exception has occurred.
+ * @return the length of the stream, or -1 if unknown.
+ * @throws IOException
+ * if an I/O exception has occurred.
*/
long length() throws IOException;
/**
- * Skipes the specified number of bytes by moving stream position.
+ * Skips the specified number of bytes by moving stream position.
*
- * @param n the number of bytes.
- *
+ * @param n
+ * the number of bytes.
* @return the actual skipped number of bytes.
- *
- * @throws IOException Signals that an I/O exception has occurred.
+ * @throws IOException
+ * if an I/O exception has occurred.
*/
int skipBytes(int n) throws IOException;
/**
- * Skipes the specified number of bytes by moving stream position.
+ * Skips the specified number of bytes by moving stream position.
*
- * @param n the number of bytes.
- *
+ * @param n
+ * the number of bytes.
* @return the actual skipped number of bytes.
- *
- * @throws IOException Signals that an I/O exception has occurred.
+ * @throws IOException
+ * if an I/O exception has occurred.
*/
long skipBytes(long n) throws IOException;
/**
- * Sets the current stream position to the specified location.
+ * Sets the current stream position to the specified location.
*
- * @param pos a file pointer position.
- *
- * @throws IOException Signals that an I/O exception has occurred.
+ * @param pos
+ * a file pointer position.
+ * @throws IOException
+ * if an I/O exception has occurred.
*/
void seek(long pos) throws IOException;
/**
- * Marks a position in the stream to be returned to by a subsequent
- * call to reset.
+ * Marks a position in the stream to be returned to by a subsequent call to
+ * reset.
*/
void mark();
/**
* Returns the file pointer to its previous position.
*
- * @throws IOException Signals that an I/O exception has occurred.
+ * @throws IOException
+ * if an I/O exception has occurred.
*/
void reset() throws IOException;
/**
- * Flushes the initial position in this stream prior to the
- * specified stream position.
+ * Flushes the initial position in this stream prior to the specified stream
+ * position.
*
- * @param pos the position.
- *
- * @throws IOException Signals that an I/O exception has occurred.
+ * @param pos
+ * the position.
+ * @throws IOException
+ * if an I/O exception has occurred.
*/
void flushBefore(long pos) throws IOException;
/**
- * Flushes the initial position in this stream prior to the
- * current stream position.
+ * Flushes the initial position in this stream prior to the current stream
+ * position.
*
- * @throws IOException Signals that an I/O exception has occurred.
+ * @throws IOException
+ * if an I/O exception has occurred.
*/
void flush() throws IOException;
@@ -450,36 +466,37 @@
long getFlushedPosition();
/**
- * Returns true if this ImageInputStream caches data in order
- * to allow seeking backwards.
+ * Returns true if this ImageInputStream caches data in order to allow
+ * seeking backwards.
*
- * @return true if this ImageInputStream caches data in order
- * to allow seeking backwards, false otherwise.
+ * @return true, if this ImageInputStream caches data in order to allow
+ * seeking backwards, false otherwise.
*/
boolean isCached();
/**
- * Returns true if this ImageInputStream caches data in order
- * to allow seeking backwards, and keeps it in memory.
+ * Returns true if this ImageInputStream caches data in order to allow
+ * seeking backwards, and keeps it in memory.
*
- * @return true if this ImageInputStream caches data in order
- * to allow seeking backwards, and keeps it in memory.
+ * @return true, if this ImageInputStream caches data in order to allow
+ * seeking backwards, and keeps it in memory.
*/
boolean isCachedMemory();
/**
- * Returns true if this ImageInputStream caches data in order
- * to allow seeking backwards, and keeps it in a temporary file.
+ * Returns true if this ImageInputStream caches data in order to allow
+ * seeking backwards, and keeps it in a temporary file.
*
- * @return true if this ImageInputStream caches data in order
- * to allow seeking backwards, and keeps it in a temporary file.
+ * @return true, if this ImageInputStream caches data in order to allow
+ * seeking backwards, and keeps it in a temporary file.
*/
boolean isCachedFile();
/**
* Closes this stream.
*
- * @throws IOException Signals that an I/O exception has occurred.
+ * @throws IOException
+ * if an I/O exception has occurred.
*/
void close() throws IOException;
}
diff --git a/awt/javax/imageio/stream/ImageInputStreamImpl.java b/awt/javax/imageio/stream/ImageInputStreamImpl.java
index 83ac13a..d79da41 100644
--- a/awt/javax/imageio/stream/ImageInputStreamImpl.java
+++ b/awt/javax/imageio/stream/ImageInputStreamImpl.java
@@ -18,6 +18,7 @@
* @author Rustem V. Rafikov
* @version $Revision: 1.3 $
*/
+
package javax.imageio.stream;
import java.io.EOFException;
@@ -25,38 +26,54 @@
import java.nio.ByteOrder;
/**
- * The ImageInputStreamImpl abstract class implements
- * the ImageInputStream interface.
+ * The ImageInputStreamImpl abstract class implements the ImageInputStream
+ * interface.
+ *
+ * @since Android 1.0
*/
public abstract class ImageInputStreamImpl implements ImageInputStream {
- /** The byte order. */
+ /**
+ * The byte order.
+ */
protected ByteOrder byteOrder = ByteOrder.BIG_ENDIAN;
- /** The stream position. */
+ /**
+ * The stream position.
+ */
protected long streamPos = 0;
-
- /** The flushed position. */
+
+ /**
+ * The flushed position.
+ */
protected long flushedPos = 0;
-
- /** The bit offset. */
+
+ /**
+ * The bit offset.
+ */
protected int bitOffset = 0;
- /** The closed. */
+ /**
+ * The closed.
+ */
private boolean closed = false;
- /** The position stack. */
+ /**
+ * The position stack.
+ */
private final PositionStack posStack = new PositionStack();
/**
* Instantiates a new ImageInputStreamImpl.
*/
- public ImageInputStreamImpl() {}
+ public ImageInputStreamImpl() {
+ }
/**
* Check if the stream is closed and if true, throws an IOException.
*
- * @throws IOException Signals that the stream is closed.
+ * @throws IOException
+ * if the stream is closed.
*/
protected final void checkClosed() throws IOException {
if (closed) {
@@ -106,7 +123,7 @@
if (b < 0) {
throw new EOFException("EOF reached");
}
- return (byte) b;
+ return (byte)b;
}
public int readUnsignedByte() throws IOException {
@@ -125,58 +142,57 @@
throw new EOFException("EOF reached");
}
- return byteOrder == ByteOrder.BIG_ENDIAN ?
- (short) ((b1 << 8) | (b2 & 0xff)) :
- (short) ((b2 << 8) | (b1 & 0xff));
+ return byteOrder == ByteOrder.BIG_ENDIAN ? (short)((b1 << 8) | (b2 & 0xff))
+ : (short)((b2 << 8) | (b1 & 0xff));
}
public int readUnsignedShort() throws IOException {
- //-- TODO implement
+ // -- TODO implement
throw new UnsupportedOperationException("Not implemented yet");
}
public char readChar() throws IOException {
- //-- TODO implement
+ // -- TODO implement
throw new UnsupportedOperationException("Not implemented yet");
}
public int readInt() throws IOException {
- //-- TODO implement
+ // -- TODO implement
throw new UnsupportedOperationException("Not implemented yet");
}
public long readUnsignedInt() throws IOException {
- //-- TODO implement
+ // -- TODO implement
throw new UnsupportedOperationException("Not implemented yet");
}
public long readLong() throws IOException {
- //-- TODO implement
+ // -- TODO implement
throw new UnsupportedOperationException("Not implemented yet");
}
public float readFloat() throws IOException {
- //-- TODO implement
+ // -- TODO implement
throw new UnsupportedOperationException("Not implemented yet");
}
public double readDouble() throws IOException {
- //-- TODO implement
+ // -- TODO implement
throw new UnsupportedOperationException("Not implemented yet");
}
public String readLine() throws IOException {
- //-- TODO implement
+ // -- TODO implement
throw new UnsupportedOperationException("Not implemented yet");
}
public String readUTF() throws IOException {
- //-- TODO implement
+ // -- TODO implement
throw new UnsupportedOperationException("Not implemented yet");
}
public void readFully(byte[] b, int off, int len) throws IOException {
- //-- TODO implement
+ // -- TODO implement
throw new UnsupportedOperationException("Not implemented yet");
}
@@ -185,32 +201,32 @@
}
public void readFully(short[] s, int off, int len) throws IOException {
- //-- TODO implement
+ // -- TODO implement
throw new UnsupportedOperationException("Not implemented yet");
}
public void readFully(char[] c, int off, int len) throws IOException {
- //-- TODO implement
+ // -- TODO implement
throw new UnsupportedOperationException("Not implemented yet");
}
public void readFully(int[] i, int off, int len) throws IOException {
- //-- TODO implement
+ // -- TODO implement
throw new UnsupportedOperationException("Not implemented yet");
}
public void readFully(long[] l, int off, int len) throws IOException {
- //-- TODO implement
+ // -- TODO implement
throw new UnsupportedOperationException("Not implemented yet");
}
public void readFully(float[] f, int off, int len) throws IOException {
- //-- TODO implement
+ // -- TODO implement
throw new UnsupportedOperationException("Not implemented yet");
}
public void readFully(double[] d, int off, int len) throws IOException {
- //-- TODO implement
+ // -- TODO implement
throw new UnsupportedOperationException("Not implemented yet");
}
@@ -230,12 +246,12 @@
}
public int readBit() throws IOException {
- //-- TODO implement
+ // -- TODO implement
throw new UnsupportedOperationException("Not implemented yet");
}
public long readBits(int numBits) throws IOException {
- //-- TODO implement
+ // -- TODO implement
throw new UnsupportedOperationException("Not implemented yet");
}
@@ -244,12 +260,12 @@
}
public int skipBytes(int n) throws IOException {
- //-- TODO implement
+ // -- TODO implement
throw new UnsupportedOperationException("Not implemented yet");
}
public long skipBytes(long n) throws IOException {
- //-- TODO implement
+ // -- TODO implement
throw new UnsupportedOperationException("Not implemented yet");
}
@@ -272,7 +288,7 @@
}
public void reset() throws IOException {
- //-- TODO bit pos
+ // -- TODO bit pos
if (!posStack.isEmpty()) {
long p = posStack.pop();
if (p < flushedPos) {
@@ -290,7 +306,7 @@
throw new IndexOutOfBoundsException("Trying to flush within already flushed portion");
}
flushedPos = pos;
- //-- TODO implement
+ // -- TODO implement
}
public void flush() throws IOException {
@@ -302,15 +318,15 @@
}
public boolean isCached() {
- return false; //def
+ return false; // def
}
public boolean isCachedMemory() {
- return false; //def
+ return false; // def
}
public boolean isCachedFile() {
- return false; //def
+ return false; // def
}
public void close() throws IOException {
@@ -322,7 +338,8 @@
/**
* Finalizes this object.
*
- * @throws Throwable if an error occurs.
+ * @throws Throwable
+ * if an error occurs.
*/
@Override
protected void finalize() throws Throwable {
@@ -339,25 +356,31 @@
* The Class PositionStack.
*/
private static class PositionStack {
-
- /** The Constant SIZE. */
+
+ /**
+ * The Constant SIZE.
+ */
private static final int SIZE = 10;
- /** The values. */
+ /**
+ * The values.
+ */
private long[] values = new long[SIZE];
-
- /** The pos. */
- private int pos = 0;
+ /**
+ * The pos.
+ */
+ private int pos = 0;
/**
* Push.
*
- * @param v the v
+ * @param v
+ * the v.
*/
void push(long v) {
if (pos >= values.length) {
- ensure(pos+1);
+ ensure(pos + 1);
}
values[pos++] = v;
}
@@ -365,7 +388,7 @@
/**
* Pop.
*
- * @return the long
+ * @return the long.
*/
long pop() {
return values[--pos];
@@ -374,7 +397,7 @@
/**
* Checks if is empty.
*
- * @return true, if is empty
+ * @return true, if is empty.
*/
boolean isEmpty() {
return pos == 0;
@@ -383,7 +406,8 @@
/**
* Ensure.
*
- * @param size the size
+ * @param size
+ * the size.
*/
private void ensure(int size) {
long[] arr = new long[Math.max(2 * values.length, size)];
diff --git a/awt/javax/imageio/stream/ImageOutputStream.java b/awt/javax/imageio/stream/ImageOutputStream.java
index e59b69d..28ec932 100644
--- a/awt/javax/imageio/stream/ImageOutputStream.java
+++ b/awt/javax/imageio/stream/ImageOutputStream.java
@@ -18,252 +18,289 @@
* @author Rustem V. Rafikov
* @version $Revision: 1.2 $
*/
+
package javax.imageio.stream;
import java.io.DataOutput;
import java.io.IOException;
/**
- * The ImageOutputStream represents output stream interface that is
- * used by ImageWriters.
+ * The ImageOutputStream represents output stream interface that is used by
+ * ImageWriters.
+ *
+ * @since Android 1.0
*/
public interface ImageOutputStream extends DataOutput, ImageInputStream {
/**
- * Writes a single byte to the stream at the current position.
+ * Writes a single byte to the stream at the current position.
*
- * @param b the int value, of which the 8 lowest bits
- * will be written.
- *
- * @throws IOException Signals that an I/O exception has occurred.
+ * @param b
+ * the integer value, of which the 8 lowest bits will be written.
+ * @throws IOException
+ * if an I/O exception has occurred.
*/
void write(int b) throws IOException;
/**
* Writes the bytes array to the stream.
*
- * @param b the byte array to be written.
- *
- * @throws IOException Signals that an I/O exception has occurred.
+ * @param b
+ * the byte array to be written.
+ * @throws IOException
+ * if an I/O exception has occurred.
*/
void write(byte[] b) throws IOException;
/**
- * Writes a number of bytes from the specified byte array
- * beggining from the specified offset.
+ * Writes a number of bytes from the specified byte array beginning from the
+ * specified offset.
*
- * @param b the byte array.
- * @param off the offset.
- * @param len the number of bytes to be written.
- *
- * @throws IOException Signals that an I/O exception has occurred.
+ * @param b
+ * the byte array.
+ * @param off
+ * the offset.
+ * @param len
+ * the number of bytes to be written.
+ * @throws IOException
+ * if an I/O exception has occurred.
*/
void write(byte[] b, int off, int len) throws IOException;
/**
- * Writes the specified boolean value to the stream, 1 if it is true,
- * 0 if it is false.
+ * Writes the specified boolean value to the stream, 1 if it is true, 0 if
+ * it is false.
*
- * @param b the boolean value to be written.
- *
- * @throws IOException Signals that an I/O exception has occurred.
+ * @param b
+ * the boolean value to be written.
+ * @throws IOException
+ * if an I/O exception has occurred.
*/
void writeBoolean(boolean b) throws IOException;
/**
- * Writes the 8 lowest bits of the specified int value to the stream.
+ * Writes the 8 lowest bits of the specified integer value to the stream.
*
- * @param b the specified int value.
- *
- * @throws IOException Signals that an I/O exception has occurred.
+ * @param b
+ * the specified integer value.
+ * @throws IOException
+ * if an I/O exception has occurred.
*/
void writeByte(int b) throws IOException;
/**
- * Writes a short value to the output stream.
+ * Writes a short value to the output stream.
*
- * @param v the short value to be written.
- *
- * @throws IOException Signals that an I/O exception has occurred.
+ * @param v
+ * the short value to be written.
+ * @throws IOException
+ * if an I/O exception has occurred.
*/
void writeShort(int v) throws IOException;
/**
- * Writes the 16 lowest bits of the specified int value to the stream.
+ * Writes the 16 lowest bits of the specified integer value to the stream.
*
- * @param v the specified int value.
- *
- * @throws IOException Signals that an I/O exception has occurred.
+ * @param v
+ * the specified integer value.
+ * @throws IOException
+ * if an I/O exception has occurred.
*/
void writeChar(int v) throws IOException;
/**
- * Writes an integer value to the output stream.
+ * Writes an integer value to the output stream.
*
- * @param v the integer value to be written.
- *
- * @throws IOException Signals that an I/O exception has occurred.
+ * @param v
+ * the integer value to be written.
+ * @throws IOException
+ * if an I/O exception has occurred.
*/
void writeInt(int v) throws IOException;
/**
* Write long.
*
- * @param v the long value
- *
- * @throws IOException Signals that an I/O exception has occurred.
+ * @param v
+ * the long value.
+ * @throws IOException
+ * if an I/O exception has occurred.
*/
void writeLong(long v) throws IOException;
/**
- * Writes a float value to the output stream.
+ * Writes a float value to the output stream.
*
- * @param v the float which contains value to be written.
- *
- * @throws IOException Signals that an I/O exception has occurred.
+ * @param v
+ * the float which contains value to be written.
+ * @throws IOException
+ * if an I/O exception has occurred.
*/
void writeFloat(float v) throws IOException;
/**
- * Writes a double value to the output stream.
+ * Writes a double value to the output stream.
*
- * @param v the double which contains value to be written.
- *
- * @throws IOException Signals that an I/O exception has occurred.
+ * @param v
+ * the double which contains value to be written.
+ * @throws IOException
+ * if an I/O exception has occurred.
*/
void writeDouble(double v) throws IOException;
/**
* Writes the specified string to the stream.
*
- * @param s the string to be written.
- *
- * @throws IOException Signals that an I/O exception has occurred.
+ * @param s
+ * the string to be written.
+ * @throws IOException
+ * if an I/O exception has occurred.
*/
void writeBytes(String s) throws IOException;
/**
* Writes the specified String to the output stream.
*
- * @param s the String to be written.
- *
- * @throws IOException Signals that an I/O exception has occurred.
+ * @param s
+ * the String to be written.
+ * @throws IOException
+ * if an I/O exception has occurred.
*/
void writeChars(String s) throws IOException;
/**
- * Writes 2 bytes to the output stream in
- * the modified UTF-8 representation of every character of
- * the specified string.
+ * Writes 2 bytes to the output stream in the modified UTF-8 representation
+ * of every character of the specified string.
*
- * @param s the specified string to be written.
- *
- * @throws IOException Signals that an I/O exception has occurred.
+ * @param s
+ * the specified string to be written.
+ * @throws IOException
+ * if an I/O exception has occurred.
*/
void writeUTF(String s) throws IOException;
/**
- * Flushes the initial position in this stream prior to the
- * specified stream position.
+ * Flushes the initial position in this stream prior to the specified stream
+ * position.
*
- * @param pos the position.
- *
- * @throws IOException Signals that an I/O exception has occurred.
+ * @param pos
+ * the position.
+ * @throws IOException
+ * if an I/O exception has occurred.
*/
void flushBefore(long pos) throws IOException;
-
/**
- * Writes a len number of short values from the specified array
- * to the stream.
+ * Writes a len number of short values from the specified array to the
+ * stream.
*
- * @param s the shorts array to be written.
- * @param off the offset in the char array.
- * @param len the length of chars to be written.
- *
- * @throws IOException Signals that an I/O exception has occurred.
+ * @param s
+ * the shorts array to be written.
+ * @param off
+ * the offset in the char array.
+ * @param len
+ * the length of chars to be written.
+ * @throws IOException
+ * if an I/O exception has occurred.
*/
void writeShorts(short[] s, int off, int len) throws IOException;
/**
* Writes a len number of chars to the stream.
*
- * @param c the char array to be written.
- * @param off the offset in the char array.
- * @param len the length of chars to be written.
- *
- * @throws IOException Signals that an I/O exception has occurred.
+ * @param c
+ * the char array to be written.
+ * @param off
+ * the offset in the char array.
+ * @param len
+ * the length of chars to be written.
+ * @throws IOException
+ * if an I/O exception has occurred.
*/
void writeChars(char[] c, int off, int len) throws IOException;
/**
- * Writes a len number of int values from the specified array
- * to the stream.
+ * Writes a len number of integer values from the specified array to the
+ * stream.
*
- * @param i the int array to be written.
- * @param off the offset in the char array.
- * @param len the length of chars to be written.
- *
- * @throws IOException Signals that an I/O exception has occurred.
+ * @param i
+ * the integer array to be written.
+ * @param off
+ * the offset in the char array.
+ * @param len
+ * the length of chars to be written.
+ * @throws IOException
+ * if an I/O exception has occurred.
*/
void writeInts(int[] i, int off, int len) throws IOException;
/**
- * Writes a len number of long values from the specified array
- * to the stream.
+ * Writes a len number of long values from the specified array to the
+ * stream.
*
- * @param l the long array to be written.
- * @param off the offset in the char array.
- * @param len the length of chars to be written.
- *
- * @throws IOException Signals that an I/O exception has occurred.
+ * @param l
+ * the long array to be written.
+ * @param off
+ * the offset in the char array.
+ * @param len
+ * the length of chars to be written.
+ * @throws IOException
+ * if an I/O exception has occurred.
*/
void writeLongs(long[] l, int off, int len) throws IOException;
/**
- * Writes a len number of float values from the specified array
- * to the stream.
+ * Writes a len number of float values from the specified array to the
+ * stream.
*
- * @param f the float array to be written.
- * @param off the offset in the char array.
- * @param len the length of chars to be written.
- *
- * @throws IOException Signals that an I/O exception has occurred.
+ * @param f
+ * the float array to be written.
+ * @param off
+ * the offset in the char array.
+ * @param len
+ * the length of chars to be written.
+ * @throws IOException
+ * if an I/O exception has occurred.
*/
void writeFloats(float[] f, int off, int len) throws IOException;
/**
- * Writes a len number of double values from the specified array
- * to the stream.
+ * Writes a len number of double values from the specified array to the
+ * stream.
*
- * @param d the double array to be written.
- * @param off the offset in the char array.
- * @param len the length of chars to be written.
- *
- * @throws IOException Signals that an I/O exception has occurred.
+ * @param d
+ * the double array to be written.
+ * @param off
+ * the offset in the char array.
+ * @param len
+ * the length of chars to be written.
+ * @throws IOException
+ * if an I/O exception has occurred.
*/
void writeDoubles(double[] d, int off, int len) throws IOException;
/**
* Writes a single bit at the current position.
*
- * @param bit the an int whose least significant bit is to be
- * written to the stream.
- *
- * @throws IOException Signals that an I/O exception has occurred.
+ * @param bit
+ * the integer whose least significant bit is to be written to
+ * the stream.
+ * @throws IOException
+ * if an I/O exception has occurred.
*/
void writeBit(int bit) throws IOException;
/**
- * Writes a sequence of bits beggining from the current position.
+ * Writes a sequence of bits beginning from the current position.
*
- * @param bits a long value containing the bits to be written,
- * starting with the bit in position numBits - 1 down to the
- * least significant bit.
- * @param numBits the number of significant bit ,
- * it can be between 0 and 64.
- *
- * @throws IOException Signals that an I/O exception has occurred.
+ * @param bits
+ * the long value containing the bits to be written, starting
+ * with the bit in position numBits - 1 down to the least
+ * significant bit.
+ * @param numBits
+ * the number of significant bit, it can be between 0 and 64.
+ * @throws IOException
+ * if an I/O exception has occurred.
*/
void writeBits(long bits, int numBits) throws IOException;
diff --git a/awt/javax/imageio/stream/ImageOutputStreamImpl.java b/awt/javax/imageio/stream/ImageOutputStreamImpl.java
index c3d80fa..0fef78f 100644
--- a/awt/javax/imageio/stream/ImageOutputStreamImpl.java
+++ b/awt/javax/imageio/stream/ImageOutputStreamImpl.java
@@ -18,6 +18,7 @@
* @author Rustem V. Rafikov
* @version $Revision: 1.3 $
*/
+
package javax.imageio.stream;
import java.io.IOException;
@@ -29,16 +30,19 @@
*/
/**
- * The ImageOutputStreamImpl abstract class implements
- * the ImageOutputStream interface.
+ * The ImageOutputStreamImpl abstract class implements the ImageOutputStream
+ * interface.
+ *
+ * @since Android 1.0
*/
-public abstract class ImageOutputStreamImpl extends ImageInputStreamImpl
- implements ImageOutputStream {
+public abstract class ImageOutputStreamImpl extends ImageInputStreamImpl implements
+ ImageOutputStream {
/**
* Instantiates a new ImageOutputStreamImpl.
*/
- public ImageOutputStreamImpl() {}
+ public ImageOutputStreamImpl() {
+ }
public abstract void write(int b) throws IOException;
@@ -62,7 +66,7 @@
} else {
}
- //-- TODO implement
+ // -- TODO implement
throw new UnsupportedOperationException("Not implemented yet");
}
@@ -76,7 +80,7 @@
} else {
}
- //-- TODO implement
+ // -- TODO implement
throw new UnsupportedOperationException("Not implemented yet");
}
@@ -86,7 +90,7 @@
} else {
}
- //-- TODO implement
+ // -- TODO implement
throw new UnsupportedOperationException("Not implemented yet");
}
@@ -108,62 +112,63 @@
}
public void writeUTF(String s) throws IOException {
- //-- TODO implement
+ // -- TODO implement
throw new UnsupportedOperationException("Not implemented yet");
}
public void writeShorts(short[] s, int off, int len) throws IOException {
- //-- TODO implement
+ // -- TODO implement
throw new UnsupportedOperationException("Not implemented yet");
}
public void writeChars(char[] c, int off, int len) throws IOException {
- //-- TODO implement
+ // -- TODO implement
throw new UnsupportedOperationException("Not implemented yet");
}
public void writeInts(int[] i, int off, int len) throws IOException {
- //-- TODO implement
+ // -- TODO implement
throw new UnsupportedOperationException("Not implemented yet");
}
public void writeLongs(long[] l, int off, int len) throws IOException {
- //-- TODO implement
+ // -- TODO implement
throw new UnsupportedOperationException("Not implemented yet");
}
public void writeFloats(float[] f, int off, int len) throws IOException {
- //-- TODO implement
+ // -- TODO implement
throw new UnsupportedOperationException("Not implemented yet");
}
public void writeDoubles(double[] d, int off, int len) throws IOException {
- //-- TODO implement
+ // -- TODO implement
throw new UnsupportedOperationException("Not implemented yet");
}
public void writeBit(int bit) throws IOException {
- //-- TODO implement
+ // -- TODO implement
throw new UnsupportedOperationException("Not implemented yet");
}
public void writeBits(long bits, int numBits) throws IOException {
- //-- TODO implement
+ // -- TODO implement
throw new UnsupportedOperationException("Not implemented yet");
}
/**
- * Flushes the bits. This method should be called in the write
- * methods by subclasses.
+ * Flushes the bits. This method should be called in the write methods by
+ * subclasses.
*
- * @throws IOException Signals that an I/O exception has occurred.
+ * @throws IOException
+ * if an I/O exception has occurred.
*/
protected final void flushBits() throws IOException {
if (bitOffset == 0) {
return;
}
-
- //-- TODO implement
+
+ // -- TODO implement
throw new UnsupportedOperationException("Not implemented yet");
}
}
diff --git a/awt/javax/imageio/stream/MemoryCacheImageInputStream.java b/awt/javax/imageio/stream/MemoryCacheImageInputStream.java
index a3d470b..d7fc791 100644
--- a/awt/javax/imageio/stream/MemoryCacheImageInputStream.java
+++ b/awt/javax/imageio/stream/MemoryCacheImageInputStream.java
@@ -15,7 +15,6 @@
* limitations under the License.
*/
-
package javax.imageio.stream;
import org.apache.harmony.x.imageio.stream.RandomAccessMemoryCache;
@@ -24,22 +23,29 @@
import java.io.InputStream;
/**
- * The MemoryCacheImageInputStream class implements ImageInputStream
- * using a memory buffer for caching the data.
+ * The MemoryCacheImageInputStream class implements ImageInputStream using a
+ * memory buffer for caching the data.
+ *
+ * @since Android 1.0
*/
-public class MemoryCacheImageInputStream extends ImageInputStreamImpl {
-
- /** The is. */
+public class MemoryCacheImageInputStream extends ImageInputStreamImpl {
+
+ /**
+ * The is.
+ */
private InputStream is;
-
- /** The ramc. */
+
+ /**
+ * The ramc.
+ */
private RandomAccessMemoryCache ramc = new RandomAccessMemoryCache();
/**
- * Instantiates a new MemoryCacheImageInputStream
- * which reads from the specified InputStream.
+ * Instantiates a new MemoryCacheImageInputStream which reads from the
+ * specified InputStream.
*
- * @param stream the InputStream to be read.
+ * @param stream
+ * the InputStream to be read.
*/
public MemoryCacheImageInputStream(InputStream stream) {
if (stream == null) {
diff --git a/awt/javax/imageio/stream/MemoryCacheImageOutputStream.java b/awt/javax/imageio/stream/MemoryCacheImageOutputStream.java
index 96ded43..1df40a3 100644
--- a/awt/javax/imageio/stream/MemoryCacheImageOutputStream.java
+++ b/awt/javax/imageio/stream/MemoryCacheImageOutputStream.java
@@ -15,7 +15,6 @@
* limitations under the License.
*/
-
package javax.imageio.stream;
import org.apache.harmony.x.imageio.stream.RandomAccessMemoryCache;
@@ -23,24 +22,30 @@
import java.io.OutputStream;
import java.io.IOException;
-
/**
- * The MemoryCacheImageOutputStream class implements ImageOutputStream
- * using a memory buffer for caching the data.
+ * The MemoryCacheImageOutputStream class implements ImageOutputStream using a
+ * memory buffer for caching the data.
+ *
+ * @since Android 1.0
*/
public class MemoryCacheImageOutputStream extends ImageOutputStreamImpl {
-
- /** The os. */
+
+ /**
+ * The os.
+ */
OutputStream os;
-
- /** The ramc. */
+
+ /**
+ * The ramc.
+ */
RandomAccessMemoryCache ramc = new RandomAccessMemoryCache();
/**
- * Instantiates a new MemoryCacheImageOutputStream
- * which writes to the specified OutputStream.
+ * Instantiates a new MemoryCacheImageOutputStream which writes to the
+ * specified OutputStream.
*
- * @param stream the OutputStream.
+ * @param stream
+ * the OutputStream.
*/
public MemoryCacheImageOutputStream(OutputStream stream) {
if (stream == null) {
@@ -125,6 +130,6 @@
ramc.getData(os, nBytes, flushedPosition);
ramc.freeBefore(newFlushedPosition);
- os.flush();
+ os.flush();
}
}
diff --git a/awt/javax/imageio/stream/package.html b/awt/javax/imageio/stream/package.html
new file mode 100644
index 0000000..6cf53c3
--- /dev/null
+++ b/awt/javax/imageio/stream/package.html
@@ -0,0 +1,8 @@
+<html>
+ <body>
+ <p>
+ This package contains classes and interfaces for handling images with low-level I/O operations.
+ </p>
+ @since Android 1.0
+ </body>
+</html>