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 2008/08/05 23:33:37 UTC
svn commit: r682963 -
/myfaces/tobago/branches/tobago-1.0.x/core/src/main/java/org/apache/myfaces/tobago/taglib/extension/
Author: bommel
Date: Tue Aug 5 14:33:34 2008
New Revision: 682963
URL: http://svn.apache.org/viewvc?rev=682963&view=rev
Log:
(TOBAGO-690) Markup attribute for Label Extension Tags doesn't work
Modified:
myfaces/tobago/branches/tobago-1.0.x/core/src/main/java/org/apache/myfaces/tobago/taglib/extension/DateExtensionTag.java
myfaces/tobago/branches/tobago-1.0.x/core/src/main/java/org/apache/myfaces/tobago/taglib/extension/InExtensionTag.java
myfaces/tobago/branches/tobago-1.0.x/core/src/main/java/org/apache/myfaces/tobago/taglib/extension/LabelExtensionTag.java
myfaces/tobago/branches/tobago-1.0.x/core/src/main/java/org/apache/myfaces/tobago/taglib/extension/SelectBooleanCheckboxExtensionTag.java
myfaces/tobago/branches/tobago-1.0.x/core/src/main/java/org/apache/myfaces/tobago/taglib/extension/SelectManyCheckboxExtensionTag.java
myfaces/tobago/branches/tobago-1.0.x/core/src/main/java/org/apache/myfaces/tobago/taglib/extension/SelectManyListboxExtensionTag.java
myfaces/tobago/branches/tobago-1.0.x/core/src/main/java/org/apache/myfaces/tobago/taglib/extension/SelectOneChoiceExtensionTag.java
myfaces/tobago/branches/tobago-1.0.x/core/src/main/java/org/apache/myfaces/tobago/taglib/extension/SelectOneListboxExtensionTag.java
myfaces/tobago/branches/tobago-1.0.x/core/src/main/java/org/apache/myfaces/tobago/taglib/extension/SelectOneRadioExtensionTag.java
myfaces/tobago/branches/tobago-1.0.x/core/src/main/java/org/apache/myfaces/tobago/taglib/extension/TextAreaExtensionTag.java
Modified: myfaces/tobago/branches/tobago-1.0.x/core/src/main/java/org/apache/myfaces/tobago/taglib/extension/DateExtensionTag.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-1.0.x/core/src/main/java/org/apache/myfaces/tobago/taglib/extension/DateExtensionTag.java?rev=682963&r1=682962&r2=682963&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-1.0.x/core/src/main/java/org/apache/myfaces/tobago/taglib/extension/DateExtensionTag.java (original)
+++ myfaces/tobago/branches/tobago-1.0.x/core/src/main/java/org/apache/myfaces/tobago/taglib/extension/DateExtensionTag.java Tue Aug 5 14:33:34 2008
@@ -112,6 +112,9 @@
if (rendered != null) {
labelTag.setRendered(rendered);
}
+ if (markup != null) {
+ labelTag.setMarkup(markup);
+ }
labelTag.setParent(getParent());
labelTag.doStartTag();
Modified: myfaces/tobago/branches/tobago-1.0.x/core/src/main/java/org/apache/myfaces/tobago/taglib/extension/InExtensionTag.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-1.0.x/core/src/main/java/org/apache/myfaces/tobago/taglib/extension/InExtensionTag.java?rev=682963&r1=682962&r2=682963&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-1.0.x/core/src/main/java/org/apache/myfaces/tobago/taglib/extension/InExtensionTag.java (original)
+++ myfaces/tobago/branches/tobago-1.0.x/core/src/main/java/org/apache/myfaces/tobago/taglib/extension/InExtensionTag.java Tue Aug 5 14:33:34 2008
@@ -105,7 +105,9 @@
if (labelWidth != null) {
labelTag.setColumns(labelWidth + ";*");
}
-
+ if (markup != null) {
+ labelTag.setMarkup(markup);
+ }
labelTag.setParent(getParent());
labelTag.doStartTag();
Modified: myfaces/tobago/branches/tobago-1.0.x/core/src/main/java/org/apache/myfaces/tobago/taglib/extension/LabelExtensionTag.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-1.0.x/core/src/main/java/org/apache/myfaces/tobago/taglib/extension/LabelExtensionTag.java?rev=682963&r1=682962&r2=682963&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-1.0.x/core/src/main/java/org/apache/myfaces/tobago/taglib/extension/LabelExtensionTag.java (original)
+++ myfaces/tobago/branches/tobago-1.0.x/core/src/main/java/org/apache/myfaces/tobago/taglib/extension/LabelExtensionTag.java Tue Aug 5 14:33:34 2008
@@ -49,6 +49,7 @@
private String rendered;
private String columns = DEFAULT_COLUMNS;
private String rows = "fixed";
+ private String markup;
private PanelTag panelTag;
@@ -87,6 +88,9 @@
if (tip != null) {
labelTag.setTip(tip);
}
+ if (markup != null) {
+ labelTag.setMarkup(markup);
+ }
labelTag.setFor("@auto");
labelTag.setParent(panelTag);
labelTag.doStartTag();
@@ -110,6 +114,7 @@
columns = DEFAULT_COLUMNS;
rows = "fixed";
panelTag = null;
+ markup = null;
}
public void setValue(String value) {
@@ -136,4 +141,8 @@
void setRows(String rows) {
this.rows = rows;
}
+
+ public void setMarkup(String markup) {
+ this.markup = markup;
+ }
}
Modified: myfaces/tobago/branches/tobago-1.0.x/core/src/main/java/org/apache/myfaces/tobago/taglib/extension/SelectBooleanCheckboxExtensionTag.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-1.0.x/core/src/main/java/org/apache/myfaces/tobago/taglib/extension/SelectBooleanCheckboxExtensionTag.java?rev=682963&r1=682962&r2=682963&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-1.0.x/core/src/main/java/org/apache/myfaces/tobago/taglib/extension/SelectBooleanCheckboxExtensionTag.java (original)
+++ myfaces/tobago/branches/tobago-1.0.x/core/src/main/java/org/apache/myfaces/tobago/taglib/extension/SelectBooleanCheckboxExtensionTag.java Tue Aug 5 14:33:34 2008
@@ -90,13 +90,9 @@
if (labelWidth != null) {
labelTag.setColumns(labelWidth + ";*");
}
- /* TODO accessKey
- if (labelWithAccessKey != null) {
- label.setLabelWithAccessKey(labelWithAccessKey);
- }
- if (accessKey !=null) {
- label.setAccessKey(accessKey);
- } */
+ if (markup != null) {
+ labelTag.setMarkup(markup);
+ }
labelTag.setParent(getParent());
labelTag.doStartTag();
Modified: myfaces/tobago/branches/tobago-1.0.x/core/src/main/java/org/apache/myfaces/tobago/taglib/extension/SelectManyCheckboxExtensionTag.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-1.0.x/core/src/main/java/org/apache/myfaces/tobago/taglib/extension/SelectManyCheckboxExtensionTag.java?rev=682963&r1=682962&r2=682963&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-1.0.x/core/src/main/java/org/apache/myfaces/tobago/taglib/extension/SelectManyCheckboxExtensionTag.java (original)
+++ myfaces/tobago/branches/tobago-1.0.x/core/src/main/java/org/apache/myfaces/tobago/taglib/extension/SelectManyCheckboxExtensionTag.java Tue Aug 5 14:33:34 2008
@@ -95,13 +95,9 @@
if (labelWidth != null) {
labelTag.setColumns(labelWidth + ";*");
}
- /* TODO accessKey
- if (labelWithAccessKey != null) {
- label.setLabelWithAccessKey(labelWithAccessKey);
- }
- if (accessKey !=null) {
- label.setAccessKey(accessKey);
- } */
+ if (markup != null) {
+ labelTag.setMarkup(markup);
+ }
labelTag.setParent(getParent());
labelTag.doStartTag();
Modified: myfaces/tobago/branches/tobago-1.0.x/core/src/main/java/org/apache/myfaces/tobago/taglib/extension/SelectManyListboxExtensionTag.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-1.0.x/core/src/main/java/org/apache/myfaces/tobago/taglib/extension/SelectManyListboxExtensionTag.java?rev=682963&r1=682962&r2=682963&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-1.0.x/core/src/main/java/org/apache/myfaces/tobago/taglib/extension/SelectManyListboxExtensionTag.java (original)
+++ myfaces/tobago/branches/tobago-1.0.x/core/src/main/java/org/apache/myfaces/tobago/taglib/extension/SelectManyListboxExtensionTag.java Tue Aug 5 14:33:34 2008
@@ -99,13 +99,9 @@
if (labelWidth != null) {
labelTag.setColumns(labelWidth + ";*");
}
- /* TODO accessKey
- if (labelWithAccessKey != null) {
- label.setLabelWithAccessKey(labelWithAccessKey);
- }
- if (accessKey !=null) {
- label.setAccessKey(accessKey);
- } */
+ if (markup != null) {
+ labelTag.setMarkup(markup);
+ }
labelTag.setParent(getParent());
labelTag.doStartTag();
Modified: myfaces/tobago/branches/tobago-1.0.x/core/src/main/java/org/apache/myfaces/tobago/taglib/extension/SelectOneChoiceExtensionTag.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-1.0.x/core/src/main/java/org/apache/myfaces/tobago/taglib/extension/SelectOneChoiceExtensionTag.java?rev=682963&r1=682962&r2=682963&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-1.0.x/core/src/main/java/org/apache/myfaces/tobago/taglib/extension/SelectOneChoiceExtensionTag.java (original)
+++ myfaces/tobago/branches/tobago-1.0.x/core/src/main/java/org/apache/myfaces/tobago/taglib/extension/SelectOneChoiceExtensionTag.java Tue Aug 5 14:33:34 2008
@@ -92,6 +92,9 @@
if (labelWidth != null) {
labelTag.setColumns(labelWidth + ";*");
}
+ if (markup != null) {
+ labelTag.setMarkup(markup);
+ }
labelTag.setParent(getParent());
labelTag.doStartTag();
Modified: myfaces/tobago/branches/tobago-1.0.x/core/src/main/java/org/apache/myfaces/tobago/taglib/extension/SelectOneListboxExtensionTag.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-1.0.x/core/src/main/java/org/apache/myfaces/tobago/taglib/extension/SelectOneListboxExtensionTag.java?rev=682963&r1=682962&r2=682963&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-1.0.x/core/src/main/java/org/apache/myfaces/tobago/taglib/extension/SelectOneListboxExtensionTag.java (original)
+++ myfaces/tobago/branches/tobago-1.0.x/core/src/main/java/org/apache/myfaces/tobago/taglib/extension/SelectOneListboxExtensionTag.java Tue Aug 5 14:33:34 2008
@@ -37,6 +37,7 @@
import org.apache.myfaces.tobago.taglib.decl.IsReadonly;
import org.apache.myfaces.tobago.taglib.decl.IsRendered;
import org.apache.myfaces.tobago.taglib.decl.IsRequired;
+import org.apache.myfaces.tobago.taglib.decl.HasMarkup;
import javax.servlet.jsp.JspException;
import javax.servlet.jsp.tagext.BodyTagSupport;
@@ -48,7 +49,7 @@
@ExtensionTag(baseClassName = "org.apache.myfaces.tobago.taglib.component.SelectOneListboxTag")
public class SelectOneListboxExtensionTag
extends BodyTagSupport implements HasId, HasValue, HasValueChangeListener, IsDisabled,
- HasLabel, HasLabelWidth, IsReadonly, HasOnchange, IsRendered,
+ HasLabel, HasLabelWidth, IsReadonly, HasOnchange, IsRendered, HasMarkup,
HasBinding, HasDeprecatedHeight, IsFocus, HasTip, IsRequired, HasConverter, HasValidator, HasTabIndex {
private String required;
private String value;
@@ -67,6 +68,7 @@
private String labelWidth;
private String tabIndex;
private String focus;
+ private String markup;
private LabelExtensionTag labelTag;
private SelectOneListboxTag selectOneListboxTag;
@@ -89,6 +91,9 @@
if (labelWidth != null) {
labelTag.setColumns(labelWidth + ";*");
}
+ if (markup != null) {
+ labelTag.setMarkup(markup);
+ }
labelTag.setParent(getParent());
labelTag.doStartTag();
@@ -136,6 +141,9 @@
if (tabIndex != null) {
selectOneListboxTag.setTabIndex(tabIndex);
}
+ if (markup != null) {
+ selectOneListboxTag.setMarkup(markup);
+ }
selectOneListboxTag.setParent(labelTag);
selectOneListboxTag.doStartTag();
@@ -171,6 +179,7 @@
selectOneListboxTag = null;
labelTag = null;
focus = null;
+ markup = null;
}
public void setRequired(String required) {
@@ -240,4 +249,8 @@
public void setFocus(String focus) {
this.focus = focus;
}
+
+ public void setMarkup(String markup) {
+ this.markup = markup;
+ }
}
Modified: myfaces/tobago/branches/tobago-1.0.x/core/src/main/java/org/apache/myfaces/tobago/taglib/extension/SelectOneRadioExtensionTag.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-1.0.x/core/src/main/java/org/apache/myfaces/tobago/taglib/extension/SelectOneRadioExtensionTag.java?rev=682963&r1=682962&r2=682963&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-1.0.x/core/src/main/java/org/apache/myfaces/tobago/taglib/extension/SelectOneRadioExtensionTag.java (original)
+++ myfaces/tobago/branches/tobago-1.0.x/core/src/main/java/org/apache/myfaces/tobago/taglib/extension/SelectOneRadioExtensionTag.java Tue Aug 5 14:33:34 2008
@@ -37,6 +37,7 @@
import org.apache.myfaces.tobago.taglib.decl.IsReadonly;
import org.apache.myfaces.tobago.taglib.decl.IsRendered;
import org.apache.myfaces.tobago.taglib.decl.IsRequired;
+import org.apache.myfaces.tobago.taglib.decl.HasMarkup;
import javax.servlet.jsp.JspException;
import javax.servlet.jsp.tagext.BodyTagSupport;
@@ -50,7 +51,7 @@
@Tag(name = "selectOneRadio")
@ExtensionTag(baseClassName = "org.apache.myfaces.tobago.taglib.component.SelectOneRadioTag")
public class SelectOneRadioExtensionTag extends BodyTagSupport
- implements HasId, HasValue, HasValueChangeListener, IsDisabled,
+ implements HasId, HasValue, HasValueChangeListener, IsDisabled, HasMarkup,
IsReadonly, HasOnchange, IsInline, HasLabel, HasLabelWidth, IsRequired,
IsRendered, HasBinding, HasTip, HasValidator, HasConverter, HasRenderRange, HasTabIndex {
@@ -71,6 +72,7 @@
private String tabIndex;
private String focus;
private String renderRange;
+ private String markup;
private LabelExtensionTag labelTag;
private SelectOneRadioTag selectOneRadioTag;
@@ -92,6 +94,9 @@
if (labelWidth != null) {
labelTag.setColumns(labelWidth + ";*");
}
+ if (markup != null) {
+ labelTag.setMarkup(markup);
+ }
labelTag.setParent(getParent());
labelTag.doStartTag();
@@ -139,6 +144,9 @@
if (renderRange != null) {
selectOneRadioTag.setRenderRange(renderRange);
}
+ if (markup != null) {
+ selectOneRadioTag.setMarkup(markup);
+ }
selectOneRadioTag.setParent(labelTag);
selectOneRadioTag.doStartTag();
@@ -175,6 +183,7 @@
labelTag = null;
focus = null;
renderRange = null;
+ markup = null;
}
public void setRequired(String required) {
@@ -244,4 +253,8 @@
public void setRenderRange(String renderRange) {
this.renderRange = renderRange;
}
+
+ public void setMarkup(String markup) {
+ this.markup = markup;
+ }
}
Modified: myfaces/tobago/branches/tobago-1.0.x/core/src/main/java/org/apache/myfaces/tobago/taglib/extension/TextAreaExtensionTag.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-1.0.x/core/src/main/java/org/apache/myfaces/tobago/taglib/extension/TextAreaExtensionTag.java?rev=682963&r1=682962&r2=682963&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-1.0.x/core/src/main/java/org/apache/myfaces/tobago/taglib/extension/TextAreaExtensionTag.java (original)
+++ myfaces/tobago/branches/tobago-1.0.x/core/src/main/java/org/apache/myfaces/tobago/taglib/extension/TextAreaExtensionTag.java Tue Aug 5 14:33:34 2008
@@ -102,6 +102,9 @@
if (labelWidth != null) {
labelTag.setColumns(labelWidth + ";*");
}
+ if (markup != null) {
+ labelTag.setMarkup(markup);
+ }
labelTag.setParent(getParent());
labelTag.doStartTag();