[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/03/01 12:05:50

  Modified:    core/plugins/org.jboss.ide.eclipse.packages.ui/src/main/org/jboss/ide/eclipse/packages/ui/wizards  
                        NewJARWizard.java AbstractPackageWizard.java
  Log:
  Some changes to fix a selection bug where the wizard was getting a null selection
  
  Revision  Changes    Path
  1.6       +2 -0      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.5
  retrieving revision 1.6
  diff -u -b -r1.5 -r1.6
  --- NewJARWizard.java	19 Feb 2007 20:32:00 -0000	1.5
  +++ NewJARWizard.java	1 Mar 2007 17:05:49 -0000	1.6
  @@ -1,7 +1,9 @@
   package org.jboss.ide.eclipse.packages.ui.wizards;
   
   import org.eclipse.jface.resource.ImageDescriptor;
  +import org.eclipse.jface.viewers.IStructuredSelection;
   import org.eclipse.jface.wizard.WizardPage;
  +import org.eclipse.ui.IWorkbench;
   import org.jboss.ide.eclipse.packages.core.Trace;
   import org.jboss.ide.eclipse.packages.core.model.IPackage;
   import org.jboss.ide.eclipse.packages.core.model.PackagesCore;
  
  
  
  1.9       +9 -2      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.8
  retrieving revision 1.9
  diff -u -b -r1.8 -r1.9
  --- AbstractPackageWizard.java	21 Feb 2007 19:45:24 -0000	1.8
  +++ AbstractPackageWizard.java	1 Mar 2007 17:05:49 -0000	1.9
  @@ -19,6 +19,7 @@
   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.views.ProjectPackagesView;
   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;
  @@ -111,9 +112,15 @@
   
   	public void init(IWorkbench workbench, IStructuredSelection selection) {
   		if (selection == null) return;
  +		project = ProjectPackagesView.instance().getCurrentProject();
  +		Object selected;
  +		
  +		if( selection.isEmpty() ) {
  +			selected = project;
  +		} else {
  +			selected = selection.getFirstElement();
  +		}
   		
  -		project = ProjectUtil.getProject(selection.getFirstElement());
  -		Object selected = selection.getFirstElement();
   		if (selected instanceof IPackageNode)
   		{
   			IPackageNode node = (IPackageNode) selected;