[jbosstools-commits] JBoss Tools SVN: r2949 - in trunk/seam/plugins: org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/internal/project/facet and 1 other directory.

Author: dgolovin Date: 2007-08-07 21:40:53 -0400 (Tue, 07 Aug 2007) New Revision: 2949 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/WtpUtils.java trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/internal/project/facet/DataModelSynchronizer.java trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/internal/project/facet/DataModelValidatorDelegate.java trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/internal/project/facet/IValidator.java 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/ValidatorFactory.java Log: http://jira.jboss.org/jira/browse/JBIDE-643 Java comments where added Typo mentione on JBoss Tools Forum is fixed 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-07 21:48:36 UTC (rev 2948) +++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/SeamFacetInstallDelegete.java 2007-08-08 01:40:53 UTC (rev 2949) @@ -313,13 +313,12 @@ protected IStatus run(IProgressMonitor monitor) { IProject ear = WtpUtils.createEclipseProject(model.getProperty(ISeamFacetDataModelProperties.SEAM_PROJECT_NAME)+"-ear", monitor); - - try { + IProject ejb = WtpUtils.createEclipseProject(model.getProperty(ISeamFacetDataModelProperties.SEAM_PROJECT_NAME)+"-ejb", monitor); try { FilterSet filterSet = new FilterSet(); filterSet.addFilter("projectName", project.getName()); - filterSet.addFilter("runtimeName", WtpUtils.getServerRuntimename(project)); + filterSet.addFilter("runtimeName", WtpUtils.getServerRuntimeName(project)); - IProject ejb = WtpUtils.createEclipseProject(model.getProperty(ISeamFacetDataModelProperties.SEAM_PROJECT_NAME)+"-ejb", monitor); + AntCopyUtils.copyFilesAndFolders( new File(SeamFacetInstallDataModelProvider.getTemplatesFolder(),"ejb"), @@ -362,7 +361,6 @@ new File(ejb.getLocation().toFile(),ejb.getName()+".launch"), new FilterSetCollection(projectFilterSet), true); - ejb.refreshLocal(IResource.DEPTH_INFINITE, monitor); File earContentsFolder = new File(ear.getLocation().toFile(),"EarContent"); File earContentsMetaInfFolder = new File(earContentsFolder,"META-INF"); @@ -387,14 +385,17 @@ AntCopyUtils.copyFiles(seamGenResFolder,earContentsFolder,new AntCopyUtils.FileSetFileFilter(new AntCopyUtils.FileSet(JBOSS_EAR_CONTENT).dir(seamGenResFolder))); // Copy JDBC driver if there is any - AntCopyUtils.copyFiles((String[])model.getProperty(ISeamFacetDataModelProperties.JDBC_DRIVER_JAR_PATH), earContentsFolder); - - ear.refreshLocal(IResource.DEPTH_INFINITE, monitor); - + if(model.getProperty(ISeamFacetDataModelProperties.JDBC_DRIVER_JAR_PATH)!=null) + AntCopyUtils.copyFiles((String[])model.getProperty(ISeamFacetDataModelProperties.JDBC_DRIVER_JAR_PATH), earContentsFolder); } catch (IOException e) { SeamCorePlugin.getPluginLog().logError(e); - } catch (CoreException e) { - SeamCorePlugin.getPluginLog().logError(e); + } finally { + try { + ejb.refreshLocal(IResource.DEPTH_INFINITE, monitor); + ear.refreshLocal(IResource.DEPTH_INFINITE, monitor); + } catch(CoreException e) { + SeamCorePlugin.getPluginLog().logError(e); + } } return Status.OK_STATUS; } Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/WtpUtils.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/WtpUtils.java 2007-08-07 21:48:36 UTC (rev 2948) +++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/WtpUtils.java 2007-08-08 01:40:53 UTC (rev 2949) @@ -97,7 +97,7 @@ } } - public static String getServerRuntimename(IProject project) { + public static String getServerRuntimeName(IProject project) { IJavaProject javaProject = JavaCore.create(project); if(javaProject!=null) { Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/internal/project/facet/DataModelSynchronizer.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/internal/project/facet/DataModelSynchronizer.java 2007-08-07 21:48:36 UTC (rev 2948) +++ trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/internal/project/facet/DataModelSynchronizer.java 2007-08-08 01:40:53 UTC (rev 2949) @@ -19,31 +19,34 @@ import org.jboss.tools.seam.ui.widget.editor.IFieldEditor; /** - * + * It is intended to collect all changes from Wizard Page and put it to + * IDataModel instance behind it. * @author eskimo * */ public class DataModelSynchronizer implements PropertyChangeListener { /** - * + * Target IDataModel instance */ protected IDataModel model; /** - * + * Map allows get particular IFieldEditor instance by its name. + * It is used by register(IFieldEditor) method. */ Map<String,IFieldEditor> editors = new HashMap<String,IFieldEditor>(); /** * - * @param model + * @param model is a target IDataModel instance */ public DataModelSynchronizer(IDataModel model) { this.model = model; } /** - * + * This class implements PropertyChangeListener interface from Java Beans + * API to receive property change events from registered IFieldEditors. */ public void propertyChange(PropertyChangeEvent evt) { model.setProperty(evt.getPropertyName(), evt.getNewValue()); @@ -51,16 +54,17 @@ /** * - * @param name - * @return + * @param name - name of property from IDataModel instance + * @return IFieldEditor used to edit property with given name */ public IFieldEditor getNamedElement(String name) { return editors.get(name); } /** - * - * @param editor + * Registers a editor used to edit IDataModel property. + * The name of editor and model property should be the same. + * @param editor - instance of IFiedEditor placed on IWizardPage */ public void register(IFieldEditor editor) { editors.put(editor.getName(), editor); Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/internal/project/facet/DataModelValidatorDelegate.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/internal/project/facet/DataModelValidatorDelegate.java 2007-08-07 21:48:36 UTC (rev 2948) +++ trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/internal/project/facet/DataModelValidatorDelegate.java 2007-08-08 01:40:53 UTC (rev 2949) @@ -20,24 +20,27 @@ import org.eclipse.wst.common.frameworks.datamodel.IDataModelListener; /** + * Delegate class used during validation process in wizard dialog. It contains + * map from property name to IValidator instance. It is triggered by property + * change event from any registered property editor + * * @author eskimo * */ public class DataModelValidatorDelegate implements IDataModelListener { /** - * + * Target IDataModel instance */ protected IDataModel model = null; - /** - * + * WizardPage instance that should be validated */ protected WizardPage page = null; /** - * + * Map from property name to IValidator instance */ protected Map<String,IValidator> mapPropToValidator = new HashMap<String,IValidator>(); Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/internal/project/facet/IValidator.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/internal/project/facet/IValidator.java 2007-08-07 21:48:36 UTC (rev 2948) +++ trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/internal/project/facet/IValidator.java 2007-08-08 01:40:53 UTC (rev 2949) @@ -15,7 +15,7 @@ import org.eclipse.core.runtime.IAdaptable; /** - * + * Simple validator interface * @author eskimo * */ @@ -24,10 +24,10 @@ public static final String DEFAULT_ERROR = "default.error"; /** - * - * @param value - * @param context - * @return + * Method perform validation of given value against a provided context. + * @param value - an object that should be validated against context + * @param context - a contextual data that can be used during validation + * @return map from editor name to error text */ Map<String,String> validate(Object value, Object context); } 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-07 21:48:36 UTC (rev 2948) +++ trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/internal/project/facet/SeamInstallWizardPage.java 2007-08-08 01:40:53 UTC (rev 2949) @@ -7,7 +7,7 @@ * * Contributors: * Exadel, Inc. and Red Hat, Inc. - initial API and implementation - ******************************************************************************/ + ******************************************************************************/ package org.jboss.tools.seam.ui.internal.project.facet; import java.util.ArrayList; @@ -51,108 +51,139 @@ /** * @author eskimo - * + * */ -public class SeamInstallWizardPage extends AbstractFacetWizardPage implements IFacetWizardPage, IDataModelListener{ +public class SeamInstallWizardPage extends AbstractFacetWizardPage implements + IFacetWizardPage, IDataModelListener { /** + * + */ + boolean seamHomeRequiresSave = SeamFacetPreference.getStringPreference(SeamFacetPreference.SEAM_HOME_FOLDER).equals(""); + /** * */ DriverClassHelpers HIBERNATE_HELPER = new DriverClassHelpers(); - + /** * */ IDataModel model = null; - + /** * */ DataModelValidatorDelegate validatorDelegate; - - IFieldEditor jBossSeamHomeEditor = IFieldEditorFactory.INSTANCE.createBrowseFolderEditor( - ISeamFacetDataModelProperties.JBOSS_SEAM_HOME, - "JBoss Seam Home Folder:",SeamFacetPreference.getStringPreference(SeamFacetPreference.SEAM_HOME_FOLDER)); - boolean seamHomeRequiresSave = SeamFacetPreference.getStringPreference(SeamFacetPreference.SEAM_HOME_FOLDER).equals(""); - - IFieldEditor jBossAsDeployAsEditor = IFieldEditorFactory.INSTANCE.createComboEditor( - ISeamFacetDataModelProperties.JBOSS_AS_DEPLOY_AS, - "Deploy as:",Arrays.asList(new String[]{"war","ear"}),"war",false); - + IFieldEditor jBossSeamHomeEditor = IFieldEditorFactory.INSTANCE + .createBrowseFolderEditor( + ISeamFacetDataModelProperties.JBOSS_SEAM_HOME, + "JBoss Seam Home Folder:", + SeamFacetPreference + .getStringPreference(SeamFacetPreference.SEAM_HOME_FOLDER)); + IFieldEditor jBossAsDeployAsEditor = IFieldEditorFactory.INSTANCE + .createComboEditor( + ISeamFacetDataModelProperties.JBOSS_AS_DEPLOY_AS, + "Deploy as:", Arrays.asList(new String[] { "war", "ear" }), + "war", false); + String lastCreatedCPName = ""; - + // Database group - IFieldEditor connProfileSelEditor = IFieldEditorFactory.INSTANCE.createComboWithTwoButtons( - ISeamFacetDataModelProperties.SEAM_CONNECTION_PROFILE, "Connection profile", - getProfileNameList(), "", true, - new EditConnectionProfileAction(), - new NewConnectionProfileAction(), - ValidatorFactory.NO_ERRORS_VALIDATOR); - IFieldEditor jBossAsDbTypeEditor = IFieldEditorFactory.INSTANCE.createComboEditor( - ISeamFacetDataModelProperties.DB_TYPE, - "Database Type:",Arrays.asList(HIBERNATE_HELPER.getDialectNames()),"HSQL",true); - IFieldEditor jBossHibernateDialectEditor = IFieldEditorFactory.INSTANCE.createUneditableTextEditor( - ISeamFacetDataModelProperties.HIBERNATE_DIALECT, - "Hibernate Dialect:",HIBERNATE_HELPER.getDialectClass("HSQL")); - - ITaggedFieldEditor jdbcDriverClassname = IFieldEditorFactory.INSTANCE.createComboEditor( - ISeamFacetDataModelProperties.JDBC_DRIVER_CLASS_NAME, - "JDBC Driver Class for Your Database:",Arrays.asList(HIBERNATE_HELPER.getDriverClasses(HIBERNATE_HELPER.getDialectClass("HSQL"))),HIBERNATE_HELPER.getDriverClasses(HIBERNATE_HELPER.getDialectClass("HSQL"))[0]); - ITaggedFieldEditor jdbcUrlForDb = IFieldEditorFactory.INSTANCE.createComboEditor( - ISeamFacetDataModelProperties.JDBC_URL_FOR_DB, - "JDBC Url for Your Database:", - Arrays.asList(HIBERNATE_HELPER.getConnectionURLS(HIBERNATE_HELPER.getDriverClasses( - HIBERNATE_HELPER.getDialectClass("HSQL"))[0])), - HIBERNATE_HELPER.getConnectionURLS(HIBERNATE_HELPER.getDriverClasses(HIBERNATE_HELPER.getDialectClass("HSQL"))[0])[0].replace("<", "").replace(">", "")); + IFieldEditor connProfileSelEditor = IFieldEditorFactory.INSTANCE + .createComboWithTwoButtons( + ISeamFacetDataModelProperties.SEAM_CONNECTION_PROFILE, + "Connection profile", getProfileNameList(), "", true, + new EditConnectionProfileAction(), + new NewConnectionProfileAction(), + ValidatorFactory.NO_ERRORS_VALIDATOR); + IFieldEditor jBossAsDbTypeEditor = IFieldEditorFactory.INSTANCE + .createComboEditor(ISeamFacetDataModelProperties.DB_TYPE, + "Database Type:", Arrays.asList(HIBERNATE_HELPER + .getDialectNames()), "HSQL", true); + IFieldEditor jBossHibernateDialectEditor = IFieldEditorFactory.INSTANCE + .createUneditableTextEditor( + ISeamFacetDataModelProperties.HIBERNATE_DIALECT, + "Hibernate Dialect:", HIBERNATE_HELPER + .getDialectClass("HSQL")); + + ITaggedFieldEditor jdbcDriverClassname = IFieldEditorFactory.INSTANCE + .createComboEditor( + ISeamFacetDataModelProperties.JDBC_DRIVER_CLASS_NAME, + "JDBC Driver Class for Your Database:", Arrays + .asList(HIBERNATE_HELPER + .getDriverClasses(HIBERNATE_HELPER + .getDialectClass("HSQL"))), + HIBERNATE_HELPER.getDriverClasses(HIBERNATE_HELPER + .getDialectClass("HSQL"))[0]); + ITaggedFieldEditor jdbcUrlForDb = IFieldEditorFactory.INSTANCE + .createComboEditor(ISeamFacetDataModelProperties.JDBC_URL_FOR_DB, + "JDBC Url for Your Database:", + Arrays.asList(HIBERNATE_HELPER + .getConnectionURLS(HIBERNATE_HELPER + .getDriverClasses(HIBERNATE_HELPER + .getDialectClass("HSQL"))[0])), + HIBERNATE_HELPER.getConnectionURLS(HIBERNATE_HELPER + .getDriverClasses(HIBERNATE_HELPER + .getDialectClass("HSQL"))[0])[0].replace( + "<", "").replace(">", "")); IFieldEditor dbUserName = IFieldEditorFactory.INSTANCE.createTextEditor( - ISeamFacetDataModelProperties.DB_USER_NAME, - "Database User Name:", "username"); - IFieldEditor dbUserPassword = IFieldEditorFactory.INSTANCE.createTextEditor( - ISeamFacetDataModelProperties.DB_USERP_PASSWORD, - "User Password:", "password"); + ISeamFacetDataModelProperties.DB_USER_NAME, "Database User Name:", + "username"); + IFieldEditor dbUserPassword = IFieldEditorFactory.INSTANCE + .createTextEditor(ISeamFacetDataModelProperties.DB_USERP_PASSWORD, + "User Password:", "password"); IFieldEditor dbSchemaName = IFieldEditorFactory.INSTANCE.createTextEditor( - ISeamFacetDataModelProperties.DB_SCHEMA_NAME, + ISeamFacetDataModelProperties.DB_SCHEMA_NAME, "Database Schema Name:", ""); IFieldEditor dbCatalogName = IFieldEditorFactory.INSTANCE.createTextEditor( - ISeamFacetDataModelProperties.DB_CATALOG_NAME, + ISeamFacetDataModelProperties.DB_CATALOG_NAME, "Database Catalog Name:", ""); - IFieldEditor dbTablesExists = IFieldEditorFactory.INSTANCE.createCheckboxEditor( - ISeamFacetDataModelProperties. DB_ALREADY_EXISTS, - "DB Tables already exists in database:", false); - IFieldEditor recreateTablesOnDeploy = IFieldEditorFactory.INSTANCE.createCheckboxEditor( - ISeamFacetDataModelProperties.RECREATE_TABLES_AND_DATA_ON_DEPLOY, - "Recreate database tables and data on deploy:", false); - IFieldEditor pathToJdbcDriverJar = IFieldEditorFactory.INSTANCE.createBrowseFileEditor( - ISeamFacetDataModelProperties. JDBC_DRIVER_JAR_PATH, - "JDBC Driver jar:", ""); - + IFieldEditor dbTablesExists = IFieldEditorFactory.INSTANCE + .createCheckboxEditor( + ISeamFacetDataModelProperties.DB_ALREADY_EXISTS, + "DB Tables already exists in database:", false); + IFieldEditor recreateTablesOnDeploy = IFieldEditorFactory.INSTANCE + .createCheckboxEditor( + ISeamFacetDataModelProperties.RECREATE_TABLES_AND_DATA_ON_DEPLOY, + "Recreate database tables and data on deploy:", false); + IFieldEditor pathToJdbcDriverJar = IFieldEditorFactory.INSTANCE + .createBrowseFileEditor( + ISeamFacetDataModelProperties.JDBC_DRIVER_JAR_PATH, + "JDBC Driver jar:", ""); + // Code generation group - IFieldEditor sessionBeanPkgNameditor = IFieldEditorFactory.INSTANCE.createTextEditor( - ISeamFacetDataModelProperties.SESION_BEAN_PACKAGE_NAME, - "Session Bean Package Name:",""); - IFieldEditor entityBeanPkgNameditor = IFieldEditorFactory.INSTANCE.createTextEditor( - ISeamFacetDataModelProperties.ENTITY_BEAN_PACKAGE_NAME, - "Entity Bean Package Name:","com.mydomain.projectname.entity"); - IFieldEditor testsPkgNameditor = IFieldEditorFactory.INSTANCE.createTextEditor( - ISeamFacetDataModelProperties.TEST_CASES_PACKAGE_NAME, - "Session Bean Package Name:","com.mydomain.projectname.test"); - + IFieldEditor sessionBeanPkgNameditor = IFieldEditorFactory.INSTANCE + .createTextEditor( + ISeamFacetDataModelProperties.SESION_BEAN_PACKAGE_NAME, + "Session Bean Package Name:", ""); + IFieldEditor entityBeanPkgNameditor = IFieldEditorFactory.INSTANCE + .createTextEditor( + ISeamFacetDataModelProperties.ENTITY_BEAN_PACKAGE_NAME, + "Entity Bean Package Name:", + "com.mydomain.projectname.entity"); + IFieldEditor testsPkgNameditor = IFieldEditorFactory.INSTANCE + .createTextEditor( + ISeamFacetDataModelProperties.TEST_CASES_PACKAGE_NAME, + "Test Package Name:", + "com.mydomain.projectname.test"); + /** * */ public SeamInstallWizardPage() { super("Seam Facet"); setTitle("Seam Facet"); - setImageDescriptor(ImageDescriptor.createFromFile(SeamFormWizard.class, "SeamWebProjectWizBan.png")); + setImageDescriptor(ImageDescriptor.createFromFile(SeamFormWizard.class, + "SeamWebProjectWizBan.png")); setDescription("Configure Seam Facest Settings"); } - + /** * */ private DataModelSynchronizer sync; - + /** * */ @@ -160,17 +191,16 @@ public void setWizard(IWizard newWizard) { super.setWizard(newWizard); } - + /** * */ public void setConfig(Object config) { - model = (IDataModel)config; + model = (IDataModel) config; sync = new DataModelSynchronizer(model); - validatorDelegate = new DataModelValidatorDelegate(model,this); model.addListener(this); } - + /** * Finish has been pressed. */ @@ -183,81 +213,81 @@ /** - * + * Registers editor in data synchronizer and put SWT controls for it at + * wizard page. * @param editor * @param parent * @param columns */ - public void registerEditor(IFieldEditor editor,Composite parent,int columns) { + protected void registerEditor(IFieldEditor editor, Composite parent, + int columns) { sync.register(editor); editor.doFillIntoGrid(parent); } - + /** - * + * Creates Seam Facet Wizard Page contents */ public void createControl(Composite parent) { initializeDialogUnits(parent); - + Composite root = new Composite(parent, SWT.NONE); GridData gd = new GridData(); - - gd.horizontalSpan = 1; - gd.horizontalAlignment = GridData.FILL; - gd.grabExcessHorizontalSpace = true; - gd.grabExcessVerticalSpace = false; + gd.horizontalSpan = 1; + gd.horizontalAlignment = GridData.FILL; + gd.grabExcessHorizontalSpace = true; + gd.grabExcessVerticalSpace = false; + GridLayout gridLayout = new GridLayout(1, false); root.setLayout(gridLayout); - Group generalGroup = new Group(root,SWT.NONE); + Group generalGroup = new Group(root, SWT.NONE); generalGroup.setLayoutData(gd); generalGroup.setText("General"); gridLayout = new GridLayout(3, false); - + generalGroup.setLayout(gridLayout); - registerEditor(jBossSeamHomeEditor,generalGroup, 3); - registerEditor(jBossAsDeployAsEditor,generalGroup, 3); - + registerEditor(jBossSeamHomeEditor, generalGroup, 3); + registerEditor(jBossAsDeployAsEditor, generalGroup, 3); + gd = new GridData(); - gd.horizontalSpan = 1; - gd.horizontalAlignment = GridData.FILL; - gd.grabExcessHorizontalSpace = true; - gd.grabExcessVerticalSpace = false; - - Group databaseGroup = new Group(root,SWT.NONE); + gd.horizontalSpan = 1; + gd.horizontalAlignment = GridData.FILL; + gd.grabExcessHorizontalSpace = true; + gd.grabExcessVerticalSpace = false; + + Group databaseGroup = new Group(root, SWT.NONE); databaseGroup.setLayoutData(gd); databaseGroup.setText("Database"); gridLayout = new GridLayout(4, false); databaseGroup.setLayout(gridLayout); - registerEditor(jBossAsDbTypeEditor,databaseGroup, 4); - registerEditor(jBossHibernateDialectEditor,databaseGroup, 4); - registerEditor(connProfileSelEditor,databaseGroup,4); - registerEditor(dbSchemaName,databaseGroup, 4); - registerEditor(dbCatalogName,databaseGroup, 4); - registerEditor(dbTablesExists,databaseGroup, 4); - registerEditor(recreateTablesOnDeploy,databaseGroup, 4); - //registerEditor(pathToJdbcDriverJar,databaseGroup, 4); + registerEditor(jBossAsDbTypeEditor, databaseGroup, 4); + registerEditor(jBossHibernateDialectEditor, databaseGroup, 4); + registerEditor(connProfileSelEditor, databaseGroup, 4); + registerEditor(dbSchemaName, databaseGroup, 4); + registerEditor(dbCatalogName, databaseGroup, 4); + registerEditor(dbTablesExists, databaseGroup, 4); + registerEditor(recreateTablesOnDeploy, databaseGroup, 4); + // registerEditor(pathToJdbcDriverJar,databaseGroup, 4); - Group generationGroup = new Group(root,SWT.NONE); + Group generationGroup = new Group(root, SWT.NONE); gd = new GridData(); - gd.horizontalSpan = 1; - gd.horizontalAlignment = GridData.FILL; - gd.grabExcessHorizontalSpace = true; - gd.grabExcessVerticalSpace = false; - + gd.horizontalSpan = 1; + gd.horizontalAlignment = GridData.FILL; + gd.grabExcessHorizontalSpace = true; + gd.grabExcessVerticalSpace = false; + generationGroup.setLayoutData(gd); generationGroup.setText("Code Generation"); gridLayout = new GridLayout(3, false); generationGroup.setLayout(gridLayout); - registerEditor(sessionBeanPkgNameditor,generationGroup, 3); - registerEditor(entityBeanPkgNameditor,generationGroup, 3); - registerEditor(testsPkgNameditor,generationGroup, 3); - + registerEditor(sessionBeanPkgNameditor, generationGroup, 3); + registerEditor(entityBeanPkgNameditor, generationGroup, 3); + registerEditor(testsPkgNameditor, generationGroup, 3); + setControl(root); - - 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); } @@ -266,27 +296,32 @@ * */ public void propertyChanged(DataModelEvent event) { - if(event.getPropertyName().equals(IJ2EEModuleFacetInstallDataModelProperties.CONFIG_FOLDER)) { - model.setStringProperty(ISeamFacetDataModelProperties.WEB_CONTENTS_FOLDER, event.getProperty() - .toString()); - } if (event.getPropertyName().equals(ISeamFacetDataModelProperties.DB_TYPE)) { - + if (event.getPropertyName().equals( + IJ2EEModuleFacetInstallDataModelProperties.CONFIG_FOLDER)) { + model.setStringProperty( + ISeamFacetDataModelProperties.WEB_CONTENTS_FOLDER, event + .getProperty().toString()); } + if (event.getPropertyName().equals( + ISeamFacetDataModelProperties.DB_TYPE)) { + + } } - - // Utils method + // Utils method private List<String> getProfileNameList() { - IConnectionProfile[] profiles = ProfileManager.getInstance().getProfilesByCategory(ProfileSelectionComposite.JDBC_CATEGORY); + IConnectionProfile[] profiles = ProfileManager.getInstance() + .getProfilesByCategory(ProfileSelectionComposite.JDBC_CATEGORY); List<String> names = new ArrayList<String>(); for (IConnectionProfile connectionProfile : profiles) { names.add(connectionProfile.getName()); } return names; } - - public class EditConnectionProfileAction extends ButtonFieldEditor.ButtonPressedAction { - + + public class EditConnectionProfileAction extends + ButtonFieldEditor.ButtonPressedAction { + /** * @param label */ @@ -296,22 +331,37 @@ @Override public void run() { - IConnectionProfile selectedProfile = ProfileManager.getInstance().getProfileByName(getFieldEditor().getValue().toString()); + IConnectionProfile selectedProfile = ProfileManager.getInstance() + .getProfileByName(getFieldEditor().getValue().toString()); String oldName = getFieldEditor().getValue().toString(); - if(selectedProfile==null) return; - PropertyDialog.createDialogOn(Display.getCurrent().getActiveShell(), - "org.eclipse.datatools.connectivity.db.generic.profileProperties", selectedProfile).open(); - - if(!oldName.equals(selectedProfile.getName())) { + if (selectedProfile == null) + return; + PropertyDialog + .createDialogOn( + Display.getCurrent().getActiveShell(), + "org.eclipse.datatools.connectivity.db.generic.profileProperties", + selectedProfile).open(); + + if (!oldName.equals(selectedProfile.getName())) { getFieldEditor().setValue(selectedProfile.getName()); - ((ITaggedFieldEditor)((CompositeEditor)connProfileSelEditor).getEditors().get(1)).setTags(getProfileNameList().toArray(new String[0])); + ((ITaggedFieldEditor) ((CompositeEditor) connProfileSelEditor) + .getEditors().get(1)).setTags(getProfileNameList() + .toArray(new String[0])); oldName = selectedProfile.getName(); } } }; - - public class NewConnectionProfileAction extends ButtonFieldEditor.ButtonPressedAction { + + /** + * Handler for ButtonFieldEditor that shows Property Editor dialog for + * selected ConnectionProfile + * + * @author eskimo + * + */ + public class NewConnectionProfileAction extends + ButtonFieldEditor.ButtonPressedAction { /** * @param label */ @@ -322,46 +372,81 @@ @Override public void run() { NewConnectionProfileWizard wizard = new NewConnectionProfileWizard() { - - /* (non-Javadoc) + + /* + * (non-Javadoc) + * * @see org.eclipse.datatools.connectivity.ui.wizards.NewConnectionProfileWizard#performFinish() */ @Override public boolean performFinish() { - // create profile only + // create profile only try { ProfileManager.getInstance().createProfile( - getProfileName()==null?"":getProfileName(), - getProfileDescription()==null?"":getProfileDescription(), + getProfileName() == null ? "" + : getProfileName(), + getProfileDescription() == null ? "" + : getProfileDescription(), mProviderID, - getProfileProperties(), - mProfilePage.getRepository()==null?"":mProfilePage.getRepository().getName(), - false); + getProfileProperties(), + mProfilePage.getRepository() == null ? "" + : mProfilePage.getRepository() + .getName(), false); lastCreatedCPName = getProfileName(); } catch (ConnectionProfileException e) { SeamCorePlugin.getPluginLog().logError(e); } - + return true; - }}; - wizard.initProviderID(IDBConnectionProfileConstants.CONNECTION_PROFILE_ID); - WizardDialog wizardDialog = new WizardDialog(Display.getCurrent().getActiveShell(),wizard); + } + }; + wizard + .initProviderID(IDBConnectionProfileConstants.CONNECTION_PROFILE_ID); + WizardDialog wizardDialog = new WizardDialog(Display.getCurrent() + .getActiveShell(), wizard); wizardDialog.open(); - - if(wizardDialog.getReturnCode() != WizardDialog.CANCEL) { + + if (wizardDialog.getReturnCode() != WizardDialog.CANCEL) { getFieldEditor().setValue(lastCreatedCPName); - ((ITaggedFieldEditor)((CompositeEditor)connProfileSelEditor).getEditors().get(1)).setTags(getProfileNameList().toArray(new String[0])); + ((ITaggedFieldEditor) ((CompositeEditor) connProfileSelEditor) + .getEditors().get(1)).setTags(getProfileNameList() + .toArray(new String[0])); } } } + /** + * It is overridden to fill Code Generation group with the default package + * names + */ @Override public void setVisible(boolean visible) { - NewProjectDataModelFacetWizard wizard = (NewProjectDataModelFacetWizard)getWizard(); + 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"); + 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"); + + validatorDelegate = new DataModelValidatorDelegate(model, this); + validatorDelegate.addValidatorForProperty( + jBossSeamHomeEditor.getName(), + ValidatorFactory.JBOSS_SEAM_HOME_FOLDER_VALIDATOR); + validatorDelegate + .addValidatorForProperty(connProfileSelEditor.getName(), + ValidatorFactory.CONNECTION_PROFILE_IS_NOT_SELECTED); super.setVisible(visible); }; } Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/internal/project/facet/ValidatorFactory.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/internal/project/facet/ValidatorFactory.java 2007-08-07 21:48:36 UTC (rev 2948) +++ trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/internal/project/facet/ValidatorFactory.java 2007-08-08 01:40:53 UTC (rev 2949) @@ -7,7 +7,7 @@ * * Contributors: * Exadel, Inc. and Red Hat, Inc. - initial API and implementation - ******************************************************************************/ + ******************************************************************************/ package org.jboss.tools.seam.ui.internal.project.facet; import java.io.File; @@ -38,22 +38,21 @@ /** * * @author eskimo - * + * */ public class ValidatorFactory { - - - + /** * */ - static public Map<String,IValidator> validators = new HashMap<String, IValidator>(); - + static public Map<String, IValidator> validators = new HashMap<String, IValidator>(); + /** * */ - static public Map<String,String> NO_ERRORS = Collections.unmodifiableMap(new HashMap<String,String>()); - + static public Map<String, String> NO_ERRORS = Collections + .unmodifiableMap(new HashMap<String, String>()); + /** * */ @@ -63,7 +62,7 @@ return NO_ERRORS; } }; - + /** * * @param id @@ -71,174 +70,186 @@ */ public static IValidator getValidator(String id) { IValidator validator = validators.get(id); - return validator==null?NO_ERRORS_VALIDATOR:validator; + return validator == null ? NO_ERRORS_VALIDATOR : validator; } - + /** * * @return */ - public static Map<String,String> createErrorMap() { - return new HashMap<String,String>(); + public static Map<String, String> createErrorMap() { + return new HashMap<String, String>(); } - + /** * * @param text * @return */ - public static Map<String,String> createErrormessage(String text) { - Map<String,String> map = createErrorMap(); + public static Map<String, String> createErrormessage(String text) { + Map<String, String> map = createErrorMap(); map.put(IValidator.DEFAULT_ERROR, text); return map; } - + /** * */ public static final IValidator FILE_SYSTEM_FOLDER_EXISTS = new IValidator() { public Map<String, String> validate(Object value, Object context) { - if(value == null) - throw new IllegalArgumentException("Path to a folder cannot be null"); + if (value == null) + throw new IllegalArgumentException( + "Path to a folder cannot be null"); String folderPath = value.toString(); File folder = new File(folderPath); if (!folder.exists()) - return createErrormessage("Folder '" + folderPath +"' doesn't exists"); - if(!folder.isDirectory()) - return createErrormessage("Path '" + folderPath +"' points to file"); + return createErrormessage("Folder '" + folderPath + + "' doesn't exists"); + if (!folder.isDirectory()) + return createErrormessage("Path '" + folderPath + + "' points to file"); return NO_ERRORS; } - + }; - + /** * */ public static IValidator JBOSS_SEAM_HOME_FOLDER_VALIDATOR = new IValidator() { public Map<String, String> validate(Object value, Object context) { - Map<String,String> errors = FILE_SYSTEM_FOLDER_EXISTS.validate(value, context); - if(errors.size()>0) { + Map<String, String> errors = FILE_SYSTEM_FOLDER_EXISTS.validate( + value, context); + if (errors.size() > 0) { errors = createErrorMap(); - errors.put( - ISeamFacetDataModelProperties.JBOSS_SEAM_HOME, - "Seam Home folder doesn't exist" - ); + errors.put(ISeamFacetDataModelProperties.JBOSS_SEAM_HOME, + "Seam Home folder doesn't exist"); return errors; } - if(!new File(value.toString(),"seam").isFile()) { - errors = createErrormessage( - "Seam Home Folde field points to location that doesn't look like seam home folder"); - + if (!new File(value.toString(), "seam").isFile()) { + errors = createErrormessage("Seam Home Folde field points to location that doesn't look like seam home folder"); + } return errors; } }; - + /** * */ public static IValidator JBOSS_AS_HOME_FOLDER_VALIDATOR = new IValidator() { public Map<String, String> validate(Object value, Object context) { - Map<String,String> errors = FILE_SYSTEM_FOLDER_EXISTS.validate(value, context); - if(errors.size()>0) { + Map<String, String> errors = FILE_SYSTEM_FOLDER_EXISTS.validate( + value, context); + if (errors.size() > 0) { errors = createErrorMap(); - errors.put( - ISeamFacetDataModelProperties.JBOSS_AS_HOME, - "JBoss AS Home folder doesn't exist" - ); + errors.put(ISeamFacetDataModelProperties.JBOSS_AS_HOME, + "JBoss AS Home folder doesn't exist"); return errors; } - if(!new File(value.toString(),"bin/twiddle.jar").isFile()) { - errors.put( - ISeamFacetDataModelProperties.JBOSS_AS_HOME, - "JBoss AS Home Folde field points to location that doesn't look like JBoss AS home folder"); + if (!new File(value.toString(), "bin/twiddle.jar").isFile()) { + errors + .put( + ISeamFacetDataModelProperties.JBOSS_AS_HOME, + "JBoss AS Home Folde field points to location that doesn't look like JBoss AS home folder"); } return errors; } }; - + /** * */ public static IValidator CLASS_QNAME_VALIDATOR = new IValidator() { public Map<String, String> validate(Object value, Object context) { String classDecl = "class " + value.toString() + " {}"; - ASTParser parser= ASTParser.newParser(AST.JLS3); + ASTParser parser = ASTParser.newParser(AST.JLS3); parser.setSource(classDecl.toCharArray()); - parser.setProject((IJavaProject)context); - CompilationUnit compilationUnit= (CompilationUnit) parser.createAST(null); - IProblem[] problems= compilationUnit.getProblems(); + parser.setProject((IJavaProject) context); + CompilationUnit compilationUnit = (CompilationUnit) parser + .createAST(null); + IProblem[] problems = compilationUnit.getProblems(); if (problems.length > 0) { - return createErrormessage(Messages.format("Component name is not invalid.", problems[0].getMessage())); - } + return createErrormessage(Messages.format( + "Component name is not invalid.", problems[0] + .getMessage())); + } return ValidatorFactory.NO_ERRORS; } }; - + /** * */ public static IValidator FILESYSTEM_FILE_EXISTS_VALIDATOR = new IValidator() { - public java.util.Map<String,String> validate(Object value, Object context) { + public java.util.Map<String, String> validate(Object value, + Object context) { return ValidatorFactory.NO_ERRORS; }; }; /** * * @author eskimo - * + * */ public static IValidator SEAM_COMPONENT_NAME_VALIDATOR = new IValidator() { public Map<String, String> validate(Object value, Object context) { String targetName = null; IProject project = null; - if(context instanceof Object[]) { - Object[] contextArray = ((Object[])context); + if (context instanceof Object[]) { + Object[] contextArray = ((Object[]) context); targetName = contextArray[0].toString(); - project = (IProject)contextArray[1]; + project = (IProject) contextArray[1]; } - - // to allow qualified names for component use import statement as target - String classDecl = "import " + value.toString() +"; class Dummy {}"; - ASTParser parser= ASTParser.newParser(AST.JLS3); + + // to allow qualified names for component use import statement as + // target + String classDecl = "import " + value.toString() + + "; class Dummy {}"; + ASTParser parser = ASTParser.newParser(AST.JLS3); parser.setSource(classDecl.toCharArray()); parser.setProject(JavaCore.create(project)); - CompilationUnit compilationUnit= (CompilationUnit) parser.createAST(null); - IProblem[] problems= compilationUnit.getProblems(); - + CompilationUnit compilationUnit = (CompilationUnit) parser + .createAST(null); + IProblem[] problems = compilationUnit.getProblems(); + if (problems.length > 0) { return createErrormessage(targetName + " name is not valid."); - } - + } + return NO_ERRORS; } }; - + /** * * @author eskimo - * + * */ public static IValidator SEAM_JAVA_INTEFACE_NAME_CONVENTION_VALIDATOR = new IValidator() { public Map<String, String> validate(Object value, Object context) { String targetName = null; IProject project = null; - if(context instanceof Object[]) { - Object[] contextArray = ((Object[])context); + if (context instanceof Object[]) { + Object[] contextArray = ((Object[]) context); targetName = contextArray[0].toString(); - project = (IProject)contextArray[1]; + project = (IProject) contextArray[1]; } IJavaProject jProject = JavaCore.create(project); - - String sourceLevel= jProject.getOption(JavaCore.COMPILER_SOURCE, true); - String compliance= jProject.getOption(JavaCore.COMPILER_COMPLIANCE, true); - IStatus status = JavaConventions.validateJavaTypeName(value.toString(), sourceLevel, compliance); - if(status.getSeverity() == IStatus.WARNING) { - return createErrormessage("Local Interface name is not valid.\n" + status.getMessage()); + + String sourceLevel = jProject.getOption(JavaCore.COMPILER_SOURCE, + true); + String compliance = jProject.getOption( + JavaCore.COMPILER_COMPLIANCE, true); + IStatus status = JavaConventions.validateJavaTypeName(value + .toString(), sourceLevel, compliance); + if (status.getSeverity() == IStatus.WARNING) { + return createErrormessage("Local Interface name is not valid.\n" + + status.getMessage()); } return NO_ERRORS; } @@ -249,24 +260,26 @@ public Map<String, String> validate(Object value, Object context) { String targetName = null; IProject project = null; - - if(context instanceof Object[]) { - Object[] contextArray = ((Object[])context); + + if (context instanceof Object[]) { + Object[] contextArray = ((Object[]) context); targetName = contextArray[0].toString(); - project = (IProject)contextArray[1]; + project = (IProject) contextArray[1]; } - - String classDecl = "class ClassName {public void " + value.toString() + "() {}}"; - ASTParser parser= ASTParser.newParser(AST.JLS3); + + String classDecl = "class ClassName {public void " + + value.toString() + "() {}}"; + ASTParser parser = ASTParser.newParser(AST.JLS3); parser.setSource(classDecl.toCharArray()); parser.setProject(JavaCore.create(project)); - CompilationUnit compilationUnit= (CompilationUnit) parser.createAST(null); - IProblem[] problems= compilationUnit.getProblems(); - + CompilationUnit compilationUnit = (CompilationUnit) parser + .createAST(null); + IProblem[] problems = compilationUnit.getProblems(); + if (problems.length > 0) { return createErrormessage(targetName + " name is not valid."); - } - + } + return NO_ERRORS; } }; @@ -276,15 +289,16 @@ public Map<String, String> validate(Object value, Object context) { String targetName = null; IProject project = null; - - if(context instanceof Object[]) { - Object[] contextArray = ((Object[])context); + + if (context instanceof Object[]) { + Object[] contextArray = ((Object[]) context); targetName = contextArray[0].toString(); - project = (IProject)contextArray[1]; + project = (IProject) contextArray[1]; } - if("".equals(value) || !project.getLocation().isValidSegment(value.toString())) - return createErrormessage(targetName + " name is not valid."); - + if ("".equals(value) + || !project.getLocation().isValidSegment(value.toString())) + return createErrormessage(targetName + " name is not valid."); + return NO_ERRORS; } }; @@ -292,14 +306,18 @@ public static IValidator SEAM_PROJECT_NAME_VALIDATOR = new IValidator() { public Map<String, String> validate(Object value, Object context) { - IResource project = ResourcesPlugin.getWorkspace().getRoot().findMember(value.toString()); - - if(project==null || !(project instanceof IProject) || !project.exists()) { - return createErrormessage("Project '" + value + "' does'n exist."); + IResource project = ResourcesPlugin.getWorkspace().getRoot() + .findMember(value.toString()); + + if (project == null || !(project instanceof IProject) + || !project.exists()) { + return createErrormessage("Project '" + value + + "' does'n exist."); } else { try { - if(!((IProject)project).hasNature(ISeamProject.NATURE_ID)) { - return createErrormessage("Project '" + project.getName()+ "' has no Seam nature."); + if (!((IProject) project).hasNature(ISeamProject.NATURE_ID)) { + return createErrormessage("Project '" + + project.getName() + "' has no Seam nature."); } } catch (CoreException e) { SeamCorePlugin.getPluginLog().logError(e); @@ -311,7 +329,7 @@ public static IValidator CONNECTION_PROFILE_IS_NOT_SELECTED = new IValidator() { public Map<String, String> validate(Object value, Object context) { - if(value==null || "".equals(value.toString().trim())) { + if (value == null || "".equals(value.toString().trim())) { return createErrormessage("Connection profile is not selected."); } return NO_ERRORS;