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/03/13 12:14:46 UTC
svn commit: r636712 [3/6] - in /myfaces/tobago/trunk: core/
core/src/main/faces-config/ core/src/main/java/org/apache/myfaces/tobago/
core/src/main/java/org/apache/myfaces/tobago/ajax/api/
core/src/main/java/org/apache/myfaces/tobago/component/ core/sr...
Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/LinkTagDeclaration.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/LinkTagDeclaration.java?rev=636712&r1=636711&r2=636712&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/LinkTagDeclaration.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/LinkTagDeclaration.java Thu Mar 13 04:14:02 2008
@@ -44,6 +44,7 @@
@BodyContentDescription(anyTagOf = "facestag")
@UIComponentTag(
uiComponent = "org.apache.myfaces.tobago.component.UILinkCommand",
+ uiComponentBaseClass ="org.apache.myfaces.tobago.component.UICommand",
rendererType = "Link",
allowedChildComponenents = "NONE",
facets = {@Facet(name="confirmation", description = "Contains a UIOutput instance with the confirmation message.",
Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/MenuBarTagDeclaration.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/MenuBarTagDeclaration.java?rev=636712&r1=636711&r2=636712&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/MenuBarTagDeclaration.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/MenuBarTagDeclaration.java Thu Mar 13 04:14:02 2008
@@ -46,8 +46,9 @@
"org.apache.myfaces.tobago.taglib.component.MenuSelectOneTag",
"org.apache.myfaces.tobago.taglib.component.MenuSeparatorTag"})
@UIComponentTag(
- uiComponent = "javax.faces.component.UIPanel",
- rendererType = "MenuBar", isComponentAlreadyDefined = false, // changed to false
+ uiComponent = "org.apache.myfaces.tobago.component.UIMenuBar",
+ uiComponentBaseClass = "javax.faces.component.UIPanel",
+ rendererType = "MenuBar", isComponentAlreadyDefined = false,
allowedChildComponenents = {
UIMenu.COMPONENT_TYPE,
UIMenuCommand.COMPONENT_TYPE,
Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/MenuCheckboxTagDeclaration.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/MenuCheckboxTagDeclaration.java?rev=636712&r1=636711&r2=636712&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/MenuCheckboxTagDeclaration.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/MenuCheckboxTagDeclaration.java Thu Mar 13 04:14:02 2008
@@ -35,7 +35,8 @@
@Tag(name = "menuCheckbox", tagExtraInfoClassName = "org.apache.myfaces.tobago.taglib.component.CommandTagExtraInfo")
@UIComponentTag(
- uiComponent = "org.apache.myfaces.tobago.component.UISelectBooleanCommand",
+ uiComponent = "org.apache.myfaces.tobago.component.UIMenuCheckbox",
+ uiComponentBaseClass = "org.apache.myfaces.tobago.component.UISelectBooleanCommand",
rendererType = "MenuCommand",
allowedChildComponenents = {
"javax.faces.SelectItem",
Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/MenuCommandTag.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/MenuCommandTag.java?rev=636712&r1=636711&r2=636712&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/MenuCommandTag.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/MenuCommandTag.java Thu Mar 13 04:14:02 2008
@@ -23,8 +23,8 @@
import static org.apache.myfaces.tobago.TobagoConstants.ATTR_LABEL;
import static org.apache.myfaces.tobago.TobagoConstants.ATTR_TARGET;
import static org.apache.myfaces.tobago.TobagoConstants.RENDERER_TYPE_MENUCOMMAND;
-import org.apache.myfaces.tobago.component.ComponentUtil;
import org.apache.myfaces.tobago.component.UIMenuCommand;
+import org.apache.myfaces.tobago.internal.taglib.TagUtils;
import javax.faces.component.UIComponent;
@@ -53,10 +53,10 @@
protected void setProperties(UIComponent component) {
super.setProperties(component);
component.setRendererType(RENDERER_TYPE_MENUCOMMAND);
- ComponentUtil.setStringProperty(component, ATTR_IMAGE, image);
+ TagUtils.setStringProperty(component, ATTR_IMAGE, image);
//ComponentUtil.setStringProperty(component, ATTR_COMMAND_TYPE, COMMAND_TYPE);
- ComponentUtil.setStringProperty(component, ATTR_LABEL, label);
- ComponentUtil.setStringProperty(component, ATTR_TARGET, target);
+ TagUtils.setStringProperty(component, ATTR_LABEL, label);
+ TagUtils.setStringProperty(component, ATTR_TARGET, target);
}
public String getImage() {
Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/MenuCommandTagDeclaration.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/MenuCommandTagDeclaration.java?rev=636712&r1=636711&r2=636712&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/MenuCommandTagDeclaration.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/MenuCommandTagDeclaration.java Thu Mar 13 04:14:02 2008
@@ -36,6 +36,7 @@
@Tag(name = "menuItem", tagExtraInfoClassName = "org.apache.myfaces.tobago.taglib.component.CommandTagExtraInfo")
@UIComponentTag(
uiComponent = "org.apache.myfaces.tobago.component.UIMenuCommand",
+ uiComponentBaseClass = "org.apache.myfaces.tobago.component.UICommand",
rendererType = "MenuCommand",
allowedChildComponenents = "NONE")
public interface MenuCommandTagDeclaration extends TobagoTagDeclaration, AbstractCommandTagDeclaration,
Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/MenuRadioTagDeclaration.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/MenuRadioTagDeclaration.java?rev=636712&r1=636711&r2=636712&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/MenuRadioTagDeclaration.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/MenuRadioTagDeclaration.java Thu Mar 13 04:14:02 2008
@@ -34,7 +34,8 @@
*/
@Tag(name = "menuRadio", tagExtraInfoClassName = "org.apache.myfaces.tobago.taglib.component.CommandTagExtraInfo")
@UIComponentTag(
- uiComponent = "org.apache.myfaces.tobago.component.UISelectOneCommand",
+ uiComponent = "org.apache.myfaces.tobago.component.UIMenuRadio",
+ uiComponentBaseClass = "org.apache.myfaces.tobago.component.UISelectOneCommand",
rendererType = "MenuCommand",
allowedChildComponenents = "NONE")
public interface MenuRadioTagDeclaration extends TobagoTagDeclaration, AbstractCommandTagDeclaration,
Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/MenuSelectBooleanTagDeclaration.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/MenuSelectBooleanTagDeclaration.java?rev=636712&r1=636711&r2=636712&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/MenuSelectBooleanTagDeclaration.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/MenuSelectBooleanTagDeclaration.java Thu Mar 13 04:14:02 2008
@@ -37,6 +37,7 @@
@Tag(name = "menucheck", tagExtraInfoClassName = "org.apache.myfaces.tobago.taglib.component.CommandTagExtraInfo")
@UIComponentTag(
uiComponent = "org.apache.myfaces.tobago.component.UISelectBooleanCommand",
+ generate = false,
rendererType = "MenuCommand",
allowedChildComponenents = "NONE")
@Deprecated
Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/MenuSelectOneTagDeclaration.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/MenuSelectOneTagDeclaration.java?rev=636712&r1=636711&r2=636712&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/MenuSelectOneTagDeclaration.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/MenuSelectOneTagDeclaration.java Thu Mar 13 04:14:02 2008
@@ -36,6 +36,7 @@
@Tag(name = "menuradio", tagExtraInfoClassName = "org.apache.myfaces.tobago.taglib.component.CommandTagExtraInfo")
@UIComponentTag(
uiComponent = "org.apache.myfaces.tobago.component.UISelectOneCommand",
+ generate = false,
rendererType = "MenuCommand",
allowedChildComponenents = "NONE")
@Deprecated
Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/MenuSeparatorTagDeclaration.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/MenuSeparatorTagDeclaration.java?rev=636712&r1=636711&r2=636712&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/MenuSeparatorTagDeclaration.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/MenuSeparatorTagDeclaration.java Thu Mar 13 04:14:02 2008
@@ -34,6 +34,7 @@
@Tag(name = "menuSeparator", bodyContent = BodyContent.EMPTY)
@UIComponentTag(
uiComponent = "org.apache.myfaces.tobago.component.UIMenuSeparator",
+ uiComponentBaseClass = "javax.faces.component.UIOutput",
allowedChildComponenents = "NONE")
public interface MenuSeparatorTagDeclaration extends TobagoTagDeclaration, IsRendered, HasBinding {
Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/MenuTag.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/MenuTag.java?rev=636712&r1=636711&r2=636712&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/MenuTag.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/MenuTag.java Thu Mar 13 04:14:02 2008
@@ -21,8 +21,8 @@
import org.apache.commons.logging.LogFactory;
import static org.apache.myfaces.tobago.TobagoConstants.ATTR_IMAGE;
import static org.apache.myfaces.tobago.TobagoConstants.ATTR_LABEL;
-import org.apache.myfaces.tobago.component.ComponentUtil;
import org.apache.myfaces.tobago.component.UIMenu;
+import org.apache.myfaces.tobago.internal.taglib.TagUtils;
import javax.faces.component.UIComponent;
@@ -41,8 +41,8 @@
protected void setProperties(UIComponent component) {
super.setProperties(component);
component.setRendererType(null);
- ComponentUtil.setStringProperty(component, ATTR_LABEL, label);
- ComponentUtil.setStringProperty(component, ATTR_IMAGE, image);
+ TagUtils.setStringProperty(component, ATTR_LABEL, label);
+ TagUtils.setStringProperty(component, ATTR_IMAGE, image);
//ComponentUtil.setStringProperty(component, ATTR_COMMAND_TYPE, "menu");
}
Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/MenuTagDeclaration.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/MenuTagDeclaration.java?rev=636712&r1=636711&r2=636712&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/MenuTagDeclaration.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/MenuTagDeclaration.java Thu Mar 13 04:14:02 2008
@@ -47,6 +47,7 @@
"org.apache.myfaces.tobago.taglib.component.MenuSeparatorTag"})
@UIComponentTag(
uiComponent = "org.apache.myfaces.tobago.component.UIMenu",
+ uiComponentBaseClass = "org.apache.myfaces.tobago.component.UIPanelBase",
allowedChildComponenents = {
UIMenu.COMPONENT_TYPE,
UIMenuCommand.COMPONENT_TYPE,
Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/MessageTag.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/MessageTag.java?rev=636712&r1=636711&r2=636712&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/MessageTag.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/MessageTag.java Thu Mar 13 04:14:02 2008
@@ -20,7 +20,7 @@
import static org.apache.myfaces.tobago.TobagoConstants.ATTR_FOR;
import static org.apache.myfaces.tobago.TobagoConstants.ATTR_SHOW_DETAIL;
import static org.apache.myfaces.tobago.TobagoConstants.ATTR_SHOW_SUMMARY;
-import org.apache.myfaces.tobago.component.ComponentUtil;
+import org.apache.myfaces.tobago.internal.taglib.TagUtils;
import javax.faces.component.UIComponent;
import javax.faces.component.UIMessage;
@@ -42,9 +42,9 @@
protected void setProperties(UIComponent component) {
super.setProperties(component);
- ComponentUtil.setStringProperty(component, ATTR_FOR, forComponent);
- ComponentUtil.setBooleanProperty(component, ATTR_SHOW_SUMMARY, showSummary);
- ComponentUtil.setBooleanProperty(component, ATTR_SHOW_DETAIL, showDetail);
+ TagUtils.setStringProperty(component, ATTR_FOR, forComponent);
+ TagUtils.setBooleanProperty(component, ATTR_SHOW_SUMMARY, showSummary);
+ TagUtils.setBooleanProperty(component, ATTR_SHOW_DETAIL, showDetail);
}
public void release() {
Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/MessageTagDeclaration.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/MessageTagDeclaration.java?rev=636712&r1=636711&r2=636712&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/MessageTagDeclaration.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/MessageTagDeclaration.java Thu Mar 13 04:14:02 2008
@@ -38,7 +38,8 @@
@Deprecated
@Tag(name = "message", bodyContent = BodyContent.EMPTY)
@UIComponentTag(
- uiComponent = "javax.faces.component.UIMessage",
+ uiComponent = "org.apache.myfaces.tobago.component.UIMessage",
+ uiComponentBaseClass = "javax.faces.component.UIMessage",
rendererType = "Message", isComponentAlreadyDefined = false,
allowedChildComponenents = "NONE")
public interface MessageTagDeclaration extends TobagoTagDeclaration, HasIdBindingAndRendered, HasFor {
Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/MessagesTag.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/MessagesTag.java?rev=636712&r1=636711&r2=636712&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/MessagesTag.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/MessagesTag.java Thu Mar 13 04:14:02 2008
@@ -25,8 +25,8 @@
import static org.apache.myfaces.tobago.TobagoConstants.ATTR_ORDER_BY;
import static org.apache.myfaces.tobago.TobagoConstants.ATTR_SHOW_DETAIL;
import static org.apache.myfaces.tobago.TobagoConstants.ATTR_SHOW_SUMMARY;
-import org.apache.myfaces.tobago.component.ComponentUtil;
import org.apache.myfaces.tobago.component.UIMessages;
+import org.apache.myfaces.tobago.internal.taglib.TagUtils;
import javax.faces.component.UIComponent;
import javax.faces.webapp.UIComponentTag;
@@ -50,20 +50,20 @@
protected void setProperties(UIComponent component) {
super.setProperties(component);
- ComponentUtil.setStringProperty(component, ATTR_FOR, forComponent);
- ComponentUtil.setBooleanProperty(component, ATTR_GLOBAL_ONLY, globalOnly);
- ComponentUtil.setBooleanProperty(component, ATTR_SHOW_SUMMARY, showSummary);
- ComponentUtil.setBooleanProperty(component, ATTR_SHOW_DETAIL, showDetail);
- ComponentUtil.setStringProperty(component, ATTR_MIN_SEVERITY, minSeverity);
- ComponentUtil.setStringProperty(component, ATTR_MAX_SEVERITY, maxSeverity);
- ComponentUtil.setStringProperty(component, ATTR_MAX_NUMBER, maxNumber);
+ TagUtils.setStringProperty(component, ATTR_FOR, forComponent);
+ TagUtils.setBooleanProperty(component, ATTR_GLOBAL_ONLY, globalOnly);
+ TagUtils.setBooleanProperty(component, ATTR_SHOW_SUMMARY, showSummary);
+ TagUtils.setBooleanProperty(component, ATTR_SHOW_DETAIL, showDetail);
+ TagUtils.setStringProperty(component, ATTR_MIN_SEVERITY, minSeverity);
+ TagUtils.setStringProperty(component, ATTR_MAX_SEVERITY, maxSeverity);
+ TagUtils.setStringProperty(component, ATTR_MAX_NUMBER, maxNumber);
setOrderByProperty(component, ATTR_ORDER_BY, orderBy);
}
private void setOrderByProperty(UIComponent component, String name, String value) {
if (value != null) {
if (UIComponentTag.isValueReference(value)) {
- component.setValueBinding(name, ComponentUtil.createValueBinding(value));
+ component.setValueBinding(name, TagUtils.createValueBinding(value));
} else {
component.getAttributes().put(name, UIMessages.OrderBy.parse(value));
}
Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/MessagesTagDeclaration.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/MessagesTagDeclaration.java?rev=636712&r1=636711&r2=636712&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/MessagesTagDeclaration.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/MessagesTagDeclaration.java Thu Mar 13 04:14:02 2008
@@ -37,6 +37,8 @@
@Tag(name = "messages", bodyContent = BodyContent.EMPTY)
@UIComponentTag(
uiComponent = "org.apache.myfaces.tobago.component.UIMessages",
+ uiComponentBaseClass = "javax.faces.component.UIMessages",
+ generate = false,
rendererType = "Messages",
allowedChildComponenents = "NONE")
@@ -98,7 +100,7 @@
* The default "occurence".
*/
@TagAttribute
- @UIComponentTagAttribute(
+ @UIComponentTagAttribute(type = "org.apache.myfaces.tobago.component.UIMessages.OrderBy",
allowedValues = {UIMessages.OrderBy.OCCURENCE_STRING, UIMessages.OrderBy.SEVERITY_STRING},
defaultValue = UIMessages.OrderBy.OCCURENCE_STRING)
void setOrderBy(String orderBy);
Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/ObjectTag.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/ObjectTag.java?rev=636712&r1=636711&r2=636712&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/ObjectTag.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/ObjectTag.java Thu Mar 13 04:14:02 2008
@@ -18,7 +18,7 @@
*/
import static org.apache.myfaces.tobago.TobagoConstants.ATTR_SRC;
-import org.apache.myfaces.tobago.component.ComponentUtil;
+import org.apache.myfaces.tobago.internal.taglib.TagUtils;
import javax.faces.component.UIComponent;
import javax.faces.component.UIOutput;
@@ -34,7 +34,7 @@
protected void setProperties(UIComponent component) {
super.setProperties(component);
- ComponentUtil.setStringProperty(component, ATTR_SRC, src);
+ TagUtils.setStringProperty(component, ATTR_SRC, src);
}
Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/ObjectTagDeclaration.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/ObjectTagDeclaration.java?rev=636712&r1=636711&r2=636712&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/ObjectTagDeclaration.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/ObjectTagDeclaration.java Thu Mar 13 04:14:02 2008
@@ -30,7 +30,8 @@
*/
@Tag(name = "object", bodyContent = BodyContent.EMPTY)
@UIComponentTag(
- uiComponent = "javax.faces.component.UIOutput",
+ uiComponent = "org.apache.myfaces.tobago.component.UIObject",
+ uiComponentBaseClass = "javax.faces.component.UIOutput",
rendererType = "Object", isComponentAlreadyDefined = false,
allowedChildComponenents = "NONE")
public interface ObjectTagDeclaration extends TobagoTagDeclaration, HasId {
Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/OutTag.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/OutTag.java?rev=636712&r1=636711&r2=636712&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/OutTag.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/OutTag.java Thu Mar 13 04:14:02 2008
@@ -26,6 +26,7 @@
import static org.apache.myfaces.tobago.TobagoConstants.ATTR_TIP;
import org.apache.myfaces.tobago.component.ComponentUtil;
import org.apache.myfaces.tobago.component.UIOutput;
+import org.apache.myfaces.tobago.internal.taglib.TagUtils;
import javax.faces.component.UIComponent;
@@ -49,11 +50,11 @@
protected void setProperties(UIComponent component) {
super.setProperties(component);
- ComponentUtil.setBooleanProperty(component, ATTR_ESCAPE, escape);
+ TagUtils.setBooleanProperty(component, ATTR_ESCAPE, escape);
// TODO ???? SPAN ?
//ComponentUtil.setBooleanProperty(component, ATTR_CREATE_SPAN, "true");
ComponentUtil.setMarkup(component, markup);
- ComponentUtil.setStringProperty(component, ATTR_TIP, tip);
+ TagUtils.setStringProperty(component, ATTR_TIP, tip);
}
public String getEscape() {
@@ -70,6 +71,10 @@
public void setMarkup(String markup) {
this.markup = markup;
+ }
+
+
+ public void setCreateSpan(String createSpan) {
}
public String getTip() {
Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/OutTagDeclaration.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/OutTagDeclaration.java?rev=636712&r1=636711&r2=636712&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/OutTagDeclaration.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/OutTagDeclaration.java Thu Mar 13 04:14:02 2008
@@ -41,6 +41,7 @@
@BodyContentDescription(anyTagOf = "f:converter|f:convertNumber|f:convertDateTime|...")
@UIComponentTag(
uiComponent = "org.apache.myfaces.tobago.component.UIOutput",
+ uiComponentBaseClass = "javax.faces.component.UIOutput",
rendererType = "Out",
allowedChildComponenents = "NONE")
@@ -61,6 +62,10 @@
* Possible values are 'none', 'strong' and 'deleted'
*/
@TagAttribute
- @UIComponentTagAttribute(defaultValue = "none", allowedValues = {"none", "strong", "deleted"})
+ @UIComponentTagAttribute(defaultValue = "none", type = "java.lang.String[]",
+ allowedValues = {"none", "strong", "deleted"})
void setMarkup(String markup);
+
+ @UIComponentTagAttribute(type = "java.lang.Boolean", defaultValue = "true")
+ void setCreateSpan(String createSpan);
}
Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/PageTag.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/PageTag.java?rev=636712&r1=636711&r2=636712&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/PageTag.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/PageTag.java Thu Mar 13 04:14:02 2008
@@ -27,6 +27,7 @@
import static org.apache.myfaces.tobago.TobagoConstants.ATTR_WIDTH;
import org.apache.myfaces.tobago.component.ComponentUtil;
import org.apache.myfaces.tobago.component.UIPage;
+import org.apache.myfaces.tobago.internal.taglib.TagUtils;
import javax.faces.component.UIComponent;
import javax.servlet.jsp.JspException;
@@ -83,14 +84,14 @@
protected void setProperties(UIComponent component) {
super.setProperties(component);
- ComponentUtil.setStringProperty(component, ATTR_METHOD, method);
- ComponentUtil.setStringProperty(component, ATTR_DOCTYPE, doctype);
- ComponentUtil.setStringProperty(component, ATTR_FOCUS_ID, focusId);
- ComponentUtil.setStringProperty(component, ATTR_LABEL, label);
+ TagUtils.setStringProperty(component, ATTR_METHOD, method);
+ TagUtils.setStringProperty(component, ATTR_DOCTYPE, doctype);
+ TagUtils.setStringProperty(component, ATTR_FOCUS_ID, focusId);
+ TagUtils.setStringProperty(component, ATTR_LABEL, label);
ComponentUtil.setValueBinding(component, ATTR_STATE, state);
ComponentUtil.setIntegerSizeProperty(component, ATTR_WIDTH, width);
ComponentUtil.setIntegerSizeProperty(component, ATTR_HEIGHT, height);
- ComponentUtil.setStringProperty(component, ATTR_APPLICATION_ICON, applicationIcon);
+ TagUtils.setStringProperty(component, ATTR_APPLICATION_ICON, applicationIcon);
}
public void setDoctype(String doctype) {
Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/PageTagDeclaration.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/PageTagDeclaration.java?rev=636712&r1=636711&r2=636712&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/PageTagDeclaration.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/PageTagDeclaration.java Thu Mar 13 04:14:02 2008
@@ -38,7 +38,7 @@
@Tag(name = "page")
@UIComponentTag(
uiComponent = "org.apache.myfaces.tobago.component.UIPage",
- rendererType = "Page",
+ rendererType = "Page", generate = false,
facets =
{ @Facet(name = "action", description ="Contains an instance of UICommand (tc:command) for an auto-action",
allowedChildComponenents = "org.apache.myfaces.tobago.Command"),
Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/PanelTagDeclaration.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/PanelTagDeclaration.java?rev=636712&r1=636711&r2=636712&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/PanelTagDeclaration.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/PanelTagDeclaration.java Thu Mar 13 04:14:02 2008
@@ -36,7 +36,9 @@
@Tag(name = "panel")
@UIComponentTag(
uiComponent = "org.apache.myfaces.tobago.component.UIPanel",
+ generate = false,
rendererType = "Panel",
+ isAjaxEnabled = true,
facets = {
@Facet(name="reload", description = "Contains an instance of UIReload",
allowedChildComponenents = "org.apache.myfaces.tobago.Reload"),
@@ -50,7 +52,7 @@
* Possible value is 'none'. But this can be overridden in the theme.
*/
@TagAttribute
- @UIComponentTagAttribute(defaultValue = "none")
+ @UIComponentTagAttribute(defaultValue = "none", type = "java.lang.String[]")
void setMarkup(String markup);
}
Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/PopupTag.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/PopupTag.java?rev=636712&r1=636711&r2=636712&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/PopupTag.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/PopupTag.java Thu Mar 13 04:14:02 2008
@@ -22,8 +22,8 @@
import static org.apache.myfaces.tobago.TobagoConstants.ATTR_MODAL;
import static org.apache.myfaces.tobago.TobagoConstants.ATTR_TOP;
import static org.apache.myfaces.tobago.TobagoConstants.ATTR_WIDTH;
-import org.apache.myfaces.tobago.component.ComponentUtil;
import org.apache.myfaces.tobago.component.UIPopup;
+import org.apache.myfaces.tobago.internal.taglib.TagUtils;
import javax.faces.component.UIComponent;
import javax.servlet.jsp.tagext.BodyTag;
@@ -52,11 +52,11 @@
protected void setProperties(UIComponent component) {
super.setProperties(component);
- ComponentUtil.setStringProperty(component, ATTR_WIDTH, width);
- ComponentUtil.setStringProperty(component, ATTR_HEIGHT, height);
- ComponentUtil.setStringProperty(component, ATTR_LEFT, left);
- ComponentUtil.setStringProperty(component, ATTR_TOP, top);
- ComponentUtil.setBooleanProperty(component, ATTR_MODAL, modal);
+ TagUtils.setStringProperty(component, ATTR_WIDTH, width);
+ TagUtils.setStringProperty(component, ATTR_HEIGHT, height);
+ TagUtils.setStringProperty(component, ATTR_LEFT, left);
+ TagUtils.setStringProperty(component, ATTR_TOP, top);
+ TagUtils.setBooleanProperty(component, ATTR_MODAL, modal);
}
Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/PopupTagDeclaration.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/PopupTagDeclaration.java?rev=636712&r1=636711&r2=636712&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/PopupTagDeclaration.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/PopupTagDeclaration.java Thu Mar 13 04:14:02 2008
@@ -26,7 +26,6 @@
import org.apache.myfaces.tobago.taglib.decl.IsRendered;
/*
- * User: bommel
* Date: 02.04.2006
* Time: 16:11:02
*/
@@ -36,6 +35,9 @@
@Tag(name = "popup")
@UIComponentTag(
uiComponent = "org.apache.myfaces.tobago.component.UIPopup",
+ uiComponentBaseClass = "org.apache.myfaces.tobago.component.UIPanelBase",
+ generate = false,
+ isAjaxEnabled = true,
rendererType = "Popup")
public interface PopupTagDeclaration extends TobagoBodyTagDeclaration, HasId, IsRendered, HasDimension {
Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/ProgressTag.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/ProgressTag.java?rev=636712&r1=636711&r2=636712&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/ProgressTag.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/ProgressTag.java Thu Mar 13 04:14:02 2008
@@ -25,6 +25,7 @@
import static org.apache.myfaces.tobago.TobagoConstants.ATTR_TIP;
import org.apache.myfaces.tobago.component.ComponentUtil;
import org.apache.myfaces.tobago.component.UIProgress;
+import org.apache.myfaces.tobago.internal.taglib.TagUtils;
import javax.faces.component.UIComponent;
@@ -41,7 +42,7 @@
protected void setProperties(UIComponent component) {
super.setProperties(component);
ComponentUtil.setMarkup(component, markup);
- ComponentUtil.setStringProperty(component, ATTR_TIP, tip);
+ TagUtils.setStringProperty(component, ATTR_TIP, tip);
}
public void release() {
Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/ProgressTagDeclaration.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/ProgressTagDeclaration.java?rev=636712&r1=636711&r2=636712&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/ProgressTagDeclaration.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/ProgressTagDeclaration.java Thu Mar 13 04:14:02 2008
@@ -22,6 +22,7 @@
import org.apache.myfaces.tobago.apt.annotation.TagAttribute;
import org.apache.myfaces.tobago.apt.annotation.UIComponentTag;
import org.apache.myfaces.tobago.apt.annotation.UIComponentTagAttribute;
+import org.apache.myfaces.tobago.apt.annotation.DynamicExpression;
import org.apache.myfaces.tobago.taglib.decl.HasIdBindingAndRendered;
import org.apache.myfaces.tobago.taglib.decl.HasMarkup;
import org.apache.myfaces.tobago.taglib.decl.HasTip;
@@ -37,6 +38,7 @@
@Tag(name = "progress")
@UIComponentTag(
uiComponent = "org.apache.myfaces.tobago.component.UIProgress",
+ uiComponentBaseClass = "javax.faces.component.UIOutput",
rendererType = "Progress",
allowedChildComponenents = "NONE",
facets = {@Facet(
@@ -51,6 +53,7 @@
* The current value of this component.
*/
@TagAttribute
- @UIComponentTagAttribute(type = { "javax.swing.BoundedRangeModel" }, valueExpression = "REQUIRED")
+ @UIComponentTagAttribute(type = { "javax.swing.BoundedRangeModel" },
+ expression = DynamicExpression.VALUE_BINDING_REQUIRED)
void setValue(String value);
}
Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/ReloadTag.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/ReloadTag.java?rev=636712&r1=636711&r2=636712&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/ReloadTag.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/ReloadTag.java Thu Mar 13 04:14:02 2008
@@ -19,8 +19,8 @@
import static org.apache.myfaces.tobago.TobagoConstants.ATTR_FREQUENCY;
import static org.apache.myfaces.tobago.TobagoConstants.ATTR_UPDATE;
-import org.apache.myfaces.tobago.component.ComponentUtil;
import org.apache.myfaces.tobago.component.UIReload;
+import org.apache.myfaces.tobago.internal.taglib.TagUtils;
import javax.faces.component.UIComponent;
@@ -58,7 +58,7 @@
protected void setProperties(UIComponent component) {
super.setProperties(component);
- ComponentUtil.setIntegerProperty(component, ATTR_FREQUENCY, frequency);
- ComponentUtil.setBooleanProperty(component, ATTR_UPDATE, update);
+ TagUtils.setIntegerProperty(component, ATTR_FREQUENCY, frequency);
+ TagUtils.setBooleanProperty(component, ATTR_UPDATE, update);
}
}
Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/ReloadTagDeclaration.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/ReloadTagDeclaration.java?rev=636712&r1=636711&r2=636712&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/ReloadTagDeclaration.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/ReloadTagDeclaration.java Thu Mar 13 04:14:02 2008
@@ -35,6 +35,8 @@
@Tag(name = "reload")
@UIComponentTag(
uiComponent = "org.apache.myfaces.tobago.component.UIReload",
+ componentType = "org.apache.myfaces.tobago.Reload",
+ componentFamily = "org.apache.myfaces.tobago.Reload",
allowedChildComponenents = "NONE")
public interface ReloadTagDeclaration extends TobagoTagDeclaration, HasIdBindingAndRendered {
Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/ScriptTag.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/ScriptTag.java?rev=636712&r1=636711&r2=636712&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/ScriptTag.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/ScriptTag.java Thu Mar 13 04:14:02 2008
@@ -22,6 +22,7 @@
import org.apache.myfaces.tobago.apt.annotation.TagAttribute;
import org.apache.myfaces.tobago.component.ComponentUtil;
import org.apache.myfaces.tobago.component.UIPage;
+import org.apache.myfaces.tobago.internal.taglib.TagUtils;
import javax.faces.context.FacesContext;
import javax.servlet.jsp.JspException;
@@ -58,24 +59,24 @@
}
if (file != null) {
- page.getScriptFiles().add(ComponentUtil.getValueFromEl(file));
+ page.getScriptFiles().add(TagUtils.getValueFromEl(file));
}
if (onload != null) {
- page.getOnloadScripts().add(ComponentUtil.getValueFromEl(onload));
+ page.getOnloadScripts().add(TagUtils.getValueFromEl(onload));
}
if (onunload != null) {
- page.getOnunloadScripts().add(ComponentUtil.getValueFromEl(onunload));
+ page.getOnunloadScripts().add(TagUtils.getValueFromEl(onunload));
}
if (onexit != null) {
- page.getOnexitScripts().add(ComponentUtil.getValueFromEl(onexit));
+ page.getOnexitScripts().add(TagUtils.getValueFromEl(onexit));
}
if (onsubmit != null) {
- page.getOnsubmitScripts().add(ComponentUtil.getValueFromEl(onsubmit));
+ page.getOnsubmitScripts().add(TagUtils.getValueFromEl(onsubmit));
}
if (bodyContent != null) {
String script = bodyContent.getString();
bodyContent.clearBody();
- page.getScriptBlocks().add(ComponentUtil.getValueFromEl(script));
+ page.getScriptBlocks().add(TagUtils.getValueFromEl(script));
}
return EVAL_PAGE;
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=636712&r1=636711&r2=636712&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 Thu Mar 13 04:14:02 2008
@@ -34,6 +34,8 @@
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.HasConverter;
+import org.apache.myfaces.tobago.taglib.decl.IsFocus;
//import org.apache.myfaces.tobago.taglib.decl.IsImmediateComponent;
/*
@@ -48,6 +50,7 @@
@BodyContentDescription(anyTagOf = "<f:facet>* ")
@UIComponentTag(
uiComponent = "org.apache.myfaces.tobago.component.UISelectBoolean",
+ uiComponentBaseClass = "javax.faces.component.UISelectBoolean",
rendererType = "SelectBooleanCheckbox",
allowedChildComponenents = "NONE",
facets = {
@@ -63,6 +66,6 @@
public interface SelectBooleanCheckboxTagDeclaration extends BeanTagDeclaration, HasValidator,
HasOnchange, HasValueChangeListener, HasIdBindingAndRendered, HasLabelAndAccessKey, HasBooleanValue, IsDisabled,
- IsInline, HasTip, IsReadonly, HasMarkup, HasTabIndex, IsRequired/*, IsImmediateComponent */{
+ IsInline, HasTip, IsReadonly, HasMarkup, HasTabIndex, IsRequired, HasConverter, IsFocus /*, IsImmediateComponent */{
}
Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/SelectBooleanCommandTag.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/SelectBooleanCommandTag.java?rev=636712&r1=636711&r2=636712&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/SelectBooleanCommandTag.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/SelectBooleanCommandTag.java Thu Mar 13 04:14:02 2008
@@ -23,8 +23,8 @@
import static org.apache.myfaces.tobago.TobagoConstants.ATTR_TIP;
import static org.apache.myfaces.tobago.TobagoConstants.ATTR_VALUE;
import static org.apache.myfaces.tobago.TobagoConstants.RENDERER_TYPE_MENUCOMMAND;
-import org.apache.myfaces.tobago.component.ComponentUtil;
import org.apache.myfaces.tobago.component.UISelectBooleanCommand;
+import org.apache.myfaces.tobago.internal.taglib.TagUtils;
import javax.faces.component.UIComponent;
@@ -49,9 +49,9 @@
protected void setProperties(UIComponent component) {
super.setProperties(component);
component.setRendererType(RENDERER_TYPE_MENUCOMMAND);
- ComponentUtil.setStringProperty(component, ATTR_VALUE, value);
- ComponentUtil.setStringProperty(component, ATTR_LABEL, label);
- ComponentUtil.setStringProperty(component, ATTR_TIP, tip);
+ TagUtils.setStringProperty(component, ATTR_VALUE, value);
+ TagUtils.setStringProperty(component, ATTR_LABEL, label);
+ TagUtils.setStringProperty(component, ATTR_TIP, tip);
}
public void release() {
Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/SelectItemTag.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/SelectItemTag.java?rev=636712&r1=636711&r2=636712&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/SelectItemTag.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/SelectItemTag.java Thu Mar 13 04:14:02 2008
@@ -26,6 +26,7 @@
import static org.apache.myfaces.tobago.TobagoConstants.ATTR_VALUE;
import org.apache.myfaces.tobago.component.ComponentUtil;
import org.apache.myfaces.tobago.component.UISelectItem;
+import org.apache.myfaces.tobago.internal.taglib.TagUtils;
import javax.faces.component.UIComponent;
@@ -50,13 +51,13 @@
protected void setProperties(UIComponent component) {
super.setProperties(component);
- ComponentUtil.setStringProperty(component, ATTR_ITEM_DESCRIPTION, itemDescription);
- ComponentUtil.setBooleanProperty(component, ATTR_ITEM_DISABLED, itemDisabled);
- ComponentUtil.setStringProperty(component, ATTR_ITEM_LABEL, itemLabel);
- ComponentUtil.setStringProperty(component, ATTR_ITEM_VALUE, itemValue);
- ComponentUtil.setStringProperty(component, ATTR_VALUE, value);
- ComponentUtil.setStringProperty(component, ATTR_ITEM_IMAGE, itemImage);
- ComponentUtil.setStringProperty(component, ATTR_IMAGE, itemImage);
+ TagUtils.setStringProperty(component, ATTR_ITEM_DESCRIPTION, itemDescription);
+ TagUtils.setBooleanProperty(component, ATTR_ITEM_DISABLED, itemDisabled);
+ TagUtils.setStringProperty(component, ATTR_ITEM_LABEL, itemLabel);
+ TagUtils.setStringProperty(component, ATTR_ITEM_VALUE, itemValue);
+ TagUtils.setStringProperty(component, ATTR_VALUE, value);
+ TagUtils.setStringProperty(component, ATTR_ITEM_IMAGE, itemImage);
+ TagUtils.setStringProperty(component, ATTR_IMAGE, itemImage);
ComponentUtil.setMarkup(component, markup);
}
Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/SelectItemTagDeclaration.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/SelectItemTagDeclaration.java?rev=636712&r1=636711&r2=636712&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/SelectItemTagDeclaration.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/SelectItemTagDeclaration.java Thu Mar 13 04:14:02 2008
@@ -22,6 +22,7 @@
import org.apache.myfaces.tobago.apt.annotation.TagAttribute;
import org.apache.myfaces.tobago.apt.annotation.UIComponentTag;
import org.apache.myfaces.tobago.apt.annotation.UIComponentTagAttribute;
+import org.apache.myfaces.tobago.apt.annotation.DynamicExpression;
import org.apache.myfaces.tobago.taglib.decl.HasBinding;
import org.apache.myfaces.tobago.taglib.decl.HasId;
import org.apache.myfaces.tobago.taglib.decl.HasMarkup;
@@ -38,8 +39,9 @@
*/
@Tag(name = "selectItem", bodyContent = BodyContent.EMPTY)
@UIComponentTag(
- uiComponent = "org.apache.myfaces.tobago.component.UISelectItem",
- allowedChildComponenents = "NONE")
+ uiComponent = "org.apache.myfaces.tobago.component.UISelectItem",
+ uiComponentBaseClass = "javax.faces.component.UISelectItem",
+ allowedChildComponenents = "NONE")
public interface SelectItemTagDeclaration extends TobagoTagDeclaration, HasBinding, HasId, HasMarkup {
/**
* Flag indicating whether the option created
@@ -76,7 +78,8 @@
* the information for this option.
*/
@TagAttribute
- @UIComponentTagAttribute(type = "javax.faces.model.SelectItem")
+ @UIComponentTagAttribute(type = "javax.faces.model.SelectItem",
+ expression = DynamicExpression.VALUE_BINDING_REQUIRED)
void setValue(String value);
/**
Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/SelectItemsTag.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/SelectItemsTag.java?rev=636712&r1=636711&r2=636712&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/SelectItemsTag.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/SelectItemsTag.java Thu Mar 13 04:14:02 2008
@@ -18,7 +18,7 @@
*/
import static org.apache.myfaces.tobago.TobagoConstants.ATTR_VALUE;
-import org.apache.myfaces.tobago.component.ComponentUtil;
+import org.apache.myfaces.tobago.internal.taglib.TagUtils;
import javax.faces.component.UIComponent;
import javax.faces.component.UISelectItems;
@@ -43,7 +43,7 @@
@Override
protected void setProperties(UIComponent component) {
super.setProperties(component);
- ComponentUtil.setStringProperty(component, ATTR_VALUE, value);
+ TagUtils.setStringProperty(component, ATTR_VALUE, value);
}
@Override
Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/SelectItemsTagDeclaration.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/SelectItemsTagDeclaration.java?rev=636712&r1=636711&r2=636712&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/SelectItemsTagDeclaration.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/SelectItemsTagDeclaration.java Thu Mar 13 04:14:02 2008
@@ -22,6 +22,7 @@
import org.apache.myfaces.tobago.apt.annotation.TagAttribute;
import org.apache.myfaces.tobago.apt.annotation.UIComponentTag;
import org.apache.myfaces.tobago.apt.annotation.UIComponentTagAttribute;
+import org.apache.myfaces.tobago.apt.annotation.DynamicExpression;
import org.apache.myfaces.tobago.taglib.decl.HasBinding;
import org.apache.myfaces.tobago.taglib.decl.HasId;
@@ -32,9 +33,10 @@
*/
@Tag(name = "selectItems", bodyContent = BodyContent.EMPTY)
@UIComponentTag(
- uiComponent = "javax.faces.component.UISelectItems",
- isComponentAlreadyDefined = false,
- allowedChildComponenents = "NONE")
+ uiComponent = "org.apache.myfaces.tobago.component.UISelectItems",
+ uiComponentBaseClass = "javax.faces.component.UISelectItems",
+ isComponentAlreadyDefined = false,
+ allowedChildComponenents = "NONE")
public interface SelectItemsTagDeclaration extends TobagoTagDeclaration, HasId, HasBinding {
/**
@@ -42,7 +44,7 @@
* the information for this option.
*/
@TagAttribute
- @UIComponentTagAttribute(valueExpression = "REQUIRED")
+ @UIComponentTagAttribute(expression = DynamicExpression.VALUE_BINDING_REQUIRED)
void setValue(String value);
}
Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/SelectManyCheckboxTag.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/SelectManyCheckboxTag.java?rev=636712&r1=636711&r2=636712&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/SelectManyCheckboxTag.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/SelectManyCheckboxTag.java Thu Mar 13 04:14:02 2008
@@ -18,18 +18,20 @@
*/
import static org.apache.myfaces.tobago.TobagoConstants.ATTR_RENDER_RANGE;
-import org.apache.myfaces.tobago.component.ComponentUtil;
+import org.apache.myfaces.tobago.internal.taglib.TagUtils;
import javax.faces.component.UIComponent;
-
+/**
+ * Render a group of checkboxes.
+ */
public class SelectManyCheckboxTag extends SelectManyTag implements SelectManyCheckboxTagDeclaration {
private String renderRange;
protected void setProperties(UIComponent component) {
super.setProperties(component);
- ComponentUtil.setStringProperty(component, ATTR_RENDER_RANGE, renderRange);
+ TagUtils.setStringProperty(component, ATTR_RENDER_RANGE, renderRange);
}
public void release() {
Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/SelectManyCheckboxTagDeclaration.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/SelectManyCheckboxTagDeclaration.java?rev=636712&r1=636711&r2=636712&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/SelectManyCheckboxTagDeclaration.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/SelectManyCheckboxTagDeclaration.java Thu Mar 13 04:14:02 2008
@@ -42,7 +42,8 @@
@Tag(name = "selectManyCheckbox")
@BodyContentDescription(anyTagOf = "(<f:selectItems>|<f:selectItem>|<tc:selectItem>)+ <f:facet>* ")
@UIComponentTag(
- uiComponent = "org.apache.myfaces.tobago.component.UISelectMany",
+ uiComponent = "org.apache.myfaces.tobago.component.UISelectManyCheckbox",
+ uiComponentBaseClass = "org.apache.myfaces.tobago.component.UISelectMany",
rendererType = "SelectManyCheckbox",
allowedChildComponenents = {
"javax.faces.SelectItem",
Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/SelectManyListboxTagDeclaration.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/SelectManyListboxTagDeclaration.java?rev=636712&r1=636711&r2=636712&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/SelectManyListboxTagDeclaration.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/SelectManyListboxTagDeclaration.java Thu Mar 13 04:14:02 2008
@@ -29,6 +29,7 @@
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.HasConverter;
/*
* Created: Aug 5, 2005 5:58:55 PM
@@ -40,15 +41,16 @@
*/
@Tag(name = "selectManyListbox")
@UIComponentTag(
- uiComponent = "org.apache.myfaces.tobago.component.UISelectMany",
+ uiComponent = "org.apache.myfaces.tobago.component.UISelectManyListbox",
+ uiComponentBaseClass = "org.apache.myfaces.tobago.component.UISelectMany",
rendererType = "SelectManyListbox",
allowedChildComponenents = {
"javax.faces.SelectItem",
"javax.faces.SelectItems"
})
-public interface SelectManyListboxTagDeclaration
- extends SelectManyTagDeclaration, HasId, IsDisabled,
- HasDeprecatedHeight, IsInline, HasLabelAndAccessKey, IsRendered, HasBinding, HasTip, IsReadonly, IsRequired {
+public interface SelectManyListboxTagDeclaration extends SelectManyTagDeclaration, HasId, IsDisabled,
+ HasDeprecatedHeight, IsInline, HasLabelAndAccessKey,
+ IsRendered, HasBinding, HasTip, IsReadonly, HasConverter, IsRequired {
}
Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/SelectOneChoiceTagDeclaration.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/SelectOneChoiceTagDeclaration.java?rev=636712&r1=636711&r2=636712&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/SelectOneChoiceTagDeclaration.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/SelectOneChoiceTagDeclaration.java Thu Mar 13 04:14:02 2008
@@ -45,7 +45,8 @@
@Tag(name = "selectOneChoice")
@BodyContentDescription(anyTagOf = "(<f:selectItems>|<f:selectItem>|<tc:selectItem>)+ <f:facet>* ")
@UIComponentTag(
- uiComponent = "org.apache.myfaces.tobago.component.UISelectOne",
+ uiComponent = "org.apache.myfaces.tobago.component.UISelectOneChoice",
+ uiComponentBaseClass = "org.apache.myfaces.tobago.component.UISelectOne",
rendererType = "SelectOneChoice",
allowedChildComponenents = {
"javax.faces.SelectItem",
Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/SelectOneCommandTag.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/SelectOneCommandTag.java?rev=636712&r1=636711&r2=636712&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/SelectOneCommandTag.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/SelectOneCommandTag.java Thu Mar 13 04:14:02 2008
@@ -19,8 +19,8 @@
import static org.apache.myfaces.tobago.TobagoConstants.ATTR_VALUE;
import static org.apache.myfaces.tobago.TobagoConstants.RENDERER_TYPE_MENUCOMMAND;
-import org.apache.myfaces.tobago.component.ComponentUtil;
import org.apache.myfaces.tobago.component.UISelectOneCommand;
+import org.apache.myfaces.tobago.internal.taglib.TagUtils;
import javax.faces.component.UIComponent;
@@ -46,7 +46,7 @@
protected void setProperties(UIComponent component) {
super.setProperties(component);
component.setRendererType(RENDERER_TYPE_MENUCOMMAND);
- ComponentUtil.setStringProperty(component, ATTR_VALUE, value);
+ TagUtils.setStringProperty(component, ATTR_VALUE, value);
}
public String getValue() {
Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/SelectOneListboxTagDeclaration.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/SelectOneListboxTagDeclaration.java?rev=636712&r1=636711&r2=636712&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/SelectOneListboxTagDeclaration.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/SelectOneListboxTagDeclaration.java Thu Mar 13 04:14:02 2008
@@ -31,6 +31,7 @@
import org.apache.myfaces.tobago.taglib.decl.IsDisabled;
import org.apache.myfaces.tobago.taglib.decl.IsReadonly;
import org.apache.myfaces.tobago.taglib.decl.IsRendered;
+import org.apache.myfaces.tobago.taglib.decl.HasConverter;
/*
* Created: Aug 5, 2005 6:08:24 PM
@@ -43,7 +44,8 @@
@Tag(name = "selectOneListbox")
@BodyContentDescription(anyTagOf = "(<f:selectItems>|<f:selectItem>|<tc:selectItem>)+ <f:facet>* ")
@UIComponentTag(
- uiComponent = "org.apache.myfaces.tobago.component.UISelectOne",
+ uiComponent = "org.apache.myfaces.tobago.component.UISelectOneListbox",
+ uiComponentBaseClass = "org.apache.myfaces.tobago.component.UISelectOne",
rendererType = "SelectOneListbox",
allowedChildComponenents = {
"javax.faces.SelectItem",
@@ -60,7 +62,7 @@
allowedChildComponenents = "org.apache.myfaces.tobago.Command")
})
public interface SelectOneListboxTagDeclaration extends SelectOneTagDeclaration, HasId, IsDisabled,
- IsReadonly, HasLabelAndAccessKey, IsRendered, HasBinding, HasDeprecatedHeight, HasTip {
+ IsReadonly, HasLabelAndAccessKey, IsRendered, HasBinding, HasDeprecatedHeight, HasTip, HasConverter {
/**
* Flag indicating that selecting an Item representing a Value is Required.
Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/SelectOneRadioTag.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/SelectOneRadioTag.java?rev=636712&r1=636711&r2=636712&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/SelectOneRadioTag.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/SelectOneRadioTag.java Thu Mar 13 04:14:02 2008
@@ -18,7 +18,7 @@
*/
import static org.apache.myfaces.tobago.TobagoConstants.ATTR_RENDER_RANGE;
-import org.apache.myfaces.tobago.component.ComponentUtil;
+import org.apache.myfaces.tobago.internal.taglib.TagUtils;
import javax.faces.component.UIComponent;
@@ -29,7 +29,7 @@
protected void setProperties(UIComponent component) {
super.setProperties(component);
- ComponentUtil.setStringProperty(component, ATTR_RENDER_RANGE, renderRange);
+ TagUtils.setStringProperty(component, ATTR_RENDER_RANGE, renderRange);
}
public void release() {
Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/SelectReferenceTag.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/SelectReferenceTag.java?rev=636712&r1=636711&r2=636712&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/SelectReferenceTag.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/SelectReferenceTag.java Thu Mar 13 04:14:02 2008
@@ -19,7 +19,7 @@
import static org.apache.myfaces.tobago.TobagoConstants.ATTR_FOR;
import static org.apache.myfaces.tobago.TobagoConstants.ATTR_RENDER_RANGE;
-import org.apache.myfaces.tobago.component.ComponentUtil;
+import org.apache.myfaces.tobago.internal.taglib.TagUtils;
import javax.faces.component.UIComponent;
import javax.faces.component.UIOutput;
@@ -51,8 +51,8 @@
protected void setProperties(UIComponent component) {
super.setProperties(component);
- ComponentUtil.setStringProperty(component, ATTR_FOR, forComponent);
- ComponentUtil.setStringProperty(component, ATTR_RENDER_RANGE, renderRange);
+ TagUtils.setStringProperty(component, ATTR_FOR, forComponent);
+ TagUtils.setStringProperty(component, ATTR_RENDER_RANGE, renderRange);
}
public String getRenderRange() {
Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/SelectReferenceTagDeclaration.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/SelectReferenceTagDeclaration.java?rev=636712&r1=636711&r2=636712&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/SelectReferenceTagDeclaration.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/SelectReferenceTagDeclaration.java Thu Mar 13 04:14:02 2008
@@ -35,7 +35,8 @@
*/
@Tag(name = "selectReference", bodyContent = BodyContent.EMPTY)
@UIComponentTag(
- uiComponent = "javax.faces.component.UIOutput",
+ uiComponent = "org.apache.myfaces.tobago.component.UISelectReference",
+ uiComponentBaseClass = "javax.faces.component.UIOutput",
rendererType = "SelectReference",
isComponentAlreadyDefined = false,
allowedChildComponenents = "NONE")
Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/SeparatorTagDeclaration.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/SeparatorTagDeclaration.java?rev=636712&r1=636711&r2=636712&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/SeparatorTagDeclaration.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/SeparatorTagDeclaration.java Thu Mar 13 04:14:02 2008
@@ -28,6 +28,8 @@
@Tag(name = "separator")
@UIComponentTag(rendererType = "Separator",
uiComponent = "org.apache.myfaces.tobago.component.UISeparator",
+ componentFamily = "org.apache.myfaces.tobago.Separator",
+ componentType = "org.apache.myfaces.tobago.Separator",
allowedChildComponenents = "NONE",
facets = { @Facet(name = "label", description = "This facet contains a UILabel",
allowedChildComponenents = "org.apache.myfaces.tobago.Label") })
Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/SheetTag.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/SheetTag.java?rev=636712&r1=636711&r2=636712&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/SheetTag.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/SheetTag.java Thu Mar 13 04:14:02 2008
@@ -32,6 +32,7 @@
import static org.apache.myfaces.tobago.TobagoConstants.ATTR_VAR;
import org.apache.myfaces.tobago.component.ComponentUtil;
import org.apache.myfaces.tobago.component.UIData;
+import org.apache.myfaces.tobago.internal.taglib.TagUtils;
import javax.faces.component.UIComponent;
@@ -55,7 +56,6 @@
private String selectable;
public String getComponentType() {
- // TODO: implement uidata with overridden processUpdates to store state
return UIData.COMPONENT_TYPE;
}
@@ -81,21 +81,21 @@
protected void setProperties(UIComponent component) {
super.setProperties(component);
UIData data = (UIData) component;
- ComponentUtil.setStringProperty(data, ATTR_SHOW_ROW_RANGE, showRowRange);
- ComponentUtil.setStringProperty(data, ATTR_SHOW_PAGE_RANGE, showPageRange);
- ComponentUtil.setStringProperty(data, ATTR_SHOW_DIRECT_LINKS, showDirectLinks);
- ComponentUtil.setIntegerProperty(data, ATTR_DIRECT_LINK_COUNT, directLinkCount);
- ComponentUtil.setBooleanProperty(data, ATTR_SHOW_HEADER, showHeader);
- ComponentUtil.setIntegerProperty(data, ATTR_FIRST, first);
- ComponentUtil.setIntegerProperty(data, ATTR_ROWS, rows);
- ComponentUtil.setStringProperty(data, ATTR_COLUMNS, columns);
- ComponentUtil.setStringProperty(data, ATTR_VALUE, value);
- ComponentUtil.setStringProperty(data, ATTR_FORCE_VERTICAL_SCROLLBAR, forceVerticalScrollbar);
- ComponentUtil.setStringProperty(data, ATTR_VAR, var);
+ TagUtils.setStringProperty(data, ATTR_SHOW_ROW_RANGE, showRowRange);
+ TagUtils.setStringProperty(data, ATTR_SHOW_PAGE_RANGE, showPageRange);
+ TagUtils.setStringProperty(data, ATTR_SHOW_DIRECT_LINKS, showDirectLinks);
+ TagUtils.setIntegerProperty(data, ATTR_DIRECT_LINK_COUNT, directLinkCount);
+ TagUtils.setBooleanProperty(data, ATTR_SHOW_HEADER, showHeader);
+ TagUtils.setIntegerProperty(data, ATTR_FIRST, first);
+ TagUtils.setIntegerProperty(data, ATTR_ROWS, rows);
+ TagUtils.setStringProperty(data, ATTR_COLUMNS, columns);
+ TagUtils.setStringProperty(data, ATTR_VALUE, value);
+ TagUtils.setStringProperty(data, ATTR_FORCE_VERTICAL_SCROLLBAR, forceVerticalScrollbar);
+ TagUtils.setStringProperty(data, ATTR_VAR, var);
ComponentUtil.setValueBinding(component, ATTR_STATE, state);
ComponentUtil.setStateChangeListener(data, stateChangeListener);
ComponentUtil.setSortActionListener(data, sortActionListener);
- ComponentUtil.setStringProperty(data, ATTR_SELECTABLE, selectable);
+ TagUtils.setStringProperty(data, ATTR_SELECTABLE, selectable);
}
public String getColumns() {
Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/SheetTagDeclaration.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/SheetTagDeclaration.java?rev=636712&r1=636711&r2=636712&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/SheetTagDeclaration.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/SheetTagDeclaration.java Thu Mar 13 04:14:02 2008
@@ -41,7 +41,8 @@
@BodyContentDescription(anyTagOf = "<tc:column>* <tc:columnSelector>?")
@UIComponentTag(
uiComponent = "org.apache.myfaces.tobago.component.UIData",
- rendererType = "Sheet",
+ generate = false, isAjaxEnabled = true,
+ rendererType = "Sheet",
allowedChildComponenents = {
"javax.faces.Column",
"org.apache.myfaces.tobago.ColumnSelector"},
@@ -104,7 +105,7 @@
@TagAttribute
@UIComponentTagAttribute(type = {"java.lang.Object[]", "java.util.List", "javax.servlet.jsp.jstl.sql.Result",
"java.sql.ResultSet", "java.lang.Object", "javax.faces.model.DataModel"},
- valueExpression = "REQUIRED")
+ expression = DynamicExpression.VALUE_BINDING_REQUIRED)
void setValue(String value);
/**
@@ -192,7 +193,8 @@
* Sheet state saving object.
*/
@TagAttribute
- @UIComponentTagAttribute(type = "org.apache.myfaces.tobago.model.SheetState", valueExpression = "REQUIRED")
+ @UIComponentTagAttribute(type = "org.apache.myfaces.tobago.model.SheetState",
+ expression = DynamicExpression.VALUE_BINDING_REQUIRED)
void setState(String state);
/**
@@ -203,7 +205,8 @@
*/
@TagAttribute
@UIComponentTagAttribute(type = "javax.faces.el.MethodBinding",
- expression = DynamicExpression.METHOD_BINDING, valueExpression = "REQUIRED")
+ expression = DynamicExpression.METHOD_BINDING_REQUIRED,
+ methodSignature = "javax.faces.event.ActionEvent")
void setStateChangeListener(String stateChangeListener);
/**
@@ -220,7 +223,8 @@
*/
@TagAttribute
@UIComponentTagAttribute(type = "javax.faces.el.MethodBinding",
- expression = DynamicExpression.METHOD_BINDING, valueExpression = "REQUIRED")
+ expression = DynamicExpression.METHOD_BINDING_REQUIRED,
+ methodSignature = "javax.faces.event.ActionEvent")
void setSortActionListener(String sortActionListener);
}
Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/StyleTag.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/StyleTag.java?rev=636712&r1=636711&r2=636712&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/StyleTag.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/StyleTag.java Thu Mar 13 04:14:02 2008
@@ -24,6 +24,7 @@
import org.apache.myfaces.tobago.component.ComponentUtil;
import org.apache.myfaces.tobago.component.UIPage;
import org.apache.myfaces.tobago.taglib.decl.HasId;
+import org.apache.myfaces.tobago.internal.taglib.TagUtils;
import javax.faces.context.FacesContext;
import javax.servlet.jsp.JspException;
@@ -51,13 +52,13 @@
}
if (style != null) {
- page.getStyleFiles().add(ComponentUtil.getValueFromEl(style));
+ page.getStyleFiles().add(TagUtils.getValueFromEl(style));
}
if (bodyContent != null) {
String classes = bodyContent.getString();
bodyContent.clearBody();
- page.getStyleBlocks().add(ComponentUtil.getValueFromEl(classes));
+ page.getStyleBlocks().add(TagUtils.getValueFromEl(classes));
}
return EVAL_PAGE;
Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/TabChangeListenerTag.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/TabChangeListenerTag.java?rev=636712&r1=636711&r2=636712&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/TabChangeListenerTag.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/TabChangeListenerTag.java Thu Mar 13 04:14:02 2008
@@ -22,10 +22,10 @@
import org.apache.myfaces.tobago.apt.annotation.BodyContent;
import org.apache.myfaces.tobago.apt.annotation.Tag;
import org.apache.myfaces.tobago.apt.annotation.TagAttribute;
-import org.apache.myfaces.tobago.component.ComponentUtil;
import org.apache.myfaces.tobago.event.TabChangeListener;
import org.apache.myfaces.tobago.event.TabChangeListenerValueBindingDelegate;
import org.apache.myfaces.tobago.event.TabChangeSource;
+import org.apache.myfaces.tobago.internal.taglib.TagUtils;
import javax.faces.component.UIComponent;
import javax.faces.context.FacesContext;
@@ -107,7 +107,7 @@
TabChangeListener handler = null;
ValueBinding valueBinding = null;
if (binding != null && UIComponentTag.isValueReference(binding)) {
- valueBinding = ComponentUtil.createValueBinding(binding);
+ valueBinding = TagUtils.createValueBinding(binding);
if (valueBinding != null) {
Object obj = valueBinding.getValue(FacesContext.getCurrentInstance());
if (obj != null && obj instanceof TabChangeListener) {
Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/TabGroupTag.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/TabGroupTag.java?rev=636712&r1=636711&r2=636712&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/TabGroupTag.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/TabGroupTag.java Thu Mar 13 04:14:02 2008
@@ -26,6 +26,7 @@
import org.apache.myfaces.tobago.component.UITabGroup;
import static org.apache.myfaces.tobago.component.UITabGroup.SWITCH_TYPE_CLIENT;
import static org.apache.myfaces.tobago.component.UITabGroup.SWITCH_TYPE_RELOAD_PAGE;
+import org.apache.myfaces.tobago.internal.taglib.TagUtils;
import javax.faces.component.UIComponent;
import javax.faces.component.ActionSource;
@@ -50,10 +51,10 @@
@Override
protected void setProperties(UIComponent component) {
super.setProperties(component);
- ComponentUtil.setIntegerProperty(component, ATTR_SELECTED_INDEX, selectedIndex);
- ComponentUtil.setIntegerProperty(component, ATTR_SELECTED_INDEX, state);
- ComponentUtil.setStringProperty(component, ATTR_SWITCH_TYPE, switchType);
- ComponentUtil.setBooleanProperty(component, ATTR_IMMEDIATE, immediate);
+ TagUtils.setIntegerProperty(component, ATTR_SELECTED_INDEX, selectedIndex);
+ TagUtils.setIntegerProperty(component, ATTR_SELECTED_INDEX, state);
+ TagUtils.setStringProperty(component, ATTR_SWITCH_TYPE, switchType);
+ TagUtils.setBooleanProperty(component, ATTR_IMMEDIATE, immediate);
if (component instanceof ActionSource) {
ComponentUtil.setActionListener((ActionSource) component, actionListener);
ComponentUtil.setAction((ActionSource) component, action);
Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/TabGroupTagDeclaration.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/TabGroupTagDeclaration.java?rev=636712&r1=636711&r2=636712&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/TabGroupTagDeclaration.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/TabGroupTagDeclaration.java Thu Mar 13 04:14:02 2008
@@ -22,6 +22,7 @@
import org.apache.myfaces.tobago.apt.annotation.TagAttribute;
import org.apache.myfaces.tobago.apt.annotation.UIComponentTag;
import org.apache.myfaces.tobago.apt.annotation.UIComponentTagAttribute;
+import org.apache.myfaces.tobago.apt.annotation.DynamicExpression;
import org.apache.myfaces.tobago.component.UITabGroup;
import org.apache.myfaces.tobago.taglib.decl.HasDeprecatedDimension;
import org.apache.myfaces.tobago.taglib.decl.HasIdBindingAndRendered;
@@ -43,7 +44,10 @@
@BodyContentDescription(anyTagOf = "(<tc:tab>* ")
@UIComponentTag(
uiComponent = "org.apache.myfaces.tobago.component.UITabGroup",
+ uiComponentBaseClass = "org.apache.myfaces.tobago.component.UIPanelBase",
+ generate = false,
rendererType = "TabGroup",
+ isAjaxEnabled = true,
allowedChildComponenents = "org.apache.myfaces.tobago.Tab")
public interface TabGroupTagDeclaration extends TobagoTagDeclaration, HasIdBindingAndRendered, HasDeprecatedDimension,
@@ -79,7 +83,8 @@
* component's selected Tab.
*
*/
- @TagAttribute @UIComponentTagAttribute(type = "java.lang.Integer", valueExpression= "REQUIRED")
+ @TagAttribute @UIComponentTagAttribute(type = "java.lang.Integer",
+ expression = DynamicExpression.VALUE_BINDING_REQUIRED)
void setSelectedIndex(String selectedIndex);
/**
Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/TabTag.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/TabTag.java?rev=636712&r1=636711&r2=636712&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/TabTag.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/TabTag.java Thu Mar 13 04:14:02 2008
@@ -24,6 +24,7 @@
import static org.apache.myfaces.tobago.TobagoConstants.ATTR_TIP;
import org.apache.myfaces.tobago.component.ComponentUtil;
import org.apache.myfaces.tobago.component.UITab;
+import org.apache.myfaces.tobago.internal.taglib.TagUtils;
import javax.faces.component.UIComponent;
import javax.servlet.jsp.tagext.BodyTag;
@@ -45,10 +46,10 @@
protected void setProperties(UIComponent component) {
super.setProperties(component);
- ComponentUtil.setStringProperty(component, ATTR_LABEL, label);
- ComponentUtil.setStringProperty(component, ATTR_TIP, tip);
+ TagUtils.setStringProperty(component, ATTR_LABEL, label);
+ TagUtils.setStringProperty(component, ATTR_TIP, tip);
ComponentUtil.setMarkup(component, markup);
- ComponentUtil.setBooleanProperty(component, ATTR_DISABLED, disabled);
+ TagUtils.setBooleanProperty(component, ATTR_DISABLED, disabled);
}
public void release() {
Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/TabTagDeclaration.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/TabTagDeclaration.java?rev=636712&r1=636711&r2=636712&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/TabTagDeclaration.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/TabTagDeclaration.java Thu Mar 13 04:14:02 2008
@@ -36,6 +36,8 @@
@Tag(name = "tab")
@UIComponentTag(
uiComponent = "org.apache.myfaces.tobago.component.UITab",
+ uiComponentBaseClass = "org.apache.myfaces.tobago.component.UIPanel",
+ namingContainer = true,
rendererType = "Tab")
public interface TabTagDeclaration extends TobagoBodyTagDeclaration, HasIdBindingAndRendered, HasLabelAndAccessKey,
HasTip, HasMarkup, IsDisabled {
Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/TextAreaTag.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/TextAreaTag.java?rev=636712&r1=636711&r2=636712&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/TextAreaTag.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/TextAreaTag.java Thu Mar 13 04:14:02 2008
@@ -21,6 +21,7 @@
import org.apache.commons.logging.LogFactory;
import static org.apache.myfaces.tobago.TobagoConstants.ATTR_ROWS;
import org.apache.myfaces.tobago.component.ComponentUtil;
+import org.apache.myfaces.tobago.internal.taglib.TagUtils;
import javax.faces.component.UIComponent;
@@ -48,7 +49,7 @@
LOG.warn("the label attribute is deprecated in t:in, please use tx:in instead.");
}
- ComponentUtil.setStringProperty(component, ATTR_ROWS, rows);
+ TagUtils.setStringProperty(component, ATTR_ROWS, rows);
ComponentUtil.setMarkup(component, markup);
}
Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/TextAreaTagDeclaration.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/TextAreaTagDeclaration.java?rev=636712&r1=636711&r2=636712&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/TextAreaTagDeclaration.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/TextAreaTagDeclaration.java Thu Mar 13 04:14:02 2008
@@ -27,7 +27,6 @@
import org.apache.myfaces.tobago.taglib.decl.HasLabelAndAccessKey;
import org.apache.myfaces.tobago.taglib.decl.HasTip;
import org.apache.myfaces.tobago.taglib.decl.IsDisabled;
-import org.apache.myfaces.tobago.taglib.decl.IsFocus;
import org.apache.myfaces.tobago.taglib.decl.IsReadonly;
import org.apache.myfaces.tobago.taglib.decl.IsRequired;
@@ -42,12 +41,13 @@
*/
@Tag(name = "textarea")
@UIComponentTag(
- uiComponent = "org.apache.myfaces.tobago.component.UIInput",
+ uiComponent = "org.apache.myfaces.tobago.component.UITextarea",
+ uiComponentBaseClass = "org.apache.myfaces.tobago.component.UIInputBase",
rendererType = "TextArea",
allowedChildComponenents = "NONE")
public interface TextAreaTagDeclaration extends TextInputTagDeclaration, HasIdBindingAndRendered,
HasConverter, IsReadonly, IsDisabled, HasDeprecatedDimension,
- IsFocus, IsRequired, HasLabelAndAccessKey, HasTip {
+ IsRequired, HasLabelAndAccessKey, HasTip {
/**
* The row count for this component.
@@ -61,6 +61,6 @@
* Possible value is 'none'. But this can be overridden in the theme.
*/
@TagAttribute
- @UIComponentTagAttribute(defaultValue = "none")
+ @UIComponentTagAttribute(defaultValue = "none", type = "java.lang.String[]")
void setMarkup(String markup);
}
Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/TextInputTag.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/TextInputTag.java?rev=636712&r1=636711&r2=636712&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/TextInputTag.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/TextInputTag.java Thu Mar 13 04:14:02 2008
@@ -17,7 +17,7 @@
* limitations under the License.
*/
-import org.apache.myfaces.tobago.component.UIInput;
+import org.apache.myfaces.tobago.component.UIInputBase;
/**
* User: weber
@@ -27,7 +27,7 @@
public class TextInputTag extends InputTag implements TextInputTagDeclaration {
public String getComponentType() {
- return UIInput.COMPONENT_TYPE;
+ return UIInputBase.COMPONENT_TYPE;
}
Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/TimeTagDeclaration.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/TimeTagDeclaration.java?rev=636712&r1=636711&r2=636712&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/TimeTagDeclaration.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/TimeTagDeclaration.java Thu Mar 13 04:14:02 2008
@@ -39,7 +39,9 @@
@Tag(name = "time")
@UIComponentTag(
uiComponent = "org.apache.myfaces.tobago.component.UITimeInput",
- rendererType =RENDERER_TYPE_TIME,
+ uiComponentBaseClass = "javax.faces.component.UIInput",
+ generate = false,
+ rendererType = RENDERER_TYPE_TIME,
allowedChildComponenents = "NONE")
public interface TimeTagDeclaration
extends InputTagDeclaration, HasIdBindingAndRendered,
Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/TobagoTag.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/TobagoTag.java?rev=636712&r1=636711&r2=636712&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/TobagoTag.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/TobagoTag.java Thu Mar 13 04:14:02 2008
@@ -28,8 +28,8 @@
import static org.apache.myfaces.tobago.TobagoConstants.ATTR_TITLE;
import static org.apache.myfaces.tobago.TobagoConstants.ATTR_WIDTH;
import static org.apache.myfaces.tobago.TobagoConstants.TOBAGO_COMPONENT_CREATED;
-import org.apache.myfaces.tobago.component.ComponentUtil;
import org.apache.myfaces.tobago.component.OnComponentCreated;
+import org.apache.myfaces.tobago.internal.taglib.TagUtils;
import javax.faces.component.UIComponent;
import javax.faces.webapp.UIComponentTag;
@@ -88,22 +88,22 @@
protected void setProperties(UIComponent component) {
super.setProperties(component);
- ComponentUtil.setStringProperty(component, ATTR_LABEL, label);
- ComponentUtil.setStringProperty(component, ATTR_TITLE, title);
+ TagUtils.setStringProperty(component, ATTR_LABEL, label);
+ TagUtils.setStringProperty(component, ATTR_TITLE, title);
- ComponentUtil.setBooleanProperty(component, ATTR_DISABLED, disabled);
- ComponentUtil.setBooleanProperty(component, ATTR_READONLY, readonly);
- ComponentUtil.setBooleanProperty(component, ATTR_HIDDEN, hidden);
- ComponentUtil.setBooleanProperty(component, ATTR_INLINE, inline);
+ TagUtils.setBooleanProperty(component, ATTR_DISABLED, disabled);
+ TagUtils.setBooleanProperty(component, ATTR_READONLY, readonly);
+ TagUtils.setBooleanProperty(component, ATTR_HIDDEN, hidden);
+ TagUtils.setBooleanProperty(component, ATTR_INLINE, inline);
if (width != null) {
LOG.warn("the width attribute is deprecated, please use a layout manager. (" + getClass().getSimpleName() + ")");
}
- ComponentUtil.setStringProperty(component, ATTR_WIDTH, width);
+ TagUtils.setStringProperty(component, ATTR_WIDTH, width);
if (height != null) {
LOG.warn("the height attribute is deprecated, please use a layout manager. (" + getClass().getSimpleName() + ")");
}
- ComponentUtil.setStringProperty(component, ATTR_HEIGHT, height);
+ TagUtils.setStringProperty(component, ATTR_HEIGHT, height);
}
public String getDisabled() {