Author: dmaliarevich Date: 2010-07-13 11:08:59 -0400 (Tue, 13 Jul 2010) New Revision: 23385 Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeEditAnyDialog.java trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/messages/messages.properties Log: https://jira.jboss.org/browse/JBIDE-6599 , message was corrected, field names were corrected. Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeEditAnyDialog.java =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeEditAnyDialog.java 2010-07-13 13:33:55 UTC (rev 23384) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeEditAnyDialog.java 2010-07-13 15:08:59 UTC (rev 23385) @@ -13,6 +13,7 @@ import java.io.IOException; import java.net.URL; import java.text.MessageFormat; +import java.util.regex.Pattern; import javax.xml.parsers.DocumentBuilderFactory; import javax.xml.parsers.ParserConfigurationException; @@ -336,11 +337,24 @@ */ private IMessageProvider validateTagName() { Message message = null; - if (tagName.getText().indexOf(":") < 0) { //$NON-NLS-1$ + String[] parts = tagName.getText().split(":"); //$NON-NLS-1$ + if (parts.length != 2 || tagName.getText().startsWith(":") //$NON-NLS-1$ + || tagName.getText().endsWith(":")) { //$NON-NLS-1$ message = new Message( MessageFormat.format(VpeUIMessages.TAG_NAME_IS_NOT_VALID, - tagName.getText().trim()), - IMessageProvider.ERROR); + tagName.getText().trim()), IMessageProvider.ERROR); + } else { + /* + * Matcher will accept only word characters with optional numbers. + */ + Pattern p = Pattern.compile("([a-zA-Z]+\\d*)+"); //$NON-NLS-1$ + if ((parts[0].length() == 0) || (parts[1].length() == 0) + || (!p.matcher(parts[0]).matches()) + || (!p.matcher(parts[1]).matches())) { + message = new Message( + MessageFormat.format(VpeUIMessages.TAG_NAME_IS_NOT_VALID, + tagName.getText().trim()), IMessageProvider.ERROR); + } } return message; } @@ -356,9 +370,13 @@ try { xmlDocument.createElement(txtTagForDisplay.getText()); } catch (DOMException e) { + /* + * https://jira.jboss.org/browse/JBIDE-6599 + * Changing warning message. + */ return new Message( MessageFormat.format(VpeUIMessages.TAG_FOR_DISPLAY_IS_NOT_VALID, - e.getMessage()), + txtTagForDisplay.getText()), IMessageProvider.ERROR); } } Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/messages/messages.properties =================================================================== --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/messages/messages.properties 2010-07-13 13:33:55 UTC (rev 23384) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/messages/messages.properties 2010-07-13 15:08:59 UTC (rev 23385) @@ -20,14 +20,14 @@ TEMPLATE=Unknown tag template UNKNOWN_TAGS_DIALOG_DESCRIPTION=Set up parameters for the unknown tag TAG_ATTRIBUTES=Set up tag attributes -TAG_NAME=Tag Name: +TAG_NAME=Tag name: TAG_URI=Tag URI: -TAG_FOR_DISPLAY=Tag For Display: +TAG_FOR_DISPLAY=Tag for display: TAG_STYLE=Tag style: CHILDREN=Allow tag children: VALUE=Value: TAG_NAME_IS_NOT_VALID=Tag name ({0}) is not valid. The pattern is "taglib:tag" -TAG_FOR_DISPLAY_IS_NOT_VALID=Tag for display is not valid ({0}). +TAG_FOR_DISPLAY_IS_NOT_VALID=Incorrect tag with name ({0}). VALUE_IS_NOT_VALID=Value is not valid ({0}). BACKGROUND_COLOR=Background Color