[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/03/01 17:48:51

  Modified:    core/plugins/org.jboss.ide.eclipse.packages.core/src/main/org/jboss/ide/eclipse/packages/core/project/build 
                        TruezipUtil.java
  Log:
  committing a fix for deleting package nodes on the top level
  
  Revision  Changes    Path
  1.3       +13 -13    jbosside/core/plugins/org.jboss.ide.eclipse.packages.core/src/main/org/jboss/ide/eclipse/packages/core/project/build/TruezipUtil.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: TruezipUtil.java
  ===================================================================
  RCS file: /cvsroot/jboss/jbosside/core/plugins/org.jboss.ide.eclipse.packages.core/src/main/org/jboss/ide/eclipse/packages/core/project/build/TruezipUtil.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -b -r1.2 -r1.3
  --- TruezipUtil.java	28 Feb 2007 23:22:47 -0000	1.2
  +++ TruezipUtil.java	1 Mar 2007 22:48:51 -0000	1.3
  @@ -7,7 +7,6 @@
   import java.util.Iterator;
   
   import org.eclipse.core.runtime.IPath;
  -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;
   import org.jboss.ide.eclipse.packages.core.model.IPackageFolder;
  @@ -97,17 +96,17 @@
   
   	public static File[] createFiles (IPath subPath, Hashtable pkgsAndPaths)
   	{
  -		File[] roots = createFileRoots(pkgsAndPaths);
  +		File[] roots = createNodeRoots(pkgsAndPaths);
   		return createFiles (roots, subPath);
   	}
   
   	public static File[] createNodeRoots (IPackageNode node)
   	{	
   		Hashtable pkgsAndPaths = PackagesModel.instance().getTopLevelPackagesAndPathways(node);
  -		return createFileRoots (pkgsAndPaths);	
  +		return createNodeRoots (pkgsAndPaths);	
   	}
   
  -	public static File[] createFileRoots (Hashtable pkgsAndPaths)
  +	public static File[] createNodeRoots (Hashtable pkgsAndPaths)
   	{
   		ArrayList roots = new ArrayList();
   		
  @@ -116,15 +115,16 @@
   			IPackage topLevelPackage = (IPackage) iter.next();
   			ArrayList pathway = (ArrayList) pkgsAndPaths.get(topLevelPackage);
   			
  -			File root = null;
  -			if (topLevelPackage.isDestinationInWorkspace())
  -			{
  -				IPath projectPath = ProjectUtil.getProjectLocation(topLevelPackage.getProject());
  -				IPath subPath = topLevelPackage.getDestinationContainer().getProjectRelativePath();
  -				root = new File(projectPath.append(subPath).toFile());
  -			} else {
  -				root = new File(topLevelPackage.getDestinationPath().toFile());
  -			}
  +			File root = new File(topLevelPackage.getDestinationPath().toFile());
  +			
  +//			if (topLevelPackage.isDestinationInWorkspace())
  +//			{
  +//				IPath projectPath = ProjectUtil.getProjectLocation(topLevelPackage.getProject());
  +//				IPath subPath = topLevelPackage.getDestinationContainer().getProjectRelativePath();
  +//				root = new File(projectPath.append(subPath).toFile());
  +//			} else {
  +//				root = new File(topLevelPackage.getDestinationPath().toFile());
  +//			}
   			
   			for (Iterator iter2 = pathway.iterator(); iter2.hasNext(); )
   			{