From 21b64d75cefcd6da1d5bc4e5abb01b63bd9598a8 Mon Sep 17 00:00:00 2001 From: Qing Date: Sun, 31 May 2020 18:27:08 +0800 Subject: [PATCH 1/7] fix --- .../importer/fetcher/WebSearchPaneViewModel.java | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/src/main/java/org/jabref/gui/importer/fetcher/WebSearchPaneViewModel.java b/src/main/java/org/jabref/gui/importer/fetcher/WebSearchPaneViewModel.java index 342d7e61fc3..78800f3bcdf 100644 --- a/src/main/java/org/jabref/gui/importer/fetcher/WebSearchPaneViewModel.java +++ b/src/main/java/org/jabref/gui/importer/fetcher/WebSearchPaneViewModel.java @@ -94,10 +94,22 @@ public void search() { BackgroundTask 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(); } + + void exceptionHandler(Exception exception) { + if(exception.getClass().getName().equals("org.jabref.logic.importer.FetcherException")){ + if(exception.getMessage().equals("A network error occurred")){ + 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())); + } + } } From 0622d67ca6352e361d9ea4743ae45639a1489573 Mon Sep 17 00:00:00 2001 From: Qing Date: Sun, 31 May 2020 18:56:06 +0800 Subject: [PATCH 2/7] update --- .../org/jabref/gui/importer/fetcher/WebSearchPaneViewModel.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/org/jabref/gui/importer/fetcher/WebSearchPaneViewModel.java b/src/main/java/org/jabref/gui/importer/fetcher/WebSearchPaneViewModel.java index 78800f3bcdf..56478d6816a 100644 --- a/src/main/java/org/jabref/gui/importer/fetcher/WebSearchPaneViewModel.java +++ b/src/main/java/org/jabref/gui/importer/fetcher/WebSearchPaneViewModel.java @@ -101,7 +101,7 @@ public void search() { dialog.showAndWait(); } - void exceptionHandler(Exception exception) { + private void exceptionHandler(Exception exception) { if(exception.getClass().getName().equals("org.jabref.logic.importer.FetcherException")){ if(exception.getMessage().equals("A network error occurred")){ dialogService.showWarningDialogAndWait(Localization.lang("An error occurred"), From e682509184c6bf992d3b8bb8069c3fe1dcf7963c Mon Sep 17 00:00:00 2001 From: Qing Date: Sun, 31 May 2020 19:08:04 +0800 Subject: [PATCH 3/7] checkstyle --- .../jabref/gui/importer/fetcher/WebSearchPaneViewModel.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/org/jabref/gui/importer/fetcher/WebSearchPaneViewModel.java b/src/main/java/org/jabref/gui/importer/fetcher/WebSearchPaneViewModel.java index 56478d6816a..9df572eb0a2 100644 --- a/src/main/java/org/jabref/gui/importer/fetcher/WebSearchPaneViewModel.java +++ b/src/main/java/org/jabref/gui/importer/fetcher/WebSearchPaneViewModel.java @@ -102,10 +102,10 @@ public void search() { } private void exceptionHandler(Exception exception) { - if(exception.getClass().getName().equals("org.jabref.logic.importer.FetcherException")){ - if(exception.getMessage().equals("A network error occurred")){ + if (exception.getClass().getName().equals("org.jabref.logic.importer.FetcherException")) { + if (exception.getMessage().equals("A network error occurred")) { dialogService.showWarningDialogAndWait(Localization.lang("An error occurred"), - Localization.lang(exception.getMessage()+". You have no rights to access resources")); + Localization.lang(exception.getMessage() + ". You have no rights to access resources")); } }else{ dialogService.showWarningDialogAndWait(Localization.lang("An error occurred"), From ef2a1967a8fc5714fc152639bf01998d3de822ab Mon Sep 17 00:00:00 2001 From: Qing Date: Sun, 31 May 2020 19:28:49 +0800 Subject: [PATCH 4/7] update --- .../org/jabref/gui/importer/fetcher/WebSearchPaneViewModel.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/org/jabref/gui/importer/fetcher/WebSearchPaneViewModel.java b/src/main/java/org/jabref/gui/importer/fetcher/WebSearchPaneViewModel.java index 9df572eb0a2..8e215a3e441 100644 --- a/src/main/java/org/jabref/gui/importer/fetcher/WebSearchPaneViewModel.java +++ b/src/main/java/org/jabref/gui/importer/fetcher/WebSearchPaneViewModel.java @@ -107,7 +107,7 @@ private void exceptionHandler(Exception exception) { dialogService.showWarningDialogAndWait(Localization.lang("An error occurred"), Localization.lang(exception.getMessage() + ". You have no rights to access resources")); } - }else{ + } else { dialogService.showWarningDialogAndWait(Localization.lang("An error occurred"), Localization.lang(exception.getMessage())); } From 5b30c8d8f04c543321d6c1f18d68369328e24a27 Mon Sep 17 00:00:00 2001 From: Qing Date: Tue, 2 Jun 2020 12:44:22 +0800 Subject: [PATCH 5/7] change request --- .../gui/importer/fetcher/WebSearchPaneViewModel.java | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/src/main/java/org/jabref/gui/importer/fetcher/WebSearchPaneViewModel.java b/src/main/java/org/jabref/gui/importer/fetcher/WebSearchPaneViewModel.java index 8e215a3e441..af7e3b30a85 100644 --- a/src/main/java/org/jabref/gui/importer/fetcher/WebSearchPaneViewModel.java +++ b/src/main/java/org/jabref/gui/importer/fetcher/WebSearchPaneViewModel.java @@ -15,10 +15,7 @@ import org.jabref.gui.JabRefFrame; import org.jabref.gui.importer.ImportEntriesDialog; import org.jabref.gui.util.BackgroundTask; -import org.jabref.logic.importer.ImportFormatPreferences; -import org.jabref.logic.importer.ParserResult; -import org.jabref.logic.importer.SearchBasedFetcher; -import org.jabref.logic.importer.WebFetchers; +import org.jabref.logic.importer.*; import org.jabref.logic.l10n.Localization; import org.jabref.model.strings.StringUtil; import org.jabref.preferences.JabRefPreferences; @@ -102,10 +99,10 @@ public void search() { } private void exceptionHandler(Exception exception) { - if (exception.getClass().getName().equals("org.jabref.logic.importer.FetcherException")) { + if (exception instanceof FetcherException) { if (exception.getMessage().equals("A network error occurred")) { dialogService.showWarningDialogAndWait(Localization.lang("An error occurred"), - Localization.lang(exception.getMessage() + ". You have no rights to access resources")); + Localization.lang(exception.getMessage() + ". You have no rights to access resources.")); } } else { dialogService.showWarningDialogAndWait(Localization.lang("An error occurred"), From fb3594ba6fd8451270f066eeabc59c5b75d2c7e9 Mon Sep 17 00:00:00 2001 From: Qing Date: Tue, 2 Jun 2020 13:06:16 +0800 Subject: [PATCH 6/7] checksytle --- .../jabref/gui/importer/fetcher/WebSearchPaneViewModel.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/main/java/org/jabref/gui/importer/fetcher/WebSearchPaneViewModel.java b/src/main/java/org/jabref/gui/importer/fetcher/WebSearchPaneViewModel.java index af7e3b30a85..fd680a38ffc 100644 --- a/src/main/java/org/jabref/gui/importer/fetcher/WebSearchPaneViewModel.java +++ b/src/main/java/org/jabref/gui/importer/fetcher/WebSearchPaneViewModel.java @@ -15,7 +15,11 @@ import org.jabref.gui.JabRefFrame; import org.jabref.gui.importer.ImportEntriesDialog; import org.jabref.gui.util.BackgroundTask; -import org.jabref.logic.importer.*; +import org.jabref.logic.importer.ImportFormatPreferences; +import org.jabref.logic.importer.ParserResult; +import org.jabref.logic.importer.SearchBasedFetcher; +import org.jabref.logic.importer.WebFetchers; +import org.jabref.logic.importer.FetcherException; import org.jabref.logic.l10n.Localization; import org.jabref.model.strings.StringUtil; import org.jabref.preferences.JabRefPreferences; From dde928071f62a18cdefc5060c31469a2132b36f9 Mon Sep 17 00:00:00 2001 From: Qing Date: Thu, 4 Jun 2020 00:17:49 +0800 Subject: [PATCH 7/7] alphabetical order --- .../org/jabref/gui/importer/fetcher/WebSearchPaneViewModel.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/org/jabref/gui/importer/fetcher/WebSearchPaneViewModel.java b/src/main/java/org/jabref/gui/importer/fetcher/WebSearchPaneViewModel.java index fd680a38ffc..5775916238d 100644 --- a/src/main/java/org/jabref/gui/importer/fetcher/WebSearchPaneViewModel.java +++ b/src/main/java/org/jabref/gui/importer/fetcher/WebSearchPaneViewModel.java @@ -15,11 +15,11 @@ 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; import org.jabref.logic.importer.WebFetchers; -import org.jabref.logic.importer.FetcherException; import org.jabref.logic.l10n.Localization; import org.jabref.model.strings.StringUtil; import org.jabref.preferences.JabRefPreferences;