[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/02/09 14:07:04

  Modified:    core/plugins/org.jboss.ide.eclipse.packages.core/src/main/org/jboss/ide/eclipse/packages/core/model/internal 
                        PackageFileSetImpl.java
  Log:
  directory scanner creation wasn't working for "single file" filesets.. fixed now
  
  Revision  Changes    Path
  1.4       +25 -13    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.3
  retrieving revision 1.4
  diff -u -b -r1.3 -r1.4
  --- PackageFileSetImpl.java	20 Dec 2006 19:56:40 -0000	1.3
  +++ PackageFileSetImpl.java	9 Feb 2007 19:07:04 -0000	1.4
  @@ -37,7 +37,7 @@
    * A PackageFileSetImpl.
    * 
    * @author <a href="marshall at jboss.org">Marshall Culpepper</a>
  - * @version $Revision: 1.3 $
  + * @version $Revision: 1.4 $
    */
   public class PackageFileSetImpl extends PackageNodeImpl implements
   		IPackageFileSet {
  @@ -186,6 +186,17 @@
   	}
   
   	public DirectoryScanner createDirectoryScanner(boolean scan) {
  +		if (isSingleFile())
  +		{
  +			if (isInWorkspace())
  +			{
  +				return PackagesModel.createDirectoryScanner(getFile(), scan);
  +			}
  +			else {
  +				return PackagesModel.createDirectoryScanner(getFilePath(), scan);
  +			}
  +		}
  +		else {
   		if (isInWorkspace())
   		{
   			return PackagesModel.createDirectoryScanner(
  @@ -195,6 +206,7 @@
   					getSourceFolder(), getIncludesPattern(), getExcludesPattern(), scan);
   		}
   	}
  +	}
   	
   	public int getNodeType() {
   		return TYPE_PACKAGE_FILESET;
  @@ -269,10 +281,10 @@
   		return filesetDelegate;
   	}
   	
  -	public String toString() {
  -		String includes = filesetDelegate.getIncludes();
  -		if (includes == null) includes = "";
  -		
  -		return filesetDelegate.getDir() + " : " + includes;
  -	}
  +//	public String toString() {
  +//		String includes = filesetDelegate.getIncludes();
  +//		if (includes == null) includes = "";
  +//		
  +//		return filesetDelegate.getDir() + " : " + includes;
  +//	}
   }