Author: dgolovin Date: 2007-08-08 22:28:09 -0400 (Wed, 08 Aug 2007) New Revision: 2993 Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/project/facet/SeamFacetPreference.java trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/SeamFacetInstallDataModelProvider.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.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/DataModelValidatorDelegate.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 trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/widget/editor/SwtFieldEditorFactory.java trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/SeamBaseWizardPage.java Log: http://jira.jboss.org/jira/browse/JBIDE-643 Validation is restored Last selected Connection profile is saved as default Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/project/facet/SeamFacetPreference.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/project/facet/SeamFacetPreference.java 2007-08-09 02:24:56 UTC (rev 2992) +++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/project/facet/SeamFacetPreference.java 2007-08-09 02:28:09 UTC (rev 2993) @@ -23,7 +23,8 @@ */ public class SeamFacetPreference { public static final String SEAM_HOME_FOLDER = SeamCorePlugin.PLUGIN_ID + ".project.facet.seamhome"; - + public static final String SEAM_DEFAULT_CONNECTION_PROFILE = SeamCorePlugin.PLUGIN_ID + ".project.facet.default.conn.profile"; + public static String getStringPreference(String name) { return SeamCorePlugin.getDefault().getPreferenceStore().getString(SeamFacetPreference.SEAM_HOME_FOLDER); } Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/SeamFacetInstallDataModelProvider.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/SeamFacetInstallDataModelProvider.java 2007-08-09 02:24:56 UTC (rev 2992) +++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/SeamFacetInstallDataModelProvider.java 2007-08-09 02:28:09 UTC (rev 2993) @@ -17,6 +17,7 @@ import java.util.Set; import org.eclipse.core.runtime.FileLocator; +import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.Platform; import org.eclipse.wst.common.componentcore.datamodel.FacetInstallDataModelProvider; import org.jboss.tools.seam.core.SeamCorePlugin; @@ -29,6 +30,12 @@ public class SeamFacetInstallDataModelProvider extends FacetInstallDataModelProvider implements ISeamFacetDataModelProperties { + @Override + public IStatus validate(String name) { + // TODO Auto-generated method stub + return super.validate(name); + } + public static final Map<String,String[]> SEAM_LIBRARIES= new HashMap<String,String[]>(); static { 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-09 02:24:56 UTC (rev 2992) +++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/SeamFacetInstallDelegete.java 2007-08-09 02:28:09 UTC (rev 2993) @@ -268,7 +268,7 @@ AntCopyUtils.copyFileToFolder( hibernateConsolePref, - new File(project.getLocation().toFile(),".settings"), + new File(project.getLocation().toFile(),".settings"), new FilterSetCollection(projectFilterSet), true); // In case of WAR configuration @@ -330,12 +330,7 @@ } } } - - - - - - + if(s==null) { return new Status(Status.WARNING, SeamCorePlugin.PLUGIN_ID, "No server selected to deploy datasource to"); } @@ -477,10 +472,10 @@ create.schedule(); } ClasspathHelper.addClasspathEntries(project, fv); - project.refreshLocal(IResource.DEPTH_INFINITE, monitor); - + EclipseResourceUtil.addNatureToProject(project, ISeamProject.NATURE_ID); + project.refreshLocal(IResource.DEPTH_INFINITE, monitor); } public static boolean isWarConfiguration(IDataModel model) { 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-09 02:24:56 UTC (rev 2992) +++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/SeamFacetPreInstallDelegate.java 2007-08-09 02:28:09 UTC (rev 2993) @@ -33,13 +33,26 @@ Properties props = connProfile.getProperties("org.eclipse.datatools.connectivity.db.generic.connectionProfile"); // Collect properties name from DTP Connection Profile - model.setProperty(ISeamFacetDataModelProperties.DB_USER_NAME,props.get("org.eclipse.datatools.connectivity.db.username").toString()); - model.setProperty(ISeamFacetDataModelProperties.JDBC_DRIVER_CLASS_NAME,props.get("org.eclipse.datatools.connectivity.db.driverClass").toString()); - 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()); + model.setProperty(ISeamFacetDataModelProperties.DB_USER_NAME, + props.get("org.eclipse.datatools.connectivity.db.username")==null + ?"":props.get("org.eclipse.datatools.connectivity.db.username").toString()); + model.setProperty(ISeamFacetDataModelProperties.JDBC_DRIVER_CLASS_NAME, + props.get("org.eclipse.datatools.connectivity.db.driverClass")==null + ?"":props.get("org.eclipse.datatools.connectivity.db.driverClass").toString()); + + model.setProperty(ISeamFacetDataModelProperties.DB_USERP_PASSWORD, + props.get("org.eclipse.datatools.connectivity.db.password")==null + ?"":props.get("org.eclipse.datatools.connectivity.db.password").toString()); + + model.setProperty(ISeamFacetDataModelProperties.JDBC_URL_FOR_DB, + props.get("org.eclipse.datatools.connectivity.db.URL")==null + ?"":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()); + } } 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-09 02:24:56 UTC (rev 2992) +++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/WtpUtils.java 2007-08-09 02:28:09 UTC (rev 2993) @@ -22,15 +22,15 @@ import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.NullProgressMonitor; import org.eclipse.core.runtime.Path; -import org.eclipse.jdt.core.IClasspathContainer; import org.eclipse.jdt.core.IClasspathEntry; import org.eclipse.jdt.core.IJavaProject; import org.eclipse.jdt.core.JavaCore; import org.eclipse.jdt.core.JavaModelException; import org.eclipse.jdt.launching.JavaRuntime; -import org.eclipse.jst.j2ee.internal.common.classpath.J2EEComponentClasspathContainer; import org.eclipse.wst.common.project.facet.core.IFacetedProject; import org.eclipse.wst.common.project.facet.core.ProjectFacetsManager; +import org.eclipse.wst.common.project.facet.core.runtime.IRuntime; +import org.eclipse.wst.common.project.facet.core.runtime.RuntimeManager; import org.jboss.tools.seam.core.SeamCorePlugin; /** @@ -98,16 +98,12 @@ } public static String getServerRuntimeName(IProject project) { - IJavaProject javaProject = JavaCore.create(project); - - if(javaProject!=null) { - try { - IFacetedProject facetedProject = ProjectFacetsManager.create(project); - return facetedProject.getPrimaryRuntime().getName(); - } catch (CoreException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } + try { + IFacetedProject facetedProject = ProjectFacetsManager.create(project); + IRuntime rt = facetedProject.getPrimaryRuntime(); + return facetedProject.getPrimaryRuntime().getName(); + } catch (CoreException e) { + SeamCorePlugin.getPluginLog().logError(e); } return ""; } 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-09 02:24:56 UTC (rev 2992) +++ trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/internal/project/facet/DataModelValidatorDelegate.java 2007-08-09 02:28:09 UTC (rev 2993) @@ -82,6 +82,7 @@ public void validateUntillError() { page.setErrorMessage(getFirstValidationError()); page.setPageComplete(page.getErrorMessage()==null); + if(page.getErrorMessage()==null) page.setMessage(null); } /** 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-09 02:24:56 UTC (rev 2992) +++ trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/internal/project/facet/SeamInstallWizardPage.java 2007-08-09 02:28:09 UTC (rev 2993) @@ -13,13 +13,17 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.List; +import java.util.Map; +import org.eclipse.core.runtime.IStatus; import org.eclipse.datatools.connectivity.ConnectionProfileException; import org.eclipse.datatools.connectivity.IConnectionProfile; 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.core.JavaConventions; +import org.eclipse.jdt.internal.compiler.impl.CompilerOptions; import org.eclipse.jface.resource.ImageDescriptor; import org.eclipse.jface.wizard.IWizard; import org.eclipse.jface.wizard.WizardDialog; @@ -56,6 +60,7 @@ public class SeamInstallWizardPage extends AbstractFacetWizardPage implements IFacetWizardPage, IDataModelListener { + public static final String PAGE_DESCRIPTION = "Configure Seam Facet Settings"; /** * */ @@ -93,7 +98,8 @@ IFieldEditor connProfileSelEditor = IFieldEditorFactory.INSTANCE .createComboWithTwoButtons( ISeamFacetDataModelProperties.SEAM_CONNECTION_PROFILE, - "Connection profile", getProfileNameList(), "", true, + "Connection profile:", getProfileNameList(), SeamCorePlugin.getDefault().getPluginPreferences().getString( + SeamFacetPreference.SEAM_DEFAULT_CONNECTION_PROFILE), true, new EditConnectionProfileAction(), new NewConnectionProfileAction(), ValidatorFactory.NO_ERRORS_VALIDATOR); @@ -176,7 +182,7 @@ setTitle("Seam Facet"); setImageDescriptor(ImageDescriptor.createFromFile(SeamFormWizard.class, "SeamWebProjectWizBan.png")); - setDescription("Configure Seam Facest Settings"); + setDescription(PAGE_DESCRIPTION); } /** @@ -207,8 +213,13 @@ public void transferStateToConfig() { if( seamHomeRequiresSave) { SeamCorePlugin.getDefault().getPluginPreferences().setValue( - SeamFacetPreference.SEAM_HOME_FOLDER, jBossSeamHomeEditor.getValueAsString()); + SeamFacetPreference.SEAM_HOME_FOLDER, jBossSeamHomeEditor.getValueAsString()); } + if("".equals(SeamCorePlugin.getDefault().getPluginPreferences().getString(( + SeamFacetPreference.SEAM_DEFAULT_CONNECTION_PROFILE)))) { + SeamCorePlugin.getDefault().getPluginPreferences().setValue( + SeamFacetPreference.SEAM_DEFAULT_CONNECTION_PROFILE, connProfileSelEditor.getValueAsString()); + } } @@ -286,10 +297,31 @@ registerEditor(testsPkgNameditor, generationGroup, 3); setControl(root); + NewProjectDataModelFacetWizard wizard = (NewProjectDataModelFacetWizard) getWizard(); + + IDataModel model = wizard.getDataModel(); - - setMessage(null); - setErrorMessage(null); + if(validatorDelegate==null) { + validatorDelegate = new DataModelValidatorDelegate(this.model, this); + validatorDelegate.addValidatorForProperty( + jBossSeamHomeEditor.getName(), + ValidatorFactory.JBOSS_SEAM_HOME_FOLDER_VALIDATOR); + validatorDelegate + .addValidatorForProperty(connProfileSelEditor.getName(), + ValidatorFactory.CONNECTION_PROFILE_IS_NOT_SELECTED); + validatorDelegate + .addValidatorForProperty(testsPkgNameditor.getName(), + new PackageNameValidator( + testsPkgNameditor.getName(), "tests")); + validatorDelegate + .addValidatorForProperty(entityBeanPkgNameditor.getName(), + new PackageNameValidator( + entityBeanPkgNameditor.getName(), "entity beans")); + validatorDelegate + .addValidatorForProperty(sessionBeanPkgNameditor.getName(), + new PackageNameValidator( + sessionBeanPkgNameditor.getName(), "session beans")); + } } /** @@ -421,32 +453,52 @@ */ @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"); + .setValue("org.domain." + + model.getProperty(IFacetDataModelProperties.FACET_PROJECT_NAME) + + ".session"); entityBeanPkgNameditor - .setValue("org.domain." - + model - .getProperty(IFacetDataModelProperties.FACET_PROJECT_NAME) - + ".entity"); + .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); + .setValue("org.domain." + + model.getProperty(IFacetDataModelProperties.FACET_PROJECT_NAME) + + ".test"); + if(visible) { + String message = validatorDelegate.getFirstValidationError(); + this.setPageComplete(message==null); + this.setMessage(message); + } super.setVisible(visible); }; + + public class PackageNameValidator implements IValidator { + + String fieldName; + String targetName; + + /** + * @param fieldName + * @param targetName + */ + public PackageNameValidator(String fieldName, String targetName) { + this.fieldName = fieldName; + this.targetName = targetName; + } + + /** + * @see IValidator#validate(Object, Object) + */ + public Map<String, String> validate(Object value, Object context) { + IStatus status = JavaConventions.validatePackageName( + value.toString(), + CompilerOptions.VERSION_1_5, + CompilerOptions.VERSION_1_5); + if(!status.isOK()) { + return ValidatorFactory.createErrormessage(fieldName, "Package name for " + targetName + " is not valid" ); + } + return ValidatorFactory.NO_ERRORS; + } + } } 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-09 02:24:56 UTC (rev 2992) +++ trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/internal/project/facet/ValidatorFactory.java 2007-08-09 02:28:09 UTC (rev 2993) @@ -45,12 +45,13 @@ /** * */ - 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 + static public final Map<String, String> NO_ERRORS = Collections .unmodifiableMap(new HashMap<String, String>()); /** @@ -94,7 +95,19 @@ /** * + * @param text + * @return */ + public static Map<String, String> createErrormessage(String propertyName, + String text) { + Map<String, String> map = createErrorMap(); + map.put(propertyName, text); + return map; + } + + /** + * + */ public static final IValidator FILE_SYSTEM_FOLDER_EXISTS = new IValidator() { public Map<String, String> validate(Object value, Object context) { @@ -129,7 +142,8 @@ 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"); + errors = createErrormessage("Seam Home Folde field points to " + + "location that doesn't look like seam home folder"); } return errors; @@ -150,10 +164,10 @@ 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"); + 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; } @@ -197,29 +211,11 @@ 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); - targetName = contextArray[0].toString(); - project = (IProject) contextArray[1]; + IStatus status = JavaConventions.validateClassFileName(value.toString()+".class", "5.0", "5.0"); + if (!status.isOK()) { + return createErrormessage("{0} name is not valid."); } - // 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(); - - if (problems.length > 0) { - return createErrormessage(targetName + " name is not valid."); - } - return NO_ERRORS; } }; @@ -267,13 +263,10 @@ project = (IProject) contextArray[1]; } - 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); + CompilationUnit compilationUnit = createCompilationUnit( + "class ClassName {public void " + + value.toString() + "() {}}",project); + IProblem[] problems = compilationUnit.getProblems(); if (problems.length > 0) { @@ -311,13 +304,13 @@ if (project == null || !(project instanceof IProject) || !project.exists()) { - return createErrormessage("Project '" + value - + "' does'n exist."); + 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."); + return createErrormessage( + "Project '" + project.getName() + "' has no Seam nature"); } } catch (CoreException e) { SeamCorePlugin.getPluginLog().logError(e); @@ -327,12 +320,25 @@ } }; - public static IValidator CONNECTION_PROFILE_IS_NOT_SELECTED = new IValidator() { + 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())) { - return createErrormessage("Connection profile is not selected."); + return createErrormessage( + ISeamFacetDataModelProperties.SEAM_CONNECTION_PROFILE, + "Connection profile is not selected"); } return NO_ERRORS; } }; + + public static CompilationUnit createCompilationUnit(String classDecl, + IProject project) { + ASTParser parser = ASTParser.newParser(AST.JLS3); + parser.setSource(classDecl.toCharArray()); + parser.setProject(JavaCore.create(project)); + CompilationUnit compilationUnit = (CompilationUnit) parser + .createAST(null); + return compilationUnit; + } } Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/widget/editor/SwtFieldEditorFactory.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/widget/editor/SwtFieldEditorFactory.java 2007-08-09 02:24:56 UTC (rev 2992) +++ trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/widget/editor/SwtFieldEditorFactory.java 2007-08-09 02:28:09 UTC (rev 2993) @@ -165,6 +165,7 @@ } }; } + /** * */ @@ -172,7 +173,7 @@ List values, Object defaultValue, boolean flat, ButtonPressedAction action1, ButtonPressedAction action2, IValidator validator) { - CompositeEditor editor = new CompositeEditor("seam.project.connection.profile","Connection Profile",null); + CompositeEditor editor = new CompositeEditor(name,label,defaultValue); editor.addFieldEditors(new IFieldEditor[]{ new LabelFieldEditor(name,label), new ComboFieldEditor(name,label, values, defaultValue, false), Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/SeamBaseWizardPage.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/SeamBaseWizardPage.java 2007-08-09 02:24:56 UTC (rev 2992) +++ trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/SeamBaseWizardPage.java 2007-08-09 02:28:09 UTC (rev 2993) @@ -27,6 +27,7 @@ import org.eclipse.jface.resource.ImageDescriptor; import org.eclipse.jface.wizard.Wizard; import org.eclipse.jface.wizard.WizardPage; +import org.eclipse.osgi.util.NLS; import org.eclipse.swt.SWT; import org.eclipse.swt.layout.GridLayout; import org.eclipse.swt.widgets.Composite; @@ -186,29 +187,29 @@ getEditor(IParameter.SEAM_BEAN_NAME).setEnabled(!"war".equals(type)); errors = ValidatorFactory.SEAM_COMPONENT_NAME_VALIDATOR.validate( - editorRegistry.get(IParameter.SEAM_COMPONENT_NAME).getValue(), new Object[]{"Seam component",project}); + editorRegistry.get(IParameter.SEAM_COMPONENT_NAME).getValue(), null); if(errors.size()>0) { - setErrorMessage(errors.get(IValidator.DEFAULT_ERROR).toString()); + setErrorMessage(NLS.bind(errors.get(IValidator.DEFAULT_ERROR).toString(),"Seam component")); setPageComplete(false); return; } errors = ValidatorFactory.SEAM_COMPONENT_NAME_VALIDATOR.validate( - editorRegistry.get(IParameter.SEAM_LOCAL_INTERFACE_NAME).getValue(), new Object[]{"Local interface",project}); + editorRegistry.get(IParameter.SEAM_LOCAL_INTERFACE_NAME).getValue(), null); if(errors.size()>0) { - setErrorMessage(errors.get(IValidator.DEFAULT_ERROR).toString()); + setErrorMessage(NLS.bind(errors.get(IValidator.DEFAULT_ERROR).toString(),"Local interface")); setPageComplete(false); return; } if(!isWar()) { errors = ValidatorFactory.SEAM_COMPONENT_NAME_VALIDATOR.validate( - editorRegistry.get(IParameter.SEAM_BEAN_NAME).getValue(), new Object[]{"Bean",project}); + editorRegistry.get(IParameter.SEAM_BEAN_NAME).getValue(), null); if(errors.size()>0) { - setErrorMessage(errors.get(IValidator.DEFAULT_ERROR).toString()); + setErrorMessage(NLS.bind(errors.get(IValidator.DEFAULT_ERROR).toString(),"Bean")); setPageComplete(false); return; }