WIP

lightcrafts/src/main/java/com/lightcrafts/image/libs/LibRaw.java

@@ -10,8 +10,8 @@
 import java.awt.*;
 import java.awt.image.*;
 import java.io.File;
+import java.time.*;
 import java.util.Arrays;
-import java.util.Date;
 
 public class LibRaw extends RawDecoder {
     final String filePath;
@@ -215,8 +215,9 @@ public float getAperture() {
         return aperture;
     }
 
-    public Date getCaptureDateTime() {
-        return new Date(1000 * timestamp);
+    public ZonedDateTime getCaptureDateTime() {
+        // TODO: Is the libraw timestamp in UTC?
+        return ZonedDateTime.ofInstant(Instant.ofEpochMilli(timestamp), ZoneOffset.UTC);
     }
 
     public float getFocalLength() {
@@ -455,7 +456,13 @@ public static void main(String[] args) {
 
         LibRaw libRaw = new LibRaw("/Stuff/Pictures/New Raw Support/Canon 450D/IMG_1598.CR2");
 
-        System.out.println("LibRaw (p:" + libRaw.progress_flags + ", w:" + libRaw.process_warnings + ") - make: " + libRaw.make + ", model: " + libRaw.model + ", timestamp: " + new Date(1000 * libRaw.timestamp));
+        System.out.println(
+                "LibRaw (p:" + libRaw.progress_flags
+                + ", w:" + libRaw.process_warnings
+                + ") - make: " + libRaw.make
+                + ", model: " + libRaw.model
+                + ", timestamp: " + libRaw.timestamp + " (" + libRaw.getCaptureDateTime() + ")"
+        );
         System.out.println("Filter pattern: " + libRaw.filter_pattern);
 
         for (int i = 0; i < 4; i++)

lightcrafts/src/main/java/com/lightcrafts/image/metadata/CIFFDirectory.java

@@ -2,9 +2,9 @@
 
 package com.lightcrafts.image.metadata;
 
+import java.time.ZonedDateTime;
 import java.util.HashMap;
 import java.util.Map;
-import java.util.Date;
 import java.util.ResourceBundle;
 
 import com.lightcrafts.image.metadata.values.DateMetaValue;
@@ -130,7 +130,7 @@ public String getCameraModel() {
      * {@inheritDoc}
      */
     @Override
-    public Date getCaptureDateTime() {
+    public ZonedDateTime getCaptureDateTime() {
         final ImageMetaValue value = getValue( CIFF_CAPTURED_TIME );
         return  value instanceof DateMetaValue ?
                 ((DateMetaValue)value).getDateValue() : null;

lightcrafts/src/main/java/com/lightcrafts/image/metadata/CoreDirectory.java

@@ -19,13 +19,15 @@
 import java.awt.*;
 import java.awt.color.ICC_Profile;
 import java.io.File;
+import java.time.ZonedDateTime;
 import java.util.*;
 
 import static com.lightcrafts.image.metadata.CoreTags.*;
 import static com.lightcrafts.image.metadata.ImageMetaType.*;
 import static com.lightcrafts.image.metadata.ImageOrientation.ORIENTATION_LANDSCAPE;
 import static com.lightcrafts.image.metadata.ImageOrientation.ORIENTATION_UNKNOWN;
 import static com.lightcrafts.image.metadata.XMPConstants.*;
+import static java.time.format.DateTimeFormatter.*;
 
 /**
  * A <code>CoreDirectory</code> is-an {@link ImageMetadataDirectory} for
@@ -162,7 +164,7 @@ public String getCaption() {
      * {@inheritDoc}
      */
     @Override
-    public Date getCaptureDateTime() {
+    public ZonedDateTime getCaptureDateTime() {
         final ImageMetaValue value = getValue( CORE_CAPTURE_DATE_TIME );
         return value != null ? ((DateMetaValue)value).getDateValue() : null;
     }
@@ -189,7 +191,7 @@ public String getCopyright() {
      * {@inheritDoc}
      */
     @Override
-    public Date getFileDateTime() {
+    public ZonedDateTime getFileDateTime() {
         final ImageMetaValue value = getValue( CORE_FILE_DATE_TIME );
         return value != null ? ((DateMetaValue)value).getDateValue() : null;
     }
@@ -489,9 +491,7 @@ protected Collection<Element> toXMP( Document xmpDoc, String nsURI,
             );
             XMLUtil.setTextContentOf(
                 createDateElement,
-                TextUtil.dateFormat(
-                    ISO_8601_DATE_FORMAT, captureDateValue.getDateValue()
-                )
+                captureDateValue.getDateValue().format(ISO_LOCAL_DATE_TIME)
             );
             xapRDFDescElement.appendChild( createDateElement );
         }
@@ -509,21 +509,21 @@ protected Collection<Element> toXMP( Document xmpDoc, String nsURI,
 
         ////////// MetadataDate & ModifyDate
 
-        final Date now = new Date();
+        final var now = ZonedDateTime.now();
         final Element metadataDateElement = xmpDoc.createElementNS(
             XMP_XAP_NS, XMP_XAP_PREFIX + ":MetadataDate"
         );
         XMLUtil.setTextContentOf(
             metadataDateElement,
-            TextUtil.dateFormat( ISO_8601_DATE_FORMAT, now )
+                now.format(ISO_OFFSET_DATE_TIME)
         );
         xapRDFDescElement.appendChild( metadataDateElement );
         final Element modifyDateElement = xmpDoc.createElementNS(
             XMP_XAP_NS, XMP_XAP_PREFIX + ":ModifyDate"
         );
         XMLUtil.setTextContentOf(
             modifyDateElement,
-            TextUtil.dateFormat( ISO_8601_DATE_FORMAT, now )
+                now.format(ISO_OFFSET_DATE_TIME)
         );
         xapRDFDescElement.appendChild( modifyDateElement );
 
@@ -675,7 +675,7 @@ private void addCaption( ImageMetadata metadata ) {
      */
     private void addCaptureDateTime( ImageInfo imageInfo ) {
         removeValue( CORE_CAPTURE_DATE_TIME );
-        final Date date = imageInfo.getCurrentMetadata().getCaptureDateTime();
+        final var date = imageInfo.getCurrentMetadata().getCaptureDateTime();
         if ( date != null )
             putValue( CORE_CAPTURE_DATE_TIME, new DateMetaValue( date ) );
     }
@@ -741,8 +741,7 @@ private void addFileInfo( ImageInfo imageInfo ) {
         putValue( CORE_DIR_NAME , new StringMetaValue( parentDir ) );
         putValue( CORE_FILE_NAME, new StringMetaValue( file.getName() ) );
         putValue( CORE_FILE_SIZE, new UnsignedLongMetaValue( file.length() ) );
-        final Date date = new Date( file.lastModified() );
-        putValue( CORE_FILE_DATE_TIME, new DateMetaValue( date ) );
+        putValue( CORE_FILE_DATE_TIME, new DateMetaValue(file.lastModified()) );
 
         removeValue( CORE_ORIGINAL_IMAGE_HEIGHT );
         removeValue( CORE_ORIGINAL_IMAGE_WIDTH );

lightcrafts/src/main/java/com/lightcrafts/image/metadata/EXIFDirectory.java

@@ -9,6 +9,7 @@
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 
+import java.time.ZonedDateTime;
 import java.util.*;
 import java.util.stream.Stream;
 
@@ -106,7 +107,7 @@ public String getCaption() {
      * {@inheritDoc}
      */
     @Override
-    public Date getCaptureDateTime() {
+    public ZonedDateTime getCaptureDateTime() {
         ImageMetaValue value = getValue( EXIF_DATE_TIME_ORIGINAL );
         if ( value == null )
             value = getValue( EXIF_DATE_TIME_DIGITIZED );

lightcrafts/src/main/java/com/lightcrafts/image/metadata/IPTCDirectory.java

@@ -1,8 +1,10 @@
 /* Copyright (C) 2005-2011 Fabio Riccardi */
+/* Copyright (C) 2023-     Masahiro Kitagawa */
 
 package com.lightcrafts.image.metadata;
 
 import java.io.UnsupportedEncodingException;
+import java.time.ZonedDateTime;
 import java.util.*;
 import java.nio.ByteBuffer;
 
@@ -71,7 +73,7 @@ public String getArtist() {
      * {@inheritDoc}
      */
     @Override
-    public Date getCaptureDateTime() {
+    public ZonedDateTime getCaptureDateTime() {
         final ImageMetaValue value = getValue( IPTC_DATE_CREATED );
         return  value instanceof DateMetaValue ?
                 ((DateMetaValue)value).getDateValue() : null;
@@ -636,6 +638,8 @@ private static void encodeTag( ByteBuffer buf, int tagID ) {
      * {@link DateMetaValue} plus the time.
      */
     private ImageMetaValue mergeDateTime( ImageMetaValue date, int timeTagID ) {
+        // TODO: There might be a better way to do this with ZonedDateTime.
+
         final ImageMetaValue timeValue = getValue( timeTagID );
         if ( timeValue == null )
             return date;
@@ -674,12 +678,10 @@ private ImageMetaValue mergeDateTime( ImageMetaValue date, int timeTagID ) {
                     return date;
             }
 
-            final int delta = ((hh+zh) * 60 * 60 + (mm+zm) * 60 + ss) * 1000;
+            final int deltaSeconds = (hh+zh) * 60 * 60 + (mm+zm) * 60 + ss;
 
-            final DateMetaValue newDateValue = (DateMetaValue)date.clone();
-            final Date newDate = newDateValue.getDateValue();
-            newDate.setTime( newDate.getTime() + delta );
-            return newDateValue;
+            final var newDate = ((DateMetaValue)date).getDateValue().plusSeconds(deltaSeconds);
+            return new DateMetaValue(newDate);
         }
         catch ( NumberFormatException e ) {
             return date;

lightcrafts/src/main/java/com/lightcrafts/image/metadata/ImageMetadata.java

@@ -16,6 +16,7 @@
 import org.w3c.dom.Element;
 
 import java.io.*;
+import java.time.ZonedDateTime;
 import java.util.*;
 
 import static com.lightcrafts.image.metadata.CoreTags.*;
@@ -255,11 +256,11 @@ public String getCaption() {
     /**
      * {@inheritDoc}
      */
-    public Date getCaptureDateTime() {
+    public ZonedDateTime getCaptureDateTime() {
         final Collection<ImageMetadataDirectory> dirs =
             findProvidersOf( CaptureDateTimeProvider.class );
         for ( ImageMetadataDirectory dir : dirs ) {
-            final Date date =
+            final var date =
                 ((CaptureDateTimeProvider)dir).getCaptureDateTime();
             if ( date != null )
                 return date;
@@ -364,7 +365,8 @@ public File getFile() {
     /**
      * {@inheritDoc}
      */
-    public Date getFileDateTime() {
+    @Override
+    public ZonedDateTime getFileDateTime() {
         final CoreDirectory dir =
             (CoreDirectory)getDirectoryFor( CoreDirectory.class );
         return dir != null ? dir.getFileDateTime() : null;

lightcrafts/src/main/java/com/lightcrafts/image/metadata/TIFFDirectory.java

@@ -1,4 +1,5 @@
 /* Copyright (C) 2005-2011 Fabio Riccardi */
+/* Copyright (C) 2023-     Masahiro Kitagawa */
 
 package com.lightcrafts.image.metadata;
 
@@ -15,6 +16,7 @@
 
 import java.awt.image.RenderedImage;
 import java.io.IOException;
+import java.time.ZonedDateTime;
 import java.util.*;
 
 import static com.lightcrafts.image.metadata.ImageMetaType.*;
@@ -87,7 +89,7 @@ public String getCaption() {
     /**
      * {@inheritDoc}
      */
-    public Date getCaptureDateTime() {
+    public ZonedDateTime getCaptureDateTime() {
         final ImageMetaValue value = getValue( TIFF_DATE_TIME );
         return  value instanceof DateMetaValue ?
                 ((DateMetaValue)value).getDateValue() : null;

lightcrafts/src/main/java/com/lightcrafts/image/metadata/XMPConstants.java

@@ -1,22 +1,17 @@
 /* Copyright (C) 2005-2011 Fabio Riccardi */
+/* Copyright (C) 2023-     Masahiro Kitagawa */
 
 package com.lightcrafts.image.metadata;
 
 import com.lightcrafts.app.Application;
 
-import java.text.SimpleDateFormat;
-
 /**
  * <code>XMPConstants</code> defines constants for XMP.
  *
  * @author Paul J. Lucas [[email protected]]
  */
 public interface XMPConstants {
 
-    /** This is the date format required by XMP. */
-    SimpleDateFormat ISO_8601_DATE_FORMAT =
-        new SimpleDateFormat( "yyyy-MM-dd'T'HH:mm:ss" );
-
     /** The Dublin Core namespace URI. */
     String XMP_DC_NS = "http://purl.org/dc/elements/1.1/";
 

lightcrafts/src/main/java/com/lightcrafts/image/metadata/makernotes/PentaxDirectory.java

@@ -1,4 +1,5 @@
 /* Copyright (C) 2005-2011 Fabio Riccardi */
+/* Copyright (C) 2023-     Masahiro Kitagawa */
 
 package com.lightcrafts.image.metadata.makernotes;
 
@@ -17,6 +18,7 @@
 
 import java.awt.image.RenderedImage;
 import java.io.IOException;
+import java.time.ZonedDateTime;
 import java.util.*;
 import java.util.regex.Pattern;
 
@@ -52,7 +54,7 @@ public float getAperture() {
      * {@inheritDoc}
      */
     @Override
-    public Date getCaptureDateTime() {
+    public ZonedDateTime getCaptureDateTime() {
         final ImageMetaValue value = getValue( PENTAX_DATE );
         return  value instanceof DateMetaValue ?
                 ((DateMetaValue)value).getDateValue() : null;
@@ -296,7 +298,7 @@ public void putValue( Integer tagID, ImageMetaValue value ) {
                 if (dateValue == null) {
                     return;
                 }
-                final Date date = ((DateMetaValue)dateValue).getDateValue();
+                final var date = ((DateMetaValue)dateValue).getDateValue();
                 final byte[] buf =
                     ((UndefinedMetaValue)value).getUndefinedValue();
                 date.setTime(

lightcrafts/src/main/java/com/lightcrafts/image/metadata/providers/CaptureDateTimeProvider.java

@@ -1,8 +1,9 @@
 /* Copyright (C) 2005-2011 Fabio Riccardi */
+/* Copyright (C) 2023-     Masahiro Kitagawa */
 
 package com.lightcrafts.image.metadata.providers;
 
-import java.util.Date;
+import java.time.ZonedDateTime;
 
 /**
  * A <code>CaptureDateTimeProvider</code> provides the capture date/time of an
@@ -18,7 +19,7 @@ public interface CaptureDateTimeProvider extends ImageMetadataProvider {
      * @return Returns the date/time or <code>null</code> if no date/time is
      * available.
      */
-    Date getCaptureDateTime();
+    ZonedDateTime getCaptureDateTime();
 
 }
 /* vim:set et sw=4 ts=4: */

lightcrafts/src/main/java/com/lightcrafts/image/metadata/providers/FileDateTimeProvider.java

@@ -1,8 +1,9 @@
 /* Copyright (C) 2005-2011 Fabio Riccardi */
+/* Copyright (C) 2023-     Masahiro Kitagawa */
 
 package com.lightcrafts.image.metadata.providers;
 
-import java.util.Date;
+import java.time.ZonedDateTime;
 
 /**
  * A <code>FileDateTimeProvider</code> provides the last modified date/time of
@@ -18,7 +19,7 @@ public interface FileDateTimeProvider extends ImageMetadataProvider {
      * @return Returns the date/time or <code>null</code> if no date/time is
      * available.
      */
-    Date getFileDateTime();
+    ZonedDateTime getFileDateTime();
 
 }
 /* vim:set et sw=4 ts=4: */