svn commit: r1489331 - in /myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago: facelets/extension/DateExtensionHandler.java internal/taglib/extension/DateExtensionTag.java

[lo...@apache.org]

Author: lofwyr
Date: Tue Jun  4 08:28:56 2013
New Revision: 1489331

URL: http://svn.apache.org/r1489331
Log:
TOBAGO-1274: tx:date should relay the markups also to the date picker

Modified:
    myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/extension/DateExtensionHandler.java
    myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/DateExtensionTag.java

Modified: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/extension/DateExtensionHandler.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/extension/DateExtensionHandler.java?rev=1489331&r1=1489330&r2=1489331&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/extension/DateExtensionHandler.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/extension/DateExtensionHandler.java Tue Jun  4 08:28:56 2013
@@ -19,13 +19,16 @@
 
 package org.apache.myfaces.tobago.facelets.extension;
 
+import org.apache.myfaces.tobago.component.Attributes;
 import org.apache.myfaces.tobago.component.OnComponentCreated;
 import org.apache.myfaces.tobago.component.RendererTypes;
 import org.apache.myfaces.tobago.component.UIDate;
 import org.apache.myfaces.tobago.component.UIDatePicker;
 import org.apache.myfaces.tobago.component.UIForm;
+import org.apache.myfaces.tobago.context.Markup;
 import org.apache.myfaces.tobago.util.ComponentUtils;
 
+import javax.el.ValueExpression;
 import javax.faces.application.Application;
 import javax.faces.component.UIComponent;
 import javax.faces.component.UIViewRoot;
@@ -37,11 +40,13 @@ public class DateExtensionHandler extend
 
   private TagAttribute pickerIdAttribute;
   private TagAttribute formIdAttribute;
+  private TagAttribute markupAttribute;
 
   public DateExtensionHandler(ComponentConfig config) {
     super(config);
     pickerIdAttribute = getAttribute("pickerId");
     formIdAttribute = getAttribute("formId");
+    markupAttribute = getAttribute(Attributes.MARKUP);
   }
 
   protected String getSubComponentType() {
@@ -71,6 +76,14 @@ public class DateExtensionHandler extend
         picker.getAttributes().put(OnComponentCreated.MARKER, Boolean.TRUE);
         picker.onComponentCreated(faceletContext.getFacesContext(), panel);
       }
+      if (markupAttribute != null) {
+        if (markupAttribute.isLiteral()) {
+          picker.setMarkup(Markup.valueOf(markupAttribute.getValue()));
+        } else {
+          ValueExpression expression = markupAttribute.getValueExpression(faceletContext, Object.class);
+          picker.setValueExpression(Attributes.MARKUP, expression);
+        }
+      }
       form.getChildren().add(picker);
     }
   }

Modified: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/DateExtensionTag.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/DateExtensionTag.java?rev=1489331&r1=1489330&r2=1489331&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/DateExtensionTag.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/DateExtensionTag.java Tue Jun  4 08:28:56 2013
@@ -193,6 +193,9 @@ public class DateExtensionTag extends To
     if (tabIndex != null) {
       datePicker.setTabIndex(tabIndex);
     }
+    if (markup != null) {
+      datePicker.setMarkup(markup);
+    }
     datePicker.setParent(formTag);
     if (pickerId != null) {
       datePicker.setId(pickerId);