Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKarsten Thoms2017-12-12 01:02:32 +0000
committerMikaƫl Barbero2017-12-12 08:27:03 +0000
commitc3e849a0affd43e328d0bde669f7e2ea76be7b62 (patch)
treeac8c683105e665f4179fc8b740d056b287871930
parent180453677480695b60afd1ee8bf2a8badad8693b (diff)
downloadeclipse.platform.ui-c3e849a0affd43e328d0bde669f7e2ea76be7b62.tar.gz
eclipse.platform.ui-c3e849a0affd43e328d0bde669f7e2ea76be7b62.tar.xz
eclipse.platform.ui-c3e849a0affd43e328d0bde669f7e2ea76be7b62.zip
Bug 528186 - Replace usage of Platform#getJobManager by
Job#getJobManager Change-Id: I6aeb93e8d44a5ab2fa523dcd2410c8f7081e7551 Signed-off-by: Karsten Thoms <karsten.thoms@itemis.de>
-rw-r--r--examples/org.eclipse.e4.ui.examples.job/src/org/eclipse/e4/ui/examples/jobs/views/JobsView.java7
-rw-r--r--tests/org.eclipse.ui.tests.performance/src/org/eclipse/ui/tests/performance/EditorTestHelper.java3
-rw-r--r--tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/concurrency/TransferRuleTest.java7
-rw-r--r--tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/decorators/DecoratorViewerTest.java3
4 files changed, 8 insertions, 12 deletions
diff --git a/examples/org.eclipse.e4.ui.examples.job/src/org/eclipse/e4/ui/examples/jobs/views/JobsView.java b/examples/org.eclipse.e4.ui.examples.job/src/org/eclipse/e4/ui/examples/jobs/views/JobsView.java
index df7baa1b04a..bc9c2de87cd 100644
--- a/examples/org.eclipse.e4.ui.examples.job/src/org/eclipse/e4/ui/examples/jobs/views/JobsView.java
+++ b/examples/org.eclipse.e4.ui.examples.job/src/org/eclipse/e4/ui/examples/jobs/views/JobsView.java
@@ -11,7 +11,6 @@ import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.Platform;
import org.eclipse.core.runtime.Status;
import org.eclipse.core.runtime.SubMonitor;
import org.eclipse.core.runtime.jobs.Job;
@@ -114,7 +113,7 @@ public class JobsView {
}
if (useGroup) {
- group = Platform.getJobManager().createProgressGroup();
+ group = Job.getJobManager().createProgressGroup();
group.beginTask("Group", total); //$NON-NLS-1$
}
@@ -317,14 +316,14 @@ public class JobsView {
* Wakes up all sleeping test jobs.
*/
protected void doWakeUp() {
- Platform.getJobManager().wakeUp(TestJob.FAMILY_TEST_JOB);
+ Job.getJobManager().wakeUp(TestJob.FAMILY_TEST_JOB);
}
/**
* Puts to sleep all waiting test jobs.
*/
protected void doSleep() {
- Platform.getJobManager().sleep(TestJob.FAMILY_TEST_JOB);
+ Job.getJobManager().sleep(TestJob.FAMILY_TEST_JOB);
}
/**
diff --git a/tests/org.eclipse.ui.tests.performance/src/org/eclipse/ui/tests/performance/EditorTestHelper.java b/tests/org.eclipse.ui.tests.performance/src/org/eclipse/ui/tests/performance/EditorTestHelper.java
index c3b6f8fd691..14f3ce329e9 100644
--- a/tests/org.eclipse.ui.tests.performance/src/org/eclipse/ui/tests/performance/EditorTestHelper.java
+++ b/tests/org.eclipse.ui.tests.performance/src/org/eclipse/ui/tests/performance/EditorTestHelper.java
@@ -12,7 +12,6 @@ package org.eclipse.ui.tests.performance;
import org.eclipse.core.resources.IFile;
-import org.eclipse.core.runtime.Platform;
import org.eclipse.core.runtime.jobs.IJobManager;
import org.eclipse.core.runtime.jobs.Job;
import org.eclipse.jface.text.IDocument;
@@ -129,7 +128,7 @@ public class EditorTestHelper {
}
public static boolean isCalm() {
- IJobManager jobManager= Platform.getJobManager();
+ IJobManager jobManager = Job.getJobManager();
Job[] jobs= jobManager.find(null);
for (int i= 0; i < jobs.length; i++) {
Job job= jobs[i];
diff --git a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/concurrency/TransferRuleTest.java b/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/concurrency/TransferRuleTest.java
index 79b35294527..7e555f72853 100644
--- a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/concurrency/TransferRuleTest.java
+++ b/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/concurrency/TransferRuleTest.java
@@ -13,7 +13,6 @@ package org.eclipse.ui.tests.concurrency;
import java.lang.reflect.InvocationTargetException;
import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.Platform;
import org.eclipse.core.runtime.jobs.ISchedulingRule;
import org.eclipse.core.runtime.jobs.Job;
import org.eclipse.jface.dialogs.ProgressMonitorDialog;
@@ -74,7 +73,7 @@ public class TransferRuleTest extends UITestCase {
@Override
public void threadChange(Thread thread) {
try {
- Platform.getJobManager().transferRule(rule, thread);
+ Job.getJobManager().transferRule(rule, thread);
} catch (Throwable t) {
//remember any error so we can fail the test
error = t;
@@ -91,7 +90,7 @@ public class TransferRuleTest extends UITestCase {
TestRunnable runnable = new TestRunnable(rule);
try {
//first get the rule in the test thread
- Platform.getJobManager().beginRule(rule, null);
+ Job.getJobManager().beginRule(rule, null);
//now execute the runnable using ModalContext - the rule should transfer correctly
new ProgressMonitorDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell()).run(true, true, runnable);
} catch (InvocationTargetException e) {
@@ -102,7 +101,7 @@ public class TransferRuleTest extends UITestCase {
fail("1.1");
} finally {
//must release the rule when finished
- Platform.getJobManager().endRule(rule);
+ Job.getJobManager().endRule(rule);
}
//check the runnable for errors
if (runnable.error != null) {
diff --git a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/decorators/DecoratorViewerTest.java b/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/decorators/DecoratorViewerTest.java
index 76a6107aebb..e98f133d0b5 100644
--- a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/decorators/DecoratorViewerTest.java
+++ b/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/decorators/DecoratorViewerTest.java
@@ -12,7 +12,6 @@ package org.eclipse.ui.tests.decorators;
import org.eclipse.core.runtime.Assert;
import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.Platform;
import org.eclipse.core.runtime.jobs.Job;
import org.eclipse.ui.IDecoratorManager;
import org.eclipse.ui.IViewPart;
@@ -167,7 +166,7 @@ public abstract class DecoratorViewerTest extends AbstractNavigatorTest {
.getDecoratorManager();
manager.setEnabled(FontDecorator.ID, true);
- Platform.getJobManager().join(DecoratorManager.FAMILY_DECORATE, null);
+ Job.getJobManager().join(DecoratorManager.FAMILY_DECORATE, null);
dispatchDuringUpdates((DecoratorTestPart) view);
fontCheck(view);

Back to the top