Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat (limited to 'bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/UpdateOnlyMergableOperation.java')
-rw-r--r--bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/UpdateOnlyMergableOperation.java9
1 files changed, 7 insertions, 2 deletions
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/UpdateOnlyMergableOperation.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/UpdateOnlyMergableOperation.java
index 2482d88cd..c8e5940b0 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/UpdateOnlyMergableOperation.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/UpdateOnlyMergableOperation.java
@@ -33,7 +33,7 @@ import org.eclipse.ui.IWorkbenchPart;
*/
public class UpdateOnlyMergableOperation extends SingleCommandOperation {
- List skippedFiles = new ArrayList();
+ List<IFile> skippedFiles = new ArrayList<>();
private final IProject project;
public UpdateOnlyMergableOperation(IWorkbenchPart part, IProject project, IResource[] resources, LocalOption[] localOptions) {
@@ -44,6 +44,7 @@ public class UpdateOnlyMergableOperation extends SingleCommandOperation {
/* (non-Javadoc)
* @see org.eclipse.team.internal.ccvs.ui.operations.SingleCommandOperation#executeCommand(org.eclipse.team.internal.ccvs.core.client.Session, org.eclipse.team.internal.ccvs.core.CVSTeamProvider, org.eclipse.core.resources.IResource[], org.eclipse.core.runtime.IProgressMonitor)
*/
+ @Override
protected IStatus executeCommand(Session session, CVSTeamProvider provider, ICVSResource[] resources, boolean recurse, IProgressMonitor monitor) throws CVSException, InterruptedException {
UpdateMergableOnly update = new UpdateMergableOnly();
IStatus status = update.execute(
@@ -63,6 +64,7 @@ public class UpdateOnlyMergableOperation extends SingleCommandOperation {
/* (non-Javadoc)
* @see org.eclipse.team.internal.ccvs.ui.operations.RepositoryProviderOperation#getTaskName()
*/
+ @Override
protected String getTaskName() {
return CVSUIMessages.UpdateOnlyMergeable_taskName;
}
@@ -70,6 +72,7 @@ public class UpdateOnlyMergableOperation extends SingleCommandOperation {
/* (non-Javadoc)
* @see org.eclipse.team.internal.ccvs.ui.operations.RepositoryProviderOperation#getTaskName(org.eclipse.team.internal.ccvs.core.CVSTeamProvider)
*/
+ @Override
protected String getTaskName(CVSTeamProvider provider) {
return NLS.bind(CVSUIMessages.UpdateOperation_0, new String[] { provider.getProject().getName() });
}
@@ -79,16 +82,18 @@ public class UpdateOnlyMergableOperation extends SingleCommandOperation {
}
public IFile[] getSkippedFiles() {
- return (IFile[]) skippedFiles.toArray(new IFile[skippedFiles.size()]);
+ return skippedFiles.toArray(new IFile[skippedFiles.size()]);
}
/* (non-Javadoc)
* @see org.eclipse.team.internal.ccvs.ui.operations.UpdateOperation#getResourceMappingContext()
*/
+ @Override
protected ResourceMappingContext getResourceMappingContext() {
return new SingleProjectSubscriberContext(CVSProviderPlugin.getPlugin().getCVSWorkspaceSubscriber(), false, project);
}
+ @Override
protected SynchronizationScopeManager createScopeManager(boolean consultModels) {
return new SingleProjectScopeManager(getJobName(), getSelectedMappings(), getResourceMappingContext(), consultModels, project);
}

Back to the top