[jbosstools-commits] JBoss Tools SVN: r36413 - trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/project.

Author: scabanovich Date: 2011-11-17 15:32:10 -0500 (Thu, 17 Nov 2011) New Revision: 36413 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 Fix for default web content folder for XModel. 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 19:26:02 UTC (rev 36412) +++ trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/project/ProjectHome.java 2011-11-17 20:32:10 UTC (rev 36413) @@ -131,18 +131,6 @@ } } return ps.toArray(new IPath[0]); - -// IVirtualFolder webInfDir = component.getRootFolder().getFolder(new Path("/WEB-INF")); //$NON-NLS-1$ -// if(webInfDir.exists()) { -// IContainer[] cs = webInfDir.getUnderlyingFolders(); -// List<IPath> ps = new ArrayList<IPath>(); -// for (IContainer c: cs) { -// if(c.exists()) { -// ps.add(c.getFullPath()); -// } -// } -// return ps.toArray(new IPath[0]); -// } } return new IPath[0]; } @@ -155,25 +143,10 @@ 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()); - } + ps.add(c.getFullPath()); } } return ps.toArray(new IPath[0]); - -// IVirtualFolder webDir = component.getRootFolder().getFolder(new Path("/")); //$NON-NLS-1$ -// if(webDir.exists()) { -// IContainer[] cs = webDir.getUnderlyingFolders(); -// List<IPath> ps = new ArrayList<IPath>(); -// for (IContainer c: cs) { -// if(c.exists()) { -// ps.add(c.getFullPath()); -// } -// } -// return ps.toArray(new IPath[0]); -// } } return new IPath[0]; }