--- old/src/share/classes/com/sun/imageio/plugins/bmp/BMPImageReader.java 2012-09-13 19:47:11.990008500 +0400
+++ new/src/share/classes/com/sun/imageio/plugins/bmp/BMPImageReader.java 2012-09-13 19:47:11.442977200 +0400
@@ -690,6 +690,7 @@
return metadata.compression == BI_RGB;
}
+ @SuppressWarnings("fallthrough")
public BufferedImage read(int imageIndex, ImageReadParam param)
throws IOException {
@@ -767,14 +768,11 @@
// the sampleModel can be null in case of embedded image
if (sampleModel != null) {
if (sampleModel.getDataType() == DataBuffer.TYPE_BYTE)
- bdata = (byte[])
- ((DataBufferByte)raster.getDataBuffer()).getData();
+ bdata = ((DataBufferByte)raster.getDataBuffer()).getData();
else if (sampleModel.getDataType() == DataBuffer.TYPE_USHORT)
- sdata = (short[])
- ((DataBufferUShort)raster.getDataBuffer()).getData();
+ sdata = ((DataBufferUShort)raster.getDataBuffer()).getData();
else if (sampleModel.getDataType() == DataBuffer.TYPE_INT)
- idata = (int[])
- ((DataBufferInt)raster.getDataBuffer()).getData();
+ idata = ((DataBufferInt)raster.getDataBuffer()).getData();
}
// There should only be one tile.
--- old/src/share/classes/com/sun/imageio/plugins/bmp/BMPImageWriter.java 2012-09-13 19:47:19.232422700 +0400
+++ new/src/share/classes/com/sun/imageio/plugins/bmp/BMPImageWriter.java 2012-09-13 19:47:18.726393800 +0400
@@ -582,7 +582,7 @@
imageSize = embedded_stream.size();
long endPos = stream.getStreamPosition();
- fileSize = (int)(offset + imageSize);
+ fileSize = offset + imageSize;
stream.seek(headPos);
writeSize(fileSize, 2);
stream.seek(headPos);
--- old/src/share/classes/com/sun/imageio/plugins/common/ImageUtil.java 2012-09-13 19:47:26.443835200 +0400
+++ new/src/share/classes/com/sun/imageio/plugins/common/ImageUtil.java 2012-09-13 19:47:25.931805900 +0400
@@ -593,16 +593,15 @@
int i = eltOffset;
while(xRemaining > 24) {
data[i++] =
- (int)(((binaryDataArray[b++] & 0xFF) << 24) |
- ((binaryDataArray[b++] & 0xFF) << 16) |
- ((binaryDataArray[b++] & 0xFF) << 8) |
- (binaryDataArray[b++] & 0xFF));
+ (((binaryDataArray[b++] & 0xFF) << 24) |
+ ((binaryDataArray[b++] & 0xFF) << 16) |
+ ((binaryDataArray[b++] & 0xFF) << 8) |
+ (binaryDataArray[b++] & 0xFF));
xRemaining -= 32;
}
int shift = 24;
while(xRemaining > 0) {
- data[i] |=
- (int)((binaryDataArray[b++] & 0xFF) << shift);
+ data[i] |= ((binaryDataArray[b++] & 0xFF) << shift);
shift -= 8;
xRemaining -= 8;
}
@@ -835,8 +834,7 @@
for(int x = 0; x < rectWidth; x++) {
if(bdata[k++] != (byte)0) {
data[bOffset/32] |=
- (int)(0x00000001 <<
- (31 - bOffset % 32));
+ (0x00000001 << (31 - bOffset % 32));
}
bOffset++;
}
--- old/src/share/classes/com/sun/imageio/plugins/common/LZWStringTable.java 2012-09-13 19:47:33.774254500 +0400
+++ new/src/share/classes/com/sun/imageio/plugins/common/LZWStringTable.java 2012-09-13 19:47:33.107216300 +0400
@@ -143,7 +143,7 @@
}
static public int hash(short index, byte lastbyte) {
- return ((int)((short)(lastbyte << 8) ^ index) & 0xFFFF) % HASHSIZE;
+ return (((short)(lastbyte << 8) ^ index) & 0xFFFF) % HASHSIZE;
}
/*
--- old/src/share/classes/com/sun/imageio/plugins/gif/GIFImageMetadata.java 2012-09-13 19:47:41.194678900 +0400
+++ new/src/share/classes/com/sun/imageio/plugins/gif/GIFImageMetadata.java 2012-09-13 19:47:40.595644600 +0400
@@ -232,7 +232,7 @@
appExtNode.setAttribute("authenticationCode",
toISO8859(authenticationCode));
byte[] appData = (byte[])applicationData.get(i);
- appExtNode.setUserObject((byte[])appData.clone());
+ appExtNode.setUserObject(appData.clone());
node.appendChild(appExtNode);
}
--- old/src/share/classes/com/sun/imageio/plugins/jpeg/DQTMarkerSegment.java 2012-09-13 19:47:48.931121400 +0400
+++ new/src/share/classes/com/sun/imageio/plugins/jpeg/DQTMarkerSegment.java 2012-09-13 19:47:47.960065900 +0400
@@ -274,7 +274,7 @@
newGuy = (Qtable) super.clone();
} catch (CloneNotSupportedException e) {} // won't happen
if (data != null) {
- newGuy.data = (int []) data.clone();
+ newGuy.data = data.clone();
}
return newGuy;
}
--- old/src/share/classes/com/sun/imageio/plugins/jpeg/JFIFMarkerSegment.java 2012-09-13 19:47:56.111532100 +0400
+++ new/src/share/classes/com/sun/imageio/plugins/jpeg/JFIFMarkerSegment.java 2012-09-13 19:47:55.611503500 +0400
@@ -1448,7 +1448,7 @@
protected Object clone () {
ICCMarkerSegment newGuy = (ICCMarkerSegment) super.clone();
if (profile != null) {
- newGuy.profile = (byte[]) profile.clone();
+ newGuy.profile = profile.clone();
}
return newGuy;
}
--- old/src/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageWriter.java 2012-09-13 19:48:03.447951700 +0400
+++ new/src/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageWriter.java 2012-09-13 19:48:02.855917800 +0400
@@ -318,7 +318,7 @@
IIOMetadata streamMetadata,
IIOMetadata imageMetadata) {
if (jfifOK(imageType, param, streamMetadata, imageMetadata)) {
- return (Dimension [])preferredThumbSizes.clone();
+ return preferredThumbSizes.clone();
}
return null;
}
--- old/src/share/classes/com/sun/imageio/plugins/jpeg/JPEGMetadata.java 2012-09-13 19:48:11.220396300 +0400
+++ new/src/share/classes/com/sun/imageio/plugins/jpeg/JPEGMetadata.java 2012-09-13 19:48:10.602360900 +0400
@@ -723,7 +723,7 @@
newGuy = (JPEGMetadata) super.clone();
} catch (CloneNotSupportedException e) {} // won't happen
if (markerSequence != null) {
- newGuy.markerSequence = (List) cloneSequence();
+ newGuy.markerSequence = cloneSequence();
}
newGuy.resetSequence = null;
return newGuy;
@@ -2015,14 +2015,14 @@
// First approximation
int y = 1;
- int x = (int) Math.round(value);
+ int x = Math.round(value);
float ratio = (float) x;
float delta = Math.abs(value - ratio);
while (delta > epsilon) { // not close enough
// Increment y and compute a new x
y++;
- x = (int) Math.round(y*value);
+ x = Math.round(y*value);
ratio = (float)x/(float)y;
delta = Math.abs(value - ratio);
}
--- old/src/share/classes/com/sun/imageio/plugins/jpeg/MarkerSegment.java 2012-09-13 19:48:18.651821300 +0400
+++ new/src/share/classes/com/sun/imageio/plugins/jpeg/MarkerSegment.java 2012-09-13 19:48:18.139792000 +0400
@@ -114,7 +114,7 @@
newGuy = (MarkerSegment) super.clone();
} catch (CloneNotSupportedException e) {} // won't happen
if (this.data != null) {
- newGuy.data = (byte[]) data.clone();
+ newGuy.data = data.clone();
}
return newGuy;
}
--- old/src/share/classes/javax/imageio/IIOException.java 2012-09-13 19:48:25.783229200 +0400
+++ new/src/share/classes/javax/imageio/IIOException.java 2012-09-13 19:48:25.243198300 +0400
@@ -41,6 +41,8 @@
*/
public class IIOException extends IOException {
+ private static final long serialVersionUID = -3216210718638985251L;
+
/**
* Constructs an IIOException
with a given message
* String
. No underlying cause is set;
--- old/src/share/classes/javax/imageio/IIOParam.java 2012-09-13 19:48:32.939638500 +0400
+++ new/src/share/classes/javax/imageio/IIOParam.java 2012-09-13 19:48:32.452610700 +0400
@@ -437,7 +437,7 @@
}
}
- this.sourceBands = (int[])(sourceBands.clone());
+ this.sourceBands = sourceBands.clone();
}
}
@@ -460,7 +460,7 @@
if (sourceBands == null) {
return null;
}
- return (int[])(sourceBands.clone());
+ return sourceBands.clone();
}
/**
--- old/src/share/classes/javax/imageio/ImageIO.java 2012-09-13 19:48:40.166051900 +0400
+++ new/src/share/classes/javax/imageio/ImageIO.java 2012-09-13 19:48:39.609020000 +0400
@@ -169,7 +169,7 @@
*/
private static String getTempDir() {
GetPropertyAction a = new GetPropertyAction("java.io.tmpdir");
- return (String)AccessController.doPrivileged(a);
+ return AccessController.doPrivileged(a);
}
/**
@@ -339,7 +339,7 @@
throw new IllegalArgumentException("input == null!");
}
- Iterator iter;
+ Iterator iter;
// Ensure category is present
try {
iter = theRegistry.getServiceProviders(ImageInputStreamSpi.class,
@@ -351,7 +351,7 @@
boolean usecache = getUseCache() && hasCachePermission();
while (iter.hasNext()) {
- ImageInputStreamSpi spi = (ImageInputStreamSpi)iter.next();
+ ImageInputStreamSpi spi = iter.next();
if (spi.getInputClass().isInstance(input)) {
try {
return spi.createInputStreamInstance(input,
@@ -401,7 +401,7 @@
throw new IllegalArgumentException("output == null!");
}
- Iterator iter;
+ Iterator iter;
// Ensure category is present
try {
iter = theRegistry.getServiceProviders(ImageOutputStreamSpi.class,
@@ -413,7 +413,7 @@
boolean usecache = getUseCache() && hasCachePermission();
while (iter.hasNext()) {
- ImageOutputStreamSpi spi = (ImageOutputStreamSpi)iter.next();
+ ImageOutputStreamSpi spi = iter.next();
if (spi.getOutputClass().isInstance(output)) {
try {
return spi.createOutputStreamInstance(output,
@@ -640,7 +640,7 @@
if (input == null) {
throw new IllegalArgumentException("input == null!");
}
- Iterator iter;
+ Iterator iter;
// Ensure category is present
try {
iter = theRegistry.getServiceProviders(ImageReaderSpi.class,
@@ -702,7 +702,7 @@
if (formatName == null) {
throw new IllegalArgumentException("formatName == null!");
}
- Iterator iter;
+ Iterator iter;
// Ensure category is present
try {
iter = theRegistry.getServiceProviders(ImageReaderSpi.class,
@@ -738,7 +738,7 @@
throw new IllegalArgumentException("fileSuffix == null!");
}
// Ensure category is present
- Iterator iter;
+ Iterator iter;
try {
iter = theRegistry.getServiceProviders(ImageReaderSpi.class,
new ContainsFilter(readerFileSuffixesMethod,
@@ -773,7 +773,7 @@
throw new IllegalArgumentException("MIMEType == null!");
}
// Ensure category is present
- Iterator iter;
+ Iterator iter;
try {
iter = theRegistry.getServiceProviders(ImageReaderSpi.class,
new ContainsFilter(readerMIMETypesMethod,
@@ -885,7 +885,7 @@
if (formatName == null) {
throw new IllegalArgumentException("formatName == null!");
}
- Iterator iter;
+ Iterator iter;
// Ensure category is present
try {
iter = theRegistry.getServiceProviders(ImageWriterSpi.class,
@@ -919,7 +919,7 @@
if (fileSuffix == null) {
throw new IllegalArgumentException("fileSuffix == null!");
}
- Iterator iter;
+ Iterator iter;
// Ensure category is present
try {
iter = theRegistry.getServiceProviders(ImageWriterSpi.class,
@@ -953,7 +953,7 @@
if (MIMEType == null) {
throw new IllegalArgumentException("MIMEType == null!");
}
- Iterator iter;
+ Iterator iter;
// Ensure category is present
try {
iter = theRegistry.getServiceProviders(ImageWriterSpi.class,
@@ -1002,7 +1002,7 @@
ImageReaderSpi readerSpi = reader.getOriginatingProvider();
if (readerSpi == null) {
- Iterator readerSpiIter;
+ Iterator readerSpiIter;
// Ensure category is present
try {
readerSpiIter =
@@ -1013,7 +1013,7 @@
}
while (readerSpiIter.hasNext()) {
- ImageReaderSpi temp = (ImageReaderSpi) readerSpiIter.next();
+ ImageReaderSpi temp = readerSpiIter.next();
if (temp.isOwnReader(reader)) {
readerSpi = temp;
break;
@@ -1082,7 +1082,7 @@
ImageWriterSpi writerSpi = writer.getOriginatingProvider();
if (writerSpi == null) {
- Iterator writerSpiIter;
+ Iterator writerSpiIter;
// Ensure category is present
try {
writerSpiIter =
@@ -1093,7 +1093,7 @@
}
while (writerSpiIter.hasNext()) {
- ImageWriterSpi temp = (ImageWriterSpi) writerSpiIter.next();
+ ImageWriterSpi temp = writerSpiIter.next();
if (temp.isOwnWriter(writer)) {
writerSpi = temp;
break;
@@ -1160,7 +1160,7 @@
throw new IllegalArgumentException("formatName == null!");
}
- Iterator iter;
+ Iterator iter;
// Ensure category is present
try {
iter = theRegistry.getServiceProviders(ImageWriterSpi.class,
@@ -1249,7 +1249,7 @@
ServiceRegistry.Filter filter =
new TranscoderFilter(readerSpi, writerSpi);
- Iterator iter;
+ Iterator iter;
// Ensure category is present
try {
iter = theRegistry.getServiceProviders(ImageTranscoderSpi.class,
@@ -1435,12 +1435,12 @@
throw new IllegalArgumentException("stream == null!");
}
- Iterator iter = getImageReaders(stream);
+ Iterator iter = getImageReaders(stream);
if (!iter.hasNext()) {
return null;
}
- ImageReader reader = (ImageReader)iter.next();
+ ImageReader reader = iter.next();
ImageReadParam param = reader.getDefaultReadParam();
reader.setInput(stream, true, true);
BufferedImage bi;
--- old/src/share/classes/javax/imageio/ImageReadParam.java 2012-09-13 19:48:47.657480300 +0400
+++ new/src/share/classes/javax/imageio/ImageReadParam.java 2012-09-13 19:48:47.160451900 +0400
@@ -294,7 +294,7 @@
}
}
}
- this.destinationBands = (int[])destinationBands.clone();
+ this.destinationBands = destinationBands.clone();
}
}
@@ -312,7 +312,7 @@
if (destinationBands == null) {
return null;
} else {
- return (int[])(destinationBands.clone());
+ return destinationBands.clone();
}
}
--- old/src/share/classes/javax/imageio/ImageReader.java 2012-09-13 19:48:54.709883700 +0400
+++ new/src/share/classes/javax/imageio/ImageReader.java 2012-09-13 19:48:54.198854500 +0400
@@ -457,7 +457,7 @@
if (availableLocales == null) {
return null;
} else {
- return (Locale[])availableLocales.clone();
+ return availableLocales.clone();
}
}
@@ -679,7 +679,7 @@
*/
public ImageTypeSpecifier getRawImageType(int imageIndex)
throws IOException {
- return (ImageTypeSpecifier)getImageTypes(imageIndex).next();
+ return getImageTypes(imageIndex).next();
}
/**
@@ -2014,8 +2014,7 @@
}
int numListeners = progressListeners.size();
for (int i = 0; i < numListeners; i++) {
- IIOReadProgressListener listener =
- (IIOReadProgressListener)progressListeners.get(i);
+ IIOReadProgressListener listener = progressListeners.get(i);
listener.sequenceStarted(this, minIndex);
}
}
@@ -2032,8 +2031,7 @@
}
int numListeners = progressListeners.size();
for (int i = 0; i < numListeners; i++) {
- IIOReadProgressListener listener =
- (IIOReadProgressListener)progressListeners.get(i);
+ IIOReadProgressListener listener = progressListeners.get(i);
listener.sequenceComplete(this);
}
}
@@ -2052,8 +2050,7 @@
}
int numListeners = progressListeners.size();
for (int i = 0; i < numListeners; i++) {
- IIOReadProgressListener listener =
- (IIOReadProgressListener)progressListeners.get(i);
+ IIOReadProgressListener listener = progressListeners.get(i);
listener.imageStarted(this, imageIndex);
}
}
@@ -2073,8 +2070,7 @@
}
int numListeners = progressListeners.size();
for (int i = 0; i < numListeners; i++) {
- IIOReadProgressListener listener =
- (IIOReadProgressListener)progressListeners.get(i);
+ IIOReadProgressListener listener = progressListeners.get(i);
listener.imageProgress(this, percentageDone);
}
}
@@ -2091,8 +2087,7 @@
}
int numListeners = progressListeners.size();
for (int i = 0; i < numListeners; i++) {
- IIOReadProgressListener listener =
- (IIOReadProgressListener)progressListeners.get(i);
+ IIOReadProgressListener listener = progressListeners.get(i);
listener.imageComplete(this);
}
}
@@ -2114,8 +2109,7 @@
}
int numListeners = progressListeners.size();
for (int i = 0; i < numListeners; i++) {
- IIOReadProgressListener listener =
- (IIOReadProgressListener)progressListeners.get(i);
+ IIOReadProgressListener listener = progressListeners.get(i);
listener.thumbnailStarted(this, imageIndex, thumbnailIndex);
}
}
@@ -2135,8 +2129,7 @@
}
int numListeners = progressListeners.size();
for (int i = 0; i < numListeners; i++) {
- IIOReadProgressListener listener =
- (IIOReadProgressListener)progressListeners.get(i);
+ IIOReadProgressListener listener = progressListeners.get(i);
listener.thumbnailProgress(this, percentageDone);
}
}
@@ -2153,8 +2146,7 @@
}
int numListeners = progressListeners.size();
for (int i = 0; i < numListeners; i++) {
- IIOReadProgressListener listener =
- (IIOReadProgressListener)progressListeners.get(i);
+ IIOReadProgressListener listener = progressListeners.get(i);
listener.thumbnailComplete(this);
}
}
@@ -2171,8 +2163,7 @@
}
int numListeners = progressListeners.size();
for (int i = 0; i < numListeners; i++) {
- IIOReadProgressListener listener =
- (IIOReadProgressListener)progressListeners.get(i);
+ IIOReadProgressListener listener = progressListeners.get(i);
listener.readAborted(this);
}
}
@@ -2207,8 +2198,7 @@
}
int numListeners = updateListeners.size();
for (int i = 0; i < numListeners; i++) {
- IIOReadUpdateListener listener =
- (IIOReadUpdateListener)updateListeners.get(i);
+ IIOReadUpdateListener listener = updateListeners.get(i);
listener.passStarted(this, theImage, pass,
minPass,
maxPass,
@@ -2248,8 +2238,7 @@
}
int numListeners = updateListeners.size();
for (int i = 0; i < numListeners; i++) {
- IIOReadUpdateListener listener =
- (IIOReadUpdateListener)updateListeners.get(i);
+ IIOReadUpdateListener listener = updateListeners.get(i);
listener.imageUpdate(this,
theImage,
minX, minY,
@@ -2273,8 +2262,7 @@
}
int numListeners = updateListeners.size();
for (int i = 0; i < numListeners; i++) {
- IIOReadUpdateListener listener =
- (IIOReadUpdateListener)updateListeners.get(i);
+ IIOReadUpdateListener listener = updateListeners.get(i);
listener.passComplete(this, theImage);
}
}
@@ -2310,8 +2298,7 @@
}
int numListeners = updateListeners.size();
for (int i = 0; i < numListeners; i++) {
- IIOReadUpdateListener listener =
- (IIOReadUpdateListener)updateListeners.get(i);
+ IIOReadUpdateListener listener = updateListeners.get(i);
listener.thumbnailPassStarted(this, theThumbnail, pass,
minPass,
maxPass,
@@ -2352,8 +2339,7 @@
}
int numListeners = updateListeners.size();
for (int i = 0; i < numListeners; i++) {
- IIOReadUpdateListener listener =
- (IIOReadUpdateListener)updateListeners.get(i);
+ IIOReadUpdateListener listener = updateListeners.get(i);
listener.thumbnailUpdate(this,
theThumbnail,
minX, minY,
@@ -2378,8 +2364,7 @@
}
int numListeners = updateListeners.size();
for (int i = 0; i < numListeners; i++) {
- IIOReadUpdateListener listener =
- (IIOReadUpdateListener)updateListeners.get(i);
+ IIOReadUpdateListener listener = updateListeners.get(i);
listener.thumbnailPassComplete(this, theThumbnail);
}
}
@@ -2404,8 +2389,7 @@
}
int numListeners = warningListeners.size();
for (int i = 0; i < numListeners; i++) {
- IIOReadWarningListener listener =
- (IIOReadWarningListener)warningListeners.get(i);
+ IIOReadWarningListener listener = warningListeners.get(i);
listener.warningOccurred(this, warning);
}
@@ -2449,9 +2433,8 @@
}
int numListeners = warningListeners.size();
for (int i = 0; i < numListeners; i++) {
- IIOReadWarningListener listener =
- (IIOReadWarningListener)warningListeners.get(i);
- Locale locale = (Locale)warningLocales.get(i);
+ IIOReadWarningListener listener = warningListeners.get(i);
+ Locale locale = warningLocales.get(i);
if (locale == null) {
locale = Locale.getDefault();
}
@@ -2867,8 +2850,7 @@
} else {
boolean foundIt = false;
while (imageTypes.hasNext()) {
- ImageTypeSpecifier type =
- (ImageTypeSpecifier)imageTypes.next();
+ ImageTypeSpecifier type = imageTypes.next();
if (type.equals(imageType)) {
foundIt = true;
break;
--- old/src/share/classes/javax/imageio/ImageTypeSpecifier.java 2012-09-13 19:49:02.002300800 +0400
+++ new/src/share/classes/javax/imageio/ImageTypeSpecifier.java 2012-09-13 19:49:01.495271800 +0400
@@ -296,7 +296,7 @@
("Bad value for dataType!");
}
this.colorSpace = colorSpace;
- this.bandOffsets = (int[])bandOffsets.clone();
+ this.bandOffsets = bandOffsets.clone();
this.dataType = dataType;
this.hasAlpha = hasAlpha;
this.isAlphaPremultiplied = isAlphaPremultiplied;
@@ -449,8 +449,8 @@
}
this.colorSpace = colorSpace;
- this.bankIndices = (int[])bankIndices.clone();
- this.bandOffsets = (int[])bandOffsets.clone();
+ this.bankIndices = bankIndices.clone();
+ this.bandOffsets = bandOffsets.clone();
this.dataType = dataType;
this.hasAlpha = hasAlpha;
this.isAlphaPremultiplied = isAlphaPremultiplied;
@@ -769,11 +769,11 @@
(alphaLUT != null && alphaLUT.length != len)) {
throw new IllegalArgumentException("LUT has improper length!");
}
- this.redLUT = (byte[])redLUT.clone();
- this.greenLUT = (byte[])greenLUT.clone();
- this.blueLUT = (byte[])blueLUT.clone();
+ this.redLUT = redLUT.clone();
+ this.greenLUT = greenLUT.clone();
+ this.blueLUT = blueLUT.clone();
if (alphaLUT != null) {
- this.alphaLUT = (byte[])alphaLUT.clone();
+ this.alphaLUT = alphaLUT.clone();
}
this.bits = bits;
this.dataType = dataType;
--- old/src/share/classes/javax/imageio/ImageWriteParam.java 2012-09-13 19:49:09.147709500 +0400
+++ new/src/share/classes/javax/imageio/ImageWriteParam.java 2012-09-13 19:49:08.623679500 +0400
@@ -977,7 +977,7 @@
if (compressionTypes == null) {
return null;
}
- return (String[])compressionTypes.clone();
+ return compressionTypes.clone();
}
/**
--- old/src/share/classes/javax/imageio/ImageWriter.java 2012-09-13 19:49:16.350121500 +0400
+++ new/src/share/classes/javax/imageio/ImageWriter.java 2012-09-13 19:49:15.847092700 +0400
@@ -259,7 +259,7 @@
*/
public Locale[] getAvailableLocales() {
return (availableLocales == null) ?
- null : (Locale[])availableLocales.clone();
+ null : availableLocales.clone();
}
/**
@@ -1755,8 +1755,7 @@
}
int numListeners = progressListeners.size();
for (int i = 0; i < numListeners; i++) {
- IIOWriteProgressListener listener =
- (IIOWriteProgressListener)progressListeners.get(i);
+ IIOWriteProgressListener listener = progressListeners.get(i);
listener.imageStarted(this, imageIndex);
}
}
@@ -1776,8 +1775,7 @@
}
int numListeners = progressListeners.size();
for (int i = 0; i < numListeners; i++) {
- IIOWriteProgressListener listener =
- (IIOWriteProgressListener)progressListeners.get(i);
+ IIOWriteProgressListener listener = progressListeners.get(i);
listener.imageProgress(this, percentageDone);
}
}
@@ -1794,8 +1792,7 @@
}
int numListeners = progressListeners.size();
for (int i = 0; i < numListeners; i++) {
- IIOWriteProgressListener listener =
- (IIOWriteProgressListener)progressListeners.get(i);
+ IIOWriteProgressListener listener = progressListeners.get(i);
listener.imageComplete(this);
}
}
@@ -1817,8 +1814,7 @@
}
int numListeners = progressListeners.size();
for (int i = 0; i < numListeners; i++) {
- IIOWriteProgressListener listener =
- (IIOWriteProgressListener)progressListeners.get(i);
+ IIOWriteProgressListener listener = progressListeners.get(i);
listener.thumbnailStarted(this, imageIndex, thumbnailIndex);
}
}
@@ -1838,8 +1834,7 @@
}
int numListeners = progressListeners.size();
for (int i = 0; i < numListeners; i++) {
- IIOWriteProgressListener listener =
- (IIOWriteProgressListener)progressListeners.get(i);
+ IIOWriteProgressListener listener = progressListeners.get(i);
listener.thumbnailProgress(this, percentageDone);
}
}
@@ -1856,8 +1851,7 @@
}
int numListeners = progressListeners.size();
for (int i = 0; i < numListeners; i++) {
- IIOWriteProgressListener listener =
- (IIOWriteProgressListener)progressListeners.get(i);
+ IIOWriteProgressListener listener = progressListeners.get(i);
listener.thumbnailComplete(this);
}
}
@@ -1874,8 +1868,7 @@
}
int numListeners = progressListeners.size();
for (int i = 0; i < numListeners; i++) {
- IIOWriteProgressListener listener =
- (IIOWriteProgressListener)progressListeners.get(i);
+ IIOWriteProgressListener listener = progressListeners.get(i);
listener.writeAborted(this);
}
}
@@ -1903,8 +1896,7 @@
}
int numListeners = warningListeners.size();
for (int i = 0; i < numListeners; i++) {
- IIOWriteWarningListener listener =
- (IIOWriteWarningListener)warningListeners.get(i);
+ IIOWriteWarningListener listener = warningListeners.get(i);
listener.warningOccurred(this, imageIndex, warning);
}
@@ -1951,9 +1943,8 @@
}
int numListeners = warningListeners.size();
for (int i = 0; i < numListeners; i++) {
- IIOWriteWarningListener listener =
- (IIOWriteWarningListener)warningListeners.get(i);
- Locale locale = (Locale)warningLocales.get(i);
+ IIOWriteWarningListener listener = warningListeners.get(i);
+ Locale locale = warningLocales.get(i);
if (locale == null) {
locale = Locale.getDefault();
}
--- old/src/share/classes/javax/imageio/metadata/IIOInvalidTreeException.java 2012-09-13 19:49:23.709542400 +0400
+++ new/src/share/classes/javax/imageio/metadata/IIOInvalidTreeException.java 2012-09-13 19:49:23.161511100 +0400
@@ -45,6 +45,8 @@
*/
public class IIOInvalidTreeException extends IIOException {
+ private static final long serialVersionUID = -1314083172544132777L;
+
/**
* The Node
that led to the parsing error, or
* null
.
--- old/src/share/classes/javax/imageio/metadata/IIOMetadata.java 2012-09-13 19:49:30.744944800 +0400
+++ new/src/share/classes/javax/imageio/metadata/IIOMetadata.java 2012-09-13 19:49:30.237915800 +0400
@@ -192,9 +192,9 @@
("extraMetadataFormatClassNames.length != extraMetadataFormatNames.length!");
}
this.extraMetadataFormatNames =
- (String[]) extraMetadataFormatNames.clone();
+ extraMetadataFormatNames.clone();
this.extraMetadataFormatClassNames =
- (String[]) extraMetadataFormatClassNames.clone();
+ extraMetadataFormatClassNames.clone();
} else {
if (extraMetadataFormatClassNames != null) {
throw new IllegalArgumentException
@@ -285,7 +285,7 @@
if (extraMetadataFormatNames == null) {
return null;
}
- return (String[])extraMetadataFormatNames.clone();
+ return extraMetadataFormatNames.clone();
}
/**
--- old/src/share/classes/javax/imageio/metadata/IIOMetadataFormatImpl.java 2012-09-13 19:49:37.890353500 +0400
+++ new/src/share/classes/javax/imageio/metadata/IIOMetadataFormatImpl.java 2012-09-13 19:49:37.379324300 +0400
@@ -1178,7 +1178,7 @@
private ObjectValue getObjectValue(String elementName) {
Element element = getElement(elementName);
- ObjectValue objv = (ObjectValue)element.objectValue;
+ ObjectValue objv = element.objectValue;
if (objv == null) {
throw new IllegalArgumentException("No object within element " +
elementName + "!");
@@ -1188,7 +1188,7 @@
public int getObjectValueType(String elementName) {
Element element = getElement(elementName);
- ObjectValue objv = (ObjectValue)element.objectValue;
+ ObjectValue objv = element.objectValue;
if (objv == null) {
return VALUE_NONE;
}
--- old/src/share/classes/javax/imageio/plugins/jpeg/JPEGImageReadParam.java 2012-09-13 19:49:45.140768200 +0400
+++ new/src/share/classes/javax/imageio/plugins/jpeg/JPEGImageReadParam.java 2012-09-13 19:49:44.609737800 +0400
@@ -134,9 +134,9 @@
throw new IllegalArgumentException
("Invalid JPEG table arrays");
}
- this.qTables = (JPEGQTable[])qTables.clone();
- this.DCHuffmanTables = (JPEGHuffmanTable[])DCHuffmanTables.clone();
- this.ACHuffmanTables = (JPEGHuffmanTable[])ACHuffmanTables.clone();
+ this.qTables = qTables.clone();
+ this.DCHuffmanTables = DCHuffmanTables.clone();
+ this.ACHuffmanTables = ACHuffmanTables.clone();
}
/**
@@ -162,7 +162,7 @@
* @see #setDecodeTables
*/
public JPEGQTable[] getQTables() {
- return (qTables != null) ? (JPEGQTable[])qTables.clone() : null;
+ return (qTables != null) ? qTables.clone() : null;
}
/**
@@ -177,7 +177,7 @@
*/
public JPEGHuffmanTable[] getDCHuffmanTables() {
return (DCHuffmanTables != null)
- ? (JPEGHuffmanTable[])DCHuffmanTables.clone()
+ ? DCHuffmanTables.clone()
: null;
}
@@ -193,7 +193,7 @@
*/
public JPEGHuffmanTable[] getACHuffmanTables() {
return (ACHuffmanTables != null)
- ? (JPEGHuffmanTable[])ACHuffmanTables.clone()
+ ? ACHuffmanTables.clone()
: null;
}
}
--- old/src/share/classes/javax/imageio/plugins/jpeg/JPEGImageWriteParam.java 2012-09-13 19:49:52.348180400 +0400
+++ new/src/share/classes/javax/imageio/plugins/jpeg/JPEGImageWriteParam.java 2012-09-13 19:49:51.844151600 +0400
@@ -167,7 +167,7 @@
(getCompressionType() == null)) {
throw new IllegalStateException("No compression type set!");
}
- return (String[])qualityDescs.clone();
+ return qualityDescs.clone();
}
public float[] getCompressionQualityValues() {
@@ -179,7 +179,7 @@
(getCompressionType() == null)) {
throw new IllegalStateException("No compression type set!");
}
- return (float[])qualityVals.clone();
+ return qualityVals.clone();
}
/**
* Returns true
if tables are currently set.
@@ -222,9 +222,9 @@
(DCHuffmanTables.length != ACHuffmanTables.length)) {
throw new IllegalArgumentException("Invalid JPEG table arrays");
}
- this.qTables = (JPEGQTable[])qTables.clone();
- this.DCHuffmanTables = (JPEGHuffmanTable[])DCHuffmanTables.clone();
- this.ACHuffmanTables = (JPEGHuffmanTable[])ACHuffmanTables.clone();
+ this.qTables = qTables.clone();
+ this.DCHuffmanTables = DCHuffmanTables.clone();
+ this.ACHuffmanTables = ACHuffmanTables.clone();
}
/**
@@ -250,7 +250,7 @@
* @see #setEncodeTables
*/
public JPEGQTable[] getQTables() {
- return (qTables != null) ? (JPEGQTable[])qTables.clone() : null;
+ return (qTables != null) ? qTables.clone() : null;
}
/**
@@ -265,7 +265,7 @@
*/
public JPEGHuffmanTable[] getDCHuffmanTables() {
return (DCHuffmanTables != null)
- ? (JPEGHuffmanTable[])DCHuffmanTables.clone()
+ ? DCHuffmanTables.clone()
: null;
}
@@ -281,7 +281,7 @@
*/
public JPEGHuffmanTable[] getACHuffmanTables() {
return (ACHuffmanTables != null)
- ? (JPEGHuffmanTable[])ACHuffmanTables.clone()
+ ? ACHuffmanTables.clone()
: null;
}
--- old/src/share/classes/javax/imageio/spi/ImageReaderSpi.java 2012-09-13 19:49:59.518590600 +0400
+++ new/src/share/classes/javax/imageio/spi/ImageReaderSpi.java 2012-09-13 19:49:58.956558400 +0400
@@ -237,7 +237,7 @@
// If length == 0, leave it null
if (writerSpiNames != null && writerSpiNames.length > 0) {
- this.writerSpiNames = (String[])writerSpiNames.clone();
+ this.writerSpiNames = writerSpiNames.clone();
}
}
@@ -255,7 +255,7 @@
* Class
objects of length at least 1.
*/
public Class[] getInputTypes() {
- return (Class[])inputTypes.clone();
+ return inputTypes.clone();
}
/**
@@ -408,6 +408,6 @@
*/
public String[] getImageWriterSpiNames() {
return writerSpiNames == null ?
- null : (String[])writerSpiNames.clone();
+ null : writerSpiNames.clone();
}
}
--- old/src/share/classes/javax/imageio/spi/ImageReaderWriterSpi.java 2012-09-13 19:50:06.705001600 +0400
+++ new/src/share/classes/javax/imageio/spi/ImageReaderWriterSpi.java 2012-09-13 19:50:06.194972400 +0400
@@ -239,14 +239,14 @@
throw new IllegalArgumentException("pluginClassName == null!");
}
- this.names = (String[])names.clone();
+ this.names = names.clone();
// If length == 0, leave it null
if (suffixes != null && suffixes.length > 0) {
- this.suffixes = (String[])suffixes.clone();
+ this.suffixes = suffixes.clone();
}
// If length == 0, leave it null
if (MIMETypes != null && MIMETypes.length > 0) {
- this.MIMETypes = (String[])MIMETypes.clone();
+ this.MIMETypes = MIMETypes.clone();
}
this.pluginClassName = pluginClassName;
@@ -259,13 +259,13 @@
if (extraStreamMetadataFormatNames != null &&
extraStreamMetadataFormatNames.length > 0) {
this.extraStreamMetadataFormatNames =
- (String[])extraStreamMetadataFormatNames.clone();
+ extraStreamMetadataFormatNames.clone();
}
// If length == 0, leave it null
if (extraStreamMetadataFormatClassNames != null &&
extraStreamMetadataFormatClassNames.length > 0) {
this.extraStreamMetadataFormatClassNames =
- (String[])extraStreamMetadataFormatClassNames.clone();
+ extraStreamMetadataFormatClassNames.clone();
}
this.supportsStandardImageMetadataFormat =
supportsStandardImageMetadataFormat;
@@ -276,13 +276,13 @@
if (extraImageMetadataFormatNames != null &&
extraImageMetadataFormatNames.length > 0) {
this.extraImageMetadataFormatNames =
- (String[])extraImageMetadataFormatNames.clone();
+ extraImageMetadataFormatNames.clone();
}
// If length == 0, leave it null
if (extraImageMetadataFormatClassNames != null &&
extraImageMetadataFormatClassNames.length > 0) {
this.extraImageMetadataFormatClassNames =
- (String[])extraImageMetadataFormatClassNames.clone();
+ extraImageMetadataFormatClassNames.clone();
}
}
@@ -308,7 +308,7 @@
* associated with this reader or writer.
*/
public String[] getFormatNames() {
- return (String[])names.clone();
+ return names.clone();
}
/**
@@ -332,7 +332,7 @@
* writer, or null
.
*/
public String[] getFileSuffixes() {
- return suffixes == null ? null : (String[])suffixes.clone();
+ return suffixes == null ? null : suffixes.clone();
}
/**
@@ -367,7 +367,7 @@
* null
.
*/
public String[] getMIMETypes() {
- return MIMETypes == null ? null : (String[])MIMETypes.clone();
+ return MIMETypes == null ? null : MIMETypes.clone();
}
/**
@@ -443,7 +443,7 @@
*/
public String[] getExtraStreamMetadataFormatNames() {
return extraStreamMetadataFormatNames == null ?
- null : (String[])extraStreamMetadataFormatNames.clone();
+ null : extraStreamMetadataFormatNames.clone();
}
/**
@@ -507,7 +507,7 @@
*/
public String[] getExtraImageMetadataFormatNames() {
return extraImageMetadataFormatNames == null ?
- null : (String[])extraImageMetadataFormatNames.clone();
+ null : extraImageMetadataFormatNames.clone();
}
/**
--- old/src/share/classes/javax/imageio/spi/ImageWriterSpi.java 2012-09-13 19:50:13.889412500 +0400
+++ new/src/share/classes/javax/imageio/spi/ImageWriterSpi.java 2012-09-13 19:50:13.401384600 +0400
@@ -238,7 +238,7 @@
// If length == 0, leave it null
if (readerSpiNames != null && readerSpiNames.length > 0) {
- this.readerSpiNames = (String[])readerSpiNames.clone();
+ this.readerSpiNames = readerSpiNames.clone();
}
}
@@ -268,7 +268,7 @@
* Class
objects of length at least 1.
*/
public Class[] getOutputTypes() {
- return (Class[])outputTypes.clone();
+ return outputTypes.clone();
}
/**
@@ -435,6 +435,6 @@
*/
public String[] getImageReaderSpiNames() {
return readerSpiNames == null ?
- null : (String[])readerSpiNames.clone();
+ null : readerSpiNames.clone();
}
}