Someone's IDE chose the wrong Date.

Part 2 of the mystery of the java.sql.Date in preloaded-classes solved.

Change-Id: If819d89d1cb7ac015adee7a39a6fda963c6a1022

diff --git a/src/com/android/gallery3d/app/TrimVideo.java b/src/com/android/gallery3d/app/TrimVideo.java
index 38b403b..4325a41 100644 (file)
--- a/src/com/android/gallery3d/app/TrimVideo.java
+++ b/src/com/android/gallery3d/app/TrimVideo.java
@@ -44,8 +44,8 @@ import com.android.gallery3d.util.BucketNames;
 
 import java.io.File;
 import java.io.IOException;
-import java.sql.Date;
 import java.text.SimpleDateFormat;
+import java.util.Date;
 
 public class TrimVideo extends Activity implements
         MediaPlayer.OnErrorListener,
@@ -282,8 +282,7 @@ public class TrimVideo extends Activity implements
         } else {
             saveFolderName = mSaveDirectory.getName();
         }
-        mSaveFileName = new SimpleDateFormat(TIME_STAMP_NAME).format(
-                new Date(System.currentTimeMillis()));
+        mSaveFileName = new SimpleDateFormat(TIME_STAMP_NAME).format(new Date());
 
         mDstFile = new File(mSaveDirectory, mSaveFileName + ".mp4");
         mSrcFile = new File(mSrcVideoPath);

diff --git a/src/com/android/gallery3d/filtershow/tools/SaveCopyTask.java b/src/com/android/gallery3d/filtershow/tools/SaveCopyTask.java
index 9c55623..7200db3 100644 (file)
--- a/src/com/android/gallery3d/filtershow/tools/SaveCopyTask.java
+++ b/src/com/android/gallery3d/filtershow/tools/SaveCopyTask.java
@@ -42,8 +42,8 @@ import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
-import java.sql.Date;
 import java.text.SimpleDateFormat;
+import java.util.Date;
 
 /**
  * Asynchronous task for saving edited photo as a new copy.
@@ -115,8 +115,7 @@ public class SaveCopyTask extends AsyncTask<ImagePreset, Void, Uri> {
             this.destinationFile = destination;
         }
 
-        saveFileName = new SimpleDateFormat(TIME_STAMP_NAME).format(new Date(
-                System.currentTimeMillis()));
+        saveFileName = new SimpleDateFormat(TIME_STAMP_NAME).format(new Date());
     }
 
     public static File getFinalSaveDirectory(Context context, Uri sourceUri) {
@@ -132,8 +131,7 @@ public class SaveCopyTask extends AsyncTask<ImagePreset, Void, Uri> {
 
     public static File getNewFile(Context context, Uri sourceUri) {
         File saveDirectory = getFinalSaveDirectory(context, sourceUri);
-        String filename = new SimpleDateFormat(TIME_STAMP_NAME).format(new Date(
-                System.currentTimeMillis()));
+        String filename = new SimpleDateFormat(TIME_STAMP_NAME).format(new Date());
         return new File(saveDirectory, filename + ".JPG");
     }