diff options
| author | cbridgha | 2006-06-07 21:58:09 +0000 |
|---|---|---|
| committer | cbridgha | 2006-06-07 21:58:09 +0000 |
| commit | 04e72c0ee895d9beb41990bce341dc78e08af880 (patch) | |
| tree | bc0b914e7a3cf4fd9018eb5b0968d81364feaf17 /plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee | |
| parent | ed47325fa83e09475c943512960126f2e4f86cb8 (diff) | |
| download | webtools.javaee-04e72c0ee895d9beb41990bce341dc78e08af880.tar.gz webtools.javaee-04e72c0ee895d9beb41990bce341dc78e08af880.tar.xz webtools.javaee-04e72c0ee895d9beb41990bce341dc78e08af880.zip | |
[145166] better webcontext defalts
Diffstat (limited to 'plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee')
| -rw-r--r-- | plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/internal/earcreation/DefaultJ2EEComponentCreationDataModelProvider.java | 49 |
1 files changed, 28 insertions, 21 deletions
diff --git a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/internal/earcreation/DefaultJ2EEComponentCreationDataModelProvider.java b/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/internal/earcreation/DefaultJ2EEComponentCreationDataModelProvider.java index 4f7f3446f..d0025bfa0 100644 --- a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/internal/earcreation/DefaultJ2EEComponentCreationDataModelProvider.java +++ b/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/internal/earcreation/DefaultJ2EEComponentCreationDataModelProvider.java @@ -21,6 +21,7 @@ import org.eclipse.jst.j2ee.application.internal.operations.DefaultJ2EEComponent import org.eclipse.jst.j2ee.applicationclient.internal.creation.AppClientFacetProjectCreationDataModelProvider; import org.eclipse.jst.j2ee.internal.J2EEVersionConstants; import org.eclipse.jst.j2ee.internal.common.J2EEVersionUtil; +import org.eclipse.jst.j2ee.internal.common.operations.INewJavaClassDataModelProperties; import org.eclipse.jst.j2ee.internal.moduleextension.EarModuleManager; import org.eclipse.jst.j2ee.internal.moduleextension.EjbModuleExtension; import org.eclipse.jst.j2ee.internal.moduleextension.JcaModuleExtension; @@ -32,8 +33,10 @@ import org.eclipse.wst.common.componentcore.datamodel.properties.IFacetDataModel import org.eclipse.wst.common.componentcore.datamodel.properties.IFacetProjectCreationDataModelProperties; import org.eclipse.wst.common.componentcore.datamodel.properties.IFacetProjectCreationDataModelProperties.FacetDataModelMap; import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelProvider; +import org.eclipse.wst.common.frameworks.datamodel.DataModelEvent; import org.eclipse.wst.common.frameworks.datamodel.DataModelFactory; import org.eclipse.wst.common.frameworks.datamodel.IDataModel; +import org.eclipse.wst.common.frameworks.datamodel.IDataModelListener; import org.eclipse.wst.common.frameworks.datamodel.IDataModelOperation; import org.eclipse.wst.common.frameworks.internal.WTPPlugin; import org.eclipse.wst.common.frameworks.internal.plugin.WTPCommonMessages; @@ -299,34 +302,38 @@ public class DefaultJ2EEComponentCreationDataModelProvider extends AbstractDataM * @see org.eclipse.wst.common.frameworks.internal.operation.WTPOperationDataModel#doValidateProperty(java.lang.String) */ public IStatus validate(String propertyName) { - if (propertyName.equals(APPCLIENT_COMPONENT_NAME)) { - return validateComponentName(getStringProperty(APPCLIENT_COMPONENT_NAME)); + + if (getBooleanProperty(CREATE_APPCLIENT) && propertyName.equals(APPCLIENT_COMPONENT_NAME)) { + return clientModel.validateProperty(IFacetProjectCreationDataModelProperties.FACET_PROJECT_NAME); } - if (propertyName.equals(WEB_COMPONENT_NAME)) { - return validateComponentName(getStringProperty(WEB_COMPONENT_NAME)); + + if (getBooleanProperty(CREATE_WEB) && propertyName.equals(WEB_COMPONENT_NAME)) { + return webModel.validateProperty(IFacetProjectCreationDataModelProperties.FACET_PROJECT_NAME); } - if (propertyName.equals(EJB_COMPONENT_NAME)) { - return validateComponentName(getStringProperty(EJB_COMPONENT_NAME)); + + if (getBooleanProperty(CREATE_EJB) && propertyName.equals(EJB_COMPONENT_NAME)) { + return ejbModel.validateProperty(IFacetProjectCreationDataModelProperties.FACET_PROJECT_NAME); } - if (propertyName.equals(CONNECTOR_COMPONENT_NAME)) { - return validateComponentName(getStringProperty(CONNECTOR_COMPONENT_NAME)); + + if (getBooleanProperty(CREATE_CONNECTOR) && propertyName.equals(CONNECTOR_COMPONENT_NAME)) { + return jcaModel.validateProperty(IFacetProjectCreationDataModelProperties.FACET_PROJECT_NAME); } return super.validate(propertyName); } - private IStatus validateComponentName(String componentName) { - IStatus status = OK_STATUS; - if (status.isOK()) { - if (componentName.indexOf("#") != -1) { //$NON-NLS-1$ - String errorMessage = WTPCommonPlugin.getResourceString(WTPCommonMessages.ERR_INVALID_CHARS); - return WTPCommonPlugin.createErrorStatus(errorMessage); - } else if (componentName == null || componentName.equals("")) { //$NON-NLS-1$ - String errorMessage = WTPCommonPlugin.getResourceString(WTPCommonMessages.ERR_EMPTY_MODULE_NAME); - return WTPCommonPlugin.createErrorStatus(errorMessage); - } - } - return status; - } +// private IStatus validateComponentName(String componentName) { +// IStatus status = OK_STATUS; +// if (status.isOK()) { +// if (componentName.indexOf("#") != -1) { //$NON-NLS-1$ +// String errorMessage = WTPCommonPlugin.getResourceString(WTPCommonMessages.ERR_INVALID_CHARS); +// return WTPCommonPlugin.createErrorStatus(errorMessage); +// } else if (componentName == null || componentName.equals("")) { //$NON-NLS-1$ +// String errorMessage = WTPCommonPlugin.getResourceString(WTPCommonMessages.ERR_EMPTY_MODULE_NAME); +// return WTPCommonPlugin.createErrorStatus(errorMessage); +// } +// } +// return status; +// } private void setDefaultNestedComponentName(String name, int flag) { IDataModel modModule = getNestedModel(flag); |