1 files changed, 8 insertions, 13 deletions

diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/mappings/CompareSubscriberContext.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/mappings/CompareSubscriberContext.java
index 529d166c4..f2844bf16 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/mappings/CompareSubscriberContext.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/mappings/CompareSubscriberContext.java
@@ -15,7 +15,7 @@ package org.eclipse.team.internal.ccvs.ui.mappings;
 
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.preferences.*;
+import org.eclipse.core.runtime.preferences.IEclipsePreferences;
 import org.eclipse.core.runtime.preferences.IEclipsePreferences.IPreferenceChangeListener;
 import org.eclipse.core.runtime.preferences.IEclipsePreferences.PreferenceChangeEvent;
 import org.eclipse.team.core.diff.DiffFilter;
@@ -43,30 +43,25 @@ public class CompareSubscriberContext extends CVSSubscriberMergeContext implemen
 		((IEclipsePreferences) CVSUIPlugin.getPlugin().getInstancePreferences().node("")).addPreferenceChangeListener(this); //$NON-NLS-1$
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.team.core.subscribers.SubscriberMergeContext#dispose()
-	 */
+	@Override
 	public void dispose() {
 		super.dispose();
 		((IEclipsePreferences) CVSUIPlugin.getPlugin().getInstancePreferences().node("")).removePreferenceChangeListener(this); //$NON-NLS-1$
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.team.core.mapping.IMergeContext#markAsMerged(org.eclipse.team.core.diff.IDiff, boolean, org.eclipse.core.runtime.IProgressMonitor)
-	 */
+	@Override
 	public void markAsMerged(IDiff node, boolean inSyncHint,
 			IProgressMonitor monitor) throws CoreException {
 		// Do nothing 
 	}
 	
-	/* (non-Javadoc)
-	 * @see org.eclipse.team.core.subscribers.SubscriberMergeContext#getDiffFilter()
-	 */
+	@Override
 	protected DiffFilter getDiffFilter() {
 		final DiffFilter contentFilter = createContentFilter();
 		final DiffFilter regexFilter = createRegexFilter();
 		if (contentFilter != null && regexFilter != null) {
 			return new DiffFilter() {
+				@Override
 				public boolean select(IDiff diff, IProgressMonitor monitor) {
 					return !contentFilter.select(diff, monitor)
 							&& !regexFilter.select(diff, monitor);
@@ -74,12 +69,14 @@ public class CompareSubscriberContext extends CVSSubscriberMergeContext implemen
 			};
 		} else if (contentFilter != null) {
 			return new DiffFilter() {
+				@Override
 				public boolean select(IDiff diff, IProgressMonitor monitor) {
 					return !contentFilter.select(diff, monitor);
 				}
 			};
 		} else if (regexFilter != null) {
 			return new DiffFilter() {
+				@Override
 				public boolean select(IDiff diff, IProgressMonitor monitor) {
 					return !regexFilter.select(diff, monitor);
 				}
@@ -111,9 +108,7 @@ public class CompareSubscriberContext extends CVSSubscriberMergeContext implemen
 		return null;
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.core.runtime.preferences.IEclipsePreferences.IPreferenceChangeListener#preferenceChange(org.eclipse.core.runtime.preferences.IEclipsePreferences.PreferenceChangeEvent)
-	 */
+	@Override
 	public void preferenceChange(PreferenceChangeEvent event) {
 		if (event.getKey().equals(ICVSUIConstants.PREF_CONSIDER_CONTENTS) || event.getKey().equals(ICVSUIConstants.PREF_SYNCVIEW_REGEX_FILTER_PATTERN)) {
 			SubscriberDiffTreeEventHandler handler = getHandler();