Skip to content

Apply exit early pattern #10297

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.

Sign up for GitHub

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

Merged
merged 1 commit into from
Sep 3, 2023
Merged

Apply exit early pattern #10297

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -292,10 +292,10 @@ tasks.register("generateBstGrammarSource", JavaExec) {
}

tasks.register("generateSearchGrammarSource", JavaExec) {
main = "org.antlr.v4.Tool"
classpath = configurations.antlr4
group = 'JabRef'
description = "Generates java files for Search.g antlr4."
classpath = configurations.antlr4
main = "org.antlr.v4.Tool"

inputs.dir("src/main/antlr4/org/jabref/search/")
outputs.dir("src-gen/main/java/org/jabref/search/")
Expand Down
26 changes: 14 additions & 12 deletions src/main/java/org/jabref/gui/journals/AbbreviateAction.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,13 +110,14 @@ private String abbreviate(BibDatabaseContext databaseContext, List<BibEntry> ent
}
}).count();

if (count > 0) {
ce.end();
frame.getUndoManager().addEdit(ce);
frame.getCurrentLibraryTab().markBaseChanged();
return Localization.lang("Abbreviated %0 journal names.", String.valueOf(count));
if (count == 0) {
return Localization.lang("No journal names could be abbreviated.");
}
return Localization.lang("No journal names could be abbreviated.");

ce.end();
frame.getUndoManager().addEdit(ce);
frame.getCurrentLibraryTab().markBaseChanged();
return Localization.lang("Abbreviated %0 journal names.", String.valueOf(count));
}

private String unabbreviate(BibDatabaseContext databaseContext, List<BibEntry> entries) {
Expand All @@ -126,12 +127,13 @@ private String unabbreviate(BibDatabaseContext databaseContext, List<BibEntry> e
int count = entries.stream().mapToInt(entry ->
(int) FieldFactory.getJournalNameFields().stream().filter(journalField ->
undoableAbbreviator.unabbreviate(databaseContext.getDatabase(), entry, journalField, ce)).count()).sum();
if (count > 0) {
ce.end();
frame.getUndoManager().addEdit(ce);
frame.getCurrentLibraryTab().markBaseChanged();
return Localization.lang("Unabbreviated %0 journal names.", String.valueOf(count));
if (count == 0) {
return Localization.lang("No journal names could be unabbreviated.");
}
return Localization.lang("No journal names could be unabbreviated.");

ce.end();
frame.getUndoManager().addEdit(ce);
frame.getCurrentLibraryTab().markBaseChanged();
return Localization.lang("Unabbreviated %0 journal names.", String.valueOf(count));
}
}