[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: 07/03/01 11:50:55

  Modified:    core/plugins/org.jboss.ide.eclipse.packages.core/src/main/org/jboss/ide/eclipse/packages/core/model/internal 
                        PackageFileSetImpl.java
  Log:
  getSourcePath() wasn't working for sub-dirs under a project, this should now be fixed. [JBIDE-455]
  
  file copy tracing now shows the destination path of each file being copied
  
  Revision  Changes    Path
  1.11      +304 -298  jbosside/core/plugins/org.jboss.ide.eclipse.packages.core/src/main/org/jboss/ide/eclipse/packages/core/model/internal/PackageFileSetImpl.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: PackageFileSetImpl.java
  ===================================================================
  RCS file: /cvsroot/jboss/jbosside/core/plugins/org.jboss.ide.eclipse.packages.core/src/main/org/jboss/ide/eclipse/packages/core/model/internal/PackageFileSetImpl.java,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -b -r1.10 -r1.11
  --- PackageFileSetImpl.java	26 Feb 2007 19:12:03 -0000	1.10
  +++ PackageFileSetImpl.java	1 Mar 2007 16:50:55 -0000	1.11
  @@ -31,7 +31,6 @@
   import org.eclipse.core.runtime.Path;
   import org.jboss.ide.eclipse.core.util.ProjectUtil;
   import org.jboss.ide.eclipse.core.util.ResourceUtil;
  -import org.jboss.ide.eclipse.packages.core.PackagesCorePlugin;
   import org.jboss.ide.eclipse.packages.core.model.DirectoryScannerFactory;
   import org.jboss.ide.eclipse.packages.core.model.IPackageFileSet;
   import org.jboss.ide.eclipse.packages.core.model.PackagesCore;
  @@ -41,7 +40,7 @@
    * A PackageFileSetImpl.
    * 
    * @author <a href="marshall at jboss.org">Marshall Culpepper</a>
  - * @version $Revision: 1.10 $
  + * @version $Revision: 1.11 $
    */
   public class PackageFileSetImpl extends PackageNodeImpl implements
   		IPackageFileSet {
  @@ -130,11 +129,18 @@
   
   	public IPath getSourcePath() {
   		String path = filesetDelegate.getDir();
  -		if (filesetDelegate.getDir() == null || filesetDelegate.getDir().equals(".") || filesetDelegate.getDir().equals(""))
  +		if (path == null || path.equals(".") || path.equals(""))
   			return ProjectUtil.getProjectLocation(getSourceProject());
   		
  +		else {
  +			if (isInWorkspace())
  +			{
  +				return ResourceUtil.makeAbsolute(getSourceProject().getFolder(path));
  +			} else {
   		return new Path(path);
   	}
  +		}
  +	}
   	
   	public IProject getSourceProject() {
   		String projectName = filesetDelegate.getProject();