[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/28 18:22:01

  Modified:    core/plugins/org.jboss.ide.eclipse.packages.core/src/main/org/jboss/ide/eclipse/packages/core/project/build 
                        BuildFileOperations.java
  Log:
  created unit tests and implementations for removeFolder, removePackage, and removePackageRef
  
  Revision  Changes    Path
  1.3       +35 -27    jbosside/core/plugins/org.jboss.ide.eclipse.packages.core/src/main/org/jboss/ide/eclipse/packages/core/project/build/BuildFileOperations.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: BuildFileOperations.java
  ===================================================================
  RCS file: /cvsroot/jboss/jbosside/core/plugins/org.jboss.ide.eclipse.packages.core/src/main/org/jboss/ide/eclipse/packages/core/project/build/BuildFileOperations.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -b -r1.2 -r1.3
  --- BuildFileOperations.java	28 Feb 2007 16:36:43 -0000	1.2
  +++ BuildFileOperations.java	28 Feb 2007 23:22:01 -0000	1.3
  @@ -12,7 +12,6 @@
   import org.apache.tools.ant.DirectoryScanner;
   import org.eclipse.core.resources.IFile;
   import org.eclipse.core.resources.IResource;
  -import org.eclipse.core.runtime.CoreException;
   import org.eclipse.core.runtime.IPath;
   import org.eclipse.core.runtime.NullProgressMonitor;
   import org.eclipse.core.runtime.Path;
  @@ -23,7 +22,7 @@
   import org.jboss.ide.eclipse.packages.core.model.IPackageFolder;
   import org.jboss.ide.eclipse.packages.core.model.IPackageNode;
   import org.jboss.ide.eclipse.packages.core.model.IPackageNodeVisitor;
  -import org.jboss.ide.eclipse.packages.core.model.PackagesCore;
  +import org.jboss.ide.eclipse.packages.core.model.IPackageReference;
   import org.jboss.ide.eclipse.packages.core.model.internal.PackageFileSetImpl;
   import org.jboss.ide.eclipse.packages.core.model.internal.PackagesModel;
   
  @@ -52,7 +51,7 @@
   		for (int i = 0; i < filesets.length; i++)
   		{
   			Hashtable pkgsAndPathways = PackagesModel.instance().getTopLevelPackagesAndPathways(filesets[i]);
  -			File[] packagedFiles = TruezipUtil.createFiles(filesets[i], getFilesetRelativePath(path, filesets[i]), pkgsAndPathways);
  +			File[] packagedFiles = TruezipUtil.createFiles(getFilesetRelativePath(path, filesets[i]), pkgsAndPathways);
   			IPackage[] topLevelPackages = (IPackage[])
   				pkgsAndPathways.keySet().toArray(new IPackage[pkgsAndPathways.keySet().size()]);
   				
  @@ -85,7 +84,7 @@
   			IPackage[] topLevelPackages = (IPackage [])
   				pkgsAndPaths.keySet().toArray(new IPackage[pkgsAndPaths.keySet().size()]);
   			
  -			File[] packageFiles = TruezipUtil.createFiles (filesets[i], copyTo, pkgsAndPaths);
  +			File[] packageFiles = TruezipUtil.createFiles(copyTo, pkgsAndPaths);
   			
   			if (checkStamps)
   			{
  @@ -179,18 +178,35 @@
   
   	public synchronized void removeFolder (IPackageFolder folder)
   		{
  -	//		IPath parentPath = getNodeParentPath(folder);
  -	//		File file = new File(parentPath.append(folder.getName()).toFile());
  -	//		
  -	//		if (file.exists()) file.deleteAll();
  +		File folderInstances[] = TruezipUtil.createFiles(folder, new Path(folder.getName()));
  +		
  +		for (int i = 0; i < folderInstances.length; i++)
  +		{
  +			folderInstances[i].deleteAll();
  +		}
  +		TruezipUtil.umountAll();
   		}
   
  -	public synchronized void removeInnerPackage (IPackage pkg)
  -		{
  -	//		IPath parentPath = getNodeParentPath(pkg);
  -	//		File file = new File(parentPath.toFile());wha
  -	//		
  -	//		if (file.exists()) file.deleteAll();
  +	public synchronized void removePackage (IPackage pkg)
  +	{
  +		File packageInstances[] = TruezipUtil.createFiles(pkg, pkg.isTopLevel() ? null : new Path(pkg.getName()));
  +		
  +		for (int i = 0; i < packageInstances.length; i++)
  +		{
  +			packageInstances[i].deleteAll();
  +		}
  +		TruezipUtil.umountAll();
  +	}
  +	
  +	public synchronized void removePackageRef (IPackageReference ref)
  +	{
  +		File refInstances[] = TruezipUtil.createFiles (ref, new Path(ref.getName()));
  +		
  +		for (int i = 0; i < refInstances.length; i++)
  +		{
  +			refInstances[i].deleteAll(); 
  +		}
  +		TruezipUtil.umountAll();
   		}
   
   	public synchronized void removeNode (IPackageNode node)
  @@ -198,19 +214,11 @@
   		NullProgressMonitor nullMonitor = new NullProgressMonitor();
   		if (node.getNodeType() == IPackageNode.TYPE_PACKAGE)
   		{
  -			IPackage pkg = (IPackage) node;
  -			if (pkg.isTopLevel())
  -			{
  -				IFile packageFile = pkg.getPackageFile();
  -				try {
  -					packageFile.delete(true, true, nullMonitor);
  -				} catch (CoreException e) {
  -					Trace.trace(getClass(), e);
  -				}
  -			}
  -			else {
  -				removeInnerPackage(pkg);
  +			removePackage((IPackage)node);
   			}
  +		else if (node.getNodeType() == IPackageNode.TYPE_PACKAGE_REFERENCE)
  +		{
  +			removePackageRef((IPackageReference)node);
   		}
   		else if (node.getNodeType() == IPackageNode.TYPE_PACKAGE_FILESET)
   		{