Author: dgolovin Date: 2007-10-11 02:34:34 -0400 (Thu, 11 Oct 2007) New Revision: 4107 Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/internal/project/facet/SeamInstallWizardPage.java trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/SeamProjectWizard.java Log: http://jira.jboss.com/jira/browse/JBIDE-1013 problem was in SeamFacetPreInstallDelegate that fills some properties in IDataModel instance. That triggered wizard validation and finish button became active. Now wizard notify the page about finish pressed and all validation skipped after that notification. Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/internal/project/facet/SeamInstallWizardPage.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/internal/project/facet/SeamInstallWizardPage.java 2007-10-11 05:28:56 UTC (rev 4106) +++ trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/internal/project/facet/SeamInstallWizardPage.java 2007-10-11 06:34:34 UTC (rev 4107) @@ -611,5 +611,12 @@ public void profileDeleted(IConnectionProfile profile) { // this event never happens } + } + + /** + * + */ + public void finishPressed() { + model.removeListener(validatorDelegate); }; } Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/SeamProjectWizard.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/SeamProjectWizard.java 2007-10-11 05:28:56 UTC (rev 4106) +++ trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/SeamProjectWizard.java 2007-10-11 06:34:34 UTC (rev 4107) @@ -10,10 +10,6 @@ ******************************************************************************/ package org.jboss.tools.seam.ui.wizard; -import java.lang.reflect.InvocationTargetException; -import java.net.URL; - -import org.eclipse.core.runtime.Platform; import org.eclipse.jface.resource.ImageDescriptor; import org.eclipse.jface.wizard.IWizardPage; import org.eclipse.jst.servlet.ui.project.facet.WebProjectWizard; @@ -23,9 +19,8 @@ import org.eclipse.wst.common.frameworks.datamodel.IDataModel; import org.eclipse.wst.common.project.facet.core.IFacetedProjectTemplate; import org.eclipse.wst.common.project.facet.core.ProjectFacetsManager; -import org.eclipse.wst.common.project.facet.ui.PresetSelectionPanel; import org.jboss.tools.seam.ui.SeamUIMessages; -import org.osgi.framework.Bundle; +import org.jboss.tools.seam.ui.internal.project.facet.SeamInstallWizardPage; /** * @@ -57,7 +52,7 @@ @Override public void createPageControls(Composite container) { super.createPageControls(container); - Control control = findGroupByText((Composite)getShell(), SeamUIMessages.SEAM_PROJECT_WIZARD_EAR_MEMBERSHIP); + Control control = findGroupByText(getShell(), SeamUIMessages.SEAM_PROJECT_WIZARD_EAR_MEMBERSHIP); control.setVisible(false); } @@ -94,7 +89,18 @@ return "org.jboss.tools.seam.ui.SeamPerspective"; //$NON-NLS-1$ } + @Override protected IFacetedProjectTemplate getTemplate() { return ProjectFacetsManager.getTemplate("template.jst.seam"); //$NON-NLS-1$ } + + /* (non-Javadoc) + * @see org.eclipse.wst.web.ui.internal.wizards.NewProjectDataModelFacetWizard#performFinish() + */ + @Override + public boolean performFinish() { + SeamInstallWizardPage page = (SeamInstallWizardPage)getPage(SeamUIMessages.SEAM_INSTALL_WIZARD_PAGE_SEAM_FACET); + page.finishPressed(); + return super.performFinish(); + } } \ No newline at end of file