1 files changed, 18 insertions, 13 deletions

diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/mappings/ModelReplaceOperation.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/mappings/ModelReplaceOperation.java
index c1d7bc66a..3f2cf9ccc 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/mappings/ModelReplaceOperation.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/mappings/ModelReplaceOperation.java
@@ -37,6 +37,7 @@ public class ModelReplaceOperation extends ModelUpdateOperation {
 	/* (non-Javadoc)
 	 * @see org.eclipse.team.ui.TeamOperation#getJobName()
 	 */
+	@Override
 	protected String getJobName() {
 		return CVSUIMessages.ReplaceOperation_taskName;
 	}
@@ -44,6 +45,7 @@ public class ModelReplaceOperation extends ModelUpdateOperation {
 	/* (non-Javadoc)
 	 * @see org.eclipse.team.ui.operations.ResourceMappingMergeOperation#isAttemptHeadlessMerge()
 	 */
+	@Override
 	protected boolean isAttemptHeadlessMerge() {
 		return true;
 	}
@@ -51,6 +53,7 @@ public class ModelReplaceOperation extends ModelUpdateOperation {
 	/* (non-Javadoc)
 	 * @see org.eclipse.team.ui.operations.ResourceMappingMergeOperation#hasChangesOfInterest()
 	 */
+	@Override
 	protected boolean hasChangesOfInterest() {
 		IMergeContext context = (IMergeContext)getContext();
 		return !context.getDiffTree().isEmpty();
@@ -59,6 +62,7 @@ public class ModelReplaceOperation extends ModelUpdateOperation {
 	/* (non-Javadoc)
 	 * @see org.eclipse.team.internal.ccvs.ui.mappings.ModelUpdateOperation#getMergeType()
 	 */
+	@Override
 	protected int getMergeType() {
 		return ISynchronizationContext.TWO_WAY;
 	}
@@ -66,6 +70,7 @@ public class ModelReplaceOperation extends ModelUpdateOperation {
 	/* (non-Javadoc)
 	 * @see org.eclipse.team.ui.operations.ResourceMappingMergeOperation#performMerge(org.eclipse.core.runtime.IProgressMonitor)
 	 */
+	@Override
 	protected IStatus performMerge(IProgressMonitor monitor) throws CoreException {
 		if (!hasLocalChanges() || promptForOverwrite()) {
 			return super.performMerge(monitor);
@@ -80,20 +85,19 @@ public class ModelReplaceOperation extends ModelUpdateOperation {
 		if (hasPrompted)
 			return true;
 		final int[] result = new int[] { 1 };
-		Display.getDefault().syncExec(new Runnable() {
-			public void run() {
-		        MessageDialog dialog = new MessageDialog(getShell(), CVSUIMessages.ModelReplaceOperation_0, null, // accept
-		                // the
-		                // default
-		                // window
-		                // icon
-		        		CVSUIMessages.ModelReplaceOperation_1, 
-		        		MessageDialog.QUESTION, new String[] { CVSUIMessages.ModelReplaceOperation_2, CVSUIMessages.ModelReplaceOperation_3,
-		                        IDialogConstants.CANCEL_LABEL }, result[0]); // preview is the default
-		        
-		        result[0] = dialog.open();
+		Display.getDefault().syncExec(() -> {
+			MessageDialog dialog = new MessageDialog(getShell(), CVSUIMessages.ModelReplaceOperation_0, null, // accept
+					// the
+					// default
+					// window
+					// icon
+					CVSUIMessages.ModelReplaceOperation_1, MessageDialog.QUESTION,
+					new String[] { CVSUIMessages.ModelReplaceOperation_2, CVSUIMessages.ModelReplaceOperation_3,
+							IDialogConstants.CANCEL_LABEL },
+					result[0]); // preview is the default
+
+			result[0] = dialog.open();
 
-			};
 		});
         if (result[0] == 2)
         	throw new OperationCanceledException();
@@ -103,6 +107,7 @@ public class ModelReplaceOperation extends ModelUpdateOperation {
 
 	private boolean hasLocalChanges() {
 		return getContext().getDiffTree().hasMatchingDiffs(ResourcesPlugin.getWorkspace().getRoot().getFullPath(), new FastDiffFilter() {
+			@Override
 			public boolean select(IDiff node) {
 				if (node instanceof IThreeWayDiff) {
 					IThreeWayDiff twd = (IThreeWayDiff) node;