[531559] Replace Platform.getJobManager with Job.getJobManager

Change-Id: If7b9c97a7544351d699e1f88bed84afd967c6085

15 files changed, 24 insertions, 26 deletions

diff --git a/core/bundles/org.eclipse.jst.ws.consumption.ui/META-INF/MANIFEST.MF b/core/bundles/org.eclipse.jst.ws.consumption.ui/META-INF/MANIFEST.MF
index e39f36b38..565ca631d 100644
--- a/core/bundles/org.eclipse.jst.ws.consumption.ui/META-INF/MANIFEST.MF
+++ b/core/bundles/org.eclipse.jst.ws.consumption.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %PLUGIN_NAME
 Bundle-SymbolicName: org.eclipse.jst.ws.consumption.ui; singleton:=true
-Bundle-Version: 1.1.850.qualifier
+Bundle-Version: 1.1.900.qualifier
 Bundle-Activator: org.eclipse.jst.ws.internal.consumption.ui.plugin.WebServiceConsumptionUIPlugin
 Bundle-Vendor: %PLUGIN_PROVIDER
 Bundle-Localization: plugin
diff --git a/core/bundles/org.eclipse.jst.ws.consumption.ui/pom.xml b/core/bundles/org.eclipse.jst.ws.consumption.ui/pom.xml
index 5f4da8195..e2ce07fe1 100644
--- a/core/bundles/org.eclipse.jst.ws.consumption.ui/pom.xml
+++ b/core/bundles/org.eclipse.jst.ws.consumption.ui/pom.xml
@@ -22,6 +22,6 @@
 

   <groupId>org.eclipse.webtools.webservices</groupId>

   <artifactId>org.eclipse.jst.ws.consumption.ui</artifactId>

-  <version>1.1.850-SNAPSHOT</version>

+  <version>1.1.900-SNAPSHOT</version>

   <packaging>eclipse-plugin</packaging>

 </project>

diff --git a/core/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/server/StartServerWidget.java b/core/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/server/StartServerWidget.java
index 5e62fef92..44424cd31 100644
--- a/core/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/server/StartServerWidget.java
+++ b/core/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/server/StartServerWidget.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2005, 2007 IBM Corporation and others.
+ * Copyright (c) 2005, 2018 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
@@ -17,7 +17,6 @@ package org.eclipse.jst.ws.internal.consumption.ui.server;
 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.jobs.IJobChangeEvent;
 import org.eclipse.core.runtime.jobs.IJobManager;
