You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by lo...@apache.org on 2013/06/04 10:27:23 UTC
svn commit: r1489330 - in
/myfaces/tobago/branches/tobago-1.5.x/tobago-extension:
tobago-facelets/src/main/java/org/apache/myfaces/tobago/facelets/extension/
tobago-taglib-extension/src/main/java-jsf-1.1/org/apache/myfaces/tobago/internal/taglib/extens...
Author: lofwyr
Date: Tue Jun 4 08:27:23 2013
New Revision: 1489330
URL: http://svn.apache.org/r1489330
Log:
TOBAGO-1274: tx:date should relay the markups also to the date picker
Modified:
myfaces/tobago/branches/tobago-1.5.x/tobago-extension/tobago-facelets/src/main/java/org/apache/myfaces/tobago/facelets/extension/DateExtensionHandler.java
myfaces/tobago/branches/tobago-1.5.x/tobago-extension/tobago-taglib-extension/src/main/java-jsf-1.1/org/apache/myfaces/tobago/internal/taglib/extension/DateExtensionTag.java
myfaces/tobago/branches/tobago-1.5.x/tobago-extension/tobago-taglib-extension/src/main/java-jsf-1.2/org/apache/myfaces/tobago/internal/taglib/extension/DateExtensionTag.java
Modified: myfaces/tobago/branches/tobago-1.5.x/tobago-extension/tobago-facelets/src/main/java/org/apache/myfaces/tobago/facelets/extension/DateExtensionHandler.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-1.5.x/tobago-extension/tobago-facelets/src/main/java/org/apache/myfaces/tobago/facelets/extension/DateExtensionHandler.java?rev=1489330&r1=1489329&r2=1489330&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-1.5.x/tobago-extension/tobago-facelets/src/main/java/org/apache/myfaces/tobago/facelets/extension/DateExtensionHandler.java (original)
+++ myfaces/tobago/branches/tobago-1.5.x/tobago-extension/tobago-facelets/src/main/java/org/apache/myfaces/tobago/facelets/extension/DateExtensionHandler.java Tue Jun 4 08:27:23 2013
@@ -20,15 +20,19 @@
package org.apache.myfaces.tobago.facelets.extension;
import com.sun.facelets.FaceletContext;
+import com.sun.facelets.el.ELAdaptor;
import com.sun.facelets.tag.TagAttribute;
import com.sun.facelets.tag.jsf.ComponentConfig;
import com.sun.facelets.tag.jsf.ComponentSupport;
+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 javax.el.ValueExpression;
import javax.faces.application.Application;
import javax.faces.component.UIComponent;
import javax.faces.component.UIViewRoot;
@@ -37,11 +41,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 +77,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);
+ ELAdaptor.setExpression(picker, Attributes.MARKUP, expression);
+ }
+ }
form.getChildren().add(picker);
}
}
Modified: myfaces/tobago/branches/tobago-1.5.x/tobago-extension/tobago-taglib-extension/src/main/java-jsf-1.1/org/apache/myfaces/tobago/internal/taglib/extension/DateExtensionTag.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-1.5.x/tobago-extension/tobago-taglib-extension/src/main/java-jsf-1.1/org/apache/myfaces/tobago/internal/taglib/extension/DateExtensionTag.java?rev=1489330&r1=1489329&r2=1489330&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-1.5.x/tobago-extension/tobago-taglib-extension/src/main/java-jsf-1.1/org/apache/myfaces/tobago/internal/taglib/extension/DateExtensionTag.java (original)
+++ myfaces/tobago/branches/tobago-1.5.x/tobago-extension/tobago-taglib-extension/src/main/java-jsf-1.1/org/apache/myfaces/tobago/internal/taglib/extension/DateExtensionTag.java Tue Jun 4 08:27:23 2013
@@ -208,6 +208,9 @@ public class DateExtensionTag extends Bo
if (tabIndex != null) {
datePicker.setTabIndex(tabIndex);
}
+ if (markup != null) {
+ datePicker.setMarkup(markup);
+ }
datePicker.setParent(formTag);
datePicker.doStartTag();
datePicker.doEndTag();
Modified: myfaces/tobago/branches/tobago-1.5.x/tobago-extension/tobago-taglib-extension/src/main/java-jsf-1.2/org/apache/myfaces/tobago/internal/taglib/extension/DateExtensionTag.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-1.5.x/tobago-extension/tobago-taglib-extension/src/main/java-jsf-1.2/org/apache/myfaces/tobago/internal/taglib/extension/DateExtensionTag.java?rev=1489330&r1=1489329&r2=1489330&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-1.5.x/tobago-extension/tobago-taglib-extension/src/main/java-jsf-1.2/org/apache/myfaces/tobago/internal/taglib/extension/DateExtensionTag.java (original)
+++ myfaces/tobago/branches/tobago-1.5.x/tobago-extension/tobago-taglib-extension/src/main/java-jsf-1.2/org/apache/myfaces/tobago/internal/taglib/extension/DateExtensionTag.java Tue Jun 4 08:27:23 2013
@@ -195,6 +195,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);