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/02/01 08:34:31 UTC
svn commit: r502145 - in
/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago:
component/UISelectMany.java taglib/component/SelectManyTag.java
taglib/component/SelectManyTagDeclaration.java
taglib/extension/SelectManyListboxExtensionTag.java
Author: bommel
Date: Wed Jan 31 23:34:30 2007
New Revision: 502145
URL: http://svn.apache.org/viewvc?view=rev&rev=502145
Log:
(TOBAGO-215) markup attribute for all input components (selectMany)
Modified:
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/UISelectMany.java
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/SelectManyTag.java
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/SelectManyTagDeclaration.java
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/extension/SelectManyListboxExtensionTag.java
Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/UISelectMany.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/UISelectMany.java?view=diff&rev=502145&r1=502144&r2=502145
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/UISelectMany.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/UISelectMany.java Wed Jan 31 23:34:30 2007
@@ -28,11 +28,38 @@
* Date: May 31, 2005
* Time: 7:47:11 PM
*/
-public class UISelectMany extends javax.faces.component.UISelectMany {
+public class UISelectMany extends javax.faces.component.UISelectMany implements SupportsMarkup {
private static final Log LOG = LogFactory.getLog(UISelectMany.class);
public static final String COMPONENT_TYPE = "org.apache.myfaces.tobago.SelectMany";
+
+ private String[] markup;
+
+ public void restoreState(FacesContext context, Object state) {
+ Object[] values = (Object[]) state;
+ super.restoreState(context, values[0]);
+ markup = (String[]) values[1];
+ }
+
+ public Object saveState(FacesContext context) {
+ Object[] values = new Object[2];
+ values[0] = super.saveState(context);
+ values[1] = markup;
+ return values;
+ }
+
+ public String[] getMarkup() {
+ if (markup != null) {
+ return markup;
+ }
+ return ComponentUtil.getMarkupBinding(getFacesContext(), this);
+ }
+
+ public void setMarkup(String[] markup) {
+ this.markup = markup;
+ }
+
public void encodeBegin(FacesContext facesContext) throws IOException {
// TODO change this should be renamed to DimensionUtils.prepare!!!
Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/SelectManyTag.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/SelectManyTag.java?view=diff&rev=502145&r1=502144&r2=502145
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/SelectManyTag.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/SelectManyTag.java Wed Jan 31 23:34:30 2007
@@ -17,7 +17,10 @@
* limitations under the License.
*/
+import org.apache.myfaces.tobago.component.ComponentUtil;
+
import javax.faces.component.UISelectMany;
+import javax.faces.component.UIComponent;
/**
* User: weber
@@ -27,7 +30,24 @@
public class SelectManyTag extends InputTag implements SelectManyTagDeclaration {
+ private String markup;
+
public String getComponentType() {
return UISelectMany.COMPONENT_TYPE;
}
+
+ public void release() {
+ super.release();
+ markup = null;
+ }
+
+ protected void setProperties(UIComponent component) {
+ super.setProperties(component);
+ ComponentUtil.setMarkup(component, markup);
+ }
+
+ public void setMarkup(String markup) {
+ this.markup = markup;
+ }
+
}
Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/SelectManyTagDeclaration.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/SelectManyTagDeclaration.java?view=diff&rev=502145&r1=502144&r2=502145
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/SelectManyTagDeclaration.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/SelectManyTagDeclaration.java Wed Jan 31 23:34:30 2007
@@ -17,12 +17,14 @@
* limitations under the License.
*/
-/**
+import org.apache.myfaces.tobago.taglib.decl.HasMarkup;
+
+/*
* Created: Aug 5, 2005 5:22:44 PM
* User: bommel
* $Id: $
*/
-public interface SelectManyTagDeclaration extends InputTagDeclaration {
+public interface SelectManyTagDeclaration extends InputTagDeclaration, HasMarkup {
}
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?view=diff&rev=502145&r1=502144&r2=502145
==============================================================================
--- 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 Wed Jan 31 23:34:30 2007
@@ -34,6 +34,7 @@
import org.apache.myfaces.tobago.taglib.decl.HasValueChangeListener;
import org.apache.myfaces.tobago.taglib.decl.IsReadonly;
import org.apache.myfaces.tobago.taglib.decl.HasLabelWidth;
+import org.apache.myfaces.tobago.taglib.decl.HasMarkup;
import javax.servlet.jsp.JspException;
import javax.servlet.jsp.tagext.BodyTagSupport;
@@ -52,7 +53,8 @@
@Tag(name = "selectManyListbox")
public class SelectManyListboxExtensionTag extends BodyTagSupport
implements HasId, HasValue, HasValueChangeListener, IsDisabled, HasDeprecatedHeight, IsInline,
- HasLabel, HasLabelWidth, IsRendered, HasBinding, HasTip, HasConverter, HasValidator, HasOnchange, IsReadonly {
+ HasLabel, HasLabelWidth, IsRendered, HasBinding, HasTip, HasConverter, HasValidator, HasOnchange, IsReadonly,
+ HasMarkup {
private String required;
private String value;
@@ -69,6 +71,7 @@
private String converter;
private String validator;
private String labelWidth;
+ private String markup;
private LabelExtensionTag labelTag;
private SelectManyListboxTag selectManyListboxTag;
@@ -138,6 +141,9 @@
if (required != null) {
selectManyListboxTag.setRequired(required);
}
+ if (markup != null) {
+ selectManyListboxTag.setMarkup(markup);
+ }
selectManyListboxTag.setParent(labelTag);
selectManyListboxTag.doStartTag();
@@ -169,6 +175,7 @@
tip = null;
value = null;
valueChangeListener = null;
+ markup = null;
}
public void setRequired(String required) {
@@ -229,5 +236,9 @@
public void setLabelWidth(String labelWidth) {
this.labelWidth = labelWidth;
+ }
+
+ public void setMarkup(String markup) {
+ this.markup = markup;
}
}