Author: ekoneil
Date: Mon Apr 11 10:46:50 2005
New Revision: 160930
URL: http://svn.apache.org/viewcvs?view=rev&rev=160930
Log:
Additional data grid i18n and todo cleanup.
BB: self
DRT: NetUI pass
BVT: NetUI pass (1 failure)
Modified:
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/sql/SQLSupport.java
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/Caption.java
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/ConfigurePager.java
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/DataGrid.java
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/DataGridUtil.java
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/Footer.java
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/GetDataGridState.java
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/Header.java
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/HeaderCell.java
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/RenderPager.java
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/Rows.java
incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/netui.properties
Modified:
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/sql/SQLSupport.java
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/sql/SQLSupport.java?view=diff&r1=160929&r2=160930
==============================================================================
---
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/sql/SQLSupport.java
(original)
+++
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/sql/SQLSupport.java
Mon Apr 11 10:46:50 2005
@@ -37,7 +37,7 @@
private static final String EMPTY_STRING = "";
private static final FilterOperation[] FILTER_OPERATIONS;
- /* todo: the QUOTE_CHAR needs to be read from DatabaseMetaData */
+ /* todo: the QUOTE_CHAR needs to be settable manually or from
aDatabaseMetaData */
private static final String QUOTE_CHAR = "'";
static {
Modified:
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/Caption.java
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/Caption.java?view=diff&r1=160929&r2=160930
==============================================================================
---
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/Caption.java
(original)
+++
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/Caption.java
Mon Apr 11 10:46:50 2005
@@ -21,6 +21,7 @@
import java.io.StringWriter;
import javax.servlet.jsp.tagext.JspFragment;
import javax.servlet.jsp.JspException;
+import javax.servlet.jsp.JspContext;
import org.apache.beehive.netui.tags.AbstractSimpleTag;
import org.apache.beehive.netui.tags.html.HtmlConstants;
@@ -236,7 +237,8 @@
public void doTag()
throws IOException, JspException {
- DataGridTagModel dgm =
DataGridUtil.getDataGridTagModel(getJspContext());
+ JspContext jspContext = getJspContext();
+ DataGridTagModel dgm = DataGridUtil.getDataGridTagModel(jspContext);
if(dgm == null)
throw new
JspException(Bundle.getErrorString("DataGridTags_MissingDataGridModel"));
@@ -246,7 +248,7 @@
StringWriter sw = new StringWriter();
TableRenderer tableRenderer = dgm.getTableRenderer();
StyleModel stylePolicy = dgm.getStyleModel();
- AbstractRenderAppender appender = new
WriteRenderAppender(getJspContext());
+ AbstractRenderAppender appender = new
WriteRenderAppender(jspContext);
if(_captionTag.styleClass == null)
_captionTag.styleClass = stylePolicy.getCaptionClass();
Modified:
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/ConfigurePager.java
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/ConfigurePager.java?view=diff&r1=160929&r2=160930
==============================================================================
---
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/ConfigurePager.java
(original)
+++
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/ConfigurePager.java
Mon Apr 11 10:46:50 2005
@@ -30,6 +30,7 @@
import org.apache.beehive.netui.databinding.datagrid.api.pager.PagerModel;
import org.apache.beehive.netui.tags.AbstractSimpleTag;
import org.apache.beehive.netui.util.logging.Logger;
+import org.apache.beehive.netui.util.Bundle;
/**
* @jsptagref.tagdescription Tag for configuring and rendering the pager in
the NetUI data grid.
@@ -44,7 +45,7 @@
private static final String PAGER_FORMAT_FIRST_LAST_PREV_NEXT =
"firstPrevNextLast";
private static final String PAGER_FORMAT_PREV_NEXT = "prevNext";
- private boolean _disableDefaultPager = false;
+ private Boolean _disableDefaultPager = null;
private Integer _pageSize = null;
private Integer _defaultPageSize = null;
private String _pagerFormat = null;
@@ -131,14 +132,14 @@
throws JspException {
DataGridTagModel dgm =
DataGridUtil.getDataGridTagModel(getJspContext());
- assert dgm != null;
+ if(dgm == null)
+ throw new
JspException(Bundle.getErrorString("DataGridTags_MissingDataGridModel"));
PagerModel pm = dgm.getState().getPagerModel();
assert pm != null;
- PagerRenderer pagerRenderer = null;
-
- dgm.setDisableDefaultPagerRendering(_disableDefaultPager);
+ if(_disableDefaultPager != null)
+
dgm.setDisableDefaultPagerRendering(_disableDefaultPager.booleanValue());
if(_pageSize != null)
pm.setPageSize(_pageSize);
@@ -146,14 +147,15 @@
if(_defaultPageSize != null)
pm.setDefaultPageSize(_defaultPageSize);
+ PagerRenderer pagerRenderer = null;
if(_pagerRendererClass != null) {
try {
pagerRenderer =
(PagerRenderer)ExtensionUtil.instantiateClass(_pagerRendererClass,
PagerRenderer.class);
-
assert pagerRenderer != null : "Expected a non-null pager
renderer of type \"" + _pagerRendererClass + "\"";
}
catch(DataGridExtensionException e) {
- throw new JspException(e);
+ String msg =
Bundle.getErrorString("ConfigurePager_CantCreateCustomPagerRenderer", new
Object[] {e});
+ throw new JspException(msg, e);
}
}
else if(_pagerFormat != null) {
@@ -161,14 +163,14 @@
pagerRenderer = new FirstPreviousNextLastPagerRenderer();
else if(_pagerFormat.equals(PAGER_FORMAT_PREV_NEXT))
pagerRenderer = new PreviousNextPagerRenderer();
- else throw new JspException("The pagerFormat \"" + _pagerFormat +
"\" is not supported");
+ else throw new
JspException(Bundle.getErrorString("ConfigurePager_UnsupportedPagerFormat", new
Object[] {_pagerFormat}));
}
if(pagerRenderer != null)
dgm.setPagerRenderer(pagerRenderer);
if(_pageHref != null && _pageAction != null)
- throw new JspException("The configurePager tag can't set both the
pageAction and pageHref attributes");
+ throw new
JspException(Bundle.getErrorString("ConfigurePager_CantSetHrefAndAction"));
if(_pageHref == null && _pageAction == null) {
LOGGER.info("The configurePager tag has no page action or HREF
specified; using the current request URI instead.");
Modified:
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/DataGrid.java
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/DataGrid.java?view=diff&r1=160929&r2=160930
==============================================================================
---
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/DataGrid.java
(original)
+++
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/DataGrid.java
Mon Apr 11 10:46:50 2005
@@ -283,10 +283,6 @@
_dataGridTagModel.changeRenderState(DataGridTagModel.RENDER_STATE_END);
- /* todo: when rendering using thead / tfoot / tbody, they need
to be rendered
- in order. when not rendering like this, they need to
be written
- in thead / tbody / tfoot order.
- */
write(builder.toString());
} finally {
if(addedDataAccessProvider) {
@@ -312,15 +308,16 @@
}
public Object getCurrentMetadata() {
- throw new UnsupportedOperationException("The data grid does not
support metadata binding");
+ throw new
UnsupportedOperationException(Bundle.getErrorString("Tags_DataAccessProvider_metadataUnsupported",
+ new
Object[] {getTagName()}));
}
public String getDataSource() {
return "{" + _dataSource + "}";
}
- /* todo: bug. nested grids are broken here. this should be done via the
stack of objects in the PageContext */
+ /* todo: support nested data grids. this should be done via the stack of
objects in the PageContext */
public IDataAccessProvider getProviderParent() {
- return
(IDataAccessProvider)SimpleTagSupport.findAncestorWithClass(this,
Repeater.class);
+ return
(IDataAccessProvider)SimpleTagSupport.findAncestorWithClass(this,
IDataAccessProvider.class);
}
}
Modified:
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/DataGridUtil.java
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/DataGridUtil.java?view=diff&r1=160929&r2=160930
==============================================================================
---
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/DataGridUtil.java
(original)
+++
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/DataGridUtil.java
Mon Apr 11 10:46:50 2005
@@ -29,13 +29,6 @@
*/
public final class DataGridUtil {
- private static final Logger LOGGER =
Logger.getInstance(DataGridUtil.class);
-
- /*
- * todo: bug. in order to support nested grids, there needs to be a stack
of
- * model objects in the PageContext.
- */
-
private static final String DATA_GRID_TAG_MODEL_KEY = "dataGrid";
private static final String CELL_MODEL_KEY = "cell";
Modified:
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/Footer.java
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/Footer.java?view=diff&r1=160929&r2=160930
==============================================================================
---
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/Footer.java
(original)
+++
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/Footer.java
Mon Apr 11 10:46:50 2005
@@ -35,6 +35,7 @@
import
org.apache.beehive.netui.databinding.datagrid.api.rendering.DataGridTagModel;
import org.apache.beehive.netui.databinding.datagrid.api.rendering.StyleModel;
import
org.apache.beehive.netui.databinding.datagrid.runtime.rendering.table.TableRenderer;
+import org.apache.beehive.netui.util.Bundle;
/**
* @jsptagref.tagdescription Renders a footer below the data grid.
@@ -249,7 +250,7 @@
* @netui.tldx:attribute category="misc"
*/
public void setAlign(String align) {
- /* todo: should this enforce left|center|right|justify|char as in the
spec */
+ /* todo: should this enforce left|center|right|justify|char as in the
spec? */
_tfootTag.registerAttribute(AbstractHtmlState.ATTR_GENERAL,
HtmlConstants.ALIGN, align);
}
@@ -292,7 +293,7 @@
* @netui.tldx:attribute category="misc"
*/
public void setValign(String align) {
- /* todo: should this enforce top|middle|bottom|baseline as in the spec
*/
+ /* todo: should this enforce top|middle|bottom|baseline as in the
spec? */
_tfootTag.registerAttribute(AbstractHtmlState.ATTR_GENERAL,
HtmlConstants.VALIGN, align);
}
@@ -328,24 +329,28 @@
throws IOException, JspException {
JspContext jspContext = getJspContext();
- DataGridTagModel dataGridTagModel =
DataGridUtil.getDataGridTagModel(jspContext);
- if(dataGridTagModel == null)
- throw new JspException("Unable to find a Data Grid tag model in
the JspContext");
- if(dataGridTagModel.getRenderState() ==
DataGridTagModel.RENDER_STATE_FOOTER) {
+ DataGridTagModel dgm = DataGridUtil.getDataGridTagModel(jspContext);
+ if(dgm == null)
+ throw new
JspException(Bundle.getErrorString("DataGridTags_MissingDataGridModel"));
+
+ if(dgm.getRenderState() == DataGridTagModel.RENDER_STATE_FOOTER) {
JspFragment fragment = getJspBody();
if(fragment != null) {
StringWriter sw = new StringWriter();
- TableRenderer tableRenderer =
dataGridTagModel.getTableRenderer();
+
+ TableRenderer tableRenderer = dgm.getTableRenderer();
assert tableRenderer != null;
- StyleModel styleModel = dataGridTagModel.getStyleModel();
+
+ StyleModel styleModel = dgm.getStyleModel();
assert styleModel != null;
+
AbstractRenderAppender appender = new
WriteRenderAppender(jspContext);
TrTag.State trState = new TrTag.State();
trState.styleClass = styleModel.getFooterRowClass();
- if(dataGridTagModel.isRenderRowGroups()) {
+ if(dgm.isRenderRowGroups()) {
if(_tfootTag.styleClass == null)
_tfootTag.styleClass = styleModel.getTableFootClass();
tableRenderer.openTableFoot(_tfootTag, appender);
@@ -358,7 +363,7 @@
tableRenderer.closeFooterRow(appender);
- if(dataGridTagModel.isRenderRowGroups())
+ if(dgm.isRenderRowGroups())
tableRenderer.closeTableFoot(appender);
}
}
Modified:
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/GetDataGridState.java
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/GetDataGridState.java?view=diff&r1=160929&r2=160930
==============================================================================
---
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/GetDataGridState.java
(original)
+++
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/GetDataGridState.java
Mon Apr 11 10:46:50 2005
@@ -38,7 +38,7 @@
private DataGridConfig _config = null;
public final String getTagName() {
- return "getDataGridStateService";
+ return "GetDataGridState";
}
/**
@@ -64,7 +64,8 @@
public void doTag() {
JspContext jspContext = getJspContext();
- DataGridStateFactory factory =
DataGridStateFactory.getInstance(getJspContext());
+ DataGridStateFactory factory =
DataGridStateFactory.getInstance(jspContext);
+
DataGridState state = null;
if(_config != null)
state = factory.getDataGridState(_name, _config);
Modified:
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/Header.java
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/Header.java?view=diff&r1=160929&r2=160930
==============================================================================
---
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/Header.java
(original)
+++
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/Header.java
Mon Apr 11 10:46:50 2005
@@ -35,6 +35,7 @@
import
org.apache.beehive.netui.databinding.datagrid.api.rendering.DataGridTagModel;
import org.apache.beehive.netui.databinding.datagrid.api.rendering.StyleModel;
import
org.apache.beehive.netui.databinding.datagrid.runtime.rendering.table.TableRenderer;
+import org.apache.beehive.netui.util.Bundle;
/**
* @jsptagref.tagdescription Renders an HTML table head tag
(<code><thead></code>).
@@ -327,23 +328,24 @@
throws JspException, IOException {
JspContext jspContext = getJspContext();
- DataGridTagModel dataGridModel =
DataGridUtil.getDataGridTagModel(jspContext);
- if(dataGridModel == null)
- throw new JspException("Unable to find a Data Grid tag model in
the JspContext");
+ DataGridTagModel dgm = DataGridUtil.getDataGridTagModel(jspContext);
+ if(dgm == null)
+ throw new
JspException(Bundle.getErrorString("DataGridTags_MissingDataGridModel"));
- int gridRenderState = dataGridModel.getRenderState();
+ int gridRenderState = dgm.getRenderState();
if(gridRenderState == DataGridTagModel.RENDER_STATE_HEADER) {
+ /* todo: replace StringBuilderRenderAppender with
WriteRenderAppender */
StringBuilder content = new StringBuilder();
AbstractRenderAppender appender = new
StringBuilderRenderAppender(content);
- StyleModel styleModel = dataGridModel.getStyleModel();
+ StyleModel styleModel = dgm.getStyleModel();
assert styleModel != null;
- TableRenderer tableRenderer = dataGridModel.getTableRenderer();
+ TableRenderer tableRenderer = dgm.getTableRenderer();
assert tableRenderer != null;
- if(dataGridModel.isRenderRowGroups()) {
+ if(dgm.isRenderRowGroups()) {
_theadTag.styleClass = (_theadTag.styleClass != null ?
_theadTag.styleClass : styleModel.getTableHeadClass());
tableRenderer.openTableHead(_theadTag, appender);
}
@@ -361,7 +363,7 @@
tableRenderer.closeHeaderRow(appender);
- if(dataGridModel.isRenderRowGroups())
+ if(dgm.isRenderRowGroups())
tableRenderer.closeTableHead(appender);
jspContext.getOut().write(content.toString());
Modified:
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/HeaderCell.java
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/HeaderCell.java?view=diff&r1=160929&r2=160930
==============================================================================
---
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/HeaderCell.java
(original)
+++
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/HeaderCell.java
Mon Apr 11 10:46:50 2005
@@ -53,7 +53,6 @@
implements IFormattable, IBehaviorConsumer, IAttributeConsumer {
private static final String TAG_NAME = "HeaderCell";
-
private static final String ATTRIBUTE_HEADER_NAME = "header";
private static final String BEHAVIOR_RENDERER_NAME = "renderer";
private static final String BEHAVIOR_RENDERER_NAME_DEFAULT = "default";
@@ -614,14 +613,14 @@
super.applyAttributes();
if(_headerCellModel.getFilterHref() != null &&
_headerCellModel.getFilterAction() != null)
- throw new JspException("Can not set both the filter action and
HREF attributes");
+ throw new
JspException(Bundle.getErrorString("HeaderCell_CantSetHrefAndAction"));
if(_headerCellModel.getSortHref() != null &&
_headerCellModel.getSortAction() != null)
- throw new JspException("Can not set both the sort action and HREF
attributes");
+ throw new
JspException(Bundle.getErrorString("HeaderCell_CantSetSortHrefAndAction"));
if(_headerCellModel.isSortable()) {
if(_headerCellModel.getSortExpression() == null)
- throw new JspException("Can not enable sorting on a column
with a null sort expression");
+ throw new
JspException(Bundle.getErrorString("HeaderCell_CantEnableSorting"));
/* set an intelligent default for the sorting HREF */
if(_headerCellModel.getSortHref() == null &&
_headerCellModel.getSortAction() == null)
@@ -630,7 +629,7 @@
if(_headerCellModel.isFilterable()) {
if(_headerCellModel.getFilterExpression() == null)
- throw new JspException("Can not enable filtering on a column
with a null filter expression");
+ throw new
JspException(Bundle.getErrorString("HeaderCell_CantEnableFiltering"));
/* set an intelligent default for the filtering HREF */
if(_headerCellModel.getFilterHref() == null &&
_headerCellModel.getFilterAction() == null)
Modified:
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/RenderPager.java
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/RenderPager.java?view=diff&r1=160929&r2=160930
==============================================================================
---
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/RenderPager.java
(original)
+++
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/RenderPager.java
Mon Apr 11 10:46:50 2005
@@ -22,6 +22,7 @@
import
org.apache.beehive.netui.databinding.datagrid.api.rendering.DataGridTagModel;
import org.apache.beehive.netui.tags.AbstractSimpleTag;
+import org.apache.beehive.netui.util.Bundle;
/**
* @jsptagref.tagdescription Renders a pager in a specific spot inside of a
data grid.
@@ -39,8 +40,9 @@
public void doTag()
throws JspException {
- DataGridTagModel dgm =
(DataGridTagModel)getJspContext().getAttribute("dataGrid");
- assert dgm != null : "RenderPager did not find a DataGridTagModel";
+ DataGridTagModel dgm =
DataGridUtil.getDataGridTagModel(getJspContext());
+ if(dgm == null)
+ throw new
JspException(Bundle.getErrorString("DataGridTags_MissingDataGridModel"));
String output = dgm.getPagerRenderer().render();
if(output != null)
Modified:
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/Rows.java
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/Rows.java?view=diff&r1=160929&r2=160930
==============================================================================
---
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/Rows.java
(original)
+++
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/Rows.java
Mon Apr 11 10:46:50 2005
@@ -35,6 +35,7 @@
import org.apache.beehive.netui.tags.rendering.TrTag;
import org.apache.beehive.netui.tags.rendering.TBodyTag;
import org.apache.beehive.netui.tags.rendering.AbstractHtmlState;
+import org.apache.beehive.netui.util.Bundle;
/**
* @jsptagref.tagdescription Container tag for columns that will render in the
data grid.
@@ -327,11 +328,11 @@
public void doTag()
throws IOException, JspException {
+
JspContext jspContext = getJspContext();
DataGridTagModel dataGridModel =
DataGridUtil.getDataGridTagModel(jspContext);
-
if(dataGridModel == null)
- throw new JspException("Unable to find a dataGridModel in the
JspContext");
+ throw new
JspException(Bundle.getErrorString("DataGridTags_MissingDataGridModel"));
if(dataGridModel.getRenderState() ==
DataGridTagModel.RENDER_STATE_GRID) {
StyleModel styleModel = dataGridModel.getStyleModel();
@@ -354,8 +355,7 @@
int index = dataGridModel.getCurrentIndex();
if(index % 2 == 0)
trState.styleClass = styleModel.getRowClass();
- else
- trState.styleClass = styleModel.getAltRowClass();
+ else trState.styleClass = styleModel.getAltRowClass();
tableRenderer.openTableRow(trState, appender);
dataGridModel.nextDataItem();
Modified:
incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/netui.properties
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/netui.properties?view=diff&r1=160929&r2=160930
==============================================================================
---
incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/netui.properties
(original)
+++
incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/netui.properties
Mon Apr 11 10:46:50 2005
@@ -662,6 +662,13 @@
DataGridUtil_InvalidParentClass=Invalid data grid extension. The class
\"{0}\" is not a subclass or sub interface of \"{1}\"
DataGridUtil_IllegalJspContext=Can not create a PageContext from a JspContext
of type: {0}
DataGridTags_MissingDataGridModel=Unable to find a dataGridModel in the
JspContext
+ConfigurePager_CantCreateCustomPagerRenderer=Unable to create custom pager
renderer. Cause: {0}
+ConfigurePager_UnsupportedPagerFormat=The pagerFormat \"{0}\" is not supported
+ConfigurePager_CantSetHrefAndAction=The configurePager tag can't set both the
pageAction and pageHref attributes
+HeaderCell_CantSetHrefAndAction=Can not set both the filter action and href
attributes
+HeaderCell_CantSetSortHrefAndAction=Can not set both the sort action and href
attributes
+HeaderCell_CantEnableSorting=Can not enable sorting on a column with a null
sort expression
+HeaderCell_CantEnableFiltering=Can not enable filtering on a column with a
null filter expression
#
# Utility Strings
