Author: scabanovich Date: 2010-09-15 10:17:32 -0400 (Wed, 15 Sep 2010) New Revision: 24936 Modified: trunk/cdi/plugins/org.jboss.tools.cdi.xml/src/org/jboss/tools/cdi/xml/beans/model/handlers/AddIncludeSupport.java Log: https://jira.jboss.org/browse/JBIDE-6998 Modified: trunk/cdi/plugins/org.jboss.tools.cdi.xml/src/org/jboss/tools/cdi/xml/beans/model/handlers/AddIncludeSupport.java =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.xml/src/org/jboss/tools/cdi/xml/beans/model/handlers/AddIncludeSupport.java 2010-09-15 13:44:32 UTC (rev 24935) +++ trunk/cdi/plugins/org.jboss.tools.cdi.xml/src/org/jboss/tools/cdi/xml/beans/model/handlers/AddIncludeSupport.java 2010-09-15 14:17:32 UTC (rev 24936) @@ -3,7 +3,9 @@ import java.util.Properties; import org.jboss.tools.common.meta.XChild; +import org.jboss.tools.common.meta.action.impl.DefaultWizardDataValidator; import org.jboss.tools.common.meta.action.impl.SpecialWizardSupport; +import org.jboss.tools.common.meta.action.impl.WizardDataValidator; import org.jboss.tools.common.meta.action.impl.handlers.DefaultCreateHandler; import org.jboss.tools.common.model.XModelException; import org.jboss.tools.common.model.XModelObject; @@ -51,4 +53,21 @@ return null; } + protected DefaultWizardDataValidator validator = new Validator(); + + public WizardDataValidator getValidator(int step) { + validator.setSupport(this, step); + return validator; + } + + class Validator extends DefaultWizardDataValidator { + public void validate(Properties data) { + boolean isRegEx = "true".equals(data.getProperty("is regular expression")); + String nameValue = data.getProperty("name/pattern"); + String nameAttr = isRegEx ? "pattern" : "name"; + data.setProperty(nameAttr, nameValue); + super.validate(data); + } + + } }