Changeset 6127 in josm for trunk/src/com/drew/metadata/exif/ExifInteropDescriptor.java

Timestamp:

2013-08-09T18:05:11+02:00 (11 years ago)

Author:

bastiK

Message:

applied #8895 - Upgrade metadata-extractor to v. 2.6.4 (patch by ebourg)

File:

• trunk/src/com/drew/metadata/exif/ExifInteropDescriptor.java (modified) (2 diffs)

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

@@ -1 +1 @@
 /*
- * This is public domain software - that is, you can do whatever you want
- * with it, and include it software that is licensed under the GNU or the
- * BSD license, or whatever other licence you choose, including proprietary
- * closed source licenses.  I do ask that you leave this header in tact.
+ * Copyright 2002-2012 Drew Noakes
  *
- * If you make modifications to this code that you think would benefit the
- * wider community, please send me a copy and I'll post it on my site.
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
  *
- * If you make use of this code, I'd appreciate hearing about it.
- *   drew@drewnoakes.com
- * Latest version of this software kept at
- *   http://drewnoakes.com/
+ *        http://www.apache.org/licenses/LICENSE-2.0
  *
- * Created by dnoakes on 12-Nov-2002 22:27:34 using IntelliJ IDEA.
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ *
+ * More information about this project is available at:
+ *
+ *    http://drewnoakes.com/code/exif/
+ *    http://code.google.com/p/metadata-extractor/
  */
 package com.drew.metadata.exif;
 
-import com.drew.metadata.Directory;
-import com.drew.metadata.MetadataException;
+import com.drew.lang.annotations.NotNull;
+import com.drew.lang.annotations.Nullable;
 import com.drew.metadata.TagDescriptor;
 
 /**
+ * Provides human-readable string representations of tag values stored in a <code>ExifInteropDirectory</code>.
  *
+ * @author Drew Noakes http://drewnoakes.com
  */
-public class ExifInteropDescriptor extends TagDescriptor
+public class ExifInteropDescriptor extends TagDescriptor<ExifInteropDirectory>
 {
-    public ExifInteropDescriptor(Directory directory)
+    public ExifInteropDescriptor(@NotNull ExifInteropDirectory directory)
     {
         super(directory);
     }
 
-    public String getDescription(int tagType) throws MetadataException
+    @Nullable
+    public String getDescription(int tagType)
     {
         switch (tagType) {
@@ -39 +46 @@
                 return getInteropVersionDescription();
             default:
-                return _directory.getString(tagType);
+                return super.getDescription(tagType);
         }
     }
 
-    public String getInteropVersionDescription() throws MetadataException
+    @Nullable
+    public String getInteropVersionDescription()
     {
-        if (!_directory.containsTag(ExifInteropDirectory.TAG_INTEROP_VERSION)) return null;
         int[] ints = _directory.getIntArray(ExifInteropDirectory.TAG_INTEROP_VERSION);
-        return ExifDescriptor.convertBytesToVersionString(ints);
+        return convertBytesToVersionString(ints, 2);
     }
 
+    @Nullable
     public String getInteropIndexDescription()
     {
-        if (!_directory.containsTag(ExifInteropDirectory.TAG_INTEROP_INDEX)) return null;
-        String interopIndex = _directory.getString(ExifInteropDirectory.TAG_INTEROP_INDEX).trim();
-        if ("R98".equalsIgnoreCase(interopIndex)) {
-            return "Recommended Exif Interoperability Rules (ExifR98)";
-        } else {
-            return "Unknown (" + interopIndex + ")";
-        }
+        String value = _directory.getString(ExifInteropDirectory.TAG_INTEROP_INDEX);
+
+        if (value==null)
+            return null;
+
+        return "R98".equalsIgnoreCase(value.trim())
+                ? "Recommended Exif Interoperability Rules (ExifR98)"
+                : "Unknown (" + value + ")";
     }
 }