[jboss-cvs] jbosside/core/plugins/org.jboss.ide.eclipse.packages.core/src/main/org/jboss/ide/eclipse/packages/core/model ...

[Marshall Culpepper]

  User: mculpepper
  Date: 07/03/07 18:53:21

  Modified:    core/plugins/org.jboss.ide.eclipse.packages.core/src/main/org/jboss/ide/eclipse/packages/core/model 
                        DirectoryScannerFactory.java
  Log:
  found a more elegant bug fix using SelectorUtils.matchPath and a little string replace magic
  
  Revision  Changes    Path
  1.2       +12 -0     jbosside/core/plugins/org.jboss.ide.eclipse.packages.core/src/main/org/jboss/ide/eclipse/packages/core/model/DirectoryScannerFactory.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: DirectoryScannerFactory.java
  ===================================================================
  RCS file: /cvsroot/jboss/jbosside/core/plugins/org.jboss.ide.eclipse.packages.core/src/main/org/jboss/ide/eclipse/packages/core/model/DirectoryScannerFactory.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -b -r1.1 -r1.2
  --- DirectoryScannerFactory.java	23 Feb 2007 21:17:12 -0000	1.1
  +++ DirectoryScannerFactory.java	7 Mar 2007 23:53:21 -0000	1.2
  @@ -24,6 +24,7 @@
   import java.io.File;
   
   import org.apache.tools.ant.DirectoryScanner;
  +import org.apache.tools.ant.types.selectors.SelectorUtils;
   import org.eclipse.core.resources.IContainer;
   import org.eclipse.core.resources.IFile;
   import org.eclipse.core.runtime.IPath;
  @@ -118,4 +119,15 @@
   		return scanner;
   	}
   
  +	// special hack -- DirectoryScanner path-based matching needs File.separatorChar, so we convert all slashes to it
  +	public static boolean matchesPath (String pattern, String path)
  +	{
  +		pattern = pattern.replace('/', File.separatorChar);
  +		pattern = pattern.replace('\\', File.separatorChar);
  +		
  +		path = path.replace('/', File.separatorChar);
  +		path = path.replace('\\', File.separatorChar);
  +		
  +		return SelectorUtils.matchPath(pattern, path);
  +	}
   }