svn commit: r154871 - in incubator/beehive/trunk/netui: src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/api/rendering/ src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/rendering/cell/ src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/ test/src/junitTests/org/apache/beehive/netui/test/datagrid/ test/webapps/drt/coreWeb/WEB-INF/tags/org/apache/beehive/netui/test/databinding/tagfiles/

[ek...@apache.org]

Author: ekoneil
Date: Tue Feb 22 08:32:37 2005
New Revision: 154871

URL: http://svn.apache.org/viewcvs?view=rev&rev=154871
Log:
Rename the "getDataGridState" JavaBean accessor to "getState".  No reason to have an expression that looks like:

  ${dataGrid.dataGridState}

when you can have one like:

  ${dataGrid.state}

BB: self
DRT: NetUI / datagrid pass


Modified:
    incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/api/rendering/DataGridTagModel.java
    incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/api/rendering/PagerRenderer.java
    incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/rendering/cell/SortedCellDecorator.java
    incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/AbstractHtmlTableCell.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/HeaderCell.java
    incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/datagrid/DataGridTestUtil.java
    incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/WEB-INF/tags/org/apache/beehive/netui/test/databinding/tagfiles/jumpToPage.tag

Modified: incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/api/rendering/DataGridTagModel.java
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/api/rendering/DataGridTagModel.java?view=diff&r1=154870&r2=154871
==============================================================================
--- incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/api/rendering/DataGridTagModel.java (original)
+++ incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/api/rendering/DataGridTagModel.java Tue Feb 22 08:32:37 2005
@@ -63,7 +63,7 @@
     private TableRenderer _tableRenderer = null;
     private DataGridResourceProvider _resourceProvider = null;
     private DataGridState _dataGridState = null;
-    private DataGridConfig _dataGridConfig;
+    private DataGridConfig _dataGridConfig = null;
 
     public DataGridTagModel(String name, DataGridConfig dataGridConfig, JspContext jspContext) {
         super();                 
@@ -257,7 +257,7 @@
         else throw new IllegalStateException("Received invalid sort direction \"" + sortDirection + "\"");
     }
 
-    public DataGridState getDataGridState() {
+    public DataGridState getState() {
         return _dataGridState;
     }
 

Modified: incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/api/rendering/PagerRenderer.java
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/api/rendering/PagerRenderer.java?view=diff&r1=154870&r2=154871
==============================================================================
--- incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/api/rendering/PagerRenderer.java (original)
+++ incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/api/rendering/PagerRenderer.java Tue Feb 22 08:32:37 2005
@@ -55,7 +55,7 @@
         assert gridModel != null;
 
         _gridModel = gridModel;
-        _pagerModel = _gridModel.getDataGridState().getPagerModel();
+        _pagerModel = _gridModel.getState().getPagerModel();
         _request = JspUtil.getRequest(_gridModel.getJspContext());
         _anchorTag = TagRenderingBase.Factory.getRendering(TagRenderingBase.ANCHOR_TAG, _request);
     }

Modified: incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/rendering/cell/SortedCellDecorator.java
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/rendering/cell/SortedCellDecorator.java?view=diff&r1=154870&r2=154871
==============================================================================
--- incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/rendering/cell/SortedCellDecorator.java (original)
+++ incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/rendering/cell/SortedCellDecorator.java Tue Feb 22 08:32:37 2005
@@ -74,7 +74,7 @@
         DataGridTagModel dgm = cellModel.getDataGridTagModel();
         assert dgm != null;
 
-        SortModel sortModel = dgm.getDataGridState().getSortModel();
+        SortModel sortModel = dgm.getState().getSortModel();
 
         StringBuilder builder = new StringBuilder();
         AbstractRenderAppender appender = new StringBuilderRenderAppender(builder);

Modified: incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/AbstractHtmlTableCell.java
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/AbstractHtmlTableCell.java?view=diff&r1=154870&r2=154871
==============================================================================
--- incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/AbstractHtmlTableCell.java (original)
+++ incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/AbstractHtmlTableCell.java Tue Feb 22 08:32:37 2005
@@ -460,11 +460,11 @@
 
         /* todo: refactor. extensibility in supporting style decorators */
         ArrayList<String> styleClasses = new ArrayList<String>();
-        FilterModel filterModel = dataGridModel.getDataGridState().getFilterModel();
+        FilterModel filterModel = dataGridModel.getState().getFilterModel();
         if(_filterExpression != null && filterModel.isFiltered(_filterExpression))
             styleClasses.add(dataGridModel.getStyleModel().getDataCellFilteredClass());
 
