Add nice labels for merge/rebase result status

Before, the raw enum names/toString were used. With this change, they
should look nicer in the UI.

Bug: 413275
Change-Id: I78b4b2a314840c6dea229e022b90ac66a25d1693
Signed-off-by: Robin Stocker <robin@nibor.org>

5 files changed, 150 insertions, 7 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 c8deef0e8d..c7b6f898f0 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
@@ -729,9 +729,33 @@ public class UIText extends NLS {
 	public static String RebaseResultDialog_StartMergeRadioText;
 
 	/** */
+	public static String RebaseResultDialog_StatusAborted;
+
+	/** */
+	public static String RebaseResultDialog_StatusConflicts;
+
+	/** */
+	public static String RebaseResultDialog_StatusFailed;
+
+	/** */
+	public static String RebaseResultDialog_StatusFastForward;
+
+	/** */
 	public static String RebaseResultDialog_StatusLabel;
 
 	/** */
+	public static String RebaseResultDialog_StatusNothingToCommit;
+
+	/** */
+	public static String RebaseResultDialog_StatusOK;
+
+	/** */
+	public static String RebaseResultDialog_StatusStopped;
+
+	/** */
+	public static String RebaseResultDialog_StatusUpToDate;
+
+	/** */
 	public static String RebaseResultDialog_Stopped;
 
 	/** */
@@ -3390,6 +3414,42 @@ public class UIText extends NLS {
 	public static String MergeResultDialog_result;
 
 	/** */
+	public static String MergeResultDialog_StatusAborted;
+
+	/** */
+	public static String MergeResultDialog_StatusAlreadyUpToDate;
+
+	/** */
+	public static String MergeResultDialog_StatusCheckoutConflict;
+
+	/** */
+	public static String MergeResultDialog_StatusConflicting;
+
+	/** */
+	public static String MergeResultDialog_StatusFailed;
+
+	/** */
+	public static String MergeResultDialog_StatusFastForward;
+
+	/** */
+	public static String MergeResultDialog_StatusFastForwardSquashed;
+
+	/** */
+	public static String MergeResultDialog_StatusMerged;
+
+	/** */
+	public static String MergeResultDialog_StatusMergedNotCommitted;
+
+	/** */
+	public static String MergeResultDialog_StatusMergedSquashed;
+
+	/** */
+	public static String MergeResultDialog_StatusMergedSquashedNotCommitted;
+
+	/** */
+	public static String MergeResultDialog_StatusNotSupported;
+
+	/** */
 	public static String MergeTargetSelectionDialog_ButtonMerge;
 
 	/** */
diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/merge/MergeResultDialog.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/merge/MergeResultDialog.java
index 44f9741c13..7cb2cbb8f4 100644
--- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/merge/MergeResultDialog.java
+++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/merge/MergeResultDialog.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (C) 2010, 2012 Jens Baumgart <jens.baumgart@sap.com> and others.
+ * Copyright (C) 2010, 2013 Jens Baumgart <jens.baumgart@sap.com> and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -117,7 +117,7 @@ public class MergeResultDialog extends Dialog {
 		resultLabel.setLayoutData(new GridData(SWT.LEFT, SWT.CENTER, false,
 				false));
 		Text resultText = new Text(composite, SWT.READ_ONLY);
-		resultText.setText(mergeResult.getMergeStatus().toString());
+		resultText.setText(getStatusText(mergeResult.getMergeStatus()));
 		resultText.setSelection(resultText.getCaretPosition());
 		resultText.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, false));
 		if (mergeResult.getMergeStatus() == MergeStatus.FAILED) {
@@ -253,6 +253,40 @@ public class MergeResultDialog extends Dialog {
 		return composite;
 	}
 
+	/**
+	 * @param mergeStatus
+	 * @return text describing merge status in short form
+	 */
+	public static String getStatusText(MergeStatus mergeStatus) {
+		switch (mergeStatus) {
+		case FAST_FORWARD:
+			return UIText.MergeResultDialog_StatusFastForward;
+		case FAST_FORWARD_SQUASHED:
+			return UIText.MergeResultDialog_StatusFastForwardSquashed;
+		case ALREADY_UP_TO_DATE:
+			return UIText.MergeResultDialog_StatusAlreadyUpToDate;
+		case FAILED:
+			return UIText.MergeResultDialog_StatusFailed;
+		case MERGED:
+			return UIText.MergeResultDialog_StatusMerged;
+		case MERGED_SQUASHED:
+			return UIText.MergeResultDialog_StatusMergedSquashed;
+		case MERGED_SQUASHED_NOT_COMMITTED:
+			return UIText.MergeResultDialog_StatusMergedSquashedNotCommitted;
+		case CONFLICTING:
+			return UIText.MergeResultDialog_StatusConflicting;
+		case ABORTED:
+			return UIText.MergeResultDialog_StatusAborted;
+		case MERGED_NOT_COMMITTED:
+			return UIText.MergeResultDialog_StatusMergedNotCommitted;
+		case NOT_SUPPORTED:
+			return UIText.MergeResultDialog_StatusNotSupported;
+		case CHECKOUT_CONFLICT:
+			return UIText.MergeResultDialog_StatusCheckoutConflict;
+		}
+		return mergeStatus.toString();
+	}
+
 	private RepositoryCommit[] getCommits(final ObjectId[] merges) {
 		final List<RepositoryCommit> commits = new ArrayList<RepositoryCommit>();
 		final RevWalk walk = new RevWalk(objectReader);
diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/pull/MultiPullResultDialog.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/pull/MultiPullResultDialog.java
index 76519eb228..abf31ea0ce 100644
--- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/pull/MultiPullResultDialog.java
+++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/pull/MultiPullResultDialog.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2011, 2012 SAP AG and others.
+ * Copyright (c) 2011, 2013 SAP AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -23,6 +23,8 @@ import org.eclipse.core.runtime.IStatus;
 import org.eclipse.egit.core.RepositoryUtil;
 import org.eclipse.egit.ui.Activator;
 import org.eclipse.egit.ui.internal.UIText;
+import org.eclipse.egit.ui.internal.merge.MergeResultDialog;
+import org.eclipse.egit.ui.internal.rebase.RebaseResultDialog;
 import org.eclipse.jface.dialogs.Dialog;
 import org.eclipse.jface.dialogs.IDialogConstants;
 import org.eclipse.jface.layout.GridDataFactory;
@@ -127,12 +129,13 @@ public class MultiPullResultDialog extends Dialog {
 				if (pullRes.getMergeResult() != null) {
 					return NLS.bind(
 							UIText.MultiPullResultDialog_MergeResultMessage,
-							pullRes.getMergeResult().getMergeStatus().name());
+							MergeResultDialog.getStatusText(pullRes
+									.getMergeResult().getMergeStatus()));
 				} else if (pullRes.getRebaseResult() != null) {
 					RebaseResult res = pullRes.getRebaseResult();
 					return NLS.bind(
 							UIText.MultiPullResultDialog_RebaseResultMessage,
-							res.getStatus().name());
+							RebaseResultDialog.getStatusText(res.getStatus()));
 				} else {
 					return UIText.MultiPullResultDialog_NothingUpdatedStatus;
 				}
diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/rebase/RebaseResultDialog.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/rebase/RebaseResultDialog.java
index 3e525d7d12..48e4f3713f 100644
--- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/rebase/RebaseResultDialog.java
+++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/rebase/RebaseResultDialog.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2010 SAP AG.
+ * Copyright (c) 2010, 2013 SAP AG and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -165,6 +165,32 @@ public class RebaseResultDialog extends MessageDialog {
 	}
 
 	/**
+	 * @param status
+	 * @return text describing rebase status in short form
+	 */
+	public static String getStatusText(Status status) {
+		switch (status) {
+		case OK:
+			return UIText.RebaseResultDialog_StatusOK;
+		case ABORTED:
+			return UIText.RebaseResultDialog_StatusAborted;
+		case STOPPED:
+			return UIText.RebaseResultDialog_StatusStopped;
+		case FAILED:
+			return UIText.RebaseResultDialog_StatusFailed;
+		case CONFLICTS:
+			return UIText.RebaseResultDialog_StatusConflicts;
+		case UP_TO_DATE:
+			return UIText.RebaseResultDialog_StatusUpToDate;
+		case FAST_FORWARD:
+			return UIText.RebaseResultDialog_StatusFastForward;
+		case NOTHING_TO_COMMIT:
+			return UIText.RebaseResultDialog_StatusNothingToCommit;
+		}
+		return status.toString();
+	}
+
+	/**
 	 * @param shell
 	 * @param repository
 	 * @param result
@@ -217,7 +243,7 @@ public class RebaseResultDialog extends MessageDialog {
 		resultLabel.setLayoutData(new GridData(SWT.LEFT, SWT.CENTER, false,
 				false));
 		Text resultText = new Text(composite, SWT.READ_ONLY);
-		resultText.setText(result.getStatus().toString());
+		resultText.setText(getStatusText(result.getStatus()));
 		resultText.setSelection(resultText.getCaretPosition());
 		resultText.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, false));
 		if (result.getStatus() == Status.FAILED) {
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 7f83e62042..d74fdb8315 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
@@ -308,7 +308,15 @@ RebaseResultDialog_notShared=<not shared>
 RebaseResultDialog_notSharedMessage=Some conflicting files reside in projects not shared with Git. Please share the related projects with Git.
 RebaseResultDialog_SkipCommitButton=&Skip this commit and continue rebasing the next commits
 RebaseResultDialog_StartMergeRadioText=Start Merge &Tool to resolve conflicts
+RebaseResultDialog_StatusAborted=Aborted
+RebaseResultDialog_StatusConflicts=Checkout conflict
+RebaseResultDialog_StatusFailed=Failed
+RebaseResultDialog_StatusFastForward=Fast-forward
 RebaseResultDialog_StatusLabel=Result status: {0}
+RebaseResultDialog_StatusNothingToCommit=Nothing to commit
+RebaseResultDialog_StatusOK=OK
+RebaseResultDialog_StatusStopped=Stopped
+RebaseResultDialog_StatusUpToDate=Up-to-date
 RebaseResultDialog_Stopped=Rebase stopped with conflicts
 RebaseResultDialog_SuccessfullyFinished=Rebase finished successfully
 RebaseResultDialog_ToggleShowButton=Don't show this confirmation dialog again
@@ -965,6 +973,18 @@ MergeResultDialog_mergeInput=Merge input
 MergeResultDialog_newHead=New HEAD
 MergeResultDialog_nMore=... {0} more
 MergeResultDialog_result=Result
+MergeResultDialog_StatusAborted=Aborted
+MergeResultDialog_StatusAlreadyUpToDate=Already up-to-date
+MergeResultDialog_StatusCheckoutConflict=Checkout conflict
+MergeResultDialog_StatusConflicting=Merge conflict
+MergeResultDialog_StatusFailed=Failed
+MergeResultDialog_StatusFastForward=Fast-forward
+MergeResultDialog_StatusFastForwardSquashed=Fast-forward (squashed)
+MergeResultDialog_StatusMerged=Merged
+MergeResultDialog_StatusMergedNotCommitted=Merged (not committed)
+MergeResultDialog_StatusMergedSquashed=Merged (squashed)
+MergeResultDialog_StatusMergedSquashedNotCommitted=Merged (squashed, not committed)
+MergeResultDialog_StatusNotSupported=Not yet supported
 MergeTargetSelectionDialog_ButtonMerge=&Merge
 MergeTargetSelectionDialog_SelectRef=Select a branch or tag to merge into the currently checked out branch
 MergeTargetSelectionDialog_SelectRefWithBranch=Select a branch or tag to merge into the ''{0}'' branch