[226583] fix initialization of the project field in the servlet wizards

3 files changed, 22 insertions, 1 deletions

diff --git a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/NewFilterClassWizardPage.java b/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/NewFilterClassWizardPage.java
index 26af34cd0..4990e576b 100644
--- a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/NewFilterClassWizardPage.java
+++ b/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/NewFilterClassWizardPage.java
@@ -23,6 +23,8 @@ import org.eclipse.jem.util.emf.workbench.ProjectUtilities;
 import org.eclipse.jface.window.Window;
 import org.eclipse.jst.j2ee.internal.war.ui.util.WebFiltersGroupItemProvider;
 import org.eclipse.jst.j2ee.webapplication.WebApp;
+import org.eclipse.jst.jee.ui.internal.navigator.web.GroupFiltersItemProvider;
+import org.eclipse.jst.jee.ui.internal.navigator.web.WebAppProvider;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.graphics.Cursor;
 import org.eclipse.wst.common.componentcore.ComponentCore;
@@ -52,6 +54,11 @@ public class NewFilterClassWizardPage extends NewWebClassWizardPage {
 		if (selection instanceof WebFiltersGroupItemProvider) {
 			WebApp webApp = (WebApp)((WebFiltersGroupItemProvider) selection).getParent();
 			return ProjectUtilities.getProject(webApp);
+		}else if(selection instanceof WebAppProvider){
+			return ((WebAppProvider) selection).getProject();
+		} if(selection instanceof GroupFiltersItemProvider){
+			org.eclipse.jst.javaee.web.WebApp webApp = (org.eclipse.jst.javaee.web.WebApp) ((GroupFiltersItemProvider) selection).getJavaEEObject();
+			return ProjectUtilities.getProject(webApp);
 		}
 		
 		return super.getExtendedSelectedProject(selection);
diff --git a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/NewListenerClassWizardPage.java b/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/NewListenerClassWizardPage.java
index 0eff2b987..5ffc33a88 100644
--- a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/NewListenerClassWizardPage.java
+++ b/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/NewListenerClassWizardPage.java
@@ -17,6 +17,8 @@ import org.eclipse.core.resources.IProject;
 import org.eclipse.jem.util.emf.workbench.ProjectUtilities;
 import org.eclipse.jst.j2ee.internal.war.ui.util.WebListenerGroupItemProvider;
 import org.eclipse.jst.j2ee.webapplication.WebApp;
+import org.eclipse.jst.jee.ui.internal.navigator.web.GroupListenerItemProvider;
+import org.eclipse.jst.jee.ui.internal.navigator.web.WebAppProvider;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
 
@@ -50,6 +52,11 @@ public class NewListenerClassWizardPage extends NewWebClassWizardPage {
 		if (selection instanceof WebListenerGroupItemProvider) {
 			WebApp webApp = (WebApp)((WebListenerGroupItemProvider) selection).getParent();
 			return ProjectUtilities.getProject(webApp);
+		}else if(selection instanceof WebAppProvider){
+			return ((WebAppProvider) selection).getProject();
+		} else if(selection instanceof GroupListenerItemProvider){
+			org.eclipse.jst.javaee.web.WebApp webApp = (org.eclipse.jst.javaee.web.WebApp) ((GroupListenerItemProvider) selection).getJavaEEObject();
+			return ProjectUtilities.getProject(webApp);
 		}
 		
 		return super.getExtendedSelectedProject(selection);
diff --git a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/NewServletClassWizardPage.java b/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/NewServletClassWizardPage.java
index 5acd6d2e2..7eb7f67fe 100644
--- a/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/NewServletClassWizardPage.java
+++ b/plugins/org.eclipse.jst.servlet.ui/servlet_ui/org/eclipse/jst/servlet/ui/internal/wizard/NewServletClassWizardPage.java
@@ -27,6 +27,8 @@ import org.eclipse.jem.util.emf.workbench.ProjectUtilities;
 import org.eclipse.jface.window.Window;
 import org.eclipse.jst.j2ee.internal.war.ui.util.WebServletGroupItemProvider;
 import org.eclipse.jst.j2ee.webapplication.WebApp;
+import org.eclipse.jst.jee.ui.internal.navigator.web.GroupServletItemProvider;
+import org.eclipse.jst.jee.ui.internal.navigator.web.WebAppProvider;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.graphics.Cursor;
 import org.eclipse.wst.common.componentcore.ComponentCore;
@@ -56,7 +58,12 @@ public class NewServletClassWizardPage extends NewWebClassWizardPage {
 		if (selection instanceof WebServletGroupItemProvider) {
 			WebApp webApp = (WebApp) ((WebServletGroupItemProvider) selection).getParent();
 			return ProjectUtilities.getProject(webApp);
-		} 
+		} else if(selection instanceof WebAppProvider){
+			return ((WebAppProvider) selection).getProject();
+		} else if(selection instanceof GroupServletItemProvider){
+			org.eclipse.jst.javaee.web.WebApp webApp = (org.eclipse.jst.javaee.web.WebApp) ((GroupServletItemProvider) selection).getJavaEEObject();
+			return ProjectUtilities.getProject(webApp);
+		}
 		
 		return super.getExtendedSelectedProject(selection);
 	}