Datepicker fix (#2405)

* use localdatetime instead of zonedDateTime
* refactoring and fix for #2403
* use standard DateTimeFormatter instead of custom EasyDateFormat class

src/main/java/net/sf/jabref/gui/date/DatePickerButton.java

@@ -2,7 +2,6 @@
 
 import java.awt.BorderLayout;
 import java.time.LocalDate;
-import java.time.ZonedDateTime;
 import java.time.format.DateTimeFormatter;
 
 import javax.swing.JComponent;
@@ -11,7 +10,6 @@
 import net.sf.jabref.Globals;
 import net.sf.jabref.gui.IconTheme;
 import net.sf.jabref.gui.fieldeditors.FieldEditor;
-import net.sf.jabref.logic.util.date.EasyDateFormat;
 import net.sf.jabref.preferences.JabRefPreferences;
 
 import com.github.lgooddatepicker.components.DatePicker;
@@ -27,11 +25,16 @@ public class DatePickerButton implements DateChangeListener {
     private final DatePicker datePicker;
     private final JPanel panel = new JPanel();
     private final FieldEditor editor;
-    private final boolean isoFormat;
+    private final DateTimeFormatter dateTimeFormatter;
 
 
-    public DatePickerButton(FieldEditor pEditor, Boolean isoFormat) {
-        this.isoFormat = isoFormat;
+    public DatePickerButton(FieldEditor pEditor, boolean useIsoFormat) {
+        if (useIsoFormat) {
+            dateTimeFormatter = DateTimeFormatter.ISO_DATE;
+        } else {
+            dateTimeFormatter = DateTimeFormatter.ofPattern(Globals.prefs.get(JabRefPreferences.TIME_STAMP_FORMAT));
+        }
+
         // Create a date picker with hidden text field (showing button only).
         DatePickerSettings dateSettings = new DatePickerSettings();
         dateSettings.setVisibleDateTextField(false);
@@ -51,13 +54,9 @@ public DatePickerButton(FieldEditor pEditor, Boolean isoFormat) {
     public void dateChanged(DateChangeEvent dateChangeEvent) {
         LocalDate date = datePicker.getDate();
         if (date != null) {
-            if (isoFormat) {
-                editor.setText(date.format(DateTimeFormatter.ISO_DATE));
-            } else {
-                EasyDateFormat.fromTimeStampFormat(Globals.prefs.get(JabRefPreferences.TIME_STAMP_FORMAT)).getDateAt(ZonedDateTime.from(date));
-            }
+            editor.setText(dateTimeFormatter.format(date.atStartOfDay()));
         } else {
-            // in this case the user selected "none" in the date picker, so we just clear the field
+            // in this case the user selected "clear" in the date picker, so we just clear the field
             editor.setText("");
         }
         // Set focus to editor component after changing its text:

src/main/java/net/sf/jabref/gui/entryeditor/EntryEditor.java

@@ -17,6 +17,8 @@
 import java.io.IOException;
 import java.io.StringReader;
 import java.io.StringWriter;
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
 import java.util.ArrayList;
 import java.util.HashSet;
 import java.util.List;
@@ -89,7 +91,6 @@
 import net.sf.jabref.logic.l10n.Localization;
 import net.sf.jabref.logic.search.SearchQueryHighlightListener;
 import net.sf.jabref.logic.util.UpdateField;
-import net.sf.jabref.logic.util.date.EasyDateFormat;
 import net.sf.jabref.model.EntryTypes;
 import net.sf.jabref.model.FieldChange;
 import net.sf.jabref.model.database.BibDatabase;
@@ -1459,7 +1460,7 @@ private boolean updateTimeStampIsSet() {
     private Optional<FieldChange> doUpdateTimeStamp() {
         String timeStampField = Globals.prefs.get(JabRefPreferences.TIME_STAMP_FIELD);
         String timeStampFormat = Globals.prefs.get(JabRefPreferences.TIME_STAMP_FORMAT);
-        String timestamp = EasyDateFormat.fromTimeStampFormat(timeStampFormat).getCurrentDate();
+        String timestamp = DateTimeFormatter.ofPattern(timeStampFormat).format(LocalDateTime.now());
         return UpdateField.updateField(entry, timeStampField, timestamp);
     }
 

src/main/java/net/sf/jabref/gui/entryeditor/FieldExtraComponents.java

@@ -5,6 +5,9 @@
 import java.awt.event.MouseAdapter;
 import java.awt.event.MouseEvent;
 import java.io.IOException;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
 import java.util.Optional;
 import java.util.Set;
 
@@ -32,7 +35,6 @@
 import net.sf.jabref.logic.net.URLUtil;
 import net.sf.jabref.logic.util.DOI;
 import net.sf.jabref.logic.util.ISBN;
-import net.sf.jabref.logic.util.date.EasyDateFormat;
 import net.sf.jabref.model.database.BibDatabaseMode;
 import net.sf.jabref.model.entry.BibEntry;
 import net.sf.jabref.model.entry.FieldName;
@@ -415,26 +417,33 @@ public static Optional<JComponent> getSelectorExtraComponent(JabRefFrame frame,
      * Set up field such that double click inserts the current date
      * If isDataPicker is True, a button with a data picker is returned
      *
-     * @param editor
-     * @param isDatePicker
+     * @param editor reference to the FieldEditor to display the date value
+     * @param useDatePicker shows a DatePickerButton if true
+     * @param useIsoFormat if true ISO format is always used
      * @return
      */
-    public static Optional<JComponent> getDateTimeExtraComponent(FieldEditor editor, Boolean isDatePicker,
-            Boolean isoFormat) {
+    public static Optional<JComponent> getDateTimeExtraComponent(FieldEditor editor, boolean useDatePicker,
+            boolean useIsoFormat) {
         ((JTextArea) editor).addMouseListener(new MouseAdapter() {
 
             @Override
             public void mouseClicked(MouseEvent e) {
                 if (e.getClickCount() == 2) {// double click
-                    String date = EasyDateFormat.isoDateFormat().getCurrentDate();
+                    String date = "";
+                    if(useIsoFormat) {
+                        date = DateTimeFormatter.ISO_DATE.format(LocalDate.now());
+                    } else {
+                        date = DateTimeFormatter.ofPattern(Globals.prefs.get(JabRefPreferences.TIME_STAMP_FORMAT)).format(
+                                LocalDateTime.now());
+                    }
                     editor.setText(date);
                 }
             }
         });
 
         // insert a datepicker, if the extras field contains this command
-        if (isDatePicker) {
-            DatePickerButton datePicker = new DatePickerButton(editor, isoFormat);
+        if (useDatePicker) {
+            DatePickerButton datePicker = new DatePickerButton(editor, useIsoFormat);
             return Optional.of(datePicker.getDatePicker());
         } else {
             return Optional.empty();

src/main/java/net/sf/jabref/logic/util/UpdateField.java

@@ -1,9 +1,10 @@
 package net.sf.jabref.logic.util;
 
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
 import java.util.Collection;
 import java.util.Optional;
 
-import net.sf.jabref.logic.util.date.EasyDateFormat;
 import net.sf.jabref.model.FieldChange;
 import net.sf.jabref.model.entry.BibEntry;
 import net.sf.jabref.model.entry.FieldName;
@@ -86,7 +87,7 @@ public static Optional<FieldChange> updateField(BibEntry be, String field, Strin
     public static void setAutomaticFields(BibEntry entry, boolean overwriteOwner, boolean overwriteTimestamp,
             UpdateFieldPreferences prefs) {
         String defaultOwner = prefs.getDefaultOwner();
-        String timestamp = EasyDateFormat.fromTimeStampFormat(prefs.getTimeStampFormat()).getCurrentDate();
+        String timestamp = DateTimeFormatter.ofPattern(prefs.getTimeStampFormat()).format(LocalDateTime.now());
         String timeStampField = prefs.getTimeStampField();
         boolean setOwner = prefs.isUseOwner() && (overwriteOwner || (!entry.hasField(FieldName.OWNER)));
         boolean setTimeStamp = prefs.isUseTimeStamp() && (overwriteTimestamp || (!entry.hasField(timeStampField)));
@@ -131,7 +132,7 @@ public static void setAutomaticFields(Collection<BibEntry> bibs, boolean overwri
 
         String timeStampField = prefs.getTimeStampField();
         String defaultOwner = prefs.getDefaultOwner();
-        String timestamp = EasyDateFormat.fromTimeStampFormat(prefs.getTimeStampFormat()).getCurrentDate();
+        String timestamp = DateTimeFormatter.ofPattern(prefs.getTimeStampFormat()).format(LocalDateTime.now());
 
         // Iterate through all entries
         for (BibEntry curEntry : bibs) {