[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: 07/02/14 13:52:16

  Modified:    core/plugins/org.jboss.ide.eclipse.packages.ui/src/main/org/jboss/ide/eclipse/packages/ui/wizards   
                        FilesetWizard.java AbstractPackageWizard.java
                        NewJARWizard.java
  Log:
  preliminary implementation of edit package is now working, hasn't been 100% tested yet but it's mostly there. also edit wizards are now firing change events so the packages view (and any other listeners) are updated accordingly
  
  Revision  Changes    Path
  1.6       +3 -0      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.5
  retrieving revision 1.6
  diff -u -b -r1.5 -r1.6
  --- FilesetWizard.java	20 Dec 2006 19:56:42 -0000	1.5
  +++ FilesetWizard.java	14 Feb 2007 18:52:16 -0000	1.6
  @@ -11,6 +11,7 @@
   import org.jboss.ide.eclipse.packages.core.model.IPackageFileSet;
   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.ui.wizards.pages.FilesetInfoWizardPage;
   
   public class FilesetWizard extends Wizard {
  @@ -48,6 +49,8 @@
   			Trace.trace(getClass(), e);
   		}
   		
  +		((PackageFileSetImpl)fileset).flagAsChanged();
  +		
   		return true;
   	}
   	
  
  
  
  1.7       +35 -11    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.6
  retrieving revision 1.7
  diff -u -b -r1.6 -r1.7
  --- AbstractPackageWizard.java	14 Feb 2007 17:55:12 -0000	1.6
  +++ AbstractPackageWizard.java	14 Feb 2007 18:52:16 -0000	1.7
  @@ -17,6 +17,7 @@
   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.PackagesCore;
  +import org.jboss.ide.eclipse.packages.core.model.internal.PackageImpl;
   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;
  @@ -27,9 +28,18 @@
   	private WizardPage pages[];
   	protected IProject project;
   	protected Object selectedDestination;
  +	protected IPackage existingPackage;
  +	
  +	public AbstractPackageWizard () {	}
  +	
  +	public AbstractPackageWizard (IPackage existingPackage)
  +	{
  +		this.existingPackage = existingPackage;
  +		this.project = existingPackage.getProject();
  +	}
   	
   	public void addPages() {
  -		firstPage = new PackageInfoWizardPage(this);
  +		firstPage = new PackageInfoWizardPage(this, existingPackage);
   		addPage(firstPage);
   		
   		pages = createWizardPages();
  @@ -67,6 +77,8 @@
   		
   		if (performed)
   		{
  +			if (!pkg.equals(existingPackage))
  +			{
   			try {
   				getContainer().run(false, false, new IRunnableWithProgress () {
   					public void run(IProgressMonitor monitor) throws InvocationTargetException, InterruptedException {
  @@ -78,8 +90,20 @@
   			} catch (InterruptedException e) {
   				Trace.trace(getClass(), e);
   			}
  +			}
  +			else {
  +				((PackageImpl)existingPackage).flagAsChanged();
  +			}
   			
   			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);
   			}
  
  
  
  1.4       +12 -4     jbosside/core/plugins/org.jboss.ide.eclipse.packages.ui/src/main/org/jboss/ide/eclipse/packages/ui/wizards/NewJARWizard.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: NewJARWizard.java
  ===================================================================
  RCS file: /cvsroot/jboss/jbosside/core/plugins/org.jboss.ide.eclipse.packages.ui/src/main/org/jboss/ide/eclipse/packages/ui/wizards/NewJARWizard.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -b -r1.3 -r1.4
  --- NewJARWizard.java	20 Dec 2006 19:56:42 -0000	1.3
  +++ NewJARWizard.java	14 Feb 2007 18:52:16 -0000	1.4
  @@ -13,10 +13,11 @@
   public class NewJARWizard extends AbstractPackageWizard
   {
   	public WizardPage[] createWizardPages() {
  -		
  +		if (existingPackage == null) {
   		return new WizardPage[] {
   				new DefaultJARConfigWizardPage(this)
   		};
  +		} else return new WizardPage[0];
   	}
   
   	public NewJARWizard ()
  @@ -24,6 +25,13 @@
   		setWindowTitle(PackagesUIMessages.NewJARWizard_windowTitle);
   	}
   	
  +	public NewJARWizard (IPackage existingPackage)
  +	{
  +		super(existingPackage);
  +		
  +		setWindowTitle(PackagesUIMessages.NewJARWizard_windowTitle_editJAR);
  +	}
  +	
   	public boolean performFinish(IPackage pkg) {
   		Trace.trace(getClass(), "performing finish");