Author: rob.stryker(a)jboss.com Date: 2008-11-17 16:54:05 -0500 (Mon, 17 Nov 2008) New Revision: 11858 Modified: trunk/archives/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/asf/DirectoryScanner.java trunk/archives/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/model/DirectoryScannerFactory.java Log: JBDS-485 - another CCE Modified: trunk/archives/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/asf/DirectoryScanner.java =================================================================== --- trunk/archives/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/asf/DirectoryScanner.java 2008-11-17 20:58:15 UTC (rev 11857) +++ trunk/archives/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/asf/DirectoryScanner.java 2008-11-17 21:54:05 UTC (rev 11858) @@ -892,7 +892,7 @@ continue; } String originalpattern = (String) entry.getValue(); - File myfile = new File(basedir, currentelement); + File myfile = getChild(basedir, currentelement); if (myfile.exists()) { // may be on a case insensitive file system. We want @@ -1032,7 +1032,7 @@ private void processSlowScan(String[] arr) { for (int i = 0; i < arr.length; i++) { if (!couldHoldIncluded(arr[i])) { - scandir(new File(basedir, arr[i]), + scandir(getChild(basedir, arr[i]), arr[i] + File.separator, false); } } @@ -1721,5 +1721,10 @@ return set.size() == 0 ? patterns : al.toArray(new String[al.size()]); } + + protected File getChild(File file, String element) { + return new File(file, element); + } + } Modified: trunk/archives/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/model/DirectoryScannerFactory.java =================================================================== --- trunk/archives/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/model/DirectoryScannerFactory.java 2008-11-17 20:58:15 UTC (rev 11857) +++ trunk/archives/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/model/DirectoryScannerFactory.java 2008-11-17 21:54:05 UTC (rev 11858) @@ -121,6 +121,15 @@ return list2absolute(file); } + protected File getChild(File file, String element) { + if( !fs.inWorkspace) + return super.getChild(file, element); + FileWrapper pWrapper = (FileWrapper)file; + File child = super.getChild(file, element); + FileWrapper childWrapper = new FileWrapper(child, pWrapper.getWrapperPath().append(element)); + return childWrapper; + } + protected File[] list2workspace(File file) { IPath workspaceRelative = ((FileWrapper)file).getWrapperPath(); if( workspaceRelative == null )