Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Valenta2003-09-09 13:46:18 -0400
committerMichael Valenta2003-09-09 13:46:18 -0400
commit2c3c7b40452168e38b7d1912ca568eedd03f63e7 (patch)
tree56f596424be50422578da42aacdfccd5ada1bb02
parent3fffcff95414dae9724718c7c283300a405b6769 (diff)
downloadeclipse.platform.team-2c3c7b40452168e38b7d1912ca568eedd03f63e7.tar.gz
eclipse.platform.team-2c3c7b40452168e38b7d1912ca568eedd03f63e7.tar.xz
eclipse.platform.team-2c3c7b40452168e38b7d1912ca568eedd03f63e7.zip
41979: [CVS Concurrency] Code added to M3 that should be modified in the future
-rw-r--r--bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/CVSWorkspaceSubscriber.java6
-rw-r--r--bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/sync/sets/SubscriberEventHandler.java8
2 files changed, 2 insertions, 12 deletions
diff --git a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/CVSWorkspaceSubscriber.java b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/CVSWorkspaceSubscriber.java
index 4af5c1c46..9a7512b61 100644
--- a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/CVSWorkspaceSubscriber.java
+++ b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/CVSWorkspaceSubscriber.java
@@ -19,7 +19,6 @@ import org.eclipse.core.resources.IResourceVisitor;
import org.eclipse.core.resources.ResourcesPlugin;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.Platform;
import org.eclipse.core.runtime.QualifiedName;
import org.eclipse.team.core.RepositoryProvider;
import org.eclipse.team.core.TeamException;
@@ -160,10 +159,6 @@ public class CVSWorkspaceSubscriber extends CVSSyncTreeSubscriber implements IRe
IResource resource = resources[i];
final IProgressMonitor infinite = Policy.infiniteSubMonitorFor(monitor, 100);
try {
- // We need to do a scheduling rule on the project because
- // the EclipseSynchronizer currently obtains rules which causes
- // many workers to be created (see bug 41979).
- Platform.getJobManager().beginRule(resource);
infinite.beginTask(null, 512);
resource.accept(new IResourceVisitor() {
public boolean visit(IResource innerResource) throws CoreException {
@@ -184,7 +179,6 @@ public class CVSWorkspaceSubscriber extends CVSSyncTreeSubscriber implements IRe
} catch (CoreException e) {
throw CVSException.wrapException(e);
} finally {
- Platform.getJobManager().endRule();
infinite.done();
}
}
diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/sync/sets/SubscriberEventHandler.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/sync/sets/SubscriberEventHandler.java
index e040b3d16..91b932f03 100644
--- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/sync/sets/SubscriberEventHandler.java
+++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/sync/sets/SubscriberEventHandler.java
@@ -15,7 +15,6 @@ import java.util.Arrays;
import java.util.List;
import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.WorkspaceJob;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.jobs.IJobChangeEvent;
@@ -189,11 +188,8 @@ public class SubscriberEventHandler {
* the queue is empty.
*/
private void createEventHandlingJob() {
- // We need to use a WorkspaceJob since
- // the EclipseSynchronizer currently obtains rules which causes
- // many workers to be created (see bug 41979).
- eventHandlerJob = new WorkspaceJob(Policy.bind("SubscriberEventHandler.jobName")) {//$NON-NLS-1$
- public IStatus runInWorkspace(IProgressMonitor monitor) {
+ eventHandlerJob = new Job(Policy.bind("SubscriberEventHandler.jobName")) {//$NON-NLS-1$
+ public IStatus run(IProgressMonitor monitor) {
return processEvents(monitor);
}
};

Back to the top