Changeset 8132 in josm for trunk/src/com/drew/metadata/exif/ExifInteropDescriptor.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/ExifInteropDescriptor.java (modified) (6 diffs)

trunk/src/com/drew/metadata/exif/ExifInteropDescriptor.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;
@@ -25 +25 @@
 import com.drew.metadata.TagDescriptor;
 
+import static com.drew.metadata.exif.ExifInteropDirectory.*;
+
 /**
- * Provides human-readable string representations of tag values stored in a <code>ExifInteropDirectory</code>.
+ * Provides human-readable string representations of tag values stored in a {@link ExifInteropDirectory}.
  *
- * @author Drew Noakes http://drewnoakes.com
+ * @author Drew Noakes https://drewnoakes.com
  */
 public class ExifInteropDescriptor extends TagDescriptor<ExifInteropDirectory>
@@ -37 +39 @@
     }
 
+    @Override
     @Nullable
     public String getDescription(int tagType)
     {
         switch (tagType) {
-            case ExifInteropDirectory.TAG_INTEROP_INDEX:
+            case TAG_INTEROP_INDEX:
                 return getInteropIndexDescription();
-            case ExifInteropDirectory.TAG_INTEROP_VERSION:
+            case TAG_INTEROP_VERSION:
                 return getInteropVersionDescription();
             default:
@@ -53 +56 @@
     public String getInteropVersionDescription()
     {
-        int[] ints = _directory.getIntArray(ExifInteropDirectory.TAG_INTEROP_VERSION);
-        return convertBytesToVersionString(ints, 2);
+        return getVersionBytesDescription(TAG_INTEROP_VERSION, 2);
     }
 
@@ -60 +62 @@
     public String getInteropIndexDescription()
     {
-        String value = _directory.getString(ExifInteropDirectory.TAG_INTEROP_INDEX);
+        String value = _directory.getString(TAG_INTEROP_INDEX);
 
-        if (value==null)
+        if (value == null)
             return null;