Author: dazarov Date: 2008-11-24 12:25:39 -0500 (Mon, 24 Nov 2008) New Revision: 11989 Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/SeamUtil.java 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.ui/src/org/jboss/tools/seam/ui/internal/project/facet/SeamInstallWizardPage.java Log: https://jira.jboss.org/jira/browse/JBIDE-3254 Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/SeamUtil.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/SeamUtil.java 2008-11-24 17:10:07 UTC (rev 11988) +++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/SeamUtil.java 2008-11-24 17:25:39 UTC (rev 11989) @@ -84,4 +84,33 @@ return null; } } + + /** + * Converts seam project name to string which suitable for package names + * @param projectNamePackage + * @return + */ + public static String getSeamPackageName(String projectName){ + if(projectName == null) + return null; + + String packageName = projectName.toLowerCase(); + + if(packageName.indexOf(" ") >= 0) + packageName = packageName.replaceAll(" ", ""); + + if(packageName.indexOf("-") >= 0) + packageName = packageName.replaceAll("-", ""); + + if(packageName.indexOf("+") >= 0) + packageName = packageName.replaceAll("+", ""); + + if(packageName.indexOf("_") >= 0) + packageName = packageName.replaceAll("_", ""); + + while(packageName.indexOf("..") >= 0){ + packageName = packageName.replace("..", "."); + } + return packageName; + } } \ No newline at end of file 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-24 17:10:07 UTC (rev 11988) +++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/SeamFacetAbstractInstallDelegate.java 2008-11-24 17:25:39 UTC (rev 11989) @@ -85,6 +85,7 @@ import org.jboss.tools.seam.core.ISeamProject; import org.jboss.tools.seam.core.SeamCoreMessages; import org.jboss.tools.seam.core.SeamCorePlugin; +import org.jboss.tools.seam.core.SeamUtil; import org.jboss.tools.seam.core.project.facet.SeamProjectPreferences; import org.jboss.tools.seam.core.project.facet.SeamRuntime; import org.jboss.tools.seam.core.project.facet.SeamRuntimeManager; @@ -747,8 +748,11 @@ 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(ISeamFacetDataModelProperties.SEAM_PROJECT_NAME); - IStatus status = JavaConventions.validatePackageName(projectNamePackage.toString(), CompilerOptions.VERSION_1_5, CompilerOptions.VERSION_1_5); + String projectNamePackage = (String)model.getProperty(ISeamFacetDataModelProperties.SEAM_PROJECT_NAME); + + projectNamePackage = SeamUtil.getSeamPackageName(projectNamePackage); + + IStatus status = JavaConventions.validatePackageName(projectNamePackage, CompilerOptions.VERSION_1_5, CompilerOptions.VERSION_1_5); if(!status.isOK()) { projectNamePackage = "project"; //$NON-NLS-1$ } 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-24 17:10:07 UTC (rev 11988) +++ trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/internal/project/facet/SeamInstallWizardPage.java 2008-11-24 17:25:39 UTC (rev 11989) @@ -59,6 +59,7 @@ 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.SeamUtil; import org.jboss.tools.seam.core.project.facet.SeamProjectPreferences; import org.jboss.tools.seam.core.project.facet.SeamRuntime; import org.jboss.tools.seam.core.project.facet.SeamRuntimeManager; @@ -455,15 +456,15 @@ String p = (String)model.getProperty(ISeamFacetDataModelProperties.SEAM_PROJECT_NAME); sessionBeanPkgNameditor .setValue("org.domain." //$NON-NLS-1$ - + p + + SeamUtil.getSeamPackageName(p) + ".session"); //$NON-NLS-1$ entityBeanPkgNameditor .setValue("org.domain." //$NON-NLS-1$ - + p + + SeamUtil.getSeamPackageName(p) + ".entity"); //$NON-NLS-1$ testsPkgNameditor .setValue("org.domain." //$NON-NLS-1$ - + p + + SeamUtil.getSeamPackageName(p) + ".test"); //$NON-NLS-1$ }