[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 18:09:16

  Modified:    core/plugins/org.jboss.ide.eclipse.packages.core/src/main/org/jboss/ide/eclipse/packages/core/project/build 
                        TruezipUtil.java
  Log:
  2nd attempt at fixing this bug..
  
  Revision  Changes    Path
  1.4       +17 -19    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.3
  retrieving revision 1.4
  diff -u -b -r1.3 -r1.4
  --- TruezipUtil.java	1 Mar 2007 22:48:51 -0000	1.3
  +++ TruezipUtil.java	1 Mar 2007 23:09:16 -0000	1.4
  @@ -117,14 +117,12 @@
   			
   			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());
  -//			}
  +			if (pathway.isEmpty())
  +			{
  +				// Top level package, just append the package name
  +				root = new File(root, topLevelPackage.getName(), topLevelPackage.isExploded() ? ArchiveDetector.NULL : ArchiveDetector.DEFAULT);
  +			} else { 
  +				root = new File(topLevelPackage.getDestinationPath().toFile());
   			
   			for (Iterator iter2 = pathway.iterator(); iter2.hasNext(); )
   			{
  @@ -139,7 +137,7 @@
   					root = new File(root, folder.getName(), ArchiveDetector.NULL);
   				}
   			}
  -			
  +			}
   			root.mkdirs();
   			roots.add(root);
   		}