Fix for issue 8747: date field change causes an uncaught exception

CHANGELOG.md

@@ -74,6 +74,7 @@ Note that this project **does not** adhere to [Semantic Versioning](http://semve
 - We fixed an issue where hitting enter on the search field within the preferences dialog closed the dialog. [koppor#630](https://github.com/koppor/jabref/issues/630)
 - We fixed a typo within a connection error message. [koppor#625](https://github.com/koppor/jabref/issues/625)
 - We fixed an issue where the 'close dialog' key binding was not closing the Preferences dialog. [#8888](https://github.com/jabref/jabref/issues/8888)
+- We fixed an issue where editing entry's "date" field in library mode "biblatex" causes an uncaught exception. [#8747][https://github.com/JabRef/jabref/issues/8747]
 
 ### Removed
 

src/main/java/org/jabref/gui/fieldeditors/DateEditor.java

@@ -11,6 +11,7 @@
 import org.jabref.logic.integrity.FieldCheckers;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.field.Field;
+import org.jabref.preferences.PreferencesService;
 
 import com.airhacks.afterburner.views.ViewLoader;
 
@@ -19,7 +20,7 @@ public class DateEditor extends HBox implements FieldEditorFX {
     @FXML private DateEditorViewModel viewModel;
     @FXML private TemporalAccessorPicker datePicker;
 
-    public DateEditor(Field field, DateTimeFormatter dateFormatter, SuggestionProvider<?> suggestionProvider, FieldCheckers fieldCheckers) {
+    public DateEditor(Field field, DateTimeFormatter dateFormatter, SuggestionProvider<?> suggestionProvider, FieldCheckers fieldCheckers, PreferencesService preferences) {
         this.viewModel = new DateEditorViewModel(field, suggestionProvider, dateFormatter, fieldCheckers);
 
         ViewLoader.view(this)
@@ -28,6 +29,8 @@ public DateEditor(Field field, DateTimeFormatter dateFormatter, SuggestionProvid
 
         datePicker.setStringConverter(viewModel.getDateToStringConverter());
         datePicker.getEditor().textProperty().bindBidirectional(viewModel.textProperty());
+
+        new EditorValidator(preferences).configureValidation(viewModel.getFieldValidator().getValidationStatus(), datePicker.getEditor());
     }
 
     public DateEditorViewModel getViewModel() {

src/main/java/org/jabref/gui/fieldeditors/DateEditorViewModel.java

@@ -36,7 +36,7 @@ public TemporalAccessor fromString(String string) {
                 if (StringUtil.isNotBlank(string)) {
                     try {
                         return dateFormatter.parse(string);
-                    } catch (DateTimeParseException exception) {
+                    } catch (Exception exception) {
                         // We accept all kinds of dates (not just in the format specified)
                         return Date.parse(string).map(Date::toTemporalAccessor).orElse(null);
                     }

src/main/java/org/jabref/gui/fieldeditors/FieldEditors.java

@@ -55,9 +55,9 @@ public static FieldEditorFX getForField(final Field field,
         boolean isMultiLine = FieldFactory.isMultiLineField(field, preferences.getFieldContentParserPreferences().getNonWrappableFields());
 
         if (preferences.getTimestampPreferences().getTimestampField().equals(field)) {
-            return new DateEditor(field, DateTimeFormatter.ofPattern(preferences.getTimestampPreferences().getTimestampFormat()), suggestionProvider, fieldCheckers);
+            return new DateEditor(field, DateTimeFormatter.ofPattern(preferences.getTimestampPreferences().getTimestampFormat()), suggestionProvider, fieldCheckers, preferences);
         } else if (fieldProperties.contains(FieldProperty.DATE)) {
-            return new DateEditor(field, DateTimeFormatter.ofPattern("[uuuu][-MM][-dd]"), suggestionProvider, fieldCheckers);
+            return new DateEditor(field, DateTimeFormatter.ofPattern("[uuuu][-MM][-dd]"), suggestionProvider, fieldCheckers, preferences);
         } else if (fieldProperties.contains(FieldProperty.EXTERNAL)) {
             return new UrlEditor(field, dialogService, suggestionProvider, fieldCheckers, preferences);
         } else if (fieldProperties.contains(FieldProperty.JOURNAL_NAME)) {

src/main/java/org/jabref/gui/util/component/TemporalAccessorPicker.java

@@ -7,6 +7,7 @@
 import java.time.Year;
 import java.time.YearMonth;
 import java.time.format.DateTimeFormatter;
+import java.time.format.DateTimeParseException;
 import java.time.temporal.TemporalAccessor;
 import java.time.temporal.TemporalQueries;
 import java.util.Objects;
@@ -21,6 +22,8 @@
 import org.jabref.gui.fieldeditors.TextInputControlBehavior;
 import org.jabref.gui.fieldeditors.contextmenu.EditorContextAction;
 import org.jabref.gui.util.BindingsHelper;
+import org.jabref.model.entry.Date;
+import org.jabref.model.strings.StringUtil;
 
 /**
  * A date picker with configurable datetime format where both date and time can be changed via the text field and the
@@ -75,6 +78,11 @@ private static LocalDate getDate(TemporalAccessor temporalAccessor) {
     }
 
     private static LocalDate getLocalDate(TemporalAccessor dateTime) {
+        // Return null when dateTime is null pointer
+        if (dateTime == null) {
+            return null;
+        }
+
         // Try to get as much information from the temporal accessor
         LocalDate date = dateTime.query(TemporalQueries.localDate());
         if (date != null) {
@@ -101,7 +109,16 @@ public String toString(TemporalAccessor value) {
 
             @Override
             public TemporalAccessor fromString(String value) {
-                return LocalDateTime.parse(value, defaultFormatter);
+                if (StringUtil.isNotBlank(value)) {
+                    try {
+                        return defaultFormatter.parse(value);
+                    } catch (
+                            DateTimeParseException exception) {
+                        return Date.parse(value).map(Date::toTemporalAccessor).orElse(null);
+                    }
+                } else {
+                    return null;
+                }
             }
         };
         return Objects.requireNonNullElseGet(stringConverterProperty().get(), () -> newConverter);
@@ -127,7 +144,9 @@ private class InternalConverter extends StringConverter<LocalDate> {
         @Override
         public String toString(LocalDate object) {
             TemporalAccessor value = getTemporalAccessorValue();
-            return (value != null) ? getStringConverter().toString(value) : "";
+
+            // Keeps the original text when it is an invalid date
+            return (value != null) ? getStringConverter().toString(value) : getEditor().getText();
         }
 
         @Override
@@ -139,6 +158,7 @@ public LocalDate fromString(String value) {
 
             TemporalAccessor dateTime = getStringConverter().fromString(value);
             temporalAccessorValue.set(dateTime);
+
             return getLocalDate(dateTime);
         }
     }