Changeset 15217 in josm for trunk/src/com/drew/metadata/tiff/DirectoryTiffHandler.java

Timestamp:

2019-07-07T01:56:46+02:00 (5 years ago)

Author:

Don-vip

Message:

see #17848 - update to metadata-extractor 2.12.0

File:

• trunk/src/com/drew/metadata/tiff/DirectoryTiffHandler.java (modified) (5 diffs)

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

@@ -1 +1 @@
 /*
- * Copyright 2002-2017 Drew Noakes
+ * Copyright 2002-2019 Drew Noakes and contributors
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");
@@ -24 +24 @@
 import com.drew.lang.Rational;
 import com.drew.lang.annotations.NotNull;
+import com.drew.lang.annotations.Nullable;
 import com.drew.metadata.Directory;
 import com.drew.metadata.ErrorDirectory;
@@ -40 +41 @@
     private final Stack<Directory> _directoryStack = new Stack<Directory>();
 
-    protected Directory _currentDirectory;
+    @Nullable private Directory _rootParentDirectory;
+    @Nullable protected Directory _currentDirectory;
     protected final Metadata _metadata;
 
-    protected DirectoryTiffHandler(Metadata metadata)
+    protected DirectoryTiffHandler(Metadata metadata, @Nullable Directory parentDirectory)
     {
         _metadata = metadata;
+        _rootParentDirectory = parentDirectory;
     }
 
@@ -55 +58 @@
     protected void pushDirectory(@NotNull Class<? extends Directory> directoryClass)
     {
-        Directory newDirectory = null;
+        Directory newDirectory;
 
         try {
@@ -65 +68 @@
         }
 
-        if (newDirectory != null)
-        {
-            // If this is the first directory, don't add to the stack
-            if (_currentDirectory != null)
-            {
-                _directoryStack.push(_currentDirectory);
-                newDirectory.setParent(_currentDirectory);
+        // If this is the first directory, don't add to the stack
+        if (_currentDirectory == null) {
+            // Apply any pending root parent to this new directory
+            if (_rootParentDirectory != null) {
+                newDirectory.setParent(_rootParentDirectory);
+                _rootParentDirectory = null;
             }
-            _currentDirectory = newDirectory;
-            _metadata.addDirectory(_currentDirectory);
         }
+        else {
+            // The current directory is pushed onto the stack, and set as the new directory's parent
+            _directoryStack.push(_currentDirectory);
+            newDirectory.setParent(_currentDirectory);
+        }
+
+        _currentDirectory = newDirectory;
+        _metadata.addDirectory(_currentDirectory);
     }