Author: dgolovin
Date: 2007-10-26 17:47:04 -0400 (Fri, 26 Oct 2007)
New Revision: 4547
Modified:
trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/SeamConversationWizard.java
trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/SeamConversationWizardPage1.java
trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/SeamFormWizard.java
Log:
http://jira.jboss.com/jira/browse/JBIDE-1027
fixed. ConversationJavaBean.java template is used to create new Conversation in WAR
deployment configuration
Modified:
trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/SeamConversationWizard.java
===================================================================
---
trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/SeamConversationWizard.java 2007-10-26
20:56:27 UTC (rev 4546)
+++
trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/SeamConversationWizard.java 2007-10-26
21:47:04 UTC (rev 4547)
@@ -65,12 +65,9 @@
static {
// initialize war files mapping
ACTION_WAR_MAPPING.add(new String[]{
- "${" + ISeamFacetDataModelProperties.JBOSS_SEAM_HOME +
"}/seam-gen/src/ConversationBean.java", //$NON-NLS-1$ //$NON-NLS-2$
+ "${" + ISeamFacetDataModelProperties.JBOSS_SEAM_HOME +
"}/seam-gen/src/ConversationJavaBean.java", //$NON-NLS-1$ //$NON-NLS-2$
"${" + IParameter.SEAM_PROJECT_LOCATION_PATH + "}/src/action/${"
+ ISeamFacetDataModelProperties.SESION_BEAN_PACKAGE_PATH + "}/${" +
IParameter.SEAM_BEAN_NAME +"}.java"}); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
//$NON-NLS-4$
ACTION_WAR_MAPPING.add(new String[]{
- "${" + ISeamFacetDataModelProperties.JBOSS_SEAM_HOME +
"}/seam-gen/src/Conversation.java", //$NON-NLS-1$ //$NON-NLS-2$
- "${" + IParameter.SEAM_PROJECT_LOCATION_PATH + "}/src/action/${"
+ ISeamFacetDataModelProperties.SESION_BEAN_PACKAGE_PATH + "}/${" +
IParameter.SEAM_LOCAL_INTERFACE_NAME +"}.java"}); //$NON-NLS-1$ //$NON-NLS-2$
//$NON-NLS-3$ //$NON-NLS-4$
- ACTION_WAR_MAPPING.add(new String[]{
"${" + ISeamFacetDataModelProperties.JBOSS_SEAM_HOME +
"}/seam-gen/view/conversation.xhtml", //$NON-NLS-1$ //$NON-NLS-2$
"${" + IParameter.SEAM_PROJECT_WEBCONTENT_PATH + "}/${" +
IParameter.SEAM_PAGE_NAME +"}.xhtml"}); //$NON-NLS-1$ //$NON-NLS-2$
//$NON-NLS-3$
@@ -81,7 +78,7 @@
ACTION_EAR_MAPPING.add(new String[]{
"${" + ISeamFacetDataModelProperties.JBOSS_SEAM_HOME +
"}/seam-gen/src/Conversation.java", //$NON-NLS-1$ //$NON-NLS-2$
"${" + IParameter.SEAM_EJB_PROJECT_LOCATION_PATH +
"}/ejbModule/${" + ISeamFacetDataModelProperties.SESION_BEAN_PACKAGE_PATH +
"}/${" + IParameter.SEAM_LOCAL_INTERFACE_NAME +"}.java"});
//$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
- ACTION_EAR_MAPPING.add(ACTION_WAR_MAPPING.get(2));
+ ACTION_EAR_MAPPING.add(ACTION_WAR_MAPPING.get(1));
}
/*
Modified:
trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/SeamConversationWizardPage1.java
===================================================================
---
trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/SeamConversationWizardPage1.java 2007-10-26
20:56:27 UTC (rev 4546)
+++
trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/SeamConversationWizardPage1.java 2007-10-26
21:47:04 UTC (rev 4547)
@@ -30,29 +30,6 @@
setMessage(getDefaultMessageText());
}
- /**
- * @see
org.eclipse.jface.dialogs.IDialogPage#createControl(org.eclipse.swt.widgets.Composite)
- */
- @Override
- public void createControl(Composite parent) {
- setControl(new GridLayoutComposite(parent));
-
- if (!"".equals(editorRegistry.get(IParameter.SEAM_PROJECT_NAME).getValue())){
- Map errors = ValidatorFactory.SEAM_PROJECT_NAME_VALIDATOR.validate(
- getEditor(IParameter.SEAM_PROJECT_NAME).getValue(), null);
-
- if(errors.size()>0) {
- setErrorMessage(errors.get(IValidator.DEFAULT_ERROR).toString());
- getEditor(IParameter.SEAM_BEAN_NAME).setEnabled(false);
- }
- } else {
- if(getEditor(IParameter.SEAM_PACKAGE_NAME)!=null) {
- getEditor(IParameter.SEAM_PACKAGE_NAME).setEnabled(false);
- }
- }
- setPageComplete(false);
- }
-
/* (non-Javadoc)
* @see org.jboss.tools.seam.ui.wizard.SeamBaseWizardPage#getDefaultMessageText()
*/
Modified:
trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/SeamFormWizard.java
===================================================================
---
trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/SeamFormWizard.java 2007-10-26
20:56:27 UTC (rev 4546)
+++
trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/SeamFormWizard.java 2007-10-26
21:47:04 UTC (rev 4547)
@@ -53,22 +53,6 @@
super(SeamUIMessages.SEAM_FORM_WIZARD_FORM_CREATING_OPERATION);
}
- public File getBeanFile(Map<String, Object> vars) {
- return new File(getSeamFolder(vars),"src/FormActionJavaBean.java");
//$NON-NLS-1$
- }
-
- public File getTestClassFile(Map<String, Object> vars) {
- return new File(getSeamFolder(vars),"test/FormTest.java"); //$NON-NLS-1$
- }
-
- public File getTestngXmlFile(Map<String, Object> vars) {
- return new File(getSeamFolder(vars),"test/testng.xml"); //$NON-NLS-1$
- }
-
- public File getPageXhtml(Map<String, Object> vars) {
- return new File(getSeamFolder(vars),"view/form.xhtml"); //$NON-NLS-1$
- }
-
/* (non-Javadoc)
* @see
org.jboss.tools.seam.ui.wizard.SeamBaseOperation#getFileMappings(java.util.Map)
*/