| commit | c2359b541b4d7f6e25261b70eb95e80560ce727c | [log] [tgz] |
|---|---|---|
| author | Michael Valenta <mvalenta> | Mon Jan 23 22:15:50 2006 +0000 |
| committer | Michael Valenta <mvalenta> | Mon Jan 23 22:15:50 2006 +0000 |
| tree | 7a54f1763874f4861aeee0eb00de010140c817d7 | |
| parent | 8d7405b82f28e57dc4829566ab76aa4349c69f32 [diff] |
On refresh, always wait until tree is updated
diff --git a/bundles/org.eclipse.team.core/src/org/eclipse/team/core/subscribers/SubscriberMergeContext.java b/bundles/org.eclipse.team.core/src/org/eclipse/team/core/subscribers/SubscriberMergeContext.java index 986bad8..8c75895 100644 --- a/bundles/org.eclipse.team.core/src/org/eclipse/team/core/subscribers/SubscriberMergeContext.java +++ b/bundles/org.eclipse.team.core/src/org/eclipse/team/core/subscribers/SubscriberMergeContext.java
@@ -64,7 +64,8 @@ handler.start(); if (refresh) subscriber.refresh(getScope().getTraversals(), monitor); - handler.waitUntilIdle(monitor); + else + handler.waitUntilIdle(monitor); } /* (non-Javadoc) @@ -73,6 +74,7 @@ public void refresh(ResourceTraversal[] traversals, int flags, IProgressMonitor monitor) throws CoreException { subscriber.refresh(traversals, monitor); + handler.waitUntilIdle(monitor); } /* (non-Javadoc)