Author: scabanovich Date: 2011-07-22 20:37:10 -0400 (Fri, 22 Jul 2011) New Revision: 33151 Modified: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/util/EclipseResourceUtil.java Log: JBIDE-9395 https://issues.jboss.org/browse/JBIDE-9395 Modified: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/util/EclipseResourceUtil.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/util/EclipseResourceUtil.java 2011-07-22 23:32:04 UTC (rev 33150) +++ trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/util/EclipseResourceUtil.java 2011-07-23 00:37:10 UTC (rev 33151) @@ -135,12 +135,22 @@ FileSystemsImpl fso = (FileSystemsImpl)FileSystemsHelper.getFileSystems(model); if(fso == null) return null; fso.updateOverlapped(); + XModelObject result = null; + int pathLength = 10000; XModelObject[] fs = fso.getChildren(XModelObjectConstants.ENT_FILE_SYSTEM_FOLDER); for (int i = 0; i < fs.length; i++) { FileSystemImpl s = (FileSystemImpl)fs[i]; XModelObject o = findResourceInFileSystem(s, resource); - if(o != null) return o; + if(o != null) { + if(path == null || pathLength > o.getPath().length()) { + result = o; + pathLength = o.getPath().length(); + } + } } + if(result != null) { + return result; + } fs = fso.getChildren("FileSystemJar"); //$NON-NLS-1$ String location = path == null ? null : path.toString().replace('\\', '/'); if(location != null && isJar(location)) {