[jbosstools-commits] JBoss Tools SVN: r30610 - in trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui: wizards and 1 other directory.

[jbosstools-commits at lists.jboss.org]

Author: bbrodt
Date: 2011-04-15 16:43:13 -0400 (Fri, 15 Apr 2011)
New Revision: 30610

Modified:
   trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/util/filedialog/FileSelectionGroup.java
   trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/wizards/NewFileWizardPage1.java
Log:
https://issues.jboss.org/browse/JBIDE-8738
avoid NPE during wizard validation if no current project is selected

Modified: trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/util/filedialog/FileSelectionGroup.java
===================================================================
--- trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/util/filedialog/FileSelectionGroup.java	2011-04-15 20:42:03 UTC (rev 30609)
+++ trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/util/filedialog/FileSelectionGroup.java	2011-04-15 20:43:13 UTC (rev 30610)
@@ -196,6 +196,9 @@
 	 * Sets the selected existing file.
 	 */
 	public void setSelectedResource(IResource resource) {
+		// https://issues.jboss.org/browse/JBIDE-8738
+		if (resource==null)
+			return;
 		selectedResource = resource;
 
 		//expand to and select the specified file

Modified: trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/wizards/NewFileWizardPage1.java
===================================================================
--- trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/wizards/NewFileWizardPage1.java	2011-04-15 20:42:03 UTC (rev 30609)
+++ trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/wizards/NewFileWizardPage1.java	2011-04-15 20:43:13 UTC (rev 30610)
@@ -364,8 +364,11 @@
 
 		// https://issues.jboss.org/browse/JBIDE-8591
 		NewFileWizard wiz = (NewFileWizard)getWizard();
-		if (!ModuleCoreNature.isFlexibleProject(wiz.getBPELContainer().getProject()))
-			setMessage(Messages.NewFileWizard_Not_A_Faceted_Project, WizardPage.WARNING);
+		// https://issues.jboss.org/browse/JBIDE-8738
+		if (wiz.getBPELContainer()!=null) {
+			if (!ModuleCoreNature.isFlexibleProject(wiz.getBPELContainer().getProject()))
+				setMessage(Messages.NewFileWizard_Not_A_Faceted_Project, WizardPage.WARNING);
+		}
 		else
 			setMessage(null);