1 files changed, 28 insertions, 19 deletions

diff --git a/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/mappings/SyncInfoSetTraveralContext.java b/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/mappings/SyncInfoSetTraveralContext.java
index c406764e7..2345e6638 100644
--- a/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/mappings/SyncInfoSetTraveralContext.java
+++ b/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/core/mappings/SyncInfoSetTraveralContext.java
@@ -13,14 +13,24 @@
  *******************************************************************************/
 package org.eclipse.team.tests.ccvs.core.mappings;
 
-import java.util.*;
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.Set;
 
-import org.eclipse.core.resources.*;
+import org.eclipse.core.resources.IContainer;
+import org.eclipse.core.resources.IFile;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.IResource;
+import org.eclipse.core.resources.IStorage;
+import org.eclipse.core.resources.ResourcesPlugin;
 import org.eclipse.core.resources.mapping.RemoteResourceMappingContext;
 import org.eclipse.core.resources.mapping.ResourceTraversal;
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.team.core.synchronize.*;
+import org.eclipse.team.core.synchronize.SyncInfo;
+import org.eclipse.team.core.synchronize.SyncInfoSet;
+import org.eclipse.team.core.synchronize.SyncInfoTree;
 import org.eclipse.team.core.variants.IResourceVariant;
 
 /**
@@ -41,17 +51,12 @@ public class SyncInfoSetTraveralContext extends RemoteResourceMappingContext {
         return set.getSyncInfo(file);
     }
     
-    /* (non-Javadoc)
-     * @see org.eclipse.core.resources.mapping.ITraversalContext#contentDiffers(org.eclipse.core.resources.IFile, org.eclipse.core.runtime.IProgressMonitor)
-     */
     public boolean contentDiffers(IFile file, IProgressMonitor monitor) {
         return getSyncInfo(file) != null;
     }
 
-    /* (non-Javadoc)
-     * @see org.eclipse.core.resources.mapping.ITraversalContext#fetchContents(org.eclipse.core.resources.IFile, org.eclipse.core.runtime.IProgressMonitor)
-     */
-    public IStorage fetchRemoteContents(IFile file, IProgressMonitor monitor) throws CoreException {
+    @Override
+	public IStorage fetchRemoteContents(IFile file, IProgressMonitor monitor) throws CoreException {
         SyncInfo info = getSyncInfo(file);
         if (info == null)
             return null;
@@ -61,34 +66,36 @@ public class SyncInfoSetTraveralContext extends RemoteResourceMappingContext {
         return remote.getStorage(monitor);
     }
 
-    /* (non-Javadoc)
-     * @see org.eclipse.core.resources.mapping.ITraversalContext#fetchMembers(org.eclipse.core.resources.IContainer, org.eclipse.core.runtime.IProgressMonitor)
-     */
-    public IResource[] fetchMembers(IContainer container, IProgressMonitor monitor) throws CoreException {
-        Set members = new HashSet();
+    @Override
+	public IResource[] fetchMembers(IContainer container, IProgressMonitor monitor) throws CoreException {
+		Set<IResource> members = new HashSet<>();
         members.addAll(Arrays.asList(container.members(false)));
         members.addAll(Arrays.asList(set.members(container)));
-        return (IResource[]) members.toArray(new IResource[members.size()]);
+        return members.toArray(new IResource[members.size()]);
     }
 
-    public void refresh(ResourceTraversal[] traversals, int flags, IProgressMonitor monitor) throws CoreException {
+    @Override
+	public void refresh(ResourceTraversal[] traversals, int flags, IProgressMonitor monitor) throws CoreException {
         // Do nothing
     }
 
+	@Override
 	public boolean isThreeWay() {
-		for (Iterator iter = set.iterator(); iter.hasNext();) {
-			SyncInfo info = (SyncInfo) iter.next();
+		for (Iterator<SyncInfo> iter = set.iterator(); iter.hasNext();) {
+			SyncInfo info = iter.next();
 			return info.getComparator().isThreeWay();
 		}
 		return true;
 	}
 
+	@Override
 	public boolean hasRemoteChange(IResource resource, IProgressMonitor monitor) throws CoreException {
 		SyncInfo info = set.getSyncInfo(resource);
 		int direction = SyncInfo.getDirection(info.getKind());
 		return direction == SyncInfo.INCOMING || direction == SyncInfo.CONFLICTING;
 	}
 
+	@Override
 	public boolean hasLocalChange(IResource resource, IProgressMonitor monitor) throws CoreException {
 		SyncInfo info = set.getSyncInfo(resource);
 		int direction = SyncInfo.getDirection(info.getKind());
@@ -96,6 +103,7 @@ public class SyncInfoSetTraveralContext extends RemoteResourceMappingContext {
 
 	}
 
+	@Override
 	public IStorage fetchBaseContents(IFile file, IProgressMonitor monitor) throws CoreException {
         SyncInfo info = getSyncInfo(file);
         if (info == null)
@@ -106,6 +114,7 @@ public class SyncInfoSetTraveralContext extends RemoteResourceMappingContext {
         return base.getStorage(monitor);
 	}
 
+	@Override
 	public IProject[] getProjects() {
 		return ResourcesPlugin.getWorkspace().getRoot().getProjects();
 	}