diff options
| author | Konrad Kügler | 2014-02-09 13:03:48 +0000 |
|---|---|---|
| committer | Matthias Sohn | 2014-02-13 20:35:18 +0000 |
| commit | 0a7b50bdf755d7ba114d59450e0d9af8f6a06fdd (patch) | |
| tree | d685056771e787def75162d3447a9470dddf1779 /org.eclipse.egit.ui | |
| parent | aaba3270d8e2130a5d9e27161e0797a8f51da269 (diff) | |
| download | egit-0a7b50bdf755d7ba114d59450e0d9af8f6a06fdd.tar.gz egit-0a7b50bdf755d7ba114d59450e0d9af8f6a06fdd.tar.xz egit-0a7b50bdf755d7ba114d59450e0d9af8f6a06fdd.zip | |
Show rebase result status text in red for all failure states
Used to be done only for Status.FAILED and Status.CONFLICTS, but makes
sense for all unsuccessful states.
Change-Id: I6d402402d820ed7843906aad48e670b2722b4fe1
Signed-off-by: Konrad Kügler <swamblumat-eclipsebugs@yahoo.de>
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
Diffstat (limited to 'org.eclipse.egit.ui')
| -rw-r--r-- | org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/rebase/RebaseResultDialog.java | 11 |
1 files changed, 4 insertions, 7 deletions
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 d321b10acf..648339e647 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 @@ -257,13 +257,13 @@ public class RebaseResultDialog extends MessageDialog { false)); Text resultText = new Text(composite, SWT.READ_ONLY); resultText.setText(getStatusText(result.getStatus())); + if (!result.getStatus().isSuccessful()) + resultText.setForeground(composite.getParent().getDisplay() + .getSystemColor(SWT.COLOR_RED)); resultText.setSelection(resultText.getCaretPosition()); resultText.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, false)); - if (result.getStatus() == Status.FAILED) { - resultText.setForeground(composite.getParent().getDisplay() - .getSystemColor( - SWT.COLOR_RED)); + if (result.getStatus() == Status.FAILED) { StringBuilder paths = new StringBuilder(); Label pathsLabel = new Label(composite, SWT.NONE); pathsLabel.setText(UIText.MergeResultDialog_failed); @@ -293,9 +293,6 @@ public class RebaseResultDialog extends MessageDialog { } pathsText.setText(paths.toString()); } else if (result.getStatus() == Status.CONFLICTS) { - resultText.setForeground(composite.getParent().getDisplay() - .getSystemColor(SWT.COLOR_RED)); - StringBuilder paths = new StringBuilder(); Label pathsLabel = new Label(composite, SWT.NONE); pathsLabel.setText(UIText.MergeResultDialog_conflicts); |