41580: class circularity error upon startup

2 files changed, 4 insertions, 6 deletions

diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/sync/actions/SyncAllAction.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/sync/actions/SyncAllAction.java
index 49e89c9bd..37686d89b 100644
--- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/sync/actions/SyncAllAction.java
+++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/sync/actions/SyncAllAction.java
@@ -20,7 +20,6 @@ import org.eclipse.swt.events.MenuEvent;
 import org.eclipse.swt.widgets.Control;
 import org.eclipse.swt.widgets.Menu;
 import org.eclipse.swt.widgets.MenuItem;
-import org.eclipse.team.core.subscribers.TeamProvider;
 import org.eclipse.team.core.subscribers.TeamSubscriber;
 import org.eclipse.team.ui.TeamUI;
 import org.eclipse.team.ui.sync.ISynchronizeView;
@@ -94,7 +93,7 @@ public class SyncAllAction implements IWorkbenchWindowPulldownDelegate2 {
 	}
 
 	private void fillMenu() {
-		TeamSubscriber[] subscribers = TeamProvider.getSubscribers();
+		TeamSubscriber[] subscribers = TeamSubscriber.getSubscriberManager().getSubscribers();
 		for (int i = 0; i < subscribers.length; i++) {
 			TeamSubscriber subscriber = subscribers[i];
 			createAction(getCreatedMenu(), new SubscriberAction(subscriber), i + 1);
diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/sync/views/SynchronizeView.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/sync/views/SynchronizeView.java
index e1953228e..14b141c70 100644
--- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/sync/views/SynchronizeView.java
+++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/sync/views/SynchronizeView.java
@@ -61,7 +61,6 @@ import org.eclipse.team.core.TeamException;
 import org.eclipse.team.core.subscribers.ITeamResourceChangeListener;
 import org.eclipse.team.core.subscribers.SyncInfo;
 import org.eclipse.team.core.subscribers.TeamDelta;
-import org.eclipse.team.core.subscribers.TeamProvider;
 import org.eclipse.team.core.subscribers.TeamSubscriber;
 import org.eclipse.team.internal.core.Assert;
 import org.eclipse.team.internal.ui.IPreferenceIds;
@@ -168,8 +167,8 @@ public class SynchronizeView extends ViewPart implements ITeamResourceChangeList
 		contributeToActionBars();
 		
 		// Register for addition/removal of subscribers
-		TeamProvider.addListener(this);
-		TeamSubscriber[] subscribers = TeamProvider.getSubscribers();
+		TeamSubscriber.getSubscriberManager().addTeamResourceChangeListener(this);
+		TeamSubscriber[] subscribers = TeamSubscriber.getSubscriberManager().getSubscribers();
 		for (int i = 0; i < subscribers.length; i++) {
 			TeamSubscriber subscriber = subscribers[i];
 			addSubscriber(subscriber);
@@ -533,7 +532,7 @@ public class SynchronizeView extends ViewPart implements ITeamResourceChangeList
 		job.setSubscriberInput(null);
 		
 		// Cleanup the subscriber inputs
-		TeamProvider.removeListener(this);
+		TeamSubscriber.getSubscriberManager().removeTeamResourceChangeListener(this);
 		for (Iterator it = subscriberInputs.values().iterator(); it.hasNext();) {
 			SubscriberInput input = (SubscriberInput) it.next();
 			input.dispose();