Author: fbricon
Date: 2012-02-22 04:18:25 -0500 (Wed, 22 Feb 2012)
New Revision: 38965
Modified:
trunk/maven/plugins/org.jboss.tools.maven.core/src/org/jboss/tools/maven/core/ProjectUtil.java
Log:
JBIDE-10987 : check Java nature before remove WTP classpath containers
Modified:
trunk/maven/plugins/org.jboss.tools.maven.core/src/org/jboss/tools/maven/core/ProjectUtil.java
===================================================================
---
trunk/maven/plugins/org.jboss.tools.maven.core/src/org/jboss/tools/maven/core/ProjectUtil.java 2012-02-22
09:11:40 UTC (rev 38964)
+++
trunk/maven/plugins/org.jboss.tools.maven.core/src/org/jboss/tools/maven/core/ProjectUtil.java 2012-02-22
09:18:25 UTC (rev 38965)
@@ -19,7 +19,6 @@
import org.eclipse.jdt.core.IClasspathEntry;
import org.eclipse.jdt.core.IJavaProject;
import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jdt.core.JavaModelException;
import org.eclipse.jst.j2ee.componentcore.J2EEModuleVirtualComponent;
import org.eclipse.wst.common.componentcore.ComponentCore;
import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
@@ -140,8 +139,9 @@
return relative.replace('\\', '/'); //$NON-NLS-1$ //$NON-NLS-2$
}
- public static void removeWTPContainers(IDataModel m2FacetModel, IProject project) throws
JavaModelException {
- if (m2FacetModel != null && project != null &&
m2FacetModel.getBooleanProperty(IJBossMavenConstants.REMOVE_WTP_CLASSPATH_CONTAINERS)) {
+ public static void removeWTPContainers(IDataModel m2FacetModel, IProject project) throws
CoreException {
+ if (m2FacetModel != null && project != null &&
project.hasNature(JavaCore.NATURE_ID)
+ &&
m2FacetModel.getBooleanProperty(IJBossMavenConstants.REMOVE_WTP_CLASSPATH_CONTAINERS) ) {
IJavaProject javaProject = JavaCore.create(project);
if(javaProject != null) {
// remove classpatch container from JavaProject