Refactor EntryEditorPreferences #6245

calixtus · 2020-04-05T16:32:09Z

This PR is a follow up to #6171
It aims to extract all the calls to JabRefPreferences::get or ::put in relation to EntryEditorPreferences and to use EntryEditorPreferences instead.

Change in CHANGELOG.md described (if applicable)
Tests created for changes (if applicable)
Manually tested changed features in running JabRef (always required)
Screenshots added in PR description (for bigger UI changes)
Checked documentation: Is the information available and up to date? If not: Issue created at https://github.com/JabRef/user-documentation/issues.

… extracted store logic out of dialog CustomizeGeneralFieldsDialogViewModel.

…torprefs # Conflicts: # src/main/java/org/jabref/preferences/JabRefPreferences.java # src/main/java/org/jabref/preferences/PreferencesService.java

src/main/java/org/jabref/gui/entryeditor/EntryEditorPreferences.java

…abViewModel

calixtus · 2020-04-11T10:11:29Z

I think I'll stop here, as this PR is already large enough. There is theoretically plenty left to do with the EntryEditorPreferences. I'm thinking of merging the CustomizeGenerealFields dialog into the preferences, splitting some preferences into subtabs...

However, lets talk about this one.

calixtus · 2020-04-11T10:15:45Z

This PR does only extract the calls to JabRefPreferences::get and ::put out of the PreferencesDialog in relation to EntryEditorPreferences and AutoCompletePreferences. But it prepares the extraction of those calls everywhere else.

…torprefs

…torprefs # Conflicts: # src/main/java/org/jabref/gui/customizefields/CustomizeGeneralFieldsDialogViewModel.java # src/main/java/org/jabref/gui/preferences/EntryEditorTabViewModel.java # src/main/java/org/jabref/preferences/JabRefPreferences.java

tobiasdiez

Mostly looks good to me. Good job! Just some minor comments.

src/main/java/org/jabref/gui/autocompleter/AutoCompletePreferences.java

src/main/java/org/jabref/gui/bibtexkeypattern/GenerateBibtexKeySingleAction.java

src/main/java/org/jabref/gui/customizefields/CustomizeGeneralFieldsDialogViewModel.java

