Author: ekoneil
Date: Sat Jan 22 14:21:23 2005
New Revision: 126164
URL: http://svn.apache.org/viewcvs?view=rev&rev=126164
Log:
Data grid work.
- rename "Literal*" to "Span*". Just makes more sense that way.
- fix a bug with applying formatters where the last formatter always won. Now,
all formatters are applied.
- add a test of this
- remove ParameterUtil
- add support for setting HTML attributes on <td>s for data cells
- add a bunch of HTML anchor specific attributes to the AnchorColumn
- perf fix in the ImageColumn. Keep a reference to the ImageTag.State object
rather than looking it up every time
BB: self
DRT: NetUI pass / datagrid pass
Added:
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/model/cell/SpanCellModel.java
- copied, changed from r126037,
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/model/cell/LiteralCellModel.java
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/rendering/cell/SpanCellDecorator.java
- copied, changed from r126037,
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/rendering/cell/LiteralCellDecorator.java
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/SpanColumn.java
- copied, changed from r126037,
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/LiteralColumn.java
Removed:
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/model/cell/LiteralCellModel.java
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/rendering/cell/LiteralCellDecorator.java
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/util/ParameterUtil.java
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/LiteralColumn.java
Modified:
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/model/CellModel.java
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/model/PagerModel.java
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/model/cell/AnchorCellModel.java
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/AbstractHtmlColumn.java
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/AnchorColumn.java
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/ImageColumn.java
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/databinding/datagrid/basic/index.jsp
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/databinding/datagrid/caption/index.jsp
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/databinding/datagrid/footer/index.jsp
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/databinding/datagrid/header/index.jsp
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/databinding/datagrid/misc/customHeaderStyle.jsp
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/databinding/datagrid/misc/disabledPagerNPE.jsp
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/databinding/datagrid/misc/emptyColumnsTag.jsp
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/databinding/datagrid/misc/nestedJstl.jsp
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/databinding/datagrid/misc/onclick.jsp
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/databinding/datagrid/misc/stickyPagerParam.jsp
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/databinding/datagrid/misc/stylePrefix.jsp
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/databinding/datagrid/misc/userAttributes.jsp
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/databinding/datagrid/model/index.jsp
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/databinding/datagrid/pager/basic/index.jsp
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/databinding/datagrid/pager/customselect/index.jsp
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/databinding/datagrid/pager/empty/index.jsp
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/databinding/datagrid/pager/incaption/index.jsp
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/databinding/datagrid/pager/infooter/index.jsp
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/databinding/datagrid/scriptlettagfile/index.jsp
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/databinding/datagrid/simplesort/index.jsp
incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/config/testRecorder-tests.xml
Modified:
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/model/CellModel.java
Url:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/model/CellModel.java?view=diff&rev=126164&p1=incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/model/CellModel.java&r1=126163&p2=incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/model/CellModel.java&r2=126164
==============================================================================
---
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/model/CellModel.java
(original)
+++
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/model/CellModel.java
Sat Jan 22 14:21:23 2005
@@ -74,12 +74,13 @@
if(_formatters == null)
return value.toString();
- Object formatted = null;
+ Object formatted = value;
for(Formatter formatter : _formatters) {
assert formatter != null;
try {
- formatted = formatter.format(value);
+ formatted = formatter.format(formatted);
} catch(JspException e) {
+ e.printStackTrace();
/* todo: error reporting */
if(LOGGER.isErrorEnabled())
LOGGER.error("A formatter of type \"" +
formatter.getClass().getName() + "\" threw an exception " + e, e);
@@ -87,7 +88,6 @@
}
assert formatted != null;
-
return formatted.toString();
}
}
Modified:
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/model/PagerModel.java
Url:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/model/PagerModel.java?view=diff&rev=126164&p1=incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/model/PagerModel.java&r1=126163&p2=incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/model/PagerModel.java&r2=126164
==============================================================================
---
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/model/PagerModel.java
(original)
+++
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/model/PagerModel.java
Sat Jan 22 14:21:23 2005
@@ -17,12 +17,6 @@
*/
package org.apache.beehive.netui.databinding.datagrid.model;
-import java.util.HashMap;
-import java.util.Map;
-
-import org.apache.beehive.netui.databinding.datagrid.services.pager.PagerCodec;
-import org.apache.beehive.netui.databinding.datagrid.util.ParameterUtil;
-
/**
*
*/
@@ -41,7 +35,7 @@
private Integer _currentRow = null;
private Integer _dataSetSize = null;
private Integer _lastPage = null;
-
+
private int _prevPage = -1;
private int _nextPage = -1;
Modified:
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/model/cell/AnchorCellModel.java
Url:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/model/cell/AnchorCellModel.java?view=diff&rev=126164&p1=incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/model/cell/AnchorCellModel.java&r1=126163&p2=incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/model/cell/AnchorCellModel.java&r2=126164
==============================================================================
---
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/model/cell/AnchorCellModel.java
(original)
+++
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/model/cell/AnchorCellModel.java
Sat Jan 22 14:21:23 2005
@@ -33,6 +33,7 @@
super();
}
+ private String _linkName = null;
private String _value = null;
private String _href = null;
private String _scopeId = null;
@@ -90,4 +91,12 @@
public void setAnchorState(State anchorState) {
_anchorState = anchorState;
}
+
+ public String getLinkName() {
+ return _linkName;
+ }
+
+ public void setLinkName(String linkName) {
+ _linkName = linkName;
+ }
}
Deleted:
/incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/model/cell/LiteralCellModel.java
Url:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/model/cell/LiteralCellModel.java?view=auto&rev=126163
==============================================================================
Copied:
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/model/cell/SpanCellModel.java
(from r126037,
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/model/cell/LiteralCellModel.java)
Url:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/model/cell/SpanCellModel.java?view=diff&rev=126164&p1=incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/model/cell/LiteralCellModel.java&r1=126037&p2=incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/model/cell/SpanCellModel.java&r2=126164
==============================================================================
---
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/model/cell/LiteralCellModel.java
(original)
+++
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/model/cell/SpanCellModel.java
Sat Jan 22 14:21:23 2005
@@ -24,7 +24,7 @@
/**
*
*/
-public class LiteralCellModel
+public class SpanCellModel
extends CellModel {
private static final SpanTag.State DEFAULT_SPAN_STATE = new
SpanTag.State();
Deleted:
/incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/rendering/cell/LiteralCellDecorator.java
Url:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/rendering/cell/LiteralCellDecorator.java?view=auto&rev=126163
==============================================================================
Copied:
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/rendering/cell/SpanCellDecorator.java
(from r126037,
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/rendering/cell/LiteralCellDecorator.java)
Url:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/rendering/cell/SpanCellDecorator.java?view=diff&rev=126164&p1=incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/rendering/cell/LiteralCellDecorator.java&r1=126037&p2=incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/rendering/cell/SpanCellDecorator.java&r2=126164
==============================================================================
---
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/rendering/cell/LiteralCellDecorator.java
(original)
+++
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/rendering/cell/SpanCellDecorator.java
Sat Jan 22 14:21:23 2005
@@ -23,25 +23,24 @@
import org.apache.beehive.netui.tags.rendering.AbstractRenderAppender;
import org.apache.beehive.netui.tags.rendering.TagRenderingBase;
import org.apache.beehive.netui.databinding.datagrid.model.CellModel;
-import
org.apache.beehive.netui.databinding.datagrid.model.cell.LiteralCellModel;
+import org.apache.beehive.netui.databinding.datagrid.model.cell.SpanCellModel;
import org.apache.beehive.netui.databinding.datagrid.util.JspUtil;
/**
*
*/
-public class LiteralCellDecorator
+public class SpanCellDecorator
extends CellDecorator {
public void decorate(JspContext jspContext, AbstractRenderAppender
appender, CellModel cellModel)
throws CellDecoratorException {
- assert cellModel instanceof LiteralCellModel;
- LiteralCellModel literalColumnModel = (LiteralCellModel)cellModel;
+ assert cellModel instanceof SpanCellModel;
+ SpanCellModel literalColumnModel = (SpanCellModel)cellModel;
HttpServletRequest request = JspUtil.getRequest(jspContext);
TagRenderingBase span =
TagRenderingBase.Factory.getRendering(TagRenderingBase.SPAN_TAG, request);
- /* todo: need to support formatting here */
String formatted = cellModel.formatText(literalColumnModel.getValue());
span.doStartTag(appender, literalColumnModel.getSpanState());
Deleted:
/incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/util/ParameterUtil.java
Url:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/util/ParameterUtil.java?view=auto&rev=126163
==============================================================================
Modified:
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/AbstractHtmlColumn.java
Url:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/AbstractHtmlColumn.java?view=diff&rev=126164&p1=incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/AbstractHtmlColumn.java&r1=126163&p2=incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/AbstractHtmlColumn.java&r2=126164
==============================================================================
---
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/AbstractHtmlColumn.java
(original)
+++
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/AbstractHtmlColumn.java
Sat Jan 22 14:21:23 2005
@@ -38,7 +38,7 @@
import org.apache.beehive.netui.util.Bundle;
/**
- * TODO: need to support <netui:attribute> tags for the header table cell
+ *
*/
public abstract class AbstractHtmlColumn
extends AbstractColumn
@@ -46,6 +46,8 @@
private static final String HEADER_FACET_NAME = "header";
private static final String DEFAULT_FACET_NAME = "default";
+ private static final String CELL_FACET_NAME = "cell";
+
private static final CellDecorator DEFAULT_HEADER_RENDERER;
private static final CellDecorator SORTED_HEADER_RENDERER;
@@ -56,7 +58,6 @@
private TdTag.State _tdState = new TdTag.State();
private ThTag.State _thState = new ThTag.State();
-
private HeaderCellModel _headerCellModel = new HeaderCellModel();
/**
@@ -308,6 +309,13 @@
internalGetHtmlState().registerAttribute(AbstractHtmlState.ATTR_GENERAL,
HtmlConstants.TITLE, title);
}
+ /* --------------------------------------------------------------
+ *
+ * <th> attributes
+ *
+ * --------------------------------------------------------------
+ */
+
/**
* Sets the onClick javascript event.
*
@@ -494,6 +502,199 @@
internalGetThState().registerAttribute(AbstractHtmlState.ATTR_GENERAL,
HtmlConstants.TITLE, title);
}
+ /* --------------------------------------------------------------
+ *
+ * <td> attributes
+ *
+ * --------------------------------------------------------------
+ */
+
+ /**
+ * Sets the onClick javascript event.
+ *
+ * @param onClick - the onClick event.
+ * @jsptagref.attributedescription The onClick JavaScript event.
+ * @jsptagref.databindable false
+ * @jsptagref.attributesyntaxvalue <i>string_onClick</i>
+ * @netui:attribute required="false" rtexprvalue="true" description="The
onClick JavaScript event."
+ * @netui.tldx:attribute
propertyclass="workshop.jspdesigner.properties.EventPropertyClass"
category="event"
+ */
+ public void setCellOnClick(String onClick) {
+
internalGetTdState().registerAttribute(AbstractHtmlState.ATTR_JAVASCRIPT,
HtmlConstants.ONCLICK, onClick);
+ }
+
+ /**
+ * Sets the onDblClick javascript event.
+ *
+ * @param onDblClick - the onDblClick event.
+ * @jsptagref.attributedescription The onDblClick JavaScript event.
+ * @jsptagref.databindable false
+ * @jsptagref.attributesyntaxvalue <i>string_onDblClick</i>
+ * @netui:attribute required="false" rtexprvalue="true" description="The
onDblClick JavaScript event."
+ * @netui.tldx:attribute
propertyclass="workshop.jspdesigner.properties.EventPropertyClass"
category="event"
+ */
+ public void setCellOnDblClick(String onDblClick) {
+
internalGetTdState().registerAttribute(AbstractHtmlState.ATTR_JAVASCRIPT,
HtmlConstants.ONDBLCLICK, onDblClick);
+ }
+
+ /**
+ * Sets the onKeyDown javascript event.
+ *
+ * @param onKeyDown - the onKeyDown event.
+ * @jsptagref.attributedescription The onKeyDown JavaScript event.
+ * @jsptagref.databindable false
+ * @jsptagref.attributesyntaxvalue <i>string_onKeyDown</i>
+ * @netui:attribute required="false" rtexprvalue="true" description="The
onKeyDown JavaScript event."
+ * @netui.tldx:attribute
propertyclass="workshop.jspdesigner.properties.EventPropertyClass"
category="event"
+ */
+ public void setCellOnKeyDown(String onKeyDown) {
+
internalGetTdState().registerAttribute(AbstractHtmlState.ATTR_JAVASCRIPT,
HtmlConstants.ONKEYDOWN, onKeyDown);
+ }
+
+ /**
+ * Sets the onKeyUp javascript event.
+ *
+ * @param onKeyUp - the onKeyUp event.
+ * @jsptagref.attributedescription The onKeyUp JavaScript event.
+ * @jsptagref.databindable false
+ * @jsptagref.attributesyntaxvalue <i>string_onKeyUp</i>
+ * @netui:attribute required="false" rtexprvalue="true" description="The
onKeyUp JavaScript event."
+ * @netui.tldx:attribute
propertyclass="workshop.jspdesigner.properties.EventPropertyClass"
category="event"
+ */
+ public void setCellOnKeyUp(String onKeyUp) {
+
internalGetTdState().registerAttribute(AbstractHtmlState.ATTR_JAVASCRIPT,
HtmlConstants.ONKEYUP, onKeyUp);
+ }
+
+ /**
+ * Sets the onKeyPress javascript event.
+ *
+ * @param onKeyPress - the onKeyPress event.
+ * @jsptagref.attributedescription The onKeyPress JavaScript event.
+ * @jsptagref.databindable false
+ * @jsptagref.attributesyntaxvalue <i>string_onKeyPress</i>
+ * @netui:attribute required="false" rtexprvalue="true" description="The
onKeyPress JavaScript event."
+ * @netui.tldx:attribute
propertyclass="workshop.jspdesigner.properties.EventPropertyClass"
category="event"
+ */
+ public void setCellOnKeyPress(String onKeyPress) {
+
internalGetTdState().registerAttribute(AbstractHtmlState.ATTR_JAVASCRIPT,
HtmlConstants.ONKEYPRESS, onKeyPress);
+ }
+
+ /**
+ * Sets the onMouseDown javascript event.
+ *
+ * @param onMouseDown - the onMouseDown event.
+ * @jsptagref.attributedescription The onMouseDown JavaScript event.
+ * @jsptagref.databindable false
+ * @jsptagref.attributesyntaxvalue <i>string_onMouseDown</i>
+ * @netui:attribute required="false" rtexprvalue="true" description="The
onMouseDown JavaScript event."
+ * @netui.tldx:attribute
propertyclass="workshop.jspdesigner.properties.EventPropertyClass"
category="event"
+ */
+ public void setCellOnMouseDown(String onMouseDown) {
+
internalGetTdState().registerAttribute(AbstractHtmlState.ATTR_JAVASCRIPT,
HtmlConstants.ONMOUSEDOWN, onMouseDown);
+ }
+
+ /**
+ * Sets the onMouseUp javascript event.
+ *
+ * @param onMouseUp - the onMouseUp event.
+ * @jsptagref.attributedescription The onMouseUp JavaScript event.
+ * @jsptagref.databindable false
+ * @jsptagref.attributesyntaxvalue <i>string_onMouseUp</i>
+ * @netui:attribute required="false" rtexprvalue="true" description="The
onMouseUp JavaScript event."
+ * @netui.tldx:attribute
propertyclass="workshop.jspdesigner.properties.EventPropertyClass"
category="event"
+ */
+ public void setCellOnMouseUp(String onMouseUp) {
+
internalGetTdState().registerAttribute(AbstractHtmlState.ATTR_JAVASCRIPT,
HtmlConstants.ONMOUSEDOWN, onMouseUp);
+ }
+
+ /**
+ * Sets the onMouseMove javascript event.
+ *
+ * @param onMouseMove - the onMouseMove event.
+ * @jsptagref.attributedescription The onMouseMove JavaScript event.
+ * @jsptagref.databindable false
+ * @jsptagref.attributesyntaxvalue <i>string_onMouseMove</i>
+ * @netui:attribute required="false" rtexprvalue="true" description="The
onMouseMove JavaScript event."
+ * @netui.tldx:attribute
propertyclass="workshop.jspdesigner.properties.EventPropertyClass"
category="event"
+ */
+ public void setCellOnMouseMove(String onMouseMove) {
+
internalGetTdState().registerAttribute(AbstractHtmlState.ATTR_JAVASCRIPT,
HtmlConstants.ONMOUSEMOVE, onMouseMove);
+ }
+
+ /**
+ * Sets the onMouseOut javascript event.
+ *
+ * @param onMouseOut - the onMouseOut event.
+ * @jsptagref.attributedescription The onMouseOut JavaScript event.
+ * @jsptagref.databindable false
+ * @jsptagref.attributesyntaxvalue <i>string_onMouseOut</i>
+ * @netui:attribute required="false" rtexprvalue="true" description="The
onMouseOut JavaScript event."
+ * @netui.tldx:attribute
propertyclass="workshop.jspdesigner.properties.EventPropertyClass"
category="event"
+ */
+ public void setCellOnMouseOut(String onMouseOut) {
+
internalGetTdState().registerAttribute(AbstractHtmlState.ATTR_JAVASCRIPT,
HtmlConstants.ONMOUSEOUT, onMouseOut);
+ }
+
+ /**
+ * Sets the onMouseOver javascript event.
+ *
+ * @param onMouseOver - the onMouseOver event.
+ * @jsptagref.attributedescription The onMouseOver JavaScript event.
+ * @jsptagref.databindable false
+ * @jsptagref.attributesyntaxvalue <i>string_onMouseOver</i>
+ * @netui:attribute required="false" rtexprvalue="true" description="The
onMouseOver JavaScript event."
+ * @netui.tldx:attribute
propertyclass="workshop.jspdesigner.properties.EventPropertyClass"
category="event"
+ */
+ public void setCellOnMouseOver(String onMouseOver) {
+
internalGetTdState().registerAttribute(AbstractHtmlState.ATTR_JAVASCRIPT,
HtmlConstants.ONMOUSEOVER, onMouseOver);
+ }
+
+ /**
+ * Sets the style of the rendered html tag.
+ *
+ * @param style - the html style.
+ * @jsptagref.attributedescription The style.
+ * @jsptagref.databindable false
+ * @jsptagref.attributesyntaxvalue <i>string_style</i>
+ * @netui:attribute required="false" rtexprvalue="true" description="The
style."
+ * @netui.tldx:attribute
propertyclass="workshop.jspdesigner.properties.JspStyleProperty"
category="format"
+ */
+ public void setCellStyle(String style) {
+ if("".equals(style)) return;
+
+ internalGetTdState().style = style;
+ }
+
+ /**
+ * Sets the style class of the rendered html tag.
+ *
+ * @param styleClass - the html style class.
+ * @jsptagref.attributedescription The style class.
+ * @jsptagref.databindable false
+ * @jsptagref.attributesyntaxvalue <i>string_style_class</i>
+ * @netui:attribute required="false" rtexprvalue="true" description="The
style class."
+ * @netui.tldx:attribute category="Format"
+ */
+ public void setCellStyleClass(String styleClass) {
+ if("".equals(styleClass)) return;
+
+ internalGetTdState().styleClass = styleClass;
+ }
+
+ /**
+ * Sets the value of the title attribute.
+ *
+ * @param title
+ * @jsptagref.attributedescription The title.
+ * @jsptagref.databindable false
+ * @jsptagref.attributesyntaxvalue <i>string_title</i>
+ * @netui:attribute required="false" rtexprvalue="true" description="The
title. "
+ * @netui.tldx:attribute category="misc"
+ */
+ public void setCellTitle(String title) {
+ internalGetTdState().registerAttribute(AbstractHtmlState.ATTR_GENERAL,
HtmlConstants.TITLE, title);
+ }
+
/**
* Base support for the <code>attribute</code> tag. This requires that
the tag buffer their body and
* write attribute in the end tag. For the HTML tags it is not legal to
set
@@ -507,20 +708,19 @@
*/
public void setAttribute(String name, String value, String facet)
throws JspException {
- /* TODO: need to handle pluggable facets here */
+
if(facet != null && facet.equals(HEADER_FACET_NAME))
- addStateAttribute(internalGetThState(), name, value, facet);
+ addStateAttribute(internalGetThState(), name, value);
+ else if(facet != null && facet.equals(CELL_FACET_NAME))
+ addStateAttribute(internalGetTdState(), name, value);
else if(facet == null || !facet.equals(DEFAULT_FACET_NAME))
- addStateAttribute(internalGetHtmlState(), name, value, facet);
+ addStateAttribute(internalGetHtmlState(), name, value);
else {
String s = Bundle.getString("Tags_AttributeFacetNotSupported", new
Object[]{facet});
throw new JspException(s);
}
}
- /**
- * @return
- */
protected abstract AbstractHtmlState internalGetHtmlState();
protected void renderHeaderCell(AbstractRenderAppender appender)
@@ -558,7 +758,7 @@
StringWriter sw = new StringWriter();
if(fragment != null) {
fragment.invoke(sw);
- /* ignore the return value */
+ /* ignore any produced output */
sw.toString();
}
@@ -618,9 +818,8 @@
}
}
- private void addStateAttribute(AbstractHtmlState state, String name,
String value, String facet)
+ private void addStateAttribute(AbstractHtmlState state, String name,
String value)
throws JspException {
- boolean error = false;
// validate the name attribute, in the case of an error simply return.
if(name == null || name.length() <= 0) {
@@ -633,8 +832,6 @@
String s = Bundle.getString("Tags_AttributeMayNotBeSet", new
Object[]{name});
throw new JspException(s);
}
- if(error)
- return;
// if there is a style or class we will let them override the base
if(name.equals(HtmlConstants.CLASS)) {
@@ -644,6 +841,7 @@
state.style = value;
return;
}
+
state.registerAttribute(AbstractHtmlState.ATTR_GENERAL, name, value);
}
Modified:
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/AnchorColumn.java
Url:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/AnchorColumn.java?view=diff&rev=126164&p1=incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/AnchorColumn.java&r1=126163&p2=incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/AnchorColumn.java&r2=126164
==============================================================================
---
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/AnchorColumn.java
(original)
+++
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/AnchorColumn.java
Sat Jan 22 14:21:23 2005
@@ -23,9 +23,11 @@
import org.apache.beehive.netui.databinding.datagrid.model.CellModel;
import
org.apache.beehive.netui.databinding.datagrid.rendering.cell.AnchorCellDecorator;
import org.apache.beehive.netui.tags.html.IUrlParams;
+import org.apache.beehive.netui.tags.html.HtmlConstants;
import org.apache.beehive.netui.tags.rendering.AbstractHtmlState;
import org.apache.beehive.netui.tags.rendering.AbstractRenderAppender;
import org.apache.beehive.netui.util.ParamHelper;
+import org.apache.beehive.netui.util.Bundle;
/**
* @netui:tag name="anchorColumn"
@@ -39,6 +41,7 @@
implements IUrlParams {
private static final AnchorCellDecorator DECORATOR = new
AnchorCellDecorator();
+ private static final String REQUIRED_ATTR = "href, action, linkName";
private AnchorCellModel _anchorCellModel = new AnchorCellModel();
@@ -47,20 +50,138 @@
}
/**
- * @jsptagref.attributedescription The URL that is invoked when the column
header is clicked.
+ * Sets the onClick javascript event.
+ * @param onclick - the onClick event.
+ * @jsptagref.attributedescription The onClick JavaScript event.
+ * @jsptagref.databindable false
+ * @jsptagref.attributesyntaxvalue <i>string_onClick</i>
+ * @netui:attribute required="false" rtexprvalue="true"
+ * description="The onClick JavaScript event."
+ * @netui.tldx:attribute
propertyclass="workshop.jspdesigner.properties.EventPropertyClass"
category="event"
+ */
+ public void setOnClick(String onclick) {
+ _anchorCellModel.getAnchorState().onClick =
setNonEmptyValueAttribute(onclick);
+ }
+
+ /**
+ * Sets <code>charset</code> attribute for the anchor.
+ * @param charSet - the window target.
+ * @jsptagref.attributedescription The character set.
+ * @jsptagref.databindable false
+ * @jsptagref.attributesyntaxvalue <i>string_charset</i>
+ * @netui:attribute required="false" rtexprvalue="true"
+ * description="The character set."
+ * @netui.tldx:attribute category="misc"
+ */
+ public void setCharSet(String charSet)
+ {
+
_anchorCellModel.getAnchorState().registerAttribute(AbstractHtmlState.ATTR_GENERAL,
HtmlConstants.CHARSET, charSet);
+ }
+
+ /**
+ * Sets <code>type</code> attribute for the anchor.
+ * @param type - the window target.
+ * @jsptagref.attributedescription The type.
+ * @jsptagref.databindable false
+ * @jsptagref.attributesyntaxvalue <i>string_type</i>
+ * @netui:attribute required="false" rtexprvalue="true"
+ * description="The type."
+ * @netui.tldx:attribute category="misc"
+ */
+ public void setType(String type)
+ {
+
_anchorCellModel.getAnchorState().registerAttribute(AbstractHtmlState.ATTR_GENERAL,
HtmlConstants.TYPE, type);
+ }
+
+ /**
+ * Sets <code>hreflang</code> attribute for the anchor.
+ * @param hreflang - the window target.
+ * @jsptagref.attributedescription The HREF lang.
+ * @jsptagref.databindable false
+ * @jsptagref.attributesyntaxvalue <i>string_hreflang</i>
+ * @netui:attribute required="false" rtexprvalue="true"
+ * description="The HREF lang."
+ * @netui.tldx:attribute category="misc"
+ */
+ public void setHrefLang(String hreflang)
+ {
+
_anchorCellModel.getAnchorState().registerAttribute(AbstractHtmlState.ATTR_GENERAL,
HtmlConstants.HREFLANG, hreflang);
+ }
+
+ /**
+ * Sets <code>rel</code> attribute for the anchor.
+ * @param rel - the window target.
+ * @jsptagref.attributedescription The rel.
+ * @jsptagref.databindable false
+ * @jsptagref.attributesyntaxvalue <i>string_rel</i>
+ * @netui:attribute required="false" rtexprvalue="true"
+ * description="The rel."
+ * @netui.tldx:attribute category="misc"
+ */
+ public void setRel(String rel)
+ {
+
_anchorCellModel.getAnchorState().registerAttribute(AbstractHtmlState.ATTR_GENERAL,
HtmlConstants.REL, rel);
+ }
+
+ /**
+ * Sets <code>rev</code> attribute for the anchor.
+ * @param rev - the window target.
+ * @jsptagref.attributedescription The rev.
+ * @jsptagref.databindable false
+ * @jsptagref.attributesyntaxvalue <i>string_rev</i>
+ * @netui:attribute required="false" rtexprvalue="true"
+ * description="The rev."
+ * @netui.tldx:attribute category="misc"
+ */
+ public void setRev(String rev)
+ {
+
_anchorCellModel.getAnchorState().registerAttribute(AbstractHtmlState.ATTR_GENERAL,
HtmlConstants.REV, rev);
+ }
+
+
+ /**
+ * Sets the window target.
+ * @param target - the window target.
+ * @jsptagref.attributedescription The window target.
+ * @jsptagref.databindable false
+ * @jsptagref.attributesyntaxvalue <i>string_action</i>
+ * @netui:attribute required="false" rtexprvalue="true"
+ * description="The window target."
+ * @netui.tldx:attribute category="misc"
+ */
+ public void setTarget(String target)
+ {
+
_anchorCellModel.getAnchorState().registerAttribute(AbstractHtmlState.ATTR_GENERAL,
HtmlConstants.TARGET, target);
+ }
+
+ /**
+ * Sets the href of the Anchor. This attribute will accept the empty
String as a legal value.
+ * @param href - the hyperlink URI for the Area.
+ * @jsptagref.attributedescription The URL to go to.
* @jsptagref.databindable false
* @jsptagref.attributesyntaxvalue <i>string_href</i>
* @netui:attribute required="false" rtexprvalue="true"
+ * description="The URL to go to."
+ * @netui.tldx:attribute
propertyclass="workshop.jspdesigner.properties.URIPropertyClass"
+ * reftype="url"
*/
public void setHref(String href) {
_anchorCellModel.setHref(href);
}
/**
- * @netui:attribute required="false"
+ * Set the target "scope" for the anchor's action. Multiple active page
flows may exist concurrently within named
+ * scopes. This attribute selects which named scope to use. If omitted,
the default scope is assumed.
+ * @param targetScope - the name of the target scope in which the
associated action's page flow resides.
+ * @jsptagref.attributedescription The target scope in which the
associated action's page flow resides.
+ * @jsptagref.databindable true
+ * @jsptagref.attributesyntaxvalue <i>string_targetScope</i>
+ * @netui:attribute required="false" rtexprvalue="true"
+ * description="The target scope in which the associated action's page
flow resides"
+ * @netui.tldx:attribute category="general"
*/
- public void setScope(String scopeId) {
- _anchorCellModel.setScopeId(scopeId);
+ public void setTargetScope(String targetScope) {
+ _anchorCellModel.setScopeId(targetScope);
}
/**
@@ -71,16 +192,23 @@
}
/**
- * @netui:attribute required="false"
- * @netui.tldx:attribute category="general" reftype="netui-action-url"
+ * Set the name of the action for the Area.
+ * @param action - the name of the action to set for the Area.
+ * @jsptagref.attributedescription The action method to invoke. The
action method must be in the Controller file
+ * of the Page Flow directory.
+ * @jsptagref.databindable false
+ * @jsptagref.attributesyntaxvalue <i>string_action</i>
+ * @netui:attribute required="false" rtexprvalue="true"
+ * description="The action method to invoke. The action method must be in
the Controller file of the Page Flow directory."
+ * @netui.tldx:attribute reftype="netui-action-url" category="general"
*/
- public void setAction(String action) {
- _anchorCellModel.setAction((action));
+ public void setAction(String action)
+ throws JspException {
+ _anchorCellModel.setAction(setRequiredValueAttribute(action,
"action"));
}
public void addParameter(String name, Object value, String facet)
throws JspException {
-
ParamHelper.addParam(_anchorCellModel.getParams(), name, value);
}
@@ -88,8 +216,19 @@
throws JspException {
super.applyAttributes();
- if(_anchorCellModel.getAction() != null && _anchorCellModel.getHref()
!= null)
- throw new JspException("Unable to create AnchorCellModel. The
'action' and 'href' attributes can not both be set.");
+ int have = 0;
+ if(_anchorCellModel.getAction() != null)
+ have++;
+ if(_anchorCellModel.getHref() != null)
+ have++;
+ if(_anchorCellModel.getLinkName() != null)
+ have++;
+
+ /* todo: allow creation of JavaScript anchors */
+ if (have == 0 || have > 1) {
+ String s = Bundle.getString("Tags_Anchor_InvalidAnchorURI", new
Object[]{REQUIRED_ATTR});
+ throw new JspException(s);
+ }
}
protected AbstractHtmlState internalGetHtmlState() {
Modified:
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/ImageColumn.java
Url:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/ImageColumn.java?view=diff&rev=126164&p1=incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/ImageColumn.java&r1=126163&p2=incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/ImageColumn.java&r2=126164
==============================================================================
---
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/ImageColumn.java
(original)
+++
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/ImageColumn.java
Sat Jan 22 14:21:23 2005
@@ -22,12 +22,12 @@
import
org.apache.beehive.netui.databinding.datagrid.rendering.cell.ImageCellDecorator;
import org.apache.beehive.netui.tags.rendering.AbstractHtmlState;
import org.apache.beehive.netui.tags.rendering.AbstractRenderAppender;
+import org.apache.beehive.netui.tags.rendering.ImageTag;
import org.apache.beehive.netui.tags.html.HtmlConstants;
/**
* @netui:tag name="imageColumn" description="Renders a column of images in a
NetUI data grid" body-content="scriptless"
- * @netui.tldx:tag
renderer="workshop.netui.jspdesigner.tldx.ImageColumnRenderer"
- * whitespace="indent"
+ * @netui.tldx:tag
renderer="workshop.netui.jspdesigner.tldx.ImageColumnRenderer"
whitespace="indent"
*/
public class ImageColumn
extends AbstractHtmlColumn {
@@ -35,6 +35,7 @@
private static final ImageCellDecorator DECORATOR = new
ImageCellDecorator();
private ImageCellModel _imageCellModel = new ImageCellModel();
+ private ImageTag.State _state = _imageCellModel.getImageState();
/**
* @jsptagref.attributedescription The source of the image to display.
@@ -44,21 +45,31 @@
* @netui.tldx:attribute
propertyclass="workshop.jspdesigner.properties.URIPropertyClass"
reftype="img-url"
*/
public void setSrc(String src) {
- _imageCellModel.getImageState().src = src;
+ _state.src = src;
}
/**
- * @netui:attribute required="false" rtexprvalue="true"
+ * Sets the property to specify where to align the image.
+ * @param align - the image alignment.
+ * @jsptagref.attributedescription The alignment of the image.
+ * @jsptagref.databindable false
+ * @jsptagref.attributesyntaxvalue <i>string_align</i>
+ * @netui:attribute required="false" rtexprvalue="true" description="The
alignment of the image."
*/
public void setAlign(String align) {
-
_imageCellModel.getImageState().registerAttribute(AbstractHtmlState.ATTR_GENERAL,
HtmlConstants.ALIGN, align);
+ _state.registerAttribute(AbstractHtmlState.ATTR_GENERAL,
HtmlConstants.ALIGN, align);
}
/**
- * @netui:attribute required="false" rtexprvalue="true"
+ * Sets the the horizontal spacing around the image.
+ * @param hspace - the horizontal spacing.
+ * @jsptagref.attributedescription The horizontal spacing around the image.
+ * @jsptagref.databindable Read Only
+ * @jsptagref.attributesyntaxvalue <i>integer_hspace</i>
+ * @netui:attribute required="false" rtexprvalue="true" description="The
horizontal spacing around the image."
*/
public void setHspace(String hspace) {
-
_imageCellModel.getImageState().registerAttribute(AbstractHtmlState.ATTR_GENERAL,
HtmlConstants.HSPACE, hspace);
+ _state.registerAttribute(AbstractHtmlState.ATTR_GENERAL,
HtmlConstants.HSPACE, hspace);
}
/**
@@ -68,14 +79,14 @@
* @netui:attribute required="false" rtexprvalue="true"
*/
public void setVspace(String vspace) {
-
_imageCellModel.getImageState().registerAttribute(AbstractHtmlState.ATTR_GENERAL,
HtmlConstants.VSPACE, vspace);
+ _state.registerAttribute(AbstractHtmlState.ATTR_GENERAL,
HtmlConstants.VSPACE, vspace);
}
/**
* @netui:attribute required="false" rtexprvalue="true"
*/
public void setBorder(String border) {
-
_imageCellModel.getImageState().registerAttribute(AbstractHtmlState.ATTR_GENERAL,
HtmlConstants.BORDER, border);
+ _state.registerAttribute(AbstractHtmlState.ATTR_GENERAL,
HtmlConstants.BORDER, border);
}
/**
@@ -85,7 +96,7 @@
* @netui:attribute required="false" rtexprvalue="true"
*/
public void setHeight(String height) {
-
_imageCellModel.getImageState().registerAttribute(AbstractHtmlState.ATTR_GENERAL,
HtmlConstants.HEIGHT, height);
+ _state.registerAttribute(AbstractHtmlState.ATTR_GENERAL,
HtmlConstants.HEIGHT, height);
}
/**
@@ -95,14 +106,14 @@
* @netui:attribute required="false" rtexprvalue="true"
*/
public void setWidth(String width) {
-
_imageCellModel.getImageState().registerAttribute(AbstractHtmlState.ATTR_GENERAL,
HtmlConstants.WIDTH, width);
+ _state.registerAttribute(AbstractHtmlState.ATTR_GENERAL,
HtmlConstants.WIDTH, width);
}
public String getTagName() {
return "ImageColumn";
}
- public void renderDataCellContents(AbstractRenderAppender appender) {
+ protected void renderDataCellContents(AbstractRenderAppender appender) {
DECORATOR.decorate(getJspContext(), appender, _imageCellModel);
}
Deleted:
/incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/LiteralColumn.java
Url:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/LiteralColumn.java?view=auto&rev=126163
==============================================================================
Copied:
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/SpanColumn.java
(from r126037,
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/LiteralColumn.java)
Url:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/SpanColumn.java?view=diff&rev=126164&p1=incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/LiteralColumn.java&r1=126037&p2=incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/SpanColumn.java&r2=126164
==============================================================================
---
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/LiteralColumn.java
(original)
+++
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/SpanColumn.java
Sat Jan 22 14:21:23 2005
@@ -19,23 +19,23 @@
import org.apache.beehive.netui.tags.rendering.AbstractHtmlState;
import org.apache.beehive.netui.tags.rendering.AbstractRenderAppender;
-import
org.apache.beehive.netui.databinding.datagrid.model.cell.LiteralCellModel;
+import org.apache.beehive.netui.databinding.datagrid.model.cell.SpanCellModel;
import org.apache.beehive.netui.databinding.datagrid.model.CellModel;
-import
org.apache.beehive.netui.databinding.datagrid.rendering.cell.LiteralCellDecorator;
+import
org.apache.beehive.netui.databinding.datagrid.rendering.cell.SpanCellDecorator;
/**
- * @netui:tag name="literalColumn"
+ * @netui:tag name="spanColumn"
* description="Renders a column of data in a NetUI grid"
* body-content="scriptless"
* @netui.tldx:tag whitespace="indent"
* renderer="workshop.netui.jspdesigner.tldx.LiteralColumnRenderer"
*/
-public class LiteralColumn
+public class SpanColumn
extends AbstractHtmlColumn {
- private static final LiteralCellDecorator DECORATOR = new
LiteralCellDecorator();
+ private static final SpanCellDecorator DECORATOR = new SpanCellDecorator();
- private LiteralCellModel _literalCellModel = new LiteralCellModel();
+ private SpanCellModel _literalCellModel = new SpanCellModel();
public String getTagName() {
return "LiteralCellModel";
Modified:
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/databinding/datagrid/basic/index.jsp
Url:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/databinding/datagrid/basic/index.jsp?view=diff&rev=126164&p1=incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/databinding/datagrid/basic/index.jsp&r1=126163&p2=incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/databinding/datagrid/basic/index.jsp&r2=126164
==============================================================================
---
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/databinding/datagrid/basic/index.jsp
(original)
+++
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/databinding/datagrid/basic/index.jsp
Sat Jan 22 14:21:23 2005
@@ -12,8 +12,8 @@
<netui-data:dataGrid dataSource="pageScope.stocks" name="portfolio">
<netui-data:configurePager pageHref="${pageContext.request.contextPath}"/>
<netui-data:columns>
- <netui-data:literalColumn headerText="Symbol"
value="${container.item.symbol}"/>
- <netui-data:literalColumn headerText="Price"
value="${container.item.price}"/>
+ <netui-data:spanColumn headerText="Symbol"
value="${container.item.symbol}"/>
+ <netui-data:spanColumn headerText="Price"
value="${container.item.price}"/>
<netui-data:anchorColumn headerText="Web" href="${container.item.web}"
value="${container.item.name}">
<netui:parameter name="rowid" value="${container.index}"/>
<netui:parameter name="symbol" value="${container.item.symbol}"/>
Modified:
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/databinding/datagrid/caption/index.jsp
Url:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/databinding/datagrid/caption/index.jsp?view=diff&rev=126164&p1=incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/databinding/datagrid/caption/index.jsp&r1=126163&p2=incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/databinding/datagrid/caption/index.jsp&r2=126164
==============================================================================
---
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/databinding/datagrid/caption/index.jsp
(original)
+++
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/databinding/datagrid/caption/index.jsp
Sat Jan 22 14:21:23 2005
@@ -14,8 +14,8 @@
This is the table's caption.
</netui-data:caption>
<netui-data:columns>
- <netui-data:literalColumn headerText="Symbol"
value="${container.item.symbol}"/>
- <netui-data:literalColumn headerText="Price"
value="${container.item.price}"/>
+ <netui-data:spanColumn headerText="Symbol"
value="${container.item.symbol}"/>
+ <netui-data:spanColumn headerText="Price"
value="${container.item.price}"/>
<netui-data:anchorColumn headerText="Web" href="${container.item.web}"
value="${container.item.name}">
<netui:parameter name="rowid" value="${container.index}"/>
<netui:parameter name="symbol" value="${container.item.symbol}"/>
Modified:
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/databinding/datagrid/footer/index.jsp
Url:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/databinding/datagrid/footer/index.jsp?view=diff&rev=126164&p1=incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/databinding/datagrid/footer/index.jsp&r1=126163&p2=incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/databinding/datagrid/footer/index.jsp&r2=126164
==============================================================================
---
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/databinding/datagrid/footer/index.jsp
(original)
+++
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/databinding/datagrid/footer/index.jsp
Sat Jan 22 14:21:23 2005
@@ -11,8 +11,8 @@
<br/>
<netui-data:dataGrid dataSource="pageScope.stocks" name="portfolio">
<netui-data:columns>
- <netui-data:literalColumn headerText="Symbol"
value="${container.item.symbol}"/>
- <netui-data:literalColumn headerText="Price"
value="${container.item.price}"/>
+ <netui-data:spanColumn headerText="Symbol"
value="${container.item.symbol}"/>
+ <netui-data:spanColumn headerText="Price"
value="${container.item.price}"/>
<netui-data:anchorColumn headerText="Web" href="${container.item.web}"
value="${container.item.name}">
<netui:parameter name="rowid" value="${container.index}"/>
<netui:parameter name="symbol" value="${container.item.symbol}"/>
Modified:
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/databinding/datagrid/header/index.jsp
Url:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/databinding/datagrid/header/index.jsp?view=diff&rev=126164&p1=incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/databinding/datagrid/header/index.jsp&r1=126163&p2=incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/databinding/datagrid/header/index.jsp&r2=126164
==============================================================================
---
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/databinding/datagrid/header/index.jsp
(original)
+++
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/databinding/datagrid/header/index.jsp
Sat Jan 22 14:21:23 2005
@@ -12,12 +12,12 @@
<br/>
<netui-data:dataGrid dataSource="pageScope.stocks" name="portfolio">
<netui-data:columns>
- <netui-data:literalColumn value="${container.item.symbol}">
+ <netui-data:spanColumn value="${container.item.symbol}">
<c:if test="${column.renderingHeader}">
<netui:anchor href="index.jsp">Symbol Anchor</netui:anchor>
</c:if>
- </netui-data:literalColumn>
- <netui-data:literalColumn headerText="Price"
value="${container.item.price}">
+ </netui-data:spanColumn>
+ <netui-data:spanColumn headerText="Price"
value="${container.item.price}">
<c:if test="${column.renderingHeader}">
Should not render this.
</c:if>
@@ -26,7 +26,7 @@
<netui:formatNumber pattern="$####.00" type="currency"
country="us" language="en"/>
</c:if>
--%>
- </netui-data:literalColumn>
+ </netui-data:spanColumn>
<netui-data:anchorColumn href="${container.item.web}"
value="${container.item.name}">
<c:if test="${column.renderingHeader}">
Web URL
Modified:
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/databinding/datagrid/misc/customHeaderStyle.jsp
Url:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/databinding/datagrid/misc/customHeaderStyle.jsp?view=diff&rev=126164&p1=incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/databinding/datagrid/misc/customHeaderStyle.jsp&r1=126163&p2=incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/databinding/datagrid/misc/customHeaderStyle.jsp&r2=126164
==============================================================================
---
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/databinding/datagrid/misc/customHeaderStyle.jsp
(original)
+++
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/databinding/datagrid/misc/customHeaderStyle.jsp
Sat Jan 22 14:21:23 2005
@@ -27,8 +27,8 @@
<br/>
<netui-data:dataGrid dataSource="pageScope.stocks" name="portfolio"
cssClassPrefix="foo" >
<netui-data:columns>
- <netui-data:literalColumn headerStyleClass="custom-header"
headerText="Symbol" value="${container.item.symbol}"/>
- <netui-data:literalColumn headerText="Price"
value="${container.item.price}"/>
+ <netui-data:spanColumn headerStyleClass="custom-header"
headerText="Symbol" value="${container.item.symbol}"/>
+ <netui-data:spanColumn headerText="Price"
value="${container.item.price}"/>
<netui-data:anchorColumn headerText="Web"
href="${container.item.web}" value="${container.item.name}">
<netui:parameter name="rowid" value="${container.index}"/>
<netui:parameter name="symbol"
value="${container.item.symbol}"/>
Modified:
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/databinding/datagrid/misc/disabledPagerNPE.jsp
Url:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/databinding/datagrid/misc/disabledPagerNPE.jsp?view=diff&rev=126164&p1=incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/databinding/datagrid/misc/disabledPagerNPE.jsp&r1=126163&p2=incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/databinding/datagrid/misc/disabledPagerNPE.jsp&r2=126164
==============================================================================
---
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/databinding/datagrid/misc/disabledPagerNPE.jsp
(original)
+++
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/databinding/datagrid/misc/disabledPagerNPE.jsp
Sat Jan 22 14:21:23 2005
@@ -16,8 +16,8 @@
Customers
</netui-data:caption>
<netui-data:columns>
- <netui-data:literalColumn headerText="Symbol"
value="${container.item.symbol}"/>
- <netui-data:literalColumn headerText="Price"
value="${container.item.price}"/>
+ <netui-data:spanColumn headerText="Symbol"
value="${container.item.symbol}"/>
+ <netui-data:spanColumn headerText="Price"
value="${container.item.price}"/>
</netui-data:columns>
<netui-data:footer>
<netui-data:renderPager/>
Modified:
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/databinding/datagrid/misc/emptyColumnsTag.jsp
Url:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/databinding/datagrid/misc/emptyColumnsTag.jsp?view=diff&rev=126164&p1=incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/databinding/datagrid/misc/emptyColumnsTag.jsp&r1=126163&p2=incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/databinding/datagrid/misc/emptyColumnsTag.jsp&r2=126164
==============================================================================
---
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/databinding/datagrid/misc/emptyColumnsTag.jsp
(original)
+++
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/databinding/datagrid/misc/emptyColumnsTag.jsp
Sat Jan 22 14:21:23 2005
@@ -10,8 +10,8 @@
<br/>
<netui-data:dataGrid dataSource="pageScope.stocks" name="portfolio">
<netui-data:columns>
- <netui-data:literalColumn headerText="Symbol"
value="${container.item.symbol}"/>
- <netui-data:literalColumn headerText="Price"
value="${container.item.price}"/>
+ <netui-data:spanColumn headerText="Symbol"
value="${container.item.symbol}"/>
+ <netui-data:spanColumn headerText="Price"
value="${container.item.price}"/>
<netui-data:anchorColumn headerText="Web" href="${container.item.web}"
value="${container.item.name}">
<netui:parameter name="rowid" value="${container.index}"/>
<netui:parameter name="symbol" value="${container.item.symbol}"/>
Modified:
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/databinding/datagrid/misc/nestedJstl.jsp
Url:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/databinding/datagrid/misc/nestedJstl.jsp?view=diff&rev=126164&p1=incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/databinding/datagrid/misc/nestedJstl.jsp&r1=126163&p2=incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/databinding/datagrid/misc/nestedJstl.jsp&r2=126164
==============================================================================
---
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/databinding/datagrid/misc/nestedJstl.jsp
(original)
+++
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/databinding/datagrid/misc/nestedJstl.jsp
Sat Jan 22 14:21:23 2005
@@ -12,16 +12,16 @@
<datagrid:portfolioXmlBean/>
<netui-data:dataGrid dataSource="pageScope.stocks" name="portfolio">
<netui-data:columns>
- <netui-data:literalColumn headerText="Symbol"
value="${container.item.symbol}"/>
+ <netui-data:spanColumn headerText="Symbol"
value="${container.item.symbol}"/>
<c:choose>
<c:when test="${container.index == 1}">
- <netui-data:literalColumn headerText=" " value="BEA
Systems"/>
+ <netui-data:spanColumn headerText=" " value="BEA Systems"/>
</c:when>
<c:when test="${container.index == 2}">
- <netui-data:literalColumn headerText=" " value="Cisco"/>
+ <netui-data:spanColumn headerText=" " value="Cisco"/>
</c:when>
<c:otherwise>
- <netui-data:literalColumn headerText="JSTL Column" value="None"/>
+ <netui-data:spanColumn headerText="JSTL Column" value="None"/>
</c:otherwise>
</c:choose>
</netui-data:columns>
Modified:
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/databinding/datagrid/misc/onclick.jsp
Url:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/databinding/datagrid/misc/onclick.jsp?view=diff&rev=126164&p1=incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/databinding/datagrid/misc/onclick.jsp&r1=126163&p2=incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/databinding/datagrid/misc/onclick.jsp&r2=126164
==============================================================================
---
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/databinding/datagrid/misc/onclick.jsp
(original)
+++
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/databinding/datagrid/misc/onclick.jsp
Sat Jan 22 14:21:23 2005
@@ -15,8 +15,8 @@
<%@ include file="../util/portfolioXmlBean.jsp" %>
<netui-data:dataGrid dataSource="pageScope.stocks" name="portfolio">
<netui-data:columns>
- <netui-data:literalColumn headerText="Symbol"
value="${container.item.symbol}" onClick="javascript:alert(this)"/>
- <netui-data:literalColumn headerText="Price"
value="${container.item.price}"/>
+ <netui-data:spanColumn headerText="Symbol"
value="${container.item.symbol}" onClick="javascript:alert(this)"/>
+ <netui-data:spanColumn headerText="Price"
value="${container.item.price}"/>
<netui-data:anchorColumn headerText="Web"
href="${container.item.web}" value="${container.item.name}"
onMouseOver="doAlert(this, ${container.index})">
<netui:parameter name="rowid" value="${container.index}"/>
<netui:parameter name="symbol"
value="${container.item.symbol}"/>
Modified:
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/databinding/datagrid/misc/stickyPagerParam.jsp
Url:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/databinding/datagrid/misc/stickyPagerParam.jsp?view=diff&rev=126164&p1=incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/databinding/datagrid/misc/stickyPagerParam.jsp&r1=126163&p2=incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/databinding/datagrid/misc/stickyPagerParam.jsp&r2=126164
==============================================================================
---
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/databinding/datagrid/misc/stickyPagerParam.jsp
(original)
+++
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/databinding/datagrid/misc/stickyPagerParam.jsp
Sat Jan 22 14:21:23 2005
@@ -16,8 +16,8 @@
<netui-data:dataGrid dataSource="pageScope.stocks" name="portfolio">
<netui-data:configurePager pageSize="2"
pageHref="stickyPagerParam.jsp"/>
<netui-data:columns>
- <netui-data:literalColumn headerText="Symbol"
value="${container.item.symbol}"/>
- <netui-data:literalColumn headerText="Price"
value="${container.item.price}"/>
+ <netui-data:spanColumn headerText="Symbol"
value="${container.item.symbol}"/>
+ <netui-data:spanColumn headerText="Price"
value="${container.item.price}"/>
<netui-data:anchorColumn headerText="Web"
href="${container.item.web}" value="${container.item.name}">
<netui:parameter name="rowid" value="${container.index}"/>
<netui:parameter name="symbol"
value="${container.item.symbol}"/>
Modified:
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/databinding/datagrid/misc/stylePrefix.jsp
Url:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/databinding/datagrid/misc/stylePrefix.jsp?view=diff&rev=126164&p1=incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/databinding/datagrid/misc/stylePrefix.jsp&r1=126163&p2=incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/databinding/datagrid/misc/stylePrefix.jsp&r2=126164
==============================================================================
---
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/databinding/datagrid/misc/stylePrefix.jsp
(original)
+++
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/databinding/datagrid/misc/stylePrefix.jsp
Sat Jan 22 14:21:23 2005
@@ -24,8 +24,8 @@
<br/>
<netui-data:dataGrid dataSource="pageScope.stocks" name="portfolio"
cssClassPrefix="foo" >
<netui-data:columns>
- <netui-data:literalColumn headerText="Symbol"
value="${container.item.symbol}"/>
- <netui-data:literalColumn headerText="Price"
value="${container.item.price}"/>
+ <netui-data:spanColumn headerText="Symbol"
value="${container.item.symbol}"/>
+ <netui-data:spanColumn headerText="Price"
value="${container.item.price}"/>
<netui-data:anchorColumn headerText="Web"
href="${container.item.web}" value="${container.item.name}">
<netui:parameter name="rowid" value="${container.index}"/>
<netui:parameter name="symbol"
value="${container.item.symbol}"/>
Modified:
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/databinding/datagrid/misc/userAttributes.jsp
Url:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/databinding/datagrid/misc/userAttributes.jsp?view=diff&rev=126164&p1=incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/databinding/datagrid/misc/userAttributes.jsp&r1=126163&p2=incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/databinding/datagrid/misc/userAttributes.jsp&r2=126164
==============================================================================
---
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/databinding/datagrid/misc/userAttributes.jsp
(original)
+++
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/databinding/datagrid/misc/userAttributes.jsp
Sat Jan 22 14:21:23 2005
@@ -15,13 +15,13 @@
<%@ include file="../util/portfolioXmlBean.jsp" %>
<netui-data:dataGrid dataSource="pageScope.stocks" name="portfolio">
<netui-data:columns>
- <netui-data:literalColumn headerText="Symbol"
value="${container.item.symbol}" onClick="javascript:alert(this)">
+ <netui-data:spanColumn headerText="Symbol"
value="${container.item.symbol}" onClick="javascript:alert(this)">
<netui:attribute name="attr-test-symbol"
value="${container.item.symbol}"/>
- </netui-data:literalColumn>
- <netui-data:literalColumn headerText="Price"
value="${container.item.price}">
+ </netui-data:spanColumn>
+ <netui-data:spanColumn headerText="Price"
value="${container.item.price}">
<netui:attribute name="attr-onlyeven" value="${container.index %
2 == 0 ? 'foo' : null}"/>
<netui:attribute name="attr-index" value="${container.index}"/>
- </netui-data:literalColumn>
+ </netui-data:spanColumn>
<netui-data:anchorColumn headerText="Web"
href="${container.item.web}" value="${container.item.name}"
onMouseOver="doAlert(this, ${container.index})">
<netui:parameter name="rowid" value="${container.index}"/>
<netui:parameter name="symbol"
value="${container.item.symbol}"/>
Modified:
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/databinding/datagrid/model/index.jsp
Url:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/databinding/datagrid/model/index.jsp?view=diff&rev=126164&p1=incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/databinding/datagrid/model/index.jsp&r1=126163&p2=incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/databinding/datagrid/model/index.jsp&r2=126164
==============================================================================
---
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/databinding/datagrid/model/index.jsp
(original)
+++
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/databinding/datagrid/model/index.jsp
Sat Jan 22 14:21:23 2005
@@ -13,12 +13,12 @@
<netui-data:dataGrid dataSource="pageScope.stocks" name="portfolio">
<netuitestutil:assert test="${dataGrid != null}" failureMessage="Data
Grid Model was not found in the PageContext"/>
<netui-data:columns>
- <netui-data:literalColumn headerText="Symbol"
value="${container.item.symbol}">
+ <netui-data:spanColumn headerText="Symbol"
value="${container.item.symbol}">
<netuitestutil:assert test="${column != null}"
failureMessage="Column Model was not found in the PageContext"/>
- </netui-data:literalColumn>
- <netui-data:literalColumn headerText="Price"
value="${container.item.price}">
+ </netui-data:spanColumn>
+ <netui-data:spanColumn headerText="Price"
value="${container.item.price}">
<netuitestutil:assert test="${column != null}"
failureMessage="Column Model was not found in the PageContext"/>
- </netui-data:literalColumn>
+ </netui-data:spanColumn>
<netui-data:anchorColumn headerText="Web"
href="${container.item.web}" value="${container.item.name}">
<netuitestutil:assert test="${column != null}"
failureMessage="Column Model was not found in the PageContext"/>
<netui:parameter name="rowid" value="${container.index}"/>
Modified:
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/databinding/datagrid/pager/basic/index.jsp
Url:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/databinding/datagrid/pager/basic/index.jsp?view=diff&rev=126164&p1=incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/databinding/datagrid/pager/basic/index.jsp&r1=126163&p2=incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/databinding/datagrid/pager/basic/index.jsp&r2=126164
==============================================================================
---
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/databinding/datagrid/pager/basic/index.jsp
(original)
+++
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/databinding/datagrid/pager/basic/index.jsp
Sat Jan 22 14:21:23 2005
@@ -11,8 +11,8 @@
<netui-data:dataGrid dataSource="pageScope.stocks" name="portfolio">
<netui-data:configurePager pageSize="2"
pagerFormat="firstPrevNextLast" pageAction="begin.do"/>
<netui-data:columns>
- <netui-data:literalColumn headerText="Symbol"
value="${container.item.symbol}"/>
- <netui-data:literalColumn headerText="Price"
value="${container.item.price}"/>
+ <netui-data:spanColumn headerText="Symbol"
value="${container.item.symbol}"/>
+ <netui-data:spanColumn headerText="Price"
value="${container.item.price}"/>
<netui-data:anchorColumn headerText="Web"
href="${container.item.web}" value="${container.item.name}">
<netui:parameter name="rowid" value="${container.index}"/>
<netui:parameter name="symbol"
value="${container.item.symbol}"/>
Modified:
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/databinding/datagrid/pager/customselect/index.jsp
Url:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/databinding/datagrid/pager/customselect/index.jsp?view=diff&rev=126164&p1=incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/databinding/datagrid/pager/customselect/index.jsp&r1=126163&p2=incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/databinding/datagrid/pager/customselect/index.jsp&r2=126164
==============================================================================
---
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/databinding/datagrid/pager/customselect/index.jsp
(original)
+++
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/databinding/datagrid/pager/customselect/index.jsp
Sat Jan 22 14:21:23 2005
@@ -16,8 +16,8 @@
<netui-data:dataGrid dataSource="pageScope.stocks" name="portfolio">
<netui-data:configurePager pageSize="2"
pagerFormat="firstPrevNextLast" pageAction="begin.do"
disableDefaultPager="true"/>
<netui-data:columns>
- <netui-data:literalColumn headerText="Symbol"
value="${container.item.symbol}"/>
- <netui-data:literalColumn headerText="Price"
value="${container.item.price}"/>
+ <netui-data:spanColumn headerText="Symbol"
value="${container.item.symbol}"/>
+ <netui-data:spanColumn headerText="Price"
value="${container.item.price}"/>
<netui-data:anchorColumn headerText="Web"
href="${container.item.web}" value="${container.item.name}">
<netui:parameter name="rowid" value="${container.index}"/>
<netui:parameter name="symbol"
value="${container.item.symbol}"/>
Modified:
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/databinding/datagrid/pager/empty/index.jsp
Url:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/databinding/datagrid/pager/empty/index.jsp?view=diff&rev=126164&p1=incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/databinding/datagrid/pager/empty/index.jsp&r1=126163&p2=incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/databinding/datagrid/pager/empty/index.jsp&r2=126164
==============================================================================
---
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/databinding/datagrid/pager/empty/index.jsp
(original)
+++
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/databinding/datagrid/pager/empty/index.jsp
Sat Jan 22 14:21:23 2005
@@ -12,8 +12,8 @@
<netui-data:dataGrid dataSource="pageScope.emptyList" name="portfolio">
<netui-data:configurePager pageSize="2"
pagerFormat="firstPrevNextLast" pageAction="begin.do"/>
<netui-data:columns>
- <netui-data:literalColumn headerText="Symbol"
value="${container.item.symbol}"/>
- <netui-data:literalColumn headerText="Price"
value="${container.item.price}"/>
+ <netui-data:spanColumn headerText="Symbol"
value="${container.item.symbol}"/>
+ <netui-data:spanColumn headerText="Price"
value="${container.item.price}"/>
<netui-data:anchorColumn headerText="Web"
href="${container.item.web}" value="${container.item.name}">
<netui:parameter name="rowid" value="${container.index}"/>
<netui:parameter name="symbol"
value="${container.item.symbol}"/>
Modified:
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/databinding/datagrid/pager/incaption/index.jsp
Url:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/databinding/datagrid/pager/incaption/index.jsp?view=diff&rev=126164&p1=incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/databinding/datagrid/pager/incaption/index.jsp&r1=126163&p2=incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/databinding/datagrid/pager/incaption/index.jsp&r2=126164
==============================================================================
---
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/databinding/datagrid/pager/incaption/index.jsp
(original)
+++
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/databinding/datagrid/pager/incaption/index.jsp
Sat Jan 22 14:21:23 2005
@@ -16,8 +16,8 @@
<table><tr><td><netui-data:renderPager/></td></tr></table>
</netui-data:caption>
<netui-data:columns>
- <netui-data:literalColumn headerText="Symbol"
value="${container.item.symbol}"/>
- <netui-data:literalColumn headerText="Price"
value="${container.item.price}"/>
+ <netui-data:spanColumn headerText="Symbol"
value="${container.item.symbol}"/>
+ <netui-data:spanColumn headerText="Price"
value="${container.item.price}"/>
<netui-data:anchorColumn headerText="Web"
href="${container.item.web}" value="${container.item.name}">
<netui:parameter name="rowid" value="${container.index}"/>
<netui:parameter name="symbol"
value="${container.item.symbol}"/>
Modified:
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/databinding/datagrid/pager/infooter/index.jsp
Url:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/databinding/datagrid/pager/infooter/index.jsp?view=diff&rev=126164&p1=incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/databinding/datagrid/pager/infooter/index.jsp&r1=126163&p2=incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/databinding/datagrid/pager/infooter/index.jsp&r2=126164
==============================================================================
---
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/databinding/datagrid/pager/infooter/index.jsp
(original)
+++
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/databinding/datagrid/pager/infooter/index.jsp
Sat Jan 22 14:21:23 2005
@@ -11,8 +11,8 @@
<netui-data:dataGrid dataSource="pageScope.stocks" name="portfolio">
<netui-data:configurePager pageSize="2"
pagerFormat="firstPrevNextLast" pageAction="begin.do"
disableDefaultPager="true"/>
<netui-data:columns>
- <netui-data:literalColumn headerText="Symbol"
value="${container.item.symbol}"/>
- <netui-data:literalColumn headerText="Price"
value="${container.item.price}"/>
+ <netui-data:spanColumn headerText="Symbol"
value="${container.item.symbol}"/>
+ <netui-data:spanColumn headerText="Price"
value="${container.item.price}"/>
<netui-data:anchorColumn headerText="Web"
href="${container.item.web}" value="${container.item.name}">
<netui:parameter name="rowid" value="${container.index}"/>
<netui:parameter name="symbol"
value="${container.item.symbol}"/>
Modified:
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/databinding/datagrid/scriptlettagfile/index.jsp
Url:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/databinding/datagrid/scriptlettagfile/index.jsp?view=diff&rev=126164&p1=incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/databinding/datagrid/scriptlettagfile/index.jsp&r1=126163&p2=incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/databinding/datagrid/scriptlettagfile/index.jsp&r2=126164
==============================================================================
---
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/databinding/datagrid/scriptlettagfile/index.jsp
(original)
+++
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/databinding/datagrid/scriptlettagfile/index.jsp
Sat Jan 22 14:21:23 2005
@@ -16,16 +16,16 @@
<datagrid:scriptletecho text="This custom caption intentionally left
blank"/>
</netui-data:caption>
<netui-data:columns>
- <netui-data:literalColumn headerText="Symbol"
value="${container.item.symbol}"/>
+ <netui-data:spanColumn headerText="Symbol"
value="${container.item.symbol}"/>
<netui-data:anchorColumn headerText="Web" href="${container.item.web}"
value="${container.item.name}">
<netui:parameter name="rowid" value="${container.index}"/>
<netui:parameter name="symbol" value="${container.item.symbol}"/>
</netui-data:anchorColumn>
- <netui-data:literalColumn value="${container.item.price}">
+ <netui-data:spanColumn value="${container.item.price}">
<c:if test="${column.renderingHeader}">
<datagrid:scriptletecho text="Share Price (USD)"/>
</c:if>
- </netui-data:literalColumn>
+ </netui-data:spanColumn>
</netui-data:columns>
<netui-data:footer>
<td colspan="3" align="center">
Modified:
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/databinding/datagrid/simplesort/index.jsp
Url:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/databinding/datagrid/simplesort/index.jsp?view=diff&rev=126164&p1=incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/databinding/datagrid/simplesort/index.jsp&r1=126163&p2=incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/databinding/datagrid/simplesort/index.jsp&r2=126164
==============================================================================
---
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/databinding/datagrid/simplesort/index.jsp
(original)
+++
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/databinding/datagrid/simplesort/index.jsp
Sat Jan 22 14:21:23 2005
@@ -11,8 +11,8 @@
<br/>
<netui-data:dataGrid dataSource="pageScope.stocks" name="portfolio">
<netui-data:columns>
- <netui-data:literalColumn headerText="Symbol"
value="${container.item.symbol}" sortExpression="symbol" sortAction="sort"/>
- <netui-data:literalColumn headerText="Price"
value="${container.item.price}" sortExpression="price"/>
+ <netui-data:spanColumn headerText="Symbol"
value="${container.item.symbol}" sortExpression="symbol" sortAction="sort"/>
+ <netui-data:spanColumn headerText="Price"
value="${container.item.price}" sortExpression="price"/>
<netui-data:anchorColumn headerText="Web" href="${container.item.web}"
value="${container.item.name}" sortExpression="web">
<netui:parameter name="rowid" value="${container.index}"/>
<netui:parameter name="symbol" value="${container.item.symbol}"/>
Modified:
incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/config/testRecorder-tests.xml
Url:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/config/testRecorder-tests.xml?view=diff&rev=126164&p1=incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/config/testRecorder-tests.xml&r1=126163&p2=incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/config/testRecorder-tests.xml&r2=126164
==============================================================================
---
incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/config/testRecorder-tests.xml
(original)
+++
incubator/beehive/trunk/netui/test/webapps/drt/testRecorder/config/testRecorder-tests.xml
Sat Jan 22 14:21:23 2005
@@ -2410,22 +2410,6 @@
</features>
</test>
<test>
- <name>DataGridSmokeTest</name>
- <description>DataGridSmokeTest</description>
- <webapp>coreWeb</webapp>
- <categories>
- <category>bvt</category>
- <category>bvt.struts11</category>
- <category>drt</category>
- <category>datagrid</category>
- <category>databinding</category>
- </categories>
- <features>
- <feature>Databinding</feature>
- <feature>Data Grid</feature>
- </features>
- </test>
- <test>
<name>DataGridCaptionTest</name>
<description>DataGridCaptionTest</description>
<webapp>coreWeb</webapp>
@@ -2520,6 +2504,22 @@
</features>
</test>
<test>
+ <name>DataGridFormatTest</name>
+ <description>DataGridFormatTest</description>
+ <webapp>coreWeb</webapp>
+ <categories>
+ <category>bvt</category>
+ <category>bvt.struts11</category>
+ <category>drt</category>
+ <category>datagrid</category>
+ <category>databinding</category>
+ </categories>
+ <features>
+ <feature>Databinding</feature>
+ <feature>Data Grid</feature>
+ </features>
+ </test>
+ <test>
<name>DataGridHeaderTest</name>
<description>DataGridHeaderTest</description>
<webapp>coreWeb</webapp>
@@ -2710,6 +2710,22 @@
<webapp>coreWeb</webapp>
<categories>
<category>bvt</category>
+ <category>drt</category>
+ <category>datagrid</category>
+ <category>databinding</category>
+ </categories>
+ <features>
+ <feature>Databinding</feature>
+ <feature>Data Grid</feature>
+ </features>
+ </test>
+ <test>
+ <name>DataGridSmokeTest</name>
+ <description>DataGridSmokeTest</description>
+ <webapp>coreWeb</webapp>
+ <categories>
+ <category>bvt</category>
+ <category>bvt.struts11</category>
<category>drt</category>
<category>datagrid</category>
<category>databinding</category>
