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 2006/08/17 23:37:57 UTC
svn commit: r432395 -
/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/extension/DateExtensionTag.java
Author: bommel
Date: Thu Aug 17 14:37:56 2006
New Revision: 432395
URL: http://svn.apache.org/viewvc?rev=432395&view=rev
Log:
TOBAGO-114
Modified:
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/extension/DateExtensionTag.java
Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/extension/DateExtensionTag.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/extension/DateExtensionTag.java?rev=432395&r1=432394&r2=432395&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/extension/DateExtensionTag.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/extension/DateExtensionTag.java Thu Aug 17 14:37:56 2006
@@ -19,6 +19,7 @@
import org.apache.myfaces.tobago.apt.annotation.Tag;
import org.apache.myfaces.tobago.taglib.component.DateTag;
import org.apache.myfaces.tobago.taglib.component.DatePickerTag;
+import org.apache.myfaces.tobago.taglib.component.FormTag;
import org.apache.myfaces.tobago.taglib.decl.HasConverter;
import org.apache.myfaces.tobago.taglib.decl.HasIdBindingAndRendered;
import org.apache.myfaces.tobago.taglib.decl.HasLabel;
@@ -41,7 +42,6 @@
* User: bommel
* Date: 19.12.2005
* Time: 20:13:26
- * To change this template use File | Settings | File Templates.
*/
/**
* Renders a date input field with a date picker and a label.
@@ -70,7 +70,7 @@
private LabelExtensionTag labelTag;
private DateTag dateTag;
- private DatePickerTag datePicker;
+
@Override
public int doStartTag() throws JspException {
@@ -136,12 +136,18 @@
@Override
public int doEndTag() throws JspException {
dateTag.doEndTag();
- datePicker = new DatePickerTag();
+ FormTag formTag = new FormTag();
+ formTag.setPageContext(pageContext);
+ formTag.setParent(labelTag);
+ formTag.doStartTag();
+
+ DatePickerTag datePicker = new DatePickerTag();
datePicker.setPageContext(pageContext);
datePicker.setFor("@auto");
- datePicker.setParent(getParent());
+ datePicker.setParent(formTag);
datePicker.doStartTag();
datePicker.doEndTag();
+ formTag.doEndTag();
labelTag.doEndTag();
return super.doEndTag();
@@ -164,7 +170,8 @@
value = null;
valueChangeListener = null;
onchange = null;
-
+ labelTag = null;
+ dateTag = null;
}
public void setValue(String value) {