Merge "Bug 531557: Change Platform.getJobManager() to Job.getJobManager()"
diff --git a/plugins/org.eclipse.wst.common.emfworkbench.integration/src/org/eclipse/wst/common/internal/emfworkbench/WorkbenchResourceHelper.java b/plugins/org.eclipse.wst.common.emfworkbench.integration/src/org/eclipse/wst/common/internal/emfworkbench/WorkbenchResourceHelper.java
index a74af9a..e5c193d 100644
--- a/plugins/org.eclipse.wst.common.emfworkbench.integration/src/org/eclipse/wst/common/internal/emfworkbench/WorkbenchResourceHelper.java
+++ b/plugins/org.eclipse.wst.common.emfworkbench.integration/src/org/eclipse/wst/common/internal/emfworkbench/WorkbenchResourceHelper.java
@@ -24,7 +24,7 @@
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IPath;
import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Platform;
+import org.eclipse.core.runtime.jobs.Job;
import org.eclipse.core.runtime.jobs.ILock;
import org.eclipse.emf.common.notify.Adapter;
import org.eclipse.emf.common.notify.Notification;
@@ -154,7 +154,7 @@
private ILock getSaveLock() {
if (saveLock == null)
- saveLock = Platform.getJobManager().newLock();
+ saveLock = Job.getJobManager().newLock();
return saveLock;
}
diff --git a/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/ModuleCoreNature.java b/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/ModuleCoreNature.java
index ab96853..1a2b629 100644
--- a/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/ModuleCoreNature.java
+++ b/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/ModuleCoreNature.java
@@ -22,7 +22,7 @@
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.jobs.Job;
import org.eclipse.core.runtime.Status;
import org.eclipse.core.runtime.jobs.IJobManager;
import org.eclipse.emf.common.util.URI;
@@ -215,7 +215,7 @@
if (aProject.hasNature(IModuleConstants.MODULE_NATURE_ID))
return getModuleCoreNature(aProject);
- IJobManager manager = Platform.getJobManager();
+ IJobManager manager = Job.getJobManager();
IWorkspaceRoot root = ResourcesPlugin.getWorkspace().getRoot();
if (aMonitor != null)
aMonitor.beginTask("Add ModuleCore Nature", 5); //$NON-NLS-1$
diff --git a/tests/org.eclipse.wst.common.tests/frameworktests/org/eclipse/wst/common/frameworks/componentcore/tests/StructureEditStressTest.java b/tests/org.eclipse.wst.common.tests/frameworktests/org/eclipse/wst/common/frameworks/componentcore/tests/StructureEditStressTest.java
index b70a541..add1d83 100644
--- a/tests/org.eclipse.wst.common.tests/frameworktests/org/eclipse/wst/common/frameworks/componentcore/tests/StructureEditStressTest.java
+++ b/tests/org.eclipse.wst.common.tests/frameworktests/org/eclipse/wst/common/frameworks/componentcore/tests/StructureEditStressTest.java
@@ -10,7 +10,6 @@
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.OperationCanceledException;
import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Platform;
import org.eclipse.core.runtime.Status;
import org.eclipse.core.runtime.jobs.Job;
import org.eclipse.emf.common.util.URI;
@@ -97,7 +96,7 @@
job.schedule();
}
try {
- Platform.getJobManager().join(EDITMODEL_STRESS,null);
+ Job.getJobManager().join(EDITMODEL_STRESS,null);
} catch (OperationCanceledException e) {
e.printStackTrace();
} catch (InterruptedException e) {
@@ -130,7 +129,7 @@
job.schedule();
}
try {
- Platform.getJobManager().join(EDITMODEL_STRESS,null);
+ Job.getJobManager().join(EDITMODEL_STRESS,null);
} catch (OperationCanceledException e) {
e.printStackTrace();
} catch (InterruptedException e) {