You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by gg...@apache.org on 2023/05/14 17:33:43 UTC

[commons-imaging] 02/03: Encapsulate org.apache.commons.imaging.formats.tiff.write.TiffOutputDirectory.type

This is an automated email from the ASF dual-hosted git repository.

ggregory pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-imaging.git

commit 2e6606839c768e4295bf9a4b2b692707f2084af8
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Sun May 14 13:26:48 2023 -0400

    Encapsulate
    org.apache.commons.imaging.formats.tiff.write.TiffOutputDirectory.type
---
 .../imaging/formats/tiff/write/TiffImageWriterBase.java    |  2 +-
 .../imaging/formats/tiff/write/TiffOutputDirectory.java    | 14 +++++++++-----
 .../commons/imaging/formats/tiff/write/TiffOutputSet.java  |  6 +++---
 3 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/src/main/java/org/apache/commons/imaging/formats/tiff/write/TiffImageWriterBase.java b/src/main/java/org/apache/commons/imaging/formats/tiff/write/TiffImageWriterBase.java
index b135374b..4ba8160a 100644
--- a/src/main/java/org/apache/commons/imaging/formats/tiff/write/TiffImageWriterBase.java
+++ b/src/main/java/org/apache/commons/imaging/formats/tiff/write/TiffImageWriterBase.java
@@ -230,7 +230,7 @@ public abstract class TiffImageWriterBase {
         final List<Integer> directoryIndices = new ArrayList<>();
         final Map<Integer, TiffOutputDirectory> directoryTypeMap = new HashMap<>();
         for (final TiffOutputDirectory directory : directories) {
-            final int dirType = directory.type;
+            final int dirType = directory.getType();
             directoryTypeMap.put(dirType, directory);
             // Debug.debug("validating dirType", dirType + " ("
             // + directory.getFields().size() + " fields)");
diff --git a/src/main/java/org/apache/commons/imaging/formats/tiff/write/TiffOutputDirectory.java b/src/main/java/org/apache/commons/imaging/formats/tiff/write/TiffOutputDirectory.java
index 4a8ad5f5..a4ca0189 100644
--- a/src/main/java/org/apache/commons/imaging/formats/tiff/write/TiffOutputDirectory.java
+++ b/src/main/java/org/apache/commons/imaging/formats/tiff/write/TiffOutputDirectory.java
@@ -72,8 +72,8 @@ import org.apache.commons.imaging.formats.tiff.taginfos.TagInfoShorts;
 import org.apache.commons.imaging.formats.tiff.taginfos.TagInfoXpString;
 
 public final class TiffOutputDirectory extends TiffOutputItem {
-    public static final Comparator<TiffOutputDirectory> COMPARATOR = Comparator.comparingInt(o -> o.type);
-    public final int type;
+    public static final Comparator<TiffOutputDirectory> COMPARATOR = Comparator.comparingInt(o -> o.getType());
+    private final int type;
     private final List<TiffOutputField> fields = new ArrayList<>();
     private final ByteOrder byteOrder;
     private TiffOutputDirectory nextDirectory;
@@ -531,7 +531,7 @@ public final class TiffOutputDirectory extends TiffOutputItem {
     }
 
     public String description() {
-        return TiffDirectory.description(type);
+        return TiffDirectory.description(getType());
     }
 
     /**
@@ -575,8 +575,8 @@ public final class TiffOutputDirectory extends TiffOutputItem {
 
     @Override
     public String getItemDescription() {
-        final TiffDirectoryType dirType = TiffDirectoryType.getExifDirectoryType(type);
-        return "Directory: " + dirType.name + " (" + type + ")";
+        final TiffDirectoryType dirType = TiffDirectoryType.getExifDirectoryType(getType());
+        return "Directory: " + dirType.name + " (" + getType() + ")";
     }
 
     @Override
@@ -692,6 +692,10 @@ public final class TiffOutputDirectory extends TiffOutputItem {
         return tiffImageData;
     }
 
+    public int getType() {
+        return type;
+    }
+
     public void removeField(final int tag) {
         final List<TiffOutputField> matches = new ArrayList<>();
         for (final TiffOutputField field : fields) {
diff --git a/src/main/java/org/apache/commons/imaging/formats/tiff/write/TiffOutputSet.java b/src/main/java/org/apache/commons/imaging/formats/tiff/write/TiffOutputSet.java
index c24c04c1..a8cb9794 100644
--- a/src/main/java/org/apache/commons/imaging/formats/tiff/write/TiffOutputSet.java
+++ b/src/main/java/org/apache/commons/imaging/formats/tiff/write/TiffOutputSet.java
@@ -44,7 +44,7 @@ public final class TiffOutputSet {
 
     public void addDirectory(final TiffOutputDirectory directory)
             throws ImageWriteException {
-        if (null != findDirectory(directory.type)) {
+        if (null != findDirectory(directory.getType())) {
             throw new ImageWriteException(
                     "Output set already contains a directory of that type.");
         }
@@ -88,7 +88,7 @@ public final class TiffOutputSet {
 
     public TiffOutputDirectory findDirectory(final int directoryType) {
         for (final TiffOutputDirectory directory : directories) {
-            if (directory.type == directoryType) {
+            if (directory.getType() == directoryType) {
                 return directory;
             }
         }
@@ -272,7 +272,7 @@ public final class TiffOutputSet {
         for (int i = 0; i < directories.size(); i++) {
             final TiffOutputDirectory directory = directories.get(i);
             result.append(String.format("%s\tdirectory %d: %s (%d)%n",
-                    prefix, i, directory.description(), directory.type));
+                    prefix, i, directory.description(), directory.getType()));
 
             final List<TiffOutputField> fields = directory.getFields();
             for (final TiffOutputField field : fields) {