Check for different editions in the duplicate check #2991
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
LinusDietz
added
type: enhancement
integrity-checker
status: ready-for-review
Siedlerchr
reviewed
Jul 10, 2017
| private static boolean hasSameIdentifier(BibEntry one, BibEntry two) { | ||
| private static boolean haveDifferentEditions(BibEntry one, BibEntry two) { | ||
| if (one.getField(FieldName.EDITION).isPresent() && two.getField(FieldName.EDITION).isPresent()) { | ||
| if (!one.getField(FieldName.EDITION).get().equals(two.getField(FieldName.EDITION).get())) { |
There was a problem hiding this comment.
You can direclty compare Optionals with equals, but be aware that two empty optionals also equal.
https://docs.oracle.com/javase/8/docs/api/java/util/Optional.html#equals-java.lang.Object-
There was a problem hiding this comment.
Yeah, I'm aware of that. That's why I first checked both to be present, and then called .get() on both to explicitly state that this line will only work if there is a value in the Optionals.
Siedlerchr
reviewed
Jul 10, 2017
| @@ -26,7 +26,7 @@ | |||
| * This class contains utility method for duplicate checking of entries. | |||
| */ | |||
| public class DuplicateCheck { | |||
| public static double duplicateThreshold = 0.75; // The overall threshold to signal a duplicate pair | |||
| private static final double duplicateThreshold = 0.75; // The overall threshold to signal a duplicate pair | |||
There was a problem hiding this comment.
Just a very minor thing, the constant variable should be uppercase
tobiasdiez
approved these changes
Jul 10, 2017
Siedlerchr
added a commit
that referenced
this pull request
Jul 11, 2017
* upstream/master: Eclipse J Add switch indentation for Eclipse and add some new missing formatting options Check for different editions in the duplicate check (#2991) Add CheckStyle Check for Constants (final static) (#2992) Add Remove link context menu entry in file editor (#2972) Fix DiVA tests Remove <pre> tag from entries fetched using MathSciNet (#2990) Fix Brazilian Portugese language loading (#2981) Use sftp's symlink command to provide symlink to latest version Update gradle from 4.0 to 4.0.1 Fix group storage (#2978) Fix keybindings in entry editor (#2971)
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes #2960 by checking for different editions before the actual duplicate check.
If both BibEntries have a Edition field that mismatches, it cannot be a duplicate.