tobiasdiez · 2020-04-17T16:22:55Z

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


 import de.saxsys.mvvmfx.utils.commands.Command;

 public class BibtexKeyEditorViewModel extends AbstractEditorViewModel {
-    private final EntryEditorPreferences preferences;
+    private final PreferencesService preferencesService;


In my opinion, the name preferences is also fine. That's probably a matter of taste...

In the process of moving from JabRefPreferences to PreferencesService (and preferences objects) I wanted to distinguish between JabRefPreferences as preferences or prefs or whatever is used in the code on one hand and preferencesService on the other.
But we can change that after I'm hopefully done sometime.

tobiasdiez · 2020-04-17T16:24:06Z

src/main/java/org/jabref/gui/preferences/EntryEditorTabViewModel.java

-        autoCompleteFieldsProperty.setValue(autoCompletePreferences.getCompleteNamesAsString());
-
-        if (autoCompletePreferences.getOnlyCompleteFirstLast()) {
+        // ToDo: Include EntryEditorFieldsEditor in PreferencesDialog


Is this todo still relevant?

Had the wrong name. Should be CustomizeGeneralFieldsDialog

tobiasdiez · 2020-04-17T16:27:09Z

src/main/java/org/jabref/gui/preferences/EntryEditorTabViewModel.java

-        } else {
-            autoCompletePreferences.setOnlyCompleteFirstLast(false);
-            autoCompletePreferences.setOnlyCompleteLastFirst(true);
+        preferencesService.storeEntryEditorPreferences(new EntryEditorPreferences(


Can these constants JabRefPreferences.AUTO_OPEN_FORM etc now be made private?

Sadly no, not yet, since they are still in use outside the preferences dialog. I did not yet remove all the calls to JabRefPreferences::get and ::put in the whole codebase, since this would make this PR completly unreviewable.
I wanted to do this step by step.

…torprefs # Conflicts: # src/main/java/org/jabref/gui/fieldeditors/BibtexKeyEditorViewModel.java

@ayaankazerouni

# By Tobias Diez (10) and others # Via dimitra-karadima (5) and others * upstream/master: (62 commits) Backward compatibility for 4.3.1 (#6296) Fix Export to clipboard Dialog icon (#6345) Refactor EntryEditorPreferences (#6245) Update label names Squashed 'src/main/resources/csl-locales/' changes from d0ee4d13c9..79845b087b Squashed 'src/main/resources/csl-styles/' changes from c1793d2..143464e Cite work by @ayaankazerouni Improve performance for loading files (#6332) Add ADR von JUnit vs. AssertJ (#6335) 'Name' textfield on focus instead of 'OK' button when user clicks on 'Add subgroup' option (#6330) Bump jurt from 6.3.2 to 6.4.3 (#6325) Bump unoil from 6.3.2 to 6.4.3 (#6320) Bump ridl from 6.3.2 to 6.4.3 (#6326) Bump classgraph from 4.8.69 to 4.8.71 (#6322) Bump flexmark from 0.61.6 to 0.61.16 (#6318) Bump richtextfx from 0.10.4 to 0.10.5 (#6319) Bump guava from 28.2-jre to 29.0-jre (#6323) Bump flexmark-ext-gfm-tasklist from 0.61.6 to 0.61.16 (#6327) Bump org.beryx.jlink from 2.17.5 to 2.17.7 (#6324) Improve performance massively by fixing a stupid binding mistake (#6316) ... # Conflicts: # build.gradle

* upstream/master: Backward compatibility for 4.3.1 (#6296) Fix Export to clipboard Dialog icon (#6345) Refactor EntryEditorPreferences (#6245)

@ayaankazerouni

…ionCaseInsensitive * upstream/master: (32 commits) Fix Export to clipboard Dialog icon (#6345) Refactor EntryEditorPreferences (#6245) Update label names Squashed 'src/main/resources/csl-locales/' changes from d0ee4d13c9..79845b087b Squashed 'src/main/resources/csl-styles/' changes from c1793d2..143464e Cite work by @ayaankazerouni Improve performance for loading files (#6332) Add ADR von JUnit vs. AssertJ (#6335) 'Name' textfield on focus instead of 'OK' button when user clicks on 'Add subgroup' option (#6330) Bump jurt from 6.3.2 to 6.4.3 (#6325) Bump unoil from 6.3.2 to 6.4.3 (#6320) Bump ridl from 6.3.2 to 6.4.3 (#6326) Bump classgraph from 4.8.69 to 4.8.71 (#6322) Bump flexmark from 0.61.6 to 0.61.16 (#6318) Bump richtextfx from 0.10.4 to 0.10.5 (#6319) Bump guava from 28.2-jre to 29.0-jre (#6323) Bump flexmark-ext-gfm-tasklist from 0.61.6 to 0.61.16 (#6327) Bump org.beryx.jlink from 2.17.5 to 2.17.7 (#6324) Improve performance massively by fixing a stupid binding mistake (#6316) Fixed missing paste command (#6313) ...

7bde3e4 Add style for the Geographical Analysis journal (#6145) 6fa1551 Create taylor-and-francis-chicago-b-author-date.csl (#6232) eba2e8c Create taylor-and-francis-ama.csl (#6221) dda9d57 ACS, AMA, Vancouver: Remove hardcoded space after `citation-number` (#6248) 8f5fe92 GitHub Workflows security hardening (#6246) 284bc10 Create angiology.csl (#6122) eb141cc Update society-of-biblical-literature-fullnote-bibliography.csl (#6157) dddb459 Rewrite law-citation-manual.csl (#6171) (#6171) b975c96 Update Cell to numeric-superscript style (#6245) 3a41b08 Create isara-iso-690.csl (#6201) 5a128fe Create Biomembranes.csl (#6200) da2e0c0 Capitalize-first short titles for legislation ("Statute"). (#6241) af7f08d Create proceedings-of-the-estonian-academy-of-sciences-author-date.csl (#6209) git-subtree-dir: buildres/csl/csl-styles git-subtree-split: 7bde3e4

calixtus added 2 commits April 5, 2020 18:21

Refactored JabRefPreferences, concentrated EntryEditorPreferences and…

69ca54f

… extracted store logic out of dialog CustomizeGeneralFieldsDialogViewModel.

Merge remote-tracking branch 'upstream/master' into refactor_entryedi…

f93fc24

…torprefs # Conflicts: # src/main/java/org/jabref/preferences/JabRefPreferences.java # src/main/java/org/jabref/preferences/PreferencesService.java

Siedlerchr reviewed Apr 7, 2020

View reviewed changes

src/main/java/org/jabref/gui/entryeditor/EntryEditorPreferences.java Show resolved Hide resolved

calixtus added 3 commits April 8, 2020 23:55

Extracted calls to JabRefPreferences::get and put out of EntryEditorT…

d74b272

…abViewModel

Fixed tests

6af3ddd

Refactored AutoCompletePreferences

6d0a90a

calixtus changed the title ~~[WIP] Refactor EntryEditorPreferences~~ Refactor EntryEditorPreferences Apr 11, 2020

calixtus marked this pull request as ready for review April 11, 2020 10:07

Merge remote-tracking branch 'upstream/master' into refactor_entryedi…

059d208

…torprefs

calixtus added the status: ready-for-review Pull Requests that are ready to be reviewed by the maintainers label Apr 11, 2020

calixtus added 2 commits April 14, 2020 13:57

Checkstyle and missing comment

647a781

tobiasdiez requested changes Apr 17, 2020

View reviewed changes

Rewording and small refactorings regarding discussion

36d675c

tobiasdiez approved these changes Apr 17, 2020

View reviewed changes

Merge remote-tracking branch 'upstream/master' into refactor_entryedi…

d7b18c3

…torprefs # Conflicts: # src/main/java/org/jabref/gui/fieldeditors/BibtexKeyEditorViewModel.java

tobiasdiez merged commit a10e06b into master Apr 24, 2020

tobiasdiez deleted the refactor_entryeditorprefs branch April 24, 2020 16:57

Siedlerchr added a commit that referenced this pull request Apr 27, 2020

Merge remote-tracking branch 'upstream/master' into multiline

1dc4fc5

* upstream/master: Backward compatibility for 4.3.1 (#6296) Fix Export to clipboard Dialog icon (#6345) Refactor EntryEditorPreferences (#6245)

calixtus mentioned this pull request May 17, 2020

Refactor BibtexKeyPatternPreferences #6489

Merged

5 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Refactor EntryEditorPreferences #6245

Refactor EntryEditorPreferences #6245

calixtus commented Apr 5, 2020 •

edited

Loading

calixtus commented Apr 11, 2020

calixtus commented Apr 11, 2020

tobiasdiez left a comment

tobiasdiez Apr 17, 2020

calixtus Apr 17, 2020

tobiasdiez Apr 17, 2020

calixtus Apr 17, 2020

tobiasdiez Apr 17, 2020

calixtus Apr 17, 2020

Refactor EntryEditorPreferences #6245

Refactor EntryEditorPreferences #6245

Conversation

calixtus commented Apr 5, 2020 • edited Loading

calixtus commented Apr 11, 2020

calixtus commented Apr 11, 2020

tobiasdiez left a comment

Choose a reason for hiding this comment

tobiasdiez Apr 17, 2020

Choose a reason for hiding this comment

calixtus Apr 17, 2020

Choose a reason for hiding this comment

tobiasdiez Apr 17, 2020

Choose a reason for hiding this comment

calixtus Apr 17, 2020

Choose a reason for hiding this comment

tobiasdiez Apr 17, 2020

Choose a reason for hiding this comment

calixtus Apr 17, 2020

Choose a reason for hiding this comment

calixtus commented Apr 5, 2020 •

edited

Loading