diff options
3 files changed, 11 insertions, 28 deletions
diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/UIText.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/UIText.java index 13399ac19a..6596541bd5 100644 --- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/UIText.java +++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/UIText.java @@ -2938,6 +2938,9 @@ public class UIText extends NLS { public static String MultiPullResultDialog_OkStatus; /** */ + public static String MultiPullResultDialog_FailedStatus; + + /** */ public static String MultiPullResultDialog_OverallStatusColumnHeader; /** */ 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 69c7fb2104..658a0e37ca 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 @@ -31,7 +31,6 @@ import org.eclipse.jface.viewers.ITableLabelProvider; import org.eclipse.jface.viewers.OpenEvent; import org.eclipse.jface.viewers.SelectionChangedEvent; import org.eclipse.jface.viewers.TableViewer; -import org.eclipse.jgit.api.MergeResult; import org.eclipse.jgit.api.PullResult; import org.eclipse.jgit.api.RebaseResult; import org.eclipse.jgit.lib.Repository; @@ -74,7 +73,6 @@ public class MultiPullResultDialog extends Dialog { public Image getColumnImage(Object element, int columnIndex) { if (columnIndex != 3) return null; - boolean error = false; Entry<Repository, Object> item = (Entry<Repository, Object>) element; Object resultOrError = item.getValue(); if (resultOrError instanceof IStatus) @@ -82,31 +80,8 @@ public class MultiPullResultDialog extends Dialog { ISharedImages.IMG_ELCL_STOP); PullResult res = (PullResult) item.getValue(); - MergeResult mres = res.getMergeResult(); - if (mres != null) { - switch (mres.getMergeStatus()) { - case ALREADY_UP_TO_DATE: - case FAST_FORWARD: - case MERGED: - break; - default: - error = true; - break; - } - } - RebaseResult rres = res.getRebaseResult(); - if (rres != null) { - switch (rres.getStatus()) { - case ABORTED: - case FAILED: - case STOPPED: - break; - default: - error = true; - break; - } - } - if (error) + boolean success = res.isSuccessful(); + if (!success) return PlatformUI.getWorkbench().getSharedImages().getImage( ISharedImages.IMG_ELCL_STOP); return null; @@ -157,7 +132,11 @@ public class MultiPullResultDialog extends Dialog { IStatus status = (IStatus) item.getValue(); return status.getMessage(); } - return UIText.MultiPullResultDialog_OkStatus; + PullResult res = (PullResult) item.getValue(); + if (res.isSuccessful()) + return UIText.MultiPullResultDialog_OkStatus; + else + return UIText.MultiPullResultDialog_FailedStatus; default: return null; } diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/uitext.properties b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/uitext.properties index e09534337e..4ddf9581e5 100644 --- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/uitext.properties +++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/uitext.properties @@ -1089,6 +1089,7 @@ MultiPullResultDialog_MergeResultMessage=Merge result: {0} MultiPullResultDialog_NothingFetchedStatus=Nothing fetched MultiPullResultDialog_NothingUpdatedStatus=Nothing updated MultiPullResultDialog_OkStatus=OK +MultiPullResultDialog_FailedStatus=Failed MultiPullResultDialog_OverallStatusColumnHeader=Overall Status MultiPullResultDialog_RebaseResultMessage=Rebase result: {0} MultiPullResultDialog_RepositoryColumnHeader=Repository |