[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:22:22

  Modified:    core/plugins/org.jboss.ide.eclipse.packages.core/src/main/org/jboss/ide/eclipse/packages/core/project/build 
                        PackageBuildDelegate.java
  Log:
  removing files wasn't working when the includes pattern was **/* and the file in question was at the top level of a fileset root directory. a hack to work around directoryscanner's text-based search was applied to fix t his for now...
  
  Revision  Changes    Path
  1.7       +5 -0      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.6
  retrieving revision 1.7
  diff -u -b -r1.6 -r1.7
  --- PackageBuildDelegate.java	7 Mar 2007 22:32:47 -0000	1.6
  +++ PackageBuildDelegate.java	7 Mar 2007 23:22:22 -0000	1.7
  @@ -106,8 +106,13 @@
   								IPath root = fileset.getSourcePath();
   								IPath relativePath = ResourceUtil.makeAbsolute(removedFile);
   								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 matchesExcludes = false;
   								if (fileset.getExcludesPattern() != null && fileset.getExcludesPattern().length() > 0)
   								{