Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJean Michel-Lemieux2004-05-27 16:40:04 +0000
committerJean Michel-Lemieux2004-05-27 16:40:04 +0000
commit9e5cdf6383d12d0e05682c9bb8c074dc5ad373aa (patch)
tree94c7d0286dfdddf60e94612187e4488b6a5e4e90 /bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/MergeSynchronizeParticipant.java
parent76e6cd847f70da3713017ce4aa6d2009fb41d030 (diff)
downloadeclipse.platform.team-9e5cdf6383d12d0e05682c9bb8c074dc5ad373aa.tar.gz
eclipse.platform.team-9e5cdf6383d12d0e05682c9bb8c074dc5ad373aa.tar.xz
eclipse.platform.team-9e5cdf6383d12d0e05682c9bb8c074dc5ad373aa.zip
Bug 62647 [Progress] progres message for synchronize/compare/merge needs participant details
Diffstat (limited to 'bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/MergeSynchronizeParticipant.java')
-rw-r--r--bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/MergeSynchronizeParticipant.java14
1 files changed, 14 insertions, 0 deletions
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/MergeSynchronizeParticipant.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/MergeSynchronizeParticipant.java
index 322742cc0..7861c755e 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/MergeSynchronizeParticipant.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/MergeSynchronizeParticipant.java
@@ -265,4 +265,18 @@ public class MergeSynchronizeParticipant extends CVSParticipant {
configuration.addActionContribution(new MergeParticipantActionContribution());
configuration.setProperty(SynchronizePageConfiguration.P_MODEL_MANAGER, new ChangeLogModelManager(configuration));
}
+
+ /* (non-Javadoc)
+ * @see org.eclipse.team.ui.synchronize.SubscriberParticipant#getLongTaskName()
+ */
+ protected String getLongTaskName() {
+ return getName();
+ }
+
+ /* (non-Javadoc)
+ * @see org.eclipse.team.ui.synchronize.SubscriberParticipant#getShortTaskName()
+ */
+ protected String getShortTaskName() {
+ return Policy.bind("Participant.merging"); //$NON-NLS-1$
+ }
} \ No newline at end of file

Back to the top