diff options
| author | kchan | 2006-05-04 02:17:38 +0000 |
|---|---|---|
| committer | kchan | 2006-05-04 02:17:38 +0000 |
| commit | 712625bd59ea7127b536a50a747aac059e8fff90 (patch) | |
| tree | 6441c731f3bb6f30eabe0c79ae95a7bbbf02e7eb /bundles/org.eclipse.jst.ws/src/org/eclipse | |
| parent | d3a60fc97e553d4601344a8d20e62f7440f3ff12 (diff) | |
| download | webtools.webservices-712625bd59ea7127b536a50a747aac059e8fff90.tar.gz webtools.webservices-712625bd59ea7127b536a50a747aac059e8fff90.tar.xz webtools.webservices-712625bd59ea7127b536a50a747aac059e8fff90.zip | |
[126819] Web service client wizard allows selecting simple project.
Diffstat (limited to 'bundles/org.eclipse.jst.ws/src/org/eclipse')
| -rw-r--r-- | bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/common/J2EEUtils.java | 9 | ||||
| -rw-r--r-- | bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/common/ResourceUtils.java | 11 |
2 files changed, 13 insertions, 7 deletions
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 ab131bcc4..eca3a62d8 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 @@ -11,6 +11,7 @@ * -------- -------- ----------------------------------------------------------- * 20060204 124143 rsinha@ca.ibm.com - Rupam Kuehner * 20060329 128069 rsinha@ca.ibm.com - Rupam Kuehner + * 20060503 126819 rsinha@ca.ibm.com - Rupam Kuehner *******************************************************************************/ package org.eclipse.jst.ws.internal.common; @@ -33,8 +34,6 @@ import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.NullProgressMonitor; import org.eclipse.core.runtime.Path; import org.eclipse.core.runtime.Status; -import org.eclipse.jdt.core.IJavaProject; -import org.eclipse.jdt.core.JavaCore; import org.eclipse.jem.util.emf.workbench.ProjectUtilities; import org.eclipse.jem.util.logger.proxy.Logger; import org.eclipse.jst.j2ee.application.internal.operations.AddComponentToEnterpriseApplicationDataModelProvider; @@ -1322,10 +1321,8 @@ public final class J2EEUtils { } else { - //This is not a faceted project. Check if this is a simple Java project. - IJavaProject javaProject = null; - javaProject = JavaCore.create(project); - if (javaProject != null) + //This is not a faceted project. Check if this is a simple Java project. + if (ResourceUtils.isJavaProject(project)) { return true; } diff --git a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/common/ResourceUtils.java b/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/common/ResourceUtils.java index 532a74afb..650af5aa6 100644 --- a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/common/ResourceUtils.java +++ b/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/common/ResourceUtils.java @@ -12,6 +12,7 @@ * 20060330 124667 kathy@ca.ibm.com - Kathy Chan * 20060421 136761 rsinha@ca.ibm.com - Rupam Kuehner * 20060424 115690 sengpl@ca.ibm.com - Seng Phung-Lu + * 20060503 126819 rsinha@ca.ibm.com - Rupam Kuehner *******************************************************************************/ package org.eclipse.jst.ws.internal.common; @@ -366,7 +367,15 @@ public final class ResourceUtils { * @return True if the project is a Java Project. */ public static boolean isJavaProject(IProject project) { - return (JavaCore.create(project) != null); + try + { + return project.hasNature(JavaCore.NATURE_ID); + } + catch (CoreException ce) + { + //Return false if CoreException occurs while checking nature. + return false; + } } /** |