From fda636c9315237121f939ed6dbb8915458a62e3a Mon Sep 17 00:00:00 2001 From: Marek Zawirski Date: Thu, 28 Aug 2008 03:25:08 +0200 Subject: [PATCH] Show ErrorDialog for fatal connection errors in ConfirmationPage We already do the same in analogous RefSpecPage and PushWizard etc., so let's do the same here. Signed-off-by: Marek Zawirski --- org.spearce.egit.ui/src/org/spearce/egit/ui/UIText.java | 3 +++ .../spearce/egit/ui/internal/push/ConfirmationPage.java | 16 ++++++++++++++-- .../src/org/spearce/egit/ui/uitext.properties | 1 + 3 files changed, 18 insertions(+), 2 deletions(-) diff --git a/org.spearce.egit.ui/src/org/spearce/egit/ui/UIText.java b/org.spearce.egit.ui/src/org/spearce/egit/ui/UIText.java index b2cb3404..b09cc100 100644 --- a/org.spearce.egit.ui/src/org/spearce/egit/ui/UIText.java +++ b/org.spearce.egit.ui/src/org/spearce/egit/ui/UIText.java @@ -518,6 +518,9 @@ public class UIText extends NLS { public static String PushWizard_windowTitleWithDestination; /** */ + public static String ConfirmationPage_cantConnectToAnyTitle; + + /** */ public static String ConfirmationPage_cantConnectToAny; /** */ diff --git a/org.spearce.egit.ui/src/org/spearce/egit/ui/internal/push/ConfirmationPage.java b/org.spearce.egit.ui/src/org/spearce/egit/ui/internal/push/ConfirmationPage.java index 08d21b31..6e925a74 100644 --- a/org.spearce.egit.ui/src/org/spearce/egit/ui/internal/push/ConfirmationPage.java +++ b/org.spearce.egit.ui/src/org/spearce/egit/ui/internal/push/ConfirmationPage.java @@ -13,6 +13,9 @@ import java.util.ArrayList; import java.util.Collection; import java.util.List; +import org.eclipse.core.runtime.IStatus; +import org.eclipse.core.runtime.Status; +import org.eclipse.jface.dialogs.ErrorDialog; import org.eclipse.jface.wizard.WizardPage; import org.eclipse.osgi.util.NLS; import org.eclipse.swt.SWT; @@ -24,6 +27,7 @@ import org.eclipse.swt.widgets.Control; import org.spearce.egit.core.op.PushOperation; import org.spearce.egit.core.op.PushOperationResult; import org.spearce.egit.core.op.PushOperationSpecification; +import org.spearce.egit.ui.Activator; import org.spearce.egit.ui.UIText; import org.spearce.egit.ui.internal.components.RefSpecPage; import org.spearce.egit.ui.internal.components.RepositorySelection; @@ -204,8 +208,16 @@ class ConfirmationPage extends WizardPage { setPageComplete(true); confirmedResult = result; } else { - setErrorMessage(NLS.bind(UIText.ConfirmationPage_cantConnectToAny, - result.getErrorStringForAllURis())); + final String message = NLS.bind( + UIText.ConfirmationPage_cantConnectToAny, result + .getErrorStringForAllURis()); + setErrorMessage(message); + ErrorDialog + .openError(getShell(), + UIText.ConfirmationPage_cantConnectToAnyTitle, + null, + new Status(IStatus.ERROR, Activator.getPluginId(), + message)); } } } diff --git a/org.spearce.egit.ui/src/org/spearce/egit/ui/uitext.properties b/org.spearce.egit.ui/src/org/spearce/egit/ui/uitext.properties index 0590e309..22e29c2c 100644 --- a/org.spearce.egit.ui/src/org/spearce/egit/ui/uitext.properties +++ b/org.spearce.egit.ui/src/org/spearce/egit/ui/uitext.properties @@ -199,6 +199,7 @@ PushWizard_unexpectedError=Unexpected error occurred. PushWizard_windowTitleDefault=Push To Another Repositories PushWizard_windowTitleWithDestination=Push To: {0} +ConfirmationPage_cantConnectToAnyTitle=Can't Connect ConfirmationPage_cantConnectToAny=Can't connect to any URI: {0} ConfirmationPage_description=Confirm following expected push result. ConfirmationPage_errorCantResolveSpecs=Can't resolve ref specifications locally or create tracking ref update: {0} -- 2.11.4.GIT