We already do the same in analogous RefSpecPage and PushWizard etc., so
let's do the same here.
Signed-off-by: Marek Zawirski <marek.zawirski@xxxxxxxxx>
---
.../src/org/spearce/egit/ui/UIText.java | 3 +++
.../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 b2cb340..b09cc10 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 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 08d21b3..6e925a7 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.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.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 @@ setErrorMessage(NLS.bind(UIText.ConfirmationPage_errorUnexpected, e
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 0590e30..22e29c2 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}
--
1.5.6.3
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
