*** empty log message ***

5 files changed, 19 insertions, 16 deletions

diff --git a/bundles/org.eclipse.team.core/src/org/eclipse/team/core/subscribers/FilteredSyncInfoCollector.java b/bundles/org.eclipse.team.core/src/org/eclipse/team/core/subscribers/FilteredSyncInfoCollector.java
index bf2f54ff5..5d9d5b240 100644
--- a/bundles/org.eclipse.team.core/src/org/eclipse/team/core/subscribers/FilteredSyncInfoCollector.java
+++ b/bundles/org.eclipse.team.core/src/org/eclipse/team/core/subscribers/FilteredSyncInfoCollector.java
@@ -11,6 +11,7 @@
 package org.eclipse.team.core.subscribers;
 
 import org.eclipse.team.core.synchronize.*;
+import org.eclipse.team.internal.core.subscribers.SubscriberSyncInfoSet;
 import org.eclipse.team.internal.core.subscribers.SyncSetInputFromSyncSet;
 
 /**
@@ -30,7 +31,7 @@ import org.eclipse.team.internal.core.subscribers.SyncSetInputFromSyncSet;
 public final class FilteredSyncInfoCollector {
 
 	private SyncSetInputFromSyncSet filteredInput;
-	private SyncInfoSet source;
+	private SubscriberSyncInfoSet source;
 
 	/**
 	 * Create a filtered sync info collector that collects sync info from the source set.
@@ -38,7 +39,7 @@ public final class FilteredSyncInfoCollector {
 	 * @param set the source set
 	 * @param filter the filter to be applied to the output set
 	 */
