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 2010/02/16 16:58:43 UTC
svn commit: r910571 -
/myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java-jsf-1.2/org/apache/myfaces/tobago/taglib/extension/
Author: lofwyr
Date: Tue Feb 16 15:58:41 2010
New Revision: 910571
URL: http://svn.apache.org/viewvc?rev=910571&view=rev
Log:
TOBAGO-850: tx components will be created new when rerendering in JSF 1.2 and using JSP
- add support for JspIdConsumer
a Tag of the tx-lib is mostly like a JSP page, so it must call the setJspId() method of the used Tags.
Modified:
myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java-jsf-1.2/org/apache/myfaces/tobago/taglib/extension/DateExtensionTag.java
myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java-jsf-1.2/org/apache/myfaces/tobago/taglib/extension/FileExtensionTag.java
myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java-jsf-1.2/org/apache/myfaces/tobago/taglib/extension/InExtensionTag.java
myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java-jsf-1.2/org/apache/myfaces/tobago/taglib/extension/LabelExtensionTag.java
myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java-jsf-1.2/org/apache/myfaces/tobago/taglib/extension/MenuCheckboxExtensionTag.java
myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java-jsf-1.2/org/apache/myfaces/tobago/taglib/extension/MenuRadioExtensionTag.java
myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java-jsf-1.2/org/apache/myfaces/tobago/taglib/extension/SelectBooleanCheckboxExtensionTag.java
myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java-jsf-1.2/org/apache/myfaces/tobago/taglib/extension/SelectManyCheckboxExtensionTag.java
myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java-jsf-1.2/org/apache/myfaces/tobago/taglib/extension/SelectManyListboxExtensionTag.java
myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java-jsf-1.2/org/apache/myfaces/tobago/taglib/extension/SelectOneChoiceExtensionTag.java
myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java-jsf-1.2/org/apache/myfaces/tobago/taglib/extension/SelectOneListboxExtensionTag.java
myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java-jsf-1.2/org/apache/myfaces/tobago/taglib/extension/SelectOneRadioExtensionTag.java
myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java-jsf-1.2/org/apache/myfaces/tobago/taglib/extension/SeparatorExtensionTag.java
myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java-jsf-1.2/org/apache/myfaces/tobago/taglib/extension/TextAreaExtensionTag.java
myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java-jsf-1.2/org/apache/myfaces/tobago/taglib/extension/TimeExtensionTag.java
myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java-jsf-1.2/org/apache/myfaces/tobago/taglib/extension/TobagoExtensionBodyTagSupport.java
Modified: myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java-jsf-1.2/org/apache/myfaces/tobago/taglib/extension/DateExtensionTag.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java-jsf-1.2/org/apache/myfaces/tobago/taglib/extension/DateExtensionTag.java?rev=910571&r1=910570&r2=910571&view=diff
==============================================================================
--- myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java-jsf-1.2/org/apache/myfaces/tobago/taglib/extension/DateExtensionTag.java (original)
+++ myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java-jsf-1.2/org/apache/myfaces/tobago/taglib/extension/DateExtensionTag.java Tue Feb 16 15:58:41 2010
@@ -103,6 +103,7 @@
labelTag.setMarkup(markup);
}
labelTag.setParent(getParent());
+ labelTag.setJspId(jspId + PREFIX + idSuffix++);
labelTag.doStartTag();
dateTag = new DateTag();
@@ -160,19 +161,19 @@
}
dateTag.setParent(labelTag);
+ dateTag.setJspId(jspId + PREFIX + idSuffix++);
dateTag.doStartTag();
return super.doStartTag();
}
-
-
@Override
public int doEndTag() throws JspException {
dateTag.doEndTag();
FormTag formTag = new FormTag();
formTag.setPageContext(pageContext);
formTag.setParent(labelTag);
+ formTag.setJspId(jspId + PREFIX + idSuffix++);
formTag.doStartTag();
DatePickerTag datePicker = new DatePickerTag();
@@ -182,6 +183,7 @@
datePicker.setTabIndex(tabIndex);
}
datePicker.setParent(formTag);
+ datePicker.setJspId(jspId + PREFIX + idSuffix++);
datePicker.doStartTag();
datePicker.doEndTag();
formTag.doEndTag();
Modified: myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java-jsf-1.2/org/apache/myfaces/tobago/taglib/extension/FileExtensionTag.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java-jsf-1.2/org/apache/myfaces/tobago/taglib/extension/FileExtensionTag.java?rev=910571&r1=910570&r2=910571&view=diff
==============================================================================
--- myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java-jsf-1.2/org/apache/myfaces/tobago/taglib/extension/FileExtensionTag.java (original)
+++ myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java-jsf-1.2/org/apache/myfaces/tobago/taglib/extension/FileExtensionTag.java Tue Feb 16 15:58:41 2010
@@ -86,6 +86,7 @@
labelTag.setLabelWidth(createStringValueExpression(labelWidth.getExpressionString() + ";*"));
}
labelTag.setParent(getParent());
+ labelTag.setJspId(jspId + PREFIX + idSuffix++);
labelTag.doStartTag();
fileTag = new FileTag();
@@ -131,6 +132,7 @@
fileTag.setRequiredMessage(requiredMessage);
}
fileTag.setParent(labelTag);
+ fileTag.setJspId(jspId + PREFIX + idSuffix++);
fileTag.doStartTag();
return super.doStartTag();
Modified: myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java-jsf-1.2/org/apache/myfaces/tobago/taglib/extension/InExtensionTag.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java-jsf-1.2/org/apache/myfaces/tobago/taglib/extension/InExtensionTag.java?rev=910571&r1=910570&r2=910571&view=diff
==============================================================================
--- myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java-jsf-1.2/org/apache/myfaces/tobago/taglib/extension/InExtensionTag.java (original)
+++ myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java-jsf-1.2/org/apache/myfaces/tobago/taglib/extension/InExtensionTag.java Tue Feb 16 15:58:41 2010
@@ -27,7 +27,6 @@
import org.apache.myfaces.tobago.internal.taglib.InTag;
import javax.servlet.jsp.JspException;
-import javax.servlet.jsp.tagext.JspIdConsumer;
/**
* Renders a text input field with a label.
@@ -49,10 +48,8 @@
@Tag(name = "in")
@ExtensionTag(baseClassName = "org.apache.myfaces.tobago.internal.taglib.InTag")
-public class InExtensionTag extends TobagoExtensionBodyTagSupport implements JspIdConsumer {
+public class InExtensionTag extends TobagoExtensionBodyTagSupport {
- public static final String PREFIX = "tx";
-
private javax.el.ValueExpression binding;
private javax.el.ValueExpression converter;
private javax.el.MethodExpression validator;
@@ -78,13 +75,9 @@
private LabelExtensionTag labelTag;
private InTag inTag;
- private String jspId;
-
@Override
public int doStartTag() throws JspException {
- int suffixId = 0;
-
labelTag = new LabelExtensionTag();
labelTag.setPageContext(pageContext);
if (label != null) {
@@ -103,7 +96,7 @@
labelTag.setMarkup(markup);
}
labelTag.setParent(getParent());
- labelTag.setJspId(jspId + PREFIX + suffixId++);
+ labelTag.setJspId(jspId + PREFIX + idSuffix++);
labelTag.doStartTag();
inTag = new InTag();
@@ -163,7 +156,7 @@
inTag.setRequiredMessage(requiredMessage);
}
inTag.setParent(labelTag);
- inTag.setJspId(jspId + PREFIX + suffixId++);
+ inTag.setJspId(jspId + PREFIX + idSuffix++);
inTag.doStartTag();
return super.doStartTag();
@@ -178,10 +171,6 @@
private static final Log LOG = LogFactory.getLog(InExtensionTag.class);
- public void setJspId(String jspId) {
- this.jspId = jspId;
- }
-
@Override
public void release() {
super.release();
Modified: myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java-jsf-1.2/org/apache/myfaces/tobago/taglib/extension/LabelExtensionTag.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java-jsf-1.2/org/apache/myfaces/tobago/taglib/extension/LabelExtensionTag.java?rev=910571&r1=910570&r2=910571&view=diff
==============================================================================
--- myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java-jsf-1.2/org/apache/myfaces/tobago/taglib/extension/LabelExtensionTag.java (original)
+++ myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java-jsf-1.2/org/apache/myfaces/tobago/taglib/extension/LabelExtensionTag.java Tue Feb 16 15:58:41 2010
@@ -32,16 +32,14 @@
import javax.el.ValueExpression;
import javax.faces.webapp.FacetTag;
import javax.servlet.jsp.JspException;
-import javax.servlet.jsp.tagext.JspIdConsumer;
@Tag(name = "label")
@ExtensionTag(baseClassName = "org.apache.myfaces.tobago.internal.taglib.LabelTag")
-public class LabelExtensionTag extends TobagoExtensionBodyTagSupport implements JspIdConsumer {
+public class LabelExtensionTag extends TobagoExtensionBodyTagSupport {
private static final Log LOG = LogFactory.getLog(LabelExtensionTag.class);
public static final String DEFAULT_COLUMNS = "fixed;*";
- public static final String PREFIX = "tx";
private javax.el.ValueExpression value;
private javax.el.ValueExpression tip;
@@ -54,11 +52,11 @@
private PanelTag panelTag;
private String jspId;
+ private int suffixId;
@Override
public int doStartTag() throws JspException {
- int suffixId = 0;
panelTag = new PanelTag();
panelTag.setPageContext(pageContext);
panelTag.setParent(getParent());
@@ -119,10 +117,6 @@
return super.doEndTag();
}
- public void setJspId(String jspId) {
- this.jspId = jspId;
- }
-
@Override
public void release() {
super.release();
Modified: myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java-jsf-1.2/org/apache/myfaces/tobago/taglib/extension/MenuCheckboxExtensionTag.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java-jsf-1.2/org/apache/myfaces/tobago/taglib/extension/MenuCheckboxExtensionTag.java?rev=910571&r1=910570&r2=910571&view=diff
==============================================================================
--- myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java-jsf-1.2/org/apache/myfaces/tobago/taglib/extension/MenuCheckboxExtensionTag.java (original)
+++ myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java-jsf-1.2/org/apache/myfaces/tobago/taglib/extension/MenuCheckboxExtensionTag.java Tue Feb 16 15:58:41 2010
@@ -32,20 +32,13 @@
import javax.faces.component.UIComponent;
import javax.faces.webapp.FacetTag;
import javax.servlet.jsp.JspException;
-import javax.servlet.jsp.tagext.BodyTagSupport;
-
-/*
- * Date: 09.05.2006
- * Time: 00:00:49
- */
/**
- * Renders a checkable menuitem.
+ * Renders a checkable menu item.
*/
-
@Tag(name = "menuCheckbox", tagExtraInfoClassName = "org.apache.myfaces.tobago.taglib.component.CommandTagExtraInfo")
@ExtensionTag(baseClassName = "org.apache.myfaces.tobago.taglib.component.MenuCheckboxTag")
-public class MenuCheckboxExtensionTag extends BodyTagSupport {
+public class MenuCheckboxExtensionTag extends TobagoExtensionBodyTagSupport {
private javax.el.ValueExpression rendered;
private javax.el.ValueExpression value;
@@ -63,6 +56,9 @@
private javax.el.ValueExpression transition;
private javax.el.ValueExpression renderedPartially;
+ private String jspId;
+ private int suffixId;
+
@Override
public int doStartTag() throws JspException {
@@ -102,6 +98,7 @@
if (renderedPartially != null) {
menuCommandTag.setRenderedPartially(renderedPartially);
}
+ menuCommandTag.setJspId(jspId + PREFIX + suffixId++);
menuCommandTag.doStartTag();
facetTag = new FacetTag();
@@ -116,6 +113,7 @@
selectBooleanCheckbox.setValue(value);
}
selectBooleanCheckbox.setParent(facetTag);
+ selectBooleanCheckbox.setJspId(jspId + PREFIX + suffixId++);
selectBooleanCheckbox.doStartTag();
return super.doStartTag();
}
Modified: myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java-jsf-1.2/org/apache/myfaces/tobago/taglib/extension/MenuRadioExtensionTag.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java-jsf-1.2/org/apache/myfaces/tobago/taglib/extension/MenuRadioExtensionTag.java?rev=910571&r1=910570&r2=910571&view=diff
==============================================================================
--- myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java-jsf-1.2/org/apache/myfaces/tobago/taglib/extension/MenuRadioExtensionTag.java (original)
+++ myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java-jsf-1.2/org/apache/myfaces/tobago/taglib/extension/MenuRadioExtensionTag.java Tue Feb 16 15:58:41 2010
@@ -32,20 +32,13 @@
import javax.faces.component.UIComponent;
import javax.faces.webapp.FacetTag;
import javax.servlet.jsp.JspException;
-import javax.servlet.jsp.tagext.BodyTagSupport;
-
-/*
- * Date: 09.05.2006
- * Time: 17:41:39
- */
/**
- * Renders a submenu with select one items (like a radio button).
+ * Renders a sub menu with select one items (like a radio button).
*/
-
@Tag(name = "menuRadio", tagExtraInfoClassName = "org.apache.myfaces.tobago.taglib.component.CommandTagExtraInfo")
@ExtensionTag(baseClassName = "org.apache.myfaces.tobago.internal.taglib.MenuRadioTag")
-public class MenuRadioExtensionTag extends BodyTagSupport {
+public class MenuRadioExtensionTag extends TobagoExtensionBodyTagSupport {
private javax.el.ValueExpression rendered;
private javax.el.ValueExpression value;
@@ -105,6 +98,7 @@
if (renderedPartially != null) {
menuCommandTag.setRenderedPartially(renderedPartially);
}
+ menuCommandTag.setJspId(jspId + PREFIX + idSuffix++);
menuCommandTag.doStartTag();
facetTag = new FacetTag();
@@ -122,6 +116,7 @@
if (value != null) {
selectOneRadio.setValue(value);
}
+ selectOneRadio.setJspId(jspId + PREFIX + idSuffix++);
selectOneRadio.doStartTag();
return super.doStartTag();
@@ -150,6 +145,26 @@
return super.doEndTag();
}
+ public void release() {
+ super.release();
+ rendered = null;
+ value = null;
+ action = null;
+ actionListener = null;
+ onclick = null;
+ link = null;
+ disabled = null;
+ binding = null;
+ label = null;
+ immediate = null;
+ transition = null;
+ converter = null;
+ renderedPartially = null;
+ menuCommandTag = null;
+ facetTag = null;
+ selectOneRadio = null;
+ }
+
/**
* Action to invoke when clicked.
* This must be a MethodBinding or a String representing the application action to invoke when
@@ -297,25 +312,4 @@
public void setRenderedPartially(javax.el.ValueExpression renderedPartially) {
this.renderedPartially = renderedPartially;
}
-
- public void release() {
- super.release();
- rendered = null;
- value = null;
- action = null;
- actionListener = null;
- onclick = null;
- link = null;
- disabled = null;
- binding = null;
- label = null;
- immediate = null;
- transition = null;
- converter = null;
- renderedPartially = null;
- menuCommandTag = null;
- facetTag = null;
- selectOneRadio = null;
- }
-
}
Modified: myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java-jsf-1.2/org/apache/myfaces/tobago/taglib/extension/SelectBooleanCheckboxExtensionTag.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java-jsf-1.2/org/apache/myfaces/tobago/taglib/extension/SelectBooleanCheckboxExtensionTag.java?rev=910571&r1=910570&r2=910571&view=diff
==============================================================================
--- myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java-jsf-1.2/org/apache/myfaces/tobago/taglib/extension/SelectBooleanCheckboxExtensionTag.java (original)
+++ myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java-jsf-1.2/org/apache/myfaces/tobago/taglib/extension/SelectBooleanCheckboxExtensionTag.java Tue Feb 16 15:58:41 2010
@@ -83,6 +83,7 @@
labelTag.setMarkup(markup);
}
labelTag.setParent(getParent());
+ labelTag.setJspId(jspId + PREFIX + idSuffix++);
labelTag.doStartTag();
selectBooleanCheckboxTag = new SelectBooleanCheckboxTag();
@@ -139,6 +140,7 @@
selectBooleanCheckboxTag.setRequiredMessage(requiredMessage);
}
selectBooleanCheckboxTag.setParent(labelTag);
+ selectBooleanCheckboxTag.setJspId(jspId + PREFIX + idSuffix++);
selectBooleanCheckboxTag.doStartTag();
return super.doStartTag();
Modified: myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java-jsf-1.2/org/apache/myfaces/tobago/taglib/extension/SelectManyCheckboxExtensionTag.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java-jsf-1.2/org/apache/myfaces/tobago/taglib/extension/SelectManyCheckboxExtensionTag.java?rev=910571&r1=910570&r2=910571&view=diff
==============================================================================
--- myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java-jsf-1.2/org/apache/myfaces/tobago/taglib/extension/SelectManyCheckboxExtensionTag.java (original)
+++ myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java-jsf-1.2/org/apache/myfaces/tobago/taglib/extension/SelectManyCheckboxExtensionTag.java Tue Feb 16 15:58:41 2010
@@ -81,6 +81,7 @@
labelTag.setMarkup(markup);
}
labelTag.setParent(getParent());
+ labelTag.setJspId(jspId + PREFIX + idSuffix++);
labelTag.doStartTag();
selectManyCheckboxTag = new SelectManyCheckboxTag();
@@ -143,6 +144,7 @@
selectManyCheckboxTag.setRequiredMessage(requiredMessage);
}
selectManyCheckboxTag.setParent(labelTag);
+ selectManyCheckboxTag.setJspId(jspId + PREFIX + idSuffix++);
selectManyCheckboxTag.doStartTag();
return super.doStartTag();
Modified: myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java-jsf-1.2/org/apache/myfaces/tobago/taglib/extension/SelectManyListboxExtensionTag.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java-jsf-1.2/org/apache/myfaces/tobago/taglib/extension/SelectManyListboxExtensionTag.java?rev=910571&r1=910570&r2=910571&view=diff
==============================================================================
--- myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java-jsf-1.2/org/apache/myfaces/tobago/taglib/extension/SelectManyListboxExtensionTag.java (original)
+++ myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java-jsf-1.2/org/apache/myfaces/tobago/taglib/extension/SelectManyListboxExtensionTag.java Tue Feb 16 15:58:41 2010
@@ -26,15 +26,9 @@
import javax.servlet.jsp.JspException;
-/*
- * Date: 16.12.2005
- * Time: 19:12:33
- */
-
/**
* Renders a multi selection option listbox with a label.
*/
-
@Tag(name = "selectManyListbox")
@ExtensionTag(baseClassName = "org.apache.myfaces.tobago.internal.taglib.SelectManyListboxTag")
public class SelectManyListboxExtensionTag extends TobagoExtensionBodyTagSupport {
@@ -85,6 +79,7 @@
labelTag.setMarkup(markup);
}
labelTag.setParent(getParent());
+ labelTag.setJspId(jspId + PREFIX + idSuffix++);
labelTag.doStartTag();
selectManyListboxTag = new SelectManyListboxTag();
@@ -141,6 +136,7 @@
selectManyListboxTag.setRequiredMessage(requiredMessage);
}
selectManyListboxTag.setParent(labelTag);
+ selectManyListboxTag.setJspId(jspId + PREFIX + idSuffix++);
selectManyListboxTag.doStartTag();
return super.doStartTag();
Modified: myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java-jsf-1.2/org/apache/myfaces/tobago/taglib/extension/SelectOneChoiceExtensionTag.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java-jsf-1.2/org/apache/myfaces/tobago/taglib/extension/SelectOneChoiceExtensionTag.java?rev=910571&r1=910570&r2=910571&view=diff
==============================================================================
--- myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java-jsf-1.2/org/apache/myfaces/tobago/taglib/extension/SelectOneChoiceExtensionTag.java (original)
+++ myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java-jsf-1.2/org/apache/myfaces/tobago/taglib/extension/SelectOneChoiceExtensionTag.java Tue Feb 16 15:58:41 2010
@@ -79,6 +79,7 @@
labelTag.setMarkup(markup);
}
labelTag.setParent(getParent());
+ labelTag.setJspId(jspId + PREFIX + idSuffix++);
labelTag.doStartTag();
selectOneChoiceTag = new SelectOneChoiceTag();
@@ -135,6 +136,7 @@
selectOneChoiceTag.setRequiredMessage(requiredMessage);
}
selectOneChoiceTag.setParent(labelTag);
+ selectOneChoiceTag.setJspId(jspId + PREFIX + idSuffix++);
selectOneChoiceTag.doStartTag();
return super.doStartTag();
Modified: myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java-jsf-1.2/org/apache/myfaces/tobago/taglib/extension/SelectOneListboxExtensionTag.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java-jsf-1.2/org/apache/myfaces/tobago/taglib/extension/SelectOneListboxExtensionTag.java?rev=910571&r1=910570&r2=910571&view=diff
==============================================================================
--- myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java-jsf-1.2/org/apache/myfaces/tobago/taglib/extension/SelectOneListboxExtensionTag.java (original)
+++ myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java-jsf-1.2/org/apache/myfaces/tobago/taglib/extension/SelectOneListboxExtensionTag.java Tue Feb 16 15:58:41 2010
@@ -78,6 +78,7 @@
labelTag.setMarkup(markup);
}
labelTag.setParent(getParent());
+ labelTag.setJspId(jspId + PREFIX + idSuffix++);
labelTag.doStartTag();
selectOneListboxTag = new SelectOneListboxTag();
@@ -134,6 +135,7 @@
selectOneListboxTag.setMarkup(markup);
}
selectOneListboxTag.setParent(labelTag);
+ selectOneListboxTag.setJspId(jspId + PREFIX + idSuffix++);
selectOneListboxTag.doStartTag();
return super.doStartTag();
Modified: myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java-jsf-1.2/org/apache/myfaces/tobago/taglib/extension/SelectOneRadioExtensionTag.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java-jsf-1.2/org/apache/myfaces/tobago/taglib/extension/SelectOneRadioExtensionTag.java?rev=910571&r1=910570&r2=910571&view=diff
==============================================================================
--- myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java-jsf-1.2/org/apache/myfaces/tobago/taglib/extension/SelectOneRadioExtensionTag.java (original)
+++ myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java-jsf-1.2/org/apache/myfaces/tobago/taglib/extension/SelectOneRadioExtensionTag.java Tue Feb 16 15:58:41 2010
@@ -27,11 +27,10 @@
import javax.servlet.jsp.JspException;
/**
- * Render a set of radiobuttons.
+ * Render a set of radio buttons.
*
* @since 1.0.13
*/
-
@Tag(name = "selectOneRadio")
@ExtensionTag(baseClassName = "org.apache.myfaces.tobago.internal.taglib.SelectOneRadioTag")
public class SelectOneRadioExtensionTag extends TobagoExtensionBodyTagSupport {
@@ -82,6 +81,7 @@
labelTag.setMarkup(markup);
}
labelTag.setParent(getParent());
+ labelTag.setJspId(jspId + PREFIX + idSuffix++);
labelTag.doStartTag();
selectOneRadioTag = new SelectOneRadioTag();
@@ -142,6 +142,7 @@
}
selectOneRadioTag.setParent(labelTag);
+ selectOneRadioTag.setJspId(jspId + PREFIX + idSuffix++);
selectOneRadioTag.doStartTag();
return super.doStartTag();
Modified: myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java-jsf-1.2/org/apache/myfaces/tobago/taglib/extension/SeparatorExtensionTag.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java-jsf-1.2/org/apache/myfaces/tobago/taglib/extension/SeparatorExtensionTag.java?rev=910571&r1=910570&r2=910571&view=diff
==============================================================================
--- myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java-jsf-1.2/org/apache/myfaces/tobago/taglib/extension/SeparatorExtensionTag.java (original)
+++ myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java-jsf-1.2/org/apache/myfaces/tobago/taglib/extension/SeparatorExtensionTag.java Tue Feb 16 15:58:41 2010
@@ -41,6 +41,7 @@
*/
public class SeparatorExtensionTag extends TobagoExtensionBodyTagSupport {
+
private javax.el.ValueExpression binding;
private javax.el.ValueExpression rendered;
private javax.el.ValueExpression label;
@@ -72,6 +73,7 @@
if (label != null) {
labelTag.setValue(label);
}
+ labelTag.setJspId(jspId + PREFIX + idSuffix++);
labelTag.doStartTag();
return super.doStartTag();
}
Modified: myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java-jsf-1.2/org/apache/myfaces/tobago/taglib/extension/TextAreaExtensionTag.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java-jsf-1.2/org/apache/myfaces/tobago/taglib/extension/TextAreaExtensionTag.java?rev=910571&r1=910570&r2=910571&view=diff
==============================================================================
--- myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java-jsf-1.2/org/apache/myfaces/tobago/taglib/extension/TextAreaExtensionTag.java (original)
+++ myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java-jsf-1.2/org/apache/myfaces/tobago/taglib/extension/TextAreaExtensionTag.java Tue Feb 16 15:58:41 2010
@@ -27,7 +27,7 @@
import javax.servlet.jsp.JspException;
/**
- * Renders a multiline text input control with a label.
+ * Renders a multi line text input control with a label.
* <br />
* Short syntax of:
* <p/>
@@ -93,6 +93,7 @@
labelTag.setMarkup(markup);
}
labelTag.setParent(getParent());
+ labelTag.setJspId(jspId + PREFIX + idSuffix++);
labelTag.doStartTag();
textAreaTag = new TextareaTag();
@@ -146,6 +147,7 @@
textAreaTag.setRequiredMessage(requiredMessage);
}
textAreaTag.setParent(labelTag);
+ textAreaTag.setJspId(jspId + PREFIX + idSuffix++);
textAreaTag.doStartTag();
return super.doStartTag();
Modified: myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java-jsf-1.2/org/apache/myfaces/tobago/taglib/extension/TimeExtensionTag.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java-jsf-1.2/org/apache/myfaces/tobago/taglib/extension/TimeExtensionTag.java?rev=910571&r1=910570&r2=910571&view=diff
==============================================================================
--- myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java-jsf-1.2/org/apache/myfaces/tobago/taglib/extension/TimeExtensionTag.java (original)
+++ myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java-jsf-1.2/org/apache/myfaces/tobago/taglib/extension/TimeExtensionTag.java Tue Feb 16 15:58:41 2010
@@ -88,6 +88,7 @@
labelTag.setColumns(createStringValueExpression(labelWidth.getExpressionString() + ";*"));
}
labelTag.setParent(getParent());
+ labelTag.setJspId(jspId + PREFIX + idSuffix++);
labelTag.doStartTag();
timeTag = new TimeTag();
@@ -141,6 +142,7 @@
timeTag.setRequiredMessage(requiredMessage);
}
timeTag.setParent(labelTag);
+ timeTag.setJspId(jspId + PREFIX + idSuffix++);
timeTag.doStartTag();
return super.doStartTag();
Modified: myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java-jsf-1.2/org/apache/myfaces/tobago/taglib/extension/TobagoExtensionBodyTagSupport.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java-jsf-1.2/org/apache/myfaces/tobago/taglib/extension/TobagoExtensionBodyTagSupport.java?rev=910571&r1=910570&r2=910571&view=diff
==============================================================================
--- myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java-jsf-1.2/org/apache/myfaces/tobago/taglib/extension/TobagoExtensionBodyTagSupport.java (original)
+++ myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java-jsf-1.2/org/apache/myfaces/tobago/taglib/extension/TobagoExtensionBodyTagSupport.java Tue Feb 16 15:58:41 2010
@@ -20,12 +20,28 @@
import javax.el.ValueExpression;
import javax.servlet.jsp.JspFactory;
import javax.servlet.jsp.tagext.BodyTagSupport;
+import javax.servlet.jsp.tagext.JspIdConsumer;
-public class TobagoExtensionBodyTagSupport extends BodyTagSupport {
+public class TobagoExtensionBodyTagSupport extends BodyTagSupport implements JspIdConsumer {
+ protected static final String PREFIX = "tx";
+
+ protected String jspId;
+ protected int idSuffix;
+
protected ValueExpression createStringValueExpression(String expression) {
return JspFactory.getDefaultFactory().getJspApplicationContext(pageContext.getServletContext())
.getExpressionFactory().createValueExpression(pageContext.getELContext(), expression, String.class);
}
+
+ public void setJspId(String jspId) {
+ this.jspId = jspId;
+ }
+
+ public void release() {
+ super.release();
+ jspId = null;
+ idSuffix = 0;
+ }
}