Author: dgolovin Date: 2008-11-11 20:37:56 -0500 (Tue, 11 Nov 2008) New Revision: 11691 Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/SeamFacetAbstractInstallDelegate.java trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/SeamFacetInstallDataModelProvider.java trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/internal/project/facet/SeamInstallWizardPage.java Log: https://jira.jboss.org/jira/browse/JBIDE-2525 resolved. Project name now is got from master project data model Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/SeamFacetAbstractInstallDelegate.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/SeamFacetAbstractInstallDelegate.java 2008-11-11 22:42:53 UTC (rev 11690) +++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/SeamFacetAbstractInstallDelegate.java 2008-11-12 01:37:56 UTC (rev 11691) @@ -719,7 +719,7 @@ if(model.getProperty(ISeamFacetDataModelProperties.JBOSS_AS_DEPLOY_AS)==null) { model.setProperty(ISeamFacetDataModelProperties.JBOSS_AS_DEPLOY_AS, warProject?ISeamFacetDataModelProperties.DEPLOY_AS_WAR:ISeamFacetDataModelProperties.DEPLOY_AS_EAR); } - Object projectNamePackage = model.getProperty(IFacetDataModelProperties.FACET_PROJECT_NAME); + Object projectNamePackage = model.getProperty(ISeamFacetDataModelProperties.SEAM_PROJECT_NAME); IStatus status = JavaConventions.validatePackageName(projectNamePackage.toString(), CompilerOptions.VERSION_1_5, CompilerOptions.VERSION_1_5); if(!status.isOK()) { projectNamePackage = "project"; Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/SeamFacetInstallDataModelProvider.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/SeamFacetInstallDataModelProvider.java 2008-11-11 22:42:53 UTC (rev 11690) +++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/SeamFacetInstallDataModelProvider.java 2008-11-12 01:37:56 UTC (rev 11691) @@ -12,6 +12,7 @@ import java.io.File; import java.io.IOException; +import java.util.HashSet; import java.util.Set; import org.eclipse.core.runtime.FileLocator; @@ -43,7 +44,7 @@ * @return set of property names */ public Set getPropertyNames() { - Set<String> names = super.getPropertyNames(); + Set<String> names = super.getPropertyNames();//super.getPropertyNames(); // General group names.add(ISeamFacetDataModelProperties.JBOSS_AS_HOME); 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 2008-11-11 22:42:53 UTC (rev 11690) +++ trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/internal/project/facet/SeamInstallWizardPage.java 2008-11-12 01:37:56 UTC (rev 11691) @@ -40,6 +40,7 @@ import org.eclipse.swt.widgets.Display; import org.eclipse.swt.widgets.Group; import org.eclipse.ui.PlatformUI; +import org.eclipse.wst.common.componentcore.datamodel.FacetInstallDataModelProvider; import org.eclipse.wst.common.componentcore.datamodel.properties.IFacetDataModelProperties; import org.eclipse.wst.common.componentcore.datamodel.properties.IFacetProjectCreationDataModelProperties; import org.eclipse.wst.common.componentcore.internal.util.IModuleConstants; @@ -233,9 +234,6 @@ */ public void setConfig(Object config) { model = (IDataModel) config; - sync = new DataModelSynchronizer(model); - model.addListener(this); - model.setProperty(ISeamFacetDataModelProperties.HIBERNATE_DIALECT, HIBERNATE_HELPER.getDialectClass(jBossHibernateDbTypeEditor.getValueAsString())); } @@ -298,6 +296,7 @@ * Creates Seam Facet Wizard Page contents */ public void createControl(Composite parent) { + sync = new DataModelSynchronizer(model); jBossSeamHomeEditor = SeamWizardFactory.createSeamRuntimeSelectionFieldEditor(new SeamVersion[0], SeamFacetInstallDataModelProvider.getSeamRuntimeDefaultValue(model), new NewSeamRuntimeAction()); initializeDialogUnits(parent); @@ -400,6 +399,7 @@ Dialog.applyDialogFont(parent); initDefaultWizardProperties(); + ((IDataModel)model.getProperty(FacetInstallDataModelProvider.MASTER_PROJECT_DM)).addListener(this); } private boolean isNewSeamProjectWizard() { @@ -421,7 +421,9 @@ ISeamFacetDataModelProperties.WEB_CONTENTS_FOLDER, event .getProperty().toString()); } else if(event.getPropertyName().equals(IFacetDataModelProperties.FACET_PROJECT_NAME)) { - setCodeGenerationProperties(); + model.setStringProperty( + ISeamFacetDataModelProperties.SEAM_PROJECT_NAME, event + .getProperty().toString()); } } @@ -431,8 +433,9 @@ */ @Override public void setVisible(boolean visible) { - setCodeGenerationProperties(); + if(visible) { + setCodeGenerationProperties(); setDefaultSeamRuntime(); validate(); } @@ -452,18 +455,15 @@ String p = (String)model.getProperty(ISeamFacetDataModelProperties.SEAM_PROJECT_NAME); sessionBeanPkgNameditor .setValue("org.domain." //$NON-NLS-1$ - + model - .getProperty(IFacetDataModelProperties.FACET_PROJECT_NAME) + + p + ".session"); //$NON-NLS-1$ entityBeanPkgNameditor .setValue("org.domain." //$NON-NLS-1$ - + model - .getProperty(IFacetDataModelProperties.FACET_PROJECT_NAME) + + p + ".entity"); //$NON-NLS-1$ testsPkgNameditor .setValue("org.domain." //$NON-NLS-1$ - + model - .getProperty(IFacetDataModelProperties.FACET_PROJECT_NAME) + + p + ".test"); //$NON-NLS-1$ }