You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by bo...@apache.org on 2008/04/18 18:16:22 UTC
svn commit: r649588 - in /myfaces/tobago/trunk:
core/src/main/java/org/apache/myfaces/tobago/taglib/component/
core/src/main/java/org/apache/myfaces/tobago/taglib/decl/
extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/taglib/ex...
Author: bommel
Date: Fri Apr 18 09:16:19 2008
New Revision: 649588
URL: http://svn.apache.org/viewvc?rev=649588&view=rev
Log:
(TOBAGO-650) Support for validatorMessage, requiredMessage, converterMessage and label attribute for EditableValueHolder
Added:
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/decl/HasConverterMessage.java (with props)
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/decl/HasRequiredMessage.java (with props)
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/decl/HasValidatorMessage.java (with props)
Modified:
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/FileTagDeclaration.java
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/SelectBooleanCheckboxTagDeclaration.java
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/decl/InputTagDeclaration.java
myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/taglib/extension/DateExtensionTag.java
myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/taglib/extension/FileExtensionTag.java
myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/taglib/extension/InExtensionTag.java
myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/taglib/extension/SelectBooleanCheckboxExtensionTag.java
myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/taglib/extension/SelectManyCheckboxExtensionTag.java
myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/taglib/extension/SelectManyListboxExtensionTag.java
myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/taglib/extension/SelectOneChoiceExtensionTag.java
myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/taglib/extension/SelectOneListboxExtensionTag.java
myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/taglib/extension/SelectOneRadioExtensionTag.java
myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/taglib/extension/TextAreaExtensionTag.java
myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/taglib/extension/TimeExtensionTag.java
myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/taglib/extension12/DateExtensionTag.java
myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/taglib/extension12/FileExtensionTag.java
myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/taglib/extension12/InExtensionTag.java
myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/taglib/extension12/SelectBooleanCheckboxExtensionTag.java
myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/taglib/extension12/SelectManyCheckboxExtensionTag.java
myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/taglib/extension12/SelectManyListboxExtensionTag.java
myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/taglib/extension12/SelectOneChoiceExtensionTag.java
myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/taglib/extension12/SelectOneListboxExtensionTag.java
myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/taglib/extension12/SelectOneRadioExtensionTag.java
myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/taglib/extension12/TextAreaExtensionTag.java
myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/taglib/extension12/TimeExtensionTag.java
myfaces/tobago/trunk/tobago-tool/tobago-tool-apt/src/main/java/org/apache/myfaces/tobago/apt/CreateComponentAnnotationVisitor.java
myfaces/tobago/trunk/tobago-tool/tobago-tool-apt/src/main/java/org/apache/myfaces/tobago/apt/generate/ComponentInfo.java
myfaces/tobago/trunk/tobago-tool/tobago-tool-apt/src/main/resources/org/apache/myfaces/tobago/apt/component1.1.stg
myfaces/tobago/trunk/tobago-tool/tobago-tool-apt/src/main/resources/org/apache/myfaces/tobago/apt/component1.2.stg
Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/FileTagDeclaration.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/FileTagDeclaration.java?rev=649588&r1=649587&r2=649588&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/FileTagDeclaration.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/FileTagDeclaration.java Fri Apr 18 09:16:19 2008
@@ -32,6 +32,9 @@
import org.apache.myfaces.tobago.taglib.decl.IsDisabled;
import org.apache.myfaces.tobago.taglib.decl.IsReadonly;
import org.apache.myfaces.tobago.taglib.decl.IsRequired;
+import org.apache.myfaces.tobago.taglib.decl.HasValidatorMessage;
+import org.apache.myfaces.tobago.taglib.decl.HasRequiredMessage;
+import org.apache.myfaces.tobago.taglib.decl.HasConverterMessage;
/*
* Created: Aug 5, 2005 5:15:50 PM
@@ -52,7 +55,8 @@
rendererType = "File",
allowedChildComponenents = "NONE")
public interface FileTagDeclaration
- extends HasValidator, HasOnchange, HasValueChangeListener, HasIdBindingAndRendered, IsDisabled,
+ extends HasValidator, HasValidatorMessage, HasRequiredMessage, HasConverterMessage, HasOnchange,
+ HasValueChangeListener, HasIdBindingAndRendered, IsDisabled,
HasLabelAndAccessKey, HasTip, IsReadonly, IsRequired, HasTabIndex {
/**
Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/SelectBooleanCheckboxTagDeclaration.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/SelectBooleanCheckboxTagDeclaration.java?rev=649588&r1=649587&r2=649588&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/SelectBooleanCheckboxTagDeclaration.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/SelectBooleanCheckboxTagDeclaration.java Fri Apr 18 09:16:19 2008
@@ -36,6 +36,9 @@
import org.apache.myfaces.tobago.taglib.decl.IsRequired;
import org.apache.myfaces.tobago.taglib.decl.HasConverter;
import org.apache.myfaces.tobago.taglib.decl.IsFocus;
+import org.apache.myfaces.tobago.taglib.decl.HasValidatorMessage;
+import org.apache.myfaces.tobago.taglib.decl.HasRequiredMessage;
+import org.apache.myfaces.tobago.taglib.decl.HasConverterMessage;
//import org.apache.myfaces.tobago.taglib.decl.IsImmediateComponent;
/*
@@ -66,6 +69,7 @@
public interface SelectBooleanCheckboxTagDeclaration extends HasValidator,
HasOnchange, HasValueChangeListener, HasIdBindingAndRendered, HasLabelAndAccessKey, HasBooleanValue, IsDisabled,
- IsInline, HasTip, IsReadonly, HasMarkup, HasTabIndex, IsRequired, HasConverter, IsFocus /*, IsImmediateComponent */{
+ IsInline, HasTip, IsReadonly, HasMarkup, HasTabIndex, IsRequired, HasConverter, IsFocus,
+ HasValidatorMessage, HasRequiredMessage, HasConverterMessage /*, IsImmediateComponent */{
}
Added: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/decl/HasConverterMessage.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/decl/HasConverterMessage.java?rev=649588&view=auto
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/decl/HasConverterMessage.java (added)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/decl/HasConverterMessage.java Fri Apr 18 09:16:19 2008
@@ -0,0 +1,32 @@
+package org.apache.myfaces.tobago.taglib.decl;
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import org.apache.myfaces.tobago.apt.annotation.TagAttribute;
+import org.apache.myfaces.tobago.apt.annotation.UIComponentTagAttribute;
+
+
+public interface HasConverterMessage {
+
+ /**
+ * An expression that specifies the converter message
+ */
+ @TagAttribute
+ @UIComponentTagAttribute()
+ void setConverterMessage(String converterMessage);
+}
Propchange: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/decl/HasConverterMessage.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/decl/HasConverterMessage.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Added: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/decl/HasRequiredMessage.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/decl/HasRequiredMessage.java?rev=649588&view=auto
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/decl/HasRequiredMessage.java (added)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/decl/HasRequiredMessage.java Fri Apr 18 09:16:19 2008
@@ -0,0 +1,31 @@
+package org.apache.myfaces.tobago.taglib.decl;
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import org.apache.myfaces.tobago.apt.annotation.TagAttribute;
+import org.apache.myfaces.tobago.apt.annotation.UIComponentTagAttribute;
+
+
+public interface HasRequiredMessage {
+ /**
+ * An expression that specifies the required message
+ */
+ @TagAttribute
+ @UIComponentTagAttribute()
+ void setRequiredMessage(String requiredMessage);
+}
Propchange: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/decl/HasRequiredMessage.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/decl/HasRequiredMessage.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Added: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/decl/HasValidatorMessage.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/decl/HasValidatorMessage.java?rev=649588&view=auto
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/decl/HasValidatorMessage.java (added)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/decl/HasValidatorMessage.java Fri Apr 18 09:16:19 2008
@@ -0,0 +1,31 @@
+package org.apache.myfaces.tobago.taglib.decl;
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import org.apache.myfaces.tobago.apt.annotation.TagAttribute;
+import org.apache.myfaces.tobago.apt.annotation.UIComponentTagAttribute;
+
+public interface HasValidatorMessage {
+
+ /**
+ * An expression that specifies the validator message
+ */
+ @TagAttribute
+ @UIComponentTagAttribute()
+ void setValidatorMessage(String validatorMessage);
+}
Propchange: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/decl/HasValidatorMessage.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/decl/HasValidatorMessage.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/decl/InputTagDeclaration.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/decl/InputTagDeclaration.java?rev=649588&r1=649587&r2=649588&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/decl/InputTagDeclaration.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/decl/InputTagDeclaration.java Fri Apr 18 09:16:19 2008
@@ -22,7 +22,6 @@
* Created: Aug 5, 2005 4:18:38 PM
* $Id$
*/
-public interface InputTagDeclaration extends HasValidator,
- HasOnchange, HasValue, HasValueChangeListener, HasTabIndex, IsFocus {
-
+public interface InputTagDeclaration extends HasValidator, HasOnchange, HasValue, HasValueChangeListener,
+ HasValidatorMessage, HasConverterMessage, HasRequiredMessage, HasTabIndex, IsFocus {
}
Modified: myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/taglib/extension/DateExtensionTag.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/taglib/extension/DateExtensionTag.java?rev=649588&r1=649587&r2=649588&view=diff
==============================================================================
--- myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/taglib/extension/DateExtensionTag.java (original)
+++ myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/taglib/extension/DateExtensionTag.java Fri Apr 18 09:16:19 2008
@@ -38,6 +38,9 @@
import org.apache.myfaces.tobago.taglib.decl.IsInline;
import org.apache.myfaces.tobago.taglib.decl.IsReadonly;
import org.apache.myfaces.tobago.taglib.decl.IsRequired;
+import org.apache.myfaces.tobago.taglib.decl.HasValidatorMessage;
+import org.apache.myfaces.tobago.taglib.decl.HasRequiredMessage;
+import org.apache.myfaces.tobago.taglib.decl.HasConverterMessage;
import javax.servlet.jsp.JspException;
import javax.servlet.jsp.tagext.BodyTagSupport;
@@ -68,6 +71,7 @@
public class DateExtensionTag extends BodyTagSupport
implements HasValue, HasValueChangeListener, HasValidator, HasIdBindingAndRendered,
HasConverter, IsReadonly, IsDisabled, HasOnchange, IsRequired, HasTip,
+ HasValidatorMessage, HasRequiredMessage, HasConverterMessage,
HasLabel, HasMarkup, HasLabelWidth, IsFocus, IsInline, HasTabIndex {
private static final long serialVersionUID = 2044784791513107420L;
@@ -88,6 +92,9 @@
private String onchange;
private String tabIndex;
private String markup;
+ private String validatorMessage;
+ private String converterMessage;
+ private String requiredMessage;
private String labelWidth;
private LabelExtensionTag labelTag;
@@ -159,6 +166,15 @@
if (tabIndex != null) {
dateTag.setTabIndex(tabIndex);
}
+ if (validatorMessage != null) {
+ dateTag.setValidatorMessage(validatorMessage);
+ }
+ if (converterMessage != null) {
+ dateTag.setConverterMessage(converterMessage);
+ }
+ if (requiredMessage != null) {
+ dateTag.setRequiredMessage(requiredMessage);
+ }
dateTag.setParent(labelTag);
dateTag.doStartTag();
@@ -210,6 +226,9 @@
tabIndex = null;
labelTag = null;
dateTag = null;
+ validatorMessage = null;
+ converterMessage = null;
+ requiredMessage = null;
}
public void setValue(String value) {
@@ -278,5 +297,17 @@
public void setTabIndex(String tabIndex) {
this.tabIndex = tabIndex;
+ }
+
+ public void setValidatorMessage(String validatorMessage) {
+ this.validatorMessage = validatorMessage;
+ }
+
+ public void setConverterMessage(String converterMessage) {
+ this.converterMessage = converterMessage;
+ }
+
+ public void setRequiredMessage(String requiredMessage) {
+ this.requiredMessage = requiredMessage;
}
}
Modified: myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/taglib/extension/FileExtensionTag.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/taglib/extension/FileExtensionTag.java?rev=649588&r1=649587&r2=649588&view=diff
==============================================================================
--- myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/taglib/extension/FileExtensionTag.java (original)
+++ myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/taglib/extension/FileExtensionTag.java Fri Apr 18 09:16:19 2008
@@ -19,6 +19,8 @@
import org.apache.myfaces.tobago.apt.annotation.ExtensionTag;
import org.apache.myfaces.tobago.apt.annotation.Tag;
+import org.apache.myfaces.tobago.apt.annotation.TagAttribute;
+import org.apache.myfaces.tobago.apt.annotation.UIComponentTagAttribute;
import org.apache.myfaces.tobago.internal.taglib.FileTag;
import org.apache.myfaces.tobago.taglib.decl.InputTagDeclaration;
import org.apache.myfaces.tobago.taglib.decl.HasIdBindingAndRendered;
@@ -68,6 +70,9 @@
private String required;
private String tabIndex;
private String focus;
+ private String validatorMessage;
+ private String converterMessage;
+ private String requiredMessage;
private LabelExtensionTag labelTag;
private FileTag fileTag;
@@ -121,6 +126,15 @@
if (tabIndex != null) {
fileTag.setTabIndex(tabIndex);
}
+ if (validatorMessage != null) {
+ fileTag.setValidatorMessage(validatorMessage);
+ }
+ if (converterMessage != null) {
+ fileTag.setConverterMessage(converterMessage);
+ }
+ if (requiredMessage != null) {
+ fileTag.setRequiredMessage(requiredMessage);
+ }
if (focus != null) {
//fileTag.set
@@ -156,6 +170,9 @@
fileTag = null;
labelTag = null;
focus = null;
+ validatorMessage = null;
+ converterMessage = null;
+ requiredMessage = null;
}
public void setLabel(String label) {
@@ -212,5 +229,17 @@
public void setFocus(String focus) {
this.focus = focus;
+ }
+
+ public void setValidatorMessage(String validatorMessage) {
+ this.validatorMessage = validatorMessage;
+ }
+
+ public void setConverterMessage(String converterMessage) {
+ this.converterMessage = converterMessage;
+ }
+
+ public void setRequiredMessage(String requiredMessage) {
+ this.requiredMessage = requiredMessage;
}
}
Modified: myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/taglib/extension/InExtensionTag.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/taglib/extension/InExtensionTag.java?rev=649588&r1=649587&r2=649588&view=diff
==============================================================================
--- myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/taglib/extension/InExtensionTag.java (original)
+++ myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/taglib/extension/InExtensionTag.java Fri Apr 18 09:16:19 2008
@@ -37,6 +37,9 @@
import org.apache.myfaces.tobago.taglib.decl.IsPassword;
import org.apache.myfaces.tobago.taglib.decl.IsReadonly;
import org.apache.myfaces.tobago.taglib.decl.IsRequired;
+import org.apache.myfaces.tobago.taglib.decl.HasValidatorMessage;
+import org.apache.myfaces.tobago.taglib.decl.HasRequiredMessage;
+import org.apache.myfaces.tobago.taglib.decl.HasConverterMessage;
import javax.servlet.jsp.JspException;
import javax.servlet.jsp.tagext.BodyTagSupport;
@@ -64,6 +67,7 @@
public class InExtensionTag extends BodyTagSupport
implements HasValue, HasValueChangeListener, HasValidator, HasIdBindingAndRendered,
HasConverter, IsReadonly, IsDisabled, HasOnchange, HasMarkup, IsRequired,
+ HasValidatorMessage, HasRequiredMessage, HasConverterMessage,
HasTip, HasLabel, HasLabelWidth, IsPassword, IsFocus, HasSuggestMethod, HasTabIndex {
private String binding;
@@ -84,6 +88,9 @@
private String markup;
private String labelWidth;
private String tabIndex;
+ private String validatorMessage;
+ private String converterMessage;
+ private String requiredMessage;
private LabelExtensionTag labelTag;
private InTag inTag;
@@ -156,6 +163,15 @@
if (tabIndex != null) {
inTag.setTabIndex(tabIndex);
}
+ if (validatorMessage != null) {
+ inTag.setValidatorMessage(validatorMessage);
+ }
+ if (converterMessage != null) {
+ inTag.setConverterMessage(converterMessage);
+ }
+ if (requiredMessage != null) {
+ inTag.setRequiredMessage(requiredMessage);
+ }
inTag.setParent(labelTag);
inTag.doStartTag();
@@ -192,6 +208,9 @@
tabIndex = null;
inTag = null;
labelTag = null;
+ validatorMessage = null;
+ converterMessage = null;
+ requiredMessage = null;
}
public void setMarkup(String markup) {
@@ -264,5 +283,17 @@
public void setTabIndex(String tabIndex) {
this.tabIndex = tabIndex;
+ }
+
+ public void setValidatorMessage(String validatorMessage) {
+ this.validatorMessage = validatorMessage;
+ }
+
+ public void setConverterMessage(String converterMessage) {
+ this.converterMessage = converterMessage;
+ }
+
+ public void setRequiredMessage(String requiredMessage) {
+ this.requiredMessage = requiredMessage;
}
}
Modified: myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/taglib/extension/SelectBooleanCheckboxExtensionTag.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/taglib/extension/SelectBooleanCheckboxExtensionTag.java?rev=649588&r1=649587&r2=649588&view=diff
==============================================================================
--- myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/taglib/extension/SelectBooleanCheckboxExtensionTag.java (original)
+++ myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/taglib/extension/SelectBooleanCheckboxExtensionTag.java Fri Apr 18 09:16:19 2008
@@ -34,6 +34,9 @@
import org.apache.myfaces.tobago.taglib.decl.IsFocus;
import org.apache.myfaces.tobago.taglib.decl.IsReadonly;
import org.apache.myfaces.tobago.taglib.decl.IsRequired;
+import org.apache.myfaces.tobago.taglib.decl.HasValidatorMessage;
+import org.apache.myfaces.tobago.taglib.decl.HasRequiredMessage;
+import org.apache.myfaces.tobago.taglib.decl.HasConverterMessage;
import javax.servlet.jsp.JspException;
import javax.servlet.jsp.tagext.BodyTagSupport;
@@ -49,6 +52,7 @@
@ExtensionTag(baseClassName = "org.apache.myfaces.tobago.internal.taglib.SelectBooleanCheckboxTag")
public class SelectBooleanCheckboxExtensionTag extends BodyTagSupport implements
HasValidator, HasOnchange, HasValueChangeListener, HasIdBindingAndRendered, HasLabel,
+ HasValidatorMessage, HasRequiredMessage, HasConverterMessage,
HasBooleanValue, HasLabelWidth, IsDisabled, HasTip, IsReadonly, HasMarkup, HasTabIndex, IsRequired,
IsFocus {
@@ -68,6 +72,9 @@
private String tabIndex;
private String required;
private String focus;
+ private String validatorMessage;
+ private String converterMessage;
+ private String requiredMessage;
private LabelExtensionTag labelTag;
private SelectBooleanCheckboxTag selectBooleanCheckboxTag;
@@ -149,6 +156,15 @@
if (tabIndex != null) {
selectBooleanCheckboxTag.setTabIndex(tabIndex);
}
+ if (validatorMessage != null) {
+ selectBooleanCheckboxTag.setValidatorMessage(validatorMessage);
+ }
+ if (converterMessage != null) {
+ selectBooleanCheckboxTag.setConverterMessage(converterMessage);
+ }
+ if (requiredMessage != null) {
+ selectBooleanCheckboxTag.setRequiredMessage(requiredMessage);
+ }
selectBooleanCheckboxTag.setParent(labelTag);
selectBooleanCheckboxTag.doStartTag();
@@ -183,6 +199,9 @@
required = null;
selectBooleanCheckboxTag = null;
labelTag = null;
+ validatorMessage = null;
+ converterMessage = null;
+ requiredMessage = null;
}
public void setValue(String value) {
@@ -247,5 +266,17 @@
public void setRequired(String required) {
this.required = required;
+ }
+
+ public void setValidatorMessage(String validatorMessage) {
+ this.validatorMessage = validatorMessage;
+ }
+
+ public void setConverterMessage(String converterMessage) {
+ this.converterMessage = converterMessage;
+ }
+
+ public void setRequiredMessage(String requiredMessage) {
+ this.requiredMessage = requiredMessage;
}
}
Modified: myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/taglib/extension/SelectManyCheckboxExtensionTag.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/taglib/extension/SelectManyCheckboxExtensionTag.java?rev=649588&r1=649587&r2=649588&view=diff
==============================================================================
--- myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/taglib/extension/SelectManyCheckboxExtensionTag.java (original)
+++ myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/taglib/extension/SelectManyCheckboxExtensionTag.java Fri Apr 18 09:16:19 2008
@@ -36,6 +36,9 @@
import org.apache.myfaces.tobago.taglib.decl.IsRequired;
import org.apache.myfaces.tobago.taglib.decl.HasTabIndex;
import org.apache.myfaces.tobago.taglib.decl.HasRenderRange;
+import org.apache.myfaces.tobago.taglib.decl.HasValidatorMessage;
+import org.apache.myfaces.tobago.taglib.decl.HasRequiredMessage;
+import org.apache.myfaces.tobago.taglib.decl.HasConverterMessage;
import org.apache.myfaces.tobago.internal.taglib.SelectManyCheckboxTag;
import org.apache.myfaces.tobago.apt.annotation.Tag;
import org.apache.myfaces.tobago.apt.annotation.ExtensionTag;
@@ -51,6 +54,7 @@
public class SelectManyCheckboxExtensionTag extends BodyTagSupport
implements HasId, HasValue, HasValueChangeListener, IsDisabled, IsInline, //HasDeprecatedHeight,
HasLabel, HasLabelWidth, IsRendered, HasBinding, HasTip, HasConverter, HasValidator, HasOnchange,
+ HasValidatorMessage, HasRequiredMessage, HasConverterMessage,
IsReadonly, HasMarkup, IsFocus, IsRequired, HasTabIndex, HasRenderRange {
private String required;
@@ -72,6 +76,9 @@
private String tabIndex;
private String focus;
private String renderRange;
+ private String validatorMessage;
+ private String converterMessage;
+ private String requiredMessage;
private LabelExtensionTag labelTag;
private SelectManyCheckboxTag selectManyCheckboxTag;
@@ -154,6 +161,16 @@
if (tabIndex != null) {
selectManyCheckboxTag.setTabIndex(tabIndex);
}
+ if (validatorMessage != null) {
+ selectManyCheckboxTag.setValidatorMessage(validatorMessage);
+ }
+ if (converterMessage != null) {
+ selectManyCheckboxTag.setConverterMessage(converterMessage);
+ }
+ if (requiredMessage != null) {
+ selectManyCheckboxTag.setRequiredMessage(requiredMessage);
+ }
+
selectManyCheckboxTag.setParent(labelTag);
selectManyCheckboxTag.doStartTag();
@@ -191,6 +208,9 @@
labelTag = null;
focus = null;
renderRange = null;
+ validatorMessage = null;
+ converterMessage = null;
+ requiredMessage = null;
}
public void setRequired(String required) {
@@ -268,5 +288,19 @@
public void setRenderRange(String renderRange) {
this.renderRange = renderRange;
}
+
+ public void setValidatorMessage(String validatorMessage) {
+ this.validatorMessage = validatorMessage;
+ }
+
+ public void setConverterMessage(String converterMessage) {
+ this.converterMessage = converterMessage;
+ }
+
+ public void setRequiredMessage(String requiredMessage) {
+ this.requiredMessage = requiredMessage;
+ }
+
+
}
Modified: myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/taglib/extension/SelectManyListboxExtensionTag.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/taglib/extension/SelectManyListboxExtensionTag.java?rev=649588&r1=649587&r2=649588&view=diff
==============================================================================
--- myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/taglib/extension/SelectManyListboxExtensionTag.java (original)
+++ myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/taglib/extension/SelectManyListboxExtensionTag.java Fri Apr 18 09:16:19 2008
@@ -39,6 +39,9 @@
import org.apache.myfaces.tobago.taglib.decl.IsReadonly;
import org.apache.myfaces.tobago.taglib.decl.IsRendered;
import org.apache.myfaces.tobago.taglib.decl.IsRequired;
+import org.apache.myfaces.tobago.taglib.decl.HasValidatorMessage;
+import org.apache.myfaces.tobago.taglib.decl.HasRequiredMessage;
+import org.apache.myfaces.tobago.taglib.decl.HasConverterMessage;
import javax.servlet.jsp.JspException;
import javax.servlet.jsp.tagext.BodyTagSupport;
@@ -57,6 +60,7 @@
public class SelectManyListboxExtensionTag extends BodyTagSupport
implements HasId, HasValue, HasValueChangeListener, IsDisabled, HasDeprecatedHeight, IsInline,
HasLabel, HasLabelWidth, IsRendered, HasBinding, HasTip, HasConverter, HasValidator, HasOnchange,
+ HasValidatorMessage, HasRequiredMessage, HasConverterMessage,
IsReadonly, HasMarkup, IsFocus, IsRequired, HasTabIndex {
private String required;
@@ -77,6 +81,9 @@
private String markup;
private String tabIndex;
private String focus;
+ private String validatorMessage;
+ private String converterMessage;
+ private String requiredMessage;
private LabelExtensionTag labelTag;
private SelectManyListboxTag selectManyListboxTag;
@@ -156,6 +163,16 @@
if (tabIndex != null) {
selectManyListboxTag.setTabIndex(tabIndex);
}
+ if (validatorMessage != null) {
+ selectManyListboxTag.setValidatorMessage(validatorMessage);
+ }
+ if (converterMessage != null) {
+ selectManyListboxTag.setConverterMessage(converterMessage);
+ }
+ if (requiredMessage != null) {
+ selectManyListboxTag.setRequiredMessage(requiredMessage);
+ }
+
selectManyListboxTag.setParent(labelTag);
selectManyListboxTag.doStartTag();
@@ -192,6 +209,9 @@
selectManyListboxTag = null;
labelTag = null;
focus = null;
+ validatorMessage = null;
+ converterMessage = null;
+ requiredMessage = null;
}
public void setRequired(String required) {
@@ -264,5 +284,17 @@
public void setFocus(String focus) {
this.focus = focus;
+ }
+
+ public void setValidatorMessage(String validatorMessage) {
+ this.validatorMessage = validatorMessage;
+ }
+
+ public void setConverterMessage(String converterMessage) {
+ this.converterMessage = converterMessage;
+ }
+
+ public void setRequiredMessage(String requiredMessage) {
+ this.requiredMessage = requiredMessage;
}
}
Modified: myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/taglib/extension/SelectOneChoiceExtensionTag.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/taglib/extension/SelectOneChoiceExtensionTag.java?rev=649588&r1=649587&r2=649588&view=diff
==============================================================================
--- myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/taglib/extension/SelectOneChoiceExtensionTag.java (original)
+++ myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/taglib/extension/SelectOneChoiceExtensionTag.java Fri Apr 18 09:16:19 2008
@@ -38,6 +38,9 @@
import org.apache.myfaces.tobago.taglib.decl.IsRendered;
import org.apache.myfaces.tobago.taglib.decl.IsRequired;
import org.apache.myfaces.tobago.taglib.decl.HasMarkup;
+import org.apache.myfaces.tobago.taglib.decl.HasValidatorMessage;
+import org.apache.myfaces.tobago.taglib.decl.HasRequiredMessage;
+import org.apache.myfaces.tobago.taglib.decl.HasConverterMessage;
import javax.servlet.jsp.JspException;
import javax.servlet.jsp.tagext.BodyTagSupport;
@@ -52,6 +55,7 @@
extends BodyTagSupport
implements HasId, HasValue, HasValueChangeListener, IsDisabled,
IsReadonly, HasOnchange, IsInline, HasLabel, HasLabelWidth, IsRequired,
+ HasValidatorMessage, HasRequiredMessage, HasConverterMessage,
IsRendered, IsFocus, HasBinding, HasTip, HasValidator, HasConverter, HasMarkup, HasTabIndex {
private String required;
@@ -71,6 +75,9 @@
private String tabIndex;
private String focus;
private String markup;
+ private String validatorMessage;
+ private String converterMessage;
+ private String requiredMessage;
private LabelExtensionTag labelTag;
private SelectOneChoiceTag selectOneChoiceTag;
@@ -139,6 +146,16 @@
if (tabIndex != null) {
selectOneChoiceTag.setTabIndex(tabIndex);
}
+ if (validatorMessage != null) {
+ selectOneChoiceTag.setValidatorMessage(validatorMessage);
+ }
+ if (converterMessage != null) {
+ selectOneChoiceTag.setConverterMessage(converterMessage);
+ }
+ if (requiredMessage != null) {
+ selectOneChoiceTag.setRequiredMessage(requiredMessage);
+ }
+
selectOneChoiceTag.setParent(labelTag);
selectOneChoiceTag.doStartTag();
@@ -174,6 +191,9 @@
labelTag = null;
focus = null;
markup = null;
+ validatorMessage = null;
+ converterMessage = null;
+ requiredMessage = null;
}
public void setRequired(String required) {
@@ -242,5 +262,17 @@
public void setMarkup(String markup) {
this.markup = markup;
+ }
+
+ public void setValidatorMessage(String validatorMessage) {
+ this.validatorMessage = validatorMessage;
+ }
+
+ public void setConverterMessage(String converterMessage) {
+ this.converterMessage = converterMessage;
+ }
+
+ public void setRequiredMessage(String requiredMessage) {
+ this.requiredMessage = requiredMessage;
}
}
Modified: myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/taglib/extension/SelectOneListboxExtensionTag.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/taglib/extension/SelectOneListboxExtensionTag.java?rev=649588&r1=649587&r2=649588&view=diff
==============================================================================
--- myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/taglib/extension/SelectOneListboxExtensionTag.java (original)
+++ myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/taglib/extension/SelectOneListboxExtensionTag.java Fri Apr 18 09:16:19 2008
@@ -37,6 +37,9 @@
import org.apache.myfaces.tobago.taglib.decl.IsReadonly;
import org.apache.myfaces.tobago.taglib.decl.IsRendered;
import org.apache.myfaces.tobago.taglib.decl.IsRequired;
+import org.apache.myfaces.tobago.taglib.decl.HasValidatorMessage;
+import org.apache.myfaces.tobago.taglib.decl.HasRequiredMessage;
+import org.apache.myfaces.tobago.taglib.decl.HasConverterMessage;
import javax.servlet.jsp.JspException;
import javax.servlet.jsp.tagext.BodyTagSupport;
@@ -49,6 +52,7 @@
public class SelectOneListboxExtensionTag
extends BodyTagSupport implements HasId, HasValue, HasValueChangeListener, IsDisabled,
HasLabel, HasLabelWidth, IsReadonly, HasOnchange, IsRendered,
+ HasValidatorMessage, HasRequiredMessage, HasConverterMessage,
HasBinding, HasDeprecatedHeight, IsFocus, HasTip, IsRequired, HasConverter, HasValidator, HasTabIndex {
private String required;
private String value;
@@ -67,6 +71,9 @@
private String labelWidth;
private String tabIndex;
private String focus;
+ private String validatorMessage;
+ private String converterMessage;
+ private String requiredMessage;
private LabelExtensionTag labelTag;
private SelectOneListboxTag selectOneListboxTag;
@@ -136,6 +143,16 @@
if (tabIndex != null) {
selectOneListboxTag.setTabIndex(tabIndex);
}
+ if (validatorMessage != null) {
+ selectOneListboxTag.setValidatorMessage(validatorMessage);
+ }
+ if (converterMessage != null) {
+ selectOneListboxTag.setConverterMessage(converterMessage);
+ }
+ if (requiredMessage != null) {
+ selectOneListboxTag.setRequiredMessage(requiredMessage);
+ }
+
selectOneListboxTag.setParent(labelTag);
selectOneListboxTag.doStartTag();
@@ -171,6 +188,9 @@
selectOneListboxTag = null;
labelTag = null;
focus = null;
+ validatorMessage = null;
+ converterMessage = null;
+ requiredMessage = null;
}
public void setRequired(String required) {
@@ -239,5 +259,17 @@
public void setFocus(String focus) {
this.focus = focus;
+ }
+
+ public void setValidatorMessage(String validatorMessage) {
+ this.validatorMessage = validatorMessage;
+ }
+
+ public void setConverterMessage(String converterMessage) {
+ this.converterMessage = converterMessage;
+ }
+
+ public void setRequiredMessage(String requiredMessage) {
+ this.requiredMessage = requiredMessage;
}
}
Modified: myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/taglib/extension/SelectOneRadioExtensionTag.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/taglib/extension/SelectOneRadioExtensionTag.java?rev=649588&r1=649587&r2=649588&view=diff
==============================================================================
--- myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/taglib/extension/SelectOneRadioExtensionTag.java (original)
+++ myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/taglib/extension/SelectOneRadioExtensionTag.java Fri Apr 18 09:16:19 2008
@@ -37,6 +37,9 @@
import org.apache.myfaces.tobago.taglib.decl.IsReadonly;
import org.apache.myfaces.tobago.taglib.decl.IsRendered;
import org.apache.myfaces.tobago.taglib.decl.IsRequired;
+import org.apache.myfaces.tobago.taglib.decl.HasValidatorMessage;
+import org.apache.myfaces.tobago.taglib.decl.HasRequiredMessage;
+import org.apache.myfaces.tobago.taglib.decl.HasConverterMessage;
import javax.servlet.jsp.JspException;
import javax.servlet.jsp.tagext.BodyTagSupport;
@@ -52,6 +55,7 @@
public class SelectOneRadioExtensionTag extends BodyTagSupport
implements HasId, HasValue, HasValueChangeListener, IsDisabled,
IsReadonly, HasOnchange, IsInline, HasLabel, HasLabelWidth, IsRequired,
+ HasValidatorMessage, HasRequiredMessage, HasConverterMessage,
IsRendered, HasBinding, HasTip, HasValidator, HasConverter, HasRenderRange, HasTabIndex {
private String required;
@@ -71,6 +75,9 @@
private String tabIndex;
private String focus;
private String renderRange;
+ private String validatorMessage;
+ private String converterMessage;
+ private String requiredMessage;
private LabelExtensionTag labelTag;
private SelectOneRadioTag selectOneRadioTag;
@@ -139,6 +146,15 @@
if (renderRange != null) {
selectOneRadioTag.setRenderRange(renderRange);
}
+ if (validatorMessage != null) {
+ selectOneRadioTag.setValidatorMessage(validatorMessage);
+ }
+ if (converterMessage != null) {
+ selectOneRadioTag.setConverterMessage(converterMessage);
+ }
+ if (requiredMessage != null) {
+ selectOneRadioTag.setRequiredMessage(requiredMessage);
+ }
selectOneRadioTag.setParent(labelTag);
selectOneRadioTag.doStartTag();
@@ -175,6 +191,9 @@
labelTag = null;
focus = null;
renderRange = null;
+ validatorMessage = null;
+ converterMessage = null;
+ requiredMessage = null;
}
public void setRequired(String required) {
@@ -243,5 +262,17 @@
public void setRenderRange(String renderRange) {
this.renderRange = renderRange;
+ }
+
+ public void setValidatorMessage(String validatorMessage) {
+ this.validatorMessage = validatorMessage;
+ }
+
+ public void setConverterMessage(String converterMessage) {
+ this.converterMessage = converterMessage;
+ }
+
+ public void setRequiredMessage(String requiredMessage) {
+ this.requiredMessage = requiredMessage;
}
}
Modified: myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/taglib/extension/TextAreaExtensionTag.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/taglib/extension/TextAreaExtensionTag.java?rev=649588&r1=649587&r2=649588&view=diff
==============================================================================
--- myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/taglib/extension/TextAreaExtensionTag.java (original)
+++ myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/taglib/extension/TextAreaExtensionTag.java Fri Apr 18 09:16:19 2008
@@ -35,6 +35,9 @@
import org.apache.myfaces.tobago.taglib.decl.IsFocus;
import org.apache.myfaces.tobago.taglib.decl.IsReadonly;
import org.apache.myfaces.tobago.taglib.decl.IsRequired;
+import org.apache.myfaces.tobago.taglib.decl.HasValidatorMessage;
+import org.apache.myfaces.tobago.taglib.decl.HasRequiredMessage;
+import org.apache.myfaces.tobago.taglib.decl.HasConverterMessage;
import javax.servlet.jsp.JspException;
import javax.servlet.jsp.tagext.BodyTagSupport;
@@ -62,6 +65,7 @@
public class TextAreaExtensionTag extends BodyTagSupport
implements HasValue, HasValueChangeListener, HasIdBindingAndRendered,
HasConverter, HasValidator, IsReadonly, IsDisabled, HasMarkup, IsRequired,
+ HasValidatorMessage, HasRequiredMessage, HasConverterMessage,
HasTip, HasLabel, HasLabelWidth, IsFocus, HasOnchange, HasTabIndex {
private String binding;
@@ -80,6 +84,9 @@
private String markup;
private String labelWidth;
private String tabIndex;
+ private String validatorMessage;
+ private String converterMessage;
+ private String requiredMessage;
private LabelExtensionTag labelTag;
private TextareaTag textAreaTag;
@@ -146,6 +153,16 @@
if (tabIndex != null) {
textAreaTag.setTabIndex(tabIndex);
}
+ if (validatorMessage != null) {
+ textAreaTag.setValidatorMessage(validatorMessage);
+ }
+ if (converterMessage != null) {
+ textAreaTag.setConverterMessage(converterMessage);
+ }
+ if (requiredMessage != null) {
+ textAreaTag.setRequiredMessage(requiredMessage);
+ }
+
textAreaTag.setParent(labelTag);
textAreaTag.doStartTag();
@@ -180,6 +197,9 @@
tabIndex = null;
textAreaTag = null;
labelTag = null;
+ validatorMessage = null;
+ converterMessage = null;
+ requiredMessage = null;
}
public void setValue(String value) {
@@ -244,5 +264,17 @@
public void setTabIndex(String tabIndex) {
this.tabIndex = tabIndex;
+ }
+
+ public void setValidatorMessage(String validatorMessage) {
+ this.validatorMessage = validatorMessage;
+ }
+
+ public void setConverterMessage(String converterMessage) {
+ this.converterMessage = converterMessage;
+ }
+
+ public void setRequiredMessage(String requiredMessage) {
+ this.requiredMessage = requiredMessage;
}
}
Modified: myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/taglib/extension/TimeExtensionTag.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/taglib/extension/TimeExtensionTag.java?rev=649588&r1=649587&r2=649588&view=diff
==============================================================================
--- myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/taglib/extension/TimeExtensionTag.java (original)
+++ myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/taglib/extension/TimeExtensionTag.java Fri Apr 18 09:16:19 2008
@@ -35,6 +35,9 @@
import org.apache.myfaces.tobago.taglib.decl.IsInline;
import org.apache.myfaces.tobago.taglib.decl.IsReadonly;
import org.apache.myfaces.tobago.taglib.decl.IsRequired;
+import org.apache.myfaces.tobago.taglib.decl.HasValidatorMessage;
+import org.apache.myfaces.tobago.taglib.decl.HasRequiredMessage;
+import org.apache.myfaces.tobago.taglib.decl.HasConverterMessage;
import javax.servlet.jsp.JspException;
import javax.servlet.jsp.tagext.BodyTagSupport;
@@ -61,6 +64,7 @@
public class TimeExtensionTag extends BodyTagSupport
implements HasValue, HasValueChangeListener, HasValidator, HasIdBindingAndRendered,
HasConverter, IsReadonly, IsDisabled, HasOnchange, IsRequired, HasTip,
+ HasValidatorMessage, HasRequiredMessage, HasConverterMessage,
HasLabel, HasLabelWidth, IsFocus, IsInline, HasTabIndex {
private String binding;
@@ -79,6 +83,9 @@
private String onchange;
private String labelWidth;
private String tabIndex;
+ private String validatorMessage;
+ private String converterMessage;
+ private String requiredMessage;
private LabelExtensionTag labelTag;
private TimeTag timeTag;
@@ -144,6 +151,16 @@
if (tabIndex != null) {
timeTag.setTabIndex(tabIndex);
}
+ if (validatorMessage != null) {
+ timeTag.setValidatorMessage(validatorMessage);
+ }
+ if (converterMessage != null) {
+ timeTag.setConverterMessage(converterMessage);
+ }
+ if (requiredMessage != null) {
+ timeTag.setRequiredMessage(requiredMessage);
+ }
+
timeTag.setParent(labelTag);
timeTag.doStartTag();
@@ -178,6 +195,9 @@
tabIndex = null;
timeTag = null;
labelTag = null;
+ validatorMessage = null;
+ converterMessage = null;
+ requiredMessage = null;
}
public void setValue(String value) {
@@ -242,5 +262,17 @@
public void setTabIndex(String tabIndex) {
this.tabIndex = tabIndex;
+ }
+
+ public void setValidatorMessage(String validatorMessage) {
+ this.validatorMessage = validatorMessage;
+ }
+
+ public void setConverterMessage(String converterMessage) {
+ this.converterMessage = converterMessage;
+ }
+
+ public void setRequiredMessage(String requiredMessage) {
+ this.requiredMessage = requiredMessage;
}
}
Modified: myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/taglib/extension12/DateExtensionTag.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/taglib/extension12/DateExtensionTag.java?rev=649588&r1=649587&r2=649588&view=diff
==============================================================================
--- myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/taglib/extension12/DateExtensionTag.java (original)
+++ myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/taglib/extension12/DateExtensionTag.java Fri Apr 18 09:16:19 2008
@@ -71,6 +71,9 @@
private javax.el.ValueExpression onchange;
private javax.el.ValueExpression tabIndex;
private javax.el.ValueExpression markup;
+ private javax.el.ValueExpression validatorMessage;
+ private javax.el.ValueExpression converterMessage;
+ private javax.el.ValueExpression requiredMessage;
private javax.el.ValueExpression labelWidth;
private LabelExtensionTag labelTag;
@@ -143,6 +146,16 @@
if (tabIndex != null) {
dateTag.setTabIndex(tabIndex);
}
+ if (validatorMessage != null) {
+ dateTag.setValidatorMessage(validatorMessage);
+ }
+ if (converterMessage != null) {
+ dateTag.setConverterMessage(converterMessage);
+ }
+ if (requiredMessage != null) {
+ dateTag.setRequiredMessage(requiredMessage);
+ }
+
dateTag.setParent(labelTag);
dateTag.doStartTag();
@@ -196,6 +209,9 @@
tabIndex = null;
labelTag = null;
dateTag = null;
+ validatorMessage = null;
+ converterMessage = null;
+ requiredMessage = null;
}
/**
@@ -375,4 +391,32 @@
public void setTabIndex(javax.el.ValueExpression tabIndex) {
this.tabIndex = tabIndex;
}
+
+ /**
+ * An expression that specifies the validator message
+ */
+ @TagAttribute
+ @UIComponentTagAttribute()
+ public void setValidatorMessage(javax.el.ValueExpression validatorMessage) {
+ this.validatorMessage = validatorMessage;
+ }
+
+ /**
+ * An expression that specifies the converter message
+ */
+ @TagAttribute
+ @UIComponentTagAttribute()
+ public void setConverterMessage(javax.el.ValueExpression converterMessage) {
+ this.converterMessage = converterMessage;
+ }
+
+ /**
+ * An expression that specifies the required message
+ */
+ @TagAttribute
+ @UIComponentTagAttribute()
+ public void setRequiredMessage(javax.el.ValueExpression requiredMessage) {
+ this.requiredMessage = requiredMessage;
+ }
+
}
Modified: myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/taglib/extension12/FileExtensionTag.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/taglib/extension12/FileExtensionTag.java?rev=649588&r1=649587&r2=649588&view=diff
==============================================================================
--- myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/taglib/extension12/FileExtensionTag.java (original)
+++ myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/taglib/extension12/FileExtensionTag.java Fri Apr 18 09:16:19 2008
@@ -61,6 +61,9 @@
private javax.el.ValueExpression required;
private javax.el.ValueExpression tabIndex;
private javax.el.ValueExpression focus;
+ private javax.el.ValueExpression validatorMessage;
+ private javax.el.ValueExpression converterMessage;
+ private javax.el.ValueExpression requiredMessage;
private LabelExtensionTag labelTag;
private FileTag fileTag;
@@ -118,6 +121,15 @@
if (focus != null) {
//fileTag.set
}
+ if (validatorMessage != null) {
+ fileTag.setValidatorMessage(validatorMessage);
+ }
+ if (converterMessage != null) {
+ fileTag.setConverterMessage(converterMessage);
+ }
+ if (requiredMessage != null) {
+ fileTag.setRequiredMessage(requiredMessage);
+ }
fileTag.setParent(labelTag);
fileTag.doStartTag();
@@ -149,6 +161,9 @@
fileTag = null;
labelTag = null;
focus = null;
+ validatorMessage = null;
+ converterMessage = null;
+ requiredMessage = null;
}
/**
@@ -283,4 +298,32 @@
public void setFocus(javax.el.ValueExpression focus) {
this.focus = focus;
}
+
+ /**
+ * An expression that specifies the validator message
+ */
+ @TagAttribute
+ @UIComponentTagAttribute()
+ public void setValidatorMessage(javax.el.ValueExpression validatorMessage) {
+ this.validatorMessage = validatorMessage;
+ }
+
+ /**
+ * An expression that specifies the converter message
+ */
+ @TagAttribute
+ @UIComponentTagAttribute()
+ public void setConverterMessage(javax.el.ValueExpression converterMessage) {
+ this.converterMessage = converterMessage;
+ }
+
+ /**
+ * An expression that specifies the required message
+ */
+ @TagAttribute
+ @UIComponentTagAttribute()
+ public void setRequiredMessage(javax.el.ValueExpression requiredMessage) {
+ this.requiredMessage = requiredMessage;
+ }
+
}
Modified: myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/taglib/extension12/InExtensionTag.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/taglib/extension12/InExtensionTag.java?rev=649588&r1=649587&r2=649588&view=diff
==============================================================================
--- myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/taglib/extension12/InExtensionTag.java (original)
+++ myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/taglib/extension12/InExtensionTag.java Fri Apr 18 09:16:19 2008
@@ -66,6 +66,9 @@
private javax.el.ValueExpression markup;
private javax.el.ValueExpression labelWidth;
private javax.el.ValueExpression tabIndex;
+ private javax.el.ValueExpression validatorMessage;
+ private javax.el.ValueExpression converterMessage;
+ private javax.el.ValueExpression requiredMessage;
private LabelExtensionTag labelTag;
private InTag inTag;
@@ -138,6 +141,15 @@
if (tabIndex != null) {
inTag.setTabIndex(tabIndex);
}
+ if (validatorMessage != null) {
+ inTag.setValidatorMessage(validatorMessage);
+ }
+ if (converterMessage != null) {
+ inTag.setConverterMessage(converterMessage);
+ }
+ if (requiredMessage != null) {
+ inTag.setRequiredMessage(requiredMessage);
+ }
inTag.setParent(labelTag);
inTag.doStartTag();
@@ -174,6 +186,9 @@
tabIndex = null;
inTag = null;
labelTag = null;
+ validatorMessage = null;
+ converterMessage = null;
+ requiredMessage = null;
}
/**
@@ -364,4 +379,32 @@
public void setTabIndex(javax.el.ValueExpression tabIndex) {
this.tabIndex = tabIndex;
}
+
+ /**
+ * An expression that specifies the validator message
+ */
+ @TagAttribute
+ @UIComponentTagAttribute()
+ public void setValidatorMessage(javax.el.ValueExpression validatorMessage) {
+ this.validatorMessage = validatorMessage;
+ }
+
+ /**
+ * An expression that specifies the converter message
+ */
+ @TagAttribute
+ @UIComponentTagAttribute()
+ public void setConverterMessage(javax.el.ValueExpression converterMessage) {
+ this.converterMessage = converterMessage;
+ }
+
+ /**
+ * An expression that specifies the required message
+ */
+ @TagAttribute
+ @UIComponentTagAttribute()
+ public void setRequiredMessage(javax.el.ValueExpression requiredMessage) {
+ this.requiredMessage = requiredMessage;
+ }
+
}
Modified: myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/taglib/extension12/SelectBooleanCheckboxExtensionTag.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/taglib/extension12/SelectBooleanCheckboxExtensionTag.java?rev=649588&r1=649587&r2=649588&view=diff
==============================================================================
--- myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/taglib/extension12/SelectBooleanCheckboxExtensionTag.java (original)
+++ myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/taglib/extension12/SelectBooleanCheckboxExtensionTag.java Fri Apr 18 09:16:19 2008
@@ -53,6 +53,9 @@
private javax.el.ValueExpression tabIndex;
private javax.el.ValueExpression required;
private javax.el.ValueExpression focus;
+ private javax.el.ValueExpression validatorMessage;
+ private javax.el.ValueExpression converterMessage;
+ private javax.el.ValueExpression requiredMessage;
private LabelExtensionTag labelTag;
private SelectBooleanCheckboxTag selectBooleanCheckboxTag;
@@ -134,6 +137,15 @@
if (tabIndex != null) {
selectBooleanCheckboxTag.setTabIndex(tabIndex);
}
+ if (validatorMessage != null) {
+ selectBooleanCheckboxTag.setValidatorMessage(validatorMessage);
+ }
+ if (converterMessage != null) {
+ selectBooleanCheckboxTag.setConverterMessage(converterMessage);
+ }
+ if (requiredMessage != null) {
+ selectBooleanCheckboxTag.setRequiredMessage(requiredMessage);
+ }
selectBooleanCheckboxTag.setParent(labelTag);
selectBooleanCheckboxTag.doStartTag();
@@ -168,6 +180,9 @@
required = null;
selectBooleanCheckboxTag = null;
labelTag = null;
+ validatorMessage = null;
+ converterMessage = null;
+ requiredMessage = null;
}
/**
@@ -338,4 +353,32 @@
public void setRequired(javax.el.ValueExpression required) {
this.required = required;
}
+
+ /**
+ * An expression that specifies the validator message
+ */
+ @TagAttribute
+ @UIComponentTagAttribute()
+ public void setValidatorMessage(javax.el.ValueExpression validatorMessage) {
+ this.validatorMessage = validatorMessage;
+ }
+
+ /**
+ * An expression that specifies the converter message
+ */
+ @TagAttribute
+ @UIComponentTagAttribute()
+ public void setConverterMessage(javax.el.ValueExpression converterMessage) {
+ this.converterMessage = converterMessage;
+ }
+
+ /**
+ * An expression that specifies the required message
+ */
+ @TagAttribute
+ @UIComponentTagAttribute()
+ public void setRequiredMessage(javax.el.ValueExpression requiredMessage) {
+ this.requiredMessage = requiredMessage;
+ }
+
}
Modified: myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/taglib/extension12/SelectManyCheckboxExtensionTag.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/taglib/extension12/SelectManyCheckboxExtensionTag.java?rev=649588&r1=649587&r2=649588&view=diff
==============================================================================
--- myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/taglib/extension12/SelectManyCheckboxExtensionTag.java (original)
+++ myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/taglib/extension12/SelectManyCheckboxExtensionTag.java Fri Apr 18 09:16:19 2008
@@ -51,6 +51,9 @@
private javax.el.ValueExpression tabIndex;
private javax.el.ValueExpression focus;
private javax.el.ValueExpression renderRange;
+ private javax.el.ValueExpression validatorMessage;
+ private javax.el.ValueExpression converterMessage;
+ private javax.el.ValueExpression requiredMessage;
private LabelExtensionTag labelTag;
private SelectManyCheckboxTag selectManyCheckboxTag;
@@ -133,6 +136,15 @@
if (tabIndex != null) {
selectManyCheckboxTag.setTabIndex(tabIndex);
}
+ if (validatorMessage != null) {
+ selectManyCheckboxTag.setValidatorMessage(validatorMessage);
+ }
+ if (converterMessage != null) {
+ selectManyCheckboxTag.setConverterMessage(converterMessage);
+ }
+ if (requiredMessage != null) {
+ selectManyCheckboxTag.setRequiredMessage(requiredMessage);
+ }
selectManyCheckboxTag.setParent(labelTag);
selectManyCheckboxTag.doStartTag();
@@ -170,6 +182,9 @@
labelTag = null;
focus = null;
renderRange = null;
+ validatorMessage = null;
+ converterMessage = null;
+ requiredMessage = null;
}
/**
@@ -362,5 +377,33 @@
public void setRenderRange(javax.el.ValueExpression renderRange) {
this.renderRange = renderRange;
}
+
+ /**
+ * An expression that specifies the validator message
+ */
+ @TagAttribute
+ @UIComponentTagAttribute()
+ public void setValidatorMessage(javax.el.ValueExpression validatorMessage) {
+ this.validatorMessage = validatorMessage;
+ }
+
+ /**
+ * An expression that specifies the converter message
+ */
+ @TagAttribute
+ @UIComponentTagAttribute()
+ public void setConverterMessage(javax.el.ValueExpression converterMessage) {
+ this.converterMessage = converterMessage;
+ }
+
+ /**
+ * An expression that specifies the required message
+ */
+ @TagAttribute
+ @UIComponentTagAttribute()
+ public void setRequiredMessage(javax.el.ValueExpression requiredMessage) {
+ this.requiredMessage = requiredMessage;
+ }
+
}
Modified: myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/taglib/extension12/SelectManyListboxExtensionTag.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/taglib/extension12/SelectManyListboxExtensionTag.java?rev=649588&r1=649587&r2=649588&view=diff
==============================================================================
--- myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/taglib/extension12/SelectManyListboxExtensionTag.java (original)
+++ myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/taglib/extension12/SelectManyListboxExtensionTag.java Fri Apr 18 09:16:19 2008
@@ -57,6 +57,9 @@
private javax.el.ValueExpression markup;
private javax.el.ValueExpression tabIndex;
private javax.el.ValueExpression focus;
+ private javax.el.ValueExpression validatorMessage;
+ private javax.el.ValueExpression converterMessage;
+ private javax.el.ValueExpression requiredMessage;
private LabelExtensionTag labelTag;
private SelectManyListboxTag selectManyListboxTag;
@@ -136,6 +139,15 @@
if (tabIndex != null) {
selectManyListboxTag.setTabIndex(tabIndex);
}
+ if (validatorMessage != null) {
+ selectManyListboxTag.setValidatorMessage(validatorMessage);
+ }
+ if (converterMessage != null) {
+ selectManyListboxTag.setConverterMessage(converterMessage);
+ }
+ if (requiredMessage != null) {
+ selectManyListboxTag.setRequiredMessage(requiredMessage);
+ }
selectManyListboxTag.setParent(labelTag);
selectManyListboxTag.doStartTag();
@@ -172,6 +184,9 @@
selectManyListboxTag = null;
labelTag = null;
focus = null;
+ validatorMessage = null;
+ converterMessage = null;
+ requiredMessage = null;
}
/**
@@ -355,4 +370,32 @@
public void setFocus(javax.el.ValueExpression focus) {
this.focus = focus;
}
+
+ /**
+ * An expression that specifies the validator message
+ */
+ @TagAttribute
+ @UIComponentTagAttribute()
+ public void setValidatorMessage(javax.el.ValueExpression validatorMessage) {
+ this.validatorMessage = validatorMessage;
+ }
+
+ /**
+ * An expression that specifies the converter message
+ */
+ @TagAttribute
+ @UIComponentTagAttribute()
+ public void setConverterMessage(javax.el.ValueExpression converterMessage) {
+ this.converterMessage = converterMessage;
+ }
+
+ /**
+ * An expression that specifies the required message
+ */
+ @TagAttribute
+ @UIComponentTagAttribute()
+ public void setRequiredMessage(javax.el.ValueExpression requiredMessage) {
+ this.requiredMessage = requiredMessage;
+ }
+
}
Modified: myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/taglib/extension12/SelectOneChoiceExtensionTag.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/taglib/extension12/SelectOneChoiceExtensionTag.java?rev=649588&r1=649587&r2=649588&view=diff
==============================================================================
--- myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/taglib/extension12/SelectOneChoiceExtensionTag.java (original)
+++ myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/taglib/extension12/SelectOneChoiceExtensionTag.java Fri Apr 18 09:16:19 2008
@@ -51,6 +51,9 @@
private javax.el.ValueExpression tabIndex;
private javax.el.ValueExpression focus;
private javax.el.ValueExpression markup;
+ private javax.el.ValueExpression validatorMessage;
+ private javax.el.ValueExpression converterMessage;
+ private javax.el.ValueExpression requiredMessage;
private LabelExtensionTag labelTag;
private SelectOneChoiceTag selectOneChoiceTag;
@@ -119,6 +122,15 @@
if (tabIndex != null) {
selectOneChoiceTag.setTabIndex(tabIndex);
}
+ if (validatorMessage != null) {
+ selectOneChoiceTag.setValidatorMessage(validatorMessage);
+ }
+ if (converterMessage != null) {
+ selectOneChoiceTag.setConverterMessage(converterMessage);
+ }
+ if (requiredMessage != null) {
+ selectOneChoiceTag.setRequiredMessage(requiredMessage);
+ }
selectOneChoiceTag.setParent(labelTag);
selectOneChoiceTag.doStartTag();
@@ -154,6 +166,9 @@
labelTag = null;
focus = null;
markup = null;
+ validatorMessage = null;
+ converterMessage = null;
+ requiredMessage = null;
}
/**
@@ -333,4 +348,32 @@
public void setMarkup(javax.el.ValueExpression markup) {
this.markup = markup;
}
+
+ /**
+ * An expression that specifies the validator message
+ */
+ @TagAttribute
+ @UIComponentTagAttribute()
+ public void setValidatorMessage(javax.el.ValueExpression validatorMessage) {
+ this.validatorMessage = validatorMessage;
+ }
+
+ /**
+ * An expression that specifies the converter message
+ */
+ @TagAttribute
+ @UIComponentTagAttribute()
+ public void setConverterMessage(javax.el.ValueExpression converterMessage) {
+ this.converterMessage = converterMessage;
+ }
+
+ /**
+ * An expression that specifies the required message
+ */
+ @TagAttribute
+ @UIComponentTagAttribute()
+ public void setRequiredMessage(javax.el.ValueExpression requiredMessage) {
+ this.requiredMessage = requiredMessage;
+ }
+
}
Modified: myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/taglib/extension12/SelectOneListboxExtensionTag.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/taglib/extension12/SelectOneListboxExtensionTag.java?rev=649588&r1=649587&r2=649588&view=diff
==============================================================================
--- myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/taglib/extension12/SelectOneListboxExtensionTag.java (original)
+++ myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/taglib/extension12/SelectOneListboxExtensionTag.java Fri Apr 18 09:16:19 2008
@@ -49,6 +49,9 @@
private javax.el.ValueExpression labelWidth;
private javax.el.ValueExpression tabIndex;
private javax.el.ValueExpression focus;
+ private javax.el.ValueExpression validatorMessage;
+ private javax.el.ValueExpression converterMessage;
+ private javax.el.ValueExpression requiredMessage;
private LabelExtensionTag labelTag;
private SelectOneListboxTag selectOneListboxTag;
@@ -118,6 +121,15 @@
if (tabIndex != null) {
selectOneListboxTag.setTabIndex(tabIndex);
}
+ if (validatorMessage != null) {
+ selectOneListboxTag.setValidatorMessage(validatorMessage);
+ }
+ if (converterMessage != null) {
+ selectOneListboxTag.setConverterMessage(converterMessage);
+ }
+ if (requiredMessage != null) {
+ selectOneListboxTag.setRequiredMessage(requiredMessage);
+ }
selectOneListboxTag.setParent(labelTag);
selectOneListboxTag.doStartTag();
@@ -153,6 +165,9 @@
selectOneListboxTag = null;
labelTag = null;
focus = null;
+ validatorMessage = null;
+ converterMessage = null;
+ requiredMessage = null;
}
/**
* Flag indicating that a value is required.
@@ -320,4 +335,32 @@
public void setFocus(javax.el.ValueExpression focus) {
this.focus = focus;
}
+
+ /**
+ * An expression that specifies the validator message
+ */
+ @TagAttribute
+ @UIComponentTagAttribute()
+ public void setValidatorMessage(javax.el.ValueExpression validatorMessage) {
+ this.validatorMessage = validatorMessage;
+ }
+
+ /**
+ * An expression that specifies the converter message
+ */
+ @TagAttribute
+ @UIComponentTagAttribute()
+ public void setConverterMessage(javax.el.ValueExpression converterMessage) {
+ this.converterMessage = converterMessage;
+ }
+
+ /**
+ * An expression that specifies the required message
+ */
+ @TagAttribute
+ @UIComponentTagAttribute()
+ public void setRequiredMessage(javax.el.ValueExpression requiredMessage) {
+ this.requiredMessage = requiredMessage;
+ }
+
}
Modified: myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/taglib/extension12/SelectOneRadioExtensionTag.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/taglib/extension12/SelectOneRadioExtensionTag.java?rev=649588&r1=649587&r2=649588&view=diff
==============================================================================
--- myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/taglib/extension12/SelectOneRadioExtensionTag.java (original)
+++ myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/taglib/extension12/SelectOneRadioExtensionTag.java Fri Apr 18 09:16:19 2008
@@ -53,6 +53,9 @@
private javax.el.ValueExpression tabIndex;
private javax.el.ValueExpression focus;
private javax.el.ValueExpression renderRange;
+ private javax.el.ValueExpression validatorMessage;
+ private javax.el.ValueExpression converterMessage;
+ private javax.el.ValueExpression requiredMessage;
private LabelExtensionTag labelTag;
private SelectOneRadioTag selectOneRadioTag;
@@ -121,6 +124,15 @@
if (renderRange != null) {
selectOneRadioTag.setRenderRange(renderRange);
}
+ if (validatorMessage != null) {
+ selectOneRadioTag.setValidatorMessage(validatorMessage);
+ }
+ if (converterMessage != null) {
+ selectOneRadioTag.setConverterMessage(converterMessage);
+ }
+ if (requiredMessage != null) {
+ selectOneRadioTag.setRequiredMessage(requiredMessage);
+ }
selectOneRadioTag.setParent(labelTag);
selectOneRadioTag.doStartTag();
@@ -157,6 +169,9 @@
labelTag = null;
focus = null;
renderRange = null;
+ validatorMessage = null;
+ converterMessage = null;
+ requiredMessage = null;
}
/**
@@ -334,4 +349,32 @@
public void setRenderRange(javax.el.ValueExpression renderRange) {
this.renderRange = renderRange;
}
+
+ /**
+ * An expression that specifies the validator message
+ */
+ @TagAttribute
+ @UIComponentTagAttribute()
+ public void setValidatorMessage(javax.el.ValueExpression validatorMessage) {
+ this.validatorMessage = validatorMessage;
+ }
+
+ /**
+ * An expression that specifies the converter message
+ */
+ @TagAttribute
+ @UIComponentTagAttribute()
+ public void setConverterMessage(javax.el.ValueExpression converterMessage) {
+ this.converterMessage = converterMessage;
+ }
+
+ /**
+ * An expression that specifies the required message
+ */
+ @TagAttribute
+ @UIComponentTagAttribute()
+ public void setRequiredMessage(javax.el.ValueExpression requiredMessage) {
+ this.requiredMessage = requiredMessage;
+ }
+
}
Modified: myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/taglib/extension12/TextAreaExtensionTag.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/taglib/extension12/TextAreaExtensionTag.java?rev=649588&r1=649587&r2=649588&view=diff
==============================================================================
--- myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/taglib/extension12/TextAreaExtensionTag.java (original)
+++ myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/taglib/extension12/TextAreaExtensionTag.java Fri Apr 18 09:16:19 2008
@@ -64,6 +64,9 @@
private javax.el.ValueExpression markup;
private javax.el.ValueExpression labelWidth;
private javax.el.ValueExpression tabIndex;
+ private javax.el.ValueExpression validatorMessage;
+ private javax.el.ValueExpression converterMessage;
+ private javax.el.ValueExpression requiredMessage;
private LabelExtensionTag labelTag;
private TextareaTag textAreaTag;
@@ -130,6 +133,15 @@
if (tabIndex != null) {
textAreaTag.setTabIndex(tabIndex);
}
+ if (validatorMessage != null) {
+ textAreaTag.setValidatorMessage(validatorMessage);
+ }
+ if (converterMessage != null) {
+ textAreaTag.setConverterMessage(converterMessage);
+ }
+ if (requiredMessage != null) {
+ textAreaTag.setRequiredMessage(requiredMessage);
+ }
textAreaTag.setParent(labelTag);
textAreaTag.doStartTag();
@@ -164,6 +176,9 @@
tabIndex = null;
textAreaTag = null;
labelTag = null;
+ validatorMessage = null;
+ converterMessage = null;
+ requiredMessage = null;
}
/**
@@ -334,4 +349,32 @@
public void setTabIndex(javax.el.ValueExpression tabIndex) {
this.tabIndex = tabIndex;
}
+
+ /**
+ * An expression that specifies the validator message
+ */
+ @TagAttribute
+ @UIComponentTagAttribute()
+ public void setValidatorMessage(javax.el.ValueExpression validatorMessage) {
+ this.validatorMessage = validatorMessage;
+ }
+
+ /**
+ * An expression that specifies the converter message
+ */
+ @TagAttribute
+ @UIComponentTagAttribute()
+ public void setConverterMessage(javax.el.ValueExpression converterMessage) {
+ this.converterMessage = converterMessage;
+ }
+
+ /**
+ * An expression that specifies the required message
+ */
+ @TagAttribute
+ @UIComponentTagAttribute()
+ public void setRequiredMessage(javax.el.ValueExpression requiredMessage) {
+ this.requiredMessage = requiredMessage;
+ }
+
}
Modified: myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/taglib/extension12/TimeExtensionTag.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/taglib/extension12/TimeExtensionTag.java?rev=649588&r1=649587&r2=649588&view=diff
==============================================================================
--- myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/taglib/extension12/TimeExtensionTag.java (original)
+++ myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/taglib/extension12/TimeExtensionTag.java Fri Apr 18 09:16:19 2008
@@ -63,6 +63,9 @@
private javax.el.ValueExpression onchange;
private javax.el.ValueExpression labelWidth;
private javax.el.ValueExpression tabIndex;
+ private javax.el.ValueExpression validatorMessage;
+ private javax.el.ValueExpression converterMessage;
+ private javax.el.ValueExpression requiredMessage;
private LabelExtensionTag labelTag;
private TimeTag timeTag;
@@ -128,6 +131,15 @@
if (tabIndex != null) {
timeTag.setTabIndex(tabIndex);
}
+ if (validatorMessage != null) {
+ timeTag.setValidatorMessage(validatorMessage);
+ }
+ if (converterMessage != null) {
+ timeTag.setConverterMessage(converterMessage);
+ }
+ if (requiredMessage != null) {
+ timeTag.setRequiredMessage(requiredMessage);
+ }
timeTag.setParent(labelTag);
timeTag.doStartTag();
@@ -162,6 +174,9 @@
tabIndex = null;
timeTag = null;
labelTag = null;
+ validatorMessage = null;
+ converterMessage = null;
+ requiredMessage = null;
}
/**
@@ -331,4 +346,32 @@
public void setTabIndex(javax.el.ValueExpression tabIndex) {
this.tabIndex = tabIndex;
}
+
+ /**
+ * An expression that specifies the validator message
+ */
+ @TagAttribute
+ @UIComponentTagAttribute()
+ public void setValidatorMessage(javax.el.ValueExpression validatorMessage) {
+ this.validatorMessage = validatorMessage;
+ }
+
+ /**
+ * An expression that specifies the converter message
+ */
+ @TagAttribute
+ @UIComponentTagAttribute()
+ public void setConverterMessage(javax.el.ValueExpression converterMessage) {
+ this.converterMessage = converterMessage;
+ }
+
+ /**
+ * An expression that specifies the required message
+ */
+ @TagAttribute
+ @UIComponentTagAttribute()
+ public void setRequiredMessage(javax.el.ValueExpression requiredMessage) {
+ this.requiredMessage = requiredMessage;
+ }
+
}
Modified: myfaces/tobago/trunk/tobago-tool/tobago-tool-apt/src/main/java/org/apache/myfaces/tobago/apt/CreateComponentAnnotationVisitor.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-tool/tobago-tool-apt/src/main/java/org/apache/myfaces/tobago/apt/CreateComponentAnnotationVisitor.java?rev=649588&r1=649587&r2=649588&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-tool/tobago-tool-apt/src/main/java/org/apache/myfaces/tobago/apt/CreateComponentAnnotationVisitor.java (original)
+++ myfaces/tobago/trunk/tobago-tool/tobago-tool-apt/src/main/java/org/apache/myfaces/tobago/apt/CreateComponentAnnotationVisitor.java Fri Apr 18 09:16:19 2008
@@ -287,6 +287,9 @@
if ("markup".equals(info.getName())) {
componentInfo.addInterface("org.apache.myfaces.tobago.component.SupportsMarkup");
}
+ if ("requiredMessage".equals(info.getName())) {
+ componentInfo.setMessages(true);
+ }
return componentPropertyInfo;
}
Modified: myfaces/tobago/trunk/tobago-tool/tobago-tool-apt/src/main/java/org/apache/myfaces/tobago/apt/generate/ComponentInfo.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-tool/tobago-tool-apt/src/main/java/org/apache/myfaces/tobago/apt/generate/ComponentInfo.java?rev=649588&r1=649587&r2=649588&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-tool/tobago-tool-apt/src/main/java/org/apache/myfaces/tobago/apt/generate/ComponentInfo.java (original)
+++ myfaces/tobago/trunk/tobago-tool/tobago-tool-apt/src/main/java/org/apache/myfaces/tobago/apt/generate/ComponentInfo.java Fri Apr 18 09:16:19 2008
@@ -23,6 +23,7 @@
*/
public class ComponentInfo extends TagInfo {
private boolean invokeOnComponent;
+ private boolean messages;
public ComponentInfo(String qualifiedName, String rendererName) {
super(qualifiedName, rendererName);
@@ -34,5 +35,13 @@
public void setInvokeOnComponent(boolean invokeOnComponent) {
this.invokeOnComponent = invokeOnComponent;
+ }
+
+ public boolean isMessages() {
+ return messages;
+ }
+
+ public void setMessages(boolean messages) {
+ this.messages = messages;
}
}
Modified: myfaces/tobago/trunk/tobago-tool/tobago-tool-apt/src/main/resources/org/apache/myfaces/tobago/apt/component1.1.stg
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-tool/tobago-tool-apt/src/main/resources/org/apache/myfaces/tobago/apt/component1.1.stg?rev=649588&r1=649587&r2=649588&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-tool/tobago-tool-apt/src/main/resources/org/apache/myfaces/tobago/apt/component1.1.stg (original)
+++ myfaces/tobago/trunk/tobago-tool/tobago-tool-apt/src/main/resources/org/apache/myfaces/tobago/apt/component1.1.stg Fri Apr 18 09:16:19 2008
@@ -42,7 +42,7 @@
<componentInfo.imports:import(); separator="\n">
public class <componentInfo.className>
- extends <componentInfo.superClassName> <first(componentInfo.interfaces):{ n | implements <n>}><rest(componentInfo.interfaces):{ n | , <n> }> {
+ extends <componentInfo.superClassName> <first(componentInfo.interfaces):{ n | implements <n>}><rest(componentInfo.interfaces):{ n |, <n>}> {
<if(componentInfo.componentType)>
public static final String COMPONENT_TYPE = "<componentInfo.componentType>";
@@ -76,6 +76,10 @@
return values;
}
<endif>
+
+ <if(componentInfo.messages)>
+ <messages()>
+ <endif>
<if(componentInfo.invokeOnComponent)>
<invokeOnComponent()>
@@ -92,6 +96,111 @@
throws FacesException {
return FacesUtils.invokeOnComponent(context, this, clientId, callback);
}
+>>
+
+messages() ::= <<
+protected void validateValue(FacesContext context, Object convertedValue) {
+ boolean empty = convertedValue == null
+ || (convertedValue instanceof String && ((String) convertedValue).length() == 0);
+
+ if (isRequired() && empty && getRequiredMessage() != null) {
+ String requiredMessage = getRequiredMessage();
+ context.addMessage(this.getClientId(context),
+ new javax.faces.application.FacesMessage(javax.faces.application.FacesMessage.SEVERITY_ERROR, requiredMessage, requiredMessage));
+ setValid(false);
+ return;
+ }
+ String validatorMessage = getValidatorMessage();
+ if (validatorMessage == null) {
+ super.validateValue(context, convertedValue);
+ } else {
+ for (javax.faces.validator.Validator validator : getValidators()) {
+ try {
+ validator.validate(context, this, convertedValue);
+ } catch (javax.faces.validator.ValidatorException e) {
+ setValid(false);
+ context.addMessage(getClientId(context),
+ new javax.faces.application.FacesMessage(javax.faces.application.FacesMessage.SEVERITY_ERROR, validatorMessage, validatorMessage));
+ }
+ }
+
+ javax.faces.el.MethodBinding validatorBinding = getValidator();
+ if (validatorBinding != null) {
+ try {
+ validatorBinding.invoke(context, new Object[]{context, this, convertedValue});
+ } catch (javax.faces.el.EvaluationException e) {
+ setValid(false);
+ Throwable cause = e.getCause();
+ if (cause instanceof javax.faces.validator.ValidatorException) {
+ context.addMessage(getClientId(context),
+ new javax.faces.application.FacesMessage(javax.faces.application.FacesMessage.SEVERITY_ERROR, validatorMessage, validatorMessage));
+ } else {
+ throw e;
+ }
+ }
+ }
+ }
+}
+
+protected Object getConvertedValue(FacesContext context, Object submittedValue) {
+ String converterMessage = getConverterMessage();
+ if (converterMessage == null) {
+ return super.getConvertedValue(context, submittedValue);
+ } else {
+ try {
+ javax.faces.render.Renderer renderer = getRenderer(context);
+ if (renderer != null) {
+ return renderer.getConvertedValue(context, this, submittedValue);
+ } else if (submittedValue instanceof String) {
+ javax.faces.convert.Converter converter = findUIOutputConverter(context);
+ if (converter != null) {
+ return converter.getAsObject(context, this, (String) submittedValue);
+ }
+ }
+ } catch (javax.faces.convert.ConverterException e) {
+ context.addMessage(getClientId(context),
+ new javax.faces.application.FacesMessage(javax.faces.application.FacesMessage.SEVERITY_ERROR, converterMessage, converterMessage));
+ setValid(false);
+ }
+ return submittedValue;
+ }
+}
+
+private javax.faces.convert.Converter findUIOutputConverter(FacesContext facesContext) {
+ // Attention!
+ // This code is duplicated in myfaces implementation renderkit package.
+ // If you change something here please do the same in the other class!
+
+ javax.faces.convert.Converter converter = getConverter();
+ if (converter != null) {
+ return converter;
+ }
+
+ //Try to find out by value binding
+ javax.faces.el.ValueBinding vb = getValueBinding("value");
+ if (vb == null) {
+ return null;
+ }
+
+ Class valueType = vb.getType(facesContext);
+ if (valueType == null) {
+ return null;
+ }
+
+ if (String.class.equals(valueType)) {
+ return null; //No converter needed for String type
+ }
+ if (Object.class.equals(valueType)) {
+ return null; //There is no converter for Object class
+ }
+
+ try {
+ return facesContext.getApplication().createConverter(valueType);
+ } catch (FacesException e) {
+ return null;
+ }
+}
+
>>
IntegerProperty(property) ::= <<
Modified: myfaces/tobago/trunk/tobago-tool/tobago-tool-apt/src/main/resources/org/apache/myfaces/tobago/apt/component1.2.stg
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-tool/tobago-tool-apt/src/main/resources/org/apache/myfaces/tobago/apt/component1.2.stg?rev=649588&r1=649587&r2=649588&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-tool/tobago-tool-apt/src/main/resources/org/apache/myfaces/tobago/apt/component1.2.stg (original)
+++ myfaces/tobago/trunk/tobago-tool/tobago-tool-apt/src/main/resources/org/apache/myfaces/tobago/apt/component1.2.stg Fri Apr 18 09:16:19 2008
@@ -42,7 +42,7 @@
<componentInfo.imports:import(); separator="\n">
public class <componentInfo.className>
- extends <componentInfo.superClassName> <first(componentInfo.interfaces):{ n | implements <n>}><rest(componentInfo.interfaces):{ n | , <n> }> {
+ extends <componentInfo.superClassName> <first(componentInfo.interfaces):{ n | implements <n>}><rest(componentInfo.interfaces):{ n |, <n>}> {
<if(componentInfo.componentType)>
public static final String COMPONENT_TYPE = "<componentInfo.componentType>";