You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by we...@apache.org on 2007/01/22 13:52:34 UTC
svn commit: r498598 - in /myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component: ComponentUtil.java UIBox.java UIColumn.java UIInput.java UIOutput.java

Author: weber
Date: Mon Jan 22 04:52:33 2007
New Revision: 498598

URL: http://svn.apache.org/viewvc?view=rev&rev=498598
Log:
TOBAGO-205 (Allow multiple values in markup attribute)

Modified:
    myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/ComponentUtil.java
    myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/UIBox.java
    myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/UIColumn.java
    myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/UIInput.java
    myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/UIOutput.java

Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/ComponentUtil.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/ComponentUtil.java?view=diff&rev=498598&r1=498597&r2=498598
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/ComponentUtil.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/ComponentUtil.java Mon Jan 22 04:52:33 2007
@@ -300,7 +300,7 @@
       LOG.warn("Searching for a boolean, but find a String. Should not happen. "
           + "attribute: '" + name + "' id: '" + component.getClientId(FacesContext.getCurrentInstance())
           + "' comp: '" + component + "'");
-      return Boolean.getBoolean((String) bool);
+      return Boolean.valueOf((String) bool);
     } else {
       LOG.warn("Unknown type '" + bool.getClass().getName()
           + "' for boolean attribute: " + name + " id: " + component.getClientId(FacesContext.getCurrentInstance())
@@ -1069,5 +1069,23 @@
             "Must be a valueReference (actionListener): " + stateChangeListener);
       }
     }
+  }
+
+
+
+  public static String[] getMarkupBinding(FacesContext facesContext, SupportsMarkup component) {
+    ValueBinding vb = ((UIComponent)component).getValueBinding(ATTR_MARKUP);
+    if (vb != null) {
+      Object markups = vb.getValue(facesContext);
+      if (markups instanceof String[]) {
+        return (String[]) markups;
+      } else if (markups == null) {
+        return new String[0];
+      } else {
+        return new String[]{(String) markups};
+      }
+    }
+
+    return new String[0];
   }
 }

Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/UIBox.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/UIBox.java?view=diff&rev=498598&r1=498597&r2=498598
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/UIBox.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/UIBox.java Mon Jan 22 04:52:33 2007
@@ -39,12 +39,7 @@
     if (markup != null) {
       return markup;
     }
-    ValueBinding vb = getValueBinding(ATTR_MARKUP);
-    if (vb != null) {
-      return (String[]) vb.getValue(getFacesContext());
-    } else {
-      return new String[0];
-    }
+    return ComponentUtil.getMarkupBinding(getFacesContext(), this);
   }
 
   public void setMarkup(String[] markup) {

Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/UIColumn.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/UIColumn.java?view=diff&rev=498598&r1=498597&r2=498598
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/UIColumn.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/UIColumn.java Mon Jan 22 04:52:33 2007
@@ -62,12 +62,7 @@
     if (markup != null) {
       return markup;
     }
-    ValueBinding vb = getValueBinding(ATTR_MARKUP);
-    if (vb != null) {
-      return (String[]) vb.getValue(getFacesContext());
-    } else {
-      return new String[0];
-    }
+    return ComponentUtil.getMarkupBinding(getFacesContext(), this);
   }
 
   public void setMarkup(String[] markup) {

Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/UIInput.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/UIInput.java?view=diff&rev=498598&r1=498597&r2=498598
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/UIInput.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/UIInput.java Mon Jan 22 04:52:33 2007
@@ -64,12 +64,7 @@
     if (markup != null) {
       return markup;
     }
-    ValueBinding vb = getValueBinding(ATTR_MARKUP);
-    if (vb != null) {
-      return (String[]) vb.getValue(getFacesContext());
-    } else {
-      return new String[0];
-    }
+    return ComponentUtil.getMarkupBinding(getFacesContext(), this);
   }
 
   public void setMarkup(String[] markup) {

Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/UIOutput.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/UIOutput.java?view=diff&rev=498598&r1=498597&r2=498598
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/UIOutput.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/UIOutput.java Mon Jan 22 04:52:33 2007
@@ -78,12 +78,7 @@
     if (markup != null) {
       return markup;
     }
-    ValueBinding vb = getValueBinding(ATTR_MARKUP);
-    if (vb != null) {
-      return (String[]) vb.getValue(getFacesContext());
-    } else {
-      return new String[0];
-    }
+    return ComponentUtil.getMarkupBinding(getFacesContext(), this);
   }
 
   public void setMarkup(String[] markup) {