[jboss-cvs] jbosside/core/plugins/org.jboss.ide.eclipse.packages.ui/src/main/org/jboss/ide/eclipse/packages/ui/wizards ...

[Marshall Culpepper]

  User: mculpepper
  Date: 06/11/08 14:54:44

  Modified:    core/plugins/org.jboss.ide.eclipse.packages.ui/src/main/org/jboss/ide/eclipse/packages/ui/wizards  
                        AbstractPackageWizard.java FilesetWizard.java
  Log:
  made a ton of bug fixes, re-modeled the working copy API to actually make sense (thanks rob!).. we're approaching a working implementation
  
  Revision  Changes    Path
  1.2       +3 -1      jbosside/core/plugins/org.jboss.ide.eclipse.packages.ui/src/main/org/jboss/ide/eclipse/packages/ui/wizards/AbstractPackageWizard.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: AbstractPackageWizard.java
  ===================================================================
  RCS file: /cvsroot/jboss/jbosside/core/plugins/org.jboss.ide.eclipse.packages.ui/src/main/org/jboss/ide/eclipse/packages/ui/wizards/AbstractPackageWizard.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -b -r1.1 -r1.2
  --- AbstractPackageWizard.java	6 Nov 2006 21:36:50 -0000	1.1
  +++ AbstractPackageWizard.java	8 Nov 2006 19:54:44 -0000	1.2
  @@ -10,6 +10,7 @@
   import org.eclipse.ui.INewWizard;
   import org.eclipse.ui.IWorkbench;
   import org.jboss.ide.eclipse.core.util.ProjectUtil;
  +import org.jboss.ide.eclipse.packages.core.model.IPackage;
   import org.jboss.ide.eclipse.packages.core.model.IPackageNode;
   import org.jboss.ide.eclipse.packages.core.model.IPackageNodeWorkingCopy;
   import org.jboss.ide.eclipse.packages.core.model.IPackageWorkingCopy;
  @@ -48,7 +49,8 @@
   	}
   	
   	public boolean performFinish() {
  -		IPackageWorkingCopy packageWC = PackagesCore.createPackage(project);
  +		IPackage pkg = PackagesCore.createPackage(project);
  +		IPackageWorkingCopy packageWC = pkg.createPackageWorkingCopy();
   		
   		packageWC.setName(firstPage.getPackageName());
   		packageWC.setExploded(firstPage.isPackageExploded());
  
  
  
  1.2       +8 -10     jbosside/core/plugins/org.jboss.ide.eclipse.packages.ui/src/main/org/jboss/ide/eclipse/packages/ui/wizards/FilesetWizard.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: FilesetWizard.java
  ===================================================================
  RCS file: /cvsroot/jboss/jbosside/core/plugins/org.jboss.ide.eclipse.packages.ui/src/main/org/jboss/ide/eclipse/packages/ui/wizards/FilesetWizard.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -b -r1.1 -r1.2
  --- FilesetWizard.java	6 Nov 2006 21:36:50 -0000	1.1
  +++ FilesetWizard.java	8 Nov 2006 19:54:44 -0000	1.2
  @@ -22,21 +22,19 @@
   	}
   	
   	public boolean performFinish() {
  -		IPackageFileSetWorkingCopy filesetWC;
  +		boolean createFileset = this.fileset == null;
   		
  -		if (this.fileset == null) {
  -			filesetWC = PackagesCore.createPackageFileSet(parentNode.getProject());
  -		} else {
  -			filesetWC = fileset.createFileSetWorkingCopy();
  -		}
  +		if (createFileset)
  +			this.fileset = PackagesCore.createPackageFileSet(parentNode.getProject());
  +		
  +		IPackageFileSetWorkingCopy filesetWC = fileset.createFileSetWorkingCopy();
   		
   		fillFilesetFromPage(filesetWC);
   		
  -		page1.getRootNode().addChild(filesetWC);
  -		if (this.fileset != null)
  -			page1.getRootNode().removeChild(this.fileset);
  +		if (createFileset)
  +			page1.getRootNode().addChild(this.fileset);
   		
  -		this.fileset = filesetWC.saveFileSet();
  +		filesetWC.save();
   		
   		return true;
   	}