diff options
author | Paul Pazderski | 2019-05-18 14:07:38 +0000 |
---|---|---|
committer | Paul Pazderski | 2019-05-19 23:54:17 +0000 |
commit | de3c0c5ff08c928e6d1eb4fac2704bbb2d261669 (patch) | |
tree | de6e0a11c45731a312b5e239c22387afe93fe19c /bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/synchronize/ModelMergeOperation.java | |
parent | 5e9e26b1abe5bd1df37faa91fde2d87fd79ed06b (diff) | |
download | eclipse.platform.team-de3c0c5ff08c928e6d1eb4fac2704bbb2d261669.tar.gz eclipse.platform.team-de3c0c5ff08c928e6d1eb4fac2704bbb2d261669.tar.xz eclipse.platform.team-de3c0c5ff08c928e6d1eb4fac2704bbb2d261669.zip |
Bug 547304 - [cleanup] Fix wrong space/tab indentationS4_12_0_RC2S4_12_0_RC1aS4_12_0_RC1S4_12_0_M3R4_12I20190605-1800I20190605-0600I20190604-1800I20190604-0600I20190603-1800I20190603-0600I20190602-1800I20190602-0600I20190601-1800I20190531-1800I20190531-0245I20190529-2005I20190529-1800I20190529-0600I20190528-1800I20190528-0915I20190528-0850I20190528-0600I20190527-1805I20190527-0600I20190526-1800I20190526-0600I20190525-1800I20190525-0600I20190524-1800I20190524-0135I20190522-1800I20190522-0600I20190521-1800I20190521-0600I20190520-1805I20190520-0600R4_12_maintenance
This change fixes space or mixed tab/space indentations in all Java
files. This also includes two or three space indentations and even fix
most stray single spaces in indentations.
The change includes only whitespace formatting and no code changes.
Change-Id: I4149aaf4e48ccf7b49083f36d52e0c7a67433c7d
Diffstat (limited to 'bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/synchronize/ModelMergeOperation.java')
-rw-r--r-- | bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/synchronize/ModelMergeOperation.java | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/synchronize/ModelMergeOperation.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/synchronize/ModelMergeOperation.java index 54a0acba4..a3954d833 100644 --- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/synchronize/ModelMergeOperation.java +++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/synchronize/ModelMergeOperation.java @@ -213,16 +213,16 @@ public abstract class ModelMergeOperation extends ModelOperation { * @param status the status returned from the mergers that reported the validation failures */ protected void handleValidationFailure(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 |