Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--org.eclipse.help.base/src/org/eclipse/help/internal/search/federated/LocalHelp.java3
-rw-r--r--org.eclipse.help.ui/src/org/eclipse/help/ui/internal/HelpUIPlugin.java3
-rw-r--r--org.eclipse.help.ui/src/org/eclipse/help/ui/internal/views/DynamicHelpPart.java6
-rw-r--r--org.eclipse.help.ui/src/org/eclipse/help/ui/internal/views/ReusableHelpPart.java3
-rw-r--r--org.eclipse.help.ui/src/org/eclipse/help/ui/internal/views/SearchPart.java11
5 files changed, 13 insertions, 13 deletions
diff --git a/org.eclipse.help.base/src/org/eclipse/help/internal/search/federated/LocalHelp.java b/org.eclipse.help.base/src/org/eclipse/help/internal/search/federated/LocalHelp.java
index 4c23b5062..010480b5a 100644
--- a/org.eclipse.help.base/src/org/eclipse/help/internal/search/federated/LocalHelp.java
+++ b/org.eclipse.help.base/src/org/eclipse/help/internal/search/federated/LocalHelp.java
@@ -13,6 +13,7 @@ package org.eclipse.help.internal.search.federated;
import java.util.ArrayList;
import org.eclipse.core.runtime.*;
+import org.eclipse.core.runtime.jobs.Job;
import org.eclipse.help.internal.base.*;
import org.eclipse.help.internal.search.*;
import org.eclipse.help.internal.workingset.WorkingSet;
@@ -47,7 +48,7 @@ public class LocalHelp implements ISearchEngine2 {
// If the indexer has been started and is currently running,
// wait for it to finish.
try {
- Platform.getJobManager().join(IndexerJob.FAMILY, monitor);
+ Job.getJobManager().join(IndexerJob.FAMILY, monitor);
} catch (InterruptedException e) {
}
BaseHelpSystem.getSearchManager().search(searchQuery, localResults,
diff --git a/org.eclipse.help.ui/src/org/eclipse/help/ui/internal/HelpUIPlugin.java b/org.eclipse.help.ui/src/org/eclipse/help/ui/internal/HelpUIPlugin.java
index 0631773f8..1af1e2fc2 100644
--- a/org.eclipse.help.ui/src/org/eclipse/help/ui/internal/HelpUIPlugin.java
+++ b/org.eclipse.help.ui/src/org/eclipse/help/ui/internal/HelpUIPlugin.java
@@ -13,6 +13,7 @@ package org.eclipse.help.ui.internal;
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.Platform;
import org.eclipse.core.runtime.Status;
+import org.eclipse.core.runtime.jobs.Job;
import org.eclipse.help.internal.HelpPlugin;
import org.eclipse.help.internal.base.BaseHelpSystem;
import org.eclipse.help.internal.base.HelpBasePlugin;
@@ -86,7 +87,7 @@ public class HelpUIPlugin extends AbstractUIPlugin {
public void stop(BundleContext context) throws Exception {
plugin = null;
// Make sure we cancel indexer if it is currently running
- Platform.getJobManager().cancel(IndexerJob.FAMILY);
+ Job.getJobManager().cancel(IndexerJob.FAMILY);
super.stop(context);
}
diff --git a/org.eclipse.help.ui/src/org/eclipse/help/ui/internal/views/DynamicHelpPart.java b/org.eclipse.help.ui/src/org/eclipse/help/ui/internal/views/DynamicHelpPart.java
index 633f138f0..fa25eb01f 100644
--- a/org.eclipse.help.ui/src/org/eclipse/help/ui/internal/views/DynamicHelpPart.java
+++ b/org.eclipse.help.ui/src/org/eclipse/help/ui/internal/views/DynamicHelpPart.java
@@ -164,11 +164,11 @@ public class DynamicHelpPart extends SectionPart implements IHelpPart {
});
searchResults.setText("", false, false); //$NON-NLS-1$
jobListener = new JobListener();
- Platform.getJobManager().addJobChangeListener(jobListener);
+ Job.getJobManager().addJobChangeListener(jobListener);
}
public void dispose() {
- Platform.getJobManager().removeJobChangeListener(jobListener);
+ Job.getJobManager().removeJobChangeListener(jobListener);
stop();
super.dispose();
}
@@ -242,7 +242,7 @@ public class DynamicHelpPart extends SectionPart implements IHelpPart {
protected IStatus run(IProgressMonitor monitor) {
try {
try {
- Platform.getJobManager().join(IndexerJob.FAMILY,
+ Job.getJobManager().join(IndexerJob.FAMILY,
monitor);
} catch (InterruptedException e) {
// TODO should we do someting here?
diff --git a/org.eclipse.help.ui/src/org/eclipse/help/ui/internal/views/ReusableHelpPart.java b/org.eclipse.help.ui/src/org/eclipse/help/ui/internal/views/ReusableHelpPart.java
index 29aaf896e..fecdacba8 100644
--- a/org.eclipse.help.ui/src/org/eclipse/help/ui/internal/views/ReusableHelpPart.java
+++ b/org.eclipse.help.ui/src/org/eclipse/help/ui/internal/views/ReusableHelpPart.java
@@ -21,7 +21,6 @@ import java.util.Iterator;
import java.util.Map;
import java.util.Set;
-import org.eclipse.core.runtime.Platform;
import org.eclipse.core.runtime.Preferences;
import org.eclipse.core.runtime.jobs.Job;
import org.eclipse.help.IContext;
@@ -651,7 +650,7 @@ public class ReusableHelpPart implements IHelpUIConstants,
// make sure we have the index but
// don't schedule the indexer job if one is
// already running
- Job[] jobs = Platform.getJobManager().find(IndexerJob.FAMILY);
+ Job[] jobs = Job.getJobManager().find(IndexerJob.FAMILY);
if (jobs.length == 0) {
IndexerJob indexerJob = new IndexerJob();
indexerJob.schedule();
diff --git a/org.eclipse.help.ui/src/org/eclipse/help/ui/internal/views/SearchPart.java b/org.eclipse.help.ui/src/org/eclipse/help/ui/internal/views/SearchPart.java
index 6c9c62e06..7fe1cb48f 100644
--- a/org.eclipse.help.ui/src/org/eclipse/help/ui/internal/views/SearchPart.java
+++ b/org.eclipse.help.ui/src/org/eclipse/help/ui/internal/views/SearchPart.java
@@ -1,5 +1,5 @@
/***************************************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others. All rights reserved. This program and the
+ * Copyright (c) 2000, 2006 IBM Corporation and others. All rights reserved. This program and the
* accompanying materials are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
@@ -15,7 +15,6 @@ import java.util.Observable;
import java.util.Observer;
import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Platform;
import org.eclipse.core.runtime.jobs.IJobChangeEvent;
import org.eclipse.core.runtime.jobs.IJobChangeListener;
import org.eclipse.core.runtime.jobs.Job;
@@ -124,7 +123,7 @@ public class SearchPart extends AbstractFormPart implements IHelpPart, IHelpUICo
public void done(IJobChangeEvent event) {
if (event.getJob().belongsTo(FederatedSearchJob.FAMILY)) {
- Job[] searchJobs = Platform.getJobManager().find(FederatedSearchJob.FAMILY);
+ Job[] searchJobs = Job.getJobManager().find(FederatedSearchJob.FAMILY);
if (searchJobs.length == 0) {
// search finished
searchInProgress = false;
@@ -258,7 +257,7 @@ public class SearchPart extends AbstractFormPart implements IHelpPart, IHelpUICo
toolkit.paintBordersFor(filteringGroup);
toolkit.paintBordersFor(container);
jobListener = new JobListener();
- Platform.getJobManager().addJobChangeListener(jobListener);
+ Job.getJobManager().addJobChangeListener(jobListener);
}
private void createAdvancedLink(Composite parent, FormToolkit toolkit) {
@@ -595,7 +594,7 @@ public class SearchPart extends AbstractFormPart implements IHelpPart, IHelpUICo
parent.getEngineManager().deleteObserver(engineObserver);
engineObserver = null;
}
- Platform.getJobManager().removeJobChangeListener(jobListener);
+ Job.getJobManager().removeJobChangeListener(jobListener);
stop();
super.dispose();
}
@@ -692,7 +691,7 @@ public class SearchPart extends AbstractFormPart implements IHelpPart, IHelpUICo
public void stop() {
SearchResultsPart results = (SearchResultsPart) parent.findPart(IHelpUIConstants.HV_FSEARCH_RESULT);
results.canceling();
- Platform.getJobManager().cancel(FederatedSearchJob.FAMILY);
+ Job.getJobManager().cancel(FederatedSearchJob.FAMILY);
}
public void toggleRoleFilter() {

Back to the top