[298905][298906] React to changes java facet and version changes
diff --git a/bundles/org.eclipse.jst.ws.consumption/META-INF/MANIFEST.MF b/bundles/org.eclipse.jst.ws.consumption/META-INF/MANIFEST.MF
index 2c38beb..d1f225b 100644
--- a/bundles/org.eclipse.jst.ws.consumption/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.jst.ws.consumption/META-INF/MANIFEST.MF
@@ -56,7 +56,8 @@
org.eclipse.wst.common.project.facet.core;bundle-version="[1.1.0,2.0.0)",
org.eclipse.jst.server.core;bundle-version="[1.0.102,2.0.0)",
org.eclipse.emf.codegen;bundle-version="[2.2.0,3.0.0)",
- org.eclipse.core.commands;bundle-version="[3.5.0,4.0.0)"
+ org.eclipse.core.commands;bundle-version="[3.5.0,4.0.0)",
+ org.eclipse.jst.common.project.facet.core;bundle-version="[1.4.100,2.0.0)"
Eclipse-LazyStart: true
Bundle-RequiredExecutionEnvironment: J2SE-1.4
Bundle-ActivationPolicy: lazy
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/common/FacetUtils.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/common/FacetUtils.java
index 1189868..67f4d0b 100644
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/common/FacetUtils.java
+++ b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/common/FacetUtils.java
@@ -16,6 +16,7 @@
* 20080429 213730 trungha@ca.ibm.com - Trung Ha
* 20080507 229532 kathy@ca.ibm.com - Kathy Chan
* 20090303 242635 mahutch@ca.ibm.com - Mark Hutchinson, Remove unnecessary UI dependencies from org.eclipse.jst.ws.consumption
+ * 20100203 kchong@ca.ibm.com - Keith Chong, Java Facet change
*******************************************************************************/
package org.eclipse.jst.ws.internal.consumption.common;
@@ -41,6 +42,7 @@
import org.eclipse.jdt.core.IJavaProject;
import org.eclipse.jdt.core.JavaCore;
import org.eclipse.jem.util.emf.workbench.ProjectUtilities;
+import org.eclipse.jst.common.project.facet.core.JavaFacet;
import org.eclipse.jst.j2ee.internal.common.J2EEVersionUtil;
import org.eclipse.jst.j2ee.internal.ejb.project.operations.EjbFacetInstallDataModelProvider;
import org.eclipse.jst.j2ee.internal.ejb.project.operations.IEjbFacetInstallDataModelProperties;
@@ -1002,8 +1004,8 @@
}
}
}
-
- IProjectFacet javaFacet = ProjectFacetsManager.getProjectFacet(IModuleConstants.JST_JAVA);
+
+ IProjectFacet javaFacet = ProjectFacetsManager.getProjectFacet(JavaFacet.ID);
IProjectFacetVersion javaFacetVersion = null;
if (jdkComplianceLevel.equals("1.3"))
{
@@ -1015,11 +1017,11 @@
}
else if (jdkComplianceLevel.equals("1.5"))
{
- javaFacetVersion = javaFacet.getVersion("5.0");
+ javaFacetVersion = JavaFacet.JAVA_50;
}
else if (jdkComplianceLevel.equals("1.6"))
{
- javaFacetVersion = javaFacet.getVersion("6.0");
+ javaFacetVersion = JavaFacet.JAVA_60;
}
else
{
@@ -1243,13 +1245,13 @@
}
/**
- * Returns whether the provided facet has an id of "jst.java"
+ * Returns whether the provided facet has an id the same as that of the java facet
* @param pf facet
- * @return <code>true</code> if facet has an id of "jst.java", <code>false</code> otherwise.
+ * @return <code>true</code> if facet has an id the same as that of the java facet, <code>false</code> otherwise.
*/
public static boolean isJavaFacet(IProjectFacet pf)
{
- if (pf != null && pf.getId().equals("jst.java"))
+ if (pf != null && pf.equals(JavaFacet.FACET))
return true;
else
return false;
diff --git a/bundles/org.eclipse.jst.ws/META-INF/MANIFEST.MF b/bundles/org.eclipse.jst.ws/META-INF/MANIFEST.MF
index 80e9b5f..f92cc15 100644
--- a/bundles/org.eclipse.jst.ws/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.jst.ws/META-INF/MANIFEST.MF
@@ -42,6 +42,7 @@
org.eclipse.jem.util;bundle-version="[2.0.0,3.0.0)",
org.eclipse.wst.common.environment;bundle-version="[1.0.100,1.1.0)",
org.eclipse.wst.common.project.facet.core;bundle-version="[1.1.0,2.0.0)",
- org.eclipse.wst.ws;bundle-version="[1.0.100,1.2.0)"
+ org.eclipse.wst.ws;bundle-version="[1.0.100,1.2.0)",
+ org.eclipse.jst.common.project.facet.core;bundle-version="[1.4.100,2.0.0)"
Eclipse-LazyStart: true
Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/common/J2EEUtils.java b/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/common/J2EEUtils.java
index b5dbfcd..f343fbc 100644
--- a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/common/J2EEUtils.java
+++ b/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/common/J2EEUtils.java
@@ -21,6 +21,7 @@
* 20080229 218696 ericdp@ca.ibm.com - Eric D. Peters, APIs using EJBArtifactEdit not able to deal with some EJB 3.0 beans properly
* 20081001 243869 ericdp@ca.ibm.com - Eric D. Peters, Web Service tools allowing mixed J2EE levels
* 20090114 261087 ericdp@ca.ibm.com - Eric D. Peters, No way to get meta-inf path for a project
+ * 20100203 kchong@ca.ibm.com - Keith Chong, Java Facet change
*******************************************************************************/
package org.eclipse.jst.ws.internal.common;
@@ -52,6 +53,7 @@
import org.eclipse.core.runtime.jobs.Job;
import org.eclipse.jem.util.emf.workbench.ProjectUtilities;
import org.eclipse.jem.util.logger.proxy.Logger;
+import org.eclipse.jst.common.project.facet.core.JavaFacet;
import org.eclipse.jst.j2ee.application.internal.operations.AddComponentToEnterpriseApplicationDataModelProvider;
import org.eclipse.jst.j2ee.commonarchivecore.internal.helpers.ArchiveManifest;
import org.eclipse.jst.j2ee.ejb.EJBJar;
@@ -1508,7 +1510,7 @@
if (facets.size()==1)
{
IProjectFacetVersion pfv = (IProjectFacetVersion)facets.iterator().next();
- if (pfv.getProjectFacet().getId().equals(IModuleConstants.JST_JAVA))
+ if (pfv.getProjectFacet().equals(JavaFacet.FACET))
{
return true;
}
