From c46fd0d57551b7099ad089149fa018a8aaf4be3b Mon Sep 17 00:00:00 2001 From: Thomas Wolf Date: Mon, 13 Aug 2018 14:06:55 +0200 Subject: [PATCH] Use multi-line text fields for merge and rebase result dialogs Text fields that are supposed to show multiple lines should actually be created as multi-line fields (SWT.MULTI), not single-line fields. Bug: 537482 Change-Id: Ib0f53584ff326e2160159984e140318a8fa4c432 Signed-off-by: Thomas Wolf --- .../org/eclipse/egit/ui/internal/merge/MergeResultDialog.java | 2 +- .../org/eclipse/egit/ui/internal/rebase/RebaseResultDialog.java | 9 +++++---- 2 files changed, 6 insertions(+), 5 deletions(-) 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 74c9bb0aa..ce3673c52 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 @@ -130,7 +130,7 @@ public class MergeResultDialog extends Dialog { Label pathsLabel = new Label(composite, SWT.NONE); pathsLabel.setText(UIText.MergeResultDialog_failed); pathsLabel.setLayoutData(new GridData(SWT.LEFT, SWT.TOP, false, false)); - Text pathsText = new Text(composite, SWT.READ_ONLY); + Text pathsText = new Text(composite, SWT.READ_ONLY | SWT.MULTI); pathsText.setLayoutData(new GridData(SWT.FILL, SWT.FILL, false, false)); Set> failedPaths = mergeResult.getFailingPaths().entrySet(); int n = 0; 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 e7d39ccfc..3610835ae 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 @@ -274,8 +274,9 @@ public class RebaseResultDialog extends MessageDialog { resultLabel.setText(UIText.MergeResultDialog_result); resultLabel.setLayoutData(new GridData(SWT.LEFT, SWT.CENTER, false, false)); - Text resultText = new Text(composite, SWT.READ_ONLY); - resultText.setText(getStatusText(result.getStatus())); + Text resultText = new Text(composite, SWT.READ_ONLY | SWT.MULTI); + resultText.setText(getStatusText(result.getStatus()).replace("\n", //$NON-NLS-1$ + Text.DELIMITER)); if (!result.getStatus().isSuccessful()) resultText.setForeground(composite.getParent().getDisplay() .getSystemColor(SWT.COLOR_RED)); @@ -288,7 +289,7 @@ public class RebaseResultDialog extends MessageDialog { pathsLabel.setText(UIText.MergeResultDialog_failed); pathsLabel.setLayoutData(new GridData(SWT.LEFT, SWT.TOP, false, false)); - Text pathsText = new Text(composite, SWT.READ_ONLY); + Text pathsText = new Text(composite, SWT.READ_ONLY | SWT.MULTI); pathsText.setLayoutData(new GridData(SWT.FILL, SWT.FILL, false, false)); Set> failedPaths = result @@ -317,7 +318,7 @@ public class RebaseResultDialog extends MessageDialog { pathsLabel.setText(UIText.MergeResultDialog_conflicts); pathsLabel.setLayoutData(new GridData(SWT.LEFT, SWT.TOP, false, false)); - Text pathsText = new Text(composite, SWT.READ_ONLY); + Text pathsText = new Text(composite, SWT.READ_ONLY | SWT.MULTI); pathsText.setLayoutData(new GridData(SWT.FILL, SWT.FILL, false, false)); List conflList = result.getConflicts(); -- 2.11.4.GIT