diff options
Diffstat (limited to 'bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/mapping/MergeAllOperation.java')
| -rw-r--r-- | bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/mapping/MergeAllOperation.java | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/mapping/MergeAllOperation.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/mapping/MergeAllOperation.java index b681f06b6..2d2400afc 100644 --- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/mapping/MergeAllOperation.java +++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/mapping/MergeAllOperation.java @@ -82,16 +82,16 @@ public final class MergeAllOperation extends SynchronizationOperation { return (IMergeContext)getContext(); } private boolean promptToContinue(final IStatus status) { - final boolean[] result = new boolean[] { false }; - Runnable runnable = () -> { + final boolean[] result = new boolean[] { false }; + Runnable runnable = () -> { ErrorDialog dialog = new ErrorDialog(getShell(), TeamUIMessages.ModelMergeOperation_0, TeamUIMessages.ModelMergeOperation_1, status, IStatus.ERROR | IStatus.WARNING | IStatus.INFO) { @Override protected void createButtonsForButtonBar(Composite parent) { - createButton(parent, IDialogConstants.YES_ID, IDialogConstants.YES_LABEL, - false); + createButton(parent, IDialogConstants.YES_ID, IDialogConstants.YES_LABEL, + false); createButton(parent, IDialogConstants.NO_ID, IDialogConstants.NO_LABEL, true); - createDetailsButton(parent); + createDetailsButton(parent); } @Override |