Author: scabanovich Date: 2011-11-17 16:09:53 -0500 (Thu, 17 Nov 2011) New Revision: 36415 Modified: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/project/ProjectHome.java Log: JBIDE-10177 https://issues.jboss.org/browse/JBIDE-10177 WebUtils moved to common Modified: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/project/ProjectHome.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/project/ProjectHome.java 2011-11-17 21:09:20 UTC (rev 36414) +++ trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/project/ProjectHome.java 2011-11-17 21:09:53 UTC (rev 36415) @@ -11,32 +11,22 @@ package org.jboss.tools.common.model.project; import java.io.File; -import java.lang.reflect.InvocationTargetException; -import java.lang.reflect.Method; -import java.util.ArrayList; -import java.util.List; import java.util.Properties; -import org.eclipse.core.resources.IContainer; import org.eclipse.core.resources.IFolder; import org.eclipse.core.resources.IProject; -import org.eclipse.core.resources.IResource; import org.eclipse.core.resources.ResourcesPlugin; import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IPath; import org.eclipse.core.runtime.Path; -import org.eclipse.jst.j2ee.componentcore.J2EEModuleVirtualComponent; -import org.eclipse.jst.j2ee.project.facet.IJ2EEFacetConstants; import org.eclipse.wst.common.componentcore.ComponentCore; -import org.eclipse.wst.common.componentcore.ModuleCoreNature; import org.eclipse.wst.common.componentcore.resources.IVirtualComponent; import org.eclipse.wst.common.componentcore.resources.IVirtualFolder; -import org.eclipse.wst.common.project.facet.core.IFacetedProject; -import org.eclipse.wst.common.project.facet.core.ProjectFacetsManager; import org.jboss.tools.common.model.XModelConstants; import org.jboss.tools.common.model.XModelObjectConstants; import org.jboss.tools.common.model.plugin.ModelPlugin; import org.jboss.tools.common.model.util.*; +import org.jboss.tools.common.web.WebUtils; import org.w3c.dom.Element; public class ProjectHome { @@ -106,7 +96,7 @@ //Taken from J2EEUtils and modified public static IPath getWebInfPath(IProject project) { - IPath[] ps = getWebInfPaths(project); + IPath[] ps = WebUtils.getWebInfPaths(project); if(ps.length > 0) { return ps[0]; } @@ -117,122 +107,7 @@ return (!webInfDir.exists()) ? null : modulePath; } - public static IPath[] getWebInfPaths(IProject project) { - IVirtualComponent component = ComponentCore.createComponent(project); - if(component != null && component.getRootFolder() != null) { - List<IPath> ps = new ArrayList<IPath>(); - IContainer[] cs = getWebRootFolders(project, true); - for (IContainer c: cs) { - if(c.exists()) { - IFolder f = c.getFolder(new Path("/WEB-INF")); //$NON-NLS-1$ - if(f.exists()) { - ps.add(f.getFullPath()); - } - } - } - return ps.toArray(new IPath[0]); - } - return new IPath[0]; - } - - public static IPath[] getWebContentPaths(IProject project) { - IVirtualComponent component = ComponentCore.createComponent(project); - if(component != null && component.getRootFolder() != null) { - - List<IPath> ps = new ArrayList<IPath>(); - IContainer[] cs = getWebRootFolders(project, true); - for (IContainer c: cs) { - if(c.exists()) { - ps.add(c.getFullPath()); - } - } - return ps.toArray(new IPath[0]); - } - return new IPath[0]; - } - public static IPath getFirstWebContentPath(IProject project) { - IPath modulePath = null; - IVirtualComponent vc = ComponentCore.createComponent(project); - if (vc == null || vc.getRootFolder() == null) - return null; - IContainer[] cs = getWebRootFolders(project, true); - for (IContainer c: cs) { - if(c.exists()) { - return c.getFullPath(); - } - } - if (ModuleCoreNature.isFlexibleProject(project)) { - modulePath = vc.getRootFolder().getWorkspaceRelativePath(); - } - - return modulePath; + return WebUtils.getFirstWebContentPath(project); } - - public static IContainer[] getWebRootFolders(IProject project, boolean ignoreDerived) { - IFacetedProject facetedProject = null; - try { - facetedProject = ProjectFacetsManager.create(project); - } catch (CoreException e) { - ModelPlugin.getDefault().logError(e); - } - if(facetedProject!=null && facetedProject.getProjectFacetVersion(IJ2EEFacetConstants.DYNAMIC_WEB_FACET)!=null) { - IVirtualComponent component = ComponentCore.createComponent(project); - if(component!=null) { - IVirtualFolder webRootVirtFolder = component.getRootFolder().getFolder(new Path("/")); //$NON-NLS-1$ - - IPath defaultPath = getDefaultDeploymentDescriptorFolder(webRootVirtFolder); - - IContainer[] folders = webRootVirtFolder.getUnderlyingFolders(); - if(folders.length > 1){ - ArrayList<IContainer> containers = new ArrayList<IContainer>(); - for(IContainer container : folders){ - if(!ignoreDerived || !container.isDerived(IResource.CHECK_ANCESTORS)) { - if(defaultPath!=null && defaultPath.equals(container.getFullPath())) { - containers.add(0, container); // Put default root folder to the first position of the list - } else { - containers.add(container); - } - } - } - return containers.toArray(new IContainer[containers.size()]); - } else { - return folders; - } - } - } - return EMPTY_ARRAY; - } - - private static final IContainer[] EMPTY_ARRAY = new IContainer[0]; - private static boolean WTP_3_3_0 = false; - - /** - * Returns all the web root folders of the project. - * If the project is not a web project then the method will return an empty array. - * All the derived resources or resources belonged to derived containers will be eliminated. - * If some folder is set as default web root source folder (available since WTP 3.3.1) then this folder will be places in the very beginning of the result array. - * @param project - * @return - */ - public static IPath getDefaultDeploymentDescriptorFolder(IVirtualFolder folder) { - if(!WTP_3_3_0) { - try { - Method getDefaultDeploymentDescriptorFolder = J2EEModuleVirtualComponent.class.getMethod("getDefaultDeploymentDescriptorFolder", IVirtualFolder.class); //$NON-NLS-1$ - return (IPath) getDefaultDeploymentDescriptorFolder.invoke(null, folder); - } catch (NoSuchMethodException nsme) { - // Not available in this WTP version, let's ignore it - WTP_3_3_0 = true; - } catch (IllegalArgumentException e) { - ModelPlugin.getDefault().logError(e); - } catch (IllegalAccessException e) { - ModelPlugin.getDefault().logError(e); - } catch (InvocationTargetException e) { - // Not available in this WTP version, let's ignore it - WTP_3_3_0 = true; - } - } - return null; - } - }