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.

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

Hide redundant information on fetcher exception #6569

Closed
wants to merge 7 commits into from
Closed

Hide redundant information on fetcher exception #6569

Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
21b64d7
fix
newtypes9 May 31, 2020
0622d67
update
newtypes9 May 31, 2020
e682509
checkstyle
newtypes9 May 31, 2020
ef2a196
update
newtypes9 May 31, 2020
5b30c8d
change request
newtypes9 Jun 2, 2020
fb3594b
checksytle
newtypes9 Jun 2, 2020
dde9280
alphabetical order
newtypes9 Jun 3, 2020
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
15 changes: 14 additions & 1 deletion src/main/java/org/jabref/gui/importer/fetcher/WebSearchPaneViewModel.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
import org.jabref.gui.JabRefFrame;
import org.jabref.gui.importer.ImportEntriesDialog;
import org.jabref.gui.util.BackgroundTask;
import org.jabref.logic.importer.FetcherException;
import org.jabref.logic.importer.ImportFormatPreferences;
import org.jabref.logic.importer.ParserResult;
import org.jabref.logic.importer.SearchBasedFetcher;
Expand Down Expand Up @@ -94,10 +95,22 @@ public void search() {
BackgroundTask<ParserResult> task = BackgroundTask.wrap(() -> new ParserResult(activeFetcher.performSearch(getQuery().trim())))
.withInitialMessage(Localization.lang("Processing %0", getQuery()));

task.onFailure(dialogService::showErrorDialogAndWait);
task.onFailure(this::exceptionHandler);

ImportEntriesDialog dialog = new ImportEntriesDialog(frame.getCurrentBasePanel().getBibDatabaseContext(), task);
dialog.setTitle(activeFetcher.getName());
dialog.showAndWait();
}

private void exceptionHandler(Exception exception) {
if (exception instanceof FetcherException) {
if (exception.getMessage().equals("A network error occurred")) {
Copy link
Member

Choose a reason for hiding this comment

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

Of course, please add the strings to the english language resource file.

dialogService.showWarningDialogAndWait(Localization.lang("An error occurred"),
Localization.lang(exception.getMessage() + ". You have no rights to access resources."));
}
} else {
dialogService.showWarningDialogAndWait(Localization.lang("An error occurred"),
Localization.lang(exception.getMessage()));
Copy link
Member

Choose a reason for hiding this comment

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

Localization.lang only works for static messages so sadly cannot be used here.

Copy link
Member

Choose a reason for hiding this comment

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

Background information is available at https://devdocs.jabref.org/getting-into-the-code/code-howtos#using-localization-correctly.

}
}
}