[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/14 22:36:32

  Modified:    core/plugins/org.jboss.ide.eclipse.packages.ui/src/main/org/jboss/ide/eclipse/packages/ui/wizards  
                        AbstractPackageWizard.java FilesetWizard.java
  Log:
  some bug fixes for creating filesets and packages, xml binding errors are now traced in the error log
  
  Revision  Changes    Path
  1.3       +5 -6      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.2
  retrieving revision 1.3
  diff -u -b -r1.2 -r1.3
  --- AbstractPackageWizard.java	8 Nov 2006 19:54:44 -0000	1.2
  +++ AbstractPackageWizard.java	15 Nov 2006 03:36:32 -0000	1.3
  @@ -12,7 +12,6 @@
   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;
   import org.jboss.ide.eclipse.packages.core.model.PackagesCore;
   import org.jboss.ide.eclipse.packages.ui.wizards.pages.PackageInfoWizardPage;
  @@ -63,10 +62,6 @@
   		if (!destContainer.equals(project) && destContainer instanceof IContainer) {
   			packageWC.setDestinationContainer((IContainer)destContainer);
   		}
  -		else if (destContainer instanceof IPackageNodeWorkingCopy) {
  -			IPackageNodeWorkingCopy node = (IPackageNodeWorkingCopy) destContainer;
  -			node.addChild(packageWC);
  -		}
   		else if (destContainer instanceof IPath)
   		{
   			packageWC.setDestinationFolder((IPath) destContainer);
  @@ -76,7 +71,11 @@
   		
   		if (performed)
   		{
  -			packageWC.save();
  +			pkg = packageWC.savePackage();
  +			if (destContainer instanceof IPackageNode) {
  +				IPackageNode node = (IPackageNode) destContainer;
  +				node.addChild(pkg);
  +			}
   		}
   		return performed;
   	}
  
  
  
  1.3       +2 -2      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.2
  retrieving revision 1.3
  diff -u -b -r1.2 -r1.3
  --- FilesetWizard.java	8 Nov 2006 19:54:44 -0000	1.2
  +++ FilesetWizard.java	15 Nov 2006 03:36:32 -0000	1.3
  @@ -31,11 +31,11 @@
   		
   		fillFilesetFromPage(filesetWC);
   		
  +		filesetWC.save();
  +		
   		if (createFileset)
   			page1.getRootNode().addChild(this.fileset);
   		
  -		filesetWC.save();
  -		
   		return true;
   	}