Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/constants/WangTagConstants.java URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/constants/WangTagConstants.java?rev=1655143&r1=1655142&r2=1655143&view=diff ============================================================================== --- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/constants/WangTagConstants.java (original) +++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/constants/WangTagConstants.java Tue Jan 27 20:15:19 2015 @@ -27,12 +27,16 @@ import org.apache.commons.imaging.format * Wang/Eastman Software/Kodac/eiStream/Imaging for Windows tags, * undocumented and in need of more work. */ -public interface WangTagConstants { - TagInfoByte EXIF_TAG_WANG_ANNOTATION = new TagInfoByte( +public final class WangTagConstants { + + public static final TagInfoByte EXIF_TAG_WANG_ANNOTATION = new TagInfoByte( "WangAnnotation", 0x80a4, -1, TiffDirectoryType.EXIF_DIRECTORY_UNKNOWN); - List<TagInfo> ALL_WANG_TAGS = + public static final List<TagInfo> ALL_WANG_TAGS = Collections.unmodifiableList(Arrays.<TagInfo> asList( EXIF_TAG_WANG_ANNOTATION )); + + private WangTagConstants() { + } }
Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/write/TiffImageWriterBase.java URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/write/TiffImageWriterBase.java?rev=1655143&r1=1655142&r2=1655143&view=diff ============================================================================== --- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/write/TiffImageWriterBase.java (original) +++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/write/TiffImageWriterBase.java Tue Jan 27 20:15:19 2015 @@ -28,6 +28,7 @@ import java.util.List; import java.util.Map; import org.apache.commons.imaging.ImageWriteException; +import org.apache.commons.imaging.ImagingConstants; import org.apache.commons.imaging.PixelDensity; import org.apache.commons.imaging.common.BinaryOutputStream; import org.apache.commons.imaging.common.PackBits; @@ -37,6 +38,7 @@ import org.apache.commons.imaging.common import org.apache.commons.imaging.formats.tiff.TiffElement; import org.apache.commons.imaging.formats.tiff.TiffImageData; import org.apache.commons.imaging.formats.tiff.constants.ExifTagConstants; +import org.apache.commons.imaging.formats.tiff.constants.TiffDirectoryConstants; import org.apache.commons.imaging.formats.tiff.constants.TiffTagConstants; import static org.apache.commons.imaging.formats.tiff.constants.TiffConstants.*; @@ -85,7 +87,7 @@ public abstract class TiffImageWriterBas if (dirType < 0) { switch (dirType) { - case DIRECTORY_TYPE_EXIF: + case TiffDirectoryConstants.DIRECTORY_TYPE_EXIF: if (exifDirectory != null) { throw new ImageWriteException( "More than one EXIF directory."); @@ -93,7 +95,7 @@ public abstract class TiffImageWriterBas exifDirectory = directory; break; - case DIRECTORY_TYPE_GPS: + case TiffDirectoryConstants.DIRECTORY_TYPE_GPS: if (gpsDirectory != null) { throw new ImageWriteException( "More than one GPS directory."); @@ -101,7 +103,7 @@ public abstract class TiffImageWriterBas gpsDirectory = directory; break; - case DIRECTORY_TYPE_INTEROPERABILITY: + case TiffDirectoryConstants.DIRECTORY_TYPE_INTEROPERABILITY: if (interoperabilityDirectory != null) { throw new ImageWriteException( "More than one Interoperability directory."); @@ -179,7 +181,7 @@ public abstract class TiffImageWriterBas } final TiffOutputDirectory rootDirectory = directoryTypeMap - .get(DIRECTORY_TYPE_ROOT); + .get(TiffDirectoryConstants.DIRECTORY_TYPE_ROOT); // prepare results final TiffOutputSummary result = new TiffOutputSummary(byteOrder, @@ -247,23 +249,23 @@ public abstract class TiffImageWriterBas params = new HashMap<String, Object>(params); // clear format key. - if (params.containsKey(PARAM_KEY_FORMAT)) { - params.remove(PARAM_KEY_FORMAT); + if (params.containsKey(ImagingConstants.PARAM_KEY_FORMAT)) { + params.remove(ImagingConstants.PARAM_KEY_FORMAT); } TiffOutputSet userExif = null; - if (params.containsKey(PARAM_KEY_EXIF)) { - userExif = (TiffOutputSet) params.remove(PARAM_KEY_EXIF); + if (params.containsKey(ImagingConstants.PARAM_KEY_EXIF)) { + userExif = (TiffOutputSet) params.remove(ImagingConstants.PARAM_KEY_EXIF); } String xmpXml = null; - if (params.containsKey(PARAM_KEY_XMP_XML)) { - xmpXml = (String) params.get(PARAM_KEY_XMP_XML); - params.remove(PARAM_KEY_XMP_XML); + if (params.containsKey(ImagingConstants.PARAM_KEY_XMP_XML)) { + xmpXml = (String) params.get(ImagingConstants.PARAM_KEY_XMP_XML); + params.remove(ImagingConstants.PARAM_KEY_XMP_XML); } PixelDensity pixelDensity = (PixelDensity) params - .remove(PARAM_KEY_PIXEL_DENSITY); + .remove(ImagingConstants.PARAM_KEY_PIXEL_DENSITY); if (pixelDensity == null) { pixelDensity = PixelDensity.createFromPixelsPerInch(72, 72); } @@ -273,8 +275,8 @@ public abstract class TiffImageWriterBas int compression = TIFF_COMPRESSION_LZW; // LZW is default int stripSizeInBits = 64000; // the default from legacy implementation - if (params.containsKey(PARAM_KEY_COMPRESSION)) { - final Object value = params.get(PARAM_KEY_COMPRESSION); + if (params.containsKey(ImagingConstants.PARAM_KEY_COMPRESSION)) { + final Object value = params.get(ImagingConstants.PARAM_KEY_COMPRESSION); if (value != null) { if (!(value instanceof Number)) { throw new ImageWriteException( @@ -283,7 +285,7 @@ public abstract class TiffImageWriterBas } compression = ((Number) value).intValue(); } - params.remove(PARAM_KEY_COMPRESSION); + params.remove(ImagingConstants.PARAM_KEY_COMPRESSION); if (params.containsKey(PARAM_KEY_LZW_COMPRESSION_BLOCK_SIZE)) { final Object bValue = params.get(PARAM_KEY_LZW_COMPRESSION_BLOCK_SIZE); Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/write/TiffImageWriterLossless.java URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/write/TiffImageWriterLossless.java?rev=1655143&r1=1655142&r2=1655143&view=diff ============================================================================== --- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/write/TiffImageWriterLossless.java (original) +++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/write/TiffImageWriterLossless.java Tue Jan 27 20:15:19 2015 @@ -40,6 +40,7 @@ import org.apache.commons.imaging.format import org.apache.commons.imaging.formats.tiff.TiffField; import org.apache.commons.imaging.formats.tiff.TiffImageData; import org.apache.commons.imaging.formats.tiff.TiffReader; +import org.apache.commons.imaging.formats.tiff.constants.ExifTagConstants; import static org.apache.commons.imaging.formats.tiff.constants.TiffConstants.*; @@ -152,9 +153,9 @@ public class TiffImageWriterLossless ext // There are some fields whose address in the file must not change, // unless of course their value is changed. final Map<Integer, TiffOutputField> frozenFields = new HashMap<Integer, TiffOutputField>(); - final TiffOutputField makerNoteField = outputSet.findField(EXIF_TAG_MAKER_NOTE); + final TiffOutputField makerNoteField = outputSet.findField(ExifTagConstants.EXIF_TAG_MAKER_NOTE); if (makerNoteField != null && makerNoteField.getSeperateValue() != null) { - frozenFields.put(EXIF_TAG_MAKER_NOTE.tag, makerNoteField); + frozenFields.put(ExifTagConstants.EXIF_TAG_MAKER_NOTE.tag, makerNoteField); } final List<TiffElement> analysis = analyzeOldTiff(frozenFields); final int oldLength = exifBytes.length; Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/write/TiffOutputDirectory.java URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/write/TiffOutputDirectory.java?rev=1655143&r1=1655142&r2=1655143&view=diff ============================================================================== --- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/write/TiffOutputDirectory.java (original) +++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/write/TiffOutputDirectory.java Tue Jan 27 20:15:19 2015 @@ -30,7 +30,6 @@ import org.apache.commons.imaging.format import org.apache.commons.imaging.formats.tiff.TiffDirectory; import org.apache.commons.imaging.formats.tiff.TiffElement; import org.apache.commons.imaging.formats.tiff.TiffImageData; -import org.apache.commons.imaging.formats.tiff.constants.TagConstantsUtils; import org.apache.commons.imaging.formats.tiff.constants.TiffDirectoryType; import org.apache.commons.imaging.formats.tiff.constants.TiffTagConstants; import org.apache.commons.imaging.formats.tiff.fieldtypes.FieldType; @@ -532,8 +531,7 @@ public final class TiffOutputDirectory e @Override public String getItemDescription() { - final TiffDirectoryType dirType = TagConstantsUtils - .getExifDirectoryType(type); + final TiffDirectoryType dirType = TiffDirectoryType.getExifDirectoryType(type); return "Directory: " + dirType.name + " (" + type + ")"; } Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/write/TiffOutputSet.java URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/write/TiffOutputSet.java?rev=1655143&r1=1655142&r2=1655143&view=diff ============================================================================== --- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/write/TiffOutputSet.java (original) +++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/write/TiffOutputSet.java Tue Jan 27 20:15:19 2015 @@ -23,6 +23,7 @@ import java.util.List; import org.apache.commons.imaging.ImageWriteException; import org.apache.commons.imaging.common.RationalNumber; import org.apache.commons.imaging.formats.tiff.constants.GpsTagConstants; +import org.apache.commons.imaging.formats.tiff.constants.TiffDirectoryConstants; import org.apache.commons.imaging.formats.tiff.taginfos.TagInfo; import org.apache.commons.imaging.util.Debug; @@ -67,16 +68,16 @@ public final class TiffOutputSet { } public TiffOutputDirectory getRootDirectory() { - return findDirectory(DIRECTORY_TYPE_ROOT); + return findDirectory(TiffDirectoryConstants.DIRECTORY_TYPE_ROOT); } public TiffOutputDirectory getExifDirectory() { - return findDirectory(DIRECTORY_TYPE_EXIF); + return findDirectory(TiffDirectoryConstants.DIRECTORY_TYPE_EXIF); } public TiffOutputDirectory getOrCreateRootDirectory() throws ImageWriteException { - final TiffOutputDirectory result = findDirectory(DIRECTORY_TYPE_ROOT); + final TiffOutputDirectory result = findDirectory(TiffDirectoryConstants.DIRECTORY_TYPE_ROOT); if (null != result) { return result; } @@ -88,7 +89,7 @@ public final class TiffOutputSet { // EXIF directory requires root directory. getOrCreateRootDirectory(); - final TiffOutputDirectory result = findDirectory(DIRECTORY_TYPE_EXIF); + final TiffOutputDirectory result = findDirectory(TiffDirectoryConstants.DIRECTORY_TYPE_EXIF); if (null != result) { return result; } @@ -100,7 +101,7 @@ public final class TiffOutputSet { // GPS directory requires EXIF directory getOrCreateExifDirectory(); - final TiffOutputDirectory result = findDirectory(DIRECTORY_TYPE_GPS); + final TiffOutputDirectory result = findDirectory(TiffDirectoryConstants.DIRECTORY_TYPE_GPS); if (null != result) { return result; } @@ -108,11 +109,11 @@ public final class TiffOutputSet { } public TiffOutputDirectory getGPSDirectory() { - return findDirectory(DIRECTORY_TYPE_GPS); + return findDirectory(TiffDirectoryConstants.DIRECTORY_TYPE_GPS); } public TiffOutputDirectory getInteroperabilityDirectory() { - return findDirectory(DIRECTORY_TYPE_INTEROPERABILITY); + return findDirectory(TiffDirectoryConstants.DIRECTORY_TYPE_INTEROPERABILITY); } public TiffOutputDirectory findDirectory(final int directoryType) { @@ -216,21 +217,21 @@ public final class TiffOutputSet { public TiffOutputDirectory addRootDirectory() throws ImageWriteException { final TiffOutputDirectory result = new TiffOutputDirectory( - DIRECTORY_TYPE_ROOT, byteOrder); + TiffDirectoryConstants.DIRECTORY_TYPE_ROOT, byteOrder); addDirectory(result); return result; } public TiffOutputDirectory addExifDirectory() throws ImageWriteException { final TiffOutputDirectory result = new TiffOutputDirectory( - DIRECTORY_TYPE_EXIF, byteOrder); + TiffDirectoryConstants.DIRECTORY_TYPE_EXIF, byteOrder); addDirectory(result); return result; } public TiffOutputDirectory addGPSDirectory() throws ImageWriteException { final TiffOutputDirectory result = new TiffOutputDirectory( - DIRECTORY_TYPE_GPS, byteOrder); + TiffDirectoryConstants.DIRECTORY_TYPE_GPS, byteOrder); addDirectory(result); return result; } @@ -240,7 +241,7 @@ public final class TiffOutputSet { getOrCreateExifDirectory(); final TiffOutputDirectory result = new TiffOutputDirectory( - DIRECTORY_TYPE_INTEROPERABILITY, byteOrder); + TiffDirectoryConstants.DIRECTORY_TYPE_INTEROPERABILITY, byteOrder); addDirectory(result); return result; } Modified: commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/ImagingTest.java URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/ImagingTest.java?rev=1655143&r1=1655142&r2=1655143&view=diff ============================================================================== --- commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/ImagingTest.java (original) +++ commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/ImagingTest.java Tue Jan 27 20:15:19 2015 @@ -30,7 +30,7 @@ import org.junit.Rule; import org.junit.rules.TemporaryFolder; public abstract class ImagingTest implements - ImagingTestConstants, ImagingConstants { + ImagingTestConstants { @Rule public TemporaryFolder folder = new TemporaryFolder(); Modified: commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/common/bytesource/ByteSourceImageTest.java URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/common/bytesource/ByteSourceImageTest.java?rev=1655143&r1=1655142&r2=1655143&view=diff ============================================================================== --- commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/common/bytesource/ByteSourceImageTest.java (original) +++ commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/common/bytesource/ByteSourceImageTest.java Tue Jan 27 20:15:19 2015 @@ -37,6 +37,7 @@ import org.apache.commons.imaging.ImageF import org.apache.commons.imaging.ImageInfo; import org.apache.commons.imaging.ImageReadException; import org.apache.commons.imaging.Imaging; +import org.apache.commons.imaging.ImagingConstants; import org.apache.commons.imaging.util.Debug; import org.apache.commons.io.FileUtils; import org.junit.Test; @@ -173,7 +174,7 @@ public class ByteSourceImageTest extends final ImageFormat imageFormat = Imaging.guessFormat(imageFile); if (imageFormat.equals(ImageFormats.TIFF) || imageFormat.equals(ImageFormats.JPEG)) { - params.put(PARAM_KEY_READ_THUMBNAILS, new Boolean(!ignoreImageData)); + params.put(ImagingConstants.PARAM_KEY_READ_THUMBNAILS, new Boolean(!ignoreImageData)); } final ImageInfo imageInfoFile = Imaging.getImageInfo(imageFile, params); Modified: commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/examples/WriteExifMetadataExample.java URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/examples/WriteExifMetadataExample.java?rev=1655143&r1=1655142&r2=1655143&view=diff ============================================================================== --- commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/examples/WriteExifMetadataExample.java (original) +++ commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/examples/WriteExifMetadataExample.java Tue Jan 27 20:15:19 2015 @@ -111,9 +111,6 @@ public class WriteExifMetadataExample { // TagInfo constants often contain a description of what // directories are associated with a given tag. // - // see - // org.apache.commons.imaging.formats.tiff.constants.AllTagConstants - // final TiffOutputDirectory exifDirectory = outputSet .getOrCreateExifDirectory(); // make sure to remove old value if present (this method will Modified: commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/JpegReadTest.java URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/JpegReadTest.java?rev=1655143&r1=1655142&r2=1655143&view=diff ============================================================================== --- commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/JpegReadTest.java (original) +++ commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/JpegReadTest.java Tue Jan 27 20:15:19 2015 @@ -29,6 +29,7 @@ import java.util.Map; import org.apache.commons.imaging.ImageInfo; import org.apache.commons.imaging.ImageReadException; import org.apache.commons.imaging.Imaging; +import org.apache.commons.imaging.ImagingConstants; import org.apache.commons.imaging.common.ImageMetadata; import org.apache.commons.imaging.util.Debug; import org.junit.Test; @@ -53,7 +54,7 @@ public class JpegReadTest extends JpegBa public void test() throws Exception { final Map<String, Object> params = new HashMap<String, Object>(); final boolean ignoreImageData = isPhilHarveyTestImage(imageFile); - params.put(PARAM_KEY_READ_THUMBNAILS, new Boolean(!ignoreImageData)); + params.put(ImagingConstants.PARAM_KEY_READ_THUMBNAILS, new Boolean(!ignoreImageData)); final ImageMetadata metadata = Imaging.getMetadata(imageFile, params); // TODO only run this tests with images that have metadata... Modified: commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/exif/AsciiFieldTest.java URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/exif/AsciiFieldTest.java?rev=1655143&r1=1655142&r2=1655143&view=diff ============================================================================== --- commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/exif/AsciiFieldTest.java (original) +++ commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/exif/AsciiFieldTest.java Tue Jan 27 20:15:19 2015 @@ -31,11 +31,10 @@ import org.apache.commons.imaging.common import org.apache.commons.imaging.formats.jpeg.JpegImageMetadata; import org.apache.commons.imaging.formats.tiff.TiffField; import org.apache.commons.imaging.formats.tiff.TiffImageMetadata; -import org.apache.commons.imaging.formats.tiff.constants.AllTagConstants; import org.apache.commons.imaging.formats.tiff.constants.TiffTagConstants; import org.junit.Test; -public class AsciiFieldTest extends ExifBaseTest implements AllTagConstants { +public class AsciiFieldTest extends ExifBaseTest { @Test public void testSingleImage() throws Exception { Modified: commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/exif/ExifDumpTest.java URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/exif/ExifDumpTest.java?rev=1655143&r1=1655142&r2=1655143&view=diff ============================================================================== --- commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/exif/ExifDumpTest.java (original) +++ commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/exif/ExifDumpTest.java Tue Jan 27 20:15:19 2015 @@ -26,6 +26,7 @@ import java.util.List; import java.util.Map; import org.apache.commons.imaging.Imaging; +import org.apache.commons.imaging.ImagingConstants; import org.apache.commons.imaging.common.bytesource.ByteSource; import org.apache.commons.imaging.common.bytesource.ByteSourceFile; import org.apache.commons.imaging.formats.jpeg.JpegImageMetadata; @@ -61,7 +62,7 @@ public class ExifDumpTest extends ExifBa public void testMetadata() throws Exception { final Map<String, Object> params = new HashMap<String, Object>(); final boolean ignoreImageData = isPhilHarveyTestImage(imageFile); - params.put(PARAM_KEY_READ_THUMBNAILS, Boolean.valueOf(!ignoreImageData)); + params.put(ImagingConstants.PARAM_KEY_READ_THUMBNAILS, Boolean.valueOf(!ignoreImageData)); final JpegImageMetadata metadata = (JpegImageMetadata) Imaging.getMetadata(imageFile, params); assertNotNull(metadata); Modified: commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/exif/ExifRewriteTest.java URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/exif/ExifRewriteTest.java?rev=1655143&r1=1655142&r2=1655143&view=diff ============================================================================== --- commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/exif/ExifRewriteTest.java (original) +++ commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/exif/ExifRewriteTest.java Tue Jan 27 20:15:19 2015 @@ -45,7 +45,6 @@ import org.apache.commons.imaging.format import org.apache.commons.imaging.formats.jpeg.JpegUtils; import org.apache.commons.imaging.formats.tiff.TiffField; import org.apache.commons.imaging.formats.tiff.TiffImageMetadata; -import org.apache.commons.imaging.formats.tiff.constants.AllTagConstants; import org.apache.commons.imaging.formats.tiff.fieldtypes.FieldType; import org.apache.commons.imaging.formats.tiff.write.TiffOutputSet; import org.apache.commons.imaging.util.Debug; @@ -53,7 +52,7 @@ import org.apache.commons.io.FileUtils; import org.junit.Assert; import org.junit.Test; -public class ExifRewriteTest extends ExifBaseTest implements AllTagConstants { +public class ExifRewriteTest extends ExifBaseTest { // public ExifRewriteTest(String name) // { // super(name); Modified: commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/exif/GpsTest.java URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/exif/GpsTest.java?rev=1655143&r1=1655142&r2=1655143&view=diff ============================================================================== --- commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/exif/GpsTest.java (original) +++ commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/exif/GpsTest.java Tue Jan 27 20:15:19 2015 @@ -33,7 +33,7 @@ import org.junit.runner.RunWith; import org.junit.runners.Parameterized; @RunWith(Parameterized.class) -public class GpsTest extends ExifBaseTest implements ImagingConstants { +public class GpsTest extends ExifBaseTest { private File imageFile; @@ -55,7 +55,7 @@ public class GpsTest extends ExifBaseTes final Map<String, Object> params = new HashMap<String, Object>(); final boolean ignoreImageData = isPhilHarveyTestImage(imageFile); - params.put(PARAM_KEY_READ_THUMBNAILS, Boolean.valueOf(!ignoreImageData)); + params.put(ImagingConstants.PARAM_KEY_READ_THUMBNAILS, Boolean.valueOf(!ignoreImageData)); final JpegImageMetadata metadata = (JpegImageMetadata) Imaging .getMetadata(imageFile, params); Modified: commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/exif/MicrosoftTagTest.java URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/exif/MicrosoftTagTest.java?rev=1655143&r1=1655142&r2=1655143&view=diff ============================================================================== --- commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/exif/MicrosoftTagTest.java (original) +++ commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/exif/MicrosoftTagTest.java Tue Jan 27 20:15:19 2015 @@ -26,6 +26,7 @@ import java.util.TreeMap; import org.apache.commons.imaging.ImageFormats; import org.apache.commons.imaging.Imaging; +import org.apache.commons.imaging.ImagingConstants; import org.apache.commons.imaging.common.ImageMetadata; import org.apache.commons.imaging.formats.jpeg.JpegImageMetadata; import org.apache.commons.imaging.formats.tiff.TiffImageMetadata; @@ -51,7 +52,7 @@ public class MicrosoftTagTest extends Ex exif.add(MicrosoftTagConstants.EXIF_TAG_XPSUBJECT, SUBJECT); exif.add(MicrosoftTagConstants.EXIF_TAG_XPTITLE, TITLE); final Map<String, Object> params = new TreeMap<String, Object>(); - params.put(TiffConstants.PARAM_KEY_EXIF, exifSet); + params.put(ImagingConstants.PARAM_KEY_EXIF, exifSet); final byte[] bytes = Imaging.writeImageToBytes(image, ImageFormats.TIFF, params); checkFields(bytes); } Modified: commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/exif/SpecificExifTagTest.java URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/exif/SpecificExifTagTest.java?rev=1655143&r1=1655142&r2=1655143&view=diff ============================================================================== --- commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/exif/SpecificExifTagTest.java (original) +++ commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/exif/SpecificExifTagTest.java Tue Jan 27 20:15:19 2015 @@ -27,18 +27,17 @@ import java.util.Map; import org.apache.commons.imaging.ImageReadException; import org.apache.commons.imaging.ImageWriteException; import org.apache.commons.imaging.Imaging; +import org.apache.commons.imaging.ImagingConstants; import org.apache.commons.imaging.common.ImageMetadata; import org.apache.commons.imaging.formats.jpeg.JpegImageMetadata; import org.apache.commons.imaging.formats.tiff.TiffField; import org.apache.commons.imaging.formats.tiff.TiffImageMetadata; -import org.apache.commons.imaging.formats.tiff.constants.AllTagConstants; import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; @RunWith(Parameterized.class) -public abstract class SpecificExifTagTest extends ExifBaseTest implements - AllTagConstants { +public abstract class SpecificExifTagTest extends ExifBaseTest { private File imageFile; @@ -69,7 +68,7 @@ public abstract class SpecificExifTagTes final Map<String, Object> params = new HashMap<String, Object>(); final boolean ignoreImageData = isPhilHarveyTestImage(imageFile); - params.put(PARAM_KEY_READ_THUMBNAILS, Boolean.valueOf(!ignoreImageData)); + params.put(ImagingConstants.PARAM_KEY_READ_THUMBNAILS, Boolean.valueOf(!ignoreImageData)); // note that metadata might be null if no metadata is found. final ImageMetadata metadata = Imaging.getMetadata(imageFile, params); Modified: commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/exif/WriteExifMetadataExampleTest.java URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/exif/WriteExifMetadataExampleTest.java?rev=1655143&r1=1655142&r2=1655143&view=diff ============================================================================== --- commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/exif/WriteExifMetadataExampleTest.java (original) +++ commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/exif/WriteExifMetadataExampleTest.java Tue Jan 27 20:15:19 2015 @@ -19,18 +19,15 @@ package org.apache.commons.imaging.forma import java.io.File; import java.util.Collection; -import java.util.List; import org.apache.commons.imaging.examples.WriteExifMetadataExample; -import org.apache.commons.imaging.formats.tiff.constants.AllTagConstants; import org.apache.commons.imaging.util.Debug; import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; @RunWith(Parameterized.class) -public class WriteExifMetadataExampleTest extends ExifBaseTest implements - AllTagConstants { +public class WriteExifMetadataExampleTest extends ExifBaseTest { private File imageFile; Modified: commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/iptc/IptcAddTest.java URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/iptc/IptcAddTest.java?rev=1655143&r1=1655142&r2=1655143&view=diff ============================================================================== --- commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/iptc/IptcAddTest.java (original) +++ commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/iptc/IptcAddTest.java Tue Jan 27 20:15:19 2015 @@ -30,6 +30,7 @@ import java.util.HashMap; import java.util.List; import java.util.Map; +import org.apache.commons.imaging.ImagingConstants; import org.apache.commons.imaging.common.bytesource.ByteSource; import org.apache.commons.imaging.common.bytesource.ByteSourceFile; import org.apache.commons.imaging.formats.jpeg.JpegImageParser; @@ -63,7 +64,7 @@ public class IptcAddTest extends IptcBas final Map<String, Object> params = new HashMap<String, Object>(); final boolean ignoreImageData = isPhilHarveyTestImage(imageFile); - params.put(PARAM_KEY_READ_THUMBNAILS, Boolean.valueOf(!ignoreImageData)); + params.put(ImagingConstants.PARAM_KEY_READ_THUMBNAILS, Boolean.valueOf(!ignoreImageData)); final JpegPhotoshopMetadata metadata = new JpegImageParser().getPhotoshopMetadata(byteSource, params); if (metadata == null) { Modified: commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/iptc/IptcDumpTest.java URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/iptc/IptcDumpTest.java?rev=1655143&r1=1655142&r2=1655143&view=diff ============================================================================== --- commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/iptc/IptcDumpTest.java (original) +++ commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/iptc/IptcDumpTest.java Tue Jan 27 20:15:19 2015 @@ -26,6 +26,7 @@ import java.util.List; import java.util.Map; import org.apache.commons.imaging.Imaging; +import org.apache.commons.imaging.ImagingConstants; import org.apache.commons.imaging.formats.jpeg.JpegImageMetadata; import org.apache.commons.imaging.formats.jpeg.JpegPhotoshopMetadata; import org.apache.commons.imaging.util.Debug; @@ -51,7 +52,7 @@ public class IptcDumpTest extends IptcBa public void test() throws Exception { final Map<String, Object> params = new HashMap<String, Object>(); final boolean ignoreImageData = isPhilHarveyTestImage(imageFile); - params.put(PARAM_KEY_READ_THUMBNAILS, Boolean.valueOf(!ignoreImageData)); + params.put(ImagingConstants.PARAM_KEY_READ_THUMBNAILS, Boolean.valueOf(!ignoreImageData)); final JpegImageMetadata metadata = (JpegImageMetadata) Imaging.getMetadata(imageFile, params); assertNotNull(metadata); Modified: commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/iptc/IptcUpdateTest.java URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/iptc/IptcUpdateTest.java?rev=1655143&r1=1655142&r2=1655143&view=diff ============================================================================== --- commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/iptc/IptcUpdateTest.java (original) +++ commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/iptc/IptcUpdateTest.java Tue Jan 27 20:15:19 2015 @@ -33,6 +33,8 @@ import java.util.Map; import org.apache.commons.imaging.ImageReadException; import org.apache.commons.imaging.ImageWriteException; +import org.apache.commons.imaging.Imaging; +import org.apache.commons.imaging.ImagingConstants; import org.apache.commons.imaging.common.bytesource.ByteSource; import org.apache.commons.imaging.common.bytesource.ByteSourceFile; import org.apache.commons.imaging.formats.jpeg.JpegImageParser; @@ -64,7 +66,7 @@ public class IptcUpdateTest extends Iptc final Map<String, Object> params = new HashMap<String, Object>(); final boolean ignoreImageData = isPhilHarveyTestImage(imageFile); - params.put(PARAM_KEY_READ_THUMBNAILS, Boolean.valueOf(!ignoreImageData)); + params.put(ImagingConstants.PARAM_KEY_READ_THUMBNAILS, Boolean.valueOf(!ignoreImageData)); final JpegPhotoshopMetadata metadata = new JpegImageParser() .getPhotoshopMetadata(byteSource, params); @@ -97,7 +99,7 @@ public class IptcUpdateTest extends Iptc final Map<String, Object> params = new HashMap<String, Object>(); final boolean ignoreImageData = isPhilHarveyTestImage(imageFile); - params.put(PARAM_KEY_READ_THUMBNAILS, Boolean.valueOf(!ignoreImageData)); + params.put(ImagingConstants.PARAM_KEY_READ_THUMBNAILS, Boolean.valueOf(!ignoreImageData)); final JpegPhotoshopMetadata metadata = new JpegImageParser().getPhotoshopMetadata(byteSource, params); assertNotNull(metadata); @@ -142,7 +144,7 @@ public class IptcUpdateTest extends Iptc final Map<String, Object> params = new HashMap<String, Object>(); final boolean ignoreImageData = isPhilHarveyTestImage(imageFile); - params.put(PARAM_KEY_READ_THUMBNAILS, Boolean.valueOf(!ignoreImageData)); + params.put(ImagingConstants.PARAM_KEY_READ_THUMBNAILS, Boolean.valueOf(!ignoreImageData)); final JpegPhotoshopMetadata metadata = new JpegImageParser().getPhotoshopMetadata(byteSource, params); assertNotNull(metadata); @@ -189,7 +191,7 @@ public class IptcUpdateTest extends Iptc final Map<String, Object> params = new HashMap<String, Object>(); final boolean ignoreImageData = isPhilHarveyTestImage(imageFile); - params.put(PARAM_KEY_READ_THUMBNAILS, Boolean.valueOf(!ignoreImageData)); + params.put(ImagingConstants.PARAM_KEY_READ_THUMBNAILS, Boolean.valueOf(!ignoreImageData)); final JpegPhotoshopMetadata metadata = new JpegImageParser().getPhotoshopMetadata(byteSource, params); assertNotNull(metadata); Modified: commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/tiff/TiffReadWriteTagsTest.java URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/tiff/TiffReadWriteTagsTest.java?rev=1655143&r1=1655142&r2=1655143&view=diff ============================================================================== --- commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/tiff/TiffReadWriteTagsTest.java (original) +++ commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/tiff/TiffReadWriteTagsTest.java Tue Jan 27 20:15:19 2015 @@ -28,7 +28,10 @@ import org.apache.commons.imaging.ImageR import org.apache.commons.imaging.ImageWriteException; import org.apache.commons.imaging.common.RationalNumber; import org.apache.commons.imaging.common.bytesource.ByteSourceArray; -import org.apache.commons.imaging.formats.tiff.constants.AllTagConstants; +import org.apache.commons.imaging.formats.tiff.constants.GeoTiffTagConstants; +import org.apache.commons.imaging.formats.tiff.constants.GpsTagConstants; +import org.apache.commons.imaging.formats.tiff.constants.MicrosoftHdPhotoTagConstants; +import org.apache.commons.imaging.formats.tiff.constants.TiffTagConstants; import org.apache.commons.imaging.formats.tiff.write.TiffImageWriterLossy; import org.apache.commons.imaging.formats.tiff.write.TiffOutputDirectory; import org.apache.commons.imaging.formats.tiff.write.TiffOutputSet; @@ -50,15 +53,15 @@ public class TiffReadWriteTagsTest exten TiffOutputSet set = new TiffOutputSet(); TiffOutputDirectory dir = set.getOrCreateRootDirectory(); - dir.add(AllTagConstants.TIFF_TAG_IMAGE_DESCRIPTION, description); - dir.add(AllTagConstants.TIFF_TAG_PAGE_NUMBER, page, page); - dir.add(AllTagConstants.TIFF_TAG_YRESOLUTION, twoThirds); - dir.add(AllTagConstants.TIFF_TAG_T4_OPTIONS, t4Options); - dir.add(AllTagConstants.TIFF_TAG_IMAGE_WIDTH, width); - dir.add(AllTagConstants.TIFF_TAG_IMAGE_LENGTH, new short[] { height }); - dir.add(AllTagConstants.GPS_TAG_GPS_AREA_INFORMATION, area); - dir.add(AllTagConstants.EXIF_TAG_WIDTH_RESOLUTION, widthRes); - dir.add(AllTagConstants.EXIF_TAG_GEO_DOUBLE_PARAMS_TAG, geoDoubleParams); + dir.add(TiffTagConstants.TIFF_TAG_IMAGE_DESCRIPTION, description); + dir.add(TiffTagConstants.TIFF_TAG_PAGE_NUMBER, page, page); + dir.add(TiffTagConstants.TIFF_TAG_YRESOLUTION, twoThirds); + dir.add(TiffTagConstants.TIFF_TAG_T4_OPTIONS, t4Options); + dir.add(TiffTagConstants.TIFF_TAG_IMAGE_WIDTH, width); + dir.add(TiffTagConstants.TIFF_TAG_IMAGE_LENGTH, height); + dir.add(GpsTagConstants.GPS_TAG_GPS_AREA_INFORMATION, area); + dir.add(MicrosoftHdPhotoTagConstants.EXIF_TAG_WIDTH_RESOLUTION, widthRes); + dir.add(GeoTiffTagConstants.EXIF_TAG_GEO_DOUBLE_PARAMS_TAG, geoDoubleParams); TiffImageWriterLossy writer = new TiffImageWriterLossy(); ByteArrayOutputStream tiff = new ByteArrayOutputStream(); @@ -69,16 +72,16 @@ public class TiffReadWriteTagsTest exten FormatCompliance formatCompliance = new FormatCompliance(""); TiffContents contents = reader.readFirstDirectory(new ByteSourceArray(tiff.toByteArray()), params, true, formatCompliance); TiffDirectory rootDir = contents.directories.get(0); - assertEquals(description, rootDir.getSingleFieldValue(AllTagConstants.TIFF_TAG_IMAGE_DESCRIPTION)); - assertEquals(page, rootDir.getFieldValue(AllTagConstants.TIFF_TAG_PAGE_NUMBER, true)[0]); - RationalNumber yRes = rootDir.getSingleFieldValue(AllTagConstants.TIFF_TAG_YRESOLUTION); + assertEquals(description, rootDir.getSingleFieldValue(TiffTagConstants.TIFF_TAG_IMAGE_DESCRIPTION)); + assertEquals(page, rootDir.getFieldValue(TiffTagConstants.TIFF_TAG_PAGE_NUMBER, true)[0]); + RationalNumber yRes = rootDir.getSingleFieldValue(TiffTagConstants.TIFF_TAG_YRESOLUTION); assertEquals(twoThirds.numerator, yRes.numerator); assertEquals(twoThirds.divisor, yRes.divisor); - assertEquals(t4Options, rootDir.getSingleFieldValue(AllTagConstants.TIFF_TAG_T4_OPTIONS)); - assertEquals(width, rootDir.getSingleFieldValue(AllTagConstants.TIFF_TAG_IMAGE_WIDTH)); - assertEquals(width, rootDir.getSingleFieldValue(AllTagConstants.TIFF_TAG_IMAGE_LENGTH)); - assertEquals(area, rootDir.getFieldValue(AllTagConstants.GPS_TAG_GPS_AREA_INFORMATION, true)); - assertEquals(widthRes, rootDir.getSingleFieldValue(AllTagConstants.EXIF_TAG_WIDTH_RESOLUTION), 0.0); - assertEquals(geoDoubleParams, rootDir.getSingleFieldValue(AllTagConstants.EXIF_TAG_GEO_DOUBLE_PARAMS_TAG), 0.0); + assertEquals(t4Options, rootDir.getSingleFieldValue(TiffTagConstants.TIFF_TAG_T4_OPTIONS)); + assertEquals(width, rootDir.getSingleFieldValue(TiffTagConstants.TIFF_TAG_IMAGE_WIDTH)); + assertEquals(width, rootDir.getSingleFieldValue(TiffTagConstants.TIFF_TAG_IMAGE_LENGTH)); + assertEquals(area, rootDir.getFieldValue(GpsTagConstants.GPS_TAG_GPS_AREA_INFORMATION, true)); + assertEquals(widthRes, rootDir.getSingleFieldValue(MicrosoftHdPhotoTagConstants.EXIF_TAG_WIDTH_RESOLUTION), 0.0); + assertEquals(geoDoubleParams, rootDir.getSingleFieldValue(GeoTiffTagConstants.EXIF_TAG_GEO_DOUBLE_PARAMS_TAG), 0.0); } } Modified: commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/tiff/TiffRoundtripTest.java URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/tiff/TiffRoundtripTest.java?rev=1655143&r1=1655142&r2=1655143&view=diff ============================================================================== --- commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/tiff/TiffRoundtripTest.java (original) +++ commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/tiff/TiffRoundtripTest.java Tue Jan 27 20:15:19 2015 @@ -28,6 +28,7 @@ import java.util.Map; import org.apache.commons.imaging.ImageFormats; import org.apache.commons.imaging.ImageInfo; import org.apache.commons.imaging.Imaging; +import org.apache.commons.imaging.ImagingConstants; import org.apache.commons.imaging.common.ImageMetadata; import org.apache.commons.imaging.formats.tiff.constants.TiffConstants; import org.apache.commons.imaging.util.Debug; @@ -59,7 +60,7 @@ public class TiffRoundtripTest extends T for (final int compression : compressions) { final File tempFile = createTempFile(imageFile.getName() + "-" + compression + ".", ".tif"); final Map<String, Object> params = new HashMap<String, Object>(); - params.put(TiffConstants.PARAM_KEY_COMPRESSION, compression); + params.put(ImagingConstants.PARAM_KEY_COMPRESSION, compression); Imaging.writeImage(image, tempFile, ImageFormats.TIFF, params); final BufferedImage image2 = Imaging.getBufferedImage(tempFile); Modified: commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/xmp/XmpUpdateTest.java URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/xmp/XmpUpdateTest.java?rev=1655143&r1=1655142&r2=1655143&view=diff ============================================================================== --- commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/xmp/XmpUpdateTest.java (original) +++ commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/xmp/XmpUpdateTest.java Tue Jan 27 20:15:19 2015 @@ -29,6 +29,7 @@ import java.util.Map; import org.apache.commons.imaging.ImageFormat; import org.apache.commons.imaging.ImageFormats; import org.apache.commons.imaging.Imaging; +import org.apache.commons.imaging.ImagingConstants; import org.apache.commons.imaging.ImagingTest; import org.apache.commons.imaging.util.Debug; import org.junit.Test; @@ -84,7 +85,7 @@ public class XmpUpdateTest extends Imagi // ---- final Map<String, Object> params = new HashMap<String, Object>(); - params.put(PARAM_KEY_XMP_XML, xmpXml); + params.put(ImagingConstants.PARAM_KEY_XMP_XML, xmpXml); Imaging.writeImage(image, tempFile, imageFormat, params); final String xmpXmlOut = Imaging.getXmpXml(tempFile);
