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

[Marshall Culpepper]

  User: mculpepper
  Date: 06/11/28 14:54:29

  Modified:    core/plugins/org.jboss.ide.eclipse.packages.core/src/main/org/jboss/ide/eclipse/packages/core/model/internal 
                        PackageBuildDelegate.java
  Log:
  fixed a bug where single file filesets weren't being copied to the correct location
  
  Revision  Changes    Path
  1.5       +13 -6     jbosside/core/plugins/org.jboss.ide.eclipse.packages.core/src/main/org/jboss/ide/eclipse/packages/core/model/internal/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/model/internal/PackageBuildDelegate.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -b -r1.4 -r1.5
  --- PackageBuildDelegate.java	22 Nov 2006 21:39:45 -0000	1.4
  +++ PackageBuildDelegate.java	28 Nov 2006 19:54:29 -0000	1.5
  @@ -43,6 +43,7 @@
   import org.eclipse.core.runtime.IProgressMonitor;
   import org.eclipse.core.runtime.IStatus;
   import org.eclipse.core.runtime.NullProgressMonitor;
  +import org.eclipse.core.runtime.Path;
   import org.jboss.ide.eclipse.core.util.ProjectUtil;
   import org.jboss.ide.eclipse.packages.core.Trace;
   import org.jboss.ide.eclipse.packages.core.model.IPackage;
  @@ -562,6 +563,10 @@
   	
   	private IPath getFileDestinationPath (IFile file, IPackageFileSet fileset)
   	{
  +		if (fileset.isSingleFile())
  +		{
  +			return new Path(file.getName());
  +		} else {
   		IPath filePath = file.getProjectRelativePath();
   		IPath copyTo = filePath.removeFirstSegments(fileset.getSourceContainer().getProjectRelativePath().segmentCount()).removeLastSegments(1);
   		copyTo = copyTo.append(file.getName());
  @@ -569,6 +574,7 @@
   		
   		return copyTo;
   	}
  +	}
   	
   	private IPath getPathDestinationPath (IPath path, IPackageFileSet fileset)
   	{
  @@ -604,6 +610,7 @@
   				try {
   					in = file.getContents();
   					out = createFileOutputStream(filesets[i], copyTo);
  +					
   					File.cp(in, out);
   				} catch (FileNotFoundException e) {
   					Trace.trace(getClass(), e);