Bug 531549: Use Job.getJobManager instead of Platform.getJobManager Changes instances of Platform.getManager to Job.getJobManager as Platform.getJobManager is deprecated and has been marked for deletion by Eclipse.
diff --git a/plugins/org.eclipse.jst.j2ee.ejb.annotations.xdoclet/src/org/eclipse/jst/j2ee/ejb/annotations/internal/xdoclet/XDocletBuildUtility.java b/plugins/org.eclipse.jst.j2ee.ejb.annotations.xdoclet/src/org/eclipse/jst/j2ee/ejb/annotations/internal/xdoclet/XDocletBuildUtility.java index da23943..c145a85 100644 --- a/plugins/org.eclipse.jst.j2ee.ejb.annotations.xdoclet/src/org/eclipse/jst/j2ee/ejb/annotations/internal/xdoclet/XDocletBuildUtility.java +++ b/plugins/org.eclipse.jst.j2ee.ejb.annotations.xdoclet/src/org/eclipse/jst/j2ee/ejb/annotations/internal/xdoclet/XDocletBuildUtility.java
@@ -16,7 +16,6 @@ import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IProgressMonitor; 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; @@ -97,7 +96,7 @@ private static void runNecessaryBuildersForProject(IProject aProject, IProgressMonitor monitor) throws CoreException { - Job[] buildJobs = Platform.getJobManager().find(FAMILY_MANUAL_BUILD); + Job[] buildJobs = Job.getJobManager().find(FAMILY_MANUAL_BUILD); for (int i = 0; i < buildJobs.length; i++) { Job curr = buildJobs[i]; if (curr instanceof BuildJob) {
diff --git a/plugins/org.eclipse.jst.j2ee/j2eeplugin/org/eclipse/jst/j2ee/internal/plugin/J2EEPlugin.java b/plugins/org.eclipse.jst.j2ee/j2eeplugin/org/eclipse/jst/j2ee/internal/plugin/J2EEPlugin.java index fbcc729..98e843c 100644 --- a/plugins/org.eclipse.jst.j2ee/j2eeplugin/org/eclipse/jst/j2ee/internal/plugin/J2EEPlugin.java +++ b/plugins/org.eclipse.jst.j2ee/j2eeplugin/org/eclipse/jst/j2ee/internal/plugin/J2EEPlugin.java
@@ -549,7 +549,7 @@ ResourcesPlugin.getWorkspace().removeResourceChangeListener(J2EEComponentClasspathUpdater.getInstance()); IDependencyGraph.INSTANCE.removeListener(J2EEComponentClasspathUpdater.getInstance()); try { - org.eclipse.core.runtime.Platform.getJobManager().join( J2EEElementChangedListener.PROJECT_COMPONENT_UPDATE_JOB_FAMILY, + org.eclipse.core.runtime.jobs.Job.getJobManager().join( J2EEElementChangedListener.PROJECT_COMPONENT_UPDATE_JOB_FAMILY, new NullProgressMonitor() ); } catch (OperationCanceledException e) { J2EEPlugin.logError(e.getMessage());
diff --git a/tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/jst/j2ee/dependency/tests/util/DependencyUtil.java b/tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/jst/j2ee/dependency/tests/util/DependencyUtil.java index f48fef3..1ff15be 100644 --- a/tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/jst/j2ee/dependency/tests/util/DependencyUtil.java +++ b/tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/jst/j2ee/dependency/tests/util/DependencyUtil.java
@@ -24,7 +24,6 @@ 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.IJobManager; import org.eclipse.core.runtime.jobs.Job; import org.eclipse.jdt.core.IClasspathEntry; @@ -61,7 +60,7 @@ public static void waitForValidationJobs() { // Wait for all validation jobs to end - final IJobManager jobMgr = Platform.getJobManager(); + final IJobManager jobMgr = Job.getJobManager(); IProject[] projects = ProjectUtility.getAllProjects(); for (int i = 0; i < projects.length; i++) { final IProject p = projects[i]; @@ -71,7 +70,7 @@ public static void waitForValidationJobs(final IProject project) { // Wait for all validation jobs to end - final IJobManager jobMgr = Platform.getJobManager(); + final IJobManager jobMgr = Job.getJobManager(); final String family = project.getName() + OperationTestCase.VALIDATOR_JOB_FAMILY; waitForJobs(family); } @@ -98,7 +97,7 @@ * @param family */ public static void waitForJobs(final Object family) { - final IJobManager jobMgr = Platform.getJobManager(); + final IJobManager jobMgr = Job.getJobManager(); for (int i = 0; i < 1000; i++) { final Job[] jobs = jobMgr.find(family); if (jobs.length > 0) {