Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/constants/ExifTagConstants.java URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/constants/ExifTagConstants.java?rev=1655143&r1=1655142&r2=1655143&view=diff ============================================================================== --- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/constants/ExifTagConstants.java (original) +++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/constants/ExifTagConstants.java Tue Jan 27 20:15:19 2015 @@ -43,501 +43,502 @@ import org.apache.commons.imaging.format * * "Stonits": http://www.anyhere.com/gward/pixformat/tiffluv.html */ -public interface ExifTagConstants { - TagInfoAscii EXIF_TAG_INTEROPERABILITY_INDEX = new TagInfoAscii( +public final class ExifTagConstants { + + public static final TagInfoAscii EXIF_TAG_INTEROPERABILITY_INDEX = new TagInfoAscii( "InteroperabilityIndex", 0x0001, -1, TiffDirectoryType.EXIF_DIRECTORY_INTEROP_IFD); - TagInfoUndefined EXIF_TAG_INTEROPERABILITY_VERSION = new TagInfoUndefined( + public static final TagInfoUndefined EXIF_TAG_INTEROPERABILITY_VERSION = new TagInfoUndefined( "InteroperabilityVersion", 0x0002, 1, TiffDirectoryType.EXIF_DIRECTORY_INTEROP_IFD); - TagInfoAscii EXIF_TAG_PROCESSING_SOFTWARE = new TagInfoAscii( + public static final TagInfoAscii EXIF_TAG_PROCESSING_SOFTWARE = new TagInfoAscii( "ProcessingSoftware", 0x000b, -1, TiffDirectoryType.EXIF_DIRECTORY_IFD0); - TagInfoAscii EXIF_TAG_SOFTWARE = new TagInfoAscii( + public static final TagInfoAscii EXIF_TAG_SOFTWARE = new TagInfoAscii( "Software", 0x0131, -1, TiffDirectoryType.EXIF_DIRECTORY_IFD0); - TagInfoLong EXIF_TAG_PREVIEW_IMAGE_START_IFD0 = new TagInfoLong( + public static final TagInfoLong EXIF_TAG_PREVIEW_IMAGE_START_IFD0 = new TagInfoLong( "PreviewImageStart", 0x0111, 1, TiffDirectoryType.EXIF_DIRECTORY_IFD0, true); - TagInfoLong EXIF_TAG_PREVIEW_IMAGE_START_SUB_IFD1 = new TagInfoLong( + public static final TagInfoLong EXIF_TAG_PREVIEW_IMAGE_START_SUB_IFD1 = new TagInfoLong( "PreviewImageStart", 0x0111, 1, TiffDirectoryType.EXIF_DIRECTORY_SUB_IFD1, true); - TagInfoLong EXIF_TAG_JPG_FROM_RAW_START_SUB_IFD2 = new TagInfoLong( + public static final TagInfoLong EXIF_TAG_JPG_FROM_RAW_START_SUB_IFD2 = new TagInfoLong( "JpgFromRawStart", 0x0111, 1, TiffDirectoryType.EXIF_DIRECTORY_SUB_IFD2, true); - TagInfoLong EXIF_TAG_PREVIEW_IMAGE_LENGTH_IFD0 = new TagInfoLong( + public static final TagInfoLong EXIF_TAG_PREVIEW_IMAGE_LENGTH_IFD0 = new TagInfoLong( "PreviewImageLength", 0x0117, 1, TiffDirectoryType.EXIF_DIRECTORY_IFD0); - TagInfoLong EXIF_TAG_PREVIEW_IMAGE_LENGTH_SUB_IFD1 = new TagInfoLong( + public static final TagInfoLong EXIF_TAG_PREVIEW_IMAGE_LENGTH_SUB_IFD1 = new TagInfoLong( "PreviewImageLength", 0x0117, 1, TiffDirectoryType.EXIF_DIRECTORY_SUB_IFD1); - TagInfoLong EXIF_TAG_JPG_FROM_RAW_LENGTH_SUB_IFD2 = new TagInfoLong( + public static final TagInfoLong EXIF_TAG_JPG_FROM_RAW_LENGTH_SUB_IFD2 = new TagInfoLong( "JpgFromRawLength", 0x0117, 1, TiffDirectoryType.EXIF_DIRECTORY_SUB_IFD2); - TagInfoLong EXIF_TAG_PREVIEW_IMAGE_START_MAKER_NOTES = new TagInfoLong( + public static final TagInfoLong EXIF_TAG_PREVIEW_IMAGE_START_MAKER_NOTES = new TagInfoLong( "PreviewImageStart", 0x0201, 1, TiffDirectoryType.EXIF_DIRECTORY_MAKER_NOTES); - TagInfoLong EXIF_TAG_JPG_FROM_RAW_START_SUB_IFD = new TagInfoLong( + public static final TagInfoLong EXIF_TAG_JPG_FROM_RAW_START_SUB_IFD = new TagInfoLong( "JpgFromRawStart", 0x0201, 1, TiffDirectoryType.EXIF_DIRECTORY_SUB_IFD, true); - TagInfoLong EXIF_TAG_JPG_FROM_RAW_START_IFD2 = new TagInfoLong( + public static final TagInfoLong EXIF_TAG_JPG_FROM_RAW_START_IFD2 = new TagInfoLong( "JpgFromRawStart", 0x0201, 1, TiffDirectoryType.EXIF_DIRECTORY_IFD2, true); - TagInfoLong EXIF_TAG_OTHER_IMAGE_START = new TagInfoLong( + public static final TagInfoLong EXIF_TAG_OTHER_IMAGE_START = new TagInfoLong( "OtherImageStart", 0x0201, 1, TiffDirectoryType.EXIF_DIRECTORY_UNKNOWN, true); - TagInfoLong EXIF_TAG_PREVIEW_IMAGE_LENGTH_MAKER_NOTES = new TagInfoLong( + public static final TagInfoLong EXIF_TAG_PREVIEW_IMAGE_LENGTH_MAKER_NOTES = new TagInfoLong( "PreviewImageLength", 0x0202, 1, TiffDirectoryType.EXIF_DIRECTORY_MAKER_NOTES); - TagInfoLong EXIF_TAG_JPG_FROM_RAW_LENGTH_SUB_IFD = new TagInfoLong( + public static final TagInfoLong EXIF_TAG_JPG_FROM_RAW_LENGTH_SUB_IFD = new TagInfoLong( "JpgFromRawLength", 0x0202, 1, TiffDirectoryType.EXIF_DIRECTORY_SUB_IFD); - TagInfoLong EXIF_TAG_JPG_FROM_RAW_LENGTH_IFD2 = new TagInfoLong( + public static final TagInfoLong EXIF_TAG_JPG_FROM_RAW_LENGTH_IFD2 = new TagInfoLong( "JpgFromRawLength", 0x0202, 1, TiffDirectoryType.EXIF_DIRECTORY_IFD2); - TagInfoLong EXIF_TAG_OTHER_IMAGE_LENGTH = new TagInfoLong( + public static final TagInfoLong EXIF_TAG_OTHER_IMAGE_LENGTH = new TagInfoLong( "OtherImageLength", 0x0202, 1, TiffDirectoryType.EXIF_DIRECTORY_UNKNOWN); - TagInfoByte EXIF_TAG_APPLICATION_NOTES = new TagInfoByte( + public static final TagInfoByte EXIF_TAG_APPLICATION_NOTES = new TagInfoByte( "ApplicationNotes", 0x02bc, -1, TiffDirectoryType.EXIF_DIRECTORY_UNKNOWN); - TagInfoUnknown EXIF_TAG_MATTEING = new TagInfoUnknown( + public static final TagInfoUnknown EXIF_TAG_MATTEING = new TagInfoUnknown( "Matteing", 0x80e3, -1, TiffDirectoryType.EXIF_DIRECTORY_UNKNOWN); - TagInfoUnknown EXIF_TAG_DATA_TYPE = new TagInfoUnknown( + public static final TagInfoUnknown EXIF_TAG_DATA_TYPE = new TagInfoUnknown( "DataType", 0x80e4, -1, TiffDirectoryType.EXIF_DIRECTORY_UNKNOWN); - TagInfoUnknown EXIF_TAG_IMAGE_DEPTH = new TagInfoUnknown( + public static final TagInfoUnknown EXIF_TAG_IMAGE_DEPTH = new TagInfoUnknown( "ImageDepth", 0x80e5, -1, TiffDirectoryType.EXIF_DIRECTORY_UNKNOWN); - TagInfoUnknown EXIF_TAG_TILE_DEPTH = new TagInfoUnknown( + public static final TagInfoUnknown EXIF_TAG_TILE_DEPTH = new TagInfoUnknown( "TileDepth", 0x80e6, -1, TiffDirectoryType.EXIF_DIRECTORY_UNKNOWN); - TagInfoUnknown EXIF_TAG_MODEL_2 = new TagInfoUnknown( + public static final TagInfoUnknown EXIF_TAG_MODEL_2 = new TagInfoUnknown( "Model2", 0x827d, -1, TiffDirectoryType.EXIF_DIRECTORY_UNKNOWN); - TagInfoRational EXIF_TAG_EXPOSURE_TIME = new TagInfoRational( + public static final TagInfoRational EXIF_TAG_EXPOSURE_TIME = new TagInfoRational( "ExposureTime", 0x829a, -1, TiffDirectoryType.EXIF_DIRECTORY_EXIF_IFD); - TagInfoRational EXIF_TAG_FNUMBER = new TagInfoRational( + public static final TagInfoRational EXIF_TAG_FNUMBER = new TagInfoRational( "FNumber", 0x829d, -1, TiffDirectoryType.EXIF_DIRECTORY_EXIF_IFD); // FIXME: other types? - TagInfoLong EXIF_TAG_IPTC_NAA = new TagInfoLong( + public static final TagInfoLong EXIF_TAG_IPTC_NAA = new TagInfoLong( "IPTC-NAA", 0x83bb, 1, TiffDirectoryType.EXIF_DIRECTORY_IFD0); - TagInfoShort EXIF_TAG_INTERGRAPH_PACKET_DATA = new TagInfoShort( + public static final TagInfoShort EXIF_TAG_INTERGRAPH_PACKET_DATA = new TagInfoShort( "IntergraphPacketData", 0x847e, -1, TiffDirectoryType.EXIF_DIRECTORY_UNKNOWN); - TagInfoLong EXIF_TAG_INTERGRAPH_FLAG_REGISTERS = new TagInfoLong( + public static final TagInfoLong EXIF_TAG_INTERGRAPH_FLAG_REGISTERS = new TagInfoLong( "IntergraphFlagRegisters", 0x847f, 16, TiffDirectoryType.EXIF_DIRECTORY_UNKNOWN); - TagInfoAscii EXIF_TAG_SITE = new TagInfoAscii( + public static final TagInfoAscii EXIF_TAG_SITE = new TagInfoAscii( "Site", 0x84e0, -1, TiffDirectoryType.EXIF_DIRECTORY_UNKNOWN); - TagInfoAscii EXIF_TAG_COLOR_SEQUENCE = new TagInfoAscii( + public static final TagInfoAscii EXIF_TAG_COLOR_SEQUENCE = new TagInfoAscii( "ColorSequence", 0x84e1, -1, TiffDirectoryType.EXIF_DIRECTORY_UNKNOWN); - TagInfoAscii EXIF_TAG_IT8HEADER = new TagInfoAscii( + public static final TagInfoAscii EXIF_TAG_IT8HEADER = new TagInfoAscii( "IT8Header", 0x84e2, -1, TiffDirectoryType.EXIF_DIRECTORY_UNKNOWN); - TagInfoShort EXIF_TAG_RASTER_PADDING = new TagInfoShort( + public static final TagInfoShort EXIF_TAG_RASTER_PADDING = new TagInfoShort( "RasterPadding", 0x84e3, 1, TiffDirectoryType.EXIF_DIRECTORY_UNKNOWN); - TagInfoShort EXIF_TAG_BITS_PER_RUN_LENGTH = new TagInfoShort( + public static final TagInfoShort EXIF_TAG_BITS_PER_RUN_LENGTH = new TagInfoShort( "BitsPerRunLength", 0x84e4, 1, TiffDirectoryType.EXIF_DIRECTORY_UNKNOWN); - TagInfoShort EXIF_TAG_BITS_PER_EXTENDED_RUN_LENGTH = new TagInfoShort( + public static final TagInfoShort EXIF_TAG_BITS_PER_EXTENDED_RUN_LENGTH = new TagInfoShort( "BitsPerExtendedRunLength", 0x84e5, 1, TiffDirectoryType.EXIF_DIRECTORY_UNKNOWN); - TagInfoByte EXIF_TAG_COLOR_TABLE = new TagInfoByte( + public static final TagInfoByte EXIF_TAG_COLOR_TABLE = new TagInfoByte( "ColorTable", 0x84e6, -1, TiffDirectoryType.EXIF_DIRECTORY_UNKNOWN); - TagInfoByte EXIF_TAG_IMAGE_COLOR_INDICATOR = new TagInfoByte( + public static final TagInfoByte EXIF_TAG_IMAGE_COLOR_INDICATOR = new TagInfoByte( "ImageColorIndicator", 0x84e7, 1, TiffDirectoryType.EXIF_DIRECTORY_UNKNOWN); - TagInfoByte EXIF_TAG_BACKGROUND_COLOR_INDICATOR = new TagInfoByte( + public static final TagInfoByte EXIF_TAG_BACKGROUND_COLOR_INDICATOR = new TagInfoByte( "BackgroundColorIndicator", 0x84e8, 1, TiffDirectoryType.EXIF_DIRECTORY_UNKNOWN); - TagInfoByte EXIF_TAG_IMAGE_COLOR_VALUE = new TagInfoByte( + public static final TagInfoByte EXIF_TAG_IMAGE_COLOR_VALUE = new TagInfoByte( "ImageColorValue", 0x84e9, -1, TiffDirectoryType.EXIF_DIRECTORY_UNKNOWN); - TagInfoByte EXIF_TAG_BACKGROUND_COLOR_VALUE = new TagInfoByte( + public static final TagInfoByte EXIF_TAG_BACKGROUND_COLOR_VALUE = new TagInfoByte( "BackgroundColorValue", 0x84ea, -1, TiffDirectoryType.EXIF_DIRECTORY_UNKNOWN); - TagInfoByte EXIF_TAG_PIXEL_INTENSITY_RANGE = new TagInfoByte( + public static final TagInfoByte EXIF_TAG_PIXEL_INTENSITY_RANGE = new TagInfoByte( "PixelIntensityRange", 0x84eb, -1, TiffDirectoryType.EXIF_DIRECTORY_UNKNOWN); - TagInfoByte EXIF_TAG_TRANSPARENCY_INDICATOR = new TagInfoByte( + public static final TagInfoByte EXIF_TAG_TRANSPARENCY_INDICATOR = new TagInfoByte( "TransparencyIndicator", 0x84ec, 1, TiffDirectoryType.EXIF_DIRECTORY_UNKNOWN); - TagInfoAscii EXIF_TAG_COLOR_CHARACTERIZATION = new TagInfoAscii( + public static final TagInfoAscii EXIF_TAG_COLOR_CHARACTERIZATION = new TagInfoAscii( "ColorCharacterization", 0x84ed, -1, TiffDirectoryType.EXIF_DIRECTORY_UNKNOWN); - TagInfoShortOrLong EXIF_TAG_HCUSAGE = new TagInfoShortOrLong( + public static final TagInfoShortOrLong EXIF_TAG_HCUSAGE = new TagInfoShortOrLong( "HCUsage", 0x84ee, 1, TiffDirectoryType.EXIF_DIRECTORY_UNKNOWN); - TagInfoAscii EXIF_TAG_SEMINFO = new TagInfoAscii( + public static final TagInfoAscii EXIF_TAG_SEMINFO = new TagInfoAscii( "SEMInfo", 0x8546, 1, TiffDirectoryType.EXIF_DIRECTORY_IFD0); - TagInfoLong EXIF_TAG_AFCP_IPTC = new TagInfoLong( + public static final TagInfoLong EXIF_TAG_AFCP_IPTC = new TagInfoLong( "AFCP_IPTC", 0x8568, 1, TiffDirectoryType.EXIF_DIRECTORY_UNKNOWN); - TagInfoLong EXIF_TAG_LEAF_DATA = new TagInfoLong( + public static final TagInfoLong EXIF_TAG_LEAF_DATA = new TagInfoLong( "LeafData", 0x8606, 1, TiffDirectoryType.EXIF_DIRECTORY_UNKNOWN); - TagInfoByte EXIF_TAG_PHOTOSHOP_SETTINGS = new TagInfoByte( + public static final TagInfoByte EXIF_TAG_PHOTOSHOP_SETTINGS = new TagInfoByte( "PhotoshopSettings", 0x8649, -1, TiffDirectoryType.EXIF_DIRECTORY_UNKNOWN); - TagInfoDirectory EXIF_TAG_EXIF_OFFSET = new TagInfoDirectory( + public static final TagInfoDirectory EXIF_TAG_EXIF_OFFSET = new TagInfoDirectory( "ExifOffset", 0x8769, 1, TiffDirectoryType.EXIF_DIRECTORY_UNKNOWN); - TagInfoShort EXIF_TAG_EXPOSURE_PROGRAM = new TagInfoShort( + public static final TagInfoShort EXIF_TAG_EXPOSURE_PROGRAM = new TagInfoShort( "ExposureProgram", 0x8822, 1, TiffDirectoryType.EXIF_DIRECTORY_EXIF_IFD); - int EXPOSURE_PROGRAM_VALUE_MANUAL = 1; - int EXPOSURE_PROGRAM_VALUE_PROGRAM_AE = 2; - int EXPOSURE_PROGRAM_VALUE_APERTURE_PRIORITY_AE = 3; - int EXPOSURE_PROGRAM_VALUE_SHUTTER_SPEED_PRIORITY_AE = 4; - int EXPOSURE_PROGRAM_VALUE_CREATIVE_SLOW_SPEED = 5; - int EXPOSURE_PROGRAM_VALUE_ACTION_HIGH_SPEED = 6; - int EXPOSURE_PROGRAM_VALUE_PORTRAIT = 7; - int EXPOSURE_PROGRAM_VALUE_LANDSCAPE = 8; - TagInfoAscii EXIF_TAG_SPECTRAL_SENSITIVITY = new TagInfoAscii( + public static final int EXPOSURE_PROGRAM_VALUE_MANUAL = 1; + public static final int EXPOSURE_PROGRAM_VALUE_PROGRAM_AE = 2; + public static final int EXPOSURE_PROGRAM_VALUE_APERTURE_PRIORITY_AE = 3; + public static final int EXPOSURE_PROGRAM_VALUE_SHUTTER_SPEED_PRIORITY_AE = 4; + public static final int EXPOSURE_PROGRAM_VALUE_CREATIVE_SLOW_SPEED = 5; + public static final int EXPOSURE_PROGRAM_VALUE_ACTION_HIGH_SPEED = 6; + public static final int EXPOSURE_PROGRAM_VALUE_PORTRAIT = 7; + public static final int EXPOSURE_PROGRAM_VALUE_LANDSCAPE = 8; + public static final TagInfoAscii EXIF_TAG_SPECTRAL_SENSITIVITY = new TagInfoAscii( "SpectralSensitivity", 0x8824, -1, TiffDirectoryType.EXIF_DIRECTORY_EXIF_IFD); - TagInfoDirectory EXIF_TAG_GPSINFO = new TagInfoDirectory( + public static final TagInfoDirectory EXIF_TAG_GPSINFO = new TagInfoDirectory( "GPSInfo", 0x8825, 1, TiffDirectoryType.EXIF_DIRECTORY_UNKNOWN); - TagInfoShort EXIF_TAG_ISO = new TagInfoShort( + public static final TagInfoShort EXIF_TAG_ISO = new TagInfoShort( "PhotographicSensitivity", 0x8827, -1, TiffDirectoryType.EXIF_DIRECTORY_EXIF_IFD); - TagInfoUndefined EXIF_TAG_OPTO_ELECTRIC_CONV_FACTOR = new TagInfoUndefined( + public static final TagInfoUndefined EXIF_TAG_OPTO_ELECTRIC_CONV_FACTOR = new TagInfoUndefined( "Opto - Electric Conv Factor", 0x8828, -1, TiffDirectoryType.EXIF_DIRECTORY_UNKNOWN); - TagInfoLong EXIF_TAG_LEAF_SUB_IFD = new TagInfoLong( + public static final TagInfoLong EXIF_TAG_LEAF_SUB_IFD = new TagInfoLong( "LeafSubIFD", 0x888a, 1, TiffDirectoryType.EXIF_DIRECTORY_UNKNOWN); - TagInfoUndefined EXIF_TAG_EXIF_VERSION = new TagInfoUndefined( + public static final TagInfoUndefined EXIF_TAG_EXIF_VERSION = new TagInfoUndefined( "ExifVersion", 0x9000, 4, TiffDirectoryType.EXIF_DIRECTORY_EXIF_IFD); - TagInfoAscii EXIF_TAG_DATE_TIME_ORIGINAL = new TagInfoAscii( + public static final TagInfoAscii EXIF_TAG_DATE_TIME_ORIGINAL = new TagInfoAscii( "DateTimeOriginal", 0x9003, 20, TiffDirectoryType.EXIF_DIRECTORY_EXIF_IFD); - TagInfoAscii EXIF_TAG_DATE_TIME_DIGITIZED = new TagInfoAscii( + public static final TagInfoAscii EXIF_TAG_DATE_TIME_DIGITIZED = new TagInfoAscii( "DateTimeDigitized", 0x9004, 20, TiffDirectoryType.EXIF_DIRECTORY_EXIF_IFD); - TagInfoUndefined EXIF_TAG_COMPONENTS_CONFIGURATION = new TagInfoUndefined( + public static final TagInfoUndefined EXIF_TAG_COMPONENTS_CONFIGURATION = new TagInfoUndefined( "ComponentsConfiguration", 0x9101, 4, TiffDirectoryType.EXIF_DIRECTORY_EXIF_IFD); - TagInfoRational EXIF_TAG_COMPRESSED_BITS_PER_PIXEL = new TagInfoRational( + public static final TagInfoRational EXIF_TAG_COMPRESSED_BITS_PER_PIXEL = new TagInfoRational( "CompressedBitsPerPixel", 0x9102, 1, TiffDirectoryType.EXIF_DIRECTORY_EXIF_IFD); - TagInfoSRational EXIF_TAG_SHUTTER_SPEED_VALUE = new TagInfoSRational( + public static final TagInfoSRational EXIF_TAG_SHUTTER_SPEED_VALUE = new TagInfoSRational( "ShutterSpeedValue", 0x9201, 1, TiffDirectoryType.EXIF_DIRECTORY_EXIF_IFD); - TagInfoRational EXIF_TAG_APERTURE_VALUE = new TagInfoRational( + public static final TagInfoRational EXIF_TAG_APERTURE_VALUE = new TagInfoRational( "ApertureValue", 0x9202, 1, TiffDirectoryType.EXIF_DIRECTORY_EXIF_IFD); - TagInfoSRational EXIF_TAG_BRIGHTNESS_VALUE = new TagInfoSRational( + public static final TagInfoSRational EXIF_TAG_BRIGHTNESS_VALUE = new TagInfoSRational( "BrightnessValue", 0x9203, 1, TiffDirectoryType.EXIF_DIRECTORY_EXIF_IFD); - TagInfoSRational EXIF_TAG_EXPOSURE_COMPENSATION = new TagInfoSRational( + public static final TagInfoSRational EXIF_TAG_EXPOSURE_COMPENSATION = new TagInfoSRational( "ExposureCompensation", 0x9204, 1, TiffDirectoryType.EXIF_DIRECTORY_EXIF_IFD); - TagInfoRational EXIF_TAG_MAX_APERTURE_VALUE = new TagInfoRational( + public static final TagInfoRational EXIF_TAG_MAX_APERTURE_VALUE = new TagInfoRational( "MaxApertureValue", 0x9205, 1, TiffDirectoryType.EXIF_DIRECTORY_EXIF_IFD); - TagInfoRational EXIF_TAG_SUBJECT_DISTANCE = new TagInfoRational( + public static final TagInfoRational EXIF_TAG_SUBJECT_DISTANCE = new TagInfoRational( "Subject Distance", 0x9206, -1, TiffDirectoryType.EXIF_DIRECTORY_EXIF_IFD); - TagInfoShort EXIF_TAG_METERING_MODE = new TagInfoShort( + public static final TagInfoShort EXIF_TAG_METERING_MODE = new TagInfoShort( "MeteringMode", 0x9207, 1, TiffDirectoryType.EXIF_DIRECTORY_EXIF_IFD); - int METERING_MODE_VALUE_AVERAGE = 1; - int METERING_MODE_VALUE_CENTER_WEIGHTED_AVERAGE = 2; - int METERING_MODE_VALUE_SPOT = 3; - int METERING_MODE_VALUE_MULTI_SPOT = 4; - int METERING_MODE_VALUE_MULTI_SEGMENT = 5; - int METERING_MODE_VALUE_PARTIAL = 6; - int METERING_MODE_VALUE_OTHER = 255; - TagInfoShort EXIF_TAG_LIGHT_SOURCE = new TagInfoShort( + public static final int METERING_MODE_VALUE_AVERAGE = 1; + public static final int METERING_MODE_VALUE_CENTER_WEIGHTED_AVERAGE = 2; + public static final int METERING_MODE_VALUE_SPOT = 3; + public static final int METERING_MODE_VALUE_MULTI_SPOT = 4; + public static final int METERING_MODE_VALUE_MULTI_SEGMENT = 5; + public static final int METERING_MODE_VALUE_PARTIAL = 6; + public static final int METERING_MODE_VALUE_OTHER = 255; + public static final TagInfoShort EXIF_TAG_LIGHT_SOURCE = new TagInfoShort( "LightSource", 0x9208, 1, TiffDirectoryType.EXIF_DIRECTORY_EXIF_IFD); - int LIGHT_SOURCE_VALUE_DAYLIGHT = 1; - int LIGHT_SOURCE_VALUE_FLUORESCENT = 2; - int LIGHT_SOURCE_VALUE_TUNGSTEN = 3; - int LIGHT_SOURCE_VALUE_FLASH = 4; - int LIGHT_SOURCE_VALUE_FINE_WEATHER = 9; - int LIGHT_SOURCE_VALUE_CLOUDY = 10; - int LIGHT_SOURCE_VALUE_SHADE = 11; - int LIGHT_SOURCE_VALUE_DAYLIGHT_FLUORESCENT = 12; - int LIGHT_SOURCE_VALUE_DAY_WHITE_FLUORESCENT = 13; - int LIGHT_SOURCE_VALUE_COOL_WHITE_FLUORESCENT = 14; - int LIGHT_SOURCE_VALUE_WHITE_FLUORESCENT = 15; - int LIGHT_SOURCE_VALUE_STANDARD_LIGHT_A = 17; - int LIGHT_SOURCE_VALUE_STANDARD_LIGHT_B = 18; - int LIGHT_SOURCE_VALUE_STANDARD_LIGHT_C = 19; - int LIGHT_SOURCE_VALUE_D55 = 20; - int LIGHT_SOURCE_VALUE_D65 = 21; - int LIGHT_SOURCE_VALUE_D75 = 22; - int LIGHT_SOURCE_VALUE_D50 = 23; - int LIGHT_SOURCE_VALUE_ISO_STUDIO_TUNGSTEN = 24; - int LIGHT_SOURCE_VALUE_OTHER = 255; - TagInfoShort EXIF_TAG_FLASH = new TagInfoShort( + public static final int LIGHT_SOURCE_VALUE_DAYLIGHT = 1; + public static final int LIGHT_SOURCE_VALUE_FLUORESCENT = 2; + public static final int LIGHT_SOURCE_VALUE_TUNGSTEN = 3; + public static final int LIGHT_SOURCE_VALUE_FLASH = 4; + public static final int LIGHT_SOURCE_VALUE_FINE_WEATHER = 9; + public static final int LIGHT_SOURCE_VALUE_CLOUDY = 10; + public static final int LIGHT_SOURCE_VALUE_SHADE = 11; + public static final int LIGHT_SOURCE_VALUE_DAYLIGHT_FLUORESCENT = 12; + public static final int LIGHT_SOURCE_VALUE_DAY_WHITE_FLUORESCENT = 13; + public static final int LIGHT_SOURCE_VALUE_COOL_WHITE_FLUORESCENT = 14; + public static final int LIGHT_SOURCE_VALUE_WHITE_FLUORESCENT = 15; + public static final int LIGHT_SOURCE_VALUE_STANDARD_LIGHT_A = 17; + public static final int LIGHT_SOURCE_VALUE_STANDARD_LIGHT_B = 18; + public static final int LIGHT_SOURCE_VALUE_STANDARD_LIGHT_C = 19; + public static final int LIGHT_SOURCE_VALUE_D55 = 20; + public static final int LIGHT_SOURCE_VALUE_D65 = 21; + public static final int LIGHT_SOURCE_VALUE_D75 = 22; + public static final int LIGHT_SOURCE_VALUE_D50 = 23; + public static final int LIGHT_SOURCE_VALUE_ISO_STUDIO_TUNGSTEN = 24; + public static final int LIGHT_SOURCE_VALUE_OTHER = 255; + public static final TagInfoShort EXIF_TAG_FLASH = new TagInfoShort( "Flash", 0x9209, 1, TiffDirectoryType.EXIF_DIRECTORY_EXIF_IFD); - int FLASH_VALUE_NO_FLASH = 0x0; - int FLASH_VALUE_FIRED = 0x1; - int FLASH_VALUE_FIRED_RETURN_NOT_DETECTED = 0x5; - int FLASH_VALUE_FIRED_RETURN_DETECTED = 0x7; - int FLASH_VALUE_ON_DID_NOT_FIRE = 0x8; - int FLASH_VALUE_ON = 0x9; - int FLASH_VALUE_ON_RETURN_NOT_DETECTED = 0xd; - int FLASH_VALUE_ON_RETURN_DETECTED = 0xf; - int FLASH_VALUE_OFF = 0x10; - int FLASH_VALUE_OFF_DID_NOT_FIRE_RETURN_NOT_DETECTED = 0x14; - int FLASH_VALUE_AUTO_DID_NOT_FIRE = 0x18; - int FLASH_VALUE_AUTO_FIRED = 0x19; - int FLASH_VALUE_AUTO_FIRED_RETURN_NOT_DETECTED = 0x1d; - int FLASH_VALUE_AUTO_FIRED_RETURN_DETECTED = 0x1f; - int FLASH_VALUE_NO_FLASH_FUNCTION = 0x20; - int FLASH_VALUE_OFF_NO_FLASH_FUNCTION = 0x30; - int FLASH_VALUE_FIRED_RED_EYE_REDUCTION = 0x41; - int FLASH_VALUE_FIRED_RED_EYE_REDUCTION_RETURN_NOT_DETECTED = 0x45; - int FLASH_VALUE_FIRED_RED_EYE_REDUCTION_RETURN_DETECTED = 0x47; - int FLASH_VALUE_ON_RED_EYE_REDUCTION = 0x49; - int FLASH_VALUE_ON_RED_EYE_REDUCTION_RETURN_NOT_DETECTED = 0x4d; - int FLASH_VALUE_ON_RED_EYE_REDUCTION_RETURN_DETECTED = 0x4f; - int FLASH_VALUE_OFF_RED_EYE_REDUCTION = 0x50; - int FLASH_VALUE_AUTO_DID_NOT_FIRE_RED_EYE_REDUCTION = 0x58; - int FLASH_VALUE_AUTO_FIRED_RED_EYE_REDUCTION = 0x59; - int FLASH_VALUE_AUTO_FIRED_RED_EYE_REDUCTION_RETURN_NOT_DETECTED = 0x5d; - int FLASH_VALUE_AUTO_FIRED_RED_EYE_REDUCTION_RETURN_DETECTED = 0x5f; - TagInfoRational EXIF_TAG_FOCAL_LENGTH = new TagInfoRational( + public static final int FLASH_VALUE_NO_FLASH = 0x0; + public static final int FLASH_VALUE_FIRED = 0x1; + public static final int FLASH_VALUE_FIRED_RETURN_NOT_DETECTED = 0x5; + public static final int FLASH_VALUE_FIRED_RETURN_DETECTED = 0x7; + public static final int FLASH_VALUE_ON_DID_NOT_FIRE = 0x8; + public static final int FLASH_VALUE_ON = 0x9; + public static final int FLASH_VALUE_ON_RETURN_NOT_DETECTED = 0xd; + public static final int FLASH_VALUE_ON_RETURN_DETECTED = 0xf; + public static final int FLASH_VALUE_OFF = 0x10; + public static final int FLASH_VALUE_OFF_DID_NOT_FIRE_RETURN_NOT_DETECTED = 0x14; + public static final int FLASH_VALUE_AUTO_DID_NOT_FIRE = 0x18; + public static final int FLASH_VALUE_AUTO_FIRED = 0x19; + public static final int FLASH_VALUE_AUTO_FIRED_RETURN_NOT_DETECTED = 0x1d; + public static final int FLASH_VALUE_AUTO_FIRED_RETURN_DETECTED = 0x1f; + public static final int FLASH_VALUE_NO_FLASH_FUNCTION = 0x20; + public static final int FLASH_VALUE_OFF_NO_FLASH_FUNCTION = 0x30; + public static final int FLASH_VALUE_FIRED_RED_EYE_REDUCTION = 0x41; + public static final int FLASH_VALUE_FIRED_RED_EYE_REDUCTION_RETURN_NOT_DETECTED = 0x45; + public static final int FLASH_VALUE_FIRED_RED_EYE_REDUCTION_RETURN_DETECTED = 0x47; + public static final int FLASH_VALUE_ON_RED_EYE_REDUCTION = 0x49; + public static final int FLASH_VALUE_ON_RED_EYE_REDUCTION_RETURN_NOT_DETECTED = 0x4d; + public static final int FLASH_VALUE_ON_RED_EYE_REDUCTION_RETURN_DETECTED = 0x4f; + public static final int FLASH_VALUE_OFF_RED_EYE_REDUCTION = 0x50; + public static final int FLASH_VALUE_AUTO_DID_NOT_FIRE_RED_EYE_REDUCTION = 0x58; + public static final int FLASH_VALUE_AUTO_FIRED_RED_EYE_REDUCTION = 0x59; + public static final int FLASH_VALUE_AUTO_FIRED_RED_EYE_REDUCTION_RETURN_NOT_DETECTED = 0x5d; + public static final int FLASH_VALUE_AUTO_FIRED_RED_EYE_REDUCTION_RETURN_DETECTED = 0x5f; + public static final TagInfoRational EXIF_TAG_FOCAL_LENGTH = new TagInfoRational( "FocalLength", 0x920a, -1, TiffDirectoryType.EXIF_DIRECTORY_EXIF_IFD); - TagInfoShort EXIF_TAG_SUBJECT_AREA = new TagInfoShort( + public static final TagInfoShort EXIF_TAG_SUBJECT_AREA = new TagInfoShort( "SubjectArea", 0x9214, -1, TiffDirectoryType.EXIF_DIRECTORY_EXIF_IFD); - TagInfoDouble EXIF_TAG_STO_NITS = new TagInfoDouble( + public static final TagInfoDouble EXIF_TAG_STO_NITS = new TagInfoDouble( "StoNits", 0x923f, 1, TiffDirectoryType.EXIF_DIRECTORY_UNKNOWN); - TagInfoUndefined EXIF_TAG_MAKER_NOTE = new TagInfoUndefined( + public static final TagInfoUndefined EXIF_TAG_MAKER_NOTE = new TagInfoUndefined( "MakerNote", 0x927c, -1, TiffDirectoryType.EXIF_DIRECTORY_EXIF_IFD); - TagInfoGpsText EXIF_TAG_USER_COMMENT = new TagInfoGpsText( + public static final TagInfoGpsText EXIF_TAG_USER_COMMENT = new TagInfoGpsText( "UserComment", 0x9286, 1, TiffDirectoryType.EXIF_DIRECTORY_EXIF_IFD); - TagInfoAscii EXIF_TAG_SUB_SEC_TIME = new TagInfoAscii( + public static final TagInfoAscii EXIF_TAG_SUB_SEC_TIME = new TagInfoAscii( "SubSecTime", 0x9290, -1, TiffDirectoryType.EXIF_DIRECTORY_EXIF_IFD); - TagInfoAscii EXIF_TAG_SUB_SEC_TIME_ORIGINAL = new TagInfoAscii( + public static final TagInfoAscii EXIF_TAG_SUB_SEC_TIME_ORIGINAL = new TagInfoAscii( "SubSecTimeOriginal", 0x9291, -1, TiffDirectoryType.EXIF_DIRECTORY_EXIF_IFD); - TagInfoAscii EXIF_TAG_SUB_SEC_TIME_DIGITIZED = new TagInfoAscii( + public static final TagInfoAscii EXIF_TAG_SUB_SEC_TIME_DIGITIZED = new TagInfoAscii( "SubSecTimeDigitized", 0x9292, -1, TiffDirectoryType.EXIF_DIRECTORY_EXIF_IFD); - TagInfoUndefined EXIF_TAG_FLASHPIX_VERSION = new TagInfoUndefined( + public static final TagInfoUndefined EXIF_TAG_FLASHPIX_VERSION = new TagInfoUndefined( "FlashpixVersion", 0xa000, 4, TiffDirectoryType.EXIF_DIRECTORY_EXIF_IFD); - TagInfoShort EXIF_TAG_EXIF_IMAGE_WIDTH = new TagInfoShort( + public static final TagInfoShort EXIF_TAG_EXIF_IMAGE_WIDTH = new TagInfoShort( "ExifImageWidth", 0xa002, 1, TiffDirectoryType.EXIF_DIRECTORY_EXIF_IFD); - TagInfoShort EXIF_TAG_EXIF_IMAGE_LENGTH = new TagInfoShort( + public static final TagInfoShort EXIF_TAG_EXIF_IMAGE_LENGTH = new TagInfoShort( "ExifImageLength", 0xa003, 1, TiffDirectoryType.EXIF_DIRECTORY_EXIF_IFD); - TagInfoAscii EXIF_TAG_RELATED_SOUND_FILE = new TagInfoAscii( + public static final TagInfoAscii EXIF_TAG_RELATED_SOUND_FILE = new TagInfoAscii( "RelatedSoundFile", 0xa004, 13, TiffDirectoryType.EXIF_DIRECTORY_EXIF_IFD); - TagInfoDirectory EXIF_TAG_INTEROP_OFFSET = new TagInfoDirectory( + public static final TagInfoDirectory EXIF_TAG_INTEROP_OFFSET = new TagInfoDirectory( "InteropOffset", 0xa005, 1, TiffDirectoryType.EXIF_DIRECTORY_UNKNOWN); - TagInfoRational EXIF_TAG_FLASH_ENERGY_EXIF_IFD = new TagInfoRational( + public static final TagInfoRational EXIF_TAG_FLASH_ENERGY_EXIF_IFD = new TagInfoRational( "FlashEnergy", 0xa20b, -1, TiffDirectoryType.EXIF_DIRECTORY_EXIF_IFD); - TagInfoUndefined EXIF_TAG_SPATIAL_FREQUENCY_RESPONSE_2 = new TagInfoUndefined( + public static final TagInfoUndefined EXIF_TAG_SPATIAL_FREQUENCY_RESPONSE_2 = new TagInfoUndefined( "SpatialFrequencyResponse", 0xa20c, -1, TiffDirectoryType.EXIF_DIRECTORY_UNKNOWN); - TagInfoUnknown EXIF_TAG_NOISE_2 = new TagInfoUnknown( + public static final TagInfoUnknown EXIF_TAG_NOISE_2 = new TagInfoUnknown( "Noise", 0xa20d, -1, TiffDirectoryType.EXIF_DIRECTORY_UNKNOWN); - TagInfoRational EXIF_TAG_FOCAL_PLANE_XRESOLUTION_EXIF_IFD = new TagInfoRational( + public static final TagInfoRational EXIF_TAG_FOCAL_PLANE_XRESOLUTION_EXIF_IFD = new TagInfoRational( "FocalPlaneXResolution", 0xa20e, 1, TiffDirectoryType.EXIF_DIRECTORY_EXIF_IFD); - TagInfoRational EXIF_TAG_FOCAL_PLANE_YRESOLUTION_EXIF_IFD = new TagInfoRational( + public static final TagInfoRational EXIF_TAG_FOCAL_PLANE_YRESOLUTION_EXIF_IFD = new TagInfoRational( "FocalPlaneYResolution", 0xa20f, 1, TiffDirectoryType.EXIF_DIRECTORY_EXIF_IFD); - TagInfoShort EXIF_TAG_FOCAL_PLANE_RESOLUTION_UNIT_EXIF_IFD = new TagInfoShort( + public static final TagInfoShort EXIF_TAG_FOCAL_PLANE_RESOLUTION_UNIT_EXIF_IFD = new TagInfoShort( "FocalPlaneResolutionUnit", 0xa210, 1, TiffDirectoryType.EXIF_DIRECTORY_EXIF_IFD); - int FOCAL_PLANE_RESOLUTION_UNIT_EXIF_IFD_VALUE_NONE = 1; - int FOCAL_PLANE_RESOLUTION_UNIT_EXIF_IFD_VALUE_INCHES = 2; - int FOCAL_PLANE_RESOLUTION_UNIT_EXIF_IFD_VALUE_CM = 3; - int FOCAL_PLANE_RESOLUTION_UNIT_EXIF_IFD_VALUE_MM = 4; - int FOCAL_PLANE_RESOLUTION_UNIT_EXIF_IFD_VALUE_UM = 5; - TagInfoUnknown EXIF_TAG_IMAGE_NUMBER = new TagInfoUnknown( + public static final int FOCAL_PLANE_RESOLUTION_UNIT_EXIF_IFD_VALUE_NONE = 1; + public static final int FOCAL_PLANE_RESOLUTION_UNIT_EXIF_IFD_VALUE_INCHES = 2; + public static final int FOCAL_PLANE_RESOLUTION_UNIT_EXIF_IFD_VALUE_CM = 3; + public static final int FOCAL_PLANE_RESOLUTION_UNIT_EXIF_IFD_VALUE_MM = 4; + public static final int FOCAL_PLANE_RESOLUTION_UNIT_EXIF_IFD_VALUE_UM = 5; + public static final TagInfoUnknown EXIF_TAG_IMAGE_NUMBER = new TagInfoUnknown( "ImageNumber", 0xa211, -1, TiffDirectoryType.EXIF_DIRECTORY_UNKNOWN); - TagInfoUnknown EXIF_TAG_SECURITY_CLASSIFICATION = new TagInfoUnknown( + public static final TagInfoUnknown EXIF_TAG_SECURITY_CLASSIFICATION = new TagInfoUnknown( "SecurityClassification", 0xa212, -1, TiffDirectoryType.EXIF_DIRECTORY_UNKNOWN); - TagInfoUnknown EXIF_TAG_IMAGE_HISTORY = new TagInfoUnknown( + public static final TagInfoUnknown EXIF_TAG_IMAGE_HISTORY = new TagInfoUnknown( "ImageHistory", 0xa213, -1, TiffDirectoryType.EXIF_DIRECTORY_UNKNOWN); - TagInfoShort EXIF_TAG_SUBJECT_LOCATION = new TagInfoShort( + public static final TagInfoShort EXIF_TAG_SUBJECT_LOCATION = new TagInfoShort( "SubjectLocation", 0xa214, 2, TiffDirectoryType.EXIF_DIRECTORY_EXIF_IFD); - TagInfoRational EXIF_TAG_EXPOSURE_INDEX_EXIF_IFD = new TagInfoRational( + public static final TagInfoRational EXIF_TAG_EXPOSURE_INDEX_EXIF_IFD = new TagInfoRational( "ExposureIndex", 0xa215, 1, TiffDirectoryType.EXIF_DIRECTORY_EXIF_IFD); - TagInfoUnknown EXIF_TAG_TIFF_EPSTANDARD_ID_2 = new TagInfoUnknown( + public static final TagInfoUnknown EXIF_TAG_TIFF_EPSTANDARD_ID_2 = new TagInfoUnknown( "TIFF-EPStandardID", 0xa216, -1, TiffDirectoryType.EXIF_DIRECTORY_UNKNOWN); - TagInfoShort EXIF_TAG_SENSING_METHOD_EXIF_IFD = new TagInfoShort( + public static final TagInfoShort EXIF_TAG_SENSING_METHOD_EXIF_IFD = new TagInfoShort( "SensingMethod", 0xa217, 1, TiffDirectoryType.EXIF_DIRECTORY_EXIF_IFD); - int SENSING_METHOD_EXIF_IFD_VALUE_NOT_DEFINED = 1; - int SENSING_METHOD_EXIF_IFD_VALUE_ONE_CHIP_COLOR_AREA = 2; - int SENSING_METHOD_EXIF_IFD_VALUE_TWO_CHIP_COLOR_AREA = 3; - int SENSING_METHOD_EXIF_IFD_VALUE_THREE_CHIP_COLOR_AREA = 4; - int SENSING_METHOD_EXIF_IFD_VALUE_COLOR_SEQUENTIAL_AREA = 5; - int SENSING_METHOD_EXIF_IFD_VALUE_TRILINEAR = 7; - int SENSING_METHOD_EXIF_IFD_VALUE_COLOR_SEQUENTIAL_LINEAR = 8; - TagInfoUndefined EXIF_TAG_FILE_SOURCE = new TagInfoUndefined( + public static final int SENSING_METHOD_EXIF_IFD_VALUE_NOT_DEFINED = 1; + public static final int SENSING_METHOD_EXIF_IFD_VALUE_ONE_CHIP_COLOR_AREA = 2; + public static final int SENSING_METHOD_EXIF_IFD_VALUE_TWO_CHIP_COLOR_AREA = 3; + public static final int SENSING_METHOD_EXIF_IFD_VALUE_THREE_CHIP_COLOR_AREA = 4; + public static final int SENSING_METHOD_EXIF_IFD_VALUE_COLOR_SEQUENTIAL_AREA = 5; + public static final int SENSING_METHOD_EXIF_IFD_VALUE_TRILINEAR = 7; + public static final int SENSING_METHOD_EXIF_IFD_VALUE_COLOR_SEQUENTIAL_LINEAR = 8; + public static final TagInfoUndefined EXIF_TAG_FILE_SOURCE = new TagInfoUndefined( "FileSource", 0xa300, 1, TiffDirectoryType.EXIF_DIRECTORY_EXIF_IFD); - int FILE_SOURCE_VALUE_FILM_SCANNER = 1; - int FILE_SOURCE_VALUE_REFLECTION_PRINT_SCANNER = 2; - int FILE_SOURCE_VALUE_DIGITAL_CAMERA = 3; - TagInfoUndefined EXIF_TAG_SCENE_TYPE = new TagInfoUndefined( + public static final int FILE_SOURCE_VALUE_FILM_SCANNER = 1; + public static final int FILE_SOURCE_VALUE_REFLECTION_PRINT_SCANNER = 2; + public static final int FILE_SOURCE_VALUE_DIGITAL_CAMERA = 3; + public static final TagInfoUndefined EXIF_TAG_SCENE_TYPE = new TagInfoUndefined( "SceneType", 0xa301, 1, TiffDirectoryType.EXIF_DIRECTORY_EXIF_IFD); - TagInfoUndefined EXIF_TAG_CFAPATTERN = new TagInfoUndefined( + public static final TagInfoUndefined EXIF_TAG_CFAPATTERN = new TagInfoUndefined( "CFAPattern", 0xa302, -1, TiffDirectoryType.EXIF_DIRECTORY_EXIF_IFD); - TagInfoShort EXIF_TAG_CUSTOM_RENDERED = new TagInfoShort( + public static final TagInfoShort EXIF_TAG_CUSTOM_RENDERED = new TagInfoShort( "CustomRendered", 0xa401, 1, TiffDirectoryType.EXIF_DIRECTORY_EXIF_IFD); - int CUSTOM_RENDERED_VALUE_NORMAL = 0; - int CUSTOM_RENDERED_VALUE_CUSTOM = 1; - TagInfoShort EXIF_TAG_EXPOSURE_MODE = new TagInfoShort( + public static final int CUSTOM_RENDERED_VALUE_NORMAL = 0; + public static final int CUSTOM_RENDERED_VALUE_CUSTOM = 1; + public static final TagInfoShort EXIF_TAG_EXPOSURE_MODE = new TagInfoShort( "ExposureMode", 0xa402, 1, TiffDirectoryType.EXIF_DIRECTORY_EXIF_IFD); - int EXPOSURE_MODE_VALUE_AUTO = 0; - int EXPOSURE_MODE_VALUE_MANUAL = 1; - int EXPOSURE_MODE_VALUE_AUTO_BRACKET = 2; - TagInfoShort EXIF_TAG_WHITE_BALANCE_1 = new TagInfoShort( + public static final int EXPOSURE_MODE_VALUE_AUTO = 0; + public static final int EXPOSURE_MODE_VALUE_MANUAL = 1; + public static final int EXPOSURE_MODE_VALUE_AUTO_BRACKET = 2; + public static final TagInfoShort EXIF_TAG_WHITE_BALANCE_1 = new TagInfoShort( "WhiteBalance", 0xa403, 1, TiffDirectoryType.EXIF_DIRECTORY_EXIF_IFD); - int WHITE_BALANCE_1_VALUE_AUTO = 0; - int WHITE_BALANCE_1_VALUE_MANUAL = 1; - TagInfoRational EXIF_TAG_DIGITAL_ZOOM_RATIO = new TagInfoRational( + public static final int WHITE_BALANCE_1_VALUE_AUTO = 0; + public static final int WHITE_BALANCE_1_VALUE_MANUAL = 1; + public static final TagInfoRational EXIF_TAG_DIGITAL_ZOOM_RATIO = new TagInfoRational( "DigitalZoomRatio", 0xa404, 1, TiffDirectoryType.EXIF_DIRECTORY_EXIF_IFD); - TagInfoShort EXIF_TAG_FOCAL_LENGTH_IN_35MM_FORMAT = new TagInfoShort( + public static final TagInfoShort EXIF_TAG_FOCAL_LENGTH_IN_35MM_FORMAT = new TagInfoShort( "FocalLengthIn35mmFormat", 0xa405, 1, TiffDirectoryType.EXIF_DIRECTORY_EXIF_IFD); - TagInfoShort EXIF_TAG_SCENE_CAPTURE_TYPE = new TagInfoShort( + public static final TagInfoShort EXIF_TAG_SCENE_CAPTURE_TYPE = new TagInfoShort( "SceneCaptureType", 0xa406, 1, TiffDirectoryType.EXIF_DIRECTORY_EXIF_IFD); - int SCENE_CAPTURE_TYPE_VALUE_STANDARD = 0; - int SCENE_CAPTURE_TYPE_VALUE_LANDSCAPE = 1; - int SCENE_CAPTURE_TYPE_VALUE_PORTRAIT = 2; - int SCENE_CAPTURE_TYPE_VALUE_NIGHT = 3; - TagInfoShort EXIF_TAG_GAIN_CONTROL = new TagInfoShort( + public static final int SCENE_CAPTURE_TYPE_VALUE_STANDARD = 0; + public static final int SCENE_CAPTURE_TYPE_VALUE_LANDSCAPE = 1; + public static final int SCENE_CAPTURE_TYPE_VALUE_PORTRAIT = 2; + public static final int SCENE_CAPTURE_TYPE_VALUE_NIGHT = 3; + public static final TagInfoShort EXIF_TAG_GAIN_CONTROL = new TagInfoShort( "GainControl", 0xa407, 1, TiffDirectoryType.EXIF_DIRECTORY_EXIF_IFD); - int GAIN_CONTROL_VALUE_NONE = 0; - int GAIN_CONTROL_VALUE_LOW_GAIN_UP = 1; - int GAIN_CONTROL_VALUE_HIGH_GAIN_UP = 2; - int GAIN_CONTROL_VALUE_LOW_GAIN_DOWN = 3; - int GAIN_CONTROL_VALUE_HIGH_GAIN_DOWN = 4; - TagInfoShort EXIF_TAG_CONTRAST_1 = new TagInfoShort( + public static final int GAIN_CONTROL_VALUE_NONE = 0; + public static final int GAIN_CONTROL_VALUE_LOW_GAIN_UP = 1; + public static final int GAIN_CONTROL_VALUE_HIGH_GAIN_UP = 2; + public static final int GAIN_CONTROL_VALUE_LOW_GAIN_DOWN = 3; + public static final int GAIN_CONTROL_VALUE_HIGH_GAIN_DOWN = 4; + public static final TagInfoShort EXIF_TAG_CONTRAST_1 = new TagInfoShort( "Contrast", 0xa408, 1, TiffDirectoryType.EXIF_DIRECTORY_EXIF_IFD); - int CONTRAST_1_VALUE_NORMAL = 0; - int CONTRAST_1_VALUE_LOW = 1; - int CONTRAST_1_VALUE_HIGH = 2; - TagInfoShort EXIF_TAG_SATURATION_1 = new TagInfoShort( + public static final int CONTRAST_1_VALUE_NORMAL = 0; + public static final int CONTRAST_1_VALUE_LOW = 1; + public static final int CONTRAST_1_VALUE_HIGH = 2; + public static final TagInfoShort EXIF_TAG_SATURATION_1 = new TagInfoShort( "Saturation", 0xa409, 1, TiffDirectoryType.EXIF_DIRECTORY_EXIF_IFD); - int SATURATION_1_VALUE_NORMAL = 0; - int SATURATION_1_VALUE_LOW = 1; - int SATURATION_1_VALUE_HIGH = 2; - TagInfoShort EXIF_TAG_SHARPNESS_1 = new TagInfoShort( + public static final int SATURATION_1_VALUE_NORMAL = 0; + public static final int SATURATION_1_VALUE_LOW = 1; + public static final int SATURATION_1_VALUE_HIGH = 2; + public static final TagInfoShort EXIF_TAG_SHARPNESS_1 = new TagInfoShort( "Sharpness", 0xa40a, 1, TiffDirectoryType.EXIF_DIRECTORY_EXIF_IFD); - int SHARPNESS_1_VALUE_NORMAL = 0; - int SHARPNESS_1_VALUE_SOFT = 1; - int SHARPNESS_1_VALUE_HARD = 2; - TagInfoUndefined EXIF_TAG_DEVICE_SETTING_DESCRIPTION = new TagInfoUndefined( + public static final int SHARPNESS_1_VALUE_NORMAL = 0; + public static final int SHARPNESS_1_VALUE_SOFT = 1; + public static final int SHARPNESS_1_VALUE_HARD = 2; + public static final TagInfoUndefined EXIF_TAG_DEVICE_SETTING_DESCRIPTION = new TagInfoUndefined( "DeviceSettingDescription", 0xa40b, -1, TiffDirectoryType.EXIF_DIRECTORY_UNKNOWN); - TagInfoShort EXIF_TAG_SUBJECT_DISTANCE_RANGE = new TagInfoShort( + public static final TagInfoShort EXIF_TAG_SUBJECT_DISTANCE_RANGE = new TagInfoShort( "SubjectDistanceRange", 0xa40c, 1, TiffDirectoryType.EXIF_DIRECTORY_EXIF_IFD); - int SUBJECT_DISTANCE_RANGE_VALUE_MACRO = 1; - int SUBJECT_DISTANCE_RANGE_VALUE_CLOSE = 2; - int SUBJECT_DISTANCE_RANGE_VALUE_DISTANT = 3; - TagInfoAscii EXIF_TAG_IMAGE_UNIQUE_ID = new TagInfoAscii( + public static final int SUBJECT_DISTANCE_RANGE_VALUE_MACRO = 1; + public static final int SUBJECT_DISTANCE_RANGE_VALUE_CLOSE = 2; + public static final int SUBJECT_DISTANCE_RANGE_VALUE_DISTANT = 3; + public static final TagInfoAscii EXIF_TAG_IMAGE_UNIQUE_ID = new TagInfoAscii( "ImageUniqueID", 0xa420, 33, TiffDirectoryType.EXIF_DIRECTORY_EXIF_IFD); - TagInfoRational EXIF_TAG_GAMMA = new TagInfoRational( + public static final TagInfoRational EXIF_TAG_GAMMA = new TagInfoRational( "Gamma", 0xa500, 1, TiffDirectoryType.EXIF_DIRECTORY_EXIF_IFD); - TagInfoUnknown EXIF_TAG_ANNOTATIONS = new TagInfoUnknown( + public static final TagInfoUnknown EXIF_TAG_ANNOTATIONS = new TagInfoUnknown( "Annotations", 0xc44f, -1, TiffDirectoryType.EXIF_DIRECTORY_UNKNOWN); - TagInfoUndefined EXIF_TAG_PRINT_IM = new TagInfoUndefined( + public static final TagInfoUndefined EXIF_TAG_PRINT_IM = new TagInfoUndefined( "PrintIM", 0xc4a5, 1, TiffDirectoryType.EXIF_DIRECTORY_IFD0); - TagInfoSLong EXIF_TAG_OFFSET_SCHEMA = new TagInfoSLong( + public static final TagInfoSLong EXIF_TAG_OFFSET_SCHEMA = new TagInfoSLong( "OffsetSchema", 0xea1d, 1, TiffDirectoryType.EXIF_DIRECTORY_EXIF_IFD); - TagInfoAscii EXIF_TAG_OWNER_NAME = new TagInfoAscii( + public static final TagInfoAscii EXIF_TAG_OWNER_NAME = new TagInfoAscii( "OwnerName", 0xfde8, -1, TiffDirectoryType.EXIF_DIRECTORY_EXIF_IFD); - TagInfoAscii EXIF_TAG_SERIAL_NUMBER = new TagInfoAscii( + public static final TagInfoAscii EXIF_TAG_SERIAL_NUMBER = new TagInfoAscii( "SerialNumber", 0xfde9, -1, TiffDirectoryType.EXIF_DIRECTORY_EXIF_IFD); - TagInfoAscii EXIF_TAG_LENS = new TagInfoAscii( + public static final TagInfoAscii EXIF_TAG_LENS = new TagInfoAscii( "Lens", 0xfdea, -1, TiffDirectoryType.EXIF_DIRECTORY_EXIF_IFD); - TagInfoAscii EXIF_TAG_RAW_FILE = new TagInfoAscii( + public static final TagInfoAscii EXIF_TAG_RAW_FILE = new TagInfoAscii( "RawFile", 0xfe4c, -1, TiffDirectoryType.EXIF_DIRECTORY_EXIF_IFD); - TagInfoAscii EXIF_TAG_CONVERTER = new TagInfoAscii( + public static final TagInfoAscii EXIF_TAG_CONVERTER = new TagInfoAscii( "Converter", 0xfe4d, -1, TiffDirectoryType.EXIF_DIRECTORY_EXIF_IFD); - TagInfoAscii EXIF_TAG_WHITE_BALANCE_2 = new TagInfoAscii( + public static final TagInfoAscii EXIF_TAG_WHITE_BALANCE_2 = new TagInfoAscii( "WhiteBalance", 0xfe4e, -1, TiffDirectoryType.EXIF_DIRECTORY_EXIF_IFD); - TagInfoAscii EXIF_TAG_EXPOSURE = new TagInfoAscii( + public static final TagInfoAscii EXIF_TAG_EXPOSURE = new TagInfoAscii( "Exposure", 0xfe51, -1, TiffDirectoryType.EXIF_DIRECTORY_EXIF_IFD); - TagInfoAscii EXIF_TAG_SHADOWS = new TagInfoAscii( + public static final TagInfoAscii EXIF_TAG_SHADOWS = new TagInfoAscii( "Shadows", 0xfe52, -1, TiffDirectoryType.EXIF_DIRECTORY_EXIF_IFD); - TagInfoAscii EXIF_TAG_BRIGHTNESS = new TagInfoAscii( + public static final TagInfoAscii EXIF_TAG_BRIGHTNESS = new TagInfoAscii( "Brightness", 0xfe53, -1, TiffDirectoryType.EXIF_DIRECTORY_EXIF_IFD); - TagInfoAscii EXIF_TAG_CONTRAST_2 = new TagInfoAscii( + public static final TagInfoAscii EXIF_TAG_CONTRAST_2 = new TagInfoAscii( "Contrast", 0xfe54, -1, TiffDirectoryType.EXIF_DIRECTORY_EXIF_IFD); - TagInfoAscii EXIF_TAG_SATURATION_2 = new TagInfoAscii( + public static final TagInfoAscii EXIF_TAG_SATURATION_2 = new TagInfoAscii( "Saturation", 0xfe55, -1, TiffDirectoryType.EXIF_DIRECTORY_EXIF_IFD); - TagInfoAscii EXIF_TAG_SHARPNESS_2 = new TagInfoAscii( + public static final TagInfoAscii EXIF_TAG_SHARPNESS_2 = new TagInfoAscii( "Sharpness", 0xfe56, -1, TiffDirectoryType.EXIF_DIRECTORY_EXIF_IFD); - TagInfoAscii EXIF_TAG_SMOOTHNESS = new TagInfoAscii( + public static final TagInfoAscii EXIF_TAG_SMOOTHNESS = new TagInfoAscii( "Smoothness", 0xfe57, -1, TiffDirectoryType.EXIF_DIRECTORY_EXIF_IFD); - TagInfoAscii EXIF_TAG_MOIRE_FILTER = new TagInfoAscii( + public static final TagInfoAscii EXIF_TAG_MOIRE_FILTER = new TagInfoAscii( "MoireFilter", 0xfe58, -1, TiffDirectoryType.EXIF_DIRECTORY_EXIF_IFD); - List<TagInfo> ALL_EXIF_TAGS = + public static final List<TagInfo> ALL_EXIF_TAGS = Collections.unmodifiableList(Arrays.asList( EXIF_TAG_INTEROPERABILITY_INDEX, EXIF_TAG_INTEROPERABILITY_VERSION, EXIF_TAG_PROCESSING_SOFTWARE, @@ -617,4 +618,7 @@ public interface ExifTagConstants { EXIF_TAG_USER_COMMENT, // EXIF_TAG_MAKER_NOTE)); + + private ExifTagConstants() { + } }
Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/constants/GdalLibraryTagConstants.java URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/constants/GdalLibraryTagConstants.java?rev=1655143&r1=1655142&r2=1655143&view=diff ============================================================================== --- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/constants/GdalLibraryTagConstants.java (original) +++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/constants/GdalLibraryTagConstants.java Tue Jan 27 20:15:19 2015 @@ -30,17 +30,21 @@ import org.apache.commons.imaging.format * <BR> * http://www.awaresystems.be/imaging/tiff/tifftags/gdal_nodata.html */ -public interface GdalLibraryTagConstants { - TagInfoAscii EXIF_TAG_GDAL_METADATA = new TagInfoAscii( +public final class GdalLibraryTagConstants { + + public static final TagInfoAscii EXIF_TAG_GDAL_METADATA = new TagInfoAscii( "GDALMetadata", 0xa480, -1, TiffDirectoryType.EXIF_DIRECTORY_UNKNOWN); - - TagInfoAscii EXIF_TAG_GDAL_NO_DATA = new TagInfoAscii( + + public static final TagInfoAscii EXIF_TAG_GDAL_NO_DATA = new TagInfoAscii( "GDALNoData", 0xa481, -1, TiffDirectoryType.EXIF_DIRECTORY_UNKNOWN); - List<TagInfo> ALL_GDAL_LIBRARY_TAGS = + public static final List<TagInfo> ALL_GDAL_LIBRARY_TAGS = Collections.unmodifiableList(Arrays.<TagInfo> asList( EXIF_TAG_GDAL_METADATA, EXIF_TAG_GDAL_NO_DATA)); + + private GdalLibraryTagConstants() { + } } Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/constants/GeoTiffTagConstants.java URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/constants/GeoTiffTagConstants.java?rev=1655143&r1=1655142&r2=1655143&view=diff ============================================================================== --- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/constants/GeoTiffTagConstants.java (original) +++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/constants/GeoTiffTagConstants.java Tue Jan 27 20:15:19 2015 @@ -30,36 +30,37 @@ import org.apache.commons.imaging.format * <BR> * http://www.remotesensing.org/geotiff/spec/contents.html */ -public interface GeoTiffTagConstants { - TagInfoDouble EXIF_TAG_MODEL_PIXEL_SCALE_TAG = new TagInfoDouble( +public final class GeoTiffTagConstants { + + public static final TagInfoDouble EXIF_TAG_MODEL_PIXEL_SCALE_TAG = new TagInfoDouble( "ModelPixelScaleTag", 0x830e, 3, TiffDirectoryType.EXIF_DIRECTORY_UNKNOWN); - TagInfoDouble EXIF_TAG_INTERGRAPH_MATRIX_TAG = new TagInfoDouble( + public static final TagInfoDouble EXIF_TAG_INTERGRAPH_MATRIX_TAG = new TagInfoDouble( "IntergraphMatrixTag", 0x8480, -1, TiffDirectoryType.EXIF_DIRECTORY_UNKNOWN); - TagInfoDouble EXIF_TAG_MODEL_TIEPOINT_TAG = new TagInfoDouble( + public static final TagInfoDouble EXIF_TAG_MODEL_TIEPOINT_TAG = new TagInfoDouble( "ModelTiepointTag", 0x8482, -1, TiffDirectoryType.EXIF_DIRECTORY_UNKNOWN); - - TagInfoDouble EXIF_TAG_MODEL_TRANSFORMATION_TAG = new TagInfoDouble( + + public static final TagInfoDouble EXIF_TAG_MODEL_TRANSFORMATION_TAG = new TagInfoDouble( "ModelTransformationTag", 0x85d8, 16, TiffDirectoryType.EXIF_DIRECTORY_UNKNOWN); - TagInfoShort EXIF_TAG_GEO_KEY_DIRECTORY_TAG = new TagInfoShort( + public static final TagInfoShort EXIF_TAG_GEO_KEY_DIRECTORY_TAG = new TagInfoShort( "GeoKeyDirectoryTag", 0x87af, -1, TiffDirectoryType.EXIF_DIRECTORY_UNKNOWN); - - TagInfoDouble EXIF_TAG_GEO_DOUBLE_PARAMS_TAG = new TagInfoDouble( + + public static final TagInfoDouble EXIF_TAG_GEO_DOUBLE_PARAMS_TAG = new TagInfoDouble( "GeoDoubleParamsTag", 0x87b0, -1, TiffDirectoryType.EXIF_DIRECTORY_UNKNOWN); - - TagInfoAscii EXIF_TAG_GEO_ASCII_PARAMS_TAG = new TagInfoAscii( + + public static final TagInfoAscii EXIF_TAG_GEO_ASCII_PARAMS_TAG = new TagInfoAscii( "GeoAsciiParamsTag", 0x87b1, -1, TiffDirectoryType.EXIF_DIRECTORY_UNKNOWN); - - List<TagInfo> ALL_GEO_TIFF_TAGS = + + public static final List<TagInfo> ALL_GEO_TIFF_TAGS = Collections.unmodifiableList(Arrays.asList( EXIF_TAG_MODEL_PIXEL_SCALE_TAG, EXIF_TAG_INTERGRAPH_MATRIX_TAG, @@ -69,4 +70,7 @@ public interface GeoTiffTagConstants { EXIF_TAG_GEO_DOUBLE_PARAMS_TAG, EXIF_TAG_GEO_ASCII_PARAMS_TAG)); + private GeoTiffTagConstants() { + } + } Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/constants/GpsTagConstants.java URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/constants/GpsTagConstants.java?rev=1655143&r1=1655142&r2=1655143&view=diff ============================================================================== --- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/constants/GpsTagConstants.java (original) +++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/constants/GpsTagConstants.java Tue Jan 27 20:15:19 2015 @@ -27,194 +27,195 @@ import org.apache.commons.imaging.format import org.apache.commons.imaging.formats.tiff.taginfos.TagInfoRational; import org.apache.commons.imaging.formats.tiff.taginfos.TagInfoShort; -public interface GpsTagConstants { - TagInfoByte GPS_TAG_GPS_VERSION_ID = new TagInfoByte( +public final class GpsTagConstants { + + public static final TagInfoByte GPS_TAG_GPS_VERSION_ID = new TagInfoByte( "GPSVersionID", 0x0000, 4, TiffDirectoryType.EXIF_DIRECTORY_GPS); - byte[] GPS_VERSION = new byte[] { (byte)2, (byte)3, (byte)0, (byte)0 }; + public static final byte[] GPS_VERSION = new byte[] { (byte)2, (byte)3, (byte)0, (byte)0 }; // ************************************************************ - TagInfoAscii GPS_TAG_GPS_LATITUDE_REF = new TagInfoAscii( + public static final TagInfoAscii GPS_TAG_GPS_LATITUDE_REF = new TagInfoAscii( "GPSLatitudeRef", 0x0001, 2, TiffDirectoryType.EXIF_DIRECTORY_GPS); - String GPS_TAG_GPS_LATITUDE_REF_VALUE_NORTH = "N"; - String GPS_TAG_GPS_LATITUDE_REF_VALUE_SOUTH = "S"; + public static final String GPS_TAG_GPS_LATITUDE_REF_VALUE_NORTH = "N"; + public static final String GPS_TAG_GPS_LATITUDE_REF_VALUE_SOUTH = "S"; // ************************************************************ - TagInfoRational GPS_TAG_GPS_LATITUDE = new TagInfoRational( + public static final TagInfoRational GPS_TAG_GPS_LATITUDE = new TagInfoRational( "GPSLatitude", 0x0002, 3, TiffDirectoryType.EXIF_DIRECTORY_GPS); // ************************************************************ - TagInfoAscii GPS_TAG_GPS_LONGITUDE_REF = new TagInfoAscii( + public static final TagInfoAscii GPS_TAG_GPS_LONGITUDE_REF = new TagInfoAscii( "GPSLongitudeRef", 0x0003, 2, TiffDirectoryType.EXIF_DIRECTORY_GPS); - String GPS_TAG_GPS_LONGITUDE_REF_VALUE_EAST = "E"; - String GPS_TAG_GPS_LONGITUDE_REF_VALUE_WEST = "W"; + public static final String GPS_TAG_GPS_LONGITUDE_REF_VALUE_EAST = "E"; + public static final String GPS_TAG_GPS_LONGITUDE_REF_VALUE_WEST = "W"; // ************************************************************ - TagInfoRational GPS_TAG_GPS_LONGITUDE = new TagInfoRational( + public static final TagInfoRational GPS_TAG_GPS_LONGITUDE = new TagInfoRational( "GPSLongitude", 0x0004, 3, TiffDirectoryType.EXIF_DIRECTORY_GPS); // ************************************************************ - TagInfoByte GPS_TAG_GPS_ALTITUDE_REF = new TagInfoByte( + public static final TagInfoByte GPS_TAG_GPS_ALTITUDE_REF = new TagInfoByte( "GPSAltitudeRef", 0x0005, 1, TiffDirectoryType.EXIF_DIRECTORY_GPS); - int GPS_TAG_GPS_ALTITUDE_REF_VALUE_ABOVE_SEA_LEVEL = 0; - int GPS_TAG_GPS_ALTITUDE_REF_VALUE_BELOW_SEA_LEVEL = 1; + public static final int GPS_TAG_GPS_ALTITUDE_REF_VALUE_ABOVE_SEA_LEVEL = 0; + public static final int GPS_TAG_GPS_ALTITUDE_REF_VALUE_BELOW_SEA_LEVEL = 1; // ************************************************************ - TagInfoRational GPS_TAG_GPS_ALTITUDE = new TagInfoRational( + public static final TagInfoRational GPS_TAG_GPS_ALTITUDE = new TagInfoRational( "GPSAltitude", 0x0006, 1, TiffDirectoryType.EXIF_DIRECTORY_GPS); // ************************************************************ - TagInfoRational GPS_TAG_GPS_TIME_STAMP = new TagInfoRational( + public static final TagInfoRational GPS_TAG_GPS_TIME_STAMP = new TagInfoRational( "GPSTimeStamp", 0x0007, 3, TiffDirectoryType.EXIF_DIRECTORY_GPS); // ************************************************************ - TagInfoAscii GPS_TAG_GPS_SATELLITES = new TagInfoAscii( + public static final TagInfoAscii GPS_TAG_GPS_SATELLITES = new TagInfoAscii( "GPSSatellites", 0x0008, -1, TiffDirectoryType.EXIF_DIRECTORY_GPS); // ************************************************************ - TagInfoAscii GPS_TAG_GPS_STATUS = new TagInfoAscii( + public static final TagInfoAscii GPS_TAG_GPS_STATUS = new TagInfoAscii( "GPSStatus", 0x0009, 2, TiffDirectoryType.EXIF_DIRECTORY_GPS); - String GPS_TAG_GPS_STATUS_VALUE_MEASUREMENT_IN_PROGRESS = "A"; - String GPS_TAG_GPS_STATUS_VALUE_MEASUREMENT_INTEROPERABILITY = "V"; + public static final String GPS_TAG_GPS_STATUS_VALUE_MEASUREMENT_IN_PROGRESS = "A"; + public static final String GPS_TAG_GPS_STATUS_VALUE_MEASUREMENT_INTEROPERABILITY = "V"; // ************************************************************ - TagInfoAscii GPS_TAG_GPS_MEASURE_MODE = new TagInfoAscii( + public static final TagInfoAscii GPS_TAG_GPS_MEASURE_MODE = new TagInfoAscii( "GPSMeasureMode", 0x000a, 2, TiffDirectoryType.EXIF_DIRECTORY_GPS); - int GPS_TAG_GPS_MEASURE_MODE_VALUE_2_DIMENSIONAL_MEASUREMENT = 2; - int GPS_TAG_GPS_MEASURE_MODE_VALUE_3_DIMENSIONAL_MEASUREMENT = 3; + public static final int GPS_TAG_GPS_MEASURE_MODE_VALUE_2_DIMENSIONAL_MEASUREMENT = 2; + public static final int GPS_TAG_GPS_MEASURE_MODE_VALUE_3_DIMENSIONAL_MEASUREMENT = 3; // ************************************************************ - TagInfoRational GPS_TAG_GPS_DOP = new TagInfoRational( + public static final TagInfoRational GPS_TAG_GPS_DOP = new TagInfoRational( "GPSDOP", 0x000b, 1, TiffDirectoryType.EXIF_DIRECTORY_GPS); // ************************************************************ - TagInfoAscii GPS_TAG_GPS_SPEED_REF = new TagInfoAscii( + public static final TagInfoAscii GPS_TAG_GPS_SPEED_REF = new TagInfoAscii( "GPSSpeedRef", 0x000c, 2, TiffDirectoryType.EXIF_DIRECTORY_GPS); - String GPS_TAG_GPS_SPEED_REF_VALUE_KMPH = "K"; - String GPS_TAG_GPS_SPEED_REF_VALUE_MPH = "M"; - String GPS_TAG_GPS_SPEED_REF_VALUE_KNOTS = "N"; + public static final String GPS_TAG_GPS_SPEED_REF_VALUE_KMPH = "K"; + public static final String GPS_TAG_GPS_SPEED_REF_VALUE_MPH = "M"; + public static final String GPS_TAG_GPS_SPEED_REF_VALUE_KNOTS = "N"; // ************************************************************ - TagInfoRational GPS_TAG_GPS_SPEED = new TagInfoRational( + public static final TagInfoRational GPS_TAG_GPS_SPEED = new TagInfoRational( "GPSSpeed", 0x000d, 1, TiffDirectoryType.EXIF_DIRECTORY_GPS); // ************************************************************ - TagInfoAscii GPS_TAG_GPS_TRACK_REF = new TagInfoAscii( + public static final TagInfoAscii GPS_TAG_GPS_TRACK_REF = new TagInfoAscii( "GPSTrackRef", 0x000e, 2, TiffDirectoryType.EXIF_DIRECTORY_GPS); - String GPS_TAG_GPS_TRACK_REF_VALUE_MAGNETIC_NORTH = "M"; - String GPS_TAG_GPS_TRACK_REF_VALUE_TRUE_NORTH = "T"; + public static final String GPS_TAG_GPS_TRACK_REF_VALUE_MAGNETIC_NORTH = "M"; + public static final String GPS_TAG_GPS_TRACK_REF_VALUE_TRUE_NORTH = "T"; // ************************************************************ - TagInfoRational GPS_TAG_GPS_TRACK = new TagInfoRational( + public static final TagInfoRational GPS_TAG_GPS_TRACK = new TagInfoRational( "GPSTrack", 0x000f, 1, TiffDirectoryType.EXIF_DIRECTORY_GPS); // ************************************************************ - TagInfoAscii GPS_TAG_GPS_IMG_DIRECTION_REF = new TagInfoAscii( + public static final TagInfoAscii GPS_TAG_GPS_IMG_DIRECTION_REF = new TagInfoAscii( "GPSImgDirectionRef", 0x0010, 2, TiffDirectoryType.EXIF_DIRECTORY_GPS); - String GPS_TAG_GPS_IMG_DIRECTION_REF_VALUE_MAGNETIC_NORTH = "M"; - String GPS_TAG_GPS_IMG_DIRECTION_REF_VALUE_TRUE_NORTH = "T"; + public static final String GPS_TAG_GPS_IMG_DIRECTION_REF_VALUE_MAGNETIC_NORTH = "M"; + public static final String GPS_TAG_GPS_IMG_DIRECTION_REF_VALUE_TRUE_NORTH = "T"; // ************************************************************ - TagInfoRational GPS_TAG_GPS_IMG_DIRECTION = new TagInfoRational( + public static final TagInfoRational GPS_TAG_GPS_IMG_DIRECTION = new TagInfoRational( "GPSImgDirection", 0x0011, 1, TiffDirectoryType.EXIF_DIRECTORY_GPS); // ************************************************************ - TagInfoAscii GPS_TAG_GPS_MAP_DATUM = new TagInfoAscii( + public static final TagInfoAscii GPS_TAG_GPS_MAP_DATUM = new TagInfoAscii( "GPSMapDatum", 0x0012, -1, TiffDirectoryType.EXIF_DIRECTORY_GPS); // ************************************************************ - TagInfoAscii GPS_TAG_GPS_DEST_LATITUDE_REF = new TagInfoAscii( + public static final TagInfoAscii GPS_TAG_GPS_DEST_LATITUDE_REF = new TagInfoAscii( "GPSDestLatitudeRef", 0x0013, 2, TiffDirectoryType.EXIF_DIRECTORY_GPS); - String GPS_TAG_GPS_DEST_LATITUDE_REF_VALUE_NORTH = "N"; - String GPS_TAG_GPS_DEST_LATITUDE_REF_VALUE_SOUTH = "S"; + public static final String GPS_TAG_GPS_DEST_LATITUDE_REF_VALUE_NORTH = "N"; + public static final String GPS_TAG_GPS_DEST_LATITUDE_REF_VALUE_SOUTH = "S"; // ************************************************************ - TagInfoRational GPS_TAG_GPS_DEST_LATITUDE = new TagInfoRational( + public static final TagInfoRational GPS_TAG_GPS_DEST_LATITUDE = new TagInfoRational( "GPSDestLatitude", 0x0014, 3, TiffDirectoryType.EXIF_DIRECTORY_GPS); // ************************************************************ - TagInfoAscii GPS_TAG_GPS_DEST_LONGITUDE_REF = new TagInfoAscii( + public static final TagInfoAscii GPS_TAG_GPS_DEST_LONGITUDE_REF = new TagInfoAscii( "GPSDestLongitudeRef", 0x0015, 2, TiffDirectoryType.EXIF_DIRECTORY_GPS); - String GPS_TAG_GPS_DEST_LONGITUDE_REF_VALUE_EAST = "E"; - String GPS_TAG_GPS_DEST_LONGITUDE_REF_VALUE_WEST = "W"; + public static final String GPS_TAG_GPS_DEST_LONGITUDE_REF_VALUE_EAST = "E"; + public static final String GPS_TAG_GPS_DEST_LONGITUDE_REF_VALUE_WEST = "W"; // ************************************************************ - TagInfoRational GPS_TAG_GPS_DEST_LONGITUDE = new TagInfoRational( + public static final TagInfoRational GPS_TAG_GPS_DEST_LONGITUDE = new TagInfoRational( "GPSDestLongitude", 0x0016, 3, TiffDirectoryType.EXIF_DIRECTORY_GPS); // ************************************************************ - TagInfoAscii GPS_TAG_GPS_DEST_BEARING_REF = new TagInfoAscii( + public static final TagInfoAscii GPS_TAG_GPS_DEST_BEARING_REF = new TagInfoAscii( "GPSDestBearingRef", 0x0017, 2, TiffDirectoryType.EXIF_DIRECTORY_GPS); - String GPS_TAG_GPS_DEST_BEARING_REF_VALUE_MAGNETIC_NORTH = "M"; - String GPS_TAG_GPS_DEST_BEARING_REF_VALUE_TRUE_NORTH = "T"; + public static final String GPS_TAG_GPS_DEST_BEARING_REF_VALUE_MAGNETIC_NORTH = "M"; + public static final String GPS_TAG_GPS_DEST_BEARING_REF_VALUE_TRUE_NORTH = "T"; // ************************************************************ - TagInfoRational GPS_TAG_GPS_DEST_BEARING = new TagInfoRational( + public static final TagInfoRational GPS_TAG_GPS_DEST_BEARING = new TagInfoRational( "GPSDestBearing", 0x0018, 1, TiffDirectoryType.EXIF_DIRECTORY_GPS); // ************************************************************ - TagInfoAscii GPS_TAG_GPS_DEST_DISTANCE_REF = new TagInfoAscii( + public static final TagInfoAscii GPS_TAG_GPS_DEST_DISTANCE_REF = new TagInfoAscii( "GPSDestDistanceRef", 0x0019, 2, TiffDirectoryType.EXIF_DIRECTORY_GPS); - String GPS_TAG_GPS_DEST_DISTANCE_REF_VALUE_KILOMETERS = "K"; - String GPS_TAG_GPS_DEST_DISTANCE_REF_VALUE_MILES = "M"; - String GPS_TAG_GPS_DEST_DISTANCE_REF_VALUE_NAUTICAL_MILES = "N"; + public static final String GPS_TAG_GPS_DEST_DISTANCE_REF_VALUE_KILOMETERS = "K"; + public static final String GPS_TAG_GPS_DEST_DISTANCE_REF_VALUE_MILES = "M"; + public static final String GPS_TAG_GPS_DEST_DISTANCE_REF_VALUE_NAUTICAL_MILES = "N"; // ************************************************************ - TagInfoRational GPS_TAG_GPS_DEST_DISTANCE = new TagInfoRational( + public static final TagInfoRational GPS_TAG_GPS_DEST_DISTANCE = new TagInfoRational( "GPSDestDistance", 0x001a, 1, TiffDirectoryType.EXIF_DIRECTORY_GPS); // ************************************************************ - TagInfoGpsText GPS_TAG_GPS_PROCESSING_METHOD = new TagInfoGpsText( + public static final TagInfoGpsText GPS_TAG_GPS_PROCESSING_METHOD = new TagInfoGpsText( "GPSProcessingMethod", 0x001b, -1, TiffDirectoryType.EXIF_DIRECTORY_GPS); // ************************************************************ - TagInfoGpsText GPS_TAG_GPS_AREA_INFORMATION = new TagInfoGpsText( + public static final TagInfoGpsText GPS_TAG_GPS_AREA_INFORMATION = new TagInfoGpsText( "GPSAreaInformation", 0x001c, -1, TiffDirectoryType.EXIF_DIRECTORY_GPS); // ************************************************************ - TagInfoAscii GPS_TAG_GPS_DATE_STAMP = new TagInfoAscii( + public static final TagInfoAscii GPS_TAG_GPS_DATE_STAMP = new TagInfoAscii( "GPSDateStamp", 0x001d, 11, TiffDirectoryType.EXIF_DIRECTORY_GPS); // ************************************************************ - TagInfoShort GPS_TAG_GPS_DIFFERENTIAL = new TagInfoShort( + public static final TagInfoShort GPS_TAG_GPS_DIFFERENTIAL = new TagInfoShort( "GPSDifferential", 0x001e, 1, TiffDirectoryType.EXIF_DIRECTORY_GPS); - int GPS_TAG_GPS_DIFFERENTIAL_VALUE_NO_CORRECTION = 0; - int GPS_TAG_GPS_DIFFERENTIAL_VALUE_DIFFERENTIAL_CORRECTED = 1; + public static final int GPS_TAG_GPS_DIFFERENTIAL_VALUE_NO_CORRECTION = 0; + public static final int GPS_TAG_GPS_DIFFERENTIAL_VALUE_DIFFERENTIAL_CORRECTED = 1; // ************************************************************ - List<TagInfo> ALL_GPS_TAGS = + public static final List<TagInfo> ALL_GPS_TAGS = Collections.unmodifiableList(Arrays.asList( GPS_TAG_GPS_VERSION_ID, GPS_TAG_GPS_LATITUDE_REF, GPS_TAG_GPS_LATITUDE, GPS_TAG_GPS_LONGITUDE_REF, @@ -231,4 +232,7 @@ public interface GpsTagConstants { GPS_TAG_GPS_DEST_DISTANCE, GPS_TAG_GPS_PROCESSING_METHOD, GPS_TAG_GPS_AREA_INFORMATION, GPS_TAG_GPS_DATE_STAMP, GPS_TAG_GPS_DIFFERENTIAL)); + + private GpsTagConstants() { + } } Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/constants/HylaFaxTagConstants.java URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/constants/HylaFaxTagConstants.java?rev=1655143&r1=1655142&r2=1655143&view=diff ============================================================================== --- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/constants/HylaFaxTagConstants.java (original) +++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/constants/HylaFaxTagConstants.java Tue Jan 27 20:15:19 2015 @@ -24,27 +24,31 @@ import org.apache.commons.imaging.format import org.apache.commons.imaging.formats.tiff.taginfos.TagInfoAscii; import org.apache.commons.imaging.formats.tiff.taginfos.TagInfoLong; -public interface HylaFaxTagConstants { - TagInfoLong EXIF_TAG_FAX_RECV_PARAMS = new TagInfoLong( +public final class HylaFaxTagConstants { + + public static final TagInfoLong EXIF_TAG_FAX_RECV_PARAMS = new TagInfoLong( "FaxRecvParams", 0x885c, 1, TiffDirectoryType.EXIF_DIRECTORY_UNKNOWN); - TagInfoAscii EXIF_TAG_FAX_SUB_ADDRESS = new TagInfoAscii( + public static final TagInfoAscii EXIF_TAG_FAX_SUB_ADDRESS = new TagInfoAscii( "FaxSubAddress", 0x885d, -1, TiffDirectoryType.EXIF_DIRECTORY_UNKNOWN); - TagInfoLong EXIF_TAG_FAX_RECV_TIME = new TagInfoLong( + public static final TagInfoLong EXIF_TAG_FAX_RECV_TIME = new TagInfoLong( "FaxRecvTime", 0x885e, 1, TiffDirectoryType.EXIF_DIRECTORY_UNKNOWN); - TagInfoAscii EXIF_TAG_FAX_DCS = new TagInfoAscii( + public static final TagInfoAscii EXIF_TAG_FAX_DCS = new TagInfoAscii( "FaxDCS", 0x885f, -1, TiffDirectoryType.EXIF_DIRECTORY_UNKNOWN); - List<TagInfo> ALL_HYLAFAX_TAGS = + public static final List<TagInfo> ALL_HYLAFAX_TAGS = Collections.unmodifiableList(Arrays.asList( EXIF_TAG_FAX_RECV_PARAMS, EXIF_TAG_FAX_SUB_ADDRESS, EXIF_TAG_FAX_RECV_TIME, EXIF_TAG_FAX_DCS)); + + private HylaFaxTagConstants() { + } }