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 2007/11/30 23:49:44 UTC
svn commit: r600001 - in
/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/extension:
SelectBooleanCheckboxExtensionTag.java SelectManyListboxExtensionTag.java
SelectOneChoiceExtensionTag.java SelectOneListboxExtensionTag.java
Author: bommel
Date: Fri Nov 30 14:49:43 2007
New Revision: 600001
URL: http://svn.apache.org/viewvc?rev=600001&view=rev
Log:
(TOBAGO-563) Add missing focus attribute to some extensions tags (tx)
Modified:
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/extension/SelectBooleanCheckboxExtensionTag.java
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/extension/SelectManyListboxExtensionTag.java
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/extension/SelectOneChoiceExtensionTag.java
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/extension/SelectOneListboxExtensionTag.java
Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/extension/SelectBooleanCheckboxExtensionTag.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/extension/SelectBooleanCheckboxExtensionTag.java?rev=600001&r1=600000&r2=600001&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/extension/SelectBooleanCheckboxExtensionTag.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/extension/SelectBooleanCheckboxExtensionTag.java Fri Nov 30 14:49:43 2007
@@ -33,13 +33,13 @@
import org.apache.myfaces.tobago.taglib.decl.HasValueChangeListener;
import org.apache.myfaces.tobago.taglib.decl.IsDisabled;
import org.apache.myfaces.tobago.taglib.decl.IsReadonly;
+//import org.apache.myfaces.tobago.taglib.decl.IsRequired;
+import org.apache.myfaces.tobago.taglib.decl.IsFocus;
import javax.servlet.jsp.JspException;
import javax.servlet.jsp.tagext.BodyTagSupport;
/*
- * Created by IntelliJ IDEA.
- * User: bommel
* Date: Oct 7, 2006
* Time: 9:13:21 AM
*/
@@ -50,7 +50,8 @@
@ExtensionTag(baseClassName = "org.apache.myfaces.tobago.taglib.component.SelectBooleanCheckboxTag")
public class SelectBooleanCheckboxExtensionTag extends BodyTagSupport implements TobagoTagDeclaration,
HasValidator, HasOnchange, HasValueChangeListener, HasIdBindingAndRendered, HasLabel,
- HasBooleanValue, HasLabelWidth, IsDisabled, HasTip, IsReadonly, HasMarkup, HasTabIndex {
+ HasBooleanValue, HasLabelWidth, IsDisabled, HasTip, IsReadonly, HasMarkup, HasTabIndex, //IsRequired
+ IsFocus {
private String value;
private String valueChangeListener;
@@ -66,6 +67,8 @@
private String labelWidth;
private String markup;
private String tabIndex;
+ //private String required;
+ private String focus;
private LabelExtensionTag labelTag;
private SelectBooleanCheckboxTag selectBooleanCheckboxTag;
@@ -129,9 +132,17 @@
selectBooleanCheckboxTag.setReadonly(readonly);
}
+ if (focus != null) {
+ selectBooleanCheckboxTag.setFocus(focus);
+ }
+
//if (required != null) {
// selectBooleanCheckboxTag.setRequired(required);
//}
+ // TODO item Label
+ //if (itemLabel != null) {
+ // selectOneRadioTag.setLabel(itemLabel);
+ //}
if (markup != null) {
selectBooleanCheckboxTag.setMarkup(markup);
@@ -169,6 +180,10 @@
valueChangeListener = null;
markup = null;
tabIndex = null;
+ focus = null;
+ //required = null;
+ selectBooleanCheckboxTag = null;
+ labelTag = null;
}
public void setValue(String value) {
@@ -195,7 +210,6 @@
this.label = label;
}
-
public void setValidator(String validator) {
this.validator = validator;
}
@@ -227,4 +241,12 @@
public void setTabIndex(String tabIndex) {
this.tabIndex = tabIndex;
}
+
+ public void setFocus(String focus) {
+ this.focus = focus;
+ }
+
+ //public void setRequired(String required) {
+ // this.required = required;
+ //}
}
Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/extension/SelectManyListboxExtensionTag.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/extension/SelectManyListboxExtensionTag.java?rev=600001&r1=600000&r2=600001&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/extension/SelectManyListboxExtensionTag.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/extension/SelectManyListboxExtensionTag.java Fri Nov 30 14:49:43 2007
@@ -34,6 +34,7 @@
import org.apache.myfaces.tobago.taglib.decl.HasValue;
import org.apache.myfaces.tobago.taglib.decl.HasValueChangeListener;
import org.apache.myfaces.tobago.taglib.decl.IsDisabled;
+import org.apache.myfaces.tobago.taglib.decl.IsFocus;
import org.apache.myfaces.tobago.taglib.decl.IsInline;
import org.apache.myfaces.tobago.taglib.decl.IsReadonly;
import org.apache.myfaces.tobago.taglib.decl.IsRendered;
@@ -58,7 +59,7 @@
public class SelectManyListboxExtensionTag extends BodyTagSupport
implements HasId, HasValue, HasValueChangeListener, IsDisabled, HasDeprecatedHeight, IsInline,
HasLabel, HasLabelWidth, IsRendered, HasBinding, HasTip, HasConverter, HasValidator, HasOnchange,
- IsReadonly, HasMarkup, IsRequired, HasTabIndex {
+ IsReadonly, HasMarkup, IsFocus, IsRequired, HasTabIndex {
private String required;
private String value;
@@ -77,6 +78,7 @@
private String labelWidth;
private String markup;
private String tabIndex;
+ private String focus;
private LabelExtensionTag labelTag;
private SelectManyListboxTag selectManyListboxTag;
@@ -133,7 +135,10 @@
selectManyListboxTag.setDisabled(disabled);
}
if (inline != null) {
- selectManyListboxTag.setFocus(inline);
+ selectManyListboxTag.setInline(inline);
+ }
+ if (focus != null) {
+ selectManyListboxTag.setFocus(focus);
}
if (id != null) {
selectManyListboxTag.setId(id);
@@ -188,6 +193,7 @@
tabIndex = null;
selectManyListboxTag = null;
labelTag = null;
+ focus = null;
}
public void setRequired(String required) {
@@ -256,5 +262,9 @@
public void setTabIndex(String tabIndex) {
this.tabIndex = tabIndex;
+ }
+
+ public void setFocus(String focus) {
+ this.focus = focus;
}
}
Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/extension/SelectOneChoiceExtensionTag.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/extension/SelectOneChoiceExtensionTag.java?rev=600001&r1=600000&r2=600001&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/extension/SelectOneChoiceExtensionTag.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/extension/SelectOneChoiceExtensionTag.java Fri Nov 30 14:49:43 2007
@@ -32,6 +32,7 @@
import org.apache.myfaces.tobago.taglib.decl.HasValue;
import org.apache.myfaces.tobago.taglib.decl.HasValueChangeListener;
import org.apache.myfaces.tobago.taglib.decl.IsDisabled;
+import org.apache.myfaces.tobago.taglib.decl.IsFocus;
import org.apache.myfaces.tobago.taglib.decl.IsInline;
import org.apache.myfaces.tobago.taglib.decl.IsReadonly;
import org.apache.myfaces.tobago.taglib.decl.IsRendered;
@@ -50,7 +51,7 @@
extends BodyTagSupport
implements HasId, HasValue, HasValueChangeListener, IsDisabled,
IsReadonly, HasOnchange, IsInline, HasLabel, HasLabelWidth, IsRequired,
- IsRendered, HasBinding, HasTip , HasValidator, HasConverter, HasTabIndex {
+ IsRendered, IsFocus, HasBinding, HasTip , HasValidator, HasConverter, HasTabIndex {
private String required;
private String value;
@@ -67,6 +68,7 @@
private String converter;
private String labelWidth;
private String tabIndex;
+ private String focus;
private LabelExtensionTag labelTag;
private SelectOneChoiceTag selectOneChoiceTag;
@@ -116,7 +118,10 @@
}
if (inline != null) {
- selectOneChoiceTag.setFocus(inline);
+ selectOneChoiceTag.setInline(inline);
+ }
+ if (focus != null) {
+ selectOneChoiceTag.setFocus(focus);
}
if (id != null) {
selectOneChoiceTag.setId(id);
@@ -163,6 +168,7 @@
tabIndex = null;
selectOneChoiceTag = null;
labelTag = null;
+ focus = null;
}
public void setRequired(String required) {
@@ -223,5 +229,9 @@
public void setTabIndex(String tabIndex) {
this.tabIndex = tabIndex;
+ }
+
+ public void setFocus(String focus) {
+ this.focus = focus;
}
}
Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/extension/SelectOneListboxExtensionTag.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/extension/SelectOneListboxExtensionTag.java?rev=600001&r1=600000&r2=600001&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/extension/SelectOneListboxExtensionTag.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/extension/SelectOneListboxExtensionTag.java Fri Nov 30 14:49:43 2007
@@ -33,6 +33,7 @@
import org.apache.myfaces.tobago.taglib.decl.HasValue;
import org.apache.myfaces.tobago.taglib.decl.HasValueChangeListener;
import org.apache.myfaces.tobago.taglib.decl.IsDisabled;
+import org.apache.myfaces.tobago.taglib.decl.IsFocus;
import org.apache.myfaces.tobago.taglib.decl.IsReadonly;
import org.apache.myfaces.tobago.taglib.decl.IsRendered;
import org.apache.myfaces.tobago.taglib.decl.IsRequired;
@@ -40,12 +41,6 @@
import javax.servlet.jsp.JspException;
import javax.servlet.jsp.tagext.BodyTagSupport;
-/*
- * Created by IntelliJ IDEA.
- * User: bommel
- * Date: 17.12.2005
- * Time: 08:24:21
- */
/**
* Render a single selection option listbox.
*/
@@ -54,7 +49,7 @@
public class SelectOneListboxExtensionTag
extends BodyTagSupport implements HasId, HasValue, HasValueChangeListener, IsDisabled,
HasLabel, HasLabelWidth, IsReadonly, HasOnchange, IsRendered,
- HasBinding, HasDeprecatedHeight, HasTip , IsRequired, HasConverter, HasValidator, HasTabIndex {
+ HasBinding, HasDeprecatedHeight, IsFocus, HasTip , IsRequired, HasConverter, HasValidator, HasTabIndex {
private String required;
private String value;
private String valueChangeListener;
@@ -71,6 +66,7 @@
private String validator;
private String labelWidth;
private String tabIndex;
+ private String focus;
private LabelExtensionTag labelTag;
private SelectOneListboxTag selectOneListboxTag;
@@ -120,7 +116,10 @@
selectOneListboxTag.setDisabled(disabled);
}
if (inline != null) {
- selectOneListboxTag.setFocus(inline);
+ selectOneListboxTag.setInline(inline);
+ }
+ if (focus != null) {
+ selectOneListboxTag.setFocus(focus);
}
if (id != null) {
selectOneListboxTag.setId(id);
@@ -171,6 +170,7 @@
tabIndex = null;
selectOneListboxTag = null;
labelTag = null;
+ focus = null;
}
public void setRequired(String required) {
@@ -235,5 +235,9 @@
public void setTabIndex(String tabIndex) {
this.tabIndex = tabIndex;
+ }
+
+ public void setFocus(String focus) {
+ this.focus = focus;
}
}