Refactor: Extract NewEntryPreferences from JabRefPreferences

Author: rahulkarru

jabgui/src/main/java/org/jabref/gui/newentry/NewEntryPreferences.java

@@ -8,6 +8,11 @@
 import javafx.beans.property.StringProperty;
 
 import org.jabref.model.entry.types.EntryType;
+/*these were added*/
+import org.jabref.model.entry.types.StandardEntryType;
+import org.jabref.logic.importer.fetcher.DoiFetcher;
+import org.jabref.logic.importer.plaincitation.PlainCitationParserChoice;
+/*-----*/
 
 public class NewEntryPreferences {
     private final ObjectProperty<NewEntryDialogTab> latestApproach;
@@ -18,7 +23,25 @@ public class NewEntryPreferences {
     private final BooleanProperty idLookupGuessing;
     private final StringProperty latestIdFetcherName;
     private final StringProperty latestInterpretParserName;
+private NewEntryPreferences(){
+    this(
+            NewEntryDialogTab.CHOOSE_ENTRY_TYPE,
 
+            true,
+
+            false,
+
+            true,
+
+            StandardEntryType.Article,
+
+            true,
+
+            DoiFetcher.NAME,
+
+            PlainCitationParserChoice.RULE_BASED_GENERAL.getLocalizedName()
+    );
+}
     public NewEntryPreferences(NewEntryDialogTab approach,
                                boolean expandRecommended,
                                boolean expandOther,
@@ -36,7 +59,19 @@ public NewEntryPreferences(NewEntryDialogTab approach,
         this.latestIdFetcherName = new SimpleStringProperty(idFetcherName);
         this.latestInterpretParserName = new SimpleStringProperty(interpretParserName);
     }
-
+    public static NewEntryPreferences getDefault(){
+        return new NewEntryPreferences();
+    }
+    public void setAll(NewEntryPreferences other) {
+        this.latestApproach.set(other.getLatestApproach());
+        this.typesRecommendedExpanded.set(other.getTypesRecommendedExpanded());
+        this.typesOtherExpanded.set(other.getTypesOtherExpanded());
+        this.typesCustomExpanded.set(other.getTypesCustomExpanded());
+        this.latestImmediateType.set(other.getLatestImmediateType());
+        this.idLookupGuessing.set(other.getIdLookupGuessing());
+        this.latestIdFetcherName.set(other.getLatestIdFetcher());
+        this.latestInterpretParserName.set(other.getLatestInterpretParser());
+    }
     public NewEntryDialogTab getLatestApproach() {
         return latestApproach.get();
     }
@@ -53,7 +88,7 @@ public boolean getTypesRecommendedExpanded() {
         return typesRecommendedExpanded.get();
     }
 
-    public void getTypesRecommendedExpanded(boolean expanded) {
+    public void setTypesRecommendedExpanded(boolean expanded) {
         typesRecommendedExpanded.set(expanded);
     }
 

jabgui/src/main/java/org/jabref/gui/preferences/JabRefGuiPreferences.java

@@ -74,7 +74,7 @@
 import org.jabref.model.groups.GroupHierarchyType;
 import org.jabref.model.metadata.SaveOrder;
 import org.jabref.model.metadata.SelfContainedSaveOrder;
-
+import org.jabref.model.entry.types.EntryTypeFactory;
 import com.airhacks.afterburner.injection.Injector;
 import com.tobiasdiez.easybind.EasyBind;
 import org.slf4j.Logger;
@@ -368,16 +368,7 @@ private JabRefGuiPreferences() {
         defaults.put(DONATION_LAST_SHOWN_EPOCH_DAY, -1);
         // endregion
 
-        // region NewEntryUnifierPreferences
-        defaults.put(CREATE_ENTRY_APPROACH, List.of(NewEntryDialogTab.values()).indexOf(NewEntryDialogTab.CHOOSE_ENTRY_TYPE));
-        defaults.put(CREATE_ENTRY_EXPAND_RECOMMENDED, true);
-        defaults.put(CREATE_ENTRY_EXPAND_OTHER, false);
-        defaults.put(CREATE_ENTRY_EXPAND_CUSTOM, true);
-        defaults.put(CREATE_ENTRY_IMMEDIATE_TYPE, StandardEntryType.Article.getDisplayName());
-        defaults.put(CREATE_ENTRY_ID_LOOKUP_GUESSING, true);
-        defaults.put(CREATE_ENTRY_ID_FETCHER_NAME, DoiFetcher.NAME);
-        defaults.put(CREATE_ENTRY_INTERPRET_PARSER_NAME, PlainCitationParserChoice.RULE_BASED_GENERAL.getLocalizedName());
-        // endregion
+
     }
 
     /**
@@ -414,6 +405,8 @@ public void clear() throws BackingStoreException {
 
         getWorkspacePreferences().setAll(WorkspacePreferences.getDefault());
         getGuiPreferences().setAll(CoreGuiPreferences.getDefault());
+        getNewEntryPreferences().setAll(NewEntryPreferences.getDefault());
+
     }
 
     @Override
@@ -423,6 +416,8 @@ public void importPreferences(Path file) throws JabRefException {
         // in case of incomplete or corrupt xml fall back to current preferences
         getWorkspacePreferences().setAll(getWorkspacePreferencesFromBackingStore(getWorkspacePreferences()));
         getGuiPreferences().setAll(getCoreGuiPreferencesFromBackingStore(getGuiPreferences()));
+        getNewEntryPreferences().setAll(getNewEntryPreferencesFromLowLevelApi(getNewEntryPreferences()));
+
     }
 
     // region EntryEditorPreferences
@@ -686,6 +681,30 @@ private WorkspacePreferences getWorkspacePreferencesFromBackingStore(WorkspacePr
                 getStringList(SELECTED_SLR_CATALOGS));
     }
 
+    private NewEntryPreferences getNewEntryPreferencesFromLowLevelApi(NewEntryPreferences defaults) {
+        int approachIndex = getInt("createEntryApproach", defaults.getLatestApproach().ordinal());
+        NewEntryDialogTab approach;
+        if (approachIndex >= 0 && approachIndex < NewEntryDialogTab.values().length) {
+            approach = NewEntryDialogTab.values()[approachIndex];
+        } else {
+            approach = defaults.getLatestApproach();
+        }
+
+        String typeName = get("createEntryImmediateType", defaults.getLatestImmediateType().getDisplayName());
+        EntryType immediateType = EntryTypeFactory.parse(typeName);
+
+        return new NewEntryPreferences(
+                approach,
+                getBoolean("createEntryExpandRecommended", defaults.getTypesRecommendedExpanded()),
+                getBoolean("createEntryExpandOther", defaults.getTypesOtherExpanded()),
+                getBoolean("createEntryExpandCustom", defaults.getTypesCustomExpanded()),
+                immediateType,
+                getBoolean("createEntryIdLookupGuessing", defaults.getIdLookupGuessing()),
+                get("createEntryIdFetcherName", defaults.getLatestIdFetcher()),
+                get("createEntryInterpretParserName", defaults.getLatestInterpretParser())
+        );
+    }
+
     @Override
     public UnlinkedFilesDialogPreferences getUnlinkedFilesDialogPreferences() {
         if (unlinkedFilesDialogPreferences != null) {
@@ -1190,15 +1209,8 @@ public NewEntryPreferences getNewEntryPreferences() {
             }
         }
 
-        newEntryPreferences = new NewEntryPreferences(
-                approach,
-                getBoolean(CREATE_ENTRY_EXPAND_RECOMMENDED),
-                getBoolean(CREATE_ENTRY_EXPAND_OTHER),
-                getBoolean(CREATE_ENTRY_EXPAND_CUSTOM),
-                immediateType,
-                getBoolean(CREATE_ENTRY_ID_LOOKUP_GUESSING),
-                get(CREATE_ENTRY_ID_FETCHER_NAME),
-                get(CREATE_ENTRY_INTERPRET_PARSER_NAME));
+        newEntryPreferences = getNewEntryPreferencesFromLowLevelApi(NewEntryPreferences.getDefault());
+
 
         EasyBind.listen(newEntryPreferences.latestApproachProperty(), (_, _, newValue) -> putInt(CREATE_ENTRY_APPROACH, List.of(NewEntryDialogTab.values()).indexOf(newValue)));
         EasyBind.listen(newEntryPreferences.typesRecommendedExpandedProperty(), (_, _, newValue) -> putBoolean(CREATE_ENTRY_EXPAND_RECOMMENDED, newValue));