Removed refresh from syncviewer

2 files changed, 18 insertions, 19 deletions

diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/merge/MergeWizard.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/merge/MergeWizard.java
index 3c3557223..66cea6df3 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/merge/MergeWizard.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/merge/MergeWizard.java
@@ -66,9 +66,25 @@ public class MergeWizard extends Wizard {
 		CVSTag startTag = startPage.getTag();
 		CVSTag endTag = endPage.getTag();				
 		
-		// registering the subscriber
 		final CVSMergeSubscriber s = new CVSMergeSubscriber(resources, startTag, endTag);
-		TeamProvider.registerSubscriber(s);
+		try {
+			getContainer().run(true, true, new IRunnableWithProgress() {
+				public void run(IProgressMonitor monitor)	throws InvocationTargetException, InterruptedException {
+						try {
+							s.refresh(resources, IResource.DEPTH_INFINITE, monitor);
+						} catch (TeamException e) {
+							s.cancel();
+							throw new InvocationTargetException(e);
+						}
+						TeamProvider.registerSubscriber(s);
+				}
+			});
+		} catch (InvocationTargetException e) {
+			CVSUIPlugin.openError(getContainer().getShell(), null, null, e);
+			return false;
+		} catch (InterruptedException e) {
+			return false;
+		}
 		return true;
 	}
 	
diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/sync/views/SyncViewer.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/sync/views/SyncViewer.java
index 13089927c..a0c023e23 100644
--- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/sync/views/SyncViewer.java
+++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/sync/views/SyncViewer.java
@@ -560,23 +560,6 @@ public class SyncViewer extends ViewPart implements ITeamResourceChangeListener
 		ActionContext context = new ActionContext(null);
 		context.setInput(si);
 		actions.addContext(context);
-		
-		if (hasRunnableContext()) {
-			Display.getDefault().asyncExec(new Runnable() {
-				public void run() {
-					SyncViewer.this.run(new IRunnableWithProgress() {
-						public void run(IProgressMonitor monitor) throws InvocationTargetException, InterruptedException {
-							try {
-								s.refresh(s.roots(), IResource.DEPTH_INFINITE, monitor);
-							} catch (TeamException e) {
-								throw new InvocationTargetException(e);
-							}
-						}
-					});				
-				}
-			});
-		}
-				
 		initializeSubscriberInput(si);
 	}