diff options
| author | Michael Valenta | 2003-09-11 17:48:45 +0000 |
|---|---|---|
| committer | Michael Valenta | 2003-09-11 17:48:45 +0000 |
| commit | d3216abd8a360ac477a584dbc8564a938c3da434 (patch) | |
| tree | 221b3ee2303ba425e0096512aaacb55049508789 /bundles/org.eclipse.team.cvs.ui/src | |
| parent | 0907bc683857217fc7f769e55b78e88df60fecea (diff) | |
| download | eclipse.platform.team-d3216abd8a360ac477a584dbc8564a938c3da434.tar.gz eclipse.platform.team-d3216abd8a360ac477a584dbc8564a938c3da434.tar.xz eclipse.platform.team-d3216abd8a360ac477a584dbc8564a938c3da434.zip | |
Conforming to new Core API
Diffstat (limited to 'bundles/org.eclipse.team.cvs.ui/src')
2 files changed, 6 insertions, 4 deletions
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/CheckoutIntoOperation.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/CheckoutIntoOperation.java index 84564153f..55a927010 100644 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/CheckoutIntoOperation.java +++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/CheckoutIntoOperation.java @@ -119,13 +119,14 @@ public class CheckoutIntoOperation extends CheckoutOperation { */ protected void checkout(ICVSRemoteFolder[] folders, IProgressMonitor monitor) throws CVSException { monitor.beginTask(null, 100); + ISchedulingRule rule = getSchedulingRule(); try { // Obtain a scheduling rule on the projects were about to overwrite - Platform.getJobManager().beginRule(getSchedulingRule()); + Platform.getJobManager().beginRule(rule); super.checkout(folders, Policy.subMonitorFor(monitor, 90)); refreshRoot(getLocalRoot(getLocalFolder()), Policy.subMonitorFor(monitor, 10)); } finally { - Platform.getJobManager().endRule(); + Platform.getJobManager().endRule(rule); monitor.done(); } } diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/CheckoutProjectOperation.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/CheckoutProjectOperation.java index 6a2f7c810..65f21975c 100644 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/CheckoutProjectOperation.java +++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/operations/CheckoutProjectOperation.java @@ -148,13 +148,14 @@ public abstract class CheckoutProjectOperation extends CheckoutOperation { return OK; } + ISchedulingRule rule = getSchedulingRule(targetProjects); try { // Obtain a scheduling rule on the projects were about to overwrite - Platform.getJobManager().beginRule(getSchedulingRule(targetProjects)); + Platform.getJobManager().beginRule(rule); IStatus result = performCheckout(session, resource, targetProjects, project != null, Policy.subMonitorFor(pm, 90)); return result; } finally { - Platform.getJobManager().endRule(); + Platform.getJobManager().endRule(rule); } } catch (CVSException e) { // An exception occurred either during the module-expansion or checkout |