Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Valenta2004-01-23 13:28:59 -0500
committerMichael Valenta2004-01-23 13:28:59 -0500
commitded9852c6f9673aa1fb4440a02f84289746d6fb5 (patch)
tree07065c536531ec1b54859523c67230cfb4c862a6
parent51e20210b2edc04b7e24953f81ba16fdb0bae660 (diff)
downloadeclipse.platform.team-ded9852c6f9673aa1fb4440a02f84289746d6fb5.tar.gz
eclipse.platform.team-ded9852c6f9673aa1fb4440a02f84289746d6fb5.tar.xz
eclipse.platform.team-ded9852c6f9673aa1fb4440a02f84289746d6fb5.zip
*** empty log message ***
-rw-r--r--bundles/org.eclipse.team.core/src/org/eclipse/team/core/subscribers/FilteredSyncInfoCollector.java (renamed from bundles/org.eclipse.team.core/src/org/eclipse/team/core/subscribers/SyncInfoSetCollector.java)8
-rw-r--r--bundles/org.eclipse.team.core/src/org/eclipse/team/core/subscribers/TeamSubscriber.java8
-rw-r--r--bundles/org.eclipse.team.core/src/org/eclipse/team/core/subscribers/TeamSubscriberSyncInfoCollector.java2
-rw-r--r--bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/CVSSyncTreeSubscriber.java10
-rw-r--r--bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/ReleaseCommentDialog.java2
-rw-r--r--bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/CVSSynchronizeViewPage.java2
-rw-r--r--bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/SafeUpdateAction.java2
-rw-r--r--bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/jobs/RefreshUserNotificationPolicy.java2
-rw-r--r--bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/ChangesSection.java16
-rw-r--r--bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/RefreshCompleteDialog.java4
-rw-r--r--bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/SynchronizeViewCompareConfiguration.java2
-rw-r--r--bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/actions/StatusLineContributionGroup.java2
-rw-r--r--bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/actions/TeamParticipantRefreshAction.java4
-rw-r--r--bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/synchronize/RefreshSchedule.java4
-rw-r--r--bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/synchronize/TeamSubscriberParticipant.java24
-rw-r--r--tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/SynchronizeViewTestAdapter.java4
16 files changed, 65 insertions, 31 deletions
diff --git a/bundles/org.eclipse.team.core/src/org/eclipse/team/core/subscribers/SyncInfoSetCollector.java b/bundles/org.eclipse.team.core/src/org/eclipse/team/core/subscribers/FilteredSyncInfoCollector.java
index 7642c3439..4433c18be 100644
--- a/bundles/org.eclipse.team.core/src/org/eclipse/team/core/subscribers/SyncInfoSetCollector.java
+++ b/bundles/org.eclipse.team.core/src/org/eclipse/team/core/subscribers/FilteredSyncInfoCollector.java
@@ -21,18 +21,20 @@ import org.eclipse.team.internal.core.subscribers.WorkingSetSyncSetInput;
* the provided filters.
*
* @see TeamSubscriberSyncInfoCollector
+ *
+ * @since 3.0
*/
-public final class SyncInfoSetCollector {
+public final class FilteredSyncInfoCollector {
private WorkingSetSyncSetInput workingSetInput;
private SyncSetInputFromSyncSet filteredInput;
private SyncInfoSet source;
- public SyncInfoSetCollector(SyncInfoSet source, IResource[] workingSet, SyncInfoFilter filter) {
+ public FilteredSyncInfoCollector(SyncInfoSet source, IResource[] workingSet, SyncInfoFilter filter) {
this.source = source;
// TODO: optimize and don't use working set if no roots are passed in
- workingSetInput = new WorkingSetSyncSetInput((SyncInfoSet)source);
+ workingSetInput = new WorkingSetSyncSetInput(source);
workingSetInput.setWorkingSet(workingSet);
filteredInput = new SyncSetInputFromSyncSet(workingSetInput.getSyncSet());
if(filter == null) {
diff --git a/bundles/org.eclipse.team.core/src/org/eclipse/team/core/subscribers/TeamSubscriber.java b/bundles/org.eclipse.team.core/src/org/eclipse/team/core/subscribers/TeamSubscriber.java
index 95640d7a8..0ae5698da 100644
--- a/bundles/org.eclipse.team.core/src/org/eclipse/team/core/subscribers/TeamSubscriber.java
+++ b/bundles/org.eclipse.team.core/src/org/eclipse/team/core/subscribers/TeamSubscriber.java
@@ -22,6 +22,14 @@ import org.eclipse.team.internal.core.TeamPlugin;
* A TeamSubscriber provides synchronization between local resources and a
* remote location that is used to share those resources.
*
+ * A TeamSubscriber is only required to send out change notification any time the sync
+ * state of a resoure changes but the local state does not. For instance,
+ * if the contents of a file have been modified or a file or folder has
+ * been deleted, the TeamSubscriber may or may not send out a TeamDelta.SYNC_CHANGED
+ * event. Also, if a project is deleted or closed, the TeamSubscriber is not required to
+ * issue a TeamDelta.ROOT_REMOVED event. It is up to clients to requery the subscriber
+ * when the state of a resource changes locally by listening to IResource deltas.
+ *
* [Note: How can we allow the refresh() operation to optimize the sync
* calculation based on the currently configured compare criteria?]
*/
diff --git a/bundles/org.eclipse.team.core/src/org/eclipse/team/core/subscribers/TeamSubscriberSyncInfoCollector.java b/bundles/org.eclipse.team.core/src/org/eclipse/team/core/subscribers/TeamSubscriberSyncInfoCollector.java
index d23704f7d..1cee1880d 100644
--- a/bundles/org.eclipse.team.core/src/org/eclipse/team/core/subscribers/TeamSubscriberSyncInfoCollector.java
+++ b/bundles/org.eclipse.team.core/src/org/eclipse/team/core/subscribers/TeamSubscriberSyncInfoCollector.java
@@ -196,6 +196,8 @@ public final class TeamSubscriberSyncInfoCollector implements IResourceChangeLis
}
private boolean isAncestorOfRoot(IResource parent) {
+ // Always traverse into projects in case a root was removed
+ if (parent.getType() == IResource.ROOT) return true;
IResource[] roots = getRoots();
for (int i = 0; i < roots.length; i++) {
IResource resource = roots[i];
diff --git a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/CVSSyncTreeSubscriber.java b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/CVSSyncTreeSubscriber.java
index 38683f101..33c0de8ca 100644
--- a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/CVSSyncTreeSubscriber.java
+++ b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/CVSSyncTreeSubscriber.java
@@ -275,7 +275,15 @@ public abstract class CVSSyncTreeSubscriber extends SyncTreeSubscriber {
}
try {
Set allMembers = new HashSet();
- allMembers.addAll(Arrays.asList(((IContainer)resource).members()));
+ try {
+ allMembers.addAll(Arrays.asList(((IContainer)resource).members()));
+ } catch (CoreException e) {
+ if (e.getStatus().getCode() == IResourceStatus.RESOURCE_NOT_FOUND) {
+ // The resource is no longer exists so ignore the exception
+ } else {
+ throw e;
+ }
+ }
allMembers.addAll(Arrays.asList(getMembers(getRemoteSynchronizationCache(), resource)));
if (isThreeWay()) {
allMembers.addAll(Arrays.asList(getMembers(getBaseSynchronizationCache(), resource)));
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/ReleaseCommentDialog.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/ReleaseCommentDialog.java
index 3d9255b60..fb0381d0b 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/ReleaseCommentDialog.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/ReleaseCommentDialog.java
@@ -90,7 +90,7 @@ public class ReleaseCommentDialog extends DetailsDialog {
TeamSubscriberParticipant participant = CVSUIPlugin.getPlugin().getCvsWorkspaceSynchronizeParticipant();
SyncInfoFilter.SyncInfoDirectionFilter filter = new SyncInfoFilter.SyncInfoDirectionFilter(SyncInfo.OUTGOING);
compareEditorInput = new SyncInfoSetCompareInput(cc,
- new SyncInfoSetCompareConfiguration(null, participant.getSyncInfoCollector().getSyncInfoSet()));
+ new SyncInfoSetCompareConfiguration(null, participant.getTeamSubscriberSyncInfoCollector().getSyncInfoSet()));
// set F1 help
WorkbenchHelp.setHelp(composite, IHelpContextIds.RELEASE_COMMENT_DIALOG);
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/CVSSynchronizeViewPage.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/CVSSynchronizeViewPage.java
index 4a1e0cede..075fae7e6 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/CVSSynchronizeViewPage.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/CVSSynchronizeViewPage.java
@@ -159,6 +159,6 @@ public class CVSSynchronizeViewPage extends TeamSubscriberParticipantPage implem
}
private SyncInfoSet getSyncInfoSet() {
- return getParticipant().getSyncInfoSetCollector().getSyncInfoSet();
+ return getParticipant().getFilteredSyncInfoCollector().getSyncInfoSet();
}
} \ No newline at end of file
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/SafeUpdateAction.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/SafeUpdateAction.java
index 0252216b2..04fb8a2fc 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/SafeUpdateAction.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/SafeUpdateAction.java
@@ -277,7 +277,7 @@ public abstract class SafeUpdateAction extends CVSSubscriberAction {
* Warn user that some files could not be updated.
* Note: This method is designed to be overridden by test cases.
*/
- protected void warnAboutFailedResources(final SyncInfoSet syncSet) {
+ protected void warnAboutFailedResources(final MutableSyncInfoSet syncSet) {
final int[] result = new int[] {Dialog.CANCEL};
TeamUIPlugin.getStandardDisplay().syncExec(new Runnable() {
public void run() {
diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/jobs/RefreshUserNotificationPolicy.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/jobs/RefreshUserNotificationPolicy.java
index eae15758a..fb8d3b062 100644
--- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/jobs/RefreshUserNotificationPolicy.java
+++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/jobs/RefreshUserNotificationPolicy.java
@@ -33,7 +33,7 @@ public class RefreshUserNotificationPolicy implements IRefreshSubscriberListener
* @see org.eclipse.team.internal.ui.jobs.IRefreshSubscriberListener#refreshDone(org.eclipse.team.internal.ui.jobs.IRefreshEvent)
*/
public void refreshDone(IRefreshEvent event) {
- if(event.getSubscriber() != participant.getSyncInfoCollector().getTeamSubscriber()) return;
+ if(event.getSubscriber() != participant.getTeamSubscriberSyncInfoCollector().getTeamSubscriber()) return;
int type = event.getRefreshType();
diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/ChangesSection.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/ChangesSection.java
index f8f0314c9..20248ee84 100644
--- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/ChangesSection.java
+++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/ChangesSection.java
@@ -96,12 +96,12 @@ public class ChangesSection extends Composite {
calculateDescription();
- participant.getSyncInfoSetCollector().getSyncInfoSet().addSyncSetChangedListener(changedListener);
- participant.getSyncInfoCollector().getSyncInfoSet().addSyncSetChangedListener(changedListener);
+ participant.getFilteredSyncInfoCollector().getSyncInfoSet().addSyncSetChangedListener(changedListener);
+ participant.getTeamSubscriberSyncInfoCollector().getSyncInfoSet().addSyncSetChangedListener(changedListener);
}
private void calculateDescription() {
- if(participant.getSyncInfoSetCollector().getSyncInfoSet().size() == 0) {
+ if(participant.getFilteredSyncInfoCollector().getSyncInfoSet().size() == 0) {
TeamUIPlugin.getStandardDisplay().asyncExec(new Runnable() {
public void run() {
if (changesSectionContainer.isDisposed()) return;
@@ -132,9 +132,9 @@ public class ChangesSection extends Composite {
data.grabExcessVerticalSpace = true;
composite.setLayoutData(data);
- SyncInfoSet workspace = participant.getSyncInfoCollector().getSyncInfoSet();
- SyncInfoSet workingSet = participant.getSyncInfoSetCollector().getWorkingSetSyncInfoSet();
- SyncInfoSet filteredSet = participant.getSyncInfoSetCollector().getSyncInfoSet();
+ SyncInfoSet workspace = participant.getTeamSubscriberSyncInfoCollector().getSyncInfoSet();
+ SyncInfoSet workingSet = participant.getFilteredSyncInfoCollector().getWorkingSetSyncInfoSet();
+ SyncInfoSet filteredSet = participant.getFilteredSyncInfoCollector().getSyncInfoSet();
int changesInWorkspace = workspace.size();
int changesInWorkingSet =workingSet.size();
@@ -205,7 +205,7 @@ public class ChangesSection extends Composite {
public void dispose() {
super.dispose();
- participant.getSyncInfoSetCollector().getSyncInfoSet().removeSyncSetChangedListener(changedListener);
- participant.getSyncInfoCollector().getSyncInfoSet().removeSyncSetChangedListener(changedListener);
+ participant.getFilteredSyncInfoCollector().getSyncInfoSet().removeSyncSetChangedListener(changedListener);
+ participant.getTeamSubscriberSyncInfoCollector().getSyncInfoSet().removeSyncSetChangedListener(changedListener);
}
} \ No newline at end of file
diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/RefreshCompleteDialog.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/RefreshCompleteDialog.java
index fa69c87fa..52161d784 100644
--- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/RefreshCompleteDialog.java
+++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/RefreshCompleteDialog.java
@@ -34,7 +34,7 @@ public class RefreshCompleteDialog extends DetailsDialog {
private Button promptWhenNoChanges;
private Button promptWithChanges;
private SyncInfoSetCompareInput compareEditorInput;
- private SyncInfoSetCollector set;
+ private FilteredSyncInfoCollector set;
private IRefreshEvent event;
private final static int RESOURCE_LIST_SIZE = 10;
private IDialogSettings settings;
@@ -50,7 +50,7 @@ public class RefreshCompleteDialog extends DetailsDialog {
this.event = event;
setImageKey(DLG_IMG_INFO);
- this.set = new SyncInfoSetCollector(participant.getSyncInfoCollector().getSyncInfoSet(), getResources(), null);
+ this.set = new FilteredSyncInfoCollector(participant.getTeamSubscriberSyncInfoCollector().getSyncInfoSet(), getResources(), null);
this.compareEditorInput = new SyncInfoSetCompareInput(new CompareConfiguration(),
new SyncInfoSetCompareConfiguration(participant.getId(), set.getSyncInfoSet()));
diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/SynchronizeViewCompareConfiguration.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/SynchronizeViewCompareConfiguration.java
index c744f7499..11e496c7b 100644
--- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/SynchronizeViewCompareConfiguration.java
+++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/SynchronizeViewCompareConfiguration.java
@@ -37,7 +37,7 @@ public class SynchronizeViewCompareConfiguration extends SyncInfoSetCompareConfi
private TeamParticipantRefreshAction refreshSelectionAction;
public SynchronizeViewCompareConfiguration(ISynchronizeView view, TeamSubscriberParticipant participant) {
- super(participant.getId(), participant.getSyncInfoSetCollector().getSyncInfoSet());
+ super(participant.getId(), participant.getFilteredSyncInfoCollector().getSyncInfoSet());
this.view = view;
this.participant = participant;
}
diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/actions/StatusLineContributionGroup.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/actions/StatusLineContributionGroup.java
index 6417819f7..d4a537644 100644
--- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/actions/StatusLineContributionGroup.java
+++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/actions/StatusLineContributionGroup.java
@@ -42,7 +42,7 @@ public class StatusLineContributionGroup extends ActionGroup implements ISyncSet
public StatusLineContributionGroup(final Shell shell, TeamSubscriberParticipant participant) {
super();
this.participant = participant;
- this.collector = participant.getSyncInfoCollector();
+ this.collector = participant.getTeamSubscriberSyncInfoCollector();
this.incoming = createStatusLineContribution(INCOMING_ID, TeamSubscriberParticipant.INCOMING_MODE, "0", incomingImage); //$NON-NLS-1$
this.outgoing = createStatusLineContribution(OUTGOING_ID, TeamSubscriberParticipant.OUTGOING_MODE, "0", outgoingImage); //$NON-NLS-1$
this.conflicting = createStatusLineContribution(CONFLICTING_ID, TeamSubscriberParticipant.CONFLICTING_MODE, "0", conflictingImage); //$NON-NLS-1$
diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/actions/TeamParticipantRefreshAction.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/actions/TeamParticipantRefreshAction.java
index cf1a8aa1f..2ec72ab6a 100644
--- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/actions/TeamParticipantRefreshAction.java
+++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/actions/TeamParticipantRefreshAction.java
@@ -23,10 +23,10 @@ import org.eclipse.team.ui.synchronize.actions.RefreshAction;
public class TeamParticipantRefreshAction extends RefreshAction {
public TeamParticipantRefreshAction(ISelectionProvider provider, TeamSubscriberParticipant participant, boolean refreshAll) {
- super(provider, participant.getName(), participant.getSyncInfoCollector(), new RefreshUserNotificationPolicy(participant), refreshAll);
+ super(provider, participant.getName(), participant.getTeamSubscriberSyncInfoCollector(), new RefreshUserNotificationPolicy(participant), refreshAll);
}
public static void run(IResource[] resources, TeamSubscriberParticipant participant) {
- run(participant.getName(), resources, participant.getSyncInfoCollector(), new RefreshUserNotificationPolicy(participant));
+ run(participant.getName(), resources, participant.getTeamSubscriberSyncInfoCollector(), new RefreshUserNotificationPolicy(participant));
}
} \ No newline at end of file
diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/synchronize/RefreshSchedule.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/synchronize/RefreshSchedule.java
index 6e788d662..48e23074b 100644
--- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/synchronize/RefreshSchedule.java
+++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/synchronize/RefreshSchedule.java
@@ -91,12 +91,12 @@ public class RefreshSchedule {
}
protected void startJob() {
- SyncInfoSet set = participant.getSyncInfoSetCollector().getSyncInfoSet();
+ SyncInfoSet set = participant.getFilteredSyncInfoCollector().getSyncInfoSet();
if(set == null) {
return;
}
if(job == null) {
- job = new RefreshSubscriberJob("Refreshing '" + participant.getName() + "'. " + getRefreshIntervalAsString(), participant.getSyncInfoCollector()); //$NON-NLS-1$
+ job = new RefreshSubscriberJob("Refreshing '" + participant.getName() + "'. " + getRefreshIntervalAsString(), participant.getTeamSubscriberSyncInfoCollector()); //$NON-NLS-1$
}
job.setRestartOnCancel(true);
job.setReschedule(true);
diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/synchronize/TeamSubscriberParticipant.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/synchronize/TeamSubscriberParticipant.java
index 4f7115064..915921ab2 100644
--- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/synchronize/TeamSubscriberParticipant.java
+++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/ui/synchronize/TeamSubscriberParticipant.java
@@ -32,7 +32,7 @@ public abstract class TeamSubscriberParticipant extends AbstractSynchronizeParti
private TeamSubscriberSyncInfoCollector collector;
- private SyncInfoSetCollector filteredSyncSet;
+ private FilteredSyncInfoCollector filteredSyncSet;
private RefreshSchedule refreshSchedule;
@@ -147,17 +147,27 @@ public abstract class TeamSubscriberParticipant extends AbstractSynchronizeParti
collector.dispose();
}
- public final SyncInfoSetCollector getSyncInfoSetCollector() {
+ /**
+ * Return the <code>FilteredSyncInfoCollector</code> for this participant.
+ * Thsi collector maintains the set of all out-of-sync resources that
+ * are being displayed on the participant's synchronize view page.
+ */
+ public final FilteredSyncInfoCollector getFilteredSyncInfoCollector() {
return filteredSyncSet;
}
- public final TeamSubscriberSyncInfoCollector getSyncInfoCollector() {
+ /**
+ * Return the <code>TeamSubscriberSyncInfoCollector</code> for the participant.
+ * This collector maintains the set of all out-of-sync resources for the subscriber.
+ * @return the <code>TeamSubscriberSyncInfoCollector</code> for this participant
+ */
+ public final TeamSubscriberSyncInfoCollector getTeamSubscriberSyncInfoCollector() {
return collector;
}
protected void setSubscriber(TeamSubscriber subscriber) {
collector = new TeamSubscriberSyncInfoCollector(subscriber);
- filteredSyncSet = new SyncInfoSetCollector(collector.getSyncInfoSet(), null /* no initial roots */, null /* no initial filter */);
+ filteredSyncSet = new FilteredSyncInfoCollector(collector.getSyncInfoSet(), null /* no initial roots */, null /* no initial filter */);
// listen for global ignore changes
TeamUI.addPropertyChangeListener(this);
@@ -168,6 +178,10 @@ public abstract class TeamSubscriberParticipant extends AbstractSynchronizeParti
updateMode(getMode());
}
+ /**
+ * Get the <code>TeamSubscriber</code> for this participant
+ * @return a <code>TamSubscriber</code>
+ */
public TeamSubscriber getSubscriber() {
return collector.getTeamSubscriber();
}
@@ -200,7 +214,7 @@ public abstract class TeamSubscriberParticipant extends AbstractSynchronizeParti
modeFilter = CONFLICTING_MODE_FILTER; break;
}
- getSyncInfoSetCollector().setFilter(
+ getFilteredSyncInfoCollector().setFilter(
new SyncInfoFilter.AndSyncInfoFilter(
new SyncInfoFilter[] {
new SyncInfoFilter.SyncInfoDirectionFilter(modeFilter)
diff --git a/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/SynchronizeViewTestAdapter.java b/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/SynchronizeViewTestAdapter.java
index f65804c33..bd49a1e8b 100644
--- a/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/SynchronizeViewTestAdapter.java
+++ b/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/SynchronizeViewTestAdapter.java
@@ -63,7 +63,7 @@ public class SynchronizeViewTestAdapter extends SyncInfoSource {
private TeamSubscriberSyncInfoCollector getCollector(TeamSubscriber subscriber) {
TeamSubscriberParticipant participant = getParticipant(subscriber);
if (participant == null) return null;
- TeamSubscriberSyncInfoCollector syncInfoCollector = participant.getSyncInfoCollector();
+ TeamSubscriberSyncInfoCollector syncInfoCollector = participant.getTeamSubscriberSyncInfoCollector();
EclipseTest.waitForSubscriberInputHandling(syncInfoCollector);
return syncInfoCollector;
}
@@ -73,7 +73,7 @@ public class SynchronizeViewTestAdapter extends SyncInfoSource {
*/
protected void assertProjectRemoved(TeamSubscriber subscriber, IProject project) throws TeamException {
super.assertProjectRemoved(subscriber, project);
- SyncInfoSet set = getParticipant(subscriber).getSyncInfoCollector().getSyncInfoSet();
+ SyncInfoSet set = getCollector(subscriber).getSyncInfoSet();
if (set.getOutOfSyncDescendants(project).length != 0) {
throw new AssertionFailedError("The sync set still contains resources from the deleted project " + project.getName());
}

Back to the top