Job names and cancellation support

9 files changed, 37 insertions, 27 deletions

diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/messages.properties b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/messages.properties
index 9e4217a59..baec3d3f3 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/messages.properties
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/messages.properties
@@ -994,4 +994,12 @@ CheckoutIntoProjectSelectionPage.showAll=Show all valid target projects
 CheckoutIntoProjectSelectionPage.showUnshared=Show unshared projects
 CheckoutIntoProjectSelectionPage.showSameRepo=Show projects shared with the same repository
 CheckoutIntoProjectSelectionPage.recurse=&Checkout subfolders
-CheckoutIntoProjectSelectionPage.invalidFolderName=''{0}'' is not a valid folder name
\ No newline at end of file
+CheckoutIntoProjectSelectionPage.invalidFolderName=''{0}'' is not a valid folder name
+
+CVSOperation.workspaceOperationJobName=CVS workspace modify operation: {0}
+CVSOperation.operationJobName=CVS operation: {0}
+
+HasProjectMetaFile.taskName=Looking for a remote meta file
+TagFromWorkspace.taskName=Tagging from workspace
+TagFromRepository.taskName=Tagging from repository
+UpdateOnlyMergeable.taskName=Updating mergeable changes
\ No newline at end of file
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/CVSOperation.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/CVSOperation.java
index aec473794..135210aba 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/CVSOperation.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/CVSOperation.java
@@ -94,7 +94,7 @@ public abstract class CVSOperation implements IRunnableWithProgress {
 	}
 	
 	protected void runAsJob() {
-		Job job = new Job() {
+		Job job = new Job(Policy.bind("CVSOperation.operationJobName", getTaskName())) {
 			public IStatus run(IProgressMonitor monitor) {
 				try {
 					CVSOperation.this.execute(monitor);
@@ -330,4 +330,12 @@ public abstract class CVSOperation implements IRunnableWithProgress {
 	public void setInvolvesMultipleResources(boolean b) {
 		involvesMultipleResources = b;
 	}
+
+	/**
+	 * Return the string that is to be used as the task name for the operation
+	 * 
+	 * @param remoteFolders
+	 * @return
+	 */
+	protected abstract String getTaskName();
 }
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/CVSWorkspaceModifyOperation.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/CVSWorkspaceModifyOperation.java
index 5d6edde69..21b6b7cde 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/CVSWorkspaceModifyOperation.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/CVSWorkspaceModifyOperation.java
@@ -20,6 +20,7 @@ import org.eclipse.core.runtime.jobs.Job;
 import org.eclipse.team.internal.ccvs.core.CVSException;
 import org.eclipse.team.internal.ccvs.ui.CVSUIPlugin;
 import org.eclipse.team.internal.ccvs.ui.ICVSUIConstants;
+import org.eclipse.team.internal.ccvs.ui.Policy;
 import org.eclipse.ui.actions.WorkspaceModifyOperation;
 
 /**
@@ -51,7 +52,7 @@ public class CVSWorkspaceModifyOperation extends WorkspaceModifyOperation {
 	}
 	
 	protected void runAsJob() {
-		Job job = new Job() {
+		Job job = new Job(Policy.bind("CVSOperation.workspaceOperationJobName", operation.getTaskName())) {
 			public IStatus run(IProgressMonitor monitor) {
 				try {
 					operation.run(monitor);
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/CheckoutIntoOperation.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/CheckoutIntoOperation.java
index 84bb0a9cc..3602e1c91 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/CheckoutIntoOperation.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/CheckoutIntoOperation.java
@@ -402,4 +402,8 @@ public class CheckoutIntoOperation extends CheckoutOperation {
 				throw CVSException.wrapException(e);
 			}
 	}
+
+	public String getName() {
+		return getTaskName();
+	}
 }
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/CheckoutOperation.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/CheckoutOperation.java
index f434aed13..2449a87a0 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/CheckoutOperation.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/CheckoutOperation.java
@@ -27,14 +27,6 @@ public abstract class CheckoutOperation extends RemoteOperation {
 		super(shell, remoteFolders);
 	}
 
-	/**
-	 * Return the string that is to be used as the task name for the operation
-	 * 
-	 * @param remoteFolders
-	 * @return
-	 */
-	protected abstract String getTaskName();
-	
 	/* (non-Javadoc)
 	 * @see org.eclipse.team.internal.ccvs.ui.operations.CVSOperation#execute(org.eclipse.core.runtime.IProgressMonitor)
 	 */
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/HasProjectMetaFileOperation.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/HasProjectMetaFileOperation.java
index 463c354ea..f4099a2aa 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/HasProjectMetaFileOperation.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/HasProjectMetaFileOperation.java
@@ -16,6 +16,7 @@ import org.eclipse.swt.widgets.Shell;
 import org.eclipse.team.core.TeamException;
 import org.eclipse.team.internal.ccvs.core.CVSException;
 import org.eclipse.team.internal.ccvs.core.ICVSRemoteFolder;
+import org.eclipse.team.internal.ccvs.ui.Policy;
 
 /**
  * Operation which checks for the existance of the .project file (or .vcm_meta file) 
@@ -89,4 +90,7 @@ public class HasProjectMetaFileOperation extends CVSOperation {
 		return metaFileExists;
 	}
 
+	protected String getTaskName() {
+		return Policy.bind("HasProjectMetaFile.taskName");
+	}
 }
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/TagInRepositoryOperation.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/TagInRepositoryOperation.java
index 9c2a743cb..1b1faea3b 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/TagInRepositoryOperation.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/TagInRepositoryOperation.java
@@ -99,4 +99,7 @@ public class TagInRepositoryOperation extends RemoteOperation implements ITagOpe
 		addLocalOption(Command.DO_NOT_RECURSE);
 	}
 
+	protected String getTaskName() {
+		return Policy.bind("TagFromRepository.taskName");
+	}
 }
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/TagOperation.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/TagOperation.java
index 0f0388e37..13f9651da 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/TagOperation.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/TagOperation.java
@@ -37,13 +37,6 @@ public class TagOperation extends RepositoryProviderOperation implements ITagOpe
 		super(shell, resources);
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.team.internal.ccvs.ui.operations.RepositoryProviderOperation#getTaskName()
-	 */
-	protected String getTaskName() {
-		return "Tagging";
-	}
-
 	public CVSTag getTag() {
 		return tag;
 	}
@@ -127,4 +120,8 @@ public class TagOperation extends RepositoryProviderOperation implements ITagOpe
 	public void recurse() {
 		addLocalOption(Command.DO_NOT_RECURSE);
 	}
+
+	protected  String getTaskName() {
+		return Policy.bind("TagFromWorkspace.taskName");
+	}
 }
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 efd740059..2da01dc8b 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
@@ -27,6 +27,7 @@ import org.eclipse.team.internal.ccvs.core.client.Session;
 import org.eclipse.team.internal.ccvs.core.client.UpdateMergableOnly;
 import org.eclipse.team.internal.ccvs.core.client.Command.LocalOption;
 import org.eclipse.team.internal.ccvs.core.resources.CVSWorkspaceRoot;
+import org.eclipse.team.internal.ccvs.ui.Policy;
 
 /**
  * This operation performs an update that will only effect files
@@ -38,10 +39,6 @@ public class UpdateOnlyMergableOperation extends RepositoryProviderOperation {
 
 	List skippedFiles = new ArrayList();
 	
-	/**
-	 * @param shell
-	 * @param resources
-	 */
 	public UpdateOnlyMergableOperation(Shell shell, IResource[] resources, LocalOption[] localOptions) {
 		super(shell, resources);
 		this.localOptions = localOptions;
@@ -51,7 +48,7 @@ public class UpdateOnlyMergableOperation extends RepositoryProviderOperation {
 	 * @see org.eclipse.team.internal.ccvs.ui.operations.RepositoryProviderOperation#getTaskName()
 	 */
 	protected String getTaskName() {
-		return "Updating";
+		return Policy.bind("UpdateOnlyMergeable.taskName");
 	}
 
 	/* (non-Javadoc)
@@ -79,9 +76,6 @@ public class UpdateOnlyMergableOperation extends RepositoryProviderOperation {
 
 	}
 
-	/**
-	 * @param files
-	 */
 	protected void addSkippedFiles(IFile[] files) {
 		skippedFiles.addAll(Arrays.asList(files));
 	}
@@ -89,5 +83,4 @@ public class UpdateOnlyMergableOperation extends RepositoryProviderOperation {
 	public IFile[] getSkippedFiles() {
 		return (IFile[]) skippedFiles.toArray(new IFile[skippedFiles.size()]);
 	}
-
 }