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

[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/project/build 
                        PackageBuildDelegate.java
  Log:
  found a more elegant bug fix using SelectorUtils.matchPath and a little string replace magic
  
  Revision  Changes    Path
  1.8       +4 -5      jbosside/core/plugins/org.jboss.ide.eclipse.packages.core/src/main/org/jboss/ide/eclipse/packages/core/project/build/PackageBuildDelegate.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: PackageBuildDelegate.java
  ===================================================================
  RCS file: /cvsroot/jboss/jbosside/core/plugins/org.jboss.ide.eclipse.packages.core/src/main/org/jboss/ide/eclipse/packages/core/project/build/PackageBuildDelegate.java,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -b -r1.7 -r1.8
  --- PackageBuildDelegate.java	7 Mar 2007 23:22:22 -0000	1.7
  +++ PackageBuildDelegate.java	7 Mar 2007 23:53:21 -0000	1.8
  @@ -31,6 +31,7 @@
   import java.util.TreeSet;
   
   import org.apache.tools.ant.DirectoryScanner;
  +import org.apache.tools.ant.types.selectors.SelectorUtils;
   import org.eclipse.core.resources.IFile;
   import org.eclipse.core.resources.IProject;
   import org.eclipse.core.resources.IResource;
  @@ -42,6 +43,7 @@
   import org.eclipse.core.runtime.IProgressMonitor;
   import org.jboss.ide.eclipse.core.util.ResourceUtil;
   import org.jboss.ide.eclipse.packages.core.Trace;
  +import org.jboss.ide.eclipse.packages.core.model.DirectoryScannerFactory;
   import org.jboss.ide.eclipse.packages.core.model.IPackage;
   import org.jboss.ide.eclipse.packages.core.model.IPackageFileSet;
   import org.jboss.ide.eclipse.packages.core.model.IPackageNode;
  @@ -108,15 +110,12 @@
   								relativePath = relativePath.removeFirstSegments(root.segmentCount());
   								relativePath = relativePath.setDevice(null);
   								
  -								boolean matchesIncludes = DirectoryScanner.match(fileset.getIncludesPattern(), relativePath.toString());
  -								// special hack -- DirectoryScanner text-based matching doesn't do intelligent path based globs when used as a utility 
  -								if (!matchesIncludes && fileset.getIncludesPattern().equals("**/*"))
  -									matchesIncludes = true;
  +								boolean matchesIncludes = DirectoryScannerFactory.matchesPath(fileset.getIncludesPattern(), relativePath.toString());
   								
   								boolean matchesExcludes = false;
   								if (fileset.getExcludesPattern() != null && fileset.getExcludesPattern().length() > 0)
   								{
  -									matchesExcludes = DirectoryScanner.match(fileset.getExcludesPattern(), relativePath.toString());
  +									matchesExcludes = DirectoryScannerFactory.matchesPath(fileset.getExcludesPattern(), relativePath.toString());
   								}
   								
   								if (matchesIncludes && !matchesExcludes)