You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@beehive.apache.org by ek...@apache.org on 2005/08/16 02:41:53 UTC
svn commit: r232919 - in
/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui:
databinding/datagrid/runtime/model/cell/
databinding/datagrid/runtime/rendering/cell/ tags/databinding/datagrid/
Author: ekoneil
Date: Mon Aug 15 17:41:45 2005
New Revision: 232919
URL: http://svn.apache.org/viewcvs?rev=232919&view=rev
Log:
Fix for BEEHIVE-886. This change does a couple of things:
- changes the type of the setValue(...) attribute setter on the data grid *Cell tags from String to Object. Since this is widening, there shouldn't be any back-compat issue.
- adds a setValue(Object) method to the HeaderCell. This functions like the "value" attribute of the rest of the *Cell tags and has been a hole for a while now
- changes the *Decorator implementation classes to check model.getValue() for null and render the toString'ed or formatted result if the value is non-null.
BB: self
DRT: NetUI pass
BVT: NetUI pass
Modified:
beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/model/cell/AnchorCellModel.java
beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/model/cell/HeaderCellModel.java
beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/model/cell/SpanCellModel.java
beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/rendering/cell/AnchorCellDecorator.java
beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/rendering/cell/HeaderCellDecorator.java
beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/AnchorCell.java
beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/HeaderCell.java
beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/SpanCell.java
Modified: beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/model/cell/AnchorCellModel.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/model/cell/AnchorCellModel.java?rev=232919&r1=232918&r2=232919&view=diff
==============================================================================
--- beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/model/cell/AnchorCellModel.java (original)
+++ beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/model/cell/AnchorCellModel.java Mon Aug 15 17:41:45 2005
@@ -30,7 +30,7 @@
extends CellModel {
private String _linkName = null;
- private String _value = null;
+ private Object _value = null;
private String _href = null;
private String _scopeId = null;
private String _action = null;
@@ -38,11 +38,11 @@
private HashMap _params = null;
private AnchorTag.State _anchorState = new AnchorTag.State();
- public String getValue() {
+ public Object getValue() {
return _value;
}
- public void setValue(String value) {
+ public void setValue(Object value) {
_value = value;
}
Modified: beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/model/cell/HeaderCellModel.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/model/cell/HeaderCellModel.java?rev=232919&r1=232918&r2=232919&view=diff
==============================================================================
--- beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/model/cell/HeaderCellModel.java (original)
+++ beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/model/cell/HeaderCellModel.java Mon Aug 15 17:41:45 2005
@@ -25,7 +25,7 @@
public class HeaderCellModel
extends CellModel {
- private String _headerText = null;
+ private Object _value = null;
private String _bodyContent = null;
private String _scopeId = null;
@@ -120,19 +120,19 @@
return _filterExpression != null;
}
- public String getHeaderText() {
- return _headerText;
- }
-
- public void setHeaderText(String headerText) {
- _headerText = headerText;
- }
-
public String getBodyContent() {
return _bodyContent;
}
public void setBodyContent(String bodyContent) {
_bodyContent = bodyContent;
+ }
+
+ public void setValue(Object value) {
+ _value = value;
+ }
+
+ public Object getValue() {
+ return _value;
}
}
Modified: beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/model/cell/SpanCellModel.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/model/cell/SpanCellModel.java?rev=232919&r1=232918&r2=232919&view=diff
==============================================================================
--- beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/model/cell/SpanCellModel.java (original)
+++ beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/model/cell/SpanCellModel.java Mon Aug 15 17:41:45 2005
@@ -29,15 +29,15 @@
private static final SpanTag.State DEFAULT_SPAN_STATE = new SpanTag.State();
- private String _value = null;
+ private Object _value = null;
private String _javascript = null;
private SpanTag.State _spanState = new SpanTag.State();
- public String getValue() {
+ public Object getValue() {
return _value;
}
- public void setValue(String value) {
+ public void setValue(Object value) {
_value = value;
}
Modified: beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/rendering/cell/AnchorCellDecorator.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/rendering/cell/AnchorCellDecorator.java?rev=232919&r1=232918&r2=232919&view=diff
==============================================================================
--- beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/rendering/cell/AnchorCellDecorator.java (original)
+++ beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/rendering/cell/AnchorCellDecorator.java Mon Aug 15 17:41:45 2005
@@ -78,7 +78,10 @@
anchorTag.doStartTag(appender, anchorState);
spanTag.doStartTag(appender, spanState);
- appender.append(anchorCellModel.getValue());
+
+ if(anchorCellModel.getValue() != null)
+ appender.append(anchorCellModel.getValue().toString());
+
spanTag.doEndTag(appender);
anchorTag.doEndTag(appender);
Modified: beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/rendering/cell/HeaderCellDecorator.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/rendering/cell/HeaderCellDecorator.java?rev=232919&r1=232918&r2=232919&view=diff
==============================================================================
--- beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/rendering/cell/HeaderCellDecorator.java (original)
+++ beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/rendering/cell/HeaderCellDecorator.java Mon Aug 15 17:41:45 2005
@@ -39,8 +39,9 @@
assert cellModel instanceof HeaderCellModel;
HeaderCellModel headerCellModel = (HeaderCellModel)cellModel;
- if(headerCellModel.getHeaderText() != null)
- appender.append(headerCellModel.getHeaderText());
+ /* todo: formatting doesn't work on header cell values */
+ if(headerCellModel.getValue() != null)
+ appender.append(headerCellModel.getValue().toString());
/* todo: should convert this over to using the HtmlConstants rendering support */
else appender.append(" ");
Modified: beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/AnchorCell.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/AnchorCell.java?rev=232919&r1=232918&r2=232919&view=diff
==============================================================================
--- beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/AnchorCell.java (original)
+++ beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/AnchorCell.java Mon Aug 15 17:41:45 2005
@@ -399,7 +399,7 @@
* @jsptagref.attributesyntaxvalue <i>string_value</i>
* @netui:attribute required="true" rtexprvalue="true"
*/
- public void setValue(String value) {
+ public void setValue(Object value) {
_anchorCellModel.setValue(value);
}
Modified: beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/HeaderCell.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/HeaderCell.java?rev=232919&r1=232918&r2=232919&view=diff
==============================================================================
--- beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/HeaderCell.java (original)
+++ beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/HeaderCell.java Mon Aug 15 17:41:45 2005
@@ -151,7 +151,7 @@
DECORATOR_HEADER_SORTED = new SortedCellDecorator(DECORATOR_HEADER_DEFAULT);
}
- private String _headerText = null;
+ private Object _headerValue = null;
private ThTag.State _cellState = new ThTag.State();
private HeaderCellModel _headerCellModel = new HeaderCellModel();
private CellDecorator _cellDecorator = null;
@@ -165,10 +165,11 @@
}
/**
- * Sets the text to render for this table header cell. This text will be rendered inside of the
+ * Sets the String text to render for this table header cell. This text will be rendered inside of the
* <th> tags.
*
* @param headerText The text to render.
+ * @deprecated
* @jsptagref.attributedescription
* Sets the text to render for this table header cell. This text will be rendered inside of the
* <th> tags.
@@ -177,7 +178,23 @@
* description="The text to render inside of the HTML th tag."
*/
public void setHeaderText(String headerText) {
- _headerText = headerText;
+ _headerValue = headerText;
+ }
+
+ /**
+ * Sets the Object value to render for this table header cell. This text will be rendered inside of the
+ * <th> tags. This value will be formatted when formatters are applied to header cells.
+ *
+ * @param value The text to format and render
+ * @deprecated
+ * @jsptagref.attributedescription
+ * Sets the value to format and render for this table header cell.
+ * @jsptagref.attributesyntaxvalue <i>object_headerText</i>
+ * @netui:attribute required="false" rtexprvalue="true"
+ * description="The value to format and render inside of the HTML th tag."
+ */
+ public void setValue(Object value) {
+ _headerValue = value;
}
/**
@@ -820,13 +837,13 @@
protected void renderHeaderCellContents(AbstractRenderAppender appender, String jspFragmentOutput)
throws IOException, JspException {
- if(_headerText == null) {
+ if(_headerValue == null) {
appender.append(jspFragmentOutput);
}
else {
_headerCellModel.setDataGridTagModel(DataGridUtil.getDataGridTagModel(getJspContext()));
_headerCellModel.setBodyContent(jspFragmentOutput);
- _headerCellModel.setHeaderText(_headerText);
+ _headerCellModel.setValue(_headerValue);
getCellDecorator().decorate(getJspContext(), appender, _headerCellModel);
}
Modified: beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/SpanCell.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/SpanCell.java?rev=232919&r1=232918&r2=232919&view=diff
==============================================================================
--- beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/SpanCell.java (original)
+++ beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/SpanCell.java Mon Aug 15 17:41:45 2005
@@ -303,7 +303,7 @@
* @jsptagref.attributedescription The value of the visible text rendered inside of the HTML span.
* @netui:attribute required="true" rtexprvalue="true"
*/
- public void setValue(String value) {
+ public void setValue(Object value) {
_spanCellModel.setValue(value);
}