46682: Background job progress message missing details

4 files changed, 24 insertions, 10 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 4722d6c86..b24b106fc 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
@@ -999,8 +999,8 @@ TagFromRepository.taskName=Tagging from repository
 UpdateOnlyMergeable.taskName=Updating mergeable changes
 UpdateDialog.overwriteTitle=Overwrite Local Changes?
 UpdateDialog.overwriteMessage=Some conflicting files cannot be merged automatically with the update action. Should these resources be updated, overwriting any local changes?
-ReplaceOperation.taskName=Replacing...
-UpdateOperation.taskName=Updating...
+ReplaceOperation.taskName=Performing a CVS Replace operation
+UpdateOperation.taskName=Performing a CVS Update operation
 
 SafeUpdateAction.warnFilesWithConflictsTitle=Non-mergeable files
 SafeUpdateAction.warnFilesWithConflictsDescription=Some conflicting files cannot be merged automatically with the update action. They contain conflicting changes that will have to be merged manually. Use the Synchronize View to find the conflicts then merge the changes in a compare editor.
@@ -1011,11 +1011,11 @@ SafeUpdateAction.warnFilesWithConflictsDescription=Some conflicting files cannot
 Error.unableToShowSyncView=Error opening Synchronize View. Please ensure that the Team plugin is installed correctly.
 ShowAnnotationAction.1=Unexpected response from CVS Server: {0}
 
-CVSSubscriberAction.jobName=Performing CVS operation on {0} resources.
-UpdateAction.jobName=Performing CVS update on {0} resources.
-MergeUpdateAction.jobName=Performing CVS merge on {0} resources.
+UpdateAction.jobName=Performing a CVS Update on {0} resources.
+MergeUpdateAction.jobName=Performing a CVS Merge on {0} resources.
 MergeUpdateAction.invalidSubscriber=Invalid subscriber: {0}
-CommitAction.jobName=Performing CVS commit on {0} resources.
+CommitAction.jobName=Performing a CVS Commit on {0} resources.
+OverrideAndUpdateAction.jobName=Performing CVS Override and Update on {0} resources.
 WorkInProgressPreferencePage.0=CVS Work In Progress
 WorkInProgressPreferencePage.1=Preferences for enabling features that are not complete:
 WorkInProgressPreferencePage.2=Enable background fetching of resources in the CVS Repositories view
@@ -1047,3 +1047,5 @@ MergeSynchronizeParticipant.10=Missing root nodes in cvs merge subscriber mement
 MergeSynchronizeParticipant.11=Root resource in cvs merge subscriber is no longer in workspace, ignoring: {0}
 MergeSynchronizeParticipant.12=Missing root resources for cvs merge subscriber: {0}
 DisconnectOperation.0=Disconnecting
+SubscriberConfirmMergedAction.0=Synchronization information is missing for resource {0}
+SubscriberConfirmMergedAction.jobName=Performing a CVS Mark as Merged operation on {0} resources.
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/CVSSubscriberAction.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/CVSSubscriberAction.java
index 06ee22802..cf4cea2f7 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/CVSSubscriberAction.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/CVSSubscriberAction.java
@@ -178,9 +178,7 @@ public abstract class CVSSubscriberAction extends SubscriberAction {
 	 * @param syncSet
 	 * @return
 	 */
-	protected String getJobName(SyncInfoSet syncSet) {
-		return Policy.bind("CVSSubscriberAction.jobName", new Integer(syncSet.size()).toString()); //$NON-NLS-1$
-	}
+	protected abstract String getJobName(SyncInfoSet syncSet);
 
 	/**
 	 * Return a scheduling rule that includes all resources that will be operated 
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/OverrideAndUpdateAction.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/OverrideAndUpdateAction.java
index df66843de..3ebd48e5a 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/OverrideAndUpdateAction.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/OverrideAndUpdateAction.java
@@ -66,4 +66,11 @@ public class OverrideAndUpdateAction extends CVSSubscriberAction {
 			Policy.cancelOperation();
 		}
 	}
+
+	/* (non-Javadoc)
+	 * @see org.eclipse.team.internal.ccvs.ui.subscriber.CVSSubscriberAction#getJobName(org.eclipse.team.ui.synchronize.actions.SyncInfoSet)
+	 */
+	protected String getJobName(SyncInfoSet syncSet) {
+		return Policy.bind("OverrideAndUpdateAction.jobName", new Integer(syncSet.size()).toString()); //$NON-NLS-1$
+	}
 }
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/SubscriberConfirmMergedAction.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/SubscriberConfirmMergedAction.java
index e4bb26c5d..6d80bb6a7 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/SubscriberConfirmMergedAction.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/SubscriberConfirmMergedAction.java
@@ -62,7 +62,7 @@ public class SubscriberConfirmMergedAction extends CVSSubscriberAction {
 		try {
 			CVSSyncInfo cvsInfo = getCVSSyncInfo(info);
 			if (cvsInfo == null) {
-				CVSUIPlugin.log(IStatus.ERROR, "Synchronization information is missing for resource {0}" + cvsInfo.getLocal().getFullPath().toString(), null);
+				CVSUIPlugin.log(IStatus.ERROR, Policy.bind("SubscriberConfirmMergedAction.0", cvsInfo.getLocal().getFullPath().toString()), null); //$NON-NLS-1$
 				return false;
 			}
 			// Make sure the parent is managed
@@ -80,4 +80,11 @@ public class SubscriberConfirmMergedAction extends CVSSubscriberAction {
 			monitor.done();
 		}
 	}
+
+	/* (non-Javadoc)
+	 * @see org.eclipse.team.internal.ccvs.ui.subscriber.CVSSubscriberAction#getJobName(org.eclipse.team.ui.synchronize.actions.SyncInfoSet)
+	 */
+	protected String getJobName(SyncInfoSet syncSet) {
+		return Policy.bind("SubscriberConfirmMergedAction.jobName", new Integer(syncSet.size()).toString()); //$NON-NLS-1$
+	}
 }