Author: snjeza Date: 2008-09-04 17:53:34 -0400 (Thu, 04 Sep 2008) New Revision: 10069 Modified: trunk/portlet/plugins/org.jboss.tools.portlet.ui/plugin.xml trunk/portlet/plugins/org.jboss.tools.portlet.ui/src/org/jboss/tools/portlet/ui/internal/wizard/NewJSFPortletClassWizardPage.java trunk/portlet/plugins/org.jboss.tools.portlet.ui/src/org/jboss/tools/portlet/ui/internal/wizard/NewJSFPortletWizard.java trunk/portlet/plugins/org.jboss.tools.portlet.ui/src/org/jboss/tools/portlet/ui/internal/wizard/NewPortletClassDataModelProvider.java Log: JBIDE-2622 There is 3 portlet wizards for something that does *almost* the same thing Modified: trunk/portlet/plugins/org.jboss.tools.portlet.ui/plugin.xml =================================================================== --- trunk/portlet/plugins/org.jboss.tools.portlet.ui/plugin.xml 2008-09-04 18:31:40 UTC (rev 10068) +++ trunk/portlet/plugins/org.jboss.tools.portlet.ui/plugin.xml 2008-09-04 21:53:34 UTC (rev 10069) @@ -35,13 +35,14 @@ </wizard> <wizard id="org.jboss.tools.portlet.ui.wizard.NewJSFPortletWizard" - name="JBoss JSF Portlet" + name="JBoss JSF/Seam Portlet" class="org.jboss.tools.portlet.ui.internal.wizard.NewJSFPortletWizard" category="org.jboss.tools.jst.web/org.jboss.tools.portlet" icon="icons/portlet_wiz.gif"> <description>Create a new JBoss JSF Portlet</description> <selection class="org.eclipse.core.resources.IResource" /> </wizard> + <!-- <wizard id="org.jboss.tools.portlet.ui.wizard.NewSeamPortletWizard" name="JBoss Seam Portlet" @@ -51,6 +52,7 @@ <description>Create a new JBoss Seam Portlet</description> <selection class="org.eclipse.core.resources.IResource" /> </wizard> + --> </extension> </plugin> Modified: trunk/portlet/plugins/org.jboss.tools.portlet.ui/src/org/jboss/tools/portlet/ui/internal/wizard/NewJSFPortletClassWizardPage.java =================================================================== --- trunk/portlet/plugins/org.jboss.tools.portlet.ui/src/org/jboss/tools/portlet/ui/internal/wizard/NewJSFPortletClassWizardPage.java 2008-09-04 18:31:40 UTC (rev 10068) +++ trunk/portlet/plugins/org.jboss.tools.portlet.ui/src/org/jboss/tools/portlet/ui/internal/wizard/NewJSFPortletClassWizardPage.java 2008-09-04 21:53:34 UTC (rev 10069) @@ -5,7 +5,6 @@ import static org.eclipse.jst.j2ee.internal.web.operations.INewWebClassDataModelProperties.USE_EXISTING_CLASS; import static org.eclipse.jst.servlet.ui.internal.wizard.IWebWizardConstants.BROWSE_BUTTON_LABEL; import static org.eclipse.jst.servlet.ui.internal.wizard.IWebWizardConstants.CLASS_NAME_LABEL; - import static org.jboss.tools.portlet.ui.INewPortletClassDataModelProperties.IS_JSF_PORTLET; import static org.jboss.tools.portlet.ui.INewPortletClassDataModelProperties.IS_SEAM_PORTLET; @@ -28,6 +27,7 @@ import org.eclipse.swt.SWT; import org.eclipse.swt.events.SelectionAdapter; import org.eclipse.swt.events.SelectionEvent; +import org.eclipse.swt.events.SelectionListener; import org.eclipse.swt.graphics.Cursor; import org.eclipse.swt.layout.GridData; import org.eclipse.swt.layout.GridLayout; @@ -170,12 +170,44 @@ data.widthHint = 300; data.horizontalSpan = 1; projectNameCombo.setLayoutData(data); + projectNameCombo.addSelectionListener(new SelectionListener() { + + public void widgetDefaultSelected(SelectionEvent e) { + updateProject(); + } + + public void widgetSelected(SelectionEvent e) { + updateProject(); + } + + }); synchHelper.synchCombo(projectNameCombo, IArtifactEditOperationDataModelProperties.PROJECT_NAME, null); initializeProjectList(); + updateProject(); new Label(parent, SWT.NONE); } + protected void updateProject() { + String projectName = projectNameCombo.getText(); + IProject project = ProjectUtilities.getProject(projectName); + try { + boolean isSeamPortlet = FacetedProjectFramework.hasProjectFacet(project, IPortletConstants.SEAMPORTLET_FACET_ID); + boolean isJSFPortlet; + if (isSeamPortlet) { + isJSFPortlet = false; + } else { + isJSFPortlet = FacetedProjectFramework.hasProjectFacet(project, IPortletConstants.JSFPORTLET_FACET_ID); + } + NewJSFPortletWizard wizard = (NewJSFPortletWizard) getWizard(); + NewPortletClassDataModelProvider provider = (NewPortletClassDataModelProvider) wizard.getDefaultProvider(); + provider.setSeamPortlet(isSeamPortlet); + provider.setJSFPortlet(isJSFPortlet); + } catch (CoreException e) { + // ignore + } + } + /** * */ Modified: trunk/portlet/plugins/org.jboss.tools.portlet.ui/src/org/jboss/tools/portlet/ui/internal/wizard/NewJSFPortletWizard.java =================================================================== --- trunk/portlet/plugins/org.jboss.tools.portlet.ui/src/org/jboss/tools/portlet/ui/internal/wizard/NewJSFPortletWizard.java 2008-09-04 18:31:40 UTC (rev 10068) +++ trunk/portlet/plugins/org.jboss.tools.portlet.ui/src/org/jboss/tools/portlet/ui/internal/wizard/NewJSFPortletWizard.java 2008-09-04 21:53:34 UTC (rev 10069) @@ -24,6 +24,8 @@ */ public class NewJSFPortletWizard extends NewWebArtifactWizard { + private NewPortletClassDataModelProvider provider; + //protected static final String PAGE_FOUR = "pageFour"; public NewJSFPortletWizard() { @@ -78,8 +80,11 @@ } @Override - protected IDataModelProvider getDefaultProvider() { - return new NewPortletClassDataModelProvider(true,false); + public IDataModelProvider getDefaultProvider() { + if (provider == null) { + provider = new NewPortletClassDataModelProvider(true,false); + } + return provider; } } Modified: trunk/portlet/plugins/org.jboss.tools.portlet.ui/src/org/jboss/tools/portlet/ui/internal/wizard/NewPortletClassDataModelProvider.java =================================================================== --- trunk/portlet/plugins/org.jboss.tools.portlet.ui/src/org/jboss/tools/portlet/ui/internal/wizard/NewPortletClassDataModelProvider.java 2008-09-04 18:31:40 UTC (rev 10068) +++ trunk/portlet/plugins/org.jboss.tools.portlet.ui/src/org/jboss/tools/portlet/ui/internal/wizard/NewPortletClassDataModelProvider.java 2008-09-04 21:53:34 UTC (rev 10069) @@ -480,4 +480,12 @@ // Valid source is selected return WTPCommonPlugin.OK_STATUS; } + + public void setJSFPortlet(boolean isJSFPortlet) { + this.isJSFPortlet = isJSFPortlet; + } + + public void setSeamPortlet(boolean isSeamPortlet) { + this.isSeamPortlet = isSeamPortlet; + } }