Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Avoid erroneous MaterialDesignIconFactory #5259

Merged
merged 5 commits into from
Sep 2, 2019

Conversation

r0light
Copy link
Contributor

@r0light r0light commented Aug 29, 2019

Fix for #5245

Refactoring of the code for managing icons. Now all usages of de.jensd.fx.glyphs or de.jensd.fx.glyphs.materialdesignicons are encapsulated in the package gui.icon.
In there, the usage of de.jensd.fx.glyphs.materialdesignicons.utils.MaterialDesignIconFactory is avoided, because of the error described in the issue.


  • 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?)

Copy link
Member

@tobiasdiez tobiasdiez left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for your PR. That looks already pretty good.

Two suggestions for improvement:

  • I would prefer if no classes use the MaterialDesignIcon class directly. For example, instead of MaterialDesignIcon.BRIEFCASE_CHECK one should use IconTheme.AUTO_LINKED_FILE. This makes it possible to globally change the icon of a feature without having to worry about where it is used.
  • This requires also changes to JabRefMaterialDesignIconFactory (and maybe other classes) as instead of GlyphIcons one should now pass a JabRefIcon to the method (and one can use JabRefIcon.getGraphicNode to get the icon graphic).
  • There should be an architecture test ensuring this dependency requirement of the form
    @ArchTest
    public static void doNotUseGlyphsDirectly(JavaClasses classes) {
        noClasses().that().resideOutsideOfPackage("org.jabref.gui.icon")
                   .should().accessClassesThat().resideInAPackage("de.jensd.fx.glyphs..")
                   .check(classes);
    }

