diff options
author | Matthias Sohn | 2014-05-27 07:21:57 +0000 |
---|---|---|
committer | Matthias Sohn | 2014-05-27 07:21:57 +0000 |
commit | 03faa4a4a4538427c48a7bfb87d5e53cdaaeb153 (patch) | |
tree | 84f09a9c631b80491a3ec8c2e86a2633f3229cb1 | |
parent | d2ee75ee18dfbeb8370b5291d958ca8597d28aa5 (diff) | |
download | egit-03faa4a4a4538427c48a7bfb87d5e53cdaaeb153.tar.gz egit-03faa4a4a4538427c48a7bfb87d5e53cdaaeb153.tar.xz egit-03faa4a4a4538427c48a7bfb87d5e53cdaaeb153.zip |
Ensure that transport error in RefSpecPage is logged
The RefSpecPage displays but doesn't log errors which may occur in
revalidateImpl when calling ls-remote.
see https://www.eclipse.org/forums/index.php/t/775040/
Change-Id: Ib13bc9c7fb7f2bc3e58c36136347fe8830c16f90
3 files changed, 5 insertions, 13 deletions
diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/UIText.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/UIText.java index 9df7d0cce6..1e49b28c05 100644 --- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/UIText.java +++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/UIText.java @@ -1745,9 +1745,6 @@ public class UIText extends NLS { public static String RefSpecPage_errorTransportDialogMessage; /** */ - public static String RefSpecPage_errorTransportDialogTitle; - - /** */ public static String RefSpecPage_operationCancelled; /** */ diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/components/RefSpecPage.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/components/RefSpecPage.java index c551d1e2b4..fb7e21d025 100644 --- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/components/RefSpecPage.java +++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/components/RefSpecPage.java @@ -15,15 +15,12 @@ import java.util.Collections; import java.util.List; import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.core.runtime.IStatus; -import org.eclipse.core.runtime.Status; import org.eclipse.egit.core.op.ListRemoteOperation; import org.eclipse.egit.core.securestorage.UserPasswordCredentials; import org.eclipse.egit.ui.Activator; import org.eclipse.egit.ui.UIPreferences; import org.eclipse.egit.ui.internal.UIText; import org.eclipse.jface.dialogs.Dialog; -import org.eclipse.jface.dialogs.ErrorDialog; import org.eclipse.jface.operation.IRunnableWithProgress; import org.eclipse.jface.wizard.WizardPage; import org.eclipse.jgit.lib.Repository; @@ -256,11 +253,10 @@ public class RefSpecPage extends WizardPage { } catch (InvocationTargetException e) { final Throwable cause = e.getCause(); transportError(cause.getMessage()); - ErrorDialog.openError(getShell(), - UIText.RefSpecPage_errorTransportDialogTitle, - UIText.RefSpecPage_errorTransportDialogMessage, new Status( - IStatus.ERROR, Activator.getPluginId(), 0, cause - .getMessage(), cause)); + Activator + .handleError( + UIText.RefSpecPage_errorTransportDialogMessage, + cause, true); return; } catch (InterruptedException e) { transportError(UIText.RefSpecPage_operationCancelled); diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/uitext.properties b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/uitext.properties index f1fa77f2b6..fac5324f20 100644 --- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/uitext.properties +++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/uitext.properties @@ -597,8 +597,7 @@ RefSpecPanel_validationWildcardInconsistent=Wildcard must be set either on both RefSpecPage_descriptionFetch=Select refs to fetch. RefSpecPage_descriptionPush=Select refs to push. RefSpecPage_errorDontMatchSrc=Specifications don't match any existing refs in source repository. -RefSpecPage_errorTransportDialogMessage=Cannot get remote repository refs. -RefSpecPage_errorTransportDialogTitle=Transport Error +RefSpecPage_errorTransportDialogMessage=Transport Error: Cannot get remote repository refs. RefSpecPage_operationCancelled=Operation canceled. RefSpecPage_saveSpecifications=Save specifications in ''{0}'' configuration RefSpecPage_titleFetch=Fetch Ref Specifications |