Rework PosteOpenActions to javafx (custom entry type import) #4898

Siedlerchr · 2019-04-18T20:47:39Z

Convert dialog for importing custom entry types to CheckListView
Rework threading when opening a database

The dialog triggers when you have a custom Entry type in your bib and open it via File -> Open library
Never seen this dialog before...

Before:

Now

Implement toString() for entryType classes, otherwise the CheckLIstView does not show the name.

I am currently a bit unhappy with the result lists from the dialog. Maybe someone has a more cleaner solution

@asdfasdfasdfasdfasdfas{CustomAuthor2016,
  author    = {CustomAuthor},
  date      = {2016},
  timestamp = {2016.09.04},
  year      = {2016},
}

@comment{jabref-entrytype: asdfasdfasdfasdfasdfas: req[author;year/date] opt[]}

Change in CHANGELOG.md described
Tests created for changes
Manually tested changed features in running JabRef
Screenshots added in PR description (for bigger UI changes)
Ensured that the git commit message is a good one
Check documentation status (Issue created for outdated help page at help.jabref.org?)

Convert dialog for importing custom entry types to CheckListView Rework threading when opening a database

tobiasdiez

What do you mean with "I am currently a bit unhappy with the result lists from the dialog. Maybe someone has a more cleaner solution"? Why are you unhappy?

tobiasdiez · 2019-04-19T09:54:33Z

src/main/java/org/jabref/gui/importer/actions/CheckForNewEntryTypesAction.java

-                checkboxPanel.add(box);
-                typeCheckBoxMap.put(type, box);
-            }
+    /*


this can be deleted now, right?

tobiasdiez · 2019-04-19T09:55:26Z

src/main/java/org/jabref/gui/importer/actions/CheckForNewEntryTypesAction.java

@@ -72,63 +72,60 @@ public void performAction(BasePanel panel, ParserResult parserResult) {
            }
        }

-        Map<EntryType, JCheckBox> typeCheckBoxMap = new HashMap<>();
+        DialogPane pane = new DialogPane();


please extract all this dialog-related code to a new class with the usual fxml / view / viewmodel

tobiasdiez · 2019-04-19T09:57:37Z

src/main/java/org/jabref/gui/importer/actions/GUIPostOpenAction.java

     */
-    void performAction(BasePanel panel, ParserResult pr);
+    void performAction(BasePanel panel, ParserResult pr, DialogService dialogService);


Dependencies as the DialogService should be passed to the constructor and not as a method parameter. This needs a bit more refactoring, but I don't like the static list of post open actions anyway...so this would go into the right direction.

src/main/java/org/jabref/gui/importer/actions/OpenDatabaseAction.java

src/main/java/org/jabref/gui/importer/actions/ResultHelper.java

