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

Fix multiple entries allowed in crossref (issue #5284) #5724

Merged
merged 7 commits into from
Dec 15, 2019

Conversation

Julien29121998
Copy link
Contributor

Fixed issue #5284 where multiple entries were allowed in crossref field, whereas only one should be allowed. #5284

Julien29121998 and others added 4 commits November 26, 2019 22:35
add an attribute in tagbar to allow or not multiple entries
Fixed issue JabRef#5284 where multiple entries were allowed in crossref field, whereas only one should be allowed. JabRef#5284
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! The code looks good to me. I've only a few minor remarks, mostly concerning the code style. To fix this, it should suffice to import JabRef's Intellj code style and reformat the changed files.

src/main/java/org/jabref/gui/util/component/TagBar.java Outdated Show resolved Hide resolved
src/main/java/org/jabref/gui/util/component/TagBar.java Outdated Show resolved Hide resolved
src/main/java/org/jabref/gui/util/component/TagBar.java Outdated Show resolved Hide resolved
Reformat code according to Jabref code style, simplify some conditions.
Copy link
Member

@koppor koppor left a comment

Choose a reason for hiding this comment

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

Thank you for working on this. I also have some code style comments.

src/main/java/org/jabref/gui/util/component/TagBar.java Outdated Show resolved Hide resolved
AUTHORS Outdated Show resolved Hide resolved
former "isMultiple" was replaced by a use of FielProperty.Multiple_entry_link.
Co-authored-by: Julien Bénard
Co-authored-by: Lucas Beretti
Co-authored-by: Venceslas Roullier
Replaced the boolean attribute in TagBar with a Set of properties
Co-authored-by: Julien Bénard
Co-authored-by: Lucas Beretti
Co-authored-by: Venceslas Roullier

public LinkedEntriesEditor(Field field, BibDatabaseContext databaseContext, AutoCompleteSuggestionProvider<?> suggestionProvider, FieldCheckers fieldCheckers) {
this.viewModel = new LinkedEntriesEditorViewModel(field, suggestionProvider, databaseContext, fieldCheckers);

ViewLoader.view(this)
.root(this)
Copy link
Member

Choose a reason for hiding this comment

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

I think, this indent change is an Eclipse vs. IntelliJ-thing. I won't nitpick here. Next time, please only commit code changes, not just reformat changes.

@koppor
Copy link
Member

koppor commented Dec 15, 2019

I merge even though the Co-authored-by-STrings are not correct

Co-authored-by: Julien Bénard
Co-authored-by: Lucas Beretti
Co-authored-by: Venceslas Roullier

Source from https://help.github.com/en/github/committing-changes-to-your-project/creating-a-commit-with-multiple-authors.

grafik

@koppor koppor merged commit bee4d64 into JabRef:master Dec 15, 2019
@Julien29121998 Julien29121998 deleted the issue#5284 branch December 15, 2019 20:16
@koppor
Copy link
Member

koppor commented Dec 16, 2019

For follow-up: Please ensure that "checkstyle" runs through. There was a wrong import order.

@Julien29121998 Did you configure your IDE correctly?

@koppor
Copy link
Member

koppor commented Dec 16, 2019

Nevertheless, thank you for putting effort into this. Looking forward to more contributions!

Siedlerchr added a commit that referenced this pull request Dec 20, 2019
# By Tobias Diez (11) and others
# Via GitHub (1) and Tobias Diez (1)
* upstream/master: (29 commits)
  Improve things arround change detection (#5770)
  Revert "Update to most recent journal abbreviation list" (#5769)
  Various fixes to the dark theme (#5764)
  Bump mockito-core from 3.2.0 to 3.2.4 (#5760)
  Bump classgraph from 4.8.58 to 4.8.59 (#5761)
  Improve dependency update rules
  Update jpackage to build 27 (#5758)
  Persistent column sortorder (#5730)
  Fix medline fetcher/importer when using installer (#5752)
  New Crowdin translations (#5751)
  Bump byte-buddy-parent from 1.10.4 to 1.10.5 (#5750)
  Fix checkstyle
  Fix filename
  Update to most recent journal abbreviation list
  Remove obsolete string
  Revert "Switch back to development"
  Switch back to development
  Next development cycle
  Release 5.0-beta (#5684)
  Fix multiple entries allowed in crossref (issue #5284) (#5724)
  ...

# Conflicts:
#	src/main/java/org/jabref/gui/collab/ChangeDisplayDialog.java
#	src/main/java/org/jabref/gui/collab/EntryChangeViewModel.java
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.

4 participants