[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/02/26 15:56:48

  Modified:    core/plugins/org.jboss.ide.eclipse.packages.core/src/main/org/jboss/ide/eclipse/packages/core/project/build 
                        PackageBuildDelegate.java
  Log:
  findMatchingFilesetsForRemovedFile didn't check against a "single file" fileset
  
  Revision  Changes    Path
  1.2       +22 -17    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.1
  retrieving revision 1.2
  diff -u -b -r1.1 -r1.2
  --- PackageBuildDelegate.java	26 Feb 2007 19:17:44 -0000	1.1
  +++ PackageBuildDelegate.java	26 Feb 2007 20:56:48 -0000	1.2
  @@ -31,7 +31,6 @@
   import java.util.TreeSet;
   
   import org.apache.tools.ant.DirectoryScanner;
  -import org.eclipse.core.resources.IContainer;
   import org.eclipse.core.resources.IFile;
   import org.eclipse.core.resources.IProject;
   import org.eclipse.core.resources.IResource;
  @@ -42,6 +41,7 @@
   import org.eclipse.core.runtime.IPath;
   import org.eclipse.core.runtime.IProgressMonitor;
   import org.eclipse.core.runtime.NullProgressMonitor;
  +import org.jboss.ide.eclipse.core.util.ResourceUtil;
   import org.jboss.ide.eclipse.packages.core.Trace;
   import org.jboss.ide.eclipse.packages.core.model.IPackage;
   import org.jboss.ide.eclipse.packages.core.model.IPackageFileSet;
  @@ -52,9 +52,6 @@
   import org.jboss.ide.eclipse.packages.core.model.internal.PackagesModel;
   import org.jboss.ide.eclipse.packages.core.util.PackagesExport;
   
  -import de.schlichtherle.io.ArchiveException;
  -import de.schlichtherle.io.File;
  -
   public class PackageBuildDelegate {
   	private static PackageBuildDelegate _instance;
   	
  @@ -103,10 +100,17 @@
   						if (node.getNodeType() == IPackageNode.TYPE_PACKAGE_FILESET)
   						{
   							IPackageFileSet fileset = (IPackageFileSet) node;
  -							IContainer root = fileset.getSourceContainer();
  -							IPath relativePath = removedFile.getFullPath();
  -							IPath rootPath = root.getFullPath();
  -							relativePath = relativePath.removeFirstSegments(rootPath.segmentCount());
  +							
  +							if (fileset.isSingleFile())
  +							{
  +								if (fileset.getFilePath().equals(ResourceUtil.makeAbsolute(removedFile)))
  +								{
  +									filesets.add(fileset);
  +								}
  +							} else {
  +								IPath root = fileset.getSourcePath();
  +								IPath relativePath = ResourceUtil.makeAbsolute(removedFile);
  +								relativePath = relativePath.removeFirstSegments(root.segmentCount());
   							
   							boolean matchesIncludes = DirectoryScanner.match(fileset.getIncludesPattern(), relativePath.toString());
   							boolean matchesExcludes = false;
  @@ -120,6 +124,7 @@
   								filesets.add(fileset);
   							}
   						}
  +						}
   						return true;
   					}
   				});