* upstream/master: Fix Some Codacy Code Convention Issues (#4904) Bump ridl from 6.2.2 to 6.2.3 (#4903) Bump juh from 6.2.2 to 6.2.3 (#4902) Bump jurt from 6.2.2 to 6.2.3 (#4901) Bump unoil from 6.2.2 to 6.2.3 (#4900) Bump richtextfx from 0.9.3 to 0.10.0 (#4899) Store column widths as integer (#4896)

simplify code

fix l10n Remove obsolete code

Siedlerchr · 2019-04-24T07:13:16Z

Reworked to fxml/mvvm and simpliefied code

tobiasdiez

Good job, only a few minor things remain to be done...

tobiasdiez · 2019-04-24T14:11:39Z

src/main/java/org/jabref/gui/importer/ImportCustomEntryTypesDialogViewModel.java

+
+public class ImportCustomEntryTypesDialogViewModel {
+
+    private final ListProperty<EntryType> newTypesProperty;


There is no need for an ListProperty here, an observable list is sufficient (the list property is handy if you want to replace the complete list and need listeners for this).

tobiasdiez · 2019-04-24T14:13:06Z

src/main/java/org/jabref/gui/importer/ImportCustomEntryTypesDialogViewModel.java

+    public void importCustomEntryTypes(List<EntryType> checkedUnknownEntryTypes, List<EntryType> checkedDifferentEntryTypes) {
+        if (!checkedUnknownEntryTypes.isEmpty()) {
+            checkedUnknownEntryTypes.forEach(type -> EntryTypes.addOrModifyCustomEntryType((CustomEntryType) type, mode));
+            CustomEntryTypesManager.saveCustomEntryTypes(Globals.prefs);


Please extract the Globals.prefs dependency (and even better move the saveCustomEntryTypes method to the preferences class)

tobiasdiez · 2019-04-24T14:13:51Z

src/main/java/org/jabref/gui/importer/actions/CheckForNewEntryTypesAction.java

@@ -39,94 +26,18 @@ public boolean isActionNecessary(ParserResult parserResult) {
    public void performAction(BasePanel panel, ParserResult parserResult) {
        BibDatabaseMode mode = getBibDatabaseModeFromParserResult(parserResult);

-        List<EntryType> typesToStore = determineEntryTypesToSave(panel, getListOfUnknownAndUnequalCustomizations(parserResult), mode);
+        ImportCustomEntryTypesDialog dlg = new ImportCustomEntryTypesDialog(mode, getListOfUnknownAndUnequalCustomizations(parserResult));


no abbreviations

tobiasdiez · 2019-04-24T14:14:35Z

src/main/java/org/jabref/gui/importer/actions/GUIPostOpenAction.java

@@ -32,6 +32,7 @@
     *
     * @param panel The BasePanel where the database is shown.
     * @param pr The result of the BIB parse operation.
+     * @param dialogService


can be removed

tobiasdiez · 2019-04-24T14:14:58Z

src/main/java/org/jabref/gui/importer/actions/OpenDatabaseAction.java

    }

    /**
     * Go through the list of post open actions, and perform those that need to be performed.
     *
     * @param panel  The BasePanel where the database is shown.
     * @param result The result of the BIB file parse operation.
+     * @param dialogService


* upstream/master: Toggle enable status of menu items (#4872) Fixes throwing an exception when 'id' field is present in bib file (#4918) Quick fix for error when opening preferences (#4917) Revert "Create new layout for preferences regarding columns" Create new layout for preferences regarding columns Rearrange the padding of the "Append library" dialog (#4914) Make Group dialog resizable (#4910) Adjust save exception to inlcude orgininal stack traces

…ences Use ObservableList instead of LIstProperty

bf698ac Create common-market-law-review.csl (JabRef#4910) c962eca Create harvard-prifysgol-caerdydd.csl (JabRef#4922) 0c24e7f Update gewerblicher-rechtsschutz-und-urheberrecht.csl (JabRef#4923) d2ec1a7 Create Tijdschrift-voor-Geneeskunde.csl (JabRef#4907) 5df7250 Update harvard-institut-fur-praxisforschung-de.csl (JabRef#4918) 093fd91 Update universite-de-montreal-apa.csl (JabRef#4916) a3e41d4 Update thieme-german.csl (JabRef#4919) 648765a add DOI to aerosol-science-and-technology.csl (JabRef#4909) bc1ebee Reindent/reorder a8dc18a Fix documentation link for epidemiology & infection aab403a Fix AGLC Newspaper date 4c018d5 Add period between editor and translator (SBL styles) (JabRef#4906) 42f7491 Create geographische-zeitschrift.csl (JabRef#4898) a4002a6 Create german-kunstwissenschaft.csl (JabRef#4896) b01910b Disambiguation of names (JabRef#4895) git-subtree-dir: src/main/resources/csl-styles git-subtree-split: bf698ac

bf698ac Create common-market-law-review.csl (#4910) c962eca Create harvard-prifysgol-caerdydd.csl (#4922) 0c24e7f Update gewerblicher-rechtsschutz-und-urheberrecht.csl (#4923) d2ec1a7 Create Tijdschrift-voor-Geneeskunde.csl (#4907) 5df7250 Update harvard-institut-fur-praxisforschung-de.csl (#4918) 093fd91 Update universite-de-montreal-apa.csl (#4916) a3e41d4 Update thieme-german.csl (#4919) 648765a add DOI to aerosol-science-and-technology.csl (#4909) bc1ebee Reindent/reorder a8dc18a Fix documentation link for epidemiology & infection aab403a Fix AGLC Newspaper date 4c018d5 Add period between editor and translator (SBL styles) (#4906) 42f7491 Create geographische-zeitschrift.csl (#4898) a4002a6 Create german-kunstwissenschaft.csl (#4896) b01910b Disambiguation of names (#4895) git-subtree-dir: src/main/resources/csl-styles git-subtree-split: bf698ac

bf698ac Create common-market-law-review.csl (JabRef#4910) c962eca Create harvard-prifysgol-caerdydd.csl (JabRef#4922) 0c24e7f Update gewerblicher-rechtsschutz-und-urheberrecht.csl (JabRef#4923) d2ec1a7 Create Tijdschrift-voor-Geneeskunde.csl (JabRef#4907) 5df7250 Update harvard-institut-fur-praxisforschung-de.csl (JabRef#4918) 093fd91 Update universite-de-montreal-apa.csl (JabRef#4916) a3e41d4 Update thieme-german.csl (JabRef#4919) 648765a add DOI to aerosol-science-and-technology.csl (JabRef#4909) bc1ebee Reindent/reorder a8dc18a Fix documentation link for epidemiology & infection aab403a Fix AGLC Newspaper date 4c018d5 Add period between editor and translator (SBL styles) (JabRef#4906) 42f7491 Create geographische-zeitschrift.csl (JabRef#4898) a4002a6 Create german-kunstwissenschaft.csl (JabRef#4896) b01910b Disambiguation of names (JabRef#4895) git-subtree-dir: src/main/resources/csl-styles git-subtree-split: bf698ac

* Squashed 'src/main/resources/csl-styles/' changes from 586e0b8..c5f14e2 c5f14e2 Update journal-of-plant-ecology.csl (#4837) b5d00ab Hotfix: pravnik.csl & iso690-full-note-cs.csl (#4833) fb8d48a add PMID and DOI (#4832) 7ebdfff Update lancaster-university-harvard.csl (#4836) 8771e21 Create journal-of-clinical-neurology.csl (#4835) 70beb7b Harvard Lancaster: Fix in-text locator 0709b73 Update informal-logic.csl (#4831) d18d133 Update gost-r-7-0-5-2008.csl (#4829) cfb5389 Update gost-r-7-0-5-2008-numeric.csl (#4828) 0fc46ea Update gost-r-7-0-5-2008-numeric-alphabetical.csl (#4827) fac26cb Create feminist-theory.csl (#4830) a2721e6 Update pravnik.csl, masarykova-univerzita-pravnicka-fakulta.csl, and iso690-full-note-cs.csl (#4826) 2f0d735 Improve localization of DGfP 683d7d1 Create zeitschrift-fur-theologie-und-philosophie.csl (#4813) 7c82406 always show DOI in aps.csl (#4820) 1eb531d Update journal-of-international-business-studies.csl (#4819) 9caf926 Create interdisziplinare-anthropologie.csl (#4818) 00210e1 UKSW2 (#4807) 015db6e UKSW1 (#4800) f706ef5 Update masarykova-univerzita-pravnicka-fakulta.csl (#4822) 096108d Update epilepsia.csl (#4823) 07ebdc3 Update eksploatacja-i-niezawodnosc.csl (#4824) 3d50f3c Create ABNT-Universidade-Federal-de-Pernambuco-CFCH.csl (#4798) df94fa1 Update eksploatacja-i-niezawodnosc.csl (#4808) 4089be5 Update bulletin-de-la-societe-prehistorique-francaise.csl (#4810) f130aa7 Update molecular-biology-and-evolution.csl (#4814) 86f452f Create heiliger-dienst.csl (#4815) 5ccd3e9 Update revista-brasileira-de-ciencia-do-solo.csl (#4817) 0eea734 Fix a delimiter in journal-of-the-royal-society-of-western-australia.csl (#4811) 1cbe790 Delete heiliger-dienst.csl 19fa29f Create heiliger-dienst.csl (#4787) 888bad1 Update RMIT Harvard to match Easy Cite (#4788) 46011dd Create universite-nangui-abrogoua-ufr-sn (#4676) 174adab Create apa-6th-edition-no-ampersand.csl (#4767) 03cf65f Create journal-of-plant-protection-research.csl (#4797) c749084 Update eksploatacja-i-niezawodnosc.csl (#4782) 17e1501 Update masarykova-univerzita-pravnicka-fakulta.csl (#4783) 5596d18 Update revista-brasileira-de-ciencia-do-solo.csl (#4790) 9c1a381 create csl for the journal Textual Cultures (#4785) 8345762 Update taylor-and-francis-national-library-of-medicine.csl (#4786) 5ec1acf Create british-journal-of-criminology.csl (#4789) 68550ac Update angewandte-chemie.csl (#4791) 09e2755 Create shock.csl (#4792) d46e49e Update antioxidants-and-redox-signaling.csl (#4793) git-subtree-dir: src/main/resources/csl-styles git-subtree-split: c5f14e2 * Squashed 'src/main/resources/csl-styles/' changes from c5f14e2..716f635 716f635 Update changes in Harvard-Stellenbosch (#4862) a6a9a1a Create alkoholizmus-a-drogove-zavislosti.csl (#4859) 0560ca0 Update journal-of-the-american-college-of-surgeons.csl (#4858) 9e16631 create independent style for cellular-and-molecular-gastroenterology-and-hepatology.csl (#4852) 87b0853 Update antiquity.csl (#4841) cb4e7f7 Update heart-rhythm.csl (#4850) b3b55ee Create iisue-moderno (#4846) 63973a7 Create etasr.csl (#4848) 9942138 Create style for Journal of Vertebrate Biology (#4849) 7c7f3d3 Add Future Medicine dependents (#4838) abe2066 Update methods-of-information-in-medicine.csl (#4847) c64d98b create independent style for new-zealand-journal-of-forestry-science (#4844) 28265f9 Create continuity-and-change.csl (#4839) d065fdd Create journal-of-clinical-ethics.csl (#4842) b9fbfa3 Update future-medicine.csl (#4843) ceb56fa Create future-medicine.csl (#4834) git-subtree-dir: src/main/resources/csl-styles git-subtree-split: 716f635 * Squashed 'src/main/resources/csl-styles/' changes from 716f635..a995c63 a995c63 Create errata.csl (#4894) 883b9cd Update archeologie-medievale.csl (#4892) a942b5c Update rmit-university-harvard.csl (#4890) 5d535fc Update universidade-do-porto-faculdade-de-engenharia-chicago.csl (#4891) f2a8fe3 Fix AVMA style c5a2d7e Create universidade-do-porto-faculdade-de-engenharia-chicago.csl (#4872) 9f106eb Update rmit-university-harvard.csl (#4884) 5213c2f Update universitetet-i-oslo-rettsvitenskap.csl (#4886) 7e0828d Update uclouvain-centre-charles-de-visscher-pour-le-droit-internation… (#4871) ae5eba3 Create revue-archeologique-de-lest.csl (#4881) 58a1672 Create pacific-conservation-biology.csl (#4880) 381106e Update national-institute-of-organisation-dynamics-australia-harvard.csl (#4879) c66a5c0 Create society-of-biblical-literature-author-date.csl (#4812) 008073c Create ruhr-universitat-bochum-medizinische-fakultat-variante-a.csl (#4874) 193385a Update manchester (#4878) fa9ef11 Create Faculty of Psychology and Education Sciences, Porto (#4856) 2f70b14 Add "personal communication" to remaining APA locales (#4866) 2b4f831 Fixed page-range-format (#4863) d5661ba universitat-bern-institut-fur-musikwissenschaft add missing cs:sort to cs:bibliography (#4860) e433c99 fix delimiter issue for bioscience.csl (#4876) 4d97aab update et-al settings for stroke.csl (#4875) 342b9e3 Update masarykova-univerzita-pravnicka-fakulta.csl (#4868) 91fe25e Add article number to IEEE (#4867) git-subtree-dir: src/main/resources/csl-styles git-subtree-split: a995c63 * Squashed 'src/main/resources/csl-styles/' changes from a995c63..bf698ac bf698ac Create common-market-law-review.csl (#4910) c962eca Create harvard-prifysgol-caerdydd.csl (#4922) 0c24e7f Update gewerblicher-rechtsschutz-und-urheberrecht.csl (#4923) d2ec1a7 Create Tijdschrift-voor-Geneeskunde.csl (#4907) 5df7250 Update harvard-institut-fur-praxisforschung-de.csl (#4918) 093fd91 Update universite-de-montreal-apa.csl (#4916) a3e41d4 Update thieme-german.csl (#4919) 648765a add DOI to aerosol-science-and-technology.csl (#4909) bc1ebee Reindent/reorder a8dc18a Fix documentation link for epidemiology & infection aab403a Fix AGLC Newspaper date 4c018d5 Add period between editor and translator (SBL styles) (#4906) 42f7491 Create geographische-zeitschrift.csl (#4898) a4002a6 Create german-kunstwissenschaft.csl (#4896) b01910b Disambiguation of names (#4895) git-subtree-dir: src/main/resources/csl-styles git-subtree-split: bf698ac * Squashed 'src/main/resources/csl-styles/' changes from bf698ac..7cab2f7 7cab2f7 Create depro-ufs.csl (#4947) 2fcda1f Create journal-of-sport-science-and-medicine.csl (#4949) cd457d4 Update american-marketing-association.csl (#4945) cacc4ee Create nejm-catalyst.csl (#4943) bd769b9 Update and rename dependent/chinese-medical-journal.csl to chinese-me… (#4941) 1f706cd Update health-services-research.csl (#4939) 76bcd1d Update journal-of-the-royal-society-of-western-australia.csl (#4932) e79640e Create afro-asia.csl (#4934) c601aa4 Update lancaster-university-harvard.csl (#4938) 184fd90 Update collection-du-centre-jean-berard.csl (#4936) 82f9aec fix et-al & add DOI thyroid.csl (#4937) 4af169f Create universidade-estadual-de-alagoas-uneal-abnt (#4885) 47165b3 Update and rename medical-physics.csl to dependent/medical-physics.csl (AMA) (#4905) 3cab27d Update thieme-german.csl (#4931) eb2c977 Create zeitschrift-fur-zahnarztliche-implantologie.csl (#4925) 4adb1ea Create karstenia.csl (#4929) 530a136 Fix author substitute in Universita Cattolica git-subtree-dir: src/main/resources/csl-styles git-subtree-split: 7cab2f7 * Squashed 'src/main/resources/csl-styles/' changes from 7cab2f7..827b986 827b986 add DOI preprint to american-society-for-microbiology.csl (#4946) git-subtree-dir: src/main/resources/csl-styles git-subtree-split: 827b986 * Squashed 'src/main/resources/csl-styles/' changes from 827b986..eb0d37e eb0d37e Create natbib-plainnat-author-dat.csl (#4967) fb1592a Update journal-of-fish-biology.csl (#4969) f6876cb Update .travis.yml (#4970) d6d400b Create london-review-of-international-law.csl (#4966) d2a5ae1 Update harvard-stellenbosch-university.csl (#4965) 9c62141 Create phytopathologia-mediterranea.csl (#4964) 8ca2ea1 Update historical-materialism.csl (#4960) 80456dc Update historical-materialism.csl be2d910 Update historical-materialism.csl 1d1cf09 Create atlande.csl (#4930) 89f41d4 Create juristische-zitierweise-oeffentliches-recht.csl (#4944) 8c677a0 Create korean-journal-of-gastroenterology.csl (#4954) eadb950 Create historical-materialism.csl (#4955) 5553dcd Create revista-materia.csl (#4957) d23a3ab Bug fix in APA 6 original publication macro (#4959) 66f9974 Always print publisher in APA 6th edition (#4899) 868809c Create agora.csl (#4940) 99c19c3 Update anthropologie-et-societes.csl (#4952) ee17423 Create critical-reviews-in-solid-state-and-materials-science.csl (#4951) 7a13a7d Create korean-journal-of-internal-medicine.csl (#4953) git-subtree-dir: src/main/resources/csl-styles git-subtree-split: eb0d37e * Merged new library actions * l10n * Removed unused constructor * Fixed checkstyle failed check * Fixed one more checkstyle issue Co-authored-by: github actions <[email protected]>

Siedlerchr added 2 commits April 18, 2019 22:41

Rework PosteOpenActions to javafx (custom entry type import)

7701375

Convert dialog for importing custom entry types to CheckListView Rework threading when opening a database

Rework PosteOpenActions to javafx (custom entry type import)

9b7b764

Convert dialog for importing custom entry types to CheckListView Rework threading when opening a database

Siedlerchr added the status: ready-for-review Pull Requests that are ready to be reviewed by the maintainers label Apr 18, 2019

tobiasdiez requested changes Apr 19, 2019

View reviewed changes

Siedlerchr added 5 commits April 20, 2019 10:38

rework threading stuff

9358343

simplify code

rework dialog, create fxml etc

af992a3

fix l10n Remove obsolete code

remove dialog service argument

2d0f4dd

remove dialogService parameter

8c302f5

tobiasdiez requested changes Apr 24, 2019

View reviewed changes

Siedlerchr added 2 commits April 24, 2019 20:29

Refactorings, move functionality of CustomEntryTypesManager to Prefer…

08b583d

…ences Use ObservableList instead of LIstProperty

Siedlerchr merged commit ca95b6d into master Apr 24, 2019

Siedlerchr deleted the reworkPostOpenACtion branch April 24, 2019 19:15

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Rework PosteOpenActions to javafx (custom entry type import) #4898

Rework PosteOpenActions to javafx (custom entry type import) #4898

Siedlerchr commented Apr 18, 2019 •

edited

Loading

tobiasdiez left a comment

tobiasdiez Apr 19, 2019

tobiasdiez Apr 19, 2019

tobiasdiez Apr 19, 2019

Siedlerchr commented Apr 24, 2019

tobiasdiez left a comment

tobiasdiez Apr 24, 2019

tobiasdiez Apr 24, 2019

tobiasdiez Apr 24, 2019

tobiasdiez Apr 24, 2019

tobiasdiez Apr 24, 2019


		public class ImportCustomEntryTypesDialogViewModel {

		private final ListProperty<EntryType> newTypesProperty;

Rework PosteOpenActions to javafx (custom entry type import) #4898

Rework PosteOpenActions to javafx (custom entry type import) #4898

Conversation

Siedlerchr commented Apr 18, 2019 • edited Loading

tobiasdiez left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Siedlerchr commented Apr 24, 2019

tobiasdiez left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Siedlerchr commented Apr 18, 2019 •

edited

Loading