-	public FilteredSyncInfoCollector(SubscriberSyncInfoCollector collector, SyncInfoSet set, SyncInfoFilter filter) {
+	public FilteredSyncInfoCollector(SubscriberSyncInfoCollector collector, SubscriberSyncInfoSet set, SyncInfoFilter filter) {
 		this.source = set;
 		filteredInput = new SyncSetInputFromSyncSet(source, collector.getEventHandler());
 		filteredInput.setFilter(filter);
diff --git a/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/subscribers/SyncSetInputFromSyncSet.java b/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/subscribers/SyncSetInputFromSyncSet.java
index 63f87d3f8..9ee1af721 100644
--- a/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/subscribers/SyncSetInputFromSyncSet.java
+++ b/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/subscribers/SyncSetInputFromSyncSet.java
@@ -21,9 +21,9 @@ import org.eclipse.team.internal.core.Policy;
  */
 public class SyncSetInputFromSyncSet extends SyncSetInput implements ISyncInfoSetChangeListener {
 
-	SyncInfoSet inputSyncSet;
+	SubscriberSyncInfoSet inputSyncSet;
 
-	public SyncSetInputFromSyncSet(SyncInfoSet set, SubscriberEventHandler handler) {
+	public SyncSetInputFromSyncSet(SubscriberSyncInfoSet set, SubscriberEventHandler handler) {
 		super(handler);
 		this.inputSyncSet = set;
 		inputSyncSet.addSyncSetChangedListener(this);
@@ -79,8 +79,8 @@ public class SyncSetInputFromSyncSet extends SyncSetInput implements ISyncInfoSe
 	}
 	
 	public void reset() {
-		getSyncSet().removeSyncSetChangedListener(this);
-		getSyncSet().connect(this);
+		inputSyncSet.removeSyncSetChangedListener(this);
+		inputSyncSet.connect(this);
 	}
 
 	/* (non-Javadoc)
diff --git a/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/subscribers/WorkingSetSyncSetInput.java b/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/subscribers/WorkingSetSyncSetInput.java
index 568fad32e..7cb0fdbcb 100644
--- a/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/subscribers/WorkingSetSyncSetInput.java
+++ b/bundles/org.eclipse.team.core/src/org/eclipse/team/internal/core/subscribers/WorkingSetSyncSetInput.java
@@ -12,13 +12,12 @@ package org.eclipse.team.internal.core.subscribers;
 
 import org.eclipse.core.resources.IResource;
 import org.eclipse.team.core.subscribers.Subscriber;
-import org.eclipse.team.core.synchronize.SyncInfoSet;
 
 public class WorkingSetSyncSetInput extends SyncSetInputFromSyncSet {
 
 	private SyncInfoWorkingSetFilter workingSetFilter = new SyncInfoWorkingSetFilter();
 	
-	public WorkingSetSyncSetInput(SyncInfoSet set, SubscriberEventHandler handler) {
+	public WorkingSetSyncSetInput(SubscriberSyncInfoSet set, SubscriberEventHandler handler) {
 		super(set, handler);
 		setFilter(workingSetFilter);
 	}
diff --git a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/CVSMergeSyncInfo.java b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/CVSMergeSyncInfo.java
index 6b6ec60a1..81b11a7db 100644
--- a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/CVSMergeSyncInfo.java
+++ b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/CVSMergeSyncInfo.java
@@ -20,6 +20,10 @@ import org.eclipse.team.core.synchronize.*;
  */
 public class CVSMergeSyncInfo extends CVSSyncInfo {
 
+	public CVSMergeSyncInfo(IResource local, IRemoteResource base, IRemoteResource remote, Subscriber subscriber) throws TeamException {
+		super(local, base, remote, subscriber);
+	}
+	
 	/* (non-Javadoc)
 	 * @see org.eclipse.team.internal.ccvs.core.CVSSyncInfo#handleDeletionConflicts(int)
 	 */
@@ -46,10 +50,6 @@ public class CVSMergeSyncInfo extends CVSSyncInfo {
 		
 		return kind;
 	}
-
-	public CVSMergeSyncInfo(IResource local, IRemoteResource base, IRemoteResource remote, Subscriber subscriber) throws TeamException {
-		super(local, base, remote, subscriber);
-	}
 	
 	/* (non-Javadoc)
 	 * @see org.eclipse.team.internal.ccvs.core.CVSSyncInfo#makeOutgoing(org.eclipse.core.runtime.IProgressMonitor)
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 27bba08b5..ec354b5ac 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
@@ -24,11 +24,14 @@ import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.layout.GridLayout;
 import org.eclipse.swt.widgets.*;
 import org.eclipse.team.core.subscribers.FilteredSyncInfoCollector;
-import org.eclipse.team.core.synchronize.*;
+import org.eclipse.team.core.synchronize.SyncInfo;
+import org.eclipse.team.core.synchronize.SyncInfoFilter;
+import org.eclipse.team.internal.core.subscribers.SubscriberSyncInfoSet;
 import org.eclipse.team.internal.ui.*;
 import org.eclipse.team.internal.ui.dialogs.DetailsDialog;
-import org.eclipse.team.ui.synchronize.subscriber.*;
-import org.eclipse.team.ui.synchronize.viewers.*;
+import org.eclipse.team.ui.synchronize.subscriber.SubscriberParticipant;
+import org.eclipse.team.ui.synchronize.viewers.DiffTreeViewerConfiguration;
+import org.eclipse.team.ui.synchronize.viewers.SyncInfoSetCompareInput;
 
 public class RefreshCompleteDialog extends DetailsDialog {
 
@@ -65,7 +68,7 @@ public class RefreshCompleteDialog extends DetailsDialog {
 		};
 		this.collector = new FilteredSyncInfoCollector(
 				participant.getSubscriberSyncInfoCollector(), 
-				participant.getSubscriberSyncInfoCollector().getSubscriberSyncInfoSet(), 
+				(SubscriberSyncInfoSet)participant.getSubscriberSyncInfoCollector().getSubscriberSyncInfoSet(), 
 				filter);
 		this.collector.start();
 		this.compareEditorInput = new SyncInfoSetCompareInput(new CompareConfiguration(),