From: Marek Zawirski <marek.zawirski@gmail.com>
To: robin.rosenberg@dewire.com, spearce@spearce.org
Cc: git@vger.kernel.org, Marek Zawirski <marek.zawirski@gmail.com>
Subject: [EGIT PATCH 3/3] Show ErrorDialog fot fatal connection errors in ConfirmationPage
Date: Thu, 28 Aug 2008 03:36:10 +0200 [thread overview]
Message-ID: <1219887370-17265-3-git-send-email-marek.zawirski@gmail.com> (raw)
In-Reply-To: <1219887370-17265-2-git-send-email-marek.zawirski@gmail.com>
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@gmail.com>
---
.../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
next prev parent reply other threads:[~2008-08-28 1:37 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-08-28 1:36 [EGIT PATCH 1/3] Give NoRemoteRepositoryException better message in BasePackConnection Marek Zawirski
2008-08-28 1:36 ` [EGIT PATCH 2/3] Handle NoRemoteRepositoryException in PushOperation especially Marek Zawirski
2008-08-28 1:36 ` Marek Zawirski [this message]
2008-08-28 2:21 ` [EGIT PATCH 3/3] Show ErrorDialog fot fatal connection errors in ConfirmationPage Shawn O. Pearce
2008-08-28 2:30 ` Marek Zawirski
2008-08-28 2:19 ` [EGIT PATCH 2/3] Handle NoRemoteRepositoryException in PushOperation especially Shawn O. Pearce
2008-08-28 2:29 ` Marek Zawirski
2008-08-28 2:35 ` [EGIT PATCH 1/3] Give NoRemoteRepositoryException better message in BasePackConnection Shawn O. Pearce
2008-08-28 2:40 ` Marek Zawirski
2008-08-28 2:44 ` Shawn O. Pearce
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1219887370-17265-3-git-send-email-marek.zawirski@gmail.com \
--to=marek.zawirski@gmail.com \
--cc=git@vger.kernel.org \
--cc=robin.rosenberg@dewire.com \
--cc=spearce@spearce.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).