1 files changed, 11 insertions, 5 deletions

diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/mappings/WorkspaceChangeSetCapability.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/mappings/WorkspaceChangeSetCapability.java
index 0b39311c5..2b52f7c47 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/mappings/WorkspaceChangeSetCapability.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/mappings/WorkspaceChangeSetCapability.java
@@ -33,6 +33,7 @@ public class WorkspaceChangeSetCapability extends ModelParticipantChangeSetCapab
     /* (non-Javadoc)
 	 * @see org.eclipse.team.internal.ui.synchronize.ChangeSetCapability#supportsActiveChangeSets()
 	 */
+	@Override
 	public boolean supportsActiveChangeSets() {
 		return true;
 	}
@@ -40,6 +41,7 @@ public class WorkspaceChangeSetCapability extends ModelParticipantChangeSetCapab
 	/* (non-Javadoc)
 	 * @see org.eclipse.team.internal.ui.synchronize.ChangeSetCapability#enableActiveChangeSetsFor(org.eclipse.team.ui.synchronize.ISynchronizePageConfiguration)
 	 */
+	@Override
 	public boolean enableActiveChangeSetsFor(ISynchronizePageConfiguration configuration) {
         return supportsActiveChangeSets() && 
     	configuration.getMode() != ISynchronizePageConfiguration.INCOMING_MODE;
@@ -48,7 +50,8 @@ public class WorkspaceChangeSetCapability extends ModelParticipantChangeSetCapab
     /* (non-Javadoc)
      * @see org.eclipse.team.internal.ui.synchronize.ChangeSetCapability#createChangeSet(org.eclipse.team.ui.synchronize.ISynchronizePageConfiguration, org.eclipse.team.core.diff.IDiff[])
      */
-    public ActiveChangeSet createChangeSet(ISynchronizePageConfiguration configuration, IDiff[] infos) {
+    @Override
+	public ActiveChangeSet createChangeSet(ISynchronizePageConfiguration configuration, IDiff[] infos) {
         ActiveChangeSet set = getActiveChangeSetManager().createSet(CVSUIMessages.WorkspaceChangeSetCapability_1, new IDiff[0]); 
 		CommitSetDialog dialog = new CommitSetDialog(configuration.getSite().getShell(), set, getResources(infos), CommitSetDialog.NEW);
 		dialog.open();
@@ -58,20 +61,21 @@ public class WorkspaceChangeSetCapability extends ModelParticipantChangeSetCapab
     }
 
     private IResource[] getResources(IDiff[] diffs) {
-    	Set result = new HashSet();
+		Set<IResource> result = new HashSet<>();
     	for (int i = 0; i < diffs.length; i++) {
 			IDiff diff = diffs[i];
 			IResource resource = ResourceDiffTree.getResourceFor(diff);
 			if (resource != null)
 				result.add(resource);
 		}
-        return (IResource[]) result.toArray(new IResource[result.size()]);
+        return result.toArray(new IResource[result.size()]);
     }
     
     /* (non-Javadoc)
      * @see org.eclipse.team.ui.synchronize.ChangeSetCapability#editChangeSet(org.eclipse.team.core.subscribers.ActiveChangeSet)
      */
-    public void editChangeSet(ISynchronizePageConfiguration configuration, ActiveChangeSet set) {
+    @Override
+	public void editChangeSet(ISynchronizePageConfiguration configuration, ActiveChangeSet set) {
         CommitSetDialog dialog = new CommitSetDialog(configuration.getSite().getShell(), set, set.getResources(), CommitSetDialog.EDIT);
 		dialog.open();
 		if (dialog.getReturnCode() != Window.OK) return;
@@ -81,10 +85,12 @@ public class WorkspaceChangeSetCapability extends ModelParticipantChangeSetCapab
     /* (non-Javadoc)
      * @see org.eclipse.team.ui.synchronize.ChangeSetCapability#getActiveChangeSetManager()
      */
-    public ActiveChangeSetManager getActiveChangeSetManager() {
+    @Override
+	public ActiveChangeSetManager getActiveChangeSetManager() {
         return CVSUIPlugin.getPlugin().getChangeSetManager();
     }
     
+	@Override
 	public CheckedInChangeSetCollector createCheckedInChangeSetCollector(ISynchronizePageConfiguration configuration) {
 		return new CheckedInChangeSetCollector(configuration, CVSProviderPlugin.getPlugin().getCVSWorkspaceSubscriber());
 	}