Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Valenta2004-01-23 16:50:46 -0500
committerMichael Valenta2004-01-23 16:50:46 -0500
commit720a77ab60522efd637d347062cb59498f20015e (patch)
treedbb56b73c99317150b3f43d6dcc78cfaa31c3fe3
parente3a74a1c79508e1a80fd16441b3ca73c02a94a2b (diff)
downloadeclipse.platform.team-720a77ab60522efd637d347062cb59498f20015e.tar.gz
eclipse.platform.team-720a77ab60522efd637d347062cb59498f20015e.tar.xz
eclipse.platform.team-720a77ab60522efd637d347062cb59498f20015e.zip
*** empty log message ***
-rw-r--r--bundles/org.eclipse.team.core/src/org/eclipse/team/core/subscribers/utils/SynchronizationCacheRefreshOperation.java5
-rw-r--r--bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/repo/RemoveRootAction.java6
2 files changed, 5 insertions, 6 deletions
diff --git a/bundles/org.eclipse.team.core/src/org/eclipse/team/core/subscribers/utils/SynchronizationCacheRefreshOperation.java b/bundles/org.eclipse.team.core/src/org/eclipse/team/core/subscribers/utils/SynchronizationCacheRefreshOperation.java
index 976e52662..d5718370a 100644
--- a/bundles/org.eclipse.team.core/src/org/eclipse/team/core/subscribers/utils/SynchronizationCacheRefreshOperation.java
+++ b/bundles/org.eclipse.team.core/src/org/eclipse/team/core/subscribers/utils/SynchronizationCacheRefreshOperation.java
@@ -12,7 +12,6 @@ package org.eclipse.team.core.subscribers.utils;
import java.util.*;
-import org.eclipse.core.internal.jobs.JobManager;
import org.eclipse.core.resources.IContainer;
import org.eclipse.core.resources.IResource;
import org.eclipse.core.runtime.*;
@@ -53,7 +52,7 @@ public abstract class SynchronizationCacheRefreshOperation {
try {
// Get a scheduling rule on the project since CVS may obtain a lock higher then
// the resource itself.
- JobManager.getInstance().beginRule(rule, monitor);
+ Platform.getJobManager().beginRule(rule, monitor);
if (!resource.getProject().isAccessible()) {
// The project is closed so silently skip it
return new IResource[0];
@@ -73,7 +72,7 @@ public abstract class SynchronizationCacheRefreshOperation {
sub.done();
}
} finally {
- JobManager.getInstance().endRule(rule);
+ Platform.getJobManager().endRule(rule);
monitor.done();
}
if (changedResources == null) return new IResource[0];
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/repo/RemoveRootAction.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/repo/RemoveRootAction.java
index 7b93fbb2c..7b22b5605 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/repo/RemoveRootAction.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/repo/RemoveRootAction.java
@@ -14,10 +14,10 @@ import java.lang.reflect.InvocationTargetException;
import java.util.ArrayList;
import java.util.Iterator;
-import org.eclipse.core.internal.jobs.JobManager;
import org.eclipse.core.resources.IProject;
import org.eclipse.core.resources.ResourcesPlugin;
import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.core.runtime.Platform;
import org.eclipse.core.runtime.jobs.ISchedulingRule;
import org.eclipse.jface.operation.IRunnableWithProgress;
import org.eclipse.jface.viewers.IStructuredSelection;
@@ -118,13 +118,13 @@ public class RemoveRootAction extends SelectionListenerAction {
public void run(IProgressMonitor monitor) throws InvocationTargetException, InterruptedException {
ISchedulingRule rule = new RepositoryLocationSchedulingRule(root);
try {
- JobManager.getInstance().beginRule(rule, monitor);
+ Platform.getJobManager().beginRule(rule, monitor);
view.getContentProvider().cancelJobs(root);
provider.disposeRepository(root);
} catch (CVSException e) {
throw new InvocationTargetException(e);
} finally {
- JobManager.getInstance().endRule(rule);
+ Platform.getJobManager().endRule(rule);
}
}

Back to the top