New code style. No functional changes.

This commit is contained in:
Harald Kuhr
2011-02-17 17:54:50 +01:00
parent 5bd896f80f
commit 770f948e1a
78 changed files with 1401 additions and 1412 deletions
@@ -71,21 +71,21 @@ public abstract class ImageReaderBase extends ImageReader {
* the extension object is unsuitable, an
* {@code IllegalArgumentException} should be thrown.
*
* @param pProvider the {@code ImageReaderSpi} that is invoking this constructor, or {@code null}.
* @param provider the {@code ImageReaderSpi} that is invoking this constructor, or {@code null}.
*/
protected ImageReaderBase(final ImageReaderSpi pProvider) {
super(pProvider);
protected ImageReaderBase(final ImageReaderSpi provider) {
super(provider);
}
/**
* Overrides {@code setInput}, to allow easy access to the input, in case
* it is an {@code ImageInputStream}.
*
* @param pInput the {@code ImageInputStream} or other
* @param input the {@code ImageInputStream} or other
* {@code Object} to use for future decoding.
* @param pSeekForwardOnly if {@code true}, images and metadata
* @param seekForwardOnly if {@code true}, images and metadata
* may only be read in ascending order from this input source.
* @param pIgnoreMetadata if {@code true}, metadata
* @param ignoreMetadata if {@code true}, metadata
* may be ignored during reads.
*
* @exception IllegalArgumentException if {@code input} is
@@ -96,11 +96,11 @@ public abstract class ImageReaderBase extends ImageReader {
* @see ImageInputStream
*/
@Override
public void setInput(final Object pInput, final boolean pSeekForwardOnly, final boolean pIgnoreMetadata) {
public void setInput(final Object input, final boolean seekForwardOnly, final boolean ignoreMetadata) {
resetMembers();
super.setInput(pInput, pSeekForwardOnly, pIgnoreMetadata);
if (pInput instanceof ImageInputStream) {
imageInput = (ImageInputStream) pInput;
super.setInput(input, seekForwardOnly, ignoreMetadata);
if (input instanceof ImageInputStream) {
imageInput = (ImageInputStream) input;
}
}
@@ -130,11 +130,11 @@ public abstract class ImageReaderBase extends ImageReader {
/**
* Default implementation that always returns {@code null}.
*
* @param pImageIndex ignored, unless overridden
* @param imageIndex ignored, unless overridden
* @return {@code null}, unless overridden
* @throws IOException never, unless overridden.
*/
public IIOMetadata getImageMetadata(int pImageIndex) throws IOException {
public IIOMetadata getImageMetadata(int imageIndex) throws IOException {
return null;
}
@@ -151,11 +151,11 @@ public abstract class ImageReaderBase extends ImageReader {
/**
* Default implementation that always returns {@code 1}.
*
* @param pAllowSearch ignored, unless overridden
* @param allowSearch ignored, unless overridden
* @return {@code 1}, unless overridden
* @throws IOException never, unless overridden
*/
public int getNumImages(boolean pAllowSearch) throws IOException {
public int getNumImages(boolean allowSearch) throws IOException {
assertInput();
return 1;
}
@@ -163,18 +163,18 @@ public abstract class ImageReaderBase extends ImageReader {
/**
* Convenience method to make sure image index is within bounds.
*
* @param pIndex the image index
* @param index the image index
*
* @throws java.io.IOException if an error occurs during reading
* @throws IndexOutOfBoundsException if not {@code minIndex <= pIndex < numImages}
* @throws IndexOutOfBoundsException if not {@code minIndex <= index < numImages}
*/
protected void checkBounds(int pIndex) throws IOException {
protected void checkBounds(int index) throws IOException {
assertInput();
if (pIndex < getMinIndex()) {
if (index < getMinIndex()) {
throw new IndexOutOfBoundsException("index < minIndex");
}
else if (getNumImages(false) != -1 && pIndex >= getNumImages(false)) {
throw new IndexOutOfBoundsException("index >= numImages (" + pIndex + " >= " + getNumImages(false) + ")");
else if (getNumImages(false) != -1 && index >= getNumImages(false)) {
throw new IndexOutOfBoundsException("index >= numImages (" + index + " >= " + getNumImages(false) + ")");
}
}
@@ -65,10 +65,10 @@ public abstract class ImageWriterBase extends ImageWriter {
* the extension object is unsuitable, an
* {@code IllegalArgumentException} should be thrown.
*
* @param pProvider the {@code ImageWriterSpi} that is constructing this object, or {@code null}.
* @param provider the {@code ImageWriterSpi} that is constructing this object, or {@code null}.
*/
protected ImageWriterBase(final ImageWriterSpi pProvider) {
super(pProvider);
protected ImageWriterBase(final ImageWriterSpi provider) {
super(provider);
}
public String getFormatName() throws IOException {
@@ -76,11 +76,11 @@ public abstract class ImageWriterBase extends ImageWriter {
}
@Override
public void setOutput(final Object pOutput) {
super.setOutput(pOutput);
public void setOutput(final Object output) {
super.setOutput(output);
if (pOutput instanceof ImageOutputStream) {
imageOutput = (ImageOutputStream) pOutput;
if (output instanceof ImageOutputStream) {
imageOutput = (ImageOutputStream) output;
}
}
@@ -98,21 +98,21 @@ public abstract class ImageWriterBase extends ImageWriter {
/**
* Returns {@code null}
*
* @param pParam ignored.
* @param param ignored.
* @return {@code null}.
*/
public IIOMetadata getDefaultStreamMetadata(final ImageWriteParam pParam) {
public IIOMetadata getDefaultStreamMetadata(final ImageWriteParam param) {
return null;
}
/**
* Returns {@code null}
*
* @param pInData ignored.
* @param pParam ignored.
* @param inData ignored.
* @param param ignored.
* @return {@code null}.
*/
public IIOMetadata convertStreamMetadata(final IIOMetadata pInData, final ImageWriteParam pParam) {
public IIOMetadata convertStreamMetadata(final IIOMetadata inData, final ImageWriteParam param) {
return null;
}
@@ -44,51 +44,51 @@ public abstract class ProgressListenerBase implements IIOReadProgressListener, I
protected ProgressListenerBase() {
}
public void imageComplete(ImageReader pSource) {
public void imageComplete(ImageReader source) {
}
public void imageProgress(ImageReader pSource, float pPercentageDone) {
public void imageProgress(ImageReader source, float percentageDone) {
}
public void imageStarted(ImageReader pSource, int pImageIndex) {
public void imageStarted(ImageReader source, int imageIndex) {
}
public void readAborted(ImageReader pSource) {
public void readAborted(ImageReader source) {
}
public void sequenceComplete(ImageReader pSource) {
public void sequenceComplete(ImageReader source) {
}
public void sequenceStarted(ImageReader pSource, int pMinIndex) {
public void sequenceStarted(ImageReader source, int minIndex) {
}
public void thumbnailComplete(ImageReader pSource) {
public void thumbnailComplete(ImageReader source) {
}
public void thumbnailProgress(ImageReader pSource, float pPercentageDone) {
public void thumbnailProgress(ImageReader source, float percentageDone) {
}
public void thumbnailStarted(ImageReader pSource, int pImageIndex, int pThumbnailIndex) {
public void thumbnailStarted(ImageReader source, int imageIndex, int thumbnailIndex) {
}
public void imageComplete(ImageWriter pSource) {
public void imageComplete(ImageWriter source ) {
}
public void imageProgress(ImageWriter pSource, float pPercentageDone) {
public void imageProgress(ImageWriter source, float percentageDone) {
}
public void imageStarted(ImageWriter pSource, int pImageIndex) {
public void imageStarted(ImageWriter source, int imageIndex) {
}
public void thumbnailComplete(ImageWriter pSource) {
public void thumbnailComplete(ImageWriter source) {
}
public void thumbnailProgress(ImageWriter pSource, float pPercentageDone) {
public void thumbnailProgress(ImageWriter source, float percentageDone) {
}
public void thumbnailStarted(ImageWriter pSource, int pImageIndex, int pThumbnailIndex) {
public void thumbnailStarted(ImageWriter source, int imageIndex, int thumbnailIndex) {
}
public void writeAborted(ImageWriter pSource) {
public void writeAborted(ImageWriter source) {
}
}