Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJean Michel-Lemieux2004-04-29 10:05:13 -0400
committerJean Michel-Lemieux2004-04-29 10:05:13 -0400
commitf76fb68e5773e44083e00ca9e8d56d9f7373c5db (patch)
tree6cc2ebfc6b7d85c1a57866639ef8af04532fe1ca
parentf486d4d935ff682e0700b166d3c34a866ed183cf (diff)
downloadeclipse.platform.team-f76fb68e5773e44083e00ca9e8d56d9f7373c5db.tar.gz
eclipse.platform.team-f76fb68e5773e44083e00ca9e8d56d9f7373c5db.tar.xz
eclipse.platform.team-f76fb68e5773e44083e00ca9e8d56d9f7373c5db.zip
Removed unused pre-collecting method.
-rw-r--r--bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/CompareParticipant.java9
-rw-r--r--bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/synchronize/SubscriberParticipant.java64
2 files changed, 30 insertions, 43 deletions
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/CompareParticipant.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/CompareParticipant.java
index 3a075997c..12a4dd3b4 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/CompareParticipant.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/CompareParticipant.java
@@ -56,15 +56,6 @@ public class CompareParticipant extends CVSParticipant {
public String getName() {
return getSubscriber().getName();
}
-
- /* (non-Javadoc)
- * @see org.eclipse.team.ui.synchronize.subscriber.SubscriberParticipant#preCollectingChanges()
- */
- protected void preCollectingChanges() {
- super.preCollectingChanges();
- // JEAN-MICHEL: how to handle filter configurability?
- //getSubscriberSyncInfoCollector().setFilter(contentComparison);
- }
/* (non-Javadoc)
* @see org.eclipse.team.ui.synchronize.AbstractSynchronizeParticipant#isPersistent()
diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/synchronize/SubscriberParticipant.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/synchronize/SubscriberParticipant.java
index 826966ead..284a17481 100644
--- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/synchronize/SubscriberParticipant.java
+++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/synchronize/SubscriberParticipant.java
@@ -28,6 +28,7 @@ import org.eclipse.team.internal.ui.synchronize.*;
import org.eclipse.team.ui.TeamUI;
import org.eclipse.ui.*;
import org.eclipse.ui.actions.ActionFactory;
+import org.eclipse.ui.actions.ActionFactory.IWorkbenchAction;
import org.eclipse.ui.internal.progress.ProgressManager;
import org.eclipse.ui.part.IPageBookViewPage;
import org.eclipse.ui.progress.UIJob;
@@ -111,15 +112,6 @@ public abstract class SubscriberParticipant extends AbstractSynchronizeParticipa
return new SubscriberRefreshWizard(this);
}
- public void setRefreshSchedule(SubscriberRefreshSchedule schedule) {
- this.refreshSchedule = schedule;
- firePropertyChange(this, P_SYNCVIEWPAGE_SCHEDULE, null, schedule);
- }
-
- public SubscriberRefreshSchedule getRefreshSchedule() {
- return refreshSchedule;
- }
-
/* (non-Javadoc)
* @see org.eclipse.team.ui.synchronize.ISynchronizeParticipant#getResources()
*/
@@ -128,7 +120,7 @@ public abstract class SubscriberParticipant extends AbstractSynchronizeParticipa
}
private void internalRefresh(IResource[] resources, final IRefreshSubscriberListener listener, String taskName, IWorkbenchSite site) {
- final IAction[] gotoAction = new IAction[] {null};
+ final IWorkbenchAction[] gotoAction = new IWorkbenchAction[] {null};
final RefreshSubscriberJob job = new RefreshSubscriberJob(taskName, resources, collector.getSubscriber());
IProgressMonitor group = Platform.getJobManager().createProgressGroup();
group.beginTask(taskName + " " + getName(), 100);
@@ -149,6 +141,13 @@ public abstract class SubscriberParticipant extends AbstractSynchronizeParticipa
}
return false;
}
+
+ public void dispose() {
+ super.dispose();
+ if(gotoAction[0] != null) {
+ gotoAction[0].dispose();
+ }
+ }
});
// Listener delagate
IRefreshSubscriberListener autoListener = new IRefreshSubscriberListener() {
@@ -242,26 +241,16 @@ public abstract class SubscriberParticipant extends AbstractSynchronizeParticipa
return getSubscriberSyncInfoCollector().getSyncInfoSet();
}
- /*
- * Return the <code>SubscriberSyncInfoCollector</code> for the participant.
- * This collector maintains the set of all out-of-sync resources for the subscriber.
- * @return the <code>SubscriberSyncInfoCollector</code> for this participant
- */
- public SubscriberSyncInfoCollector getSubscriberSyncInfoCollector() {
- return collector;
- }
-
protected void setSubscriber(Subscriber subscriber) {
collector = new SubscriberSyncInfoCollector(subscriber);
// listen for global ignore changes
TeamUI.addPropertyChangeListener(this);
- preCollectingChanges();
-
+ // Start collecting changes
collector.start();
- // start the refresh now that a subscriber has been added
+ // Start the refresh now that a subscriber has been added
SubscriberRefreshSchedule schedule = getRefreshSchedule();
if(schedule.isEnabled()) {
getRefreshSchedule().startJob();
@@ -269,17 +258,6 @@ public abstract class SubscriberParticipant extends AbstractSynchronizeParticipa
}
/**
- * This method is invoked just before the collector is started.
- * This gives an oportunity to configure the collector parameters
- * before collection starts. The default implementation sets the working
- * set as returned by <code>getWorkingSet()</code> and sets the mode
- * as returned by <code>getMode()</code>.
- */
- protected void preCollectingChanges() {
- //TODO: Is this needed
- }
-
- /**
* Get the <code>Subscriber</code> for this participant
* @return a <code>TamSubscriber</code>
*/
@@ -318,13 +296,31 @@ public abstract class SubscriberParticipant extends AbstractSynchronizeParticipa
refreshSchedule.saveState(settings.createChild(CTX_SUBSCRIBER_SCHEDULE_SETTINGS));
}
- /**
+ /*
* Reset the sync set of the particpant by repopulating it from scratch.
*/
public void reset() {
getSubscriberSyncInfoCollector().reset();
}
+ /*
+ * Return the <code>SubscriberSyncInfoCollector</code> for the participant.
+ * This collector maintains the set of all out-of-sync resources for the subscriber.
+ * @return the <code>SubscriberSyncInfoCollector</code> for this participant
+ */
+ public SubscriberSyncInfoCollector getSubscriberSyncInfoCollector() {
+ return collector;
+ }
+
+ public void setRefreshSchedule(SubscriberRefreshSchedule schedule) {
+ this.refreshSchedule = schedule;
+ firePropertyChange(this, P_SYNCVIEWPAGE_SCHEDULE, null, schedule);
+ }
+
+ public SubscriberRefreshSchedule getRefreshSchedule() {
+ return refreshSchedule;
+ }
+
/**
* Provide a filter that is used to filter the contents of the
* sync info set for the participant. Normally, all out-of-sync

Back to the top