(not tested and to be added here https://github.com/JabRef/jabref/blob/master/src/test/java/org/jabref/architecture/MainArchitectureTestsWithArchUnit.java)

Sorry, I could have thought about this in more detail in the morning and hope you don't have to make changes twice now.

@r0light r0light changed the title MaterialDesignIconFactory workaround [WIP] MaterialDesignIconFactory workaround Aug 29, 2019
@r0light
Copy link
Contributor Author

r0light commented Aug 29, 2019

Ok, thank you for your suggestions. I reworked it now and tried to improve it further by keeping all things related to MaterialDesignIcons inside gui.icon. And outside of this package only JabRefIcons are used. That also made the class JabRefMaterialDesignIconFactory obsolete.

It is working now as expected, but there is one thing which should be improved:
In the class org.jabref.logic.groups.DefaultGroupsFactory there was an import of de.jensd.fx.glyphs.materialdesignicons.MaterialDesignIcon which passed the architecture tests. When i refactored it, i exchanged it with an import of org.jabref.gui.icon.IconTheme which caused the architecture test to fail. Now I'm not sure how exactly the functionality in DefaultGroupsFactory is needed and don't know how to properly do it. To let the test pass, i used a String constant now...

I also added the architecture test you suggested and hope that it is correct, as i haven't done anything with ArchUnit yet :)

Copy link
Member

@Siedlerchr Siedlerchr left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good. But that workaround is no longer necessary?

@r0light r0light changed the title [WIP] MaterialDesignIconFactory workaround Avoid erroneous MaterialDesignIconFactory Aug 30, 2019
@r0light
Copy link
Contributor Author

r0light commented Aug 30, 2019

Looks good. But that workaround is no longer necessary?

It's not a workaround anymore, but more a refactoring which also fixes the issue.
I would also say, that it is ready to merge, there is just the thing i described:

In the class org.jabref.logic.groups.DefaultGroupsFactory there was an import of de.jensd.fx.glyphs.materialdesignicons.MaterialDesignIcon which passed the architecture tests. When i refactored it, i exchanged it with an import of org.jabref.gui.icon.IconTheme which caused the architecture test to fail. Now I'm not sure how exactly the functionality in DefaultGroupsFactory is needed and don't know how to properly do it. To let the test pass, i used a String constant now...

@Siedlerchr
Copy link
Member

I am going to merge this now. Looks good to me. I think the issue with the GroupFactory is when you store and read groups with an icon?

@Siedlerchr Siedlerchr merged commit 89ebaf7 into JabRef:master Sep 2, 2019
Siedlerchr added a commit that referenced this pull request Mar 14, 2021
30fb68e Create BJEDIS-ABNT-Number (#5255)
aafb868 Update geochimica-et-cosmochimica-acta.csl (#5321)
60ba25f british-journal-of-anaesthesia.csl: add comma delimiter between non-sequential citations eg. 1 4 7-9 -> 1, 4, 7-9  (#5313)
67e6564 Reindent/reorder (#5318)
c0d2a39 Ruby 3.0.0 (#5309)
76d60ff Update harvard-anglia-ruskin-university.csl (#5310)
bc18ac9 Create journal-for-the-study-of-the-new-testament.csl (#5312)
aff602c Update journal-of-food-protection.csl (#5315)
4503826 Update muscle-and-nerve.csl (#5317)
3bed58e constant redefinition
4d718a0 update documentaiton link
fa99e2f add comma delimiter between succesive numbers
d396f8b Allow privileged testing of PRs (#5307)
43b22c7 Update masarykova-univerzita-pravnicka-fakulta.csl, pravnik.csl, iso690-full-note-cs.csl (#5308)
8a31c1e Update copernicus-publications.csl (#5303)
96760bb Update anabases.csl (#5304)
744de6d removed locale (#5300)
7eb0d60 Update aviation-space-and-environmental-medicine.csl (#5297)
2769970 Update ruhr-universitat-bochum-lehrstuhl-fur-industrial-sales-and-ser… (#5298)
51e3f4c Update harvard-university-of-bath.csl (#5299)
5fce84f Create cns-spectrums.csl (#5290)
bb8082c Create journal-of-surgical-oncology.csl (#5259)
90c13ae Update ruhr-universitat-bochum-lehrstuhl-fur-industrial-sales-and-ser… (#5288)
4bab1ad Update early-christianity.csl (#5289)
636ba78 Update tatup-zeitschrift-fur-technikfolgenabschatzung-in-theorie-und-… (#5291)
b7cc511 Create biotechnologia.csl (#5292)
5bab881 Update journal-of-orthopaedic-trauma.csl (#5287)
5943413 Fix locales (#5285)
302bd65 Update universite-du-quebec-a-montreal-departement-dhistoire.csl (#5286)
860ae48 Add Haaga-Helia University of Applied Sciences Harvard style (#5282)
c1c27de  Localize Metropolia style title (#5283)
508da89 Fix presentation for Methods of Information in Medicine (#5284)
53e1d0b Create geschichte-und-gesellschaft.csl (#5216)
d7ed0cb Create universite-de-geneve-departement-de-francais-moderne.csl (#5212)
80c404b Update journal-of-orthopaedic-trauma.csl (#5281)
20c143a Adding publishers' names (#5280)
6e5cd59 Update sodertorns-hogskola-oxford.csl (#5279)
52f2621 dollar-brace
a260294 Create journal-of-microbiology-and-biotechnology.csl (#5277)
1fc979e Create qeios.csl (#5261)
86347b7 GH does this for us -- again, sorry guys
b649589 Create experimental-biology-and-medicine.csl (#5276)
12ae0b1 Revert "tell sheldon about the job state"
bdcae89 tell sheldon about the job state
1240067 Add Vegetation classification and Survey (#5271)
6f398f0 Major update to Gallia.csl (#5269)
2a74b2c Update filters.yaml (#5273)
20046d2 Update spec_helper.rb (#5272)
2ee0dd8 Create the-sociological-review.csl (#5260)
5b8d09c move filters to inert file to pacify Sheldon (#5268)
e5f3315 Localize more language descriptors in style titles (#5270)
bfd2942 Localize more language descriptors in style titles (#5267)
35e276f Fix variable used for the label after indication of number of pages (#5240)
60f6371 Create Universidade-do-Estado-do-Rio-de-Janeiro.csl (#5247)
d8cc2ae Create the-journal-of-the-acoustical-society-of-america-numeric.csl (#5256)
92259c1 Create journal-of-financial-and-quantitative-analysis.csl (#5264)
6ba8aab Create journal-of-vestibular-research.csl (#5258)
0c88f41 Update european-journal-of-international-law.csl (#5265)
cff5abc Put language descriptor within parentheses
4a62709 Update monash-university-harvard.csl (#5253)
64fd1aa Localize more language descriptors in style titles (#5262)
f6519cb Localize more language descriptors in style titles (#5257)
170ccae tiny fixes for universitat-basel-iberoromanistik.csl (#5254)
b7284c9 Localize more language descriptors in style titles (#5252)
f4ef858 Add "Baishideng Publishing Group" dependents (#5251)
266e7c3 Make world-journal-of-hepatology.csl to bpg.csl parent (#5243)
9129098 fix small formatting issues for mclc.csl (#5229)
5d9560b Create crispr-journal.csl (#5249)
a217299 Change "Czech" to "Čeština" in titles (#5248)
4fef39a Create journal-of-open-research-software.csl (#5245)
2bff1a6 Change "Dutch" to "Nederlands" in titles (#5242)
f28da34 Update spec_helper.rb (#5246)
e0e977c Move content from wiki pages to markdown files (#5194)
018304c Update universite-de-montreal-apa.csl (#5239)
3b83e5c Create sodertorns-hogskola-oxford.csl (#5234)
1335378 Stop notifying 8827 port on Zotero servers (#5237)
f079b2a Update author-year disambiguation (#5238)
60bb0c9 Update technische-universitat-dresden-medizin.csl (#5236)
e374657 Create Leidraad voor juridische auteurs 2019 (Dutch) (#5223)
0450d89 Add new style for U of Mannheim, Germanistische Linguistik (#5228)
81f0689 Create health-sports-rehabilitation-medicine.csl (#5233)
c152a44 Update Gemfile.lock (#5235)
748e1eb Update geochimica-et-cosmochimica-acta.csl (#5231)
06b9ce8 Update zeitschrift-fur-theologie-und-philosophie.csl (#5230)
e747cb1 haute-ecole-de-gestion-de-geneve: Make polyglot & et al changes
4cfedb7 Create universite-de-sherbrooke-histoire.csl (#5210)
a96a61e Update journal-of-glaciology.csl (#5222)
c6a94c9 Add Journal of Human Rights (#5227)
c5c9c5f Update ruhr-universitat-bochum-lehrstuhl-fur-industrial-sales-and-ser… (#5214)
ffb7aa6 Create comparativ.csl (#5215)
e07329a Update lancaster-university-harvard.csl (#5220)
c075d41 Update mimesis-edizioni.csl (#5219)
502970a Removed space in year only citation (#5218)
13e8c6b Update acta-scientiae-veterinariae.csl (#5209)
0699da6 Remake mammallia.csl for Oct/2020 guidelines. (#5207)
b2dd3fd Update journal-of-international-business-studies.csl (#5217)
dd52bfe Update quaternaire.csl (#5199)
ccb1b0d rebuild webpage and article-journal citations in journal-of-forensic-sciences.csl (#5203)
f02f4fb Create pedosphere.csl (#5196)
70dd87a Create open-gender-journal.csl (#5198)
d272998 Create the-quarterly-journal-of-economics.csl (#5197)
d27cab3 fix locale issues, add cite-locator (#5206)

git-subtree-dir: buildres/csl/csl-styles
git-subtree-split: 30fb68e
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants