TMI-139: Work in progress: TIFF image metadata.

imageio/imageio-psd/src/main/java/com/twelvemonkeys/imageio/plugins/psd/AbstractMetadata.java

@@ -1,137 +0,0 @@
-/*
- * Copyright (c) 2014, Harald Kuhr
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name "TwelveMonkeys" nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
- * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-package com.twelvemonkeys.imageio.plugins.psd;
-
-import org.w3c.dom.Node;
-
-import javax.imageio.metadata.IIOInvalidTreeException;
-import javax.imageio.metadata.IIOMetadata;
-import javax.imageio.metadata.IIOMetadataFormatImpl;
-import java.util.Arrays;
-
-/**
- * AbstractMetadata
- *
- * @author <a href="mailto:harald.kuhr@gmail.com">Harald Kuhr</a>
- * @author last modified by $Author: haraldk$
- * @version $Id: AbstractMetadata.java,v 1.0 Nov 13, 2009 1:02:12 AM haraldk Exp$
- */
-abstract class AbstractMetadata extends IIOMetadata implements Cloneable {
-    // TODO: Move to core...
-
-    protected AbstractMetadata(final boolean pStandardFormatSupported,
-                               final String pNativeFormatName, final String pNativeFormatClassName,
-                               final String[] pExtraFormatNames, final String[] pExtraFormatClassNames) {
-        super(pStandardFormatSupported, pNativeFormatName, pNativeFormatClassName, pExtraFormatNames, pExtraFormatClassNames);
-    }
-
-    /**
-     * Default implementation returns {@code true}.
-     * Mutable subclasses should override this method.
-     *
-     * @return {@code true}.
-     */
-    @Override
-    public boolean isReadOnly() {
-        return true;
-    }
-
-    @Override
-    public Node getAsTree(final String pFormatName) {
-        validateFormatName(pFormatName);
-
-        if (pFormatName.equals(nativeMetadataFormatName)) {
-            return getNativeTree();
-        }
-        else if (pFormatName.equals(IIOMetadataFormatImpl.standardMetadataFormatName)) {
-            return getStandardTree();
-        }
-
-        // TODO: What about extra formats??
-        throw new AssertionError("Unreachable");
-    }
-
-    @Override
-    public void mergeTree(final String pFormatName, final Node pRoot) throws IIOInvalidTreeException {
-        assertMutable();
-
-        validateFormatName(pFormatName);
-
-        if (!pRoot.getNodeName().equals(nativeMetadataFormatName)) {
-            throw new IIOInvalidTreeException("Root must be " + nativeMetadataFormatName, pRoot);
-        }
-
-        Node node = pRoot.getFirstChild();
-        while (node != null) {
-            // TODO: Merge values from node into this
-
-            // Move to the next sibling
-            node = node.getNextSibling();
-        }
-    }
-
-    @Override
-    public void reset() {
-        assertMutable();
-    }
-
-    /**
-     * Asserts that this meta data is mutable.
-     *
-     * @throws IllegalStateException if {@link #isReadOnly()} returns {@code true}.
-     */
-    protected final void assertMutable() {
-        if (isReadOnly()) {
-            throw new IllegalStateException("Metadata is read-only");
-        }
-    }
-
-    protected abstract Node getNativeTree();
-
-    protected final void validateFormatName(final String pFormatName) {
-        String[] metadataFormatNames = getMetadataFormatNames();
-
-        if (metadataFormatNames != null) {
-            for (String metadataFormatName : metadataFormatNames) {
-                if (metadataFormatName.equals(pFormatName)) {
-                    return; // Found, we're ok!
-                }
-            }
-        }
-
-        throw new IllegalArgumentException(
-                String.format("Bad format name: \"%s\". Expected one of %s", pFormatName, Arrays.toString(metadataFormatNames))
-        );
-    }
-
-    protected static String toListString(short[] values) {
-        String string = Arrays.toString(values);
-        return string.substring(1, string.length() - 1);
-    }
-}

imageio/imageio-psd/src/main/java/com/twelvemonkeys/imageio/plugins/psd/PSDMetadata.java

@@ -28,6 +28,7 @@
 
 package com.twelvemonkeys.imageio.plugins.psd;
 
+import com.twelvemonkeys.imageio.AbstractMetadata;
 import com.twelvemonkeys.imageio.metadata.Directory;
 import com.twelvemonkeys.imageio.metadata.Entry;
 import com.twelvemonkeys.imageio.metadata.exif.TIFF;
@@ -571,9 +572,8 @@ public final class PSDMetadata extends AbstractMetadata {
         compressionNode.appendChild(compressionTypeName);
 
         if (compression != PSD.COMPRESSION_NONE) {
-            IIOMetadataNode lossless = new IIOMetadataNode("Lossless");
-            lossless.setAttribute("value", "true");
-            compressionNode.appendChild(lossless);
+            compressionNode.appendChild(new IIOMetadataNode("Lossless"));
+            // "value" defaults to TRUE, all PSD compressions are lossless
         }
 
         return compressionNode;
@@ -755,7 +755,7 @@ public final class PSDMetadata extends AbstractMetadata {
     }
 
     private void appendTextEntriesFlat(final IIOMetadataNode node, final Directory directory, final FilterIterator.Filter<Entry> filter) {
-        FilterIterator<Entry> entries = new FilterIterator<Entry>(directory.iterator(), filter);
+        FilterIterator<Entry> entries = new FilterIterator<>(directory.iterator(), filter);
 
         while (entries.hasNext()) {
             Entry entry = entries.next();
@@ -807,7 +807,7 @@ public final class PSDMetadata extends AbstractMetadata {
         @SuppressWarnings({"unchecked"})
         Iterator<T> iterator = (Iterator<T>) imageResources.iterator();
 
-        return new FilterIterator<T>(iterator, new FilterIterator.Filter<T>() {
+        return new FilterIterator<>(iterator, new FilterIterator.Filter<T>() {
             public boolean accept(final T pElement) {
                 return resourceType.isInstance(pElement);
             }
@@ -817,7 +817,7 @@ public final class PSDMetadata extends AbstractMetadata {
     Iterator<PSDImageResource> getResources(final int... resourceTypes) {
         Iterator<PSDImageResource> iterator = imageResources.iterator();
 
-        return new FilterIterator<PSDImageResource>(iterator, new FilterIterator.Filter<PSDImageResource>() {
+        return new FilterIterator<>(iterator, new FilterIterator.Filter<PSDImageResource>() {
             public boolean accept(final PSDImageResource pResource) {
                 for (int type : resourceTypes) {
                     if (type == pResource.id) {