-        SortModel sortModel = dataGridModel.getDataGridState().getSortModel();
+        SortModel sortModel = dataGridModel.getState().getSortModel();
         if(_sortExpression != null && sortModel.isSorted(_sortExpression))
             styleClasses.add(dataGridModel.getStyleModel().getDataCellSortedClass());
 

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=154870&r2=154871
==============================================================================
--- 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 Tue Feb 22 08:32:37 2005
@@ -114,7 +114,7 @@
         DataGridTagModel dgm = DataGridUtil.getDataGridTagModel(getJspContext());
         assert dgm != null;
 
-        PagerModel pm = dgm.getDataGridState().getPagerModel();
+        PagerModel pm = dgm.getState().getPagerModel();
         assert pm != null;
 
         PagerRenderer pagerRenderer = null;

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=154870&r2=154871
==============================================================================
--- 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 Tue Feb 22 08:32:37 2005
@@ -190,7 +190,7 @@
                 fragment.invoke(sw);
 
                 /* todo: this needs to move into the DataGridTagModel */
-                PagerModel pm = _dataGridTagModel.getDataGridState().getPagerModel();
+                PagerModel pm = _dataGridTagModel.getState().getPagerModel();
                 _dataGridTagModel.getDataSet().createWindow(pm.getRow(), pm.getRow() + pm.getPageSize());
 
                 /* now that the model objects have been initialized, it's time to start rendering */

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=154870&r2=154871
==============================================================================
--- 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 Tue Feb 22 08:32:37 2005
@@ -553,11 +553,11 @@
         ArrayList<String> styleClasses = new ArrayList<String>();
 
         /* todo: refactor.  add a chain of decorators here */
-        FilterModel filterModel = dataGridModel.getDataGridState().getFilterModel();
+        FilterModel filterModel = dataGridModel.getState().getFilterModel();
         if(filterModel.isFiltered(_headerCellModel.getFilterExpression()))
             styleClasses.add(dataGridModel.getStyleModel().getHeaderCellFilteredClass());
 
-        SortModel sortModel = dataGridModel.getDataGridState().getSortModel();
+        SortModel sortModel = dataGridModel.getState().getSortModel();
         if(sortModel.isSorted(_headerCellModel.getSortExpression()))
             styleClasses.add(dataGridModel.getStyleModel().getHeaderCellSortedClass());
 

Modified: incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/datagrid/DataGridTestUtil.java
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/datagrid/DataGridTestUtil.java?view=diff&r1=154870&r2=154871
==============================================================================
--- incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/datagrid/DataGridTestUtil.java (original)
+++ incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/datagrid/DataGridTestUtil.java Tue Feb 22 08:32:37 2005
@@ -95,13 +95,13 @@
         DataGridTagModel dgm = new DataGridTagModel(name, config, jspContext);
         dgm.setDataSet(dataSet);
         dgm.setResourceProvider(provider);
-        dgm.getDataGridState().getPagerModel().setPageAction("fauxPageAction.do");
+        dgm.getState().getPagerModel().setPageAction("fauxPageAction.do");
 
         return dgm;
     }
 
     static final PagerModel getPagerModel(DataGridTagModel dgm) {
-        return dgm.getDataGridState().getPagerModel();
+        return dgm.getState().getPagerModel();
     }
 
     static final DataGridConfig getDataGridConfig() {

Modified: incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/WEB-INF/tags/org/apache/beehive/netui/test/databinding/tagfiles/jumpToPage.tag
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/WEB-INF/tags/org/apache/beehive/netui/test/databinding/tagfiles/jumpToPage.tag?view=diff&r1=154870&r2=154871
==============================================================================
--- incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/WEB-INF/tags/org/apache/beehive/netui/test/databinding/tagfiles/jumpToPage.tag (original)
+++ incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/WEB-INF/tags/org/apache/beehive/netui/test/databinding/tagfiles/jumpToPage.tag Tue Feb 22 08:32:37 2005
@@ -21,7 +21,7 @@
   <select name="${dataGrid.pagerRowQueryParamKey}" onchange="doPagerSubmit(this); return true;">
     <netui-data:repeater dataSource="dataGrid.pagerParamValues">
     <c:choose>
-      <c:when test="${container.index == dataGrid.dataGridState.pagerModel.page}">
+      <c:when test="${container.index == dataGrid.state.pagerModel.page}">
         <option value="${container.item}" selected="true">${container.index+1}</option>
       </c:when>
       <c:otherwise>