Author: britter Date: Sat Dec 27 19:49:21 2014 New Revision: 1648098 URL: http://svn.apache.org/r1648098 Log: Replace compression algorithm constants with enum
Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/ImageInfo.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/gif/GifImageParser.java commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/icns/IcnsImageParser.java commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/JpegImageParser.java commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/pcx/PcxImageParser.java commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/png/PngImageInfo.java commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/png/PngImageParser.java commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/pnm/PnmImageParser.java commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/psd/PsdImageParser.java commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/rgbe/RgbeImageParser.java commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/TiffImageParser.java commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/wbmp/WbmpImageParser.java commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/xbm/XbmImageParser.java commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/xpm/XpmImageParser.java Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/ImageInfo.java URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/ImageInfo.java?rev=1648098&r1=1648097&r2=1648098&view=diff ============================================================================== --- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/ImageInfo.java (original) +++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/ImageInfo.java Sat Dec 27 19:49:21 2014 @@ -50,6 +50,32 @@ public class ImageInfo { } } + public static enum CompressionAlgorithm { + UNKNOWN("Unknown"), + NONE("None"), + LZW("LZW"), + PACKBITS("PackBits"), + JPEG("JPEG"), + RLE("RLE: Run-Length Encoding"), + ADAPTIVE_RLE("Adaptive RLE"), + PSD("Photoshop"), + PNG_FILTER("PNG Filter"), + CCITT_GROUP_3("CCITT Group 3 1-Dimensional Modified Huffman run-length encoding."), + CCITT_GROUP_4("CCITT Group 4"), + CCITT_1D("CCITT 1D"); + + private String description; + + CompressionAlgorithm(String description) { + this.description = description; + } + + @Override + public String toString() { + return description; + } + } + private final String formatDetails; // ie version private final int bitsPerPixel; @@ -73,19 +99,7 @@ public class ImageInfo { private final ColorType colorType; - public static final String COMPRESSION_ALGORITHM_UNKNOWN = "Unknown"; - public static final String COMPRESSION_ALGORITHM_NONE = "None"; - public static final String COMPRESSION_ALGORITHM_LZW = "LZW"; - public static final String COMPRESSION_ALGORITHM_PACKBITS = "PackBits"; - public static final String COMPRESSION_ALGORITHM_JPEG = "JPEG"; - public static final String COMPRESSION_ALGORITHM_RLE = "RLE: Run-Length Encoding"; - public static final String COMPRESSION_ALGORITHM_PSD = "Photoshop"; - public static final String COMPRESSION_ALGORITHM_PNG_FILTER = "PNG Filter"; - public static final String COMPRESSION_ALGORITHM_CCITT_GROUP_3 = "CCITT Group 3 1-Dimensional Modified Huffman run-length encoding."; - public static final String COMPRESSION_ALGORITHM_CCITT_GROUP_4 = "CCITT Group 4"; - public static final String COMPRESSION_ALGORITHM_CCITT_1D = "CCITT 1D"; - - private final String compressionAlgorithm; + private final CompressionAlgorithm compressionAlgorithm; public ImageInfo(final String formatDetails, final int bitsPerPixel, final List<String> comments, final ImageFormat format, final String formatName, @@ -93,7 +107,7 @@ public class ImageInfo { final int physicalHeightDpi, final float physicalHeightInch, final int physicalWidthDpi, final float physicalWidthInch, final int width, final boolean progressive, final boolean transparent, final boolean usesPalette, - final ColorType colorType, final String compressionAlgorithm) { + final ColorType colorType, final CompressionAlgorithm compressionAlgorithm) { this.formatDetails = formatDetails; this.bitsPerPixel = bitsPerPixel; @@ -333,7 +347,7 @@ public class ImageInfo { /** * Returns a description of the compression algorithm, if any. */ - public String getCompressionAlgorithm() { + public CompressionAlgorithm getCompressionAlgorithm() { return compressionAlgorithm; } 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=1648098&r1=1648097&r2=1648098&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 Sat Dec 27 19:49:21 2014 @@ -617,7 +617,7 @@ public class BmpImageParser extends Imag final boolean usesPalette = colorTable != null; final ImageInfo.ColorType colorType = ImageInfo.ColorType.RGB; - final String compressionAlgorithm = ImageInfo.COMPRESSION_ALGORITHM_RLE; + final ImageInfo.CompressionAlgorithm compressionAlgorithm = ImageInfo.CompressionAlgorithm.RLE; return new ImageInfo(formatDetails, bitsPerPixel, comments, format, name, height, mimeType, numberOfImages, Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/gif/GifImageParser.java URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/gif/GifImageParser.java?rev=1648098&r1=1648097&r2=1648098&view=diff ============================================================================== --- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/gif/GifImageParser.java (original) +++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/gif/GifImageParser.java Sat Dec 27 19:49:21 2014 @@ -570,7 +570,7 @@ public class GifImageParser extends Imag final boolean usesPalette = true; final ImageInfo.ColorType colorType = ImageInfo.ColorType.RGB; - final String compressionAlgorithm = ImageInfo.COMPRESSION_ALGORITHM_LZW; + final ImageInfo.CompressionAlgorithm compressionAlgorithm = ImageInfo.CompressionAlgorithm.LZW; return new ImageInfo(formatDetails, bitsPerPixel, comments, format, formatName, height, mimeType, numberOfImages, Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/icns/IcnsImageParser.java URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/icns/IcnsImageParser.java?rev=1648098&r1=1648097&r2=1648098&view=diff ============================================================================== --- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/icns/IcnsImageParser.java (original) +++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/icns/IcnsImageParser.java Sat Dec 27 19:49:21 2014 @@ -104,7 +104,7 @@ public class IcnsImageParser extends Ima image0.getHeight(), "image/x-icns", images.size(), 0, 0, 0, 0, image0.getWidth(), false, true, false, ImageInfo.ColorType.RGB, - ImageInfo.COMPRESSION_ALGORITHM_UNKNOWN); + ImageInfo.CompressionAlgorithm.UNKNOWN); } @Override Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/JpegImageParser.java URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/JpegImageParser.java?rev=1648098&r1=1648097&r2=1648098&view=diff ============================================================================== --- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/JpegImageParser.java (original) +++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/JpegImageParser.java Sat Dec 27 19:49:21 2014 @@ -936,7 +936,7 @@ public class JpegImageParser extends Ima } } - final String compressionAlgorithm = ImageInfo.COMPRESSION_ALGORITHM_JPEG; + final ImageInfo.CompressionAlgorithm compressionAlgorithm = ImageInfo.CompressionAlgorithm.JPEG; return new ImageInfo(formatDetails, bitsPerPixel, comments, format, formatName, height, mimeType, numberOfImages, Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/pcx/PcxImageParser.java URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/pcx/PcxImageParser.java?rev=1648098&r1=1648097&r2=1648098&view=diff ============================================================================== --- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/pcx/PcxImageParser.java (original) +++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/pcx/PcxImageParser.java Sat Dec 27 19:49:21 2014 @@ -122,8 +122,8 @@ public class PcxImageParser extends Imag false, !(pcxHeader.nPlanes == 3 && pcxHeader.bitsPerPixel == 8), ImageInfo.ColorType.RGB, - pcxHeader.encoding == PcxHeader.ENCODING_RLE ? ImageInfo.COMPRESSION_ALGORITHM_RLE - : ImageInfo.COMPRESSION_ALGORITHM_NONE); + pcxHeader.encoding == PcxHeader.ENCODING_RLE ? ImageInfo.CompressionAlgorithm.RLE + : ImageInfo.CompressionAlgorithm.NONE); } @Override Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/png/PngImageInfo.java URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/png/PngImageInfo.java?rev=1648098&r1=1648097&r2=1648098&view=diff ============================================================================== --- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/png/PngImageInfo.java (original) +++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/png/PngImageInfo.java Sat Dec 27 19:49:21 2014 @@ -31,7 +31,7 @@ public class PngImageInfo extends ImageI final int physicalHeightDpi, final float physicalHeightInch, final int physicalWidthDpi, final float physicalWidthInch, final int width, final boolean progressive, final boolean transparent, final boolean usesPalette, - final ImageInfo.ColorType colorType, final String compressionAlgorithm, + final ColorType colorType, final CompressionAlgorithm compressionAlgorithm, final List<PngText> textChunks) { super(formatDetails, bitsPerPixel, comments, format, formatName, height, mimeType, numberOfImages, physicalHeightDpi, Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/png/PngImageParser.java URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/png/PngImageParser.java?rev=1648098&r1=1648097&r2=1648098&view=diff ============================================================================== --- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/png/PngImageParser.java (original) +++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/png/PngImageParser.java Sat Dec 27 19:49:21 2014 @@ -459,7 +459,7 @@ public class PngImageParser extends Imag throw new ImageReadException("Png: Unknown ColorType: " + pngChunkIHDR.pngColorType); } - final String compressionAlgorithm = ImageInfo.COMPRESSION_ALGORITHM_PNG_FILTER; + final ImageInfo.CompressionAlgorithm compressionAlgorithm = ImageInfo.CompressionAlgorithm.PNG_FILTER; return new PngImageInfo(formatDetails, bitsPerPixel, comments, format, formatName, height, mimeType, numberOfImages, Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/pnm/PnmImageParser.java URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/pnm/PnmImageParser.java?rev=1648098&r1=1648097&r2=1648098&view=diff ============================================================================== --- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/pnm/PnmImageParser.java (original) +++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/pnm/PnmImageParser.java Sat Dec 27 19:49:21 2014 @@ -255,7 +255,7 @@ public class PnmImageParser extends Imag final boolean usesPalette = false; final ImageInfo.ColorType colorType = info.getColorType(); - final String compressionAlgorithm = ImageInfo.COMPRESSION_ALGORITHM_NONE; + final ImageInfo.CompressionAlgorithm compressionAlgorithm = ImageInfo.CompressionAlgorithm.NONE; return new ImageInfo(formatDetails, bitsPerPixel, comments, format, formatName, info.height, mimeType, numberOfImages, Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/psd/PsdImageParser.java URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/psd/PsdImageParser.java?rev=1648098&r1=1648097&r2=1648098&view=diff ============================================================================== --- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/psd/PsdImageParser.java (original) +++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/psd/PsdImageParser.java Sat Dec 27 19:49:21 2014 @@ -519,16 +519,16 @@ public class PsdImageParser extends Imag final boolean usesPalette = header.mode == COLOR_MODE_INDEXED; final ImageInfo.ColorType colorType = ImageInfo.ColorType.UNKNOWN; - String compressionAlgorithm; + ImageInfo.CompressionAlgorithm compressionAlgorithm; switch (imageContents.Compression) { case 0: - compressionAlgorithm = ImageInfo.COMPRESSION_ALGORITHM_NONE; + compressionAlgorithm = ImageInfo.CompressionAlgorithm.NONE; break; case 1: - compressionAlgorithm = ImageInfo.COMPRESSION_ALGORITHM_PSD; + compressionAlgorithm = ImageInfo.CompressionAlgorithm.PSD; break; default: - compressionAlgorithm = ImageInfo.COMPRESSION_ALGORITHM_UNKNOWN; + compressionAlgorithm = ImageInfo.CompressionAlgorithm.UNKNOWN; } return new ImageInfo(formatDetails, BitsPerPixel, comments, Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/rgbe/RgbeImageParser.java URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/rgbe/RgbeImageParser.java?rev=1648098&r1=1648097&r2=1648098&view=diff ============================================================================== --- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/rgbe/RgbeImageParser.java (original) +++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/rgbe/RgbeImageParser.java Sat Dec 27 19:49:21 2014 @@ -97,7 +97,7 @@ public class RgbeImageParser extends Ima new ArrayList<String>(), ImageFormats.RGBE, getName(), info.getHeight(), "image/vnd.radiance", 1, -1, -1, -1, -1, info.getWidth(), false, false, false, - ImageInfo.ColorType.RGB, "Adaptive RLE"); + ImageInfo.ColorType.RGB, ImageInfo.CompressionAlgorithm.ADAPTIVE_RLE); canThrow = true; return ret; } finally { Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/TiffImageParser.java URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/TiffImageParser.java?rev=1648098&r1=1648097&r2=1648098&view=diff ============================================================================== --- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/TiffImageParser.java (original) +++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/TiffImageParser.java Sat Dec 27 19:49:21 2014 @@ -261,35 +261,35 @@ public class TiffImageParser extends Ima final int compression = 0xffff & directory .getSingleFieldValue(TiffTagConstants.TIFF_TAG_COMPRESSION); - String compressionAlgorithm; + ImageInfo.CompressionAlgorithm compressionAlgorithm; switch (compression) { case TIFF_COMPRESSION_UNCOMPRESSED_1: - compressionAlgorithm = ImageInfo.COMPRESSION_ALGORITHM_NONE; + compressionAlgorithm = ImageInfo.CompressionAlgorithm.NONE; break; case TIFF_COMPRESSION_CCITT_1D: - compressionAlgorithm = ImageInfo.COMPRESSION_ALGORITHM_CCITT_1D; + compressionAlgorithm = ImageInfo.CompressionAlgorithm.CCITT_1D; break; case TIFF_COMPRESSION_CCITT_GROUP_3: - compressionAlgorithm = ImageInfo.COMPRESSION_ALGORITHM_CCITT_GROUP_3; + compressionAlgorithm = ImageInfo.CompressionAlgorithm.CCITT_GROUP_3; break; case TIFF_COMPRESSION_CCITT_GROUP_4: - compressionAlgorithm = ImageInfo.COMPRESSION_ALGORITHM_CCITT_GROUP_4; + compressionAlgorithm = ImageInfo.CompressionAlgorithm.CCITT_GROUP_4; break; case TIFF_COMPRESSION_LZW: - compressionAlgorithm = ImageInfo.COMPRESSION_ALGORITHM_LZW; + compressionAlgorithm = ImageInfo.CompressionAlgorithm.LZW; break; case TIFF_COMPRESSION_JPEG: - compressionAlgorithm = ImageInfo.COMPRESSION_ALGORITHM_JPEG; + compressionAlgorithm = ImageInfo.CompressionAlgorithm.JPEG; break; case TIFF_COMPRESSION_UNCOMPRESSED_2: - compressionAlgorithm = ImageInfo.COMPRESSION_ALGORITHM_NONE; + compressionAlgorithm = ImageInfo.CompressionAlgorithm.NONE; break; case TIFF_COMPRESSION_PACKBITS: - compressionAlgorithm = ImageInfo.COMPRESSION_ALGORITHM_PACKBITS; + compressionAlgorithm = ImageInfo.CompressionAlgorithm.PACKBITS; break; default: - compressionAlgorithm = ImageInfo.COMPRESSION_ALGORITHM_UNKNOWN; + compressionAlgorithm = ImageInfo.CompressionAlgorithm.UNKNOWN; break; } Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/wbmp/WbmpImageParser.java URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/wbmp/WbmpImageParser.java?rev=1648098&r1=1648097&r2=1648098&view=diff ============================================================================== --- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/wbmp/WbmpImageParser.java (original) +++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/wbmp/WbmpImageParser.java Sat Dec 27 19:49:21 2014 @@ -84,7 +84,7 @@ public class WbmpImageParser extends Ima "Wireless Application Protocol Bitmap", wbmpHeader.height, "image/vnd.wap.wbmp", 1, 0, 0, 0, 0, wbmpHeader.width, false, false, false, ImageInfo.ColorType.BW, - ImageInfo.COMPRESSION_ALGORITHM_NONE); + ImageInfo.CompressionAlgorithm.NONE); } @Override Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/xbm/XbmImageParser.java URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/xbm/XbmImageParser.java?rev=1648098&r1=1648097&r2=1648098&view=diff ============================================================================== --- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/xbm/XbmImageParser.java (original) +++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/xbm/XbmImageParser.java Sat Dec 27 19:49:21 2014 @@ -88,7 +88,7 @@ public class XbmImageParser extends Imag ImageFormats.XBM, "X BitMap", xbmHeader.height, "image/x-xbitmap", 1, 0, 0, 0, 0, xbmHeader.width, false, false, false, ImageInfo.ColorType.BW, - ImageInfo.COMPRESSION_ALGORITHM_NONE); + ImageInfo.CompressionAlgorithm.NONE); } @Override Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/xpm/XpmImageParser.java URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/xpm/XpmImageParser.java?rev=1648098&r1=1648097&r2=1648098&view=diff ============================================================================== --- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/xpm/XpmImageParser.java (original) +++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/xpm/XpmImageParser.java Sat Dec 27 19:49:21 2014 @@ -162,7 +162,7 @@ public class XpmImageParser extends Imag new ArrayList<String>(), ImageFormats.XPM, "X PixMap", xpmHeader.height, "image/x-xpixmap", 1, 0, 0, 0, 0, xpmHeader.width, false, transparent, true, colorType, - ImageInfo.COMPRESSION_ALGORITHM_NONE); + ImageInfo.CompressionAlgorithm.NONE); } @Override