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

[Robert Stryker]

  User: rawb    
  Date: 07/02/21 14:45:24

  Modified:    core/plugins/org.jboss.ide.eclipse.packages.ui/src/main/org/jboss/ide/eclipse/packages/ui/wizards  
                        AbstractPackageWizard.java FilesetWizard.java
  Log:
  ensuring saving of model after an edit on a node
  
  Revision  Changes    Path
  1.8       +27 -29    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.7
  retrieving revision 1.8
  diff -u -b -r1.7 -r1.8
  --- AbstractPackageWizard.java	14 Feb 2007 18:52:16 -0000	1.7
  +++ AbstractPackageWizard.java	21 Feb 2007 19:45:24 -0000	1.8
  @@ -18,6 +18,7 @@
   import org.jboss.ide.eclipse.packages.core.model.IPackageNode;
   import org.jboss.ide.eclipse.packages.core.model.PackagesCore;
   import org.jboss.ide.eclipse.packages.core.model.internal.PackageImpl;
  +import org.jboss.ide.eclipse.packages.core.model.internal.PackagesModel;
   import org.jboss.ide.eclipse.packages.ui.wizards.pages.PackageInfoWizardPage;
   import org.jboss.ide.eclipse.ui.wizards.WizardPageWithNotification;
   import org.jboss.ide.eclipse.ui.wizards.WizardWithNotification;
  @@ -70,42 +71,39 @@
   			((WizardPageWithNotification)currentPage).pageExited(WizardWithNotification.FINISH);
   		}
   		
  +		final boolean create = this.existingPackage == null;
   		final IPackage pkg = firstPage.getPackage();
  -		Object destination = firstPage.getPackageDestination();
  +		final Object destination = firstPage.getPackageDestination();
   		
   		boolean performed = performFinish(pkg);
   		
  -		if (performed)
  -		{
  -			if (!pkg.equals(existingPackage))
  -			{
  +		if (performed) {
   				try {
   					getContainer().run(false, false, new IRunnableWithProgress () {
   						public void run(IProgressMonitor monitor) throws InvocationTargetException, InterruptedException {
  -							PackagesCore.attach(pkg, monitor);	
  +						if (destination instanceof IPackageNode) {
  +							if (!create && !destination.equals(pkg.getParent())) {
  +								if (pkg.getParent() != null) {
  +									pkg.getParent().removeChild(pkg);
   						}
  -					});
  -				} catch (InvocationTargetException e) {
  -					Trace.trace(getClass(), e);
  -				} catch (InterruptedException e) {
  -					Trace.trace(getClass(), e);
   				}
  +							IPackageNode node = (IPackageNode) destination;
  +							node.addChild(pkg);
   			}
  -			else {
  +						
  +						if (create) {
  +							PackagesCore.attach(pkg, monitor);	
  +						} else {
   				((PackageImpl)existingPackage).flagAsChanged();
  +							PackagesModel.instance().saveModel(pkg.getProject(), monitor);
   			}
   			
  -			if (destination instanceof IPackageNode) {
  -				if (pkg.equals(existingPackage) && !destination.equals(pkg.getParent()))
  -				{
  -					if (pkg.getParent() != null)
  -					{
  -						pkg.getParent().removeChild(pkg);
  -					}
   				}
  -				
  -				IPackageNode node = (IPackageNode) destination;
  -				node.addChild(pkg);
  +				});
  +			} catch (InvocationTargetException e) {
  +				Trace.trace(getClass(), e);
  +			} catch (InterruptedException e) {
  +				Trace.trace(getClass(), e);
   			}
   		}
   		return performed;
  
  
  
  1.9       +8 -6      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.8
  retrieving revision 1.9
  diff -u -b -r1.8 -r1.9
  --- FilesetWizard.java	19 Feb 2007 15:20:00 -0000	1.8
  +++ FilesetWizard.java	21 Feb 2007 19:45:24 -0000	1.9
  @@ -12,6 +12,7 @@
   import org.jboss.ide.eclipse.packages.core.model.IPackageNode;
   import org.jboss.ide.eclipse.packages.core.model.PackagesCore;
   import org.jboss.ide.eclipse.packages.core.model.internal.PackageFileSetImpl;
  +import org.jboss.ide.eclipse.packages.core.model.internal.PackagesModel;
   import org.jboss.ide.eclipse.packages.ui.wizards.pages.FilesetInfoWizardPage;
   
   public class FilesetWizard extends Wizard {
  @@ -28,20 +29,21 @@
   	
   	public boolean performFinish() {
   		try {
  -		boolean createFileset = this.fileset == null;
  +		final boolean createFileset = this.fileset == null;
   		
   		if (createFileset)
   			this.fileset = PackagesCore.createDetachedPackageFileSet(parentNode.getProject());
   				
   		fillFilesetFromPage(fileset);
  -
  -		if (createFileset)
  -			page1.getRootNode().addChild(this.fileset);
  -		
   		try {
   			getContainer().run(false, false, new IRunnableWithProgress () {
   				public void run(IProgressMonitor monitor) throws InvocationTargetException, InterruptedException {
  +					if (createFileset) {
  +						page1.getRootNode().addChild(fileset);
   					PackagesCore.attach(fileset, monitor);	
  +					} else {
  +						PackagesModel.instance().saveModel(fileset.getProject(), monitor);
  +					}
   				}
   			});
   		} catch (InvocationTargetException e) {