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/subscriber/MergeSynchronizeParticipant.java')
-rw-r--r--bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/MergeSynchronizeParticipant.java24
1 files changed, 0 insertions, 24 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 8879c47f5..e688683da 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
@@ -100,9 +100,6 @@ public class MergeSynchronizeParticipant extends CVSParticipant {
setSubscriber(subscriber);
}
- /* (non-Javadoc)
- * @see org.eclipse.team.ui.sync.SubscriberParticipant#setSubscriber(org.eclipse.team.core.subscribers.TeamSubscriber)
- */
@Override
public void setSubscriber(Subscriber subscriber) {
super.setSubscriber(subscriber);
@@ -116,9 +113,6 @@ public class MergeSynchronizeParticipant extends CVSParticipant {
}
}
- /* (non-Javadoc)
- * @see org.eclipse.team.ui.synchronize.ISynchronizeParticipant#init(org.eclipse.ui.IMemento)
- */
@Override
public void init(String secondayId, IMemento memento) throws PartInitException {
super.init(secondayId, memento);
@@ -137,9 +131,6 @@ public class MergeSynchronizeParticipant extends CVSParticipant {
}
}
- /* (non-Javadoc)
- * @see org.eclipse.team.ui.synchronize.ISynchronizeParticipant#init(org.eclipse.ui.IMemento)
- */
@Override
public void saveState(IMemento memento) {
super.saveState(memento);
@@ -147,9 +138,6 @@ public class MergeSynchronizeParticipant extends CVSParticipant {
write(s, memento);
}
- /* (non-Javadoc)
- * @see org.eclipse.team.ui.sync.AbstractSynchronizeParticipant#dispose()
- */
@Override
public void dispose() {
super.dispose();
@@ -160,9 +148,6 @@ public class MergeSynchronizeParticipant extends CVSParticipant {
}
}
- /* (non-Javadoc)
- * @see org.eclipse.team.ui.synchronize.ISynchronizeParticipant#getName()
- */
@Override
public String getName() {
return NLS.bind(CVSUIMessages.CompareParticipant_0, new String[] { ((CVSMergeSubscriber)getSubscriber()).getName(), Utils.convertSelection(getSubscriber().roots()) });
@@ -257,9 +242,6 @@ public class MergeSynchronizeParticipant extends CVSParticipant {
((CVSMergeSubscriber)getSubscriber()).cancel();
}
- /* (non-Javadoc)
- * @see org.eclipse.team.ui.synchronize.subscribers.SubscriberParticipant#initializeConfiguration(org.eclipse.team.ui.synchronize.ISynchronizePageConfiguration)
- */
@Override
protected void initializeConfiguration(ISynchronizePageConfiguration configuration) {
super.initializeConfiguration(configuration);
@@ -275,17 +257,11 @@ public class MergeSynchronizeParticipant extends CVSParticipant {
configuration.addActionContribution(new MergeParticipantActionContribution());
}
- /* (non-Javadoc)
- * @see org.eclipse.team.ui.synchronize.SubscriberParticipant#getLongTaskName()
- */
@Override
protected String getLongTaskName() {
return getName();
}
- /* (non-Javadoc)
- * @see org.eclipse.team.ui.synchronize.SubscriberParticipant#getShortTaskName()
- */
@Override
protected String getShortTaskName() {
return CVSUIMessages.Participant_merging;

Back to the top