[richfaces-svn-commits] JBoss Rich Faces SVN: r13774 - in trunk/ui: orderingList/src/main/java/org/richfaces/component and 1 other directory.

Author: nbelaevski Date: 2009-04-22 12:51:47 -0400 (Wed, 22 Apr 2009) New Revision: 13774 Modified: trunk/ui/listShuttle/src/main/config/component/listShuttle.xml trunk/ui/orderingList/src/main/java/org/richfaces/component/UIOrderingBaseComponent.java Log: https://jira.jboss.org/jira/browse/RF-6794 Modified: trunk/ui/listShuttle/src/main/config/component/listShuttle.xml =================================================================== --- trunk/ui/listShuttle/src/main/config/component/listShuttle.xml 2009-04-22 16:25:28 UTC (rev 13773) +++ trunk/ui/listShuttle/src/main/config/component/listShuttle.xml 2009-04-22 16:51:47 UTC (rev 13774) @@ -124,10 +124,6 @@ <property hidden="true"> <name>required</name> </property> - <property hidden="true"> - <name>requiredMessage</name> - <classname>java.lang.String</classname> - </property> <property elonly="true"> <name>sourceSelection</name> Modified: trunk/ui/orderingList/src/main/java/org/richfaces/component/UIOrderingBaseComponent.java =================================================================== --- trunk/ui/orderingList/src/main/java/org/richfaces/component/UIOrderingBaseComponent.java 2009-04-22 16:25:28 UTC (rev 13773) +++ trunk/ui/orderingList/src/main/java/org/richfaces/component/UIOrderingBaseComponent.java 2009-04-22 16:51:47 UTC (rev 13774) @@ -104,6 +104,9 @@ public abstract boolean isFastOrderControlsVisible(); public abstract void setFastOrderControlsVisible(boolean visible); + public abstract String getRequiredMessage(); + public abstract void setRequiredMessage(String requiredMessage); + public Object saveState(FacesContext faces) { Object[] state = new Object[4]; @@ -306,9 +309,16 @@ } protected void requiredInvalidate(FacesContext context) { - FacesMessage message = MessageUtil.getMessage(context, UIInput.REQUIRED_MESSAGE_ID, - new Object[] {MessageUtil.getLabel(context, this)}); - message.setSeverity(FacesMessage.SEVERITY_ERROR); + String requiredMessage = getRequiredMessage(); + FacesMessage message = null; + + if (requiredMessage != null) { + message = new FacesMessage(FacesMessage.SEVERITY_ERROR, requiredMessage, requiredMessage); + } else { + message = MessageUtil.getMessage(context, UIInput.REQUIRED_MESSAGE_ID, + new Object[] {MessageUtil.getLabel(context, this)}); + message.setSeverity(FacesMessage.SEVERITY_ERROR); + } context.addMessage(getClientId(context), message); setValid(false);