Readd all changed files

JabRef · Jan 19, 2021 · be9aca4 · be9aca4
1 parent 26dfa46
commit be9aca4
Show file tree

Hide file tree

Showing 7 changed files with 33 additions and 271 deletions.
diff --git a/src/main/java/org/jabref/gui/edit/ManageKeywordsViewModel.java b/src/main/java/org/jabref/gui/edit/ManageKeywordsViewModel.java
@@ -11,7 +11,6 @@
 import org.jabref.gui.undo.NamedCompound;
 import org.jabref.gui.undo.UndoableFieldChange;
 import org.jabref.logic.l10n.Localization;
-import org.jabref.logic.specialfields.SpecialFieldsUtils;
 import org.jabref.model.FieldChange;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.Keyword;
@@ -105,10 +104,6 @@ public void saveChanges() {
             return;
         }
 
-        if (preferences.getSpecialFieldsPreferences().isKeywordSyncEnabled() && !keywordsToAdd.isEmpty()) {
-            SpecialFieldsUtils.synchronizeSpecialFields(keywordsToAdd, keywordsToRemove);
-        }
-
         NamedCompound ce = updateKeywords(entries, keywordsToAdd, keywordsToRemove);
         // TODO: bp.getUndoManager().addEdit(ce);
     }
@@ -126,10 +121,6 @@ private NamedCompound updateKeywords(List<BibEntry> entries, KeywordList keyword
             // put keywords back
             Optional<FieldChange> change = entry.putKeywords(keywords, preferences.getKeywordDelimiter());
             change.ifPresent(fieldChange -> ce.addEdit(new UndoableFieldChange(fieldChange)));
-
-            if (preferences.getSpecialFieldsPreferences().isKeywordSyncEnabled()) {
-                SpecialFieldsUtils.syncSpecialFieldsFromKeywords(entry, preferences.getKeywordDelimiter());
-            }
         }
         ce.end();
         return ce;

diff --git a/src/main/java/org/jabref/gui/specialfields/SpecialFieldAction.java b/src/main/java/org/jabref/gui/specialfields/SpecialFieldAction.java
@@ -2,6 +2,7 @@
 
 import java.util.List;
 import java.util.Objects;
+import java.util.Optional;
 
 import javax.swing.undo.UndoManager;
 
@@ -13,7 +14,7 @@
 import org.jabref.gui.undo.NamedCompound;
 import org.jabref.gui.undo.UndoableFieldChange;
 import org.jabref.logic.l10n.Localization;
-import org.jabref.logic.specialfields.SpecialFieldsUtils;
+import org.jabref.logic.util.UpdateField;
 import org.jabref.model.FieldChange;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.field.SpecialField;
@@ -70,17 +71,9 @@ public void execute() {
             NamedCompound ce = new NamedCompound(undoText);
             for (BibEntry bibEntry : bes) {
                 // if (value==null) and then call nullField has been omitted as updatefield also handles value==null
-                List<FieldChange> changes = SpecialFieldsUtils.updateField(
-                        specialField,
-                        value,
-                        bibEntry,
-                        nullFieldIfValueIsTheSame,
-                        preferencesService.getSpecialFieldsPreferences().isKeywordSyncEnabled(),
-                        preferencesService.getKeywordDelimiter());
+                Optional<FieldChange> change = UpdateField.updateField(bibEntry, specialField, value, nullFieldIfValueIsTheSame);
 
-                for (FieldChange change : changes) {
-                    ce.addEdit(new UndoableFieldChange(change));
-                }
+                change.ifPresent(fieldChange -> ce.addEdit(new UndoableFieldChange(fieldChange)));
             }
             ce.end();
             if (ce.hasEdits()) {

diff --git a/src/main/java/org/jabref/gui/specialfields/SpecialFieldViewModel.java b/src/main/java/org/jabref/gui/specialfields/SpecialFieldViewModel.java
@@ -2,6 +2,7 @@
 
 import java.util.List;
 import java.util.Objects;
+import java.util.Optional;
 import java.util.stream.Collectors;
 
 import javax.swing.undo.UndoManager;
@@ -13,7 +14,7 @@
 import org.jabref.gui.actions.StandardActions;
 import org.jabref.gui.icon.JabRefIcon;
 import org.jabref.gui.undo.UndoableFieldChange;
-import org.jabref.logic.specialfields.SpecialFieldsUtils;
+import org.jabref.logic.util.UpdateField;
 import org.jabref.model.FieldChange;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.field.SpecialField;
@@ -83,17 +84,9 @@ public List<SpecialFieldValueViewModel> getValues() {
     }
 
     public void setSpecialFieldValue(BibEntry bibEntry, SpecialFieldValue value) {
-        List<FieldChange> changes = SpecialFieldsUtils.updateField(
-                getField(),
-                value.getFieldValue().orElse(null),
-                bibEntry,
-                getField().isSingleValueField(),
-                preferencesService.getSpecialFieldsPreferences().isKeywordSyncEnabled(),
-                preferencesService.getKeywordDelimiter());
-
-        for (FieldChange change : changes) {
-            undoManager.addEdit(new UndoableFieldChange(change));
-        }
+        Optional<FieldChange> change = UpdateField.updateField(bibEntry, getField(), value.getFieldValue().orElse(null), getField().isSingleValueField());
+
+        change.ifPresent(fieldChange -> undoManager.addEdit(new UndoableFieldChange(fieldChange)));
     }
 
     public void toggle(BibEntry entry) {

diff --git a/src/main/java/org/jabref/logic/importer/OpenDatabase.java b/src/main/java/org/jabref/logic/importer/OpenDatabase.java
@@ -9,13 +9,11 @@
 import org.jabref.logic.importer.fileformat.BibtexImporter;
 import org.jabref.logic.l10n.Localization;
 import org.jabref.logic.preferences.TimestampPreferences;
-import org.jabref.logic.specialfields.SpecialFieldsUtils;
 import org.jabref.migrations.ConvertLegacyExplicitGroups;
 import org.jabref.migrations.ConvertMarkingToGroups;
 import org.jabref.migrations.PostOpenMigration;
 import org.jabref.migrations.SpecialFieldsToSeparateFields;
 import org.jabref.migrations.TimeStampToDateAddAndModify;
-import org.jabref.model.entry.BibEntry;
 import org.jabref.model.util.FileUpdateMonitor;
 
 import org.slf4j.Logger;
@@ -66,13 +64,6 @@ public static ParserResult loadDatabase(Path fileToOpen, ImportFormatPreferences
         ParserResult result = new BibtexImporter(importFormatPreferences, fileMonitor).importDatabase(fileToOpen,
                 importFormatPreferences.getEncoding());
 
-        if (importFormatPreferences.isKeywordSyncEnabled()) {
-            for (BibEntry entry : result.getDatabase().getEntries()) {
-                SpecialFieldsUtils.syncSpecialFieldsFromKeywords(entry, importFormatPreferences.getKeywordSeparator());
-            }
-            LOGGER.debug("Synchronized special fields based on keywords");
-        }
-
         performLoadDatabaseMigrations(result, timestampPreferences, importFormatPreferences.getKeywordSeparator());
 
         return result;

diff --git a/src/main/java/org/jabref/logic/specialfields/SpecialFieldsUtils.java b/src/main/java/org/jabref/logic/specialfields/SpecialFieldsUtils.java
diff --git a/src/test/java/org/jabref/logic/specialfields/SpecialFieldsUtilsTest.java b/src/test/java/org/jabref/logic/specialfields/SpecialFieldsUtilsTest.java