svn commit: r1587479 [3/6] - in /myfaces/tobago/branches/tobago-3.0.x: ./ tobago-assembly/ tobago-core/ tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/ tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/ tobago-core/src/m...

[lo...@apache.org]

Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/SelectBooleanCheckboxExtensionTag.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/SelectBooleanCheckboxExtensionTag.java?rev=1587479&r1=1587478&r2=1587479&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/SelectBooleanCheckboxExtensionTag.java (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/SelectBooleanCheckboxExtensionTag.java Tue Apr 15 09:13:03 2014
@@ -24,11 +24,8 @@ import org.apache.myfaces.tobago.apt.ann
 import org.apache.myfaces.tobago.apt.annotation.Tag;
 import org.apache.myfaces.tobago.apt.annotation.TagAttribute;
 import org.apache.myfaces.tobago.apt.annotation.UIComponentTagAttribute;
-import org.apache.myfaces.tobago.compat.FacesUtilsEL;
-import org.apache.myfaces.tobago.internal.taglib.SelectBooleanCheckboxTag;
 
 import javax.el.ValueExpression;
-import javax.servlet.jsp.JspException;
 
 /**
  * Renders a checkbox.
@@ -37,212 +34,48 @@ import javax.servlet.jsp.JspException;
 @ExtensionTag(
     baseClassName = "org.apache.myfaces.tobago.internal.taglib.SelectBooleanCheckboxTag",
     faceletHandler = "org.apache.myfaces.tobago.facelets.extension.SelectBooleanCheckboxExtensionHandler")
-public class SelectBooleanCheckboxExtensionTag extends TobagoExtensionBodyTagSupport {
-
-  private javax.el.ValueExpression value;
-  private javax.el.MethodExpression valueChangeListener;
-  private javax.el.ValueExpression disabled;
-  private javax.el.ValueExpression readonly;
-  private javax.el.ValueExpression onchange;
-  private javax.el.ValueExpression label;
-  private javax.el.ValueExpression itemLabel;
-  private javax.el.ValueExpression rendered;
-  private javax.el.ValueExpression binding;
-  private javax.el.ValueExpression tip;
-  private javax.el.ValueExpression converter;
-  private javax.el.MethodExpression validator;
-  private javax.el.ValueExpression labelWidth;
-  private javax.el.ValueExpression markup;
-  private javax.el.ValueExpression tabIndex;
-  private javax.el.ValueExpression required;
-  private javax.el.ValueExpression focus;
-  private javax.el.ValueExpression validatorMessage;
-  private javax.el.ValueExpression converterMessage;
-  private javax.el.ValueExpression requiredMessage;
-  private String fieldId;
-
-  private LabelExtensionTag labelTag;
-  private SelectBooleanCheckboxTag selectBooleanCheckboxTag;
-
-  @Override
-  public int doStartTag() throws JspException {
-
-    labelTag = new LabelExtensionTag();
-    labelTag.setPageContext(pageContext);
-    if (id != null) {
-      labelTag.setId(id);
-    }
-    if (label != null) {
-      labelTag.setValue(label);
-    }
-    if (tip != null) {
-      labelTag.setTip(tip);
-    }
-    if (rendered != null) {
-      labelTag.setRendered(rendered);
-    }
-    if (labelWidth != null) {
-      labelTag.setColumns(createStringValueExpression(labelWidth.getExpressionString() + ";*"));
-    }
-    if (markup != null) {
-      labelTag.setMarkup(markup);
-    }
-    labelTag.setParent(getParent());
-    labelTag.setJspId(nextJspId());
-    labelTag.doStartTag();
-
-    selectBooleanCheckboxTag = new SelectBooleanCheckboxTag();
-    selectBooleanCheckboxTag.setPageContext(pageContext);
-    if (value != null) {
-      selectBooleanCheckboxTag.setValue(value);
-    }
-    if (valueChangeListener != null) {
-      selectBooleanCheckboxTag.setValueChangeListener(valueChangeListener);
-    }
-    if (binding != null) {
-      selectBooleanCheckboxTag.setBinding(binding);
-    }
-    if (onchange != null) {
-      selectBooleanCheckboxTag.setOnchange(onchange);
-    }
-    if (validator != null) {
-      selectBooleanCheckboxTag.setValidator(validator);
-    }
-    if (converter != null) {
-      selectBooleanCheckboxTag.setConverter(converter);
-    }
-    if (disabled != null) {
-      selectBooleanCheckboxTag.setDisabled(disabled);
-    }
-    if (fieldId != null) {
-      selectBooleanCheckboxTag.setId(fieldId);
-    }
-    if (readonly != null) {
-      selectBooleanCheckboxTag.setReadonly(readonly);
-    }
-    if (focus != null) {
-      selectBooleanCheckboxTag.setFocus(focus);
-    }
-    if (required != null) {
-      selectBooleanCheckboxTag.setRequired(required);
-    }
-    if (label != null) {
-      selectBooleanCheckboxTag.setLabel(label);
-    }
-    if (itemLabel != null) {
-      selectBooleanCheckboxTag.setItemLabel(itemLabel);
-    } else {
-      selectBooleanCheckboxTag.setItemLabel(FacesUtilsEL.createValueExpression(""));
-    }
-    if (markup != null) {
-      selectBooleanCheckboxTag.setMarkup(markup);
-    }
-    if (tabIndex != null) {
-      selectBooleanCheckboxTag.setTabIndex(tabIndex);
-    }
-    if (validatorMessage != null) {
-      selectBooleanCheckboxTag.setValidatorMessage(validatorMessage);
-    }
-    if (converterMessage != null) {
-      selectBooleanCheckboxTag.setConverterMessage(converterMessage);
-    }
-    if (requiredMessage != null) {
-      selectBooleanCheckboxTag.setRequiredMessage(requiredMessage);
-    }
-    selectBooleanCheckboxTag.setParent(labelTag);
-    selectBooleanCheckboxTag.setJspId(nextJspId());
-    selectBooleanCheckboxTag.doStartTag();
-
-    return super.doStartTag();
-  }
-
-  @Override
-  public int doEndTag() throws JspException {
-    selectBooleanCheckboxTag.doEndTag();
-    labelTag.doEndTag();
-    return super.doEndTag();
-  }
-
-  @Override
-  public void release() {
-    super.release();
-    binding = null;
-    onchange = null;
-    disabled = null;
-    label = null;
-    itemLabel = null;
-    labelWidth = null;
-    readonly = null;
-    rendered = null;
-    converter = null;
-    validator = null;
-    tip = null;
-    value = null;
-    valueChangeListener = null;
-    markup = null;
-    tabIndex = null;
-    focus = null;
-    required = null;
-    selectBooleanCheckboxTag = null;
-    labelTag = null;
-    validatorMessage = null;
-    converterMessage = null;
-    requiredMessage = null;
-    fieldId = null;
-  }
+public interface SelectBooleanCheckboxExtensionTag {
 
   /**
    * The current value of this component.
    */
   @TagAttribute
   @UIComponentTagAttribute(type = "java.lang.Boolean")
-  public void setValue(final javax.el.ValueExpression value) {
-    this.value = value;
-  }
+  public void setValue(final javax.el.ValueExpression value) ;
 
   /**
    * MethodExpression representing a value change listener method
    * that will be notified when a new value has been set for this input component.
    * The expression must evaluate to a public method that takes a ValueChangeEvent
    * parameter, with a return type of void.
-   *
-   * @param valueChangeListener
    */
   @TagAttribute
   @UIComponentTagAttribute(
           type = {},
           expression = DynamicExpression.METHOD_EXPRESSION_REQUIRED,
           methodSignature = "javax.faces.event.ValueChangeEvent")
-  public void setValueChangeListener(final javax.el.MethodExpression valueChangeListener) {
-    this.valueChangeListener = valueChangeListener;
-  }
+  public void setValueChangeListener(final javax.el.MethodExpression valueChangeListener) ;
 
   /**
    * Flag indicating that this element is disabled.
    */
   @TagAttribute()
   @UIComponentTagAttribute(type = "boolean", defaultValue = "false")
-  public void setDisabled(final javax.el.ValueExpression disabled) {
-    this.disabled = disabled;
-  }
+  public void setDisabled(final javax.el.ValueExpression disabled) ;
 
   /**
    * Flag indicating that this component will prohibit changes by the user.
    */
   @TagAttribute
   @UIComponentTagAttribute(type = "boolean", defaultValue = "false")
-  public void setReadonly(final javax.el.ValueExpression readonly) {
-    this.readonly = readonly;
-  }
+  public void setReadonly(final javax.el.ValueExpression readonly) ;
 
   /**
    * Clientside script function to add to this component's onchange handler.
    */
   @TagAttribute
   @UIComponentTagAttribute()
-  public void setOnchange(final javax.el.ValueExpression onchange) {
-    this.onchange = onchange;
-  }
+  public void setOnchange(final javax.el.ValueExpression onchange) ;
 
   /**
    * Text value to display as label.
@@ -250,9 +83,7 @@ public class SelectBooleanCheckboxExtens
    */
   @TagAttribute
   @UIComponentTagAttribute()
-  public void setLabel(final javax.el.ValueExpression label) {
-    this.label = label;
-  }
+  public void setLabel(final javax.el.ValueExpression label) ;
 
   /**
    * Label to be displayed to the user for this option. This label will displayed beneath the component like 
@@ -260,9 +91,7 @@ public class SelectBooleanCheckboxExtens
    */
   @TagAttribute
   @UIComponentTagAttribute()
-  public void setItemLabel(final ValueExpression itemLabel) {
-    this.itemLabel = itemLabel;
-  }
+  public void setItemLabel(final ValueExpression itemLabel) ;
 
   /**
    * A method binding EL expression,
@@ -274,9 +103,7 @@ public class SelectBooleanCheckboxExtens
   @UIComponentTagAttribute(type = {},
       expression = DynamicExpression.METHOD_EXPRESSION,
       methodSignature = { "javax.faces.context.FacesContext", "javax.faces.component.UIComponent", "java.lang.Object" })
-  public void setValidator(final javax.el.MethodExpression validator) {
-    this.validator = validator;
-  }
+  public void setValidator(final javax.el.MethodExpression validator) ;
 
   /**
    * An expression that specifies the Converter for this component.
@@ -290,9 +117,7 @@ public class SelectBooleanCheckboxExtens
   @TagAttribute
   @UIComponentTagAttribute(type = "javax.faces.convert.Converter",
       expression = DynamicExpression.VALUE_EXPRESSION)
-  public void setConverter(final javax.el.ValueExpression converter) {
-    this.converter = converter;
-  }
+  public void setConverter(final javax.el.ValueExpression converter) ;
 
   /**
    * Flag indicating whether or not this component should be rendered
@@ -300,9 +125,7 @@ public class SelectBooleanCheckboxExtens
    */
   @TagAttribute
   @UIComponentTagAttribute(type = "boolean", defaultValue = "true")
-  public void setRendered(final javax.el.ValueExpression rendered) {
-    this.rendered = rendered;
-  }
+  public void setRendered(final javax.el.ValueExpression rendered) ;
 
   /**
    * The value binding expression linking this
@@ -310,18 +133,14 @@ public class SelectBooleanCheckboxExtens
    */
   @TagAttribute
   @UIComponentTagAttribute(type = "javax.faces.component.UIComponent")
-  public void setBinding(final javax.el.ValueExpression binding) {
-    this.binding = binding;
-  }
+  public void setBinding(final javax.el.ValueExpression binding) ;
 
   /**
    * Text value to display as tooltip.
    */
   @TagAttribute
   @UIComponentTagAttribute()
-  public void setTip(final javax.el.ValueExpression tip) {
-    this.tip = tip;
-  }
+  public void setTip(final javax.el.ValueExpression tip) ;
 
   /**
    * The width for the label component. Default: 'auto'.
@@ -330,9 +149,7 @@ public class SelectBooleanCheckboxExtens
    */
   @TagAttribute
   @UIComponentTagAttribute()
-  public void setLabelWidth(final javax.el.ValueExpression labelWidth) {
-    this.labelWidth = labelWidth;
-  }
+  public void setLabelWidth(final javax.el.ValueExpression labelWidth) ;
 
   /**
    * Indicate markup of this component.
@@ -340,24 +157,18 @@ public class SelectBooleanCheckboxExtens
    */
   @TagAttribute
   @UIComponentTagAttribute(defaultValue = "none", type = "java.lang.String[]")
-  public void setMarkup(final javax.el.ValueExpression markup) {
-    this.markup = markup;
-  }
+  public void setMarkup(final javax.el.ValueExpression markup) ;
 
   @TagAttribute
   @UIComponentTagAttribute(type = "java.lang.Integer")
-  public void setTabIndex(final javax.el.ValueExpression tabIndex) {
-    this.tabIndex = tabIndex;
-  }
+  public void setTabIndex(final javax.el.ValueExpression tabIndex) ;
 
   /**
    * Flag indicating this component should receive the focus.
    */
   @TagAttribute
   @UIComponentTagAttribute(type = "boolean", defaultValue = "false")
-  public void setFocus(final javax.el.ValueExpression focus) {
-    this.focus = focus;
-  }
+  public void setFocus(final javax.el.ValueExpression focus) ;
 
   /**
    * Flag indicating that a value is required.
@@ -366,36 +177,28 @@ public class SelectBooleanCheckboxExtens
    */
   @TagAttribute
   @UIComponentTagAttribute(type = "boolean", defaultValue = "false")
-  public void setRequired(final javax.el.ValueExpression required) {
-    this.required = required;
-  }
+  public void setRequired(final javax.el.ValueExpression required) ;
 
   /**
    * An expression that specifies the validator message
    */
   @TagAttribute
   @UIComponentTagAttribute()
-  public void setValidatorMessage(final javax.el.ValueExpression validatorMessage) {
-    this.validatorMessage = validatorMessage;
-  }
+  public void setValidatorMessage(final javax.el.ValueExpression validatorMessage) ;
 
   /**
    * An expression that specifies the converter message
    */
   @TagAttribute
   @UIComponentTagAttribute()
-  public void setConverterMessage(final javax.el.ValueExpression converterMessage) {
-    this.converterMessage = converterMessage;
-  }
+  public void setConverterMessage(final javax.el.ValueExpression converterMessage) ;
 
   /**
    * An expression that specifies the required message
    */
   @TagAttribute
   @UIComponentTagAttribute()
-  public void setRequiredMessage(final javax.el.ValueExpression requiredMessage) {
-    this.requiredMessage = requiredMessage;
-  }
+  public void setRequiredMessage(final javax.el.ValueExpression requiredMessage) ;
 
   /**
    * The component identifier for the input field component inside of the container.
@@ -403,9 +206,7 @@ public class SelectBooleanCheckboxExtens
    */
   @TagAttribute(rtexprvalue = true)
   @UIComponentTagAttribute
-  public void setFieldId(final String fieldId) {
-    this.fieldId = fieldId;
-  }
+  public void setFieldId(final String fieldId) ;
 
   /**
    * The component identifier for this component.
@@ -415,7 +216,5 @@ public class SelectBooleanCheckboxExtens
    */
   @TagAttribute(rtexprvalue = true)
   @UIComponentTagAttribute
-  public void setId(final String id) {
-    super.setId(id);
-  }
+  public void setId(final String id) ;
 }

Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/SelectManyCheckboxExtensionTag.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/SelectManyCheckboxExtensionTag.java?rev=1587479&r1=1587478&r2=1587479&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/SelectManyCheckboxExtensionTag.java (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/SelectManyCheckboxExtensionTag.java Tue Apr 15 09:13:03 2014
@@ -24,9 +24,6 @@ import org.apache.myfaces.tobago.apt.ann
 import org.apache.myfaces.tobago.apt.annotation.Tag;
 import org.apache.myfaces.tobago.apt.annotation.TagAttribute;
 import org.apache.myfaces.tobago.apt.annotation.UIComponentTagAttribute;
-import org.apache.myfaces.tobago.internal.taglib.SelectManyCheckboxTag;
-
-import javax.servlet.jsp.JspException;
 
 /**
  * Render a group of checkboxes.
@@ -35,168 +32,7 @@ import javax.servlet.jsp.JspException;
 @ExtensionTag(
     baseClassName = "org.apache.myfaces.tobago.internal.taglib.SelectManyCheckboxTag",
     faceletHandler = "org.apache.myfaces.tobago.facelets.extension.SelectManyCheckboxExtensionHandler")
-public class SelectManyCheckboxExtensionTag extends TobagoExtensionBodyTagSupport {
-
-  private javax.el.ValueExpression required;
-  private javax.el.ValueExpression value;
-  private javax.el.MethodExpression valueChangeListener;
-  private javax.el.ValueExpression disabled;
-  private javax.el.ValueExpression readonly;
-  private javax.el.ValueExpression onchange;
-  private javax.el.ValueExpression inline;
-  private javax.el.ValueExpression label;
-  private javax.el.ValueExpression rendered;
-  private javax.el.ValueExpression binding;
-  private javax.el.ValueExpression tip;
-  //private javax.el.ValueExpression height;
-  private javax.el.ValueExpression converter;
-  private javax.el.MethodExpression validator;
-  private javax.el.ValueExpression labelWidth;
-  private javax.el.ValueExpression markup;
-  private javax.el.ValueExpression tabIndex;
-  private javax.el.ValueExpression focus;
-  private javax.el.ValueExpression renderRange;
-  private javax.el.ValueExpression validatorMessage;
-  private javax.el.ValueExpression converterMessage;
-  private javax.el.ValueExpression requiredMessage;
-  private String fieldId;
-
-  private LabelExtensionTag labelTag;
-  private SelectManyCheckboxTag selectManyCheckboxTag;
-
-  @Override
-  public int doStartTag() throws JspException {
-
-    labelTag = new LabelExtensionTag();
-    labelTag.setPageContext(pageContext);
-    labelTag.setRows("*");
-    if (id != null) {
-      labelTag.setId(id);
-    }
-    if (label != null) {
-      labelTag.setValue(label);
-    }
-    if (tip != null) {
-      labelTag.setTip(tip);
-    }
-    if (rendered != null) {
-      labelTag.setRendered(rendered);
-    }
-    if (labelWidth != null) {
-      labelTag.setColumns(createStringValueExpression(labelWidth.getExpressionString() + ";*"));
-    }
-    if (markup != null) {
-      labelTag.setMarkup(markup);
-    }
-    labelTag.setParent(getParent());
-    labelTag.setJspId(nextJspId());
-    labelTag.doStartTag();
-
-    selectManyCheckboxTag = new SelectManyCheckboxTag();
-    selectManyCheckboxTag.setPageContext(pageContext);
-    if (value != null) {
-      selectManyCheckboxTag.setValue(value);
-    }
-    if (valueChangeListener != null) {
-      selectManyCheckboxTag.setValueChangeListener(valueChangeListener);
-    }
-    if (binding != null) {
-      selectManyCheckboxTag.setBinding(binding);
-    }
-    if (onchange != null) {
-      selectManyCheckboxTag.setOnchange(onchange);
-    }
-    if (validator != null) {
-      selectManyCheckboxTag.setValidator(validator);
-    }
-    if (converter != null) {
-      selectManyCheckboxTag.setConverter(converter);
-    }
-    if (disabled != null) {
-      selectManyCheckboxTag.setDisabled(disabled);
-    }
-    if (inline != null) {
-      selectManyCheckboxTag.setInline(inline);
-    }
-    if (focus != null) {
-      selectManyCheckboxTag.setFocus(focus);
-    }
-    if (fieldId != null) {
-      selectManyCheckboxTag.setId(fieldId);
-    }
-    if (label != null) {
-      selectManyCheckboxTag.setLabel(label);
-    }
-    /*if (height != null) {
-      selectManyCheckboxTag.setHeight(height);
-    }*/
-    if (readonly != null) {
-      selectManyCheckboxTag.setReadonly(readonly);
-    }
-    if (required != null) {
-      selectManyCheckboxTag.setRequired(required);
-    }
-    if (markup != null) {
-      selectManyCheckboxTag.setMarkup(markup);
-    }
-    if (renderRange != null) {
-      selectManyCheckboxTag.setRenderRange(renderRange);
-    }
-    if (tabIndex != null) {
-      selectManyCheckboxTag.setTabIndex(tabIndex);
-    }
-    if (validatorMessage != null) {
-      selectManyCheckboxTag.setValidatorMessage(validatorMessage);
-    }
-    if (converterMessage != null) {
-      selectManyCheckboxTag.setConverterMessage(converterMessage);
-    }
-    if (requiredMessage != null) {
-      selectManyCheckboxTag.setRequiredMessage(requiredMessage);
-    }
-    selectManyCheckboxTag.setParent(labelTag);
-    selectManyCheckboxTag.setJspId(nextJspId());
-    selectManyCheckboxTag.doStartTag();
-
-    return super.doStartTag();
-  }
-
-  @Override
-  public int doEndTag() throws JspException {
-    selectManyCheckboxTag.doEndTag();
-    labelTag.doEndTag();
-    return super.doEndTag();
-  }
-
-  @Override
-  public void release() {
-    super.release();
-    binding = null;
-    onchange = null;
-    disabled = null;
-    inline = null;
-    label = null;
-    labelWidth = null;
-    //height = null;
-    readonly = null;
-    rendered = null;
-    converter = null;
-    validator = null;
-    required = null;
-    tip = null;
-    value = null;
-    valueChangeListener = null;
-    markup = null;
-    tabIndex = null;
-    selectManyCheckboxTag = null;
-    labelTag = null;
-    focus = null;
-    renderRange = null;
-    validatorMessage = null;
-    converterMessage = null;
-    requiredMessage = null;
-    fieldId = null;
-  }
+public interface SelectManyCheckboxExtensionTag {
 
   /**
    * Flag indicating that a value is required.
@@ -205,18 +41,14 @@ public class SelectManyCheckboxExtension
    */
   @TagAttribute
   @UIComponentTagAttribute(type = "boolean", defaultValue = "false")
-  public void setRequired(final javax.el.ValueExpression required) {
-    this.required = required;
-  }
+  public void setRequired(final javax.el.ValueExpression required) ;
 
   /**
    * The current value of this component.
    */
   @TagAttribute
   @UIComponentTagAttribute(type = "java.lang.Object")
-  public void setValue(final javax.el.ValueExpression value) {
-    this.value = value;
-  }
+  public void setValue(final javax.el.ValueExpression value) ;
 
   /**
    * MethodExpression representing a value change listener method
@@ -229,45 +61,35 @@ public class SelectManyCheckboxExtension
           type = {},
           expression = DynamicExpression.METHOD_EXPRESSION_REQUIRED,
           methodSignature = "javax.faces.event.ValueChangeEvent")
-  public void setValueChangeListener(final javax.el.MethodExpression valueChangeListener) {
-    this.valueChangeListener = valueChangeListener;
-  }
+  public void setValueChangeListener(final javax.el.MethodExpression valueChangeListener) ;
 
   /**
    * Flag indicating that this element is disabled.
    */
   @TagAttribute()
   @UIComponentTagAttribute(type = "boolean", defaultValue = "false")
-  public void setDisabled(final javax.el.ValueExpression disabled) {
-    this.disabled = disabled;
-  }
+  public void setDisabled(final javax.el.ValueExpression disabled) ;
 
   /**
    * Flag indicating that this component will prohibit changes by the user.
    */
   @TagAttribute
   @UIComponentTagAttribute(type = "boolean", defaultValue = "false")
-  public void setReadonly(final javax.el.ValueExpression readonly) {
-    this.readonly = readonly;
-  }
+  public void setReadonly(final javax.el.ValueExpression readonly) ;
 
   /**
    * Clientside script function to add to this component's onchange handler.
    */
   @TagAttribute
   @UIComponentTagAttribute()
-  public void setOnchange(final javax.el.ValueExpression onchange) {
-    this.onchange = onchange;
-  }
+  public void setOnchange(final javax.el.ValueExpression onchange) ;
 
   /**
    * Flag indicating this component should rendered as an inline element.
    */
   @TagAttribute
   @UIComponentTagAttribute(type = "boolean", defaultValue = "false")
-  public void setInline(final javax.el.ValueExpression inline) {
-    this.inline = inline;
-  }
+  public void setInline(final javax.el.ValueExpression inline) ;
 
   /**
    * Text value to display as label.
@@ -275,13 +97,9 @@ public class SelectManyCheckboxExtension
    */
   @TagAttribute
   @UIComponentTagAttribute()
-  public void setLabel(final javax.el.ValueExpression label) {
-    this.label = label;
-  }
-
-  /*public void setHeight(String height) {
-    this.height = height;
-  } */
+  public void setLabel(final javax.el.ValueExpression label) ;
+
+  /*public void setHeight(String height) ; */
 
   /**
    * A method binding EL expression,
@@ -293,9 +111,7 @@ public class SelectManyCheckboxExtension
   @UIComponentTagAttribute(type = {},
       expression = DynamicExpression.METHOD_EXPRESSION,
       methodSignature = { "javax.faces.context.FacesContext", "javax.faces.component.UIComponent", "java.lang.Object" })
-  public void setValidator(final javax.el.MethodExpression validator) {
-    this.validator = validator;
-  }
+  public void setValidator(final javax.el.MethodExpression validator) ;
 
   /**
    * An expression that specifies the Converter for this component.
@@ -309,9 +125,7 @@ public class SelectManyCheckboxExtension
   @TagAttribute
   @UIComponentTagAttribute(type = "javax.faces.convert.Converter",
       expression = DynamicExpression.VALUE_EXPRESSION)
-  public void setConverter(final javax.el.ValueExpression converter) {
-    this.converter = converter;
-  }
+  public void setConverter(final javax.el.ValueExpression converter) ;
 
   /**
    * Flag indicating whether or not this component should be rendered
@@ -319,9 +133,7 @@ public class SelectManyCheckboxExtension
    */
   @TagAttribute
   @UIComponentTagAttribute(type = "boolean", defaultValue = "true")
-  public void setRendered(final javax.el.ValueExpression rendered) {
-    this.rendered = rendered;
-  }
+  public void setRendered(final javax.el.ValueExpression rendered) ;
 
   /**
    * The value binding expression linking this
@@ -329,18 +141,14 @@ public class SelectManyCheckboxExtension
    */
   @TagAttribute
   @UIComponentTagAttribute(type = "javax.faces.component.UIComponent")
-  public void setBinding(final javax.el.ValueExpression binding) {
-    this.binding = binding;
-  }
+  public void setBinding(final javax.el.ValueExpression binding) ;
 
   /**
    * Text value to display as tooltip.
    */
   @TagAttribute
   @UIComponentTagAttribute()
-  public void setTip(final javax.el.ValueExpression tip) {
-    this.tip = tip;
-  }
+  public void setTip(final javax.el.ValueExpression tip) ;
 
   /**
    * The width for the label component. Default: 'auto'.
@@ -349,9 +157,7 @@ public class SelectManyCheckboxExtension
    */
   @TagAttribute
   @UIComponentTagAttribute()
-  public void setLabelWidth(final javax.el.ValueExpression labelWidth) {
-    this.labelWidth = labelWidth;
-  }
+  public void setLabelWidth(final javax.el.ValueExpression labelWidth) ;
 
   /**
    * Indicate markup of this component.
@@ -359,60 +165,46 @@ public class SelectManyCheckboxExtension
    */
   @TagAttribute
   @UIComponentTagAttribute(defaultValue = "none", type = "java.lang.String[]")
-  public void setMarkup(final javax.el.ValueExpression markup) {
-    this.markup = markup;
-  }
+  public void setMarkup(final javax.el.ValueExpression markup) ;
 
   @TagAttribute
   @UIComponentTagAttribute(type = "java.lang.Integer")
-  public void setTabIndex(final javax.el.ValueExpression tabIndex) {
-    this.tabIndex = tabIndex;
-  }
+  public void setTabIndex(final javax.el.ValueExpression tabIndex) ;
 
   /**
    * Flag indicating this component should receive the focus.
    */
   @TagAttribute
   @UIComponentTagAttribute(type = "boolean", defaultValue = "false")
-  public void setFocus(final javax.el.ValueExpression focus) {
-    this.focus = focus;
-  }
+  public void setFocus(final javax.el.ValueExpression focus) ;
 
   /**
    * Range of items to render.
    */
   @TagAttribute
   @UIComponentTagAttribute()
-  public void setRenderRange(final javax.el.ValueExpression renderRange) {
-    this.renderRange = renderRange;
-  }
+  public void setRenderRange(final javax.el.ValueExpression renderRange) ;
 
   /**
    * An expression that specifies the validator message
    */
   @TagAttribute
   @UIComponentTagAttribute()
-  public void setValidatorMessage(final javax.el.ValueExpression validatorMessage) {
-    this.validatorMessage = validatorMessage;
-  }
+  public void setValidatorMessage(final javax.el.ValueExpression validatorMessage) ;
 
   /**
    * An expression that specifies the converter message
    */
   @TagAttribute
   @UIComponentTagAttribute()
-  public void setConverterMessage(final javax.el.ValueExpression converterMessage) {
-    this.converterMessage = converterMessage;
-  }
+  public void setConverterMessage(final javax.el.ValueExpression converterMessage) ;
 
   /**
    * An expression that specifies the required message
    */
   @TagAttribute
   @UIComponentTagAttribute()
-  public void setRequiredMessage(final javax.el.ValueExpression requiredMessage) {
-    this.requiredMessage = requiredMessage;
-  }
+  public void setRequiredMessage(final javax.el.ValueExpression requiredMessage) ;
   
   /**
    * The component identifier for the input field component inside of the container.
@@ -420,9 +212,7 @@ public class SelectManyCheckboxExtension
    */
   @TagAttribute(rtexprvalue = true)
   @UIComponentTagAttribute
-  public void setFieldId(final String fieldId) {
-    this.fieldId = fieldId;
-  }
+  public void setFieldId(final String fieldId) ;
 
   /**
    * The component identifier for this component.
@@ -432,7 +222,5 @@ public class SelectManyCheckboxExtension
    */
   @TagAttribute(rtexprvalue = true)
   @UIComponentTagAttribute
-  public void setId(final String id) {
-    super.setId(id);
-  }
+  public void setId(final String id) ;
 }

Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/SelectManyListboxExtensionTag.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/SelectManyListboxExtensionTag.java?rev=1587479&r1=1587478&r2=1587479&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/SelectManyListboxExtensionTag.java (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/SelectManyListboxExtensionTag.java Tue Apr 15 09:13:03 2014
@@ -24,9 +24,6 @@ import org.apache.myfaces.tobago.apt.ann
 import org.apache.myfaces.tobago.apt.annotation.Tag;
 import org.apache.myfaces.tobago.apt.annotation.TagAttribute;
 import org.apache.myfaces.tobago.apt.annotation.UIComponentTagAttribute;
-import org.apache.myfaces.tobago.internal.taglib.SelectManyListboxTag;
-
-import javax.servlet.jsp.JspException;
 
 /**
  * Renders a multi selection option listbox with a label.
@@ -35,158 +32,7 @@ import javax.servlet.jsp.JspException;
 @ExtensionTag(
     baseClassName = "org.apache.myfaces.tobago.internal.taglib.SelectManyListboxTag",
     faceletHandler = "org.apache.myfaces.tobago.facelets.extension.SelectManyListboxExtensionHandler")
-public class SelectManyListboxExtensionTag extends TobagoExtensionBodyTagSupport {
-
-  private javax.el.ValueExpression required;
-  private javax.el.ValueExpression value;
-  private javax.el.MethodExpression valueChangeListener;
-  private javax.el.ValueExpression disabled;
-  private javax.el.ValueExpression readonly;
-  private javax.el.ValueExpression onchange;
-  private javax.el.ValueExpression inline;
-  private javax.el.ValueExpression label;
-  private javax.el.ValueExpression rendered;
-  private javax.el.ValueExpression binding;
-  private javax.el.ValueExpression tip;
-  private javax.el.ValueExpression converter;
-  private javax.el.MethodExpression validator;
-  private javax.el.ValueExpression labelWidth;
-  private javax.el.ValueExpression markup;
-  private javax.el.ValueExpression tabIndex;
-  private javax.el.ValueExpression focus;
-  private javax.el.ValueExpression validatorMessage;
-  private javax.el.ValueExpression converterMessage;
-  private javax.el.ValueExpression requiredMessage;
-  private String fieldId;
-
-  private LabelExtensionTag labelTag;
-  private SelectManyListboxTag selectManyListboxTag;
-
-  @Override
-  public int doStartTag() throws JspException {
-
-    labelTag = new LabelExtensionTag();
-    labelTag.setPageContext(pageContext);
-    labelTag.setRows("*");
-    if (id != null) {
-      labelTag.setId(id);
-    }
-    if (label != null) {
-      labelTag.setValue(label);
-    }
-    if (tip != null) {
-      labelTag.setTip(tip);
-    }
-    if (rendered != null) {
-      labelTag.setRendered(rendered);
-    }
-    if (labelWidth != null) {
-      labelTag.setColumns(createStringValueExpression(labelWidth.getExpressionString() + ";*"));
-    }
-    if (markup != null) {
-      labelTag.setMarkup(markup);
-    }
-    labelTag.setParent(getParent());
-    labelTag.setJspId(nextJspId());
-    labelTag.doStartTag();
-
-    selectManyListboxTag = new SelectManyListboxTag();
-    selectManyListboxTag.setPageContext(pageContext);
-    if (value != null) {
-      selectManyListboxTag.setValue(value);
-    }
-    if (valueChangeListener != null) {
-      selectManyListboxTag.setValueChangeListener(valueChangeListener);
-    }
-    if (binding != null) {
-      selectManyListboxTag.setBinding(binding);
-    }
-    if (onchange != null) {
-      selectManyListboxTag.setOnchange(onchange);
-    }
-    if (validator != null) {
-      selectManyListboxTag.setValidator(validator);
-    }
-    if (converter != null) {
-      selectManyListboxTag.setConverter(converter);
-    }
-    if (disabled != null) {
-      selectManyListboxTag.setDisabled(disabled);
-    }
-    if (inline != null) {
-      selectManyListboxTag.setInline(inline);
-    }
-    if (focus != null) {
-      selectManyListboxTag.setFocus(focus);
-    }
-    if (fieldId != null) {
-      selectManyListboxTag.setId(fieldId);
-    }
-    if (label != null) {
-      selectManyListboxTag.setLabel(label);
-    }
-    if (readonly != null) {
-      selectManyListboxTag.setReadonly(readonly);
-    }
-    if (required != null) {
-      selectManyListboxTag.setRequired(required);
-    }
-    if (markup != null) {
-      selectManyListboxTag.setMarkup(markup);
-    }
-    if (tabIndex != null) {
-      selectManyListboxTag.setTabIndex(tabIndex);
-    }
-    if (validatorMessage != null) {
-      selectManyListboxTag.setValidatorMessage(validatorMessage);
-    }
-    if (converterMessage != null) {
-      selectManyListboxTag.setConverterMessage(converterMessage);
-    }
-    if (requiredMessage != null) {
-      selectManyListboxTag.setRequiredMessage(requiredMessage);
-    }
-    selectManyListboxTag.setParent(labelTag);
-    selectManyListboxTag.setJspId(nextJspId());
-    selectManyListboxTag.doStartTag();
-
-    return super.doStartTag();
-  }
-
-  @Override
-  public int doEndTag() throws JspException {
-    selectManyListboxTag.doEndTag();
-    labelTag.doEndTag();
-    return super.doEndTag();
-  }
-
-  @Override
-  public void release() {
-    super.release();
-    binding = null;
-    onchange = null;
-    disabled = null;
-    inline = null;
-    label = null;
-    labelWidth = null;
-    readonly = null;
-    rendered = null;
-    converter = null;
-    validator = null;
-    required = null;
-    tip = null;
-    value = null;
-    valueChangeListener = null;
-    markup = null;
-    tabIndex = null;
-    selectManyListboxTag = null;
-    labelTag = null;
-    focus = null;
-    validatorMessage = null;
-    converterMessage = null;
-    requiredMessage = null;
-    fieldId = null;
-  }
+public interface SelectManyListboxExtensionTag {
 
   /**
    * Flag indicating that a value is required.
@@ -195,62 +41,48 @@ public class SelectManyListboxExtensionT
    */
   @TagAttribute
   @UIComponentTagAttribute(type = "boolean", defaultValue = "false")
-  public void setRequired(final javax.el.ValueExpression required) {
-    this.required = required;
-  }
+  public void setRequired(final javax.el.ValueExpression required) ;
 
   /**
    * The current value of this component.
    */
   @TagAttribute
   @UIComponentTagAttribute(type = "java.lang.Object")
-  public void setValue(final javax.el.ValueExpression value) {
-    this.value = value;
-  }
+  public void setValue(final javax.el.ValueExpression value) ;
 
   /**
    * MethodExpression representing a value change listener method
    * that will be notified when a new value has been set for this input component.
    * The expression must evaluate to a public method that takes a ValueChangeEvent
    * parameter, with a return type of void.
-   *
-   * @param valueChangeListener
    */
   @TagAttribute
   @UIComponentTagAttribute(
           type = {},
           expression = DynamicExpression.METHOD_EXPRESSION_REQUIRED,
           methodSignature = "javax.faces.event.ValueChangeEvent")
-  public void setValueChangeListener(final javax.el.MethodExpression valueChangeListener) {
-    this.valueChangeListener = valueChangeListener;
-  }
+  public void setValueChangeListener(final javax.el.MethodExpression valueChangeListener) ;
 
   /**
    * Flag indicating that this element is disabled.
    */
   @TagAttribute()
   @UIComponentTagAttribute(type = "boolean", defaultValue = "false")
-  public void setDisabled(final javax.el.ValueExpression disabled) {
-    this.disabled = disabled;
-  }
+  public void setDisabled(final javax.el.ValueExpression disabled) ;
 
   /**
    * Flag indicating that this component will prohibit changes by the user.
    */
   @TagAttribute
   @UIComponentTagAttribute(type = "boolean", defaultValue = "false")
-  public void setReadonly(final javax.el.ValueExpression readonly) {
-    this.readonly = readonly;
-  }
+  public void setReadonly(final javax.el.ValueExpression readonly) ;
 
   /**
    * Clientside script function to add to this component's onchange handler.
    */
   @TagAttribute
   @UIComponentTagAttribute()
-  public void setOnchange(final javax.el.ValueExpression onchange) {
-    this.onchange = onchange;
-  }
+  public void setOnchange(final javax.el.ValueExpression onchange) ;
 
   /**
    * Flag indicating this component should rendered as an inline element.
@@ -259,9 +91,7 @@ public class SelectManyListboxExtensionT
   @TagAttribute
   @UIComponentTagAttribute(type = "boolean", defaultValue = "false")
   @Deprecated
-  public void setInline(final javax.el.ValueExpression inline) {
-    this.inline = inline;
-  }
+  public void setInline(final javax.el.ValueExpression inline) ;
 
   /**
    * Text value to display as label.
@@ -269,9 +99,7 @@ public class SelectManyListboxExtensionT
    */
   @TagAttribute
   @UIComponentTagAttribute()
-  public void setLabel(final javax.el.ValueExpression label) {
-    this.label = label;
-  }
+  public void setLabel(final javax.el.ValueExpression label) ;
 
   /**
    * A method binding EL expression,
@@ -283,9 +111,7 @@ public class SelectManyListboxExtensionT
   @UIComponentTagAttribute(type = {},
       expression = DynamicExpression.METHOD_EXPRESSION,
       methodSignature = { "javax.faces.context.FacesContext", "javax.faces.component.UIComponent", "java.lang.Object" })
-  public void setValidator(final javax.el.MethodExpression validator) {
-    this.validator = validator;
-  }
+  public void setValidator(final javax.el.MethodExpression validator) ;
 
   /**
    * An expression that specifies the Converter for this component.
@@ -299,9 +125,7 @@ public class SelectManyListboxExtensionT
   @TagAttribute
   @UIComponentTagAttribute(type = "javax.faces.convert.Converter",
       expression = DynamicExpression.VALUE_EXPRESSION)
-  public void setConverter(final javax.el.ValueExpression converter) {
-    this.converter = converter;
-  }
+  public void setConverter(final javax.el.ValueExpression converter) ;
 
   /**
    * Flag indicating whether or not this component should be rendered
@@ -309,9 +133,7 @@ public class SelectManyListboxExtensionT
    */
   @TagAttribute
   @UIComponentTagAttribute(type = "boolean", defaultValue = "true")
-  public void setRendered(final javax.el.ValueExpression rendered) {
-    this.rendered = rendered;
-  }
+  public void setRendered(final javax.el.ValueExpression rendered) ;
 
   /**
    * The value binding expression linking this
@@ -319,18 +141,14 @@ public class SelectManyListboxExtensionT
    */
   @TagAttribute
   @UIComponentTagAttribute(type = "javax.faces.component.UIComponent")
-  public void setBinding(final javax.el.ValueExpression binding) {
-    this.binding = binding;
-  }
+  public void setBinding(final javax.el.ValueExpression binding) ;
 
   /**
    * Text value to display as tooltip.
    */
   @TagAttribute
   @UIComponentTagAttribute()
-  public void setTip(final javax.el.ValueExpression tip) {
-    this.tip = tip;
-  }
+  public void setTip(final javax.el.ValueExpression tip) ;
 
   /**
    * The width for the label component. Default: 'auto'.
@@ -339,9 +157,7 @@ public class SelectManyListboxExtensionT
    */
   @TagAttribute
   @UIComponentTagAttribute()
-  public void setLabelWidth(final javax.el.ValueExpression labelWidth) {
-    this.labelWidth = labelWidth;
-  }
+  public void setLabelWidth(final javax.el.ValueExpression labelWidth) ;
 
   /**
    * Indicate markup of this component.
@@ -349,51 +165,39 @@ public class SelectManyListboxExtensionT
    */
   @TagAttribute
   @UIComponentTagAttribute(defaultValue = "none", type = "java.lang.String[]")
-  public void setMarkup(final javax.el.ValueExpression markup) {
-    this.markup = markup;
-  }
+  public void setMarkup(final javax.el.ValueExpression markup) ;
 
   @TagAttribute
   @UIComponentTagAttribute(type = "java.lang.Integer")
-  public void setTabIndex(final javax.el.ValueExpression tabIndex) {
-    this.tabIndex = tabIndex;
-  }
+  public void setTabIndex(final javax.el.ValueExpression tabIndex) ;
 
   /**
    * Flag indicating this component should receive the focus.
    */
   @TagAttribute
   @UIComponentTagAttribute(type = "boolean", defaultValue = "false")
-  public void setFocus(final javax.el.ValueExpression focus) {
-    this.focus = focus;
-  }
+  public void setFocus(final javax.el.ValueExpression focus) ;
 
   /**
    * An expression that specifies the validator message
    */
   @TagAttribute
   @UIComponentTagAttribute()
-  public void setValidatorMessage(final javax.el.ValueExpression validatorMessage) {
-    this.validatorMessage = validatorMessage;
-  }
+  public void setValidatorMessage(final javax.el.ValueExpression validatorMessage) ;
 
   /**
    * An expression that specifies the converter message
    */
   @TagAttribute
   @UIComponentTagAttribute()
-  public void setConverterMessage(final javax.el.ValueExpression converterMessage) {
-    this.converterMessage = converterMessage;
-  }
+  public void setConverterMessage(final javax.el.ValueExpression converterMessage) ;
 
   /**
    * An expression that specifies the required message
    */
   @TagAttribute
   @UIComponentTagAttribute()
-  public void setRequiredMessage(final javax.el.ValueExpression requiredMessage) {
-    this.requiredMessage = requiredMessage;
-  }
+  public void setRequiredMessage(final javax.el.ValueExpression requiredMessage) ;
   
   /**
    * The component identifier for the input field component inside of the container.
@@ -401,9 +205,7 @@ public class SelectManyListboxExtensionT
    */
   @TagAttribute(rtexprvalue = true)
   @UIComponentTagAttribute
-  public void setFieldId(final String fieldId) {
-    this.fieldId = fieldId;
-  }
+  public void setFieldId(final String fieldId) ;
 
   /**
    * The component identifier for this component.
@@ -413,7 +215,5 @@ public class SelectManyListboxExtensionT
    */
   @TagAttribute(rtexprvalue = true)
   @UIComponentTagAttribute
-  public void setId(final String id) {
-    super.setId(id);
-  }
+  public void setId(final String id) ;
 }

Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/SelectManyShuttleExtensionTag.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/SelectManyShuttleExtensionTag.java?rev=1587479&r1=1587478&r2=1587479&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/SelectManyShuttleExtensionTag.java (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/SelectManyShuttleExtensionTag.java Tue Apr 15 09:13:03 2014
@@ -24,9 +24,6 @@ import org.apache.myfaces.tobago.apt.ann
 import org.apache.myfaces.tobago.apt.annotation.Tag;
 import org.apache.myfaces.tobago.apt.annotation.TagAttribute;
 import org.apache.myfaces.tobago.apt.annotation.UIComponentTagAttribute;
-import org.apache.myfaces.tobago.internal.taglib.SelectManyShuttleTag;
-
-import javax.servlet.jsp.JspException;
 
 /**
  * Renders a multi selection option shuttle with a label.
@@ -35,164 +32,7 @@ import javax.servlet.jsp.JspException;
 @ExtensionTag(
     baseClassName = "org.apache.myfaces.tobago.internal.taglib.SelectManyShuttleTag",
     faceletHandler = "org.apache.myfaces.tobago.facelets.extension.SelectManyShuttleExtensionHandler")
-public class SelectManyShuttleExtensionTag extends TobagoExtensionBodyTagSupport {
-
-  private javax.el.ValueExpression required;
-  private javax.el.ValueExpression value;
-  private javax.el.MethodExpression valueChangeListener;
-  private javax.el.ValueExpression disabled;
-  private javax.el.ValueExpression readonly;
-  private javax.el.ValueExpression onchange;
-  private javax.el.ValueExpression label;
-  private javax.el.ValueExpression unselectedLabel;
-  private javax.el.ValueExpression selectedLabel;
-  private javax.el.ValueExpression rendered;
-  private javax.el.ValueExpression binding;
-  private javax.el.ValueExpression tip;
-  private javax.el.ValueExpression converter;
-  private javax.el.MethodExpression validator;
-  private javax.el.ValueExpression labelWidth;
-  private javax.el.ValueExpression markup;
-  private javax.el.ValueExpression tabIndex;
-  private javax.el.ValueExpression focus;
-  private javax.el.ValueExpression validatorMessage;
-  private javax.el.ValueExpression converterMessage;
-  private javax.el.ValueExpression requiredMessage;
-  private String fieldId;
-
-  private LabelExtensionTag labelTag;
-  private SelectManyShuttleTag selectManyShuttleTag;
-
-  @Override
-  public int doStartTag() throws JspException {
-
-    labelTag = new LabelExtensionTag();
-    labelTag.setPageContext(pageContext);
-    labelTag.setRows("*");
-    if (id != null) {
-      labelTag.setId(id);
-    }
-    if (label != null) {
-      labelTag.setValue(label);
-    }
-    if (tip != null) {
-      labelTag.setTip(tip);
-    }
-    if (rendered != null) {
-      labelTag.setRendered(rendered);
-    }
-    if (labelWidth != null) {
-      labelTag.setColumns(createStringValueExpression(labelWidth.getExpressionString() + ";*"));
-    }
-    if (markup != null) {
-      labelTag.setMarkup(markup);
-    }
-    labelTag.setParent(getParent());
-    labelTag.setJspId(nextJspId());
-    labelTag.doStartTag();
-
-    selectManyShuttleTag = new SelectManyShuttleTag();
-    selectManyShuttleTag.setPageContext(pageContext);
-    if (value != null) {
-      selectManyShuttleTag.setValue(value);
-    }
-    if (valueChangeListener != null) {
-      selectManyShuttleTag.setValueChangeListener(valueChangeListener);
-    }
-    if (binding != null) {
-      selectManyShuttleTag.setBinding(binding);
-    }
-    if (onchange != null) {
-      selectManyShuttleTag.setOnchange(onchange);
-    }
-    if (validator != null) {
-      selectManyShuttleTag.setValidator(validator);
-    }
-    if (converter != null) {
-      selectManyShuttleTag.setConverter(converter);
-    }
-    if (disabled != null) {
-      selectManyShuttleTag.setDisabled(disabled);
-    }
-    if (focus != null) {
-      selectManyShuttleTag.setFocus(focus);
-    }
-    if (fieldId != null) {
-      selectManyShuttleTag.setId(fieldId);
-    }
-    if (label != null) {
-      selectManyShuttleTag.setLabel(label);
-    }
-    if (unselectedLabel != null) {
-      selectManyShuttleTag.setUnselectedLabel(unselectedLabel);
-    }
-    if (selectedLabel != null) {
-      selectManyShuttleTag.setSelectedLabel(selectedLabel);
-    }
-    if (readonly != null) {
-      selectManyShuttleTag.setReadonly(readonly);
-    }
-    if (required != null) {
-      selectManyShuttleTag.setRequired(required);
-    }
-    if (markup != null) {
-      selectManyShuttleTag.setMarkup(markup);
-    }
-    if (tabIndex != null) {
-      selectManyShuttleTag.setTabIndex(tabIndex);
-    }
-    if (validatorMessage != null) {
-      selectManyShuttleTag.setValidatorMessage(validatorMessage);
-    }
-    if (converterMessage != null) {
-      selectManyShuttleTag.setConverterMessage(converterMessage);
-    }
-    if (requiredMessage != null) {
-      selectManyShuttleTag.setRequiredMessage(requiredMessage);
-    }
-    selectManyShuttleTag.setParent(labelTag);
-    selectManyShuttleTag.setJspId(nextJspId());
-    selectManyShuttleTag.doStartTag();
-
-    return super.doStartTag();
-  }
-
-  @Override
-  public int doEndTag() throws JspException {
-    selectManyShuttleTag.doEndTag();
-    labelTag.doEndTag();
-    return super.doEndTag();
-  }
-
-  @Override
-  public void release() {
-    super.release();
-    binding = null;
-    onchange = null;
-    disabled = null;
-    onchange = null;
-    label = null;
-    unselectedLabel = null;
-    selectedLabel = null;
-    labelWidth = null;
-    readonly = null;
-    rendered = null;
-    converter = null;
-    validator = null;
-    required = null;
-    tip = null;
-    value = null;
-    valueChangeListener = null;
-    markup = null;
-    tabIndex = null;
-    selectManyShuttleTag = null;
-    labelTag = null;
-    focus = null;
-    validatorMessage = null;
-    converterMessage = null;
-    requiredMessage = null;
-    fieldId = null;
-  }
+public interface SelectManyShuttleExtensionTag {
 
   /**
    * Flag indicating that a value is required.
@@ -201,62 +41,48 @@ public class SelectManyShuttleExtensionT
    */
   @TagAttribute
   @UIComponentTagAttribute(type = "boolean", defaultValue = "false")
-  public void setRequired(final javax.el.ValueExpression required) {
-    this.required = required;
-  }
+  public void setRequired(final javax.el.ValueExpression required) ;
 
   /**
    * The current value of this component.
    */
   @TagAttribute
   @UIComponentTagAttribute(type = "java.lang.Object")
-  public void setValue(final javax.el.ValueExpression value) {
-    this.value = value;
-  }
+  public void setValue(final javax.el.ValueExpression value) ;
 
   /**
    * MethodExpression representing a value change listener method
    * that will be notified when a new value has been set for this input component.
    * The expression must evaluate to a public method that takes a ValueChangeEvent
    * parameter, with a return type of void.
-   *
-   * @param valueChangeListener
    */
   @TagAttribute
   @UIComponentTagAttribute(
       type = {},
       expression = DynamicExpression.METHOD_EXPRESSION_REQUIRED,
       methodSignature = "javax.faces.event.ValueChangeEvent")
-  public void setValueChangeListener(final javax.el.MethodExpression valueChangeListener) {
-    this.valueChangeListener = valueChangeListener;
-  }
+  public void setValueChangeListener(final javax.el.MethodExpression valueChangeListener) ;
 
   /**
    * Flag indicating that this element is disabled.
    */
   @TagAttribute()
   @UIComponentTagAttribute(type = "boolean", defaultValue = "false")
-  public void setDisabled(final javax.el.ValueExpression disabled) {
-    this.disabled = disabled;
-  }
+  public void setDisabled(final javax.el.ValueExpression disabled) ;
 
   /**
    * Flag indicating that this component will prohibit changes by the user.
    */
   @TagAttribute
   @UIComponentTagAttribute(type = "boolean", defaultValue = "false")
-  public void setReadonly(final javax.el.ValueExpression readonly) {
-    this.readonly = readonly;
-  }
+  public void setReadonly(final javax.el.ValueExpression readonly) ;
 
   /**
    * Clientside script function to add to this component's onchange handler.
    */
   @TagAttribute
   @UIComponentTagAttribute()
-  public void setOnchange(final javax.el.ValueExpression onchange) {
-    this.onchange = onchange;
-  }
+  public void setOnchange(final javax.el.ValueExpression onchange) ;
 
   /**
    * Text value to display as label.
@@ -264,27 +90,21 @@ public class SelectManyShuttleExtensionT
    */
   @TagAttribute
   @UIComponentTagAttribute()
-  public void setLabel(final javax.el.ValueExpression label) {
-    this.label = label;
-  }
+  public void setLabel(final javax.el.ValueExpression label) ;
 
   /**
    * Text value to display as unselected label.
    */
   @TagAttribute
   @UIComponentTagAttribute()
-  public void setUnselectedLabel(final javax.el.ValueExpression unselectedLabel) {
-    this.unselectedLabel = unselectedLabel;
-  }
+  public void setUnselectedLabel(final javax.el.ValueExpression unselectedLabel) ;
 
   /**
    * Text value to display as selected label.
    */
   @TagAttribute
   @UIComponentTagAttribute()
-  public void setSelectedLabel(final javax.el.ValueExpression selectedLabel) {
-    this.selectedLabel = selectedLabel;
-  }
+  public void setSelectedLabel(final javax.el.ValueExpression selectedLabel) ;
 
   /**
    * A method binding EL expression,
@@ -296,9 +116,7 @@ public class SelectManyShuttleExtensionT
   @UIComponentTagAttribute(type = {},
       expression = DynamicExpression.METHOD_EXPRESSION,
       methodSignature = {"javax.faces.context.FacesContext", "javax.faces.component.UIComponent", "java.lang.Object"})
-  public void setValidator(final javax.el.MethodExpression validator) {
-    this.validator = validator;
-  }
+  public void setValidator(final javax.el.MethodExpression validator) ;
 
   /**
    * An expression that specifies the Converter for this component.
@@ -312,9 +130,7 @@ public class SelectManyShuttleExtensionT
   @TagAttribute
   @UIComponentTagAttribute(type = "javax.faces.convert.Converter",
       expression = DynamicExpression.VALUE_EXPRESSION)
-  public void setConverter(final javax.el.ValueExpression converter) {
-    this.converter = converter;
-  }
+  public void setConverter(final javax.el.ValueExpression converter) ;
 
   /**
    * Flag indicating whether or not this component should be rendered
@@ -322,9 +138,7 @@ public class SelectManyShuttleExtensionT
    */
   @TagAttribute
   @UIComponentTagAttribute(type = "boolean", defaultValue = "true")
-  public void setRendered(final javax.el.ValueExpression rendered) {
-    this.rendered = rendered;
-  }
+  public void setRendered(final javax.el.ValueExpression rendered) ;
 
   /**
    * The value binding expression linking this
@@ -332,18 +146,14 @@ public class SelectManyShuttleExtensionT
    */
   @TagAttribute
   @UIComponentTagAttribute(type = "javax.faces.component.UIComponent")
-  public void setBinding(final javax.el.ValueExpression binding) {
-    this.binding = binding;
-  }
+  public void setBinding(final javax.el.ValueExpression binding) ;
 
   /**
    * Text value to display as tooltip.
    */
   @TagAttribute
   @UIComponentTagAttribute()
-  public void setTip(final javax.el.ValueExpression tip) {
-    this.tip = tip;
-  }
+  public void setTip(final javax.el.ValueExpression tip) ;
 
   /**
    * The width for the label component. Default: 'auto'.
@@ -352,9 +162,7 @@ public class SelectManyShuttleExtensionT
    */
   @TagAttribute
   @UIComponentTagAttribute()
-  public void setLabelWidth(final javax.el.ValueExpression labelWidth) {
-    this.labelWidth = labelWidth;
-  }
+  public void setLabelWidth(final javax.el.ValueExpression labelWidth) ;
 
   /**
    * Indicate markup of this component.
@@ -362,51 +170,39 @@ public class SelectManyShuttleExtensionT
    */
   @TagAttribute
   @UIComponentTagAttribute(defaultValue = "none", type = "java.lang.String[]")
-  public void setMarkup(final javax.el.ValueExpression markup) {
-    this.markup = markup;
-  }
+  public void setMarkup(final javax.el.ValueExpression markup) ;
 
   @TagAttribute
   @UIComponentTagAttribute(type = "java.lang.Integer")
-  public void setTabIndex(final javax.el.ValueExpression tabIndex) {
-    this.tabIndex = tabIndex;
-  }
+  public void setTabIndex(final javax.el.ValueExpression tabIndex) ;
 
   /**
    * Flag indicating this component should receive the focus.
    */
   @TagAttribute
   @UIComponentTagAttribute(type = "boolean", defaultValue = "false")
-  public void setFocus(final javax.el.ValueExpression focus) {
-    this.focus = focus;
-  }
+  public void setFocus(final javax.el.ValueExpression focus) ;
 
   /**
    * An expression that specifies the validator message
    */
   @TagAttribute
   @UIComponentTagAttribute()
-  public void setValidatorMessage(final javax.el.ValueExpression validatorMessage) {
-    this.validatorMessage = validatorMessage;
-  }
+  public void setValidatorMessage(final javax.el.ValueExpression validatorMessage) ;
 
   /**
    * An expression that specifies the converter message
    */
   @TagAttribute
   @UIComponentTagAttribute()
-  public void setConverterMessage(final javax.el.ValueExpression converterMessage) {
-    this.converterMessage = converterMessage;
-  }
+  public void setConverterMessage(final javax.el.ValueExpression converterMessage) ;
 
   /**
    * An expression that specifies the required message
    */
   @TagAttribute
   @UIComponentTagAttribute()
-  public void setRequiredMessage(final javax.el.ValueExpression requiredMessage) {
-    this.requiredMessage = requiredMessage;
-  }
+  public void setRequiredMessage(final javax.el.ValueExpression requiredMessage) ;
 
   /**
    * The component identifier for the input field component inside of the container.
@@ -414,9 +210,7 @@ public class SelectManyShuttleExtensionT
    */
   @TagAttribute(rtexprvalue = true)
   @UIComponentTagAttribute
-  public void setFieldId(final String fieldId) {
-    this.fieldId = fieldId;
-  }
+  public void setFieldId(final String fieldId) ;
 
   /**
    * The component identifier for this component.
@@ -426,7 +220,5 @@ public class SelectManyShuttleExtensionT
    */
   @TagAttribute(rtexprvalue = true)
   @UIComponentTagAttribute
-  public void setId(final String id) {
-    super.setId(id);
-  }
+  public void setId(final String id) ;
 }

Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/SelectOneChoiceExtensionTag.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/SelectOneChoiceExtensionTag.java?rev=1587479&r1=1587478&r2=1587479&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/SelectOneChoiceExtensionTag.java (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/SelectOneChoiceExtensionTag.java Tue Apr 15 09:13:03 2014
@@ -24,9 +24,6 @@ import org.apache.myfaces.tobago.apt.ann
 import org.apache.myfaces.tobago.apt.annotation.Tag;
 import org.apache.myfaces.tobago.apt.annotation.TagAttribute;
 import org.apache.myfaces.tobago.apt.annotation.UIComponentTagAttribute;
-import org.apache.myfaces.tobago.internal.taglib.SelectOneChoiceTag;
-
-import javax.servlet.jsp.JspException;
 
 /**
  * Render a single selection dropdown list with a label.
@@ -36,157 +33,7 @@ import javax.servlet.jsp.JspException;
 @ExtensionTag(
     baseClassName = "org.apache.myfaces.tobago.internal.taglib.SelectOneChoiceTag",
     faceletHandler = "org.apache.myfaces.tobago.facelets.extension.SelectOneChoiceExtensionHandler")
-public class SelectOneChoiceExtensionTag extends TobagoExtensionBodyTagSupport {
-
-  private javax.el.ValueExpression required;
-  private javax.el.ValueExpression value;
-  private javax.el.MethodExpression valueChangeListener;
-  private javax.el.ValueExpression disabled;
-  private javax.el.ValueExpression readonly;
-  private javax.el.ValueExpression onchange;
-  private javax.el.ValueExpression inline;
-  private javax.el.ValueExpression label;
-  private javax.el.ValueExpression rendered;
-  private javax.el.ValueExpression binding;
-  private javax.el.ValueExpression tip;
-  private javax.el.MethodExpression validator;
-  private javax.el.ValueExpression converter;
-  private javax.el.ValueExpression labelWidth;
-  private javax.el.ValueExpression tabIndex;
-  private javax.el.ValueExpression focus;
-  private javax.el.ValueExpression markup;
-  private javax.el.ValueExpression validatorMessage;
-  private javax.el.ValueExpression converterMessage;
-  private javax.el.ValueExpression requiredMessage;
-  private String fieldId;
-
-  private LabelExtensionTag labelTag;
-  private SelectOneChoiceTag selectOneChoiceTag;
-
-  @Override
-  public int doStartTag() throws JspException {
-
-    labelTag = new LabelExtensionTag();
-    labelTag.setPageContext(pageContext);
-    if (id != null) {
-      labelTag.setId(id);
-    }
-    if (label != null) {
-      labelTag.setValue(label);
-    }
-    if (tip != null) {
-      labelTag.setTip(tip);
-    }
-    if (rendered != null) {
-      labelTag.setRendered(rendered);
-    }
-    if (labelWidth != null) {
-      labelTag.setColumns(createStringValueExpression(labelWidth.getExpressionString() + ";*"));
-    }
-    if (markup != null) {
-      labelTag.setMarkup(markup);
-    }
-    labelTag.setParent(getParent());
-    labelTag.setJspId(nextJspId());
-    labelTag.doStartTag();
-
-    selectOneChoiceTag = new SelectOneChoiceTag();
-    selectOneChoiceTag.setPageContext(pageContext);
-    if (value != null) {
-      selectOneChoiceTag.setValue(value);
-    }
-    if (valueChangeListener != null) {
-      selectOneChoiceTag.setValueChangeListener(valueChangeListener);
-    }
-    if (validator != null) {
-      selectOneChoiceTag.setValidator(validator);
-    }
-    if (converter != null) {
-      selectOneChoiceTag.setConverter(converter);
-    }
-    if (binding != null) {
-      selectOneChoiceTag.setBinding(binding);
-    }
-    if (onchange != null) {
-      selectOneChoiceTag.setOnchange(onchange);
-    }
-    if (disabled != null) {
-      selectOneChoiceTag.setDisabled(disabled);
-    }
-    if (markup != null) {
-      selectOneChoiceTag.setMarkup(markup);
-    }
-    if (inline != null) {
-      selectOneChoiceTag.setInline(inline);
-    }
-    if (focus != null) {
-      selectOneChoiceTag.setFocus(focus);
-    }
-    if (fieldId != null) {
-      selectOneChoiceTag.setId(fieldId);
-    }
-    if (label != null) {
-      selectOneChoiceTag.setLabel(label);
-    }
-    if (readonly != null) {
-      selectOneChoiceTag.setReadonly(readonly);
-    }
-    if (required != null) {
-      selectOneChoiceTag.setRequired(required);
-    }
-    if (tabIndex != null) {
-      selectOneChoiceTag.setTabIndex(tabIndex);
-    }
-    if (validatorMessage != null) {
-      selectOneChoiceTag.setValidatorMessage(validatorMessage);
-    }
-    if (converterMessage != null) {
-      selectOneChoiceTag.setConverterMessage(converterMessage);
-    }
-    if (requiredMessage != null) {
-      selectOneChoiceTag.setRequiredMessage(requiredMessage);
-    }
-    selectOneChoiceTag.setParent(labelTag);
-    selectOneChoiceTag.setJspId(nextJspId());
-    selectOneChoiceTag.doStartTag();
-
-    return super.doStartTag();
-  }
-
-  @Override
-  public int doEndTag() throws JspException {
-    selectOneChoiceTag.doEndTag();
-    labelTag.doEndTag();
-    return super.doEndTag();
-  }
-
-  @Override
-  public void release() {
-    super.release();
-    binding = null;
-    onchange = null;
-    disabled = null;
-    inline = null;
-    label = null;
-    labelWidth = null;
-    converter = null;
-    validator = null;
-    readonly = null;
-    rendered = null;
-    required = null;
-    tip = null;
-    value = null;
-    valueChangeListener = null;
-    tabIndex = null;
-    selectOneChoiceTag = null;
-    labelTag = null;
-    focus = null;
-    markup = null;
-    validatorMessage = null;
-    converterMessage = null;
-    requiredMessage = null;
-    fieldId = null;
-  }
+public interface SelectOneChoiceExtensionTag {
 
   /**
    * Flag indicating that a value is required.
@@ -195,35 +42,27 @@ public class SelectOneChoiceExtensionTag
    */
   @TagAttribute
   @UIComponentTagAttribute(type = "boolean", defaultValue = "false")
-  public void setRequired(final javax.el.ValueExpression required) {
-    this.required = required;
-  }
+  public void setRequired(final javax.el.ValueExpression required) ;
 
   /**
    * The current value of this component.
    */
   @TagAttribute
   @UIComponentTagAttribute(type = "java.lang.Object")
-  public void setValue(final javax.el.ValueExpression value) {
-    this.value = value;
-  }
+  public void setValue(final javax.el.ValueExpression value) ;
 
   /**
    * MethodExpression representing a value change listener method
    * that will be notified when a new value has been set for this input component.
    * The expression must evaluate to a public method that takes a ValueChangeEvent
    * parameter, with a return type of void.
-   *
-   * @param valueChangeListener
    */
   @TagAttribute
   @UIComponentTagAttribute(
           type = {},
           expression = DynamicExpression.METHOD_EXPRESSION_REQUIRED,
           methodSignature = "javax.faces.event.ValueChangeEvent")
-  public void setValueChangeListener(final javax.el.MethodExpression valueChangeListener) {
-    this.valueChangeListener = valueChangeListener;
-  }
+  public void setValueChangeListener(final javax.el.MethodExpression valueChangeListener) ;
 
   /**
    * A method binding EL expression,
@@ -235,36 +74,28 @@ public class SelectOneChoiceExtensionTag
   @UIComponentTagAttribute(type = {},
       expression = DynamicExpression.METHOD_EXPRESSION,
       methodSignature = { "javax.faces.context.FacesContext", "javax.faces.component.UIComponent", "java.lang.Object" })
-  public void setValidator(final javax.el.MethodExpression validator) {
-    this.validator = validator;
-  }
+  public void setValidator(final javax.el.MethodExpression validator) ;
 
   /**
    * Flag indicating that this element is disabled.
    */
   @TagAttribute()
   @UIComponentTagAttribute(type = "boolean", defaultValue = "false")
-  public void setDisabled(final javax.el.ValueExpression disabled) {
-    this.disabled = disabled;
-  }
+  public void setDisabled(final javax.el.ValueExpression disabled) ;
 
   /**
    * Flag indicating that this component will prohibit changes by the user.
    */
   @TagAttribute
   @UIComponentTagAttribute(type = "boolean", defaultValue = "false")
-  public void setReadonly(final javax.el.ValueExpression readonly) {
-    this.readonly = readonly;
-  }
+  public void setReadonly(final javax.el.ValueExpression readonly) ;
 
   /**
    * Clientside script function to add to this component's onchange handler.
    */
   @TagAttribute
   @UIComponentTagAttribute()
-  public void setOnchange(final javax.el.ValueExpression onchange) {
-    this.onchange = onchange;
-  }
+  public void setOnchange(final javax.el.ValueExpression onchange) ;
 
   /**
    * An expression that specifies the Converter for this component.
@@ -278,9 +109,7 @@ public class SelectOneChoiceExtensionTag
   @TagAttribute
   @UIComponentTagAttribute(type = "javax.faces.convert.Converter",
       expression = DynamicExpression.VALUE_EXPRESSION)
-  public void setConverter(final javax.el.ValueExpression converter) {
-    this.converter = converter;
-  }
+  public void setConverter(final javax.el.ValueExpression converter) ;
 
   /**
    * Flag indicating this component should rendered as an inline element.
@@ -289,9 +118,7 @@ public class SelectOneChoiceExtensionTag
   @TagAttribute
   @UIComponentTagAttribute(type = "boolean", defaultValue = "false")
   @Deprecated
-  public void setInline(final javax.el.ValueExpression inline) {
-    this.inline = inline;
-  }
+  public void setInline(final javax.el.ValueExpression inline) ;
 
   /**
    * Text value to display as label.
@@ -299,9 +126,7 @@ public class SelectOneChoiceExtensionTag
    */
   @TagAttribute
   @UIComponentTagAttribute()
-  public void setLabel(final javax.el.ValueExpression label) {
-    this.label = label;
-  }
+  public void setLabel(final javax.el.ValueExpression label) ;
 
   /**
    * Flag indicating whether or not this component should be rendered
@@ -309,9 +134,7 @@ public class SelectOneChoiceExtensionTag
    */
   @TagAttribute
   @UIComponentTagAttribute(type = "boolean", defaultValue = "true")
-  public void setRendered(final javax.el.ValueExpression rendered) {
-    this.rendered = rendered;
-  }
+  public void setRendered(final javax.el.ValueExpression rendered) ;
 
   /**
    * The value binding expression linking this
@@ -319,18 +142,14 @@ public class SelectOneChoiceExtensionTag
    */
   @TagAttribute
   @UIComponentTagAttribute(type = "javax.faces.component.UIComponent")
-  public void setBinding(final javax.el.ValueExpression binding) {
-    this.binding = binding;
-  }
+  public void setBinding(final javax.el.ValueExpression binding) ;
 
   /**
    * Text value to display as tooltip.
    */
   @TagAttribute
   @UIComponentTagAttribute()
-  public void setTip(final javax.el.ValueExpression tip) {
-    this.tip = tip;
-  }
+  public void setTip(final javax.el.ValueExpression tip) ;
 
   /**
    * The width for the label component. Default: 'auto'.
@@ -339,24 +158,18 @@ public class SelectOneChoiceExtensionTag
    */
   @TagAttribute
   @UIComponentTagAttribute()
-  public void setLabelWidth(final javax.el.ValueExpression labelWidth) {
-    this.labelWidth = labelWidth;
-  }
+  public void setLabelWidth(final javax.el.ValueExpression labelWidth) ;
 
   @TagAttribute
   @UIComponentTagAttribute(type = "java.lang.Integer")
-  public void setTabIndex(final javax.el.ValueExpression tabIndex) {
-    this.tabIndex = tabIndex;
-  }
+  public void setTabIndex(final javax.el.ValueExpression tabIndex) ;
 
   /**
    * Flag indicating this component should receive the focus.
    */
   @TagAttribute
   @UIComponentTagAttribute(type = "boolean", defaultValue = "false")
-  public void setFocus(final javax.el.ValueExpression focus) {
-    this.focus = focus;
-  }
+  public void setFocus(final javax.el.ValueExpression focus) ;
 
   /**
    * Indicate markup of this component.
@@ -364,36 +177,28 @@ public class SelectOneChoiceExtensionTag
    */
   @TagAttribute
   @UIComponentTagAttribute(defaultValue = "none", type = "java.lang.String[]")
-  public void setMarkup(final javax.el.ValueExpression markup) {
-    this.markup = markup;
-  }
+  public void setMarkup(final javax.el.ValueExpression markup) ;
 
   /**
    * An expression that specifies the validator message
    */
   @TagAttribute
   @UIComponentTagAttribute()
-  public void setValidatorMessage(final javax.el.ValueExpression validatorMessage) {
-    this.validatorMessage = validatorMessage;
-  }
+  public void setValidatorMessage(final javax.el.ValueExpression validatorMessage) ;
 
   /**
    * An expression that specifies the converter message
    */
   @TagAttribute
   @UIComponentTagAttribute()
-  public void setConverterMessage(final javax.el.ValueExpression converterMessage) {
-    this.converterMessage = converterMessage;
-  }
+  public void setConverterMessage(final javax.el.ValueExpression converterMessage) ;
 
   /**
    * An expression that specifies the required message
    */
   @TagAttribute
   @UIComponentTagAttribute()
-  public void setRequiredMessage(final javax.el.ValueExpression requiredMessage) {
-    this.requiredMessage = requiredMessage;
-  }
+  public void setRequiredMessage(final javax.el.ValueExpression requiredMessage) ;
 
   /**
    * The component identifier for the input field component inside of the container.
@@ -401,9 +206,7 @@ public class SelectOneChoiceExtensionTag
    */
   @TagAttribute(rtexprvalue = true)
   @UIComponentTagAttribute
-  public void setFieldId(final String fieldId) {
-    this.fieldId = fieldId;
-  }
+  public void setFieldId(final String fieldId) ;
 
   /**
    * The component identifier for this component.
@@ -413,7 +216,5 @@ public class SelectOneChoiceExtensionTag
    */
   @TagAttribute(rtexprvalue = true)
   @UIComponentTagAttribute
-  public void setId(final String id) {
-    super.setId(id);
-  }
+  public void setId(final String id) ;
 }

Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/SelectOneListboxExtensionTag.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/SelectOneListboxExtensionTag.java?rev=1587479&r1=1587478&r2=1587479&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/SelectOneListboxExtensionTag.java (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/extension/SelectOneListboxExtensionTag.java Tue Apr 15 09:13:03 2014
@@ -24,9 +24,6 @@ import org.apache.myfaces.tobago.apt.ann
 import org.apache.myfaces.tobago.apt.annotation.Tag;
 import org.apache.myfaces.tobago.apt.annotation.TagAttribute;
 import org.apache.myfaces.tobago.apt.annotation.UIComponentTagAttribute;
-import org.apache.myfaces.tobago.internal.taglib.SelectOneListboxTag;
-
-import javax.servlet.jsp.JspException;
 
 /**
  * Render a single selection option listbox.
@@ -35,157 +32,7 @@ import javax.servlet.jsp.JspException;
 @ExtensionTag(
     baseClassName = "org.apache.myfaces.tobago.internal.taglib.SelectOneListboxTag",
     faceletHandler = "org.apache.myfaces.tobago.facelets.extension.SelectOneListboxExtensionHandler")
-public class SelectOneListboxExtensionTag extends TobagoExtensionBodyTagSupport {
-  private javax.el.ValueExpression required;
-  private javax.el.ValueExpression value;
-  private javax.el.MethodExpression valueChangeListener;
-  private javax.el.ValueExpression disabled;
-  private javax.el.ValueExpression readonly;
-  private javax.el.ValueExpression onchange;
-  //private javax.el.ValueExpression inline;
-  private javax.el.ValueExpression label;
-  private javax.el.ValueExpression rendered;
-  private javax.el.ValueExpression binding;
-  private javax.el.ValueExpression tip;
-  private javax.el.ValueExpression converter;
-  private javax.el.MethodExpression validator;
-  private javax.el.ValueExpression labelWidth;
-  private javax.el.ValueExpression tabIndex;
-  private javax.el.ValueExpression focus;
-  private javax.el.ValueExpression validatorMessage;
-  private javax.el.ValueExpression converterMessage;
-  private javax.el.ValueExpression requiredMessage;
-  private javax.el.ValueExpression markup;
-  private String fieldId;
-
-  private LabelExtensionTag labelTag;
-  private SelectOneListboxTag selectOneListboxTag;
-
-  @Override
-  public int doStartTag() throws JspException {
-
-    labelTag = new LabelExtensionTag();
-    labelTag.setPageContext(pageContext);
-    labelTag.setRows("*");
-    if (id != null) {
-      labelTag.setId(id);
-    }
-    if (label != null) {
-      labelTag.setValue(label);
-    }
-    if (tip != null) {
-      labelTag.setTip(tip);
-    }
-    if (rendered != null) {
-      labelTag.setRendered(rendered);
-    }
-    if (labelWidth != null) {
-      labelTag.setColumns(createStringValueExpression(labelWidth.getExpressionString() + ";*"));
-    }
-    if (markup != null) {
-      labelTag.setMarkup(markup);
-    }
-    labelTag.setParent(getParent());
-    labelTag.setJspId(nextJspId());
-    labelTag.doStartTag();
-
-    selectOneListboxTag = new SelectOneListboxTag();
-    selectOneListboxTag.setPageContext(pageContext);
-    if (value != null) {
-      selectOneListboxTag.setValue(value);
-    }
-    if (valueChangeListener != null) {
-      selectOneListboxTag.setValueChangeListener(valueChangeListener);
-    }
-    if (binding != null) {
-      selectOneListboxTag.setBinding(binding);
-    }
-    if (onchange != null) {
-      selectOneListboxTag.setOnchange(onchange);
-    }
-    if (validator != null) {
-      selectOneListboxTag.setValidator(validator);
-    }
-    if (converter != null) {
-      selectOneListboxTag.setConverter(converter);
-    }
-    if (disabled != null) {
-      selectOneListboxTag.setDisabled(disabled);
-    }
-    /*if (inline != null) {
-      selectOneListboxTag.setInline(inline);
-    }*/
-    if (focus != null) {
-      selectOneListboxTag.setFocus(focus);
-    }
-    if (fieldId != null) {
-      selectOneListboxTag.setId(fieldId);
-    }
-    if (label != null) {
-      selectOneListboxTag.setLabel(label);
-    }
-    if (readonly != null) {
-      selectOneListboxTag.setReadonly(readonly);
-    }
-    if (required != null) {
-      selectOneListboxTag.setRequired(required);
-    }
-    if (tabIndex != null) {
-      selectOneListboxTag.setTabIndex(tabIndex);
-    }
-    if (validatorMessage != null) {
-      selectOneListboxTag.setValidatorMessage(validatorMessage);
-    }
-    if (converterMessage != null) {
-      selectOneListboxTag.setConverterMessage(converterMessage);
-    }
-    if (requiredMessage != null) {
-      selectOneListboxTag.setRequiredMessage(requiredMessage);
-    }
-    if (markup != null) {
-      selectOneListboxTag.setMarkup(markup);
-    }
-    selectOneListboxTag.setParent(labelTag);
-    selectOneListboxTag.setJspId(nextJspId());
-    selectOneListboxTag.doStartTag();
-
-    return super.doStartTag();
-  }
-
-  @Override
-  public int doEndTag() throws JspException {
-    selectOneListboxTag.doEndTag();
-    labelTag.doEndTag();
-    return super.doEndTag();
-  }
-
-  @Override
-  public void release() {
-    super.release();
-    binding = null;
-    onchange = null;
-    disabled = null;
-    //inline = null;
-    labelWidth = null;
-    label = null;
-    readonly = null;
-    rendered = null;
-    converter = null;
-    validator = null;
-    required = null;
-    tip = null;
-    value = null;
-    valueChangeListener = null;
-    tabIndex = null;
-    selectOneListboxTag = null;
-    labelTag = null;
-    focus = null;
-    validatorMessage = null;
-    converterMessage = null;
-    requiredMessage = null;
-    markup = null;
-    fieldId = null;
-  }
+public interface SelectOneListboxExtensionTag {
 
   /**
    * Flag indicating that a value is required.
@@ -194,62 +41,48 @@ public class SelectOneListboxExtensionTa
    */
   @TagAttribute
   @UIComponentTagAttribute(type = "boolean", defaultValue = "false")
-  public void setRequired(final javax.el.ValueExpression required) {
-    this.required = required;
-  }
+  public void setRequired(final javax.el.ValueExpression required) ;
 
   /**
    * The current value of this component.
    */
   @TagAttribute
   @UIComponentTagAttribute(type = "java.lang.Object")
-  public void setValue(final javax.el.ValueExpression value) {
-    this.value = value;
-  }
+  public void setValue(final javax.el.ValueExpression value) ;
 
   /**
    * MethodExpression representing a value change listener method
    * that will be notified when a new value has been set for this input component.
    * The expression must evaluate to a public method that takes a ValueChangeEvent
    * parameter, with a return type of void.
-   *
-   * @param valueChangeListener
    */
   @TagAttribute
   @UIComponentTagAttribute(
           type = {},
           expression = DynamicExpression.METHOD_EXPRESSION_REQUIRED,
           methodSignature = "javax.faces.event.ValueChangeEvent")
-  public void setValueChangeListener(final javax.el.MethodExpression valueChangeListener) {
-    this.valueChangeListener = valueChangeListener;
-  }
+  public void setValueChangeListener(final javax.el.MethodExpression valueChangeListener) ;
 
   /**
    * Flag indicating that this element is disabled.
    */
   @TagAttribute()
   @UIComponentTagAttribute(type = "boolean", defaultValue = "false")
-  public void setDisabled(final javax.el.ValueExpression disabled) {
-    this.disabled = disabled;
-  }
+  public void setDisabled(final javax.el.ValueExpression disabled) ;
 
   /**
    * Flag indicating that this component will prohibit changes by the user.
    */
   @TagAttribute
   @UIComponentTagAttribute(type = "boolean", defaultValue = "false")
-  public void setReadonly(final javax.el.ValueExpression readonly) {
-    this.readonly = readonly;
-  }
+  public void setReadonly(final javax.el.ValueExpression readonly) ;
 
   /**
    * Clientside script function to add to this component's onchange handler.
    */
   @TagAttribute
   @UIComponentTagAttribute()
-  public void setOnchange(final javax.el.ValueExpression onchange) {
-    this.onchange = onchange;
-  }
+  public void setOnchange(final javax.el.ValueExpression onchange) ;
 
   /**
    * Text value to display as label.
@@ -257,9 +90,7 @@ public class SelectOneListboxExtensionTa
    */
   @TagAttribute
   @UIComponentTagAttribute()
-  public void setLabel(final javax.el.ValueExpression label) {
-    this.label = label;
-  }
+  public void setLabel(final javax.el.ValueExpression label) ;
 
   /**
    * A method binding EL expression,
@@ -271,9 +102,7 @@ public class SelectOneListboxExtensionTa
   @UIComponentTagAttribute(type = {},
       expression = DynamicExpression.METHOD_EXPRESSION,
       methodSignature = { "javax.faces.context.FacesContext", "javax.faces.component.UIComponent", "java.lang.Object" })
-  public void setValidator(final javax.el.MethodExpression validator) {
-    this.validator = validator;
-  }
+  public void setValidator(final javax.el.MethodExpression validator) ;
 
   /**
    * An expression that specifies the Converter for this component.
@@ -287,9 +116,7 @@ public class SelectOneListboxExtensionTa
   @TagAttribute
   @UIComponentTagAttribute(type = "javax.faces.convert.Converter",
       expression = DynamicExpression.VALUE_EXPRESSION)
-  public void setConverter(final javax.el.ValueExpression converter) {
-    this.converter = converter;
-  }
+  public void setConverter(final javax.el.ValueExpression converter) ;
 
   /**
    * Flag indicating whether or not this component should be rendered
@@ -297,9 +124,7 @@ public class SelectOneListboxExtensionTa
    */
   @TagAttribute
   @UIComponentTagAttribute(type = "boolean", defaultValue = "true")
-  public void setRendered(final javax.el.ValueExpression rendered) {
-    this.rendered = rendered;
-  }
+  public void setRendered(final javax.el.ValueExpression rendered) ;
 
   /**
    * The value binding expression linking this
@@ -307,18 +132,14 @@ public class SelectOneListboxExtensionTa
    */
   @TagAttribute
   @UIComponentTagAttribute(type = "javax.faces.component.UIComponent")
-  public void setBinding(final javax.el.ValueExpression binding) {
-    this.binding = binding;
-  }
+  public void setBinding(final javax.el.ValueExpression binding) ;
 
   /**
    * Text value to display as tooltip.
    */
   @TagAttribute
   @UIComponentTagAttribute()
-  public void setTip(final javax.el.ValueExpression tip) {
-    this.tip = tip;
-  }
+  public void setTip(final javax.el.ValueExpression tip) ;
 
   /**
    * The width for the label component. Default: 'auto'.
@@ -327,51 +148,39 @@ public class SelectOneListboxExtensionTa
    */
   @TagAttribute
   @UIComponentTagAttribute()
-  public void setLabelWidth(final javax.el.ValueExpression labelWidth) {
-    this.labelWidth = labelWidth;
-  }
+  public void setLabelWidth(final javax.el.ValueExpression labelWidth) ;
 
   @TagAttribute
   @UIComponentTagAttribute(type = "java.lang.Integer")
-  public void setTabIndex(final javax.el.ValueExpression tabIndex) {
-    this.tabIndex = tabIndex;
-  }
+  public void setTabIndex(final javax.el.ValueExpression tabIndex) ;
 
   /**
    * Flag indicating this component should receive the focus.
    */
   @TagAttribute
   @UIComponentTagAttribute(type = "boolean", defaultValue = "false")
-  public void setFocus(final javax.el.ValueExpression focus) {
-    this.focus = focus;
-  }
+  public void setFocus(final javax.el.ValueExpression focus) ;
 
   /**
    * An expression that specifies the validator message
    */
   @TagAttribute
   @UIComponentTagAttribute()
-  public void setValidatorMessage(final javax.el.ValueExpression validatorMessage) {
-    this.validatorMessage = validatorMessage;
-  }
+  public void setValidatorMessage(final javax.el.ValueExpression validatorMessage) ;
 
   /**
    * An expression that specifies the converter message
    */
   @TagAttribute
   @UIComponentTagAttribute()
-  public void setConverterMessage(final javax.el.ValueExpression converterMessage) {
-    this.converterMessage = converterMessage;
-  }
+  public void setConverterMessage(final javax.el.ValueExpression converterMessage) ;
 
   /**
    * An expression that specifies the required message
    */
   @TagAttribute
   @UIComponentTagAttribute()
-  public void setRequiredMessage(final javax.el.ValueExpression requiredMessage) {
-    this.requiredMessage = requiredMessage;
-  }
+  public void setRequiredMessage(final javax.el.ValueExpression requiredMessage) ;
 
   /**
    * Indicate markup of this component.
@@ -379,9 +188,7 @@ public class SelectOneListboxExtensionTa
    */
   @TagAttribute
   @UIComponentTagAttribute(defaultValue = "none", type = "java.lang.String[]")
-  public void setMarkup(final javax.el.ValueExpression markup) {
-    this.markup = markup;
-  }
+  public void setMarkup(final javax.el.ValueExpression markup) ;
 
   /**
    * The component identifier for the input field component inside of the container.
@@ -389,9 +196,7 @@ public class SelectOneListboxExtensionTa
    */
   @TagAttribute(rtexprvalue = true)
   @UIComponentTagAttribute
-  public void setFieldId(final String fieldId) {
-    this.fieldId = fieldId;
-  }
+  public void setFieldId(final String fieldId) ;
 
   /**
    * The component identifier for this component.
@@ -401,7 +206,5 @@ public class SelectOneListboxExtensionTa
    */
   @TagAttribute(rtexprvalue = true)
   @UIComponentTagAttribute
-  public void setId(final String id) {
-    super.setId(id);
-  }
+  public void setId(final String id) ;
 }