Changeset 8132 in josm for trunk/src/com/drew/metadata/exif/ExifSubIFDDescriptor.java

Timestamp:

2015-03-10T01:17:39+01:00 (10 years ago)

Author:

Don-vip

Message:

fix #11162 - update to metadata-extractor 2.7.2

File:

• trunk/src/com/drew/metadata/exif/ExifSubIFDDescriptor.java (modified) (59 diffs)

trunk/src/com/drew/metadata/exif/ExifSubIFDDescriptor.java

@@ -1 +1 @@
 /*
- * Copyright 2002-2012 Drew Noakes
+ * Copyright 2002-2015 Drew Noakes
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");
@@ -16 +16 @@
  * More information about this project is available at:
  *
- *    http://drewnoakes.com/code/exif/
- *    http://code.google.com/p/metadata-extractor/
+ *    https://drewnoakes.com/code/exif/
+ *    https://github.com/drewnoakes/metadata-extractor
  */
 package com.drew.metadata.exif;
@@ -32 +32 @@
 import java.util.Map;
 
+import static com.drew.metadata.exif.ExifSubIFDDirectory.*;
+
 /**
- * Provides human-readable string representations of tag values stored in a <code>ExifSubIFDDirectory</code>.
+ * Provides human-readable string representations of tag values stored in a {@link ExifSubIFDDirectory}.
  *
- * @author Drew Noakes http://drewnoakes.com
+ * @author Drew Noakes https://drewnoakes.com
  */
 public class ExifSubIFDDescriptor extends TagDescriptor<ExifSubIFDDirectory>
@@ -60 +62 @@
 
     /**
-     * Returns a descriptive value of the the specified tag for this image.
+     * Returns a descriptive value of the specified tag for this image.
      * Where possible, known values will be substituted here in place of the raw
      * tokens actually kept in the Exif segment.  If no substitution is
      * available, the value provided by getString(int) will be returned.
+     *
      * @param tagType the tag to find a description for
      * @return a description of the image's value for the specified tag, or
      *         <code>null</code> if the tag hasn't been defined.
      */