@@ -191,7 +190,7 @@ public class StartServerWidget extends SimpleWidgetDataContributor
   // Connect to an existing server thread otherwise start a new one.
   private void startServerJob()
   {
-	IJobManager    jobManager     = Platform.getJobManager();
+	IJobManager    jobManager     = Job.getJobManager();
 	Job[]          jobs           = jobManager.find( StartServerFamily );
 	StartServerJob startServerJob = null;
 	
diff --git a/core/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/CheckWSDLValidationCommand.java b/core/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/CheckWSDLValidationCommand.java
index 3962d82e5..9365e98ca 100644
--- a/core/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/CheckWSDLValidationCommand.java
+++ b/core/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/CheckWSDLValidationCommand.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2004, 2006 IBM Corporation and others.
+ * Copyright (c) 2004, 2018 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
@@ -16,7 +16,6 @@ package org.eclipse.jst.ws.internal.consumption.ui.widgets;
 import org.eclipse.core.runtime.IAdaptable;
 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.IJobManager;
 import org.eclipse.core.runtime.jobs.Job;
@@ -39,7 +38,7 @@ public class CheckWSDLValidationCommand extends AbstractDataModelOperation
   {
     IEnvironment env = getEnvironment();
     
-    IJobManager    jobManager     = Platform.getJobManager();
+    IJobManager    jobManager     = Job.getJobManager();
 	  Job[]          jobs           = jobManager.find( ValidateWSDLJob.VALIDATE_WSDL_JOB_FAMILY );
 	  ValidateWSDLJob existingValidateWSDLJob = null;
 	  
diff --git a/core/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/object/WSDLSelectionWidget.java b/core/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/object/WSDLSelectionWidget.java
index 5279a2851..30e3ca1af 100644
--- a/core/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/object/WSDLSelectionWidget.java
+++ b/core/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/object/WSDLSelectionWidget.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2004, 2009 IBM Corporation and others.
+ * Copyright (c) 2004, 2018 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
@@ -38,7 +38,6 @@ import org.eclipse.core.resources.IWorkspaceRoot;
 import org.eclipse.core.resources.ResourcesPlugin;
 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Platform;
 import org.eclipse.core.runtime.Status;
 import org.eclipse.core.runtime.jobs.IJobChangeEvent;
 import org.eclipse.core.runtime.jobs.IJobManager;
@@ -322,7 +321,7 @@ public class WSDLSelectionWidget extends AbstractObjectSelectionWidget implement
   
   private void handleStopValidationButton()
   {
-	  IJobManager    jobManager     = Platform.getJobManager();
+	  IJobManager    jobManager     = Job.getJobManager();
 	  Job[]          jobs           = jobManager.find( ValidateWSDLJob.VALIDATE_WSDL_JOB_FAMILY );
 	  ValidateWSDLJob existingValidateWSDLJob = null;
 	  
@@ -440,7 +439,7 @@ public class WSDLSelectionWidget extends AbstractObjectSelectionWidget implement
 	  if ((PersistentWSDLValidationContext.VALIDATE_ALL_WSDL.equals(validationSelection)) ||
 			  (PersistentWSDLValidationContext.VALIDATE_REMOTE_WSDL.equals(validationSelection) && isRemote)) {
 
-		  IJobManager    jobManager     = Platform.getJobManager();
+		  IJobManager    jobManager     = Job.getJobManager();
 		  Job[]          jobs           = jobManager.find( ValidateWSDLJob.VALIDATE_WSDL_JOB_FAMILY );
 		  ValidateWSDLJob existingValidateWSDLJob = null;
 		  
diff --git a/core/features/javaee-web/org.eclipse.jst.enterprise_core.feature/feature.xml b/core/features/javaee-web/org.eclipse.jst.enterprise_core.feature/feature.xml
index f26d97a94..78e739c9d 100644
--- a/core/features/javaee-web/org.eclipse.jst.enterprise_core.feature/feature.xml
+++ b/core/features/javaee-web/org.eclipse.jst.enterprise_core.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.jst.enterprise_core.feature"
       label="%featureName"
-      version="3.9.0.qualifier"
+      version="3.10.0.qualifier"
       provider-name="%providerName"
       license-feature="org.eclipse.license"
       license-feature-version="1.0.1.qualifier">
@@ -25,4 +25,5 @@
       <import plugin="org.eclipse.jst.j2ee.jca"/>
       <import plugin="org.eclipse.jst.jee.ejb"/>
    </requires>
+
 </feature>
diff --git a/core/features/javaee-web/org.eclipse.jst.enterprise_core.feature/pom.xml b/core/features/javaee-web/org.eclipse.jst.enterprise_core.feature/pom.xml
index 4fab14668..23195ce04 100644
--- a/core/features/javaee-web/org.eclipse.jst.enterprise_core.feature/pom.xml
+++ b/core/features/javaee-web/org.eclipse.jst.enterprise_core.feature/pom.xml
@@ -21,7 +21,7 @@
 
   <groupId>org.eclipse.webtools.javaee</groupId>
   <artifactId>org.eclipse.jst.enterprise_core.feature</artifactId>
-  <version>3.9.0-SNAPSHOT</version>
+  <version>3.10.0-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
 
   <build>
diff --git a/core/features/javaee-web/org.eclipse.jst.enterprise_tests.feature/feature.xml b/core/features/javaee-web/org.eclipse.jst.enterprise_tests.feature/feature.xml
index 1a9252af7..a670eca33 100644
--- a/core/features/javaee-web/org.eclipse.jst.enterprise_tests.feature/feature.xml
+++ b/core/features/javaee-web/org.eclipse.jst.enterprise_tests.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.jst.enterprise_tests.feature"
       label="%featureName"
-      version="3.6.0.qualifier"
+      version="3.10.0.qualifier"
       provider-name="%providerName"
       license-feature="org.eclipse.license"
       license-feature-version="1.0.1.qualifier">
@@ -27,4 +27,5 @@
       <import plugin="org.eclipse.jst.ws.axis.consumption.core.tests"/>
       <import plugin="org.eclipse.jst.ejb.ui.tests"/>
    </requires>
+
 </feature>
diff --git a/core/features/javaee-web/org.eclipse.jst.enterprise_tests.feature/pom.xml b/core/features/javaee-web/org.eclipse.jst.enterprise_tests.feature/pom.xml
index 168998549..02dde2ede 100644
--- a/core/features/javaee-web/org.eclipse.jst.enterprise_tests.feature/pom.xml
+++ b/core/features/javaee-web/org.eclipse.jst.enterprise_tests.feature/pom.xml
@@ -21,6 +21,6 @@
 
   <groupId>org.eclipse.webtools.javaee</groupId>
   <artifactId>org.eclipse.jst.enterprise_tests.feature</artifactId>
-  <version>3.6.0-SNAPSHOT</version>
+  <version>3.10.0-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
 </project>
diff --git a/core/tests/org.eclipse.jst.ws.axis.consumption.core.tests/tests/org/eclipse/jst/ws/axis/consumption/core/tests/util/Util.java b/core/tests/org.eclipse.jst.ws.axis.consumption.core.tests/tests/org/eclipse/jst/ws/axis/consumption/core/tests/util/Util.java
index e79026830..00db18bf2 100644
--- a/core/tests/org.eclipse.jst.ws.axis.consumption.core.tests/tests/org/eclipse/jst/ws/axis/consumption/core/tests/util/Util.java
+++ b/core/tests/org.eclipse.jst.ws.axis.consumption.core.tests/tests/org/eclipse/jst/ws/axis/consumption/core/tests/util/Util.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2006 IBM Corporation and others.
+ * Copyright (c) 2006, 2018 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
@@ -44,6 +44,7 @@ import org.eclipse.core.runtime.IStatus;
 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.jdt.core.IClasspathEntry;
 import org.eclipse.jdt.core.IJavaProject;
 import org.eclipse.jdt.core.JavaCore;
@@ -179,7 +180,7 @@ public class Util
 		try
 		{
 			System.out.println("Waiting for build to complete");
-			Platform.getJobManager().join(ResourcesPlugin.FAMILY_AUTO_BUILD,null);
+			Job.getJobManager().join(ResourcesPlugin.FAMILY_AUTO_BUILD,null);
 		}
 		catch (Throwable t)
 		{
diff --git a/jaxws/features/org.eclipse.jst.ws.jaxws.dom_tests.feature/feature.xml b/jaxws/features/org.eclipse.jst.ws.jaxws.dom_tests.feature/feature.xml
index bccd3e5ff..118902833 100644
--- a/jaxws/features/org.eclipse.jst.ws.jaxws.dom_tests.feature/feature.xml
+++ b/jaxws/features/org.eclipse.jst.ws.jaxws.dom_tests.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.jst.ws.jaxws.dom_tests.feature"
       label="%featureName"
-      version="1.0.301.qualifier"
+      version="1.0.400.qualifier"
       provider-name="%featureProvider"
       image="eclipse_update_120.jpg"
       license-feature="org.eclipse.license"
diff --git a/jaxws/features/org.eclipse.jst.ws.jaxws.dom_tests.feature/pom.xml b/jaxws/features/org.eclipse.jst.ws.jaxws.dom_tests.feature/pom.xml
index de3f2324e..60509183d 100644
--- a/jaxws/features/org.eclipse.jst.ws.jaxws.dom_tests.feature/pom.xml
+++ b/jaxws/features/org.eclipse.jst.ws.jaxws.dom_tests.feature/pom.xml
@@ -22,6 +22,6 @@
 
   <groupId>org.eclipse.webtools.webservices</groupId>
   <artifactId>org.eclipse.jst.ws.jaxws.dom_tests.feature</artifactId>
-  <version>1.0.301-SNAPSHOT</version>
+  <version>1.0.400-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
 </project>
diff --git a/jaxws/tests/org.eclipse.jst.ws.jaxws.testutils/META-INF/MANIFEST.MF b/jaxws/tests/org.eclipse.jst.ws.jaxws.testutils/META-INF/MANIFEST.MF
index 853c4fc8d..84cb3dade 100755
--- a/jaxws/tests/org.eclipse.jst.ws.jaxws.testutils/META-INF/MANIFEST.MF
+++ b/jaxws/tests/org.eclipse.jst.ws.jaxws.testutils/META-INF/MANIFEST.MF
@@ -4,7 +4,7 @@ Bundle-Name: %Bundle-Name.0
 Bundle-Vendor: %Bundle-Vendor.0
 Bundle-SymbolicName: org.eclipse.jst.ws.jaxws.testutils
 Bundle-Localization: plugin
-Bundle-Version: 1.0.200.qualifier
+Bundle-Version: 1.0.300.qualifier
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Require-Bundle: org.jmock,
  org.eclipse.core.resources,
diff --git a/jaxws/tests/org.eclipse.jst.ws.jaxws.testutils/pom.xml b/jaxws/tests/org.eclipse.jst.ws.jaxws.testutils/pom.xml
index 4383e95c2..21a1ff22d 100644
--- a/jaxws/tests/org.eclipse.jst.ws.jaxws.testutils/pom.xml
+++ b/jaxws/tests/org.eclipse.jst.ws.jaxws.testutils/pom.xml
@@ -22,6 +22,6 @@
 
   <groupId>org.eclipse.webtools.webservices</groupId>
   <artifactId>org.eclipse.jst.ws.jaxws.testutils</artifactId>
-  <version>1.0.200-SNAPSHOT</version>
+  <version>1.0.300-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 </project>
diff --git a/jaxws/tests/org.eclipse.jst.ws.jaxws.testutils/src/org/eclipse/jst/ws/jaxws/testutils/jobs/JobUtils.java b/jaxws/tests/org.eclipse.jst.ws.jaxws.testutils/src/org/eclipse/jst/ws/jaxws/testutils/jobs/JobUtils.java
index 90f4bc5ed..356d5fca8 100755
--- a/jaxws/tests/org.eclipse.jst.ws.jaxws.testutils/src/org/eclipse/jst/ws/jaxws/testutils/jobs/JobUtils.java
+++ b/jaxws/tests/org.eclipse.jst.ws.jaxws.testutils/src/org/eclipse/jst/ws/jaxws/testutils/jobs/JobUtils.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2009 by SAP AG, Walldorf. 
+ * Copyright (c) 2009, 2018 by SAP AG, Walldorf. 
  * 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
@@ -19,7 +19,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.jobs.Job;
 import org.eclipse.jdt.core.IJavaElement;
@@ -37,10 +36,9 @@ import org.eclipse.ui.PlatformUI;
 
 public class JobUtils
 {
-	@SuppressWarnings("deprecation")
 	public static void waitForJobsInterruptable() throws InterruptedException
 	{
-		while (Platform.getJobManager().currentJob() != null)
+		while (Job.getJobManager().currentJob() != null)
 		{
 			delay(5);
 		}