[EGIT PATCH 3/6] Handle URIs parsing errors in PushAction better

Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
From: Marek Zawirski
Date: Tuesday, August 19, 2008 - 7:57 pm

ErrorDialog is used instead of MessageDialog (more information), strings
are externalized.

Signed-off-by: Marek Zawirski <marek.zawirski@gmail.com>
---
 .../src/org/spearce/egit/ui/UIText.java            |    6 ++++++
 .../egit/ui/internal/actions/PushAction.java       |   13 +++++++++----
 .../src/org/spearce/egit/ui/uitext.properties      |    3 +++
 3 files changed, 18 insertions(+), 4 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 cc785f7..b45d2e9 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
@@ -464,6 +464,12 @@
 	public static String HistoryPreferencePage_title;
 
 	/** */
+	public static String PushAction_wrongURIDescription;
+
+	/** */
+	public static String PushAction_wrongURITitle;
+
+	/** */
 	public static String PushWizard_cantConnectToAny;
 
 	/** */
diff --git a/org.spearce.egit.ui/src/org/spearce/egit/ui/internal/actions/PushAction.java b/org.spearce.egit.ui/src/org/spearce/egit/ui/internal/actions/PushAction.java
index 61833d0..b4af3b5 100644
--- a/org.spearce.egit.ui/src/org/spearce/egit/ui/internal/actions/PushAction.java
+++ b/org.spearce.egit.ui/src/org/spearce/egit/ui/internal/actions/PushAction.java
@@ -9,9 +9,13 @@
 
 import java.net.URISyntaxException;
 
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.Status;
 import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.dialogs.MessageDialog;
+import org.eclipse.jface.dialogs.ErrorDialog;
 import org.eclipse.jface.wizard.WizardDialog;
+import org.spearce.egit.ui.Activator;
+import org.spearce.egit.ui.UIText;
 import org.spearce.egit.ui.internal.push.PushWizard;
 import org.spearce.jgit.lib.Repository;
 
@@ -31,9 +35,10 @@ public void run(IAction action) {
 		try {
 			pushWizard = new PushWizard(repository);
 		} catch (URISyntaxException x) {
-			MessageDialog.openError(getShell(), "Corrupted configuration",
-					"Remote repositories URLs configuration is corrupted: "
-							+ x.getMessage());
+			ErrorDialog.openError(getShell(), UIText.PushAction_wrongURITitle,
+					UIText.PushAction_wrongURIDescription, new Status(
+							IStatus.ERROR, Activator.getPluginId(), x
+									.getMessage(), x));
 			return;
 		}
 		final WizardDialog dialog = new WizardDialog(getShell(), pushWizard);
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 4b0aea6..83be622 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
@@ -179,6 +179,9 @@ HistoryPage_findbar_notFound=String not found
 
 HistoryPreferencePage_title=Git
 
+PushAction_wrongURIDescription=Remote repositories URIs configuration is corrupted.
+PushAction_wrongURITitle=Corrupted Configuration
+
 PushWizard_cantConnectToAny=Can't connect to any repository: {0}
 PushWizard_cantPrepareUpdatesMessage=Can't resolve ref specifications locally (local refs changed?) or create tracking ref update.
 PushWizard_cantPrepareUpdatesTitle=Preparing Ref Updates Error
-- 
1.5.6.3

--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]

Messages in current thread:
[EGIT PATCH 10/31] Improve javadoc of Transport push(), Marek Zawirski, (Sun Aug 17, 1:43 pm)
[EGIT PATCH 17/31] Fix typo in uitext.properties message, Marek Zawirski, (Sun Aug 17, 1:43 pm)
[EGIT PATCH 27/31] Add few EPL Eclipse icons, Marek Zawirski, (Sun Aug 17, 1:44 pm)
[EGIT PATCH 28/31] Checkbox images/screenshots, Marek Zawirski, (Sun Aug 17, 1:44 pm)
[EGIT PATCH 30/31] Add PushOperation to plugin, Marek Zawirski, (Sun Aug 17, 1:44 pm)
[EGIT PATCH 31/31] Push GUI, Marek Zawirski, (Sun Aug 17, 1:44 pm)
Re: [EGIT PATCH 28/31] Checkbox images/screenshots, Robin Rosenberg, (Tue Aug 19, 11:24 am)
[EGIT PATCH 3/6] Handle URIs parsing errors in PushAction ..., Marek Zawirski, (Tue Aug 19, 7:57 pm)
[EGIT PATCH 6/6] Fix RefSpecPage formatting, Marek Zawirski, (Tue Aug 19, 7:57 pm)
Git-aware Issue Tracking?, Petr Baudis, (Wed Aug 20, 8:23 am)
Re: Git-aware Issue Tracking?, Shawn O. Pearce, (Wed Aug 20, 9:44 am)
Re: Git-aware Issue Tracking?, Jakub Narebski, (Wed Aug 20, 11:52 am)
Re: Git-aware Issue Tracking?, Mike Dalessio, (Wed Aug 20, 1:22 pm)
Re: Git-aware Issue Tracking?, Robin Rosenberg, (Wed Aug 20, 1:25 pm)
Re: Git-aware Issue Tracking?, Pierre Habouzit, (Thu Aug 21, 1:30 am)
Re: Git-aware Issue Tracking?, Martin Langhoff, (Thu Aug 21, 1:47 am)
Re: Git-aware Issue Tracking?, Imran M Yousuf, (Thu Aug 21, 1:55 am)
Re: Git-aware Issue Tracking?, Jakub Narebski, (Thu Aug 21, 2:23 am)