Author: damjan Date: Wed Sep 26 19:05:35 2012 New Revision: 1390675 URL: http://svn.apache.org/viewvc?rev=1390675&view=rev Log: Fix various PMD and Findbugs issues.
Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/color/ColorCieLab.java commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/color/ColorCmy.java commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/color/ColorCmyk.java commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/color/ColorConversions.java commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/color/ColorHsl.java commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/color/ColorHsv.java commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/color/ColorHunterLab.java commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/color/ColorXyz.java commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/common/BasicCParser.java commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/common/PackBits.java commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/common/bytesource/ByteSource.java commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/common/bytesource/ByteSourceFile.java commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/common/itu_t4/T4AndT6Compression.java commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/common/mylzw/MyLzwCompressor.java commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/common/mylzw/MyLzwDecompressor.java commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/bmp/BmpImageParser.java commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/dcx/DcxImageParser.java commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/pnm/WhiteSpaceReader.java commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/palette/package-info.java commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/util/Debug.java Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/color/ColorCieLab.java URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/color/ColorCieLab.java?rev=1390675&r1=1390674&r2=1390675&view=diff ============================================================================== --- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/color/ColorCieLab.java (original) +++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/color/ColorCieLab.java Wed Sep 26 19:05:35 2012 @@ -26,7 +26,7 @@ public final class ColorCieLab { } @Override - public final String toString() { + public String toString() { return "{L: " + L + ", a: " + a + ", b: " + b + "}"; } } Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/color/ColorCmy.java URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/color/ColorCmy.java?rev=1390675&r1=1390674&r2=1390675&view=diff ============================================================================== --- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/color/ColorCmy.java (original) +++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/color/ColorCmy.java Wed Sep 26 19:05:35 2012 @@ -26,7 +26,7 @@ public final class ColorCmy { } @Override - public final String toString() { + public String toString() { return "{C: " + C + ", M: " + M + ", Y: " + Y + "}"; } } Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/color/ColorCmyk.java URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/color/ColorCmyk.java?rev=1390675&r1=1390674&r2=1390675&view=diff ============================================================================== --- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/color/ColorCmyk.java (original) +++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/color/ColorCmyk.java Wed Sep 26 19:05:35 2012 @@ -27,7 +27,7 @@ public final class ColorCmyk { } @Override - public final String toString() { + public String toString() { return "{C: " + C + ", M: " + M + ", Y: " + Y + ", K: " + K + "}"; } } Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/color/ColorConversions.java URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/color/ColorConversions.java?rev=1390675&r1=1390674&r2=1390675&view=diff ============================================================================== --- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/color/ColorConversions.java (original) +++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/color/ColorConversions.java Wed Sep 26 19:05:35 2012 @@ -16,7 +16,6 @@ */ package org.apache.commons.imaging.color; -import org.apache.commons.imaging.util.Debug; public abstract class ColorConversions { public static final ColorCieLab convertXYZtoCIELab(ColorXyz xyz) { Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/color/ColorHsl.java URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/color/ColorHsl.java?rev=1390675&r1=1390674&r2=1390675&view=diff ============================================================================== --- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/color/ColorHsl.java (original) +++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/color/ColorHsl.java Wed Sep 26 19:05:35 2012 @@ -26,7 +26,7 @@ public final class ColorHsl { } @Override - public final String toString() { + public String toString() { return "{H: " + H + ", S: " + S + ", L: " + L + "}"; } } Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/color/ColorHsv.java URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/color/ColorHsv.java?rev=1390675&r1=1390674&r2=1390675&view=diff ============================================================================== --- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/color/ColorHsv.java (original) +++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/color/ColorHsv.java Wed Sep 26 19:05:35 2012 @@ -26,7 +26,7 @@ public final class ColorHsv { } @Override - public final String toString() { + public String toString() { return "{H: " + H + ", S: " + S + ", V: " + V + "}"; } } Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/color/ColorHunterLab.java URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/color/ColorHunterLab.java?rev=1390675&r1=1390674&r2=1390675&view=diff ============================================================================== --- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/color/ColorHunterLab.java (original) +++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/color/ColorHunterLab.java Wed Sep 26 19:05:35 2012 @@ -26,7 +26,7 @@ public final class ColorHunterLab { } @Override - public final String toString() { + public String toString() { return "{L: " + L + ", a: " + a + ", b: " + b + "}"; } } Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/color/ColorXyz.java URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/color/ColorXyz.java?rev=1390675&r1=1390674&r2=1390675&view=diff ============================================================================== --- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/color/ColorXyz.java (original) +++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/color/ColorXyz.java Wed Sep 26 19:05:35 2012 @@ -26,7 +26,7 @@ public final class ColorXyz { } @Override - public final String toString() { + public String toString() { return "{X: " + X + ", Y: " + Y + ", Z: " + Z + "}"; } } Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/common/BasicCParser.java URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/common/BasicCParser.java?rev=1390675&r1=1390674&r2=1390675&view=diff ============================================================================== --- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/common/BasicCParser.java (original) +++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/common/BasicCParser.java Wed Sep 26 19:05:35 2012 @@ -74,10 +74,8 @@ public class BasicCParser { || c == '*' || c == ';' || c == '=' || c == ',') { token.append((char) c); return token.toString(); - } else if (c == ' ' || c == '\t' || c == '\r' || c == '\n') { /* - * do - * nothing - */ + } else if (c == ' ' || c == '\t' || c == '\r' || c == '\n') { + // ignore } else throw new ImageReadException( "Unhandled/invalid character '" + ((char) c) Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/common/PackBits.java URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/common/PackBits.java?rev=1390675&r1=1390674&r2=1390675&view=diff ============================================================================== --- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/common/PackBits.java (original) +++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/common/PackBits.java Wed Sep 26 19:05:35 2012 @@ -116,9 +116,7 @@ public class PackBits { bytes.length * 2); // max length 1 extra byte for every 128 int ptr = 0; - int count = 0; while (ptr < bytes.length) { - count++; int dup = findNextDuplicate(bytes, ptr); if (dup == ptr) // write run length Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/common/bytesource/ByteSource.java URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/common/bytesource/ByteSource.java?rev=1390675&r1=1390674&r2=1390675&view=diff ============================================================================== --- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/common/bytesource/ByteSource.java (original) +++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/common/bytesource/ByteSource.java Wed Sep 26 19:05:35 2012 @@ -36,10 +36,8 @@ public abstract class ByteSource extends skipBytes(is, start); succeeded = true; } finally { - if (!succeeded) { - if (is != null) { - is.close(); - } + if (!succeeded && is != null) { + is.close(); } } return is; Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/common/bytesource/ByteSourceFile.java URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/common/bytesource/ByteSourceFile.java?rev=1390675&r1=1390674&r2=1390675&view=diff ============================================================================== --- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/common/bytesource/ByteSourceFile.java (original) +++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/common/bytesource/ByteSourceFile.java Wed Sep 26 19:05:35 2012 @@ -96,7 +96,7 @@ public class ByteSourceFile extends Byte if (null != is) is.close(); } catch (IOException e) { - // Debug.d + Debug.debug(e); } } } Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/common/itu_t4/T4AndT6Compression.java URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/common/itu_t4/T4AndT6Compression.java?rev=1390675&r1=1390674&r2=1390675&view=diff ============================================================================== --- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/common/itu_t4/T4AndT6Compression.java (original) +++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/common/itu_t4/T4AndT6Compression.java Wed Sep 26 19:05:35 2012 @@ -23,14 +23,15 @@ import org.apache.commons.imaging.ImageR import org.apache.commons.imaging.ImageWriteException; import org.apache.commons.imaging.common.BitArrayOutputStream; import org.apache.commons.imaging.common.BitInputStreamFlexible; +import org.apache.commons.imaging.util.Debug; public class T4AndT6Compression { private static final HuffmanTree whiteRunLengths = new HuffmanTree(); private static final HuffmanTree blackRunLengths = new HuffmanTree(); private static final HuffmanTree controlCodes = new HuffmanTree(); - private static final int WHITE = 0; - private static final int BLACK = 1; + public static final int WHITE = 0; + public static final int BLACK = 1; static { try { @@ -80,6 +81,7 @@ public class T4AndT6Compression { controlCodes.insert(T4_T6_Tables.VR2.bitString, T4_T6_Tables.VR2); controlCodes.insert(T4_T6_Tables.VR3.bitString, T4_T6_Tables.VR3); } catch (HuffmanTreeException cannotHappen) { + Debug.debug(cannotHappen); } } Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/common/mylzw/MyLzwCompressor.java URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/common/mylzw/MyLzwCompressor.java?rev=1390675&r1=1390674&r2=1390675&view=diff ============================================================================== --- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/common/mylzw/MyLzwCompressor.java (original) +++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/common/mylzw/MyLzwCompressor.java Wed Sep 26 19:05:35 2012 @@ -114,12 +114,12 @@ public class MyLzwCompressor { } @Override - public final int hashCode() { + public int hashCode() { return hash; } @Override - public final boolean equals(Object o) { + public boolean equals(Object o) { if (o instanceof ByteArray) { ByteArray other = (ByteArray) o; if (other.hash != hash) Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/common/mylzw/MyLzwDecompressor.java URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/common/mylzw/MyLzwDecompressor.java?rev=1390675&r1=1390674&r2=1390675&view=diff ============================================================================== --- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/common/mylzw/MyLzwDecompressor.java (original) +++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/common/mylzw/MyLzwDecompressor.java Wed Sep 26 19:05:35 2012 @@ -60,7 +60,7 @@ public final class MyLzwDecompressor { InitializeTable(); } - private final void InitializeTable() { + private void InitializeTable() { codeSize = initialCodeSize; int intial_entries_count = 1 << codeSize + 2; @@ -69,7 +69,7 @@ public final class MyLzwDecompressor { table[i] = new byte[] { (byte) i, }; } - private final void clearTable() { + private void clearTable() { codes = (1 << initialCodeSize) + 2; codeSize = initialCodeSize; incrementCodeSize(); @@ -78,7 +78,7 @@ public final class MyLzwDecompressor { private final int clearCode; private final int eoiCode; - private final int getNextCode(MyBitInputStream is) throws IOException { + private int getNextCode(MyBitInputStream is) throws IOException { int code = is.readBits(codeSize); if (null != listener) @@ -86,7 +86,7 @@ public final class MyLzwDecompressor { return code; } - private final byte[] stringFromCode(int code) throws IOException { + private byte[] stringFromCode(int code) throws IOException { if ((code >= codes) || (code < 0)) throw new IOException("Bad Code: " + code + " codes: " + codes + " code_size: " + codeSize + ", table: " + table.length); @@ -94,15 +94,15 @@ public final class MyLzwDecompressor { return table[code]; } - private final boolean isInTable(int Code) { + private boolean isInTable(int Code) { return Code < codes; } - private final byte firstChar(byte bytes[]) { + private byte firstChar(byte bytes[]) { return bytes[0]; } - private final void addStringToTable(byte bytes[]) throws IOException { + private void addStringToTable(byte bytes[]) throws IOException { if (codes < (1 << codeSize)) { table[codes] = bytes; codes++; @@ -113,7 +113,7 @@ public final class MyLzwDecompressor { checkCodeSize(); } - private final byte[] appendBytes(byte bytes[], byte b) { + private byte[] appendBytes(byte bytes[], byte b) { byte result[] = new byte[bytes.length + 1]; System.arraycopy(bytes, 0, result, 0, bytes.length); @@ -123,7 +123,7 @@ public final class MyLzwDecompressor { private int written = 0; - private final void writeToResult(OutputStream os, byte bytes[]) + private void writeToResult(OutputStream os, byte bytes[]) throws IOException { os.write(bytes); written += bytes.length; @@ -186,7 +186,7 @@ public final class MyLzwDecompressor { return result; } - private final void checkCodeSize() // throws IOException + private void checkCodeSize() // throws IOException { int limit = (1 << codeSize); if (tiffLZWMode) @@ -196,7 +196,7 @@ public final class MyLzwDecompressor { incrementCodeSize(); } - private final void incrementCodeSize() // throws IOException + private void incrementCodeSize() // throws IOException { if (codeSize != 12) codeSize++; Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/bmp/BmpImageParser.java URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/bmp/BmpImageParser.java?rev=1390675&r1=1390674&r2=1390675&view=diff ============================================================================== --- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/bmp/BmpImageParser.java (original) +++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/bmp/BmpImageParser.java Wed Sep 26 19:05:35 2012 @@ -592,6 +592,7 @@ public class BmpImageParser extends Imag try { is.close(); } catch (IOException ignore) { + Debug.debug(ignore); } } } @@ -678,6 +679,7 @@ public class BmpImageParser extends Imag try { is.close(); } catch (IOException ignore) { + Debug.debug(ignore); } } } @@ -697,6 +699,7 @@ public class BmpImageParser extends Imag try { is.close(); } catch (IOException ignore) { + Debug.debug(ignore); } } } Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/dcx/DcxImageParser.java URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/dcx/DcxImageParser.java?rev=1390675&r1=1390674&r2=1390675&view=diff ============================================================================== --- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/dcx/DcxImageParser.java (original) +++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/dcx/DcxImageParser.java Wed Sep 26 19:05:35 2012 @@ -40,6 +40,7 @@ import org.apache.commons.imaging.common import org.apache.commons.imaging.common.bytesource.ByteSourceInputStream; import org.apache.commons.imaging.formats.pcx.PcxConstants; import org.apache.commons.imaging.formats.pcx.PcxImageParser; +import org.apache.commons.imaging.util.Debug; public class DcxImageParser extends ImageParser { // See http://www.fileformat.info/format/pcx/egff.htm for documentation @@ -154,6 +155,7 @@ public class DcxImageParser extends Imag is.close(); } } catch (IOException ignored) { + Debug.debug(ignored); } } } @@ -194,6 +196,7 @@ public class DcxImageParser extends Imag if (stream != null) stream.close(); } catch (IOException ignored) { + Debug.debug(ignored); } } } Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/pnm/WhiteSpaceReader.java URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/pnm/WhiteSpaceReader.java?rev=1390675&r1=1390674&r2=1390675&view=diff ============================================================================== --- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/pnm/WhiteSpaceReader.java (original) +++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/pnm/WhiteSpaceReader.java Wed Sep 26 19:05:35 2012 @@ -26,8 +26,6 @@ class WhiteSpaceReader { this.is = is; } - int count = 0; - private char read() throws IOException { int result = is.read(); if (result < 0) Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/palette/package-info.java URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/palette/package-info.java?rev=1390675&r1=1390674&r2=1390675&view=diff ============================================================================== --- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/palette/package-info.java (original) +++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/palette/package-info.java Wed Sep 26 19:05:35 2012 @@ -18,4 +18,4 @@ /** * Color quantization and palette manipulation tools. */ -package org.apache.commons.imaging.palette; \ No newline at end of file +package org.apache.commons.imaging.palette; Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/util/Debug.java URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/util/Debug.java?rev=1390675&r1=1390674&r2=1390675&view=diff ============================================================================== --- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/util/Debug.java (original) +++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/util/Debug.java Wed Sep 26 19:05:35 2012 @@ -247,7 +247,7 @@ public final class Debug { return result; } - private static final String byteQuadToString(int bytequad) { + private static String byteQuadToString(int bytequad) { byte b1 = (byte) ((bytequad >> 24) & 0xff); byte b2 = (byte) ((bytequad >> 16) & 0xff); byte b3 = (byte) ((bytequad >> 8) & 0xff); @@ -788,7 +788,7 @@ public final class Debug { } } - public static final void purgeMemory() { + public static void purgeMemory() { // try // { // // Thread.sleep(50);