Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJean Michel-Lemieux2004-05-04 12:40:58 -0400
committerJean Michel-Lemieux2004-05-04 12:40:58 -0400
commitba57d9a05f3bce0bbfd778491fb9e4df33d37ec1 (patch)
tree893539673e5f075debb0c5a46b3e6a41e8ba7737
parent712fdd4aacc5cd8eca32e94fa06770d4af619a55 (diff)
downloadeclipse.platform.team-ba57d9a05f3bce0bbfd778491fb9e4df33d37ec1.tar.gz
eclipse.platform.team-ba57d9a05f3bce0bbfd778491fb9e4df33d37ec1.tar.xz
eclipse.platform.team-ba57d9a05f3bce0bbfd778491fb9e4df33d37ec1.zip
Bug 60878 Progress message is too long (scheduled synchronize)
-rw-r--r--bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/messages.properties6
-rw-r--r--bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/RefreshSubscriberJob.java13
2 files changed, 10 insertions, 9 deletions
diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/messages.properties b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/messages.properties
index bf260c35f..fd421954b 100644
--- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/messages.properties
+++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/messages.properties
@@ -320,9 +320,9 @@ Utils.25=Conflicting
Utils.26=unknown mode
RefreshCompleteDialog.4=Synchronize Complete - {0}
RefreshCompleteDialog.4a=Scheduled Synchronize Complete - {0}
-RefreshCompleteDialog.5={0} changes found.
-RefreshCompleteDialog.5a={0} new changes found.
-RefreshCompleteDialog.6=No changes found.
+RefreshCompleteDialog.5={0}: {1} changes found.
+RefreshCompleteDialog.5a={0}: {1} new changes found.
+RefreshCompleteDialog.6={0}: No changes found.
RefreshCompleteDialog.17=Details >>
RefreshCompleteDialog.18=<< Details
RefreshUserNotificationPolicy.0=Synchronize of ''{0}'' Complete.
diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/RefreshSubscriberJob.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/RefreshSubscriberJob.java
index 87d271d6f..32d710332 100644
--- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/RefreshSubscriberJob.java
+++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/RefreshSubscriberJob.java
@@ -123,13 +123,13 @@ public final class RefreshSubscriberJob extends WorkspaceJob {
* @param subscriber
*/
public RefreshSubscriberJob(SubscriberParticipant participant, String jobName, String taskName, IResource[] resources, IRefreshSubscriberListener listener) {
- super(jobName);
+ super(taskName);
Assert.isNotNull(resources);
Assert.isNotNull(participant);
Assert.isNotNull(resources);
this.resources = resources;
this.participant = participant;
- this.taskName = taskName;
+ this.taskName = jobName;
setPriority(Job.DECORATE);
setRefreshInterval(3600 /* 1 hour */);
@@ -203,7 +203,8 @@ public final class RefreshSubscriberJob extends WorkspaceJob {
subscriber.addListener(changeListener);
// Pre-Notify
notifyListeners(STARTED, event);
- // Perform the refresh
+ // Perform the refresh
+ monitor.setTaskName(getName());
subscriber.refresh(roots, IResource.DEPTH_INFINITE, monitor);
} catch(TeamException e) {
status.merge(e.getStatus());
@@ -248,15 +249,15 @@ public final class RefreshSubscriberJob extends WorkspaceJob {
if (changes.length > 0) {
// New changes found
String numNewChanges = Integer.toString(event.getChanges().length);
- text.append(Policy.bind("RefreshCompleteDialog.5a", new Object[]{numNewChanges, participant.getName(), outgoing, incoming, conflicting})); //$NON-NLS-1$
+ text.append(Policy.bind("RefreshCompleteDialog.5a", new Object[]{getName(), numNewChanges})); //$NON-NLS-1$
} else {
// Refreshed resources contain changes
- text.append(Policy.bind("RefreshCompleteDialog.5", new Object[]{new Integer(numChanges), outgoing, incoming, conflicting})); //$NON-NLS-1$
+ text.append(Policy.bind("RefreshCompleteDialog.5", new Object[]{getName(), new Integer(numChanges)})); //$NON-NLS-1$
}
} else {
// No changes found
code = IRefreshEvent.STATUS_NO_CHANGES;
- text.append(Policy.bind("RefreshCompleteDialog.6")); //$NON-NLS-1$
+ text.append(Policy.bind("RefreshCompleteDialog.6", getName())); //$NON-NLS-1$
}
return new Status(IStatus.OK, TeamUIPlugin.ID, code, text.toString(), null);
}

Back to the top