[jbosstools-commits] JBoss Tools SVN: r2877 - in trunk/seam/plugins: org.jboss.tools.seam.ui and 5 other directories.

Author: dgolovin Date: 2007-08-03 00:33:28 -0400 (Fri, 03 Aug 2007) New Revision: 2877 Added: trunk/seam/plugins/org.jboss.tools.seam.xml.ui/images/seam16.png Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/SeamFacetFilterSetFactory.java trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/SeamFacetInstallDelegete.java trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/SeamFacetPreInstallDelegate.java trunk/seam/plugins/org.jboss.tools.seam.ui/plugin.xml 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/widget/editor/TextFieldEditor.java trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/SeamProjectWizard.java trunk/seam/plugins/org.jboss.tools.seam.xml.ui/plugin.xml Log: http://jira.jboss.com/jira/browse/JBIDE-643 Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/SeamFacetFilterSetFactory.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/SeamFacetFilterSetFactory.java 2007-08-03 03:13:02 UTC (rev 2876) +++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/SeamFacetFilterSetFactory.java 2007-08-03 04:33:28 UTC (rev 2877) @@ -89,7 +89,8 @@ String value = template.getFilterHash().get(filter).toString(); for (Object property : values.getAllProperties()) { if(value.contains("${"+property.toString()+"}")) { - value = value.replace("${"+property.toString()+"}",values.getProperty(property.toString()).toString()); + Object propertyValue = values.getProperty(property.toString()); + value = value.replace("${"+property.toString()+"}",propertyValue==null?"":propertyValue.toString()); } } result.addFilter(filter.toString(), value); @@ -103,7 +104,8 @@ String value = template.getFilterHash().get(filter).toString(); for (Object property : values.keySet()){ if(value.contains("${"+property.toString()+"}")) { - value = value.replace("${"+property.toString()+"}",values.get(property.toString()).toString()); + Object propertyValue = values.get(property.toString()); + value = value.replace("${"+property.toString()+"}",propertyValue==null?"":propertyValue.toString()); } } result.addFilter(filter.toString(), value); Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/SeamFacetInstallDelegete.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/SeamFacetInstallDelegete.java 2007-08-03 03:13:02 UTC (rev 2876) +++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/SeamFacetInstallDelegete.java 2007-08-03 04:33:28 UTC (rev 2877) @@ -296,7 +296,8 @@ new FilterSetCollection(projectFilterSet), true); // Copy JDBC driver if there is any - AntCopyUtils.copyFiles((String[])model.getProperty(ISeamFacetDataModelProperties.JDBC_DRIVER_JAR_PATH), webLibFolder); + if(model.getProperty(ISeamFacetDataModelProperties.JDBC_DRIVER_JAR_PATH)!=null) + AntCopyUtils.copyFiles((String[])model.getProperty(ISeamFacetDataModelProperties.JDBC_DRIVER_JAR_PATH), webLibFolder); } else { Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/SeamFacetPreInstallDelegate.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/SeamFacetPreInstallDelegate.java 2007-08-03 03:13:02 UTC (rev 2876) +++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/SeamFacetPreInstallDelegate.java 2007-08-03 04:33:28 UTC (rev 2877) @@ -28,6 +28,7 @@ public void execute(IProject project, IProjectFacetVersion fv, Object config, IProgressMonitor monitor) throws CoreException { IDataModel model = (IDataModel)config; + if(model.getProperty(ISeamFacetDataModelProperties.SEAM_CONNECTION_PROFILE)==null) return; IConnectionProfile connProfile = ProfileManager.getInstance().getProfileByName(model.getProperty(ISeamFacetDataModelProperties.SEAM_CONNECTION_PROFILE).toString()); Properties props = connProfile.getProperties("org.eclipse.datatools.connectivity.db.generic.connectionProfile"); @@ -37,7 +38,8 @@ model.setProperty(ISeamFacetDataModelProperties.DB_USERP_PASSWORD,props.get("org.eclipse.datatools.connectivity.db.password").toString()); model.setProperty(ISeamFacetDataModelProperties.JDBC_URL_FOR_DB,props.get("org.eclipse.datatools.connectivity.db.URL").toString()); model.setProperty(ISeamFacetDataModelProperties.JDBC_DRIVER_JAR_PATH,DriverManager.getInstance().getDriverInstanceByID( - props.get("org.eclipse.datatools.connectivity.driverDefinitionID").toString()).getJarListAsArray()); + props.get("org.eclipse.datatools.connectivity.driverDefinitionID").toString()).getJarListAsArray()); + } } Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/plugin.xml =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.ui/plugin.xml 2007-08-03 03:13:02 UTC (rev 2876) +++ trunk/seam/plugins/org.jboss.tools.seam.ui/plugin.xml 2007-08-03 04:33:28 UTC (rev 2877) @@ -13,10 +13,10 @@ class="org.jboss.tools.seam.ui.wizard.SeamProjectWizard" icon="icons/view/seam_project_new.gif" id="org.jboss.tools.seam.ui.wizards.SeamProjectWizard" - name="Seam Project" + name="Seam Web Project" project="true"> <description> - description body text + Create a Seam Web Project </description> <selection class="org.eclipse.core.resources.IResource"> @@ -25,11 +25,11 @@ <wizard category="org.jboss.tools.seam.ui" class="org.jboss.tools.seam.ui.wizard.SeamActionWizard" - icon="icons/view/component_new.gif" + icon="icons/seam16.png" id="org.jboss.tools.seam.ui.wizard.SeamActionWizard" name="Seam Action"> <description> - description body text + Create a Seam Action </description> <selection class="org.eclipse.core.resources.IResource"> @@ -38,11 +38,11 @@ <wizard category="org.jboss.tools.seam.ui" class="org.jboss.tools.seam.ui.wizard.SeamFormWizard" - icon="icons/view/component_new.gif" + icon="icons/seam16.png" id="org.jboss.tools.seam.ui.wizard2" name="Seam Form"> <description> - description body text + Create a Seam Form </description> <selection class="org.eclipse.core.resources.IResource"> 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-08-03 03:13:02 UTC (rev 2876) +++ trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/internal/project/facet/SeamInstallWizardPage.java 2007-08-03 04:33:28 UTC (rev 2877) @@ -10,21 +10,16 @@ ******************************************************************************/ package org.jboss.tools.seam.ui.internal.project.facet; -import java.beans.PropertyChangeEvent; -import java.beans.PropertyChangeListener; import java.util.ArrayList; import java.util.Arrays; import java.util.List; import org.eclipse.datatools.connectivity.ConnectionProfileException; import org.eclipse.datatools.connectivity.IConnectionProfile; -import org.eclipse.datatools.connectivity.IPropertySetChangeEvent; -import org.eclipse.datatools.connectivity.IPropertySetListener; import org.eclipse.datatools.connectivity.ProfileManager; import org.eclipse.datatools.connectivity.db.generic.IDBConnectionProfileConstants; import org.eclipse.datatools.connectivity.db.generic.ui.NewConnectionProfileWizard; import org.eclipse.datatools.connectivity.ui.dse.dialogs.ProfileSelectionComposite; -import org.eclipse.jdt.internal.core.SetVariablesOperation; import org.eclipse.jface.wizard.IWizard; import org.eclipse.jface.wizard.WizardDialog; import org.eclipse.jst.j2ee.project.facet.IJ2EEModuleFacetInstallDataModelProperties; @@ -35,11 +30,13 @@ import org.eclipse.swt.widgets.Display; import org.eclipse.swt.widgets.Group; import org.eclipse.ui.internal.dialogs.PropertyDialog; +import org.eclipse.wst.common.componentcore.datamodel.properties.IFacetDataModelProperties; import org.eclipse.wst.common.frameworks.datamodel.DataModelEvent; import org.eclipse.wst.common.frameworks.datamodel.IDataModel; import org.eclipse.wst.common.frameworks.datamodel.IDataModelListener; import org.eclipse.wst.common.project.facet.ui.AbstractFacetWizardPage; import org.eclipse.wst.common.project.facet.ui.IFacetWizardPage; +import org.eclipse.wst.web.ui.internal.wizards.NewProjectDataModelFacetWizard; import org.hibernate.eclipse.console.utils.DriverClassHelpers; import org.jboss.tools.seam.core.SeamCorePlugin; import org.jboss.tools.seam.core.project.facet.SeamFacetPreference; @@ -129,7 +126,7 @@ // Code generation group IFieldEditor sessionBeanPkgNameditor = IFieldEditorFactory.INSTANCE.createTextEditor( ISeamFacetDataModelProperties.SESION_BEAN_PACKAGE_NAME, - "Session Bean Package Name:","com.mydomain.projectname.session"); + "Session Bean Package Name:",""); IFieldEditor entityBeanPkgNameditor = IFieldEditorFactory.INSTANCE.createTextEditor( ISeamFacetDataModelProperties.ENTITY_BEAN_PACKAGE_NAME, "Entity Bean Package Name:","com.mydomain.projectname.entity"); @@ -143,7 +140,7 @@ public SeamInstallWizardPage() { super("Seam Facet"); setTitle("Seam Facet"); - setDescription("Seam Facest Description"); + setDescription("Configure Seam Facest Settings"); } /** @@ -192,6 +189,7 @@ */ public void createControl(Composite parent) { initializeDialogUnits(parent); + Composite root = new Composite(parent, SWT.NONE); GridData gd = new GridData(); @@ -251,6 +249,8 @@ validatorDelegate.addValidatorForProperty(jBossSeamHomeEditor.getName(), ValidatorFactory.JBOSS_SEAM_HOME_FOLDER_VALIDATOR); validatorDelegate.addValidatorForProperty(pathToJdbcDriverJar.getName(), ValidatorFactory.FILESYSTEM_FILE_EXISTS_VALIDATOR); validatorDelegate.addValidatorForProperty(connProfileSelEditor.getName(),ValidatorFactory.CONNECTION_PROFILE_IS_NOT_SELECTED); + setMessage(null); + setErrorMessage(null); } /** @@ -344,5 +344,15 @@ ((ITaggedFieldEditor)((CompositeEditor)connProfileSelEditor).getEditors().get(1)).setTags(getProfileNameList().toArray(new String[0])); } } + } + + @Override + public void setVisible(boolean visible) { + NewProjectDataModelFacetWizard wizard = (NewProjectDataModelFacetWizard)getWizard(); + IDataModel model = wizard.getDataModel(); + sessionBeanPkgNameditor.setValue("org.domain."+model.getProperty(IFacetDataModelProperties.FACET_PROJECT_NAME)+".session"); + entityBeanPkgNameditor.setValue("org.domain."+model.getProperty(IFacetDataModelProperties.FACET_PROJECT_NAME)+".entity"); + testsPkgNameditor.setValue("org.domain."+model.getProperty(IFacetDataModelProperties.FACET_PROJECT_NAME)+".test"); + super.setVisible(visible); }; } Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/widget/editor/TextFieldEditor.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/widget/editor/TextFieldEditor.java 2007-08-03 03:13:02 UTC (rev 2876) +++ trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/widget/editor/TextFieldEditor.java 2007-08-03 04:33:28 UTC (rev 2877) @@ -217,10 +217,13 @@ /** * */ - public void setValue(Object newWalue) { - fTextField.removePropertyChangeListener(this); - fTextField.getTextControl().setText(newWalue.toString()); - fTextField.addPropertyChangeListener(this); + public void setValue(Object newValue) { + super.setValue(newValue); + if(fTextField!=null){ + fTextField.removePropertyChangeListener(this); + fTextField.getTextControl().setText(newValue.toString()); + fTextField.addPropertyChangeListener(this); + } } /** 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-08-03 03:13:02 UTC (rev 2876) +++ trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/SeamProjectWizard.java 2007-08-03 04:33:28 UTC (rev 2877) @@ -51,7 +51,7 @@ protected IWizardPage createFirstPage() { IWizardPage page = super.createFirstPage(); page.setTitle("Seam Web Project"); - page.setDescription("TBD Description of wizard"); + page.setDescription("Create standalone Seam Web Project"); return page; } Added: trunk/seam/plugins/org.jboss.tools.seam.xml.ui/images/seam16.png =================================================================== (Binary files differ) Property changes on: trunk/seam/plugins/org.jboss.tools.seam.xml.ui/images/seam16.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Modified: trunk/seam/plugins/org.jboss.tools.seam.xml.ui/plugin.xml =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.xml.ui/plugin.xml 2007-08-03 03:13:02 UTC (rev 2876) +++ trunk/seam/plugins/org.jboss.tools.seam.xml.ui/plugin.xml 2007-08-03 04:33:28 UTC (rev 2877) @@ -3,17 +3,18 @@ <plugin> <extension point="org.eclipse.ui.newWizards"> - <category id="org.jboss.tools.seam" name="Seam" parentCategory="org.jboss.tools.jst.web"> - </category> <wizard - category="org.jboss.tools.jst.web/org.jboss.tools.shale" + category="org.jboss.tools.seam.ui" class="org.jboss.tools.seam.xml.ui.wizard.newfile.NewSeamComponentsFileWizard" - icon="images/xstudio/wizards/seam-components.gif" + icon="images/seam16.png" id="org.jboss.tools.seam.xml.ui.wizard.newfile.NewSeamComponentsFileWizard" name="Seam Components File" project="false"> <selection class="org.eclipse.core.resources.IResource"> </selection> + <description> + Create a Seam Components XM LFile + </description> </wizard> </extension> @@ -34,4 +35,4 @@ class="org.jboss.tools.seam.xml.ui.editor.form.core.SeamComponentsCoreFormLayoutData"/> </extension> -</plugin> \ No newline at end of file +</plugin>