Changeset 13061 in josm for trunk/src/com/drew/metadata/tiff

Timestamp:

2017-10-30T22:46:09+01:00 (7 years ago)

Author:

Don-vip

Message:

fix #15505 - update to metadata-extractor 2.10.1

Location:

trunk/src/com/drew/metadata/tiff

Files:

• DirectoryTiffHandler.java (modified) (5 diffs)
• package-info.java (added)
• package.html (deleted)

trunk/src/com/drew/metadata/tiff/DirectoryTiffHandler.java

@@ -1 +1 @@
 /*
- * Copyright 2002-2016 Drew Noakes
+ * Copyright 2002-2017 Drew Noakes
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");
@@ -25 +25 @@
 import com.drew.lang.annotations.NotNull;
 import com.drew.metadata.Directory;
+import com.drew.metadata.ErrorDirectory;
 import com.drew.metadata.Metadata;
+import com.drew.metadata.StringValue;
 
 import java.util.Stack;
@@ -41 +43 @@
     protected final Metadata _metadata;
 
-    protected DirectoryTiffHandler(Metadata metadata, Class<? extends Directory> initialDirectoryClass)
+    protected DirectoryTiffHandler(Metadata metadata)
     {
         _metadata = metadata;
+    }
+
+    public void endingIFD()
+    {
+        _currentDirectory = _directoryStack.empty() ? null : _directoryStack.pop();
+    }
+
+    protected void pushDirectory(@NotNull Class<? extends Directory> directoryClass)
+    {
+        Directory newDirectory = null;
+
         try {
-            _currentDirectory = initialDirectoryClass.newInstance();
+            newDirectory = directoryClass.newInstance();
         } catch (InstantiationException e) {
             throw new RuntimeException(e);
@@ -51 +64 @@
             throw new RuntimeException(e);
         }
-        _metadata.addDirectory(_currentDirectory);
-    }
-
-    public void endingIFD()
-    {
-        _currentDirectory = _directoryStack.empty() ? null : _directoryStack.pop();
-    }
-
-    protected void pushDirectory(@NotNull Class<? extends Directory> directoryClass)
-    {
-        _directoryStack.push(_currentDirectory);
-        try {
-            Directory newDirectory = directoryClass.newInstance();
-            newDirectory.setParent(_currentDirectory);
+
+        if (newDirectory != null)
+        {
+            // If this is the first directory, don't add to the stack
+            if (_currentDirectory != null)
+            {
+                _directoryStack.push(_currentDirectory);
+                newDirectory.setParent(_currentDirectory);
+            }
             _currentDirectory = newDirectory;
-        } catch (InstantiationException e) {
-            throw new RuntimeException(e);
-        } catch (IllegalAccessException e) {
-            throw new RuntimeException(e);
+            _metadata.addDirectory(_currentDirectory);
         }
-        _metadata.addDirectory(_currentDirectory);
     }
 
     public void warn(@NotNull String message)
     {
-        _currentDirectory.addError(message);
+        getCurrentOrErrorDirectory().addError(message);
     }
 
     public void error(@NotNull String message)
     {
-        _currentDirectory.addError(message);
+        getCurrentOrErrorDirectory().addError(message);
+    }
+
+    @NotNull
+    private Directory getCurrentOrErrorDirectory()
+    {
+        if (_currentDirectory != null)
+            return _currentDirectory;
+        ErrorDirectory error = _metadata.getFirstDirectoryOfType(ErrorDirectory.class);
+        if (error != null)
+            return error;
+        pushDirectory(ErrorDirectory.class);
+        return _currentDirectory;
     }
 
@@ -89 +105 @@
     }
 
-    public void setString(int tagId, @NotNull String string)
-    {
-        _currentDirectory.setString(tagId, string);
+    public void setString(int tagId, @NotNull StringValue string)
+    {
+        _currentDirectory.setStringValue(tagId, string);
     }