+    @Override
     @Nullable
     public String getDescription(int tagType)
     {
         switch (tagType) {
-            case ExifSubIFDDirectory.TAG_NEW_SUBFILE_TYPE:
+            case TAG_NEW_SUBFILE_TYPE:
                 return getNewSubfileTypeDescription();
-            case ExifSubIFDDirectory.TAG_SUBFILE_TYPE:
+            case TAG_SUBFILE_TYPE:
                 return getSubfileTypeDescription();
-            case ExifSubIFDDirectory.TAG_THRESHOLDING:
+            case TAG_THRESHOLDING:
                 return getThresholdingDescription();
-            case ExifSubIFDDirectory.TAG_FILL_ORDER:
+            case TAG_FILL_ORDER:
                 return getFillOrderDescription();
-            case ExifSubIFDDirectory.TAG_EXPOSURE_TIME:
+            case TAG_EXPOSURE_TIME:
                 return getExposureTimeDescription();
-            case ExifSubIFDDirectory.TAG_SHUTTER_SPEED:
+            case TAG_SHUTTER_SPEED:
                 return getShutterSpeedDescription();
-            case ExifSubIFDDirectory.TAG_FNUMBER:
+            case TAG_FNUMBER:
                 return getFNumberDescription();
-            case ExifSubIFDDirectory.TAG_COMPRESSED_AVERAGE_BITS_PER_PIXEL:
+            case TAG_COMPRESSED_AVERAGE_BITS_PER_PIXEL:
                 return getCompressedAverageBitsPerPixelDescription();
-            case ExifSubIFDDirectory.TAG_SUBJECT_DISTANCE:
+            case TAG_SUBJECT_DISTANCE:
                 return getSubjectDistanceDescription();
-            case ExifSubIFDDirectory.TAG_METERING_MODE:
+            case TAG_METERING_MODE:
                 return getMeteringModeDescription();
-            case ExifSubIFDDirectory.TAG_WHITE_BALANCE:
+            case TAG_WHITE_BALANCE:
                 return getWhiteBalanceDescription();
-            case ExifSubIFDDirectory.TAG_FLASH:
+            case TAG_FLASH:
                 return getFlashDescription();
-            case ExifSubIFDDirectory.TAG_FOCAL_LENGTH:
+            case TAG_FOCAL_LENGTH:
                 return getFocalLengthDescription();
-            case ExifSubIFDDirectory.TAG_COLOR_SPACE:
+            case TAG_COLOR_SPACE:
                 return getColorSpaceDescription();
-            case ExifSubIFDDirectory.TAG_EXIF_IMAGE_WIDTH:
+            case TAG_EXIF_IMAGE_WIDTH:
                 return getExifImageWidthDescription();
-            case ExifSubIFDDirectory.TAG_EXIF_IMAGE_HEIGHT:
+            case TAG_EXIF_IMAGE_HEIGHT:
                 return getExifImageHeightDescription();
-            case ExifSubIFDDirectory.TAG_FOCAL_PLANE_UNIT:
+            case TAG_FOCAL_PLANE_RESOLUTION_UNIT:
                 return getFocalPlaneResolutionUnitDescription();
-            case ExifSubIFDDirectory.TAG_FOCAL_PLANE_X_RES:
+            case TAG_FOCAL_PLANE_X_RESOLUTION:
                 return getFocalPlaneXResolutionDescription();
-            case ExifSubIFDDirectory.TAG_FOCAL_PLANE_Y_RES:
+            case TAG_FOCAL_PLANE_Y_RESOLUTION:
                 return getFocalPlaneYResolutionDescription();
-            case ExifSubIFDDirectory.TAG_BITS_PER_SAMPLE:
+            case TAG_BITS_PER_SAMPLE:
                 return getBitsPerSampleDescription();
-            case ExifSubIFDDirectory.TAG_PHOTOMETRIC_INTERPRETATION:
+            case TAG_PHOTOMETRIC_INTERPRETATION:
                 return getPhotometricInterpretationDescription();
-            case ExifSubIFDDirectory.TAG_ROWS_PER_STRIP:
+            case TAG_ROWS_PER_STRIP:
                 return getRowsPerStripDescription();
-            case ExifSubIFDDirectory.TAG_STRIP_BYTE_COUNTS:
+            case TAG_STRIP_BYTE_COUNTS:
                 return getStripByteCountsDescription();
-            case ExifSubIFDDirectory.TAG_SAMPLES_PER_PIXEL:
+            case TAG_SAMPLES_PER_PIXEL:
                 return getSamplesPerPixelDescription();
-            case ExifSubIFDDirectory.TAG_PLANAR_CONFIGURATION:
+            case TAG_PLANAR_CONFIGURATION:
                 return getPlanarConfigurationDescription();
-            case ExifSubIFDDirectory.TAG_YCBCR_SUBSAMPLING:
+            case TAG_YCBCR_SUBSAMPLING:
                 return getYCbCrSubsamplingDescription();
-            case ExifSubIFDDirectory.TAG_EXPOSURE_PROGRAM:
+            case TAG_EXPOSURE_PROGRAM:
                 return getExposureProgramDescription();
-            case ExifSubIFDDirectory.TAG_APERTURE:
+            case TAG_APERTURE:
                 return getApertureValueDescription();
-            case ExifSubIFDDirectory.TAG_MAX_APERTURE:
+            case TAG_MAX_APERTURE:
                 return getMaxApertureValueDescription();
-            case ExifSubIFDDirectory.TAG_SENSING_METHOD:
+            case TAG_SENSING_METHOD:
                 return getSensingMethodDescription();
-            case ExifSubIFDDirectory.TAG_EXPOSURE_BIAS:
+            case TAG_EXPOSURE_BIAS:
                 return getExposureBiasDescription();
-            case ExifSubIFDDirectory.TAG_FILE_SOURCE:
+            case TAG_FILE_SOURCE:
                 return getFileSourceDescription();
-            case ExifSubIFDDirectory.TAG_SCENE_TYPE:
+            case TAG_SCENE_TYPE:
                 return getSceneTypeDescription();
-            case ExifSubIFDDirectory.TAG_COMPONENTS_CONFIGURATION:
+            case TAG_COMPONENTS_CONFIGURATION:
                 return getComponentConfigurationDescription();
-            case ExifSubIFDDirectory.TAG_EXIF_VERSION:
+            case TAG_EXIF_VERSION:
                 return getExifVersionDescription();
-            case ExifSubIFDDirectory.TAG_FLASHPIX_VERSION:
+            case TAG_FLASHPIX_VERSION:
                 return getFlashPixVersionDescription();
-            case ExifSubIFDDirectory.TAG_ISO_EQUIVALENT:
+            case TAG_ISO_EQUIVALENT:
                 return getIsoEquivalentDescription();
-            case ExifSubIFDDirectory.TAG_USER_COMMENT:
+            case TAG_USER_COMMENT:
                 return getUserCommentDescription();
-            case ExifSubIFDDirectory.TAG_CUSTOM_RENDERED:
+            case TAG_CUSTOM_RENDERED:
                 return getCustomRenderedDescription();
-            case ExifSubIFDDirectory.TAG_EXPOSURE_MODE:
+            case TAG_EXPOSURE_MODE:
                 return getExposureModeDescription();
-            case ExifSubIFDDirectory.TAG_WHITE_BALANCE_MODE:
+            case TAG_WHITE_BALANCE_MODE:
                 return getWhiteBalanceModeDescription();
-            case ExifSubIFDDirectory.TAG_DIGITAL_ZOOM_RATIO:
+            case TAG_DIGITAL_ZOOM_RATIO:
                 return getDigitalZoomRatioDescription();
-            case ExifSubIFDDirectory.TAG_35MM_FILM_EQUIV_FOCAL_LENGTH:
+            case TAG_35MM_FILM_EQUIV_FOCAL_LENGTH:
                 return get35mmFilmEquivFocalLengthDescription();
-            case ExifSubIFDDirectory.TAG_SCENE_CAPTURE_TYPE:
+            case TAG_SCENE_CAPTURE_TYPE:
                 return getSceneCaptureTypeDescription();
-            case ExifSubIFDDirectory.TAG_GAIN_CONTROL:
+            case TAG_GAIN_CONTROL:
                 return getGainControlDescription();
-            case ExifSubIFDDirectory.TAG_CONTRAST:
+            case TAG_CONTRAST:
                 return getContrastDescription();
-            case ExifSubIFDDirectory.TAG_SATURATION:
+            case TAG_SATURATION:
                 return getSaturationDescription();
-            case ExifSubIFDDirectory.TAG_SHARPNESS:
+            case TAG_SHARPNESS:
                 return getSharpnessDescription();
-            case ExifSubIFDDirectory.TAG_SUBJECT_DISTANCE_RANGE:
+            case TAG_SUBJECT_DISTANCE_RANGE:
                 return getSubjectDistanceRangeDescription();
             default:
@@ -178 +182 @@
     public String getNewSubfileTypeDescription()
     {
-        Integer value = _directory.getInteger(ExifSubIFDDirectory.TAG_NEW_SUBFILE_TYPE);
-        if (value==null)
-            return null;
-        switch (value) {
-            case 1: return "Full-resolution image";
-            case 2: return "Reduced-resolution image";
-            case 3: return "Single page of multi-page reduced-resolution image";
-            case 4: return "Transparency mask";
-            case 5: return "Transparency mask of reduced-resolution image";
-            case 6: return "Transparency mask of multi-page image";
-            case 7: return "Transparency mask of reduced-resolution multi-page image";
-            default:
-                return "Unknown (" + value + ")";
-        }
+        return getIndexedDescription(TAG_NEW_SUBFILE_TYPE, 1,
+            "Full-resolution image",
+            "Reduced-resolution image",
+            "Single page of multi-page reduced-resolution image",
+            "Transparency mask",
+            "Transparency mask of reduced-resolution image",
+            "Transparency mask of multi-page image",
+            "Transparency mask of reduced-resolution multi-page image"
+        );
     }
 
@@ -197 +196 @@
     public String getSubfileTypeDescription()
     {
-        Integer value = _directory.getInteger(ExifSubIFDDirectory.TAG_SUBFILE_TYPE);
-        if (value==null)
-            return null;
-        switch (value) {
-            case 1: return "Full-resolution image";
-            case 2: return "Reduced-resolution image";
-            case 3: return "Single page of multi-page image";
-            default:
-                return "Unknown (" + value + ")";
-        }
+        return getIndexedDescription(TAG_SUBFILE_TYPE, 1,
+            "Full-resolution image",
+            "Reduced-resolution image",
+            "Single page of multi-page image"
+        );
     }
 
@@ -212 +206 @@
     public String getThresholdingDescription()
     {
-        Integer value = _directory.getInteger(ExifSubIFDDirectory.TAG_THRESHOLDING);
-        if (value==null)
-            return null;
-        switch (value) {
-            case 1: return "No dithering or halftoning";
-            case 2: return "Ordered dither or halftone";
-            case 3: return "Randomized dither";
-            default:
-                return "Unknown (" + value + ")";
-        }
+        return getIndexedDescription(TAG_THRESHOLDING, 1,
+            "No dithering or halftoning",
+            "Ordered dither or halftone",
+            "Randomized dither"
+        );
     }
 
@@ -227 +216 @@
     public String getFillOrderDescription()
     {
-        Integer value = _directory.getInteger(ExifSubIFDDirectory.TAG_FILL_ORDER);
-        if (value==null)
-            return null;
-        switch (value) {
-            case 1: return "Normal";
-            case 2: return "Reversed";
-            default:
-                return "Unknown (" + value + ")";
-        }
+        return getIndexedDescription(TAG_FILL_ORDER, 1,
+            "Normal",
+            "Reversed"
+        );
     }
 
@@ -241 +225 @@
     public String getSubjectDistanceRangeDescription()
     {
-        Integer value = _directory.getInteger(ExifSubIFDDirectory.TAG_SUBJECT_DISTANCE_RANGE);
-        if (value==null)
-            return null;
-        switch (value) {
-            case 0: return "Unknown";
-            case 1: return "Macro";
-            case 2: return "Close view";
-            case 3: return "Distant view";
-            default:
-                return "Unknown (" + value + ")";
-        }
+        return getIndexedDescription(TAG_SUBJECT_DISTANCE_RANGE,
+            "Unknown",
+            "Macro",
+            "Close view",
+            "Distant view"
+        );
     }
 
@@ -257 +236 @@
     public String getSharpnessDescription()
     {
-        Integer value = _directory.getInteger(ExifSubIFDDirectory.TAG_SHARPNESS);
-        if (value==null)
-            return null;
-        switch (value) {
-            case 0: return "None";
-            case 1: return "Low";
-            case 2: return "Hard";
-            default:
-                return "Unknown (" + value + ")";
-        }
+        return getIndexedDescription(TAG_SHARPNESS,
+            "None",
+            "Low",
+            "Hard"
+        );
     }
 
@@ -272 +246 @@
     public String getSaturationDescription()
     {
-        Integer value = _directory.getInteger(ExifSubIFDDirectory.TAG_SATURATION);
-        if (value==null)
-            return null;
-        switch (value) {
-            case 0: return "None";
-            case 1: return "Low saturation";
-            case 2: return "High saturation";
-            default:
-                return "Unknown (" + value + ")";
-        }
+        return getIndexedDescription(TAG_SATURATION,
+            "None",
+            "Low saturation",
+            "High saturation"
+        );
     }
 
@@ -287 +256 @@
     public String getContrastDescription()
     {
-        Integer value = _directory.getInteger(ExifSubIFDDirectory.TAG_CONTRAST);
-        if (value==null)
-            return null;
-        switch (value) {
-            case 0: return "None";
-            case 1: return "Soft";
-            case 2: return "Hard";
-            default:
-                return "Unknown (" + value + ")";
-        }
+        return getIndexedDescription(TAG_CONTRAST,
+            "None",
+            "Soft",
+            "Hard"
+        );
     }
 
@@ -302 +266 @@
     public String getGainControlDescription()
     {
-        Integer value = _directory.getInteger(ExifSubIFDDirectory.TAG_GAIN_CONTROL);
-        if (value==null)
-            return null;
-        switch (value) {
-            case 0: return "None";
-            case 1: return "Low gain up";
-            case 2: return "Low gain down";
-            case 3: return "High gain up";
-            case 4: return "High gain down";
-            default:
-                return "Unknown (" + value + ")";
-        }
+        return getIndexedDescription(TAG_GAIN_CONTROL,
+            "None",
+            "Low gain up",
+            "Low gain down",
+            "High gain up",
+            "High gain down"
+        );
     }
 
@@ -319 +278 @@
     public String getSceneCaptureTypeDescription()
     {
-        Integer value = _directory.getInteger(ExifSubIFDDirectory.TAG_SCENE_CAPTURE_TYPE);
-        if (value==null)
-            return null;
-        switch (value) {
-            case 0: return "Standard";
-            case 1: return "Landscape";
-            case 2: return "Portrait";
-            case 3: return "Night scene";
-            default:
-                return "Unknown (" + value + ")";
-        }
+        return getIndexedDescription(TAG_SCENE_CAPTURE_TYPE,
+            "Standard",
+            "Landscape",
+            "Portrait",
+            "Night scene"
+        );
     }
 
@@ -335 +289 @@
     public String get35mmFilmEquivFocalLengthDescription()
     {
-        Integer value = _directory.getInteger(ExifSubIFDDirectory.TAG_35MM_FILM_EQUIV_FOCAL_LENGTH);
-        if (value==null)
-            return null;
-        if (value==0)
-            return "Unknown";
-        else
-            return SimpleDecimalFormatter.format(value) + "mm";
+        Integer value = _directory.getInteger(TAG_35MM_FILM_EQUIV_FOCAL_LENGTH);
+        return value == null
+            ? null
+            : value == 0
+            ? "Unknown"
+            : SimpleDecimalFormatter.format(value) + "mm";
     }
 
@@ -347 +300 @@
     public String getDigitalZoomRatioDescription()
     {
-        Rational value = _directory.getRational(ExifSubIFDDirectory.TAG_DIGITAL_ZOOM_RATIO);
-        if (value==null)
-            return null;
-        if (value.getNumerator()==0)
-            return "Digital zoom not used.";
-        return SimpleDecimalFormatter.format(value.doubleValue());
+        Rational value = _directory.getRational(TAG_DIGITAL_ZOOM_RATIO);
+        return value == null
+            ? null
+            : value.getNumerator() == 0
+            ? "Digital zoom not used."
+            : SimpleDecimalFormatter.format(value.doubleValue());
     }
 
@@ -358 +311 @@
     public String getWhiteBalanceModeDescription()
     {
-        Integer value = _directory.getInteger(ExifSubIFDDirectory.TAG_WHITE_BALANCE_MODE);
-        if (value==null)
-            return null;
-        switch (value) {
-            case 0: return "Auto white balance";
-            case 1: return "Manual white balance";
-            default:
-                return "Unknown (" + value + ")";
-        }
+        return getIndexedDescription(TAG_WHITE_BALANCE_MODE,
+            "Auto white balance",
+            "Manual white balance"
+        );
     }
 
@@ -372 +320 @@
     public String getExposureModeDescription()
     {
-        Integer value = _directory.getInteger(ExifSubIFDDirectory.TAG_EXPOSURE_MODE);
-        if (value==null)
-            return null;
-        switch (value) {
-            case 0: return "Auto exposure";
-            case 1: return "Manual exposure";
-            case 2: return "Auto bracket";
-            default:
-                return "Unknown (" + value + ")";
-        }
+        return getIndexedDescription(TAG_EXPOSURE_MODE,
+            "Auto exposure",
+            "Manual exposure",
+            "Auto bracket"
+        );
     }
 
@@ -387 +330 @@
     public String getCustomRenderedDescription()
     {
-        Integer value = _directory.getInteger(ExifSubIFDDirectory.TAG_CUSTOM_RENDERED);
-        if (value==null)
-            return null;
-        switch (value) {
-            case 0: return "Normal process";
-            case 1: return "Custom process";
-            default:
-                return "Unknown (" + value + ")";
-        }
+        return getIndexedDescription(TAG_CUSTOM_RENDERED,
+            "Normal process",
+            "Custom process"
+        );
     }
 
@@ -401 +339 @@
     public String getUserCommentDescription()
     {
-        byte[] commentBytes = _directory.getByteArray(ExifSubIFDDirectory.TAG_USER_COMMENT);
-        if (commentBytes==null)
+        byte[] commentBytes = _directory.getByteArray(TAG_USER_COMMENT);
+        if (commentBytes == null)
             return null;
         if (commentBytes.length == 0)
@@ -408 +346 @@
 
         final Map<String, String> encodingMap = new HashMap<String, String>();
-        encodingMap.put("ASCII",    System.getProperty("file.encoding")); // Someone suggested "ISO-8859-1".
-        encodingMap.put("UNICODE",  "UTF-16LE");
-        encodingMap.put("JIS",      "Shift-JIS"); // We assume this charset for now.  Another suggestion is "JIS".
+        encodingMap.put("ASCII", System.getProperty("file.encoding")); // Someone suggested "ISO-8859-1".
+        encodingMap.put("UNICODE", "UTF-16LE");
+        encodingMap.put("JIS", "Shift-JIS"); // We assume this charset for now.  Another suggestion is "JIS".
 
         try {
@@ -442 +380 @@
     {
         // Have seen an exception here from files produced by ACDSEE that stored an int[] here with two values
-        Integer isoEquiv = _directory.getInteger(ExifSubIFDDirectory.TAG_ISO_EQUIVALENT);
-        if (isoEquiv==null)
-            return null;
+        Integer isoEquiv = _directory.getInteger(TAG_ISO_EQUIVALENT);
         // There used to be a check here that multiplied ISO values < 50 by 200.
         // Issue 36 shows a smart-phone image from a Samsung Galaxy S2 with ISO-40.
-        return Integer.toString(isoEquiv);
+        return isoEquiv != null
+            ? Integer.toString(isoEquiv)
+            : null;
     }
 
@@ -453 +391 @@
     public String getExifVersionDescription()
     {
-        int[] ints = _directory.getIntArray(ExifSubIFDDirectory.TAG_EXIF_VERSION);
-        if (ints==null)
-            return null;
-        return ExifSubIFDDescriptor.convertBytesToVersionString(ints, 2);
+        return getVersionBytesDescription(TAG_EXIF_VERSION, 2);
     }
 
@@ -462 +397 @@
     public String getFlashPixVersionDescription()
     {
-        int[] ints = _directory.getIntArray(ExifSubIFDDirectory.TAG_FLASHPIX_VERSION);
-        if (ints==null)
-            return null;
-        return ExifSubIFDDescriptor.convertBytesToVersionString(ints, 2);
+        return getVersionBytesDescription(TAG_FLASHPIX_VERSION, 2);
     }
 
@@ -471 +403 @@
     public String getSceneTypeDescription()
     {
-        Integer sceneType = _directory.getInteger(ExifSubIFDDirectory.TAG_SCENE_TYPE);
-        if (sceneType==null)
-            return null;
-        return sceneType == 1
-                ? "Directly photographed image"
-                : "Unknown (" + sceneType + ")";
+        return getIndexedDescription(TAG_SCENE_TYPE,
+            1,
+            "Directly photographed image"
+        );
     }
 
@@ -482 +412 @@
     public String getFileSourceDescription()
     {
-        Integer fileSource = _directory.getInteger(ExifSubIFDDirectory.TAG_FILE_SOURCE);
-        if (fileSource==null)
-            return null;
-        return fileSource == 3
-                ? "Digital Still Camera (DSC)"
-                : "Unknown (" + fileSource + ")";
+        return getIndexedDescription(TAG_FILE_SOURCE,
+            1,
+            "Film Scanner",
+            "Reflection Print Scanner",
+            "Digital Still Camera (DSC)"
+        );
     }
 
@@ -493 +423 @@
     public String getExposureBiasDescription()
     {
-        Rational value = _directory.getRational(ExifSubIFDDirectory.TAG_EXPOSURE_BIAS);
-        if (value==null)
+        Rational value = _directory.getRational(TAG_EXPOSURE_BIAS);
+        if (value == null)
             return null;
         return value.toSimpleString(true) + " EV";
@@ -502 +432 @@
     public String getMaxApertureValueDescription()
     {
-        Double aperture = _directory.getDoubleObject(ExifSubIFDDirectory.TAG_MAX_APERTURE);
-        if (aperture==null)
+        Double aperture = _directory.getDoubleObject(TAG_MAX_APERTURE);
+        if (aperture == null)
             return null;
         double fStop = PhotographicConversions.apertureToFStop(aperture);
@@ -512 +442 @@
     public String getApertureValueDescription()
     {
-        Double aperture = _directory.getDoubleObject(ExifSubIFDDirectory.TAG_APERTURE);
-        if (aperture==null)
+        Double aperture = _directory.getDoubleObject(TAG_APERTURE);
+        if (aperture == null)
             return null;
         double fStop = PhotographicConversions.apertureToFStop(aperture);
@@ -522 +452 @@
     public String getExposureProgramDescription()
     {
-        // '1' means manual control, '2' program normal, '3' aperture priority,
-        // '4' shutter priority, '5' program creative (slow program),
-        // '6' program action(high-speed program), '7' portrait mode, '8' landscape mode.
-        Integer value = _directory.getInteger(ExifSubIFDDirectory.TAG_EXPOSURE_PROGRAM);
-        if (value==null)
-            return null;
-        switch (value) {
-            case 1: return "Manual control";
-            case 2: return "Program normal";
-            case 3: return "Aperture priority";
-            case 4: return "Shutter priority";
-            case 5: return "Program creative (slow program)";
-            case 6: return "Program action (high-speed program)";
-            case 7: return "Portrait mode";
-            case 8: return "Landscape mode";
-            default:
-                return "Unknown program (" + value + ")";
-        }
+        return getIndexedDescription(TAG_EXPOSURE_PROGRAM,
+            1,
+            "Manual control",
+            "Program normal",
+            "Aperture priority",
+            "Shutter priority",
+            "Program creative (slow program)",
+            "Program action (high-speed program)",
+            "Portrait mode",
+            "Landscape mode"
+        );
     }
 
@@ -545 +468 @@
     public String getYCbCrSubsamplingDescription()
     {
-        int[] positions = _directory.getIntArray(ExifSubIFDDirectory.TAG_YCBCR_SUBSAMPLING);
-        if (positions==null)
+        int[] positions = _directory.getIntArray(TAG_YCBCR_SUBSAMPLING);
+        if (positions == null)
             return null;
         if (positions[0] == 2 && positions[1] == 1) {
@@ -564 +487 @@
         // pixel. If value is '2', Y/Cb/Cr value is separated and stored to Y plane/Cb plane/Cr
         // plane format.
-        Integer value = _directory.getInteger(ExifSubIFDDirectory.TAG_PLANAR_CONFIGURATION);
-        if (value==null)
-            return null;
-        switch (value) {
-            case 1: return "Chunky (contiguous for each subsampling pixel)";
-            case 2: return "Separate (Y-plane/Cb-plane/Cr-plane format)";
-            default:
-                return "Unknown configuration";
-        }
+        return getIndexedDescription(TAG_PLANAR_CONFIGURATION,
+            1,
+            "Chunky (contiguous for each subsampling pixel)",
+            "Separate (Y-plane/Cb-plane/Cr-plane format)"
+        );
     }
 
@@ -578 +497 @@
     public String getSamplesPerPixelDescription()
     {
-        String value = _directory.getString(ExifSubIFDDirectory.TAG_SAMPLES_PER_PIXEL);
-        return value==null ? null : value + " samples/pixel";
+        String value = _directory.getString(TAG_SAMPLES_PER_PIXEL);
+        return value == null ? null : value + " samples/pixel";
     }
 
@@ -585 +504 @@
     public String getRowsPerStripDescription()
     {
-        final String value = _directory.getString(ExifSubIFDDirectory.TAG_ROWS_PER_STRIP);
-        return value==null ? null : value + " rows/strip";
+        final String value = _directory.getString(TAG_ROWS_PER_STRIP);
+        return value == null ? null : value + " rows/strip";
     }
 
@@ -592 +511 @@
     public String getStripByteCountsDescription()
     {
-        final String value = _directory.getString(ExifSubIFDDirectory.TAG_STRIP_BYTE_COUNTS);
-        return value==null ? null : value + " bytes";
+        final String value = _directory.getString(TAG_STRIP_BYTE_COUNTS);
+        return value == null ? null : value + " bytes";
     }
 
@@ -600 +519 @@
     {
         // Shows the color space of the image data components
-        Integer value = _directory.getInteger(ExifSubIFDDirectory.TAG_PHOTOMETRIC_INTERPRETATION);
-        if (value==null)
+        Integer value = _directory.getInteger(TAG_PHOTOMETRIC_INTERPRETATION);
+        if (value == null)
             return null;
         switch (value) {
@@ -626 +545 @@
     public String getBitsPerSampleDescription()
     {
-        String value = _directory.getString(ExifSubIFDDirectory.TAG_BITS_PER_SAMPLE);
-        return value==null ? null : value + " bits/component/pixel";
+        String value = _directory.getString(TAG_BITS_PER_SAMPLE);
+        return value == null ? null : value + " bits/component/pixel";
     }
 
@@ -633 +552 @@
     public String getFocalPlaneXResolutionDescription()
     {
-        Rational rational = _directory.getRational(ExifSubIFDDirectory.TAG_FOCAL_PLANE_X_RES);
-        if (rational==null)
+        Rational rational = _directory.getRational(TAG_FOCAL_PLANE_X_RESOLUTION);
+        if (rational == null)
             return null;
         final String unit = getFocalPlaneResolutionUnitDescription();
         return rational.getReciprocal().toSimpleString(_allowDecimalRepresentationOfRationals)
-            + (unit==null ? "" : " " + unit.toLowerCase());
+            + (unit == null ? "" : " " + unit.toLowerCase());
     }
 
@@ -644 +563 @@
     public String getFocalPlaneYResolutionDescription()
     {
-        Rational rational = _directory.getRational(ExifSubIFDDirectory.TAG_FOCAL_PLANE_Y_RES);
-        if (rational==null)
+        Rational rational = _directory.getRational(TAG_FOCAL_PLANE_Y_RESOLUTION);
+        if (rational == null)
             return null;
         final String unit = getFocalPlaneResolutionUnitDescription();
         return rational.getReciprocal().toSimpleString(_allowDecimalRepresentationOfRationals)
-            + (unit==null ? "" : " " + unit.toLowerCase());
+            + (unit == null ? "" : " " + unit.toLowerCase());
     }
 
@@ -655 +574 @@
     public String getFocalPlaneResolutionUnitDescription()
     {
-        // Unit of FocalPlaneXResolution/FocalPlaneYResolution. '1' means no-unit,
-        // '2' inch, '3' centimeter.
-        Integer value = _directory.getInteger(ExifSubIFDDirectory.TAG_FOCAL_PLANE_UNIT);
-        if (value==null)
-            return null;
-        switch (value) {
-            case 1: return "(No unit)";
-            case 2: return "Inches";
-            case 3: return "cm";
-            default:
-                return "";
-        }
+        // Unit of FocalPlaneXResolution/FocalPlaneYResolution.
+        // '1' means no-unit, '2' inch, '3' centimeter.
+        return getIndexedDescription(TAG_FOCAL_PLANE_RESOLUTION_UNIT,
+            1,
+            "(No unit)",
+            "Inches",
+            "cm"
+        );
     }
 
@@ -672 +587 @@
     public String getExifImageWidthDescription()
     {
-        final Integer value = _directory.getInteger(ExifSubIFDDirectory.TAG_EXIF_IMAGE_WIDTH);
-        if (value==null)
-            return null;
-        return value + " pixels";
+        final Integer value = _directory.getInteger(TAG_EXIF_IMAGE_WIDTH);
+        return value == null ? null : value + " pixels";
     }
 
@@ -681 +594 @@
     public String getExifImageHeightDescription()
     {
-        final Integer value = _directory.getInteger(ExifSubIFDDirectory.TAG_EXIF_IMAGE_HEIGHT);
-        if (value==null)
-            return null;
-        return value + " pixels";
+        final Integer value = _directory.getInteger(TAG_EXIF_IMAGE_HEIGHT);
+        return value == null ? null : value + " pixels";
     }
 
@@ -690 +601 @@
     public String getColorSpaceDescription()
     {
-        final Integer value = _directory.getInteger(ExifSubIFDDirectory.TAG_COLOR_SPACE);
-        if (value==null)
+        final Integer value = _directory.getInteger(TAG_COLOR_SPACE);
+        if (value == null)
             return null;
         if (value == 1)
@@ -697 +608 @@
         if (value == 65535)
             return "Undefined";
-        return "Unknown";
+        return "Unknown (" + value + ")";
     }
 
@@ -703 +614 @@
     public String getFocalLengthDescription()
     {
-        Rational value = _directory.getRational(ExifSubIFDDirectory.TAG_FOCAL_LENGTH);
-        if (value==null)
+        Rational value = _directory.getRational(TAG_FOCAL_LENGTH);
+        if (value == null)
             return null;
         java.text.DecimalFormat formatter = new DecimalFormat("0.0##");
@@ -714 +625 @@
     {
         /*
-         * This is a bitmask.
+         * This is a bit mask.
          * 0 = flash fired
          * 1 = return detected
@@ -724 +635 @@
          */
 
-        final Integer value = _directory.getInteger(ExifSubIFDDirectory.TAG_FLASH);
-
-        if (value==null)
+        final Integer value = _directory.getInteger(TAG_FLASH);
+
+        if (value == null)
             return null;
 
         StringBuilder sb = new StringBuilder();
 
-        if ((value & 0x1)!=0)
+        if ((value & 0x1) != 0)
             sb.append("Flash fired");
         else
@@ -737 +648 @@
 
         // check if we're able to detect a return, before we mention it
-        if ((value & 0x4)!=0)
-        {
-            if ((value & 0x2)!=0)
+        if ((value & 0x4) != 0) {
+            if ((value & 0x2) != 0)
                 sb.append(", return detected");
             else
@@ -745 +655 @@
         }
 
-        if ((value & 0x10)!=0)
+        if ((value & 0x10) != 0)
             sb.append(", auto");
 
-        if ((value & 0x40)!=0)
+        if ((value & 0x40) != 0)
             sb.append(", red-eye reduction");
 
@@ -760 +670 @@
         // '17' standard light A, '18' standard light B, '19' standard light C, '20' D55,
         // '21' D65, '22' D75, '255' other.
-        final Integer value = _directory.getInteger(ExifSubIFDDirectory.TAG_WHITE_BALANCE);
-        if (value==null)
+        final Integer value = _directory.getInteger(TAG_WHITE_BALANCE);
+        if (value == null)
             return null;
         switch (value) {
@@ -786 +696 @@
         // '0' means unknown, '1' average, '2' center weighted average, '3' spot
         // '4' multi-spot, '5' multi-segment, '6' partial, '255' other
-        Integer value = _directory.getInteger(ExifSubIFDDirectory.TAG_METERING_MODE);
-        if (value==null)
+        Integer value = _directory.getInteger(TAG_METERING_MODE);
+        if (value == null)
             return null;
         switch (value) {
@@ -806 +716 @@
     public String getSubjectDistanceDescription()
     {
-        Rational value = _directory.getRational(ExifSubIFDDirectory.TAG_SUBJECT_DISTANCE);
-        if (value==null)
+        Rational value = _directory.getRational(TAG_SUBJECT_DISTANCE);
+        if (value == null)
             return null;
         java.text.DecimalFormat formatter = new DecimalFormat("0.0##");
@@ -816 +726 @@
     public String getCompressedAverageBitsPerPixelDescription()
     {
-        Rational value = _directory.getRational(ExifSubIFDDirectory.TAG_COMPRESSED_AVERAGE_BITS_PER_PIXEL);
-        if (value==null)
+        Rational value = _directory.getRational(TAG_COMPRESSED_AVERAGE_BITS_PER_PIXEL);
+        if (value == null)
             return null;
         String ratio = value.toSimpleString(_allowDecimalRepresentationOfRationals);
-        if (value.isInteger() && value.intValue() == 1) {
-            return ratio + " bit/pixel";
-        } else {
-            return ratio + " bits/pixel";
-        }
+        return value.isInteger() && value.intValue() == 1
+            ? ratio + " bit/pixel"
+            : ratio + " bits/pixel";
     }
 
@@ -830 +738 @@
     public String getExposureTimeDescription()
     {
-        String value = _directory.getString(ExifSubIFDDirectory.TAG_EXPOSURE_TIME);
-        return value==null ? null : value + " sec";
+        String value = _directory.getString(TAG_EXPOSURE_TIME);
+        return value == null ? null : value + " sec";
     }
 
@@ -847 +755 @@
         // description (spotted bug using a Canon EOS 300D)
         // thanks also to Gli Blr for spotting this bug
-        Float apexValue = _directory.getFloatObject(ExifSubIFDDirectory.TAG_SHUTTER_SPEED);
-        if (apexValue==null)
-            return null;
-        if (apexValue<=1) {
-            float apexPower = (float)(1/(Math.exp(apexValue*Math.log(2))));
+        Float apexValue = _directory.getFloatObject(TAG_SHUTTER_SPEED);
+        if (apexValue == null)
+            return null;
+        if (apexValue <= 1) {
+            float apexPower = (float)(1 / (Math.exp(apexValue * Math.log(2))));
             long apexPower10 = Math.round((double)apexPower * 10.0);
-            float fApexPower = (float) apexPower10 / 10.0f;
+            float fApexPower = (float)apexPower10 / 10.0f;
             return fApexPower + " sec";
         } else {
-            int apexPower = (int)((Math.exp(apexValue*Math.log(2))));
+            int apexPower = (int)((Math.exp(apexValue * Math.log(2))));
             return "1/" + apexPower + " sec";
         }
@@ -879 +787 @@
         return sb.toString();
 */
-
     }
 
@@ -885 +792 @@
     public String getFNumberDescription()
     {
-        Rational value = _directory.getRational(ExifSubIFDDirectory.TAG_FNUMBER);
-        if (value==null)
+        Rational value = _directory.getRational(TAG_FNUMBER);
+        if (value == null)
             return null;
         return "F" + SimpleDecimalFormatter.format(value.doubleValue());
@@ -897 +804 @@
         // '4' Three-chip color area sensor, '5' Color sequential area sensor
         // '7' Trilinear sensor '8' Color sequential linear sensor,  'Other' reserved
-        Integer value = _directory.getInteger(ExifSubIFDDirectory.TAG_SENSING_METHOD);
-        if (value==null)
-            return null;
-        switch (value) {
-            case 1: return "(Not defined)";
-            case 2: return "One-chip color area sensor";
-            case 3: return "Two-chip color area sensor";
-            case 4: return "Three-chip color area sensor";
-            case 5: return "Color sequential area sensor";
-            case 7: return "Trilinear sensor";
-            case 8: return "Color sequential linear sensor";
-            default:
-                return "";
-        }
+        return getIndexedDescription(TAG_SENSING_METHOD,
+            1,
+            "(Not defined)",
+            "One-chip color area sensor",
+            "Two-chip color area sensor",
+            "Three-chip color area sensor",
+            "Color sequential area sensor",
+            null,
+            "Trilinear sensor",
+            "Color sequential linear sensor"
+        );
     }
 
@@ -916 +820 @@
     public String getComponentConfigurationDescription()
     {
-        int[] components = _directory.getIntArray(ExifSubIFDDirectory.TAG_COMPONENTS_CONFIGURATION);
-        if (components==null)
+        int[] components = _directory.getIntArray(TAG_COMPONENTS_CONFIGURATION);
+        if (components == null)
             return null;
         String[] componentStrings = {"", "Y", "Cb", "Cr", "R", "G", "B"};