svn commit: r154433 [1/2] - 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/api/util/ src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/ src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/model/ src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/model/cell/ src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/model/style/ src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/rendering/cell/ src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/rendering/pager/ src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/util/ 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/src/databinding/datagrid/decorator/ test/webapps/drt/coreWeb/WEB-INF/src/databinding/datagrid/renderer/

ekoneil 19 Feb 2005 18:08:25 -0000

Author: ekoneil
Date: Sat Feb 19 10:08:11 2005
New Revision: 154433

URL: http://svn.apache.org/viewcvs?view=rev&rev=154433
Log:
Last mile (kilometer?) of repackaging the data grid into api/ and runtime/.


It should be the case that the data grid is extensible by importing the classes 
in api/ now.  If it's not, we should talk about it.  <g>

This checkin moves the following base classes into api/:

api/rendering/
- PagerRenderer.java
- CellModel.java
- StyleModel.java
- CellDecorator.java
- IDataGridMessageKeys
- DataGridTagModel

This also renames StylePolicy to StyleModel for consistency.

BB: self
DRT: NetUI pass


Added:
    
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/api/rendering/
    
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/api/rendering/CellDecorator.java
      - copied, changed from r154408, 
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/rendering/cell/CellDecorator.java
    
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/api/rendering/CellModel.java
      - copied, changed from r154408, 
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/model/cell/CellModel.java
    
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/api/rendering/DataGridTagModel.java
      - copied, changed from r154408, 
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/model/DataGridModel.java
    
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/api/rendering/IDataGridMessageKeys.java
      - copied, changed from r154408, 
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/util/IDataGridMessageKeys.java
    
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/api/rendering/PagerRenderer.java
      - copied, changed from r154408, 
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/rendering/pager/PagerRenderer.java
    
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/api/rendering/StyleModel.java
      - copied, changed from r154408, 
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/model/style/StylePolicy.java
    
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/model/style/DefaultStyleModel.java
      - copied, changed from r154408, 
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/model/style/DefaultStylePolicy.java
    
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/model/style/EmptyStyleModel.java
      - copied, changed from r154408, 
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/model/style/EmptyStylePolicy.java
Removed:
    
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/api/util/
    
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/model/DataGridModel.java
    
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/model/cell/CellModel.java
    
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/model/style/DefaultStylePolicy.java
    
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/model/style/EmptyStylePolicy.java
    
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/model/style/StylePolicy.java
    
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/rendering/cell/CellDecorator.java
    
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/rendering/pager/PagerRenderer.java
    
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/util/IDataGridMessageKeys.java
Modified:
    
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/DataGridFactory.java
    
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/DefaultDataGridFactory.java
    
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/model/cell/AnchorCellModel.java
    
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/model/cell/HeaderCellModel.java
    
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/model/cell/ImageCellModel.java
    
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/model/cell/SpanCellModel.java
    
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/model/cell/TemplateCellModel.java
    
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/rendering/cell/AnchorCellDecorator.java
    
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/rendering/cell/HeaderCellDecorator.java
    
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/rendering/cell/ImageAnchorCellDecorator.java
    
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/rendering/cell/ImageCellDecorator.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/databinding/datagrid/runtime/rendering/cell/SpanCellDecorator.java
    
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/rendering/pager/FirstPreviousNextLastPagerRenderer.java
    
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/rendering/pager/PreviousNextPagerRenderer.java
    
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/AbstractCell.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/AnchorCell.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/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/ImageAnchorCell.java
    
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/ImageCell.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/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/SpanCell.java
    
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/TemplateCell.java
    
incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/datagrid/DataGridTestUtil.java
    
incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/datagrid/PagerModelTest.java
    
incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/datagrid/PagerRendererTest.java
    
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/WEB-INF/src/databinding/datagrid/decorator/FooDecorator.java
    
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/WEB-INF/src/databinding/datagrid/decorator/HelloWorldDecorator.java
    
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/WEB-INF/src/databinding/datagrid/renderer/HelloWorldPagerRenderer.java

Copied: 
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/api/rendering/CellDecorator.java
 (from r154408, 
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/rendering/cell/CellDecorator.java)
URL: 
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/api/rendering/CellDecorator.java?view=diff&rev=154433&p1=incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/rendering/cell/CellDecorator.java&r1=154408&p2=incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/api/rendering/CellDecorator.java&r2=154433
==============================================================================
--- 
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/rendering/cell/CellDecorator.java
 (original)
+++ 
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/api/rendering/CellDecorator.java
 Sat Feb 19 10:08:11 2005
@@ -15,12 +15,11 @@
  *
  * $Header:$
  */
-package org.apache.beehive.netui.databinding.datagrid.runtime.rendering.cell;
+package org.apache.beehive.netui.databinding.datagrid.api.rendering;
 
 import javax.servlet.jsp.JspContext;
 
 import org.apache.beehive.netui.tags.rendering.AbstractRenderAppender;
-import 
org.apache.beehive.netui.databinding.datagrid.runtime.model.cell.CellModel;
 import 
org.apache.beehive.netui.databinding.datagrid.api.exceptions.CellDecoratorException;
 
 /**

Copied: 
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/api/rendering/CellModel.java
 (from r154408, 
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/model/cell/CellModel.java)
URL: 
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/api/rendering/CellModel.java?view=diff&rev=154433&p1=incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/model/cell/CellModel.java&r1=154408&p2=incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/api/rendering/CellModel.java&r2=154433
==============================================================================
--- 
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/model/cell/CellModel.java
 (original)
+++ 
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/api/rendering/CellModel.java
 Sat Feb 19 10:08:11 2005
@@ -15,14 +15,13 @@
  *
  * $Header:$
  */
-package org.apache.beehive.netui.databinding.datagrid.runtime.model.cell;
+package org.apache.beehive.netui.databinding.datagrid.api.rendering;
 
 import java.util.ArrayList;
 import javax.servlet.jsp.JspException;
 
 import org.apache.beehive.netui.tags.html.FormatTag.Formatter;
 import org.apache.beehive.netui.util.logging.Logger;
-import 
org.apache.beehive.netui.databinding.datagrid.runtime.model.DataGridModel;
 
 /**
  */
@@ -30,7 +29,7 @@
 
     private static final Logger LOGGER = Logger.getInstance(CellModel.class);
 
-    private DataGridModel _dataGridModel;
+    private DataGridTagModel _dataGridTagModel;
     private ArrayList<Formatter> _formatters;
 
     public boolean isRenderingHeader() {
@@ -41,12 +40,12 @@
         return false;
     }
 
-    public DataGridModel getDataGridModel() {
-        return _dataGridModel;
+    public DataGridTagModel getDataGridTagModel() {
+        return _dataGridTagModel;
     }
 
-    public void setDataGridModel(DataGridModel dataGridModel) {
-        _dataGridModel = dataGridModel;
+    public void setDataGridTagModel(DataGridTagModel dataGridTagModel) {
+        _dataGridTagModel = dataGridTagModel;
     }
 
     public void addFormatter(Formatter formatter) {

Copied: 
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/api/rendering/DataGridTagModel.java
 (from r154408, 
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/model/DataGridModel.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&rev=154433&p1=incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/model/DataGridModel.java&r1=154408&p2=incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/api/rendering/DataGridTagModel.java&r2=154433
==============================================================================
--- 
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/model/DataGridModel.java
 (original)
+++ 
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/api/rendering/DataGridTagModel.java
 Sat Feb 19 10:08:11 2005
@@ -15,22 +15,20 @@
  *
  * $Header:$
  */
-package org.apache.beehive.netui.databinding.datagrid.runtime.model;
+package org.apache.beehive.netui.databinding.datagrid.api.rendering;
 
 import java.util.Map;
 import javax.servlet.jsp.JspContext;
 import javax.servlet.http.HttpServletRequest;
 
-import 
org.apache.beehive.netui.databinding.datagrid.runtime.model.style.StylePolicy;
+import 
org.apache.beehive.netui.databinding.datagrid.api.rendering.IDataGridMessageKeys;
 import org.apache.beehive.netui.databinding.datagrid.api.sort.SortModel;
 import org.apache.beehive.netui.databinding.datagrid.api.sort.SortDirection;
 import 
org.apache.beehive.netui.databinding.datagrid.runtime.rendering.table.TableRenderer;
-import 
org.apache.beehive.netui.databinding.datagrid.runtime.rendering.pager.PagerRenderer;
 import 
org.apache.beehive.netui.databinding.datagrid.runtime.DataGridURLService;
 import org.apache.beehive.netui.databinding.datagrid.runtime.DataGridState;
 import org.apache.beehive.netui.databinding.datagrid.runtime.DataGridFactory;
 import org.apache.beehive.netui.databinding.datagrid.runtime.util.PagedDataSet;
-import 
org.apache.beehive.netui.databinding.datagrid.runtime.util.IDataGridMessageKeys;
 import org.apache.beehive.netui.databinding.datagrid.runtime.util.JspUtil;
 import 
org.apache.beehive.netui.databinding.datagrid.runtime.util.DataGridResourceProvider;
 import org.apache.beehive.netui.tags.rendering.AbstractRenderAppender;
@@ -38,7 +36,7 @@
 /**
  *
  */
-public class DataGridModel {
+public class DataGridTagModel {
 
     /*
       todo: refactor.
@@ -54,7 +52,7 @@
     private boolean _disableDefaultPagerRendering = false;
     private String _name = null;
 
-    private StylePolicy _stylePolicy = null;
+    private StyleModel _styleModel = null;
     private PagerRenderer _pagerRenderer = null;
     private PagedDataSet _dataSet = null;
     private TableRenderer _tableRenderer = null;
@@ -66,7 +64,7 @@
     private JspContext _jspContext = null;
     private HttpServletRequest _request = null;
 
-    public DataGridModel(JspContext jspContext, String name, PagedDataSet 
dataSet, DataGridFactory factory) {
+    public DataGridTagModel(JspContext jspContext, String name, PagedDataSet 
dataSet, DataGridFactory factory) {
         super();                 
 
         /* todo: refactor. this assembly could should be externalized */
@@ -110,13 +108,14 @@
     public PagerRenderer getPagerRenderer() {
         if(_pagerRenderer == null) {
             _pagerRenderer = _dataGridFactory.getDefaultPagerRenderer();
-            _pagerRenderer.setDataGridModel(this);
+            _pagerRenderer.setDataGridTagModel(this);
         }
 
         return _pagerRenderer;
     }
 
     public void setPagerRenderer(PagerRenderer pagerRenderer) {
+        pagerRenderer.setDataGridTagModel(this);
         _pagerRenderer = pagerRenderer;
     }
 
@@ -136,12 +135,12 @@
         _tableRenderer = tableRenderer;
     }
 
-    public StylePolicy getStylePolicy() {
-        return _stylePolicy;
+    public StyleModel getStyleModel() {
+        return _styleModel;
     }
 
-    public void setStylePolicy(StylePolicy cssPolicy) {
-        _stylePolicy = cssPolicy;
+    public void setStyleModel(StyleModel cssModel) {
+        _styleModel = cssModel;
     }
 
     public String getResourcePath() {

Copied: 
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/api/rendering/IDataGridMessageKeys.java
 (from r154408, 
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/util/IDataGridMessageKeys.java)
URL: 
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/api/rendering/IDataGridMessageKeys.java?view=diff&rev=154433&p1=incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/util/IDataGridMessageKeys.java&r1=154408&p2=incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/api/rendering/IDataGridMessageKeys.java&r2=154433
==============================================================================
--- 
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/util/IDataGridMessageKeys.java
 (original)
+++ 
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/api/rendering/IDataGridMessageKeys.java
 Sat Feb 19 10:08:11 2005
@@ -15,7 +15,7 @@
  *
  * $Header:$
  */
-package org.apache.beehive.netui.databinding.datagrid.runtime.util;
+package org.apache.beehive.netui.databinding.datagrid.api.rendering;
 
 /**
  *

Copied: 
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/api/rendering/PagerRenderer.java
 (from r154408, 
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/rendering/pager/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&rev=154433&p1=incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/rendering/pager/PagerRenderer.java&r1=154408&p2=incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/api/rendering/PagerRenderer.java&r2=154433
==============================================================================
--- 
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/rendering/pager/PagerRenderer.java
 (original)
+++ 
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/api/rendering/PagerRenderer.java
 Sat Feb 19 10:08:11 2005
@@ -15,7 +15,7 @@
  *
  * $Header:$
  */
-package org.apache.beehive.netui.databinding.datagrid.runtime.rendering.pager;
+package org.apache.beehive.netui.databinding.datagrid.api.rendering;
 
 import java.util.Map;
 import java.net.URISyntaxException;
@@ -23,14 +23,12 @@
 
 import 
org.apache.beehive.netui.databinding.datagrid.api.exceptions.CellDecoratorException;
 import org.apache.beehive.netui.databinding.datagrid.api.pager.PagerModel;
-import 
org.apache.beehive.netui.databinding.datagrid.runtime.model.DataGridModel;
 import org.apache.beehive.netui.databinding.datagrid.runtime.util.JspUtil;
-import 
org.apache.beehive.netui.databinding.datagrid.runtime.util.IDataGridMessageKeys;
-import org.apache.beehive.netui.util.logging.Logger;
 import org.apache.beehive.netui.tags.rendering.AnchorTag;
 import org.apache.beehive.netui.tags.rendering.TagRenderingBase;
 import org.apache.beehive.netui.tags.rendering.StringBuilderRenderAppender;
 import org.apache.beehive.netui.tags.rendering.AbstractRenderAppender;
+import org.apache.beehive.netui.util.logging.Logger;
 
 /**
  *
@@ -40,7 +38,7 @@
     private static final Logger LOGGER = 
Logger.getInstance(PagerRenderer.class);
 
     private PagerModel _pagerModel;
-    private DataGridModel _gridModel;
+    private DataGridTagModel _gridModel;
     private HttpServletRequest _request = null;
     private TagRenderingBase _anchorTag = null;
     private AnchorTag.State _anchorState = new AnchorTag.State();
@@ -49,11 +47,11 @@
         return _pagerModel;
     }
 
-    public DataGridModel getDataGridModel() {
+    public DataGridTagModel getDataGridTagModel() {
         return _gridModel;
     }
 
-    public void setDataGridModel(DataGridModel gridModel) {
+    public void setDataGridTagModel(DataGridTagModel gridModel) {
         assert gridModel != null;
 
         _gridModel = gridModel;

Copied: 
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/api/rendering/StyleModel.java
 (from r154408, 
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/model/style/StylePolicy.java)
URL: 
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/api/rendering/StyleModel.java?view=diff&rev=154433&p1=incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/model/style/StylePolicy.java&r1=154408&p2=incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/api/rendering/StyleModel.java&r2=154433
==============================================================================
--- 
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/model/style/StylePolicy.java
 (original)
+++ 
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/api/rendering/StyleModel.java
 Sat Feb 19 10:08:11 2005
@@ -15,23 +15,23 @@
  *
  * $Header:$
  */
-package org.apache.beehive.netui.databinding.datagrid.runtime.model.style;
+package org.apache.beehive.netui.databinding.datagrid.api.rendering;
 
 import java.util.List;
 
 /**
  *
  */
-public abstract class StylePolicy {
+public abstract class StyleModel {
 
     private static final String DELIM = "-";
 
     private String _stylePrefix = null;
 
-    public StylePolicy() {
+    public StyleModel() {
     }
 
-    public StylePolicy(String stylePrefix) {
+    public StyleModel(String stylePrefix) {
         _stylePrefix = stylePrefix;
     }
 

Modified: 
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/DataGridFactory.java
URL: 
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/DataGridFactory.java?view=diff&r1=154432&r2=154433
==============================================================================
--- 
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/DataGridFactory.java
 (original)
+++ 
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/DataGridFactory.java
 Sat Feb 19 10:08:11 2005
@@ -24,7 +24,7 @@
 import org.apache.beehive.netui.databinding.datagrid.api.filter.Filter;
 import org.apache.beehive.netui.databinding.datagrid.api.filter.FilterModel;
 import org.apache.beehive.netui.databinding.datagrid.api.pager.PagerModel;
-import 
org.apache.beehive.netui.databinding.datagrid.runtime.rendering.pager.PagerRenderer;
+import 
org.apache.beehive.netui.databinding.datagrid.api.rendering.PagerRenderer;
 import 
org.apache.beehive.netui.databinding.datagrid.runtime.util.DataGridResourceProvider;
 
 /**

Modified: 
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/DefaultDataGridFactory.java
URL: 
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/DefaultDataGridFactory.java?view=diff&r1=154432&r2=154433
==============================================================================
--- 
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/DefaultDataGridFactory.java
 (original)
+++ 
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/DefaultDataGridFactory.java
 Sat Feb 19 10:08:11 2005
@@ -24,7 +24,7 @@
 import org.apache.beehive.netui.databinding.datagrid.api.filter.Filter;
 import org.apache.beehive.netui.databinding.datagrid.api.filter.FilterModel;
 import org.apache.beehive.netui.databinding.datagrid.api.pager.PagerModel;
-import 
org.apache.beehive.netui.databinding.datagrid.runtime.rendering.pager.PagerRenderer;
+import 
org.apache.beehive.netui.databinding.datagrid.api.rendering.PagerRenderer;
 import 
org.apache.beehive.netui.databinding.datagrid.runtime.rendering.pager.PreviousNextPagerRenderer;
 import 
org.apache.beehive.netui.databinding.datagrid.runtime.util.DataGridResourceProvider;
 

Modified: 
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/model/cell/AnchorCellModel.java
URL: 
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/model/cell/AnchorCellModel.java?view=diff&r1=154432&r2=154433
==============================================================================
--- 
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/model/cell/AnchorCellModel.java
 (original)
+++ 
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/model/cell/AnchorCellModel.java
 Sat Feb 19 10:08:11 2005
@@ -21,6 +21,7 @@
 
 import org.apache.beehive.netui.tags.rendering.AnchorTag;
 import org.apache.beehive.netui.tags.rendering.AnchorTag.State;
+import org.apache.beehive.netui.databinding.datagrid.api.rendering.CellModel;
 
 /**
  *

Modified: 
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/model/cell/HeaderCellModel.java
URL: 
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/model/cell/HeaderCellModel.java?view=diff&r1=154432&r2=154433
==============================================================================
--- 
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/model/cell/HeaderCellModel.java
 (original)
+++ 
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/model/cell/HeaderCellModel.java
 Sat Feb 19 10:08:11 2005
@@ -17,6 +17,8 @@
  */
 package org.apache.beehive.netui.databinding.datagrid.runtime.model.cell;
 
+import org.apache.beehive.netui.databinding.datagrid.api.rendering.CellModel;
+
 /**
  *
  */

Modified: 
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/model/cell/ImageCellModel.java
URL: 
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/model/cell/ImageCellModel.java?view=diff&r1=154432&r2=154433
==============================================================================
--- 
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/model/cell/ImageCellModel.java
 (original)
+++ 
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/model/cell/ImageCellModel.java
 Sat Feb 19 10:08:11 2005
@@ -19,6 +19,7 @@
 
 import org.apache.beehive.netui.tags.rendering.ImageTag;
 import org.apache.beehive.netui.tags.rendering.ImageTag.State;
+import org.apache.beehive.netui.databinding.datagrid.api.rendering.CellModel;
 
 /**
  *

Modified: 
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/model/cell/SpanCellModel.java
URL: 
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/model/cell/SpanCellModel.java?view=diff&r1=154432&r2=154433
==============================================================================
--- 
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/model/cell/SpanCellModel.java
 (original)
+++ 
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/model/cell/SpanCellModel.java
 Sat Feb 19 10:08:11 2005
@@ -19,6 +19,7 @@
 
 import org.apache.beehive.netui.tags.rendering.SpanTag;
 import org.apache.beehive.netui.tags.rendering.SpanTag.State;
+import org.apache.beehive.netui.databinding.datagrid.api.rendering.CellModel;
 
 /**
  *

Modified: 
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/model/cell/TemplateCellModel.java
URL: 
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/model/cell/TemplateCellModel.java?view=diff&r1=154432&r2=154433
==============================================================================
--- 
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/model/cell/TemplateCellModel.java
 (original)
+++ 
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/model/cell/TemplateCellModel.java
 Sat Feb 19 10:08:11 2005
@@ -17,6 +17,8 @@
  */
 package org.apache.beehive.netui.databinding.datagrid.runtime.model.cell;
 
+import org.apache.beehive.netui.databinding.datagrid.api.rendering.CellModel;
+
 /**
  *
  */

Copied: 
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/model/style/DefaultStyleModel.java
 (from r154408, 
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/model/style/DefaultStylePolicy.java)
URL: 
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/model/style/DefaultStyleModel.java?view=diff&rev=154433&p1=incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/model/style/DefaultStylePolicy.java&r1=154408&p2=incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/model/style/DefaultStyleModel.java&r2=154433
==============================================================================
--- 
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/model/style/DefaultStylePolicy.java
 (original)
+++ 
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/model/style/DefaultStyleModel.java
 Sat Feb 19 10:08:11 2005
@@ -17,17 +17,19 @@
  */
 package org.apache.beehive.netui.databinding.datagrid.runtime.model.style;
 
+import org.apache.beehive.netui.databinding.datagrid.api.rendering.StyleModel;
+
 /**
  *
  */
-public class DefaultStylePolicy
-    extends StylePolicy {
+public class DefaultStyleModel
+    extends StyleModel {
 
-    public DefaultStylePolicy() {
+    public DefaultStyleModel() {
         this(null);
     }
 
-    public DefaultStylePolicy(String prefix) {
+    public DefaultStyleModel(String prefix) {
         super(prefix);
     }
 

Copied: 
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/model/style/EmptyStyleModel.java
 (from r154408, 
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/model/style/EmptyStylePolicy.java)
URL: 
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/model/style/EmptyStyleModel.java?view=diff&rev=154433&p1=incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/model/style/EmptyStylePolicy.java&r1=154408&p2=incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/model/style/EmptyStyleModel.java&r2=154433
==============================================================================
--- 
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/model/style/EmptyStylePolicy.java
 (original)
+++ 
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/model/style/EmptyStyleModel.java
 Sat Feb 19 10:08:11 2005
@@ -20,8 +20,8 @@
 /**
  *
  */
-public class EmptyStylePolicy
-    extends DefaultStylePolicy {
+public class EmptyStyleModel
+    extends DefaultStyleModel {
 
     protected String buildStyleClass(String baseStyle) {
         return baseStyle;

Modified: 
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/rendering/cell/AnchorCellDecorator.java
URL: 
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/rendering/cell/AnchorCellDecorator.java?view=diff&r1=154432&r2=154433
==============================================================================
--- 
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/rendering/cell/AnchorCellDecorator.java
 (original)
+++ 
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/rendering/cell/AnchorCellDecorator.java
 Sat Feb 19 10:08:11 2005
@@ -21,11 +21,12 @@
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.jsp.JspContext;
 
-import 
org.apache.beehive.netui.databinding.datagrid.runtime.model.DataGridModel;
+import 
org.apache.beehive.netui.databinding.datagrid.api.rendering.DataGridTagModel;
 import 
org.apache.beehive.netui.databinding.datagrid.runtime.model.cell.AnchorCellModel;
-import 
org.apache.beehive.netui.databinding.datagrid.runtime.model.cell.CellModel;
+import org.apache.beehive.netui.databinding.datagrid.api.rendering.CellModel;
 import org.apache.beehive.netui.databinding.datagrid.runtime.util.JspUtil;
 import 
org.apache.beehive.netui.databinding.datagrid.api.exceptions.CellDecoratorException;
+import 
org.apache.beehive.netui.databinding.datagrid.api.rendering.CellDecorator;
 import org.apache.beehive.netui.tags.rendering.AbstractRenderAppender;
 import org.apache.beehive.netui.tags.rendering.SpanTag;
 import org.apache.beehive.netui.tags.rendering.AnchorTag;
@@ -53,7 +54,7 @@
         SpanTag.State spanState = new SpanTag.State();
         AnchorTag.State anchorState = anchorCellModel.getAnchorState();
 
-        DataGridModel dgm = DataGridUtil.getDataGridModel(jspContext);
+        DataGridTagModel dgm = DataGridUtil.getDataGridTagModel(jspContext);
         assert dgm != null;
 
         String url = null;

Modified: 
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/rendering/cell/HeaderCellDecorator.java
URL: 
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/rendering/cell/HeaderCellDecorator.java?view=diff&r1=154432&r2=154433
==============================================================================
--- 
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/rendering/cell/HeaderCellDecorator.java
 (original)
+++ 
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/rendering/cell/HeaderCellDecorator.java
 Sat Feb 19 10:08:11 2005
@@ -20,9 +20,10 @@
 import javax.servlet.jsp.JspContext;
 
 import 
org.apache.beehive.netui.databinding.datagrid.api.exceptions.CellDecoratorException;
-import org.apache.beehive.netui.tags.rendering.AbstractRenderAppender;
+import org.apache.beehive.netui.databinding.datagrid.api.rendering.CellModel;
+import 
org.apache.beehive.netui.databinding.datagrid.api.rendering.CellDecorator;
 import 
org.apache.beehive.netui.databinding.datagrid.runtime.model.cell.HeaderCellModel;
-import 
org.apache.beehive.netui.databinding.datagrid.runtime.model.cell.CellModel;
+import org.apache.beehive.netui.tags.rendering.AbstractRenderAppender;
 
 /**
  *

Modified: 
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/rendering/cell/ImageAnchorCellDecorator.java
URL: 
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/rendering/cell/ImageAnchorCellDecorator.java?view=diff&r1=154432&r2=154433
==============================================================================
--- 
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/rendering/cell/ImageAnchorCellDecorator.java
 (original)
+++ 
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/rendering/cell/ImageAnchorCellDecorator.java
 Sat Feb 19 10:08:11 2005
@@ -27,8 +27,9 @@
 import org.apache.beehive.netui.tags.rendering.TagRenderingBase;
 import org.apache.beehive.netui.tags.databinding.datagrid.DataGridUtil;
 import 
org.apache.beehive.netui.databinding.datagrid.api.exceptions.CellDecoratorException;
-import 
org.apache.beehive.netui.databinding.datagrid.runtime.model.cell.CellModel;
-import 
org.apache.beehive.netui.databinding.datagrid.runtime.model.DataGridModel;
+import 
org.apache.beehive.netui.databinding.datagrid.api.rendering.CellDecorator;
+import org.apache.beehive.netui.databinding.datagrid.api.rendering.CellModel;
+import 
org.apache.beehive.netui.databinding.datagrid.api.rendering.DataGridTagModel;
 import 
org.apache.beehive.netui.databinding.datagrid.runtime.model.cell.ImageAnchorCellModel;
 import org.apache.beehive.netui.databinding.datagrid.runtime.util.JspUtil;
 import org.apache.beehive.netui.util.logging.Logger;
@@ -52,7 +53,7 @@
         AnchorTag.State anchorState = imageAnchorCellModel.getAnchorState();
         ImageTag.State imageState = imageAnchorCellModel.getImageState();
 
-        DataGridModel dgm = DataGridUtil.getDataGridModel(jspContext);
+        DataGridTagModel dgm = DataGridUtil.getDataGridTagModel(jspContext);
         assert dgm != null;
 
         String url = null;

Modified: 
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/rendering/cell/ImageCellDecorator.java
URL: 
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/rendering/cell/ImageCellDecorator.java?view=diff&r1=154432&r2=154433
==============================================================================
--- 
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/rendering/cell/ImageCellDecorator.java
 (original)
+++ 
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/rendering/cell/ImageCellDecorator.java
 Sat Feb 19 10:08:11 2005
@@ -20,12 +20,13 @@
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.jsp.JspContext;
 
-import org.apache.beehive.netui.tags.rendering.AbstractRenderAppender;
-import org.apache.beehive.netui.tags.rendering.TagRenderingBase;
 import 
org.apache.beehive.netui.databinding.datagrid.api.exceptions.CellDecoratorException;
-import 
org.apache.beehive.netui.databinding.datagrid.runtime.model.cell.CellModel;
+import org.apache.beehive.netui.databinding.datagrid.api.rendering.CellModel;
+import 
org.apache.beehive.netui.databinding.datagrid.api.rendering.CellDecorator;
 import 
org.apache.beehive.netui.databinding.datagrid.runtime.model.cell.ImageCellModel;
 import org.apache.beehive.netui.databinding.datagrid.runtime.util.JspUtil;
+import org.apache.beehive.netui.tags.rendering.AbstractRenderAppender;
+import org.apache.beehive.netui.tags.rendering.TagRenderingBase;
 
 /**
  *

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=154432&r2=154433
==============================================================================
--- 
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
 Sat Feb 19 10:08:11 2005
@@ -22,6 +22,14 @@
 import javax.servlet.jsp.JspContext;
 import javax.servlet.http.HttpServletRequest;
 
+import 
org.apache.beehive.netui.databinding.datagrid.api.exceptions.CellDecoratorException;
+import org.apache.beehive.netui.databinding.datagrid.api.sort.SortModel;
+import org.apache.beehive.netui.databinding.datagrid.api.sort.SortDirection;
+import org.apache.beehive.netui.databinding.datagrid.api.rendering.CellModel;
+import 
org.apache.beehive.netui.databinding.datagrid.api.rendering.DataGridTagModel;
+import 
org.apache.beehive.netui.databinding.datagrid.api.rendering.CellDecorator;
+import 
org.apache.beehive.netui.databinding.datagrid.runtime.model.cell.HeaderCellModel;
+import org.apache.beehive.netui.databinding.datagrid.runtime.util.JspUtil;
 import org.apache.beehive.netui.tags.rendering.AbstractRenderAppender;
 import org.apache.beehive.netui.tags.rendering.StringBuilderRenderAppender;
 import org.apache.beehive.netui.tags.rendering.TagRenderingBase;
@@ -29,13 +37,6 @@
 import org.apache.beehive.netui.tags.rendering.ImageTag;
 import org.apache.beehive.netui.tags.rendering.AbstractHtmlState;
 import org.apache.beehive.netui.tags.html.HtmlConstants;
-import 
org.apache.beehive.netui.databinding.datagrid.api.exceptions.CellDecoratorException;
-import org.apache.beehive.netui.databinding.datagrid.api.sort.SortModel;
-import org.apache.beehive.netui.databinding.datagrid.api.sort.SortDirection;
-import 
org.apache.beehive.netui.databinding.datagrid.runtime.model.cell.CellModel;
-import 
org.apache.beehive.netui.databinding.datagrid.runtime.model.cell.HeaderCellModel;
-import 
org.apache.beehive.netui.databinding.datagrid.runtime.model.DataGridModel;
-import org.apache.beehive.netui.databinding.datagrid.runtime.util.JspUtil;
 import org.apache.beehive.netui.util.logging.Logger;
 
 /**
@@ -70,7 +71,7 @@
     protected String buildSortLink(JspContext jspContext, HeaderCellModel 
cellModel) {
 
         HttpServletRequest request = JspUtil.getRequest(jspContext);
-        DataGridModel dgm = cellModel.getDataGridModel();
+        DataGridTagModel dgm = cellModel.getDataGridTagModel();
         assert dgm != null;
 
         SortModel sortModel = dgm.getDataGridState().getSortModel();

Modified: 
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/rendering/cell/SpanCellDecorator.java
URL: 
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/rendering/cell/SpanCellDecorator.java?view=diff&r1=154432&r2=154433
==============================================================================
--- 
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/rendering/cell/SpanCellDecorator.java
 (original)
+++ 
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/rendering/cell/SpanCellDecorator.java
 Sat Feb 19 10:08:11 2005
@@ -20,12 +20,13 @@
 import javax.servlet.jsp.JspContext;
 import javax.servlet.http.HttpServletRequest;
 
-import org.apache.beehive.netui.tags.rendering.AbstractRenderAppender;
-import org.apache.beehive.netui.tags.rendering.TagRenderingBase;
 import 
org.apache.beehive.netui.databinding.datagrid.api.exceptions.CellDecoratorException;
-import 
org.apache.beehive.netui.databinding.datagrid.runtime.model.cell.CellModel;
+import 
org.apache.beehive.netui.databinding.datagrid.api.rendering.CellDecorator;
+import org.apache.beehive.netui.databinding.datagrid.api.rendering.CellModel;
 import 
org.apache.beehive.netui.databinding.datagrid.runtime.model.cell.SpanCellModel;
 import org.apache.beehive.netui.databinding.datagrid.runtime.util.JspUtil;
+import org.apache.beehive.netui.tags.rendering.AbstractRenderAppender;
+import org.apache.beehive.netui.tags.rendering.TagRenderingBase;
 
 /**
  *

Modified: 
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/rendering/pager/FirstPreviousNextLastPagerRenderer.java
URL: 
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/rendering/pager/FirstPreviousNextLastPagerRenderer.java?view=diff&r1=154432&r2=154433
==============================================================================
--- 
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/rendering/pager/FirstPreviousNextLastPagerRenderer.java
 (original)
+++ 
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/rendering/pager/FirstPreviousNextLastPagerRenderer.java
 Sat Feb 19 10:08:11 2005
@@ -18,7 +18,8 @@
 package org.apache.beehive.netui.databinding.datagrid.runtime.rendering.pager;
 
 import org.apache.beehive.netui.databinding.datagrid.api.pager.PagerModel;
-import 
org.apache.beehive.netui.databinding.datagrid.runtime.util.IDataGridMessageKeys;
+import 
org.apache.beehive.netui.databinding.datagrid.api.rendering.IDataGridMessageKeys;
+import 
org.apache.beehive.netui.databinding.datagrid.api.rendering.PagerRenderer;
 
 /**
  * 
@@ -33,7 +34,7 @@
         int lastPage = pagerModel.getLastPage();
 
         /* Page # of #  First / Previous   Next / Last */
-        
buf.append(getDataGridModel().formatMessage(IDataGridMessageKeys.PAGER_FMT_BANNER,
+        
buf.append(getDataGridTagModel().formatMessage(IDataGridMessageKeys.PAGER_FMT_BANNER,
             new Integer[]{currentPage + 1, pagerModel.getLastPage() + 1}));
 
         buf.append("&nbsp;&nbsp;");

Modified: 
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/rendering/pager/PreviousNextPagerRenderer.java
URL: 
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/rendering/pager/PreviousNextPagerRenderer.java?view=diff&r1=154432&r2=154433
==============================================================================
--- 
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/rendering/pager/PreviousNextPagerRenderer.java
 (original)
+++ 
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/rendering/pager/PreviousNextPagerRenderer.java
 Sat Feb 19 10:08:11 2005
@@ -18,7 +18,8 @@
 package org.apache.beehive.netui.databinding.datagrid.runtime.rendering.pager;
 
 import org.apache.beehive.netui.databinding.datagrid.api.pager.PagerModel;
-import 
org.apache.beehive.netui.databinding.datagrid.runtime.util.IDataGridMessageKeys;
+import 
org.apache.beehive.netui.databinding.datagrid.api.rendering.IDataGridMessageKeys;
+import 
org.apache.beehive.netui.databinding.datagrid.api.rendering.PagerRenderer;
 
 public class PreviousNextPagerRenderer
     extends PagerRenderer {
@@ -29,7 +30,7 @@
         int currentPage = pagerModel.getPage();
         int lastPage = pagerModel.getLastPage();
 
-        
buf.append(getDataGridModel().formatMessage(IDataGridMessageKeys.PAGER_FMT_BANNER,
+        
buf.append(getDataGridTagModel().formatMessage(IDataGridMessageKeys.PAGER_FMT_BANNER,
             new Integer[]{currentPage + 1, pagerModel.getLastPage() + 1}));
         buf.append("&nbsp;&nbsp;");
         if(pagerModel.getPreviousPage() >= 0)

Modified: 
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/AbstractCell.java
URL: 
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/AbstractCell.java?view=diff&r1=154432&r2=154433
==============================================================================
--- 
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/AbstractCell.java
 (original)
+++ 
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/AbstractCell.java
 Sat Feb 19 10:08:11 2005
@@ -20,8 +20,8 @@
 import java.io.IOException;
 import javax.servlet.jsp.JspException;
 
-import 
org.apache.beehive.netui.databinding.datagrid.runtime.model.DataGridModel;
-import 
org.apache.beehive.netui.databinding.datagrid.runtime.model.cell.CellModel;
+import 
org.apache.beehive.netui.databinding.datagrid.api.rendering.DataGridTagModel;
+import org.apache.beehive.netui.databinding.datagrid.api.rendering.CellModel;
 import org.apache.beehive.netui.tags.AbstractSimpleTag;
 import org.apache.beehive.netui.tags.rendering.AbstractRenderAppender;
 import org.apache.beehive.netui.tags.rendering.StringBuilderRenderAppender;
@@ -59,13 +59,13 @@
     public void doTag()
         throws JspException, IOException {
 
-        DataGridModel dataGridModel = 
DataGridUtil.getDataGridModel(getJspContext());
+        DataGridTagModel dataGridModel = 
DataGridUtil.getDataGridTagModel(getJspContext());
         assert dataGridModel != null;
 
         int gridRenderState = dataGridModel.getRenderState();
 
         /* START_RENDER_STATE is a no-op for columns */
-        if(gridRenderState == DataGridModel.START_RENDER_STATE) {
+        if(gridRenderState == DataGridTagModel.START_RENDER_STATE) {
             return;
         }
         // otherwise, the ColumnModel associated with this tag
@@ -73,7 +73,7 @@
         // iteration
         else {
             CellModel model = internalGetCellModel();
-            model.setDataGridModel(dataGridModel);
+            model.setDataGridTagModel(dataGridModel);
 
             applyAttributes();
 

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=154432&r2=154433
==============================================================================
--- 
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
 Sat Feb 19 10:08:11 2005
@@ -23,7 +23,7 @@
 import javax.servlet.jsp.tagext.JspFragment;
 import javax.servlet.jsp.JspException;
 
-import 
org.apache.beehive.netui.databinding.datagrid.runtime.model.DataGridModel;
+import 
org.apache.beehive.netui.databinding.datagrid.api.rendering.DataGridTagModel;
 import 
org.apache.beehive.netui.databinding.datagrid.runtime.rendering.table.TableRenderer;
 import org.apache.beehive.netui.databinding.datagrid.api.sort.SortModel;
 import org.apache.beehive.netui.tags.IAttributeConsumer;
@@ -275,7 +275,7 @@
     protected void renderCell(AbstractRenderAppender appender)
         throws IOException, JspException {
 
-        DataGridModel dataGridModel = 
DataGridUtil.getDataGridModel(getJspContext());
+        DataGridTagModel dataGridModel = 
DataGridUtil.getDataGridTagModel(getJspContext());
         assert dataGridModel != null;
 
         TableRenderer tableRenderer = dataGridModel.getTableRenderer();
@@ -285,13 +285,13 @@
         ArrayList<String> styleClasses = new ArrayList<String>();
         SortModel sortModel = dataGridModel.getDataGridState().getSortModel();
         if(sortModel.isSorted(_sortExpression))
-            
styleClasses.add(dataGridModel.getStylePolicy().getDataCellSortedClass());
+            
styleClasses.add(dataGridModel.getStyleModel().getDataCellSortedClass());
 
         if(_tdState.styleClass == null)
-            
styleClasses.add(dataGridModel.getStylePolicy().getDataCellClass());
+            styleClasses.add(dataGridModel.getStyleModel().getDataCellClass());
         else styleClasses.add(_tdState.styleClass);
 
-        _tdState.styleClass = 
dataGridModel.getStylePolicy().buildStyleClassValue(styleClasses);
+        _tdState.styleClass = 
dataGridModel.getStyleModel().buildStyleClassValue(styleClasses);
 
         /* todo: this needs to run in order to cause the nested parameter / 
attribute / etc tags to do their work */
         JspFragment fragment = getJspBody();

Modified: 
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/AnchorCell.java
URL: 
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/AnchorCell.java?view=diff&r1=154432&r2=154433
==============================================================================
--- 
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/AnchorCell.java
 (original)
+++ 
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/AnchorCell.java
 Sat Feb 19 10:08:11 2005
@@ -19,8 +19,8 @@
 
 import javax.servlet.jsp.JspException;
 
+import org.apache.beehive.netui.databinding.datagrid.api.rendering.CellModel;
 import 
org.apache.beehive.netui.databinding.datagrid.runtime.model.cell.AnchorCellModel;
-import 
org.apache.beehive.netui.databinding.datagrid.runtime.model.cell.CellModel;
 import 
org.apache.beehive.netui.databinding.datagrid.runtime.rendering.cell.AnchorCellDecorator;
 import org.apache.beehive.netui.tags.html.IUrlParams;
 import org.apache.beehive.netui.tags.html.HtmlConstants;

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=154432&r2=154433
==============================================================================
--- 
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
 Sat Feb 19 10:08:11 2005
@@ -28,8 +28,8 @@
 import org.apache.beehive.netui.tags.rendering.CaptionTag;
 import org.apache.beehive.netui.tags.rendering.AbstractRenderAppender;
 import org.apache.beehive.netui.tags.rendering.WriteRenderAppender;
-import 
org.apache.beehive.netui.databinding.datagrid.runtime.model.DataGridModel;
-import 
org.apache.beehive.netui.databinding.datagrid.runtime.model.style.StylePolicy;
+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;
 
 /**
@@ -234,16 +234,16 @@
     public void doTag()
         throws IOException, JspException {
 
-        DataGridModel dgm = DataGridUtil.getDataGridModel(getJspContext());
+        DataGridTagModel dgm = 
DataGridUtil.getDataGridTagModel(getJspContext());
         if(dgm == null)
             throw new JspException("Unable to find a dataGridModel in the 
JspContext");
 
-        if(dgm.getRenderState() == DataGridModel.CAPTION_RENDER_STATE) {
+        if(dgm.getRenderState() == DataGridTagModel.CAPTION_RENDER_STATE) {
             JspFragment fragment = getJspBody();
             if(fragment != null) {
                 StringWriter sw = new StringWriter();
                 TableRenderer tableRenderer = dgm.getTableRenderer();
-                StylePolicy stylePolicy = dgm.getStylePolicy();
+                StyleModel stylePolicy = dgm.getStyleModel();
                 AbstractRenderAppender appender = new 
WriteRenderAppender(getJspContext());
 
                 if(_captionTag.styleClass == null)

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=154432&r2=154433
==============================================================================
--- 
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
 Sat Feb 19 10:08:11 2005
@@ -21,8 +21,8 @@
 import javax.servlet.http.HttpServletRequest;
 
 import 
org.apache.beehive.netui.databinding.datagrid.api.exceptions.DataGridExtensionException;
-import 
org.apache.beehive.netui.databinding.datagrid.runtime.model.DataGridModel;
-import 
org.apache.beehive.netui.databinding.datagrid.runtime.rendering.pager.PagerRenderer;
+import 
org.apache.beehive.netui.databinding.datagrid.api.rendering.DataGridTagModel;
+import 
org.apache.beehive.netui.databinding.datagrid.api.rendering.PagerRenderer;
 import 
org.apache.beehive.netui.databinding.datagrid.runtime.rendering.pager.FirstPreviousNextLastPagerRenderer;
 import 
org.apache.beehive.netui.databinding.datagrid.runtime.rendering.pager.PreviousNextPagerRenderer;
 import org.apache.beehive.netui.databinding.datagrid.runtime.util.JspUtil;
@@ -111,7 +111,7 @@
     public void doTag()
         throws JspException {
 
-        DataGridModel dgm = DataGridUtil.getDataGridModel(getJspContext());
+        DataGridTagModel dgm = 
DataGridUtil.getDataGridTagModel(getJspContext());
         assert dgm != null;
 
         PagerModel pm = dgm.getDataGridState().getPagerModel();
@@ -143,8 +143,6 @@
         }
 
         if(pagerRenderer != null) {
-            /* inject the DataGridModel into the PagerRenderer */
-            pagerRenderer.setDataGridModel(dgm);
             dgm.setPagerRenderer(pagerRenderer);
         }
 

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=154432&r2=154433
==============================================================================
--- 
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
 Sat Feb 19 10:08:11 2005
@@ -26,10 +26,10 @@
 import javax.servlet.jsp.tagext.JspFragment;
 import javax.servlet.http.HttpServletRequest;
 
-import 
org.apache.beehive.netui.databinding.datagrid.runtime.model.DataGridModel;
-import 
org.apache.beehive.netui.databinding.datagrid.runtime.model.style.StylePolicy;
-import 
org.apache.beehive.netui.databinding.datagrid.runtime.model.style.DefaultStylePolicy;
-import 
org.apache.beehive.netui.databinding.datagrid.runtime.model.style.EmptyStylePolicy;
+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.model.style.DefaultStyleModel;
+import 
org.apache.beehive.netui.databinding.datagrid.runtime.model.style.EmptyStyleModel;
 import org.apache.beehive.netui.databinding.datagrid.runtime.util.PagedDataSet;
 import 
org.apache.beehive.netui.databinding.datagrid.runtime.rendering.table.TableRenderer;
 import org.apache.beehive.netui.databinding.datagrid.api.pager.PagerModel;
@@ -55,8 +55,8 @@
 
     private static final String FACET_RESOURCE = "resource";
 
-    private static final StylePolicy DEFAULT_STYLE_POLICY = new 
DefaultStylePolicy("datagrid");
-    private static final StylePolicy EMPTY_STYLE_POLICY = new 
EmptyStylePolicy();
+    private static final StyleModel DEFAULT_STYLE_POLICY = new 
DefaultStyleModel("datagrid");
+    private static final StyleModel EMPTY_STYLE_POLICY = new EmptyStyleModel();
     private static final String EMPTY_STYLE_POLICY_NAME = "empty";
     private static final String DEFAULT_STYLE_POLICY_NAME = "default";
 
@@ -65,7 +65,7 @@
     private String _stylePolicyName = null;
     private String _dataSource = null;
     private String _resourceBundlePath = null;
-    private DataGridModel _gridModel = null;
+    private DataGridTagModel _gridTagModel = null;
 
     public String getTagName() {
         return "DataGrid";
@@ -118,7 +118,7 @@
         throws JspException {
 
         if(facet.equals(FACET_RESOURCE)) {
-            _gridModel.addResourceOverride(name, value);
+            _gridTagModel.addResourceOverride(name, value);
         }
         else {
             String s = Bundle.getString("Tags_AttributeFacetNotSupported", new 
Object[]{facet});
@@ -130,7 +130,7 @@
     public void doTag()
         throws JspException, IOException {
 
-        StylePolicy stylePolicy = null;
+        StyleModel styleModel = null;
         JspFragment fragment = getJspBody();
         String dataSource = getDataSource();
         HttpServletRequest request = 
(HttpServletRequest)((PageContext)getJspContext()).getRequest();
@@ -146,18 +146,18 @@
         /* todo: extensibility -- need to go to a factory with this */
         if(_stylePolicyName == null || 
_stylePolicyName.equals(DEFAULT_STYLE_POLICY_NAME)) {
             if(_styleClassPrefix != null)
-                stylePolicy = new DefaultStylePolicy(_styleClassPrefix);
-            else stylePolicy = DEFAULT_STYLE_POLICY;
+                styleModel = new DefaultStyleModel(_styleClassPrefix);
+            else styleModel = DEFAULT_STYLE_POLICY;
         }
         else if(_stylePolicyName != null && 
_stylePolicyName.equals(EMPTY_STYLE_POLICY_NAME))
-            stylePolicy = EMPTY_STYLE_POLICY;
+            styleModel = EMPTY_STYLE_POLICY;
 
         DataGridFactory dgf = DataGridFactory.getInstance();
 
-        _gridModel = new DataGridModel(getJspContext(), _name, dataSet, dgf);
-        _gridModel.setStylePolicy(stylePolicy);
-        _gridModel.setTableRenderer(tableRenderer);
-        _gridModel.setResourceBundlePath(_resourceBundlePath);
+        _gridTagModel = new DataGridTagModel(getJspContext(), _name, dataSet, 
dgf);
+        _gridTagModel.setStyleModel(styleModel);
+        _gridTagModel.setTableRenderer(tableRenderer);
+        _gridTagModel.setResourceBundlePath(_resourceBundlePath);
 
         if(fragment != null) {
             StringBuilder builder = new StringBuilder(2048);
@@ -165,7 +165,7 @@
 
             /* todo: perf -- this doesn't need to happen when the data set is 
empty */
             DataAccessProviderStack.addDataAccessProvider(this, 
getJspContext());
-            DataGridUtil.putDataGridModel(getJspContext(), _gridModel);
+            DataGridUtil.putDataGridTagModel(getJspContext(), _gridTagModel);
 
             /*
                allow sub-tags to do work during START before rendering
@@ -177,22 +177,22 @@
             StringWriter sw = new StringWriter();
             fragment.invoke(sw);
 
-            /* todo: this needs to move into the DataGridModel */
-            PagerModel pm = _gridModel.getDataGridState().getPagerModel();
-            _gridModel.getDataSet().createWindow(pm.getRow(), pm.getRow() + 
pm.getPageSize());
+            /* todo: this needs to move into the DataGridTagModel */
+            PagerModel pm = _gridTagModel.getDataGridState().getPagerModel();
+            _gridTagModel.getDataSet().createWindow(pm.getRow(), pm.getRow() + 
pm.getPageSize());
 
             /* now that the model objects have been initialized, it's time to 
start rendering */
-            _gridModel.setRenderState(DataGridModel.START_RENDER_STATE);
+            _gridTagModel.setRenderState(DataGridTagModel.START_RENDER_STATE);
 
-            if(!_gridModel.isDisableDefaultPagerRendering())
-                _gridModel.renderPager(appender);
+            if(!_gridTagModel.isDisableDefaultPagerRendering())
+                _gridTagModel.renderPager(appender);
 
             TableTag.State tableState = new TableTag.State();
-            tableState.styleClass = stylePolicy.getTableClass();
+            tableState.styleClass = styleModel.getTableClass();
             tableRenderer.openTable(tableState, appender);
 
             /* render the caption */
-            _gridModel.setRenderState(DataGridModel.CAPTION_RENDER_STATE);
+            
_gridTagModel.setRenderState(DataGridTagModel.CAPTION_RENDER_STATE);
             sw = new StringWriter();
             fragment.invoke(sw);
             String caption = sw.toString();
@@ -201,13 +201,13 @@
             }
 
             /* render the grid rows (header and data) */
-            _gridModel.setRenderState(DataGridModel.GRID_RENDER_STATE);
+            _gridTagModel.setRenderState(DataGridTagModel.GRID_RENDER_STATE);
             sw = new StringWriter();
             fragment.invoke(sw);
             appender.append(sw.toString());
 
             /* render the footer */
-            _gridModel.setRenderState(DataGridModel.FOOTER_RENDER_STATE);
+            _gridTagModel.setRenderState(DataGridTagModel.FOOTER_RENDER_STATE);
             sw = new StringWriter();
             fragment.invoke(sw);
             String footer = sw.toString();
@@ -218,7 +218,7 @@
 
             tableRenderer.closeTable(appender);
 
-            _gridModel.setRenderState(DataGridModel.END_RENDER_STATE);
+            _gridTagModel.setRenderState(DataGridTagModel.END_RENDER_STATE);
 
             /* todo: when rendering using thead / tfoot / tbody, they need to 
be rendered
                      in order.  when not rendering like this, they need to be 
written
@@ -228,7 +228,7 @@
         }
 
         DataAccessProviderStack.removeDataAccessProvider(getJspContext());
-        DataGridUtil.removeDataGridModel(getJspContext());
+        DataGridUtil.removeDataGridTagModel(getJspContext());
     }
 
     /* ===========================================================
@@ -238,11 +238,11 @@
      * ===========================================================
      */
     public int getCurrentIndex() {
-        return _gridModel.getCurrentIndex();
+        return _gridTagModel.getCurrentIndex();
     }
 
     public Object getCurrentItem() {
-        return _gridModel.getCurrentItem();
+        return _gridTagModel.getCurrentItem();
     }
 
     public Object getCurrentMetadata() {

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=154432&r2=154433
==============================================================================
--- 
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
 Sat Feb 19 10:08:11 2005
@@ -20,8 +20,8 @@
 import javax.servlet.jsp.JspContext;
 
 import 
org.apache.beehive.netui.databinding.datagrid.api.exceptions.DataGridExtensionException;
-import 
org.apache.beehive.netui.databinding.datagrid.runtime.model.DataGridModel;
-import 
org.apache.beehive.netui.databinding.datagrid.runtime.model.cell.CellModel;
+import 
org.apache.beehive.netui.databinding.datagrid.api.rendering.DataGridTagModel;
+import org.apache.beehive.netui.databinding.datagrid.api.rendering.CellModel;
 import org.apache.beehive.netui.util.logging.Logger;
 
 /**
@@ -32,32 +32,32 @@
     private static final Logger LOGGER = 
Logger.getInstance(DataGridUtil.class);
 
     /*
-     * todo: in order to support nested grids, there needs to be a stack of
+     * 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_MODEL_KEY = "dataGrid";
+    private static final String DATA_GRID_TAG_MODEL_KEY = "dataGrid";
     private static final String CELL_MODEL_KEY = "cell";
 
     /* do not construct */
     private DataGridUtil() {
     }
 
-    public static final DataGridModel getDataGridModel(JspContext jspContext) {
-        Object model = jspContext.getAttribute(DATA_GRID_MODEL_KEY);
-        assert model != null ? model instanceof DataGridModel : true;
-        return (DataGridModel)model;
+    public static final DataGridTagModel getDataGridTagModel(JspContext 
jspContext) {
+        Object model = jspContext.getAttribute(DATA_GRID_TAG_MODEL_KEY);
+        assert model != null ? model instanceof DataGridTagModel : true;
+        return (DataGridTagModel)model;
     }
 
-    public static final void putDataGridModel(JspContext jspContext, 
DataGridModel dataGridModel) {
-        jspContext.setAttribute(DATA_GRID_MODEL_KEY, dataGridModel);
+    public static final void putDataGridTagModel(JspContext jspContext, 
DataGridTagModel dataGridTagModel) {
+        jspContext.setAttribute(DATA_GRID_TAG_MODEL_KEY, dataGridTagModel);
     }
 
-    public static final void removeDataGridModel(JspContext jspContext) {
-        jspContext.removeAttribute(DATA_GRID_MODEL_KEY);
+    public static final void removeDataGridTagModel(JspContext jspContext) {
+        jspContext.removeAttribute(DATA_GRID_TAG_MODEL_KEY);
     }
 
-    public static final CellModel getCellModel(JspContext jspContext, 
DataGridModel dataGridModel) {
+    public static final CellModel getCellModel(JspContext jspContext) {
         Object model = jspContext.getAttribute(CELL_MODEL_KEY);
         assert model != null ? model instanceof CellModel : true;
         return (CellModel)model;

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=154432&r2=154433
==============================================================================
--- 
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
 Sat Feb 19 10:08:11 2005
@@ -29,8 +29,8 @@
 import org.apache.beehive.netui.tags.rendering.WriteRenderAppender;
 import org.apache.beehive.netui.tags.rendering.TFootTag;
 import org.apache.beehive.netui.tags.rendering.TrTag;
-import 
org.apache.beehive.netui.databinding.datagrid.runtime.model.DataGridModel;
-import 
org.apache.beehive.netui.databinding.datagrid.runtime.model.style.StylePolicy;
+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;
 
 /**
@@ -238,16 +238,16 @@
     public void doTag()
         throws IOException, JspException {
 
-        DataGridModel dgm = DataGridUtil.getDataGridModel(getJspContext());
+        DataGridTagModel dgm = 
DataGridUtil.getDataGridTagModel(getJspContext());
         if(dgm == null)
             throw new JspException("Unable to find a dataGridModel in the 
JspContext");
 
-        if(dgm.getRenderState() == DataGridModel.FOOTER_RENDER_STATE) {
+        if(dgm.getRenderState() == DataGridTagModel.FOOTER_RENDER_STATE) {
             JspFragment fragment = getJspBody();
             if(fragment != null) {
                 StringWriter sw = new StringWriter();
                 TableRenderer tableRenderer = dgm.getTableRenderer();
-                StylePolicy stylePolicy = dgm.getStylePolicy();
+                StyleModel stylePolicy = dgm.getStyleModel();
                 AbstractRenderAppender appender = new 
WriteRenderAppender(getJspContext());
 
                 TrTag.State trState = new TrTag.State();

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=154432&r2=154433
==============================================================================
--- 
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
 Sat Feb 19 10:08:11 2005
@@ -30,8 +30,8 @@
 import org.apache.beehive.netui.tags.rendering.AbstractRenderAppender;
 import org.apache.beehive.netui.tags.rendering.StringBuilderRenderAppender;
 import org.apache.beehive.netui.tags.rendering.AbstractHtmlState;
-import 
org.apache.beehive.netui.databinding.datagrid.runtime.model.DataGridModel;
-import 
org.apache.beehive.netui.databinding.datagrid.runtime.model.style.StylePolicy;
+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;
 
 /**
@@ -237,17 +237,17 @@
         throws JspException, IOException {
 
         JspContext jspContext = getJspContext();
-        DataGridModel dataGridModel = 
DataGridUtil.getDataGridModel(jspContext);
+        DataGridTagModel dataGridModel = 
DataGridUtil.getDataGridTagModel(jspContext);
         if(dataGridModel == null)
             throw new JspException("Unable to find a dataGridModel in the 
JspContext");
 
         int gridRenderState = dataGridModel.getRenderState();
-        if(gridRenderState == DataGridModel.GRID_RENDER_STATE) {
+        if(gridRenderState == DataGridTagModel.GRID_RENDER_STATE) {
 
             StringBuilder content = new StringBuilder();
             AbstractRenderAppender appender = new 
StringBuilderRenderAppender(content);
 
-            StylePolicy stylePolicy = dataGridModel.getStylePolicy();
+            StyleModel stylePolicy = dataGridModel.getStyleModel();
             assert stylePolicy != null;
 
             TableRenderer tableRenderer = dataGridModel.getTableRenderer();

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=154432&r2=154433
==============================================================================
--- 
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
 Sat Feb 19 10:08:11 2005
@@ -29,9 +29,9 @@
 import org.apache.beehive.netui.tags.rendering.AbstractHtmlState;
 import org.apache.beehive.netui.tags.rendering.AbstractRenderAppender;
 import 
org.apache.beehive.netui.databinding.datagrid.runtime.model.cell.HeaderCellModel;
-import 
org.apache.beehive.netui.databinding.datagrid.runtime.model.DataGridModel;
-import 
org.apache.beehive.netui.databinding.datagrid.runtime.model.cell.CellModel;
-import 
org.apache.beehive.netui.databinding.datagrid.runtime.rendering.cell.CellDecorator;
+import 
org.apache.beehive.netui.databinding.datagrid.api.rendering.DataGridTagModel;
+import 
org.apache.beehive.netui.databinding.datagrid.api.rendering.CellDecorator;
+import org.apache.beehive.netui.databinding.datagrid.api.rendering.CellModel;
 import 
org.apache.beehive.netui.databinding.datagrid.runtime.rendering.cell.HeaderCellDecorator;
 import 
org.apache.beehive.netui.databinding.datagrid.runtime.rendering.cell.SortedCellDecorator;
 import 
org.apache.beehive.netui.databinding.datagrid.runtime.rendering.table.TableRenderer;
@@ -389,7 +389,7 @@
     protected void renderCell(AbstractRenderAppender appender)
         throws IOException, JspException {
 
-        DataGridModel dataGridModel = 
DataGridUtil.getDataGridModel(getJspContext());
+        DataGridTagModel dataGridModel = 
DataGridUtil.getDataGridTagModel(getJspContext());
         assert dataGridModel != null;
 
         TableRenderer tableRenderer = dataGridModel.getTableRenderer();
@@ -398,16 +398,16 @@
         ArrayList<String> styleClasses = new ArrayList<String>();
         SortModel sortModel = dataGridModel.getDataGridState().getSortModel();
         if(sortModel.isSorted(_headerCellModel.getSortExpression()))
-            
styleClasses.add(dataGridModel.getStylePolicy().getHeaderCellSortedClass());
+            
styleClasses.add(dataGridModel.getStyleModel().getHeaderCellSortedClass());
 
         if(_headerCellModel.isSortable())
-            
styleClasses.add(dataGridModel.getStylePolicy().getHeaderCellSortableClass());
+            
styleClasses.add(dataGridModel.getStyleModel().getHeaderCellSortableClass());
 
         if(_thState.styleClass == null)
-            
styleClasses.add(dataGridModel.getStylePolicy().getHeaderCellClass());
+            
styleClasses.add(dataGridModel.getStyleModel().getHeaderCellClass());
         else styleClasses.add(_thState.styleClass);
 
-        _thState.styleClass = 
dataGridModel.getStylePolicy().buildStyleClassValue(styleClasses);
+        _thState.styleClass = 
dataGridModel.getStyleModel().buildStyleClassValue(styleClasses);
 
         tableRenderer.openHeaderCell(_thState, appender);
         renderHeaderCellContents(appender);
@@ -426,7 +426,7 @@
             bodyContent = sw.toString();
         }
 
-        
_headerCellModel.setDataGridModel(DataGridUtil.getDataGridModel(getJspContext()));
+        
_headerCellModel.setDataGridTagModel(DataGridUtil.getDataGridTagModel(getJspContext()));
         _headerCellModel.setBodyContent(bodyContent);
         _headerCellModel.setHeaderText(_headerText);
 

Modified: 
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/ImageAnchorCell.java
URL: 
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/ImageAnchorCell.java?view=diff&r1=154432&r2=154433
==============================================================================
--- 
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/ImageAnchorCell.java
 (original)
+++ 
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/ImageAnchorCell.java
 Sat Feb 19 10:08:11 2005
@@ -26,7 +26,7 @@
 import org.apache.beehive.netui.tags.html.HtmlConstants;
 import org.apache.beehive.netui.tags.html.IFormattable;
 import org.apache.beehive.netui.tags.html.IUrlParams;
-import 
org.apache.beehive.netui.databinding.datagrid.runtime.model.cell.CellModel;
+import org.apache.beehive.netui.databinding.datagrid.api.rendering.CellModel;
 import 
org.apache.beehive.netui.databinding.datagrid.runtime.model.cell.ImageAnchorCellModel;
 import 
org.apache.beehive.netui.databinding.datagrid.runtime.rendering.cell.ImageAnchorCellDecorator;
 import org.apache.beehive.netui.util.ParamHelper;

Modified: 
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/ImageCell.java
URL: 
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/ImageCell.java?view=diff&r1=154432&r2=154433
==============================================================================
--- 
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/ImageCell.java
 (original)
+++ 
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/ImageCell.java
 Sat Feb 19 10:08:11 2005
@@ -19,8 +19,8 @@
 
 import javax.servlet.jsp.JspException;
 
+import org.apache.beehive.netui.databinding.datagrid.api.rendering.CellModel;
 import 
org.apache.beehive.netui.databinding.datagrid.runtime.model.cell.ImageCellModel;
-import 
org.apache.beehive.netui.databinding.datagrid.runtime.model.cell.CellModel;
 import 
org.apache.beehive.netui.databinding.datagrid.runtime.rendering.cell.ImageCellDecorator;
 import org.apache.beehive.netui.tags.rendering.AbstractHtmlState;
 import org.apache.beehive.netui.tags.rendering.AbstractRenderAppender;

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=154432&r2=154433
==============================================================================
--- 
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
 Sat Feb 19 10:08:11 2005
@@ -20,7 +20,7 @@
 import javax.servlet.jsp.JspContext;
 import javax.servlet.jsp.JspException;
 
-import 
org.apache.beehive.netui.databinding.datagrid.runtime.model.DataGridModel;
+import 
org.apache.beehive.netui.databinding.datagrid.api.rendering.DataGridTagModel;
 import org.apache.beehive.netui.tags.AbstractSimpleTag;
 
 /**
@@ -38,8 +38,8 @@
     public void doTag()
         throws JspException {
         JspContext jspContext = getJspContext();
-        DataGridModel dgm = (DataGridModel)jspContext.getAttribute("dataGrid");
-        assert dgm != null : "RenderPager did not find a DataGridModel";
+        DataGridTagModel dgm = 
(DataGridTagModel)jspContext.getAttribute("dataGrid");
+        assert dgm != null : "RenderPager did not find a DataGridTagModel";
 
         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=154432&r2=154433
==============================================================================
--- 
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
 Sat Feb 19 10:08:11 2005
@@ -23,8 +23,8 @@
 import javax.servlet.jsp.JspContext;
 import javax.servlet.jsp.tagext.JspFragment;
 
-import 
org.apache.beehive.netui.databinding.datagrid.runtime.model.DataGridModel;
-import 
org.apache.beehive.netui.databinding.datagrid.runtime.model.style.StylePolicy;
+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.tags.AbstractSimpleTag;
 import org.apache.beehive.netui.tags.rendering.StringBuilderRenderAppender;
@@ -47,13 +47,13 @@
     public void doTag()
         throws IOException, JspException {
         JspContext jspContext = getJspContext();
-        DataGridModel dataGridModel = 
DataGridUtil.getDataGridModel(jspContext);
+        DataGridTagModel dataGridModel = 
DataGridUtil.getDataGridTagModel(jspContext);
 
         if(dataGridModel == null)
             throw new JspException("Unable to find a dataGridModel in the 
JspContext");
 
-        if(dataGridModel.getRenderState() == DataGridModel.GRID_RENDER_STATE) {
-            StylePolicy stylePolicy = dataGridModel.getStylePolicy();
+        if(dataGridModel.getRenderState() == 
DataGridTagModel.GRID_RENDER_STATE) {
+            StyleModel stylePolicy = dataGridModel.getStyleModel();
             assert stylePolicy != null;
 
             TableRenderer tableRenderer = dataGridModel.getTableRenderer();

Modified: 
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/SpanCell.java
URL: 
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/SpanCell.java?view=diff&r1=154432&r2=154433
==============================================================================
--- 
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/SpanCell.java
 (original)
+++ 
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/SpanCell.java
 Sat Feb 19 10:08:11 2005
@@ -19,13 +19,13 @@
 
 import javax.servlet.jsp.JspException;
 
+import org.apache.beehive.netui.databinding.datagrid.api.rendering.CellModel;
+import 
org.apache.beehive.netui.databinding.datagrid.runtime.model.cell.SpanCellModel;
+import 
org.apache.beehive.netui.databinding.datagrid.runtime.rendering.cell.SpanCellDecorator;
+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.tags.rendering.SpanTag;
-import org.apache.beehive.netui.tags.html.HtmlConstants;
-import 
org.apache.beehive.netui.databinding.datagrid.runtime.model.cell.SpanCellModel;
-import 
org.apache.beehive.netui.databinding.datagrid.runtime.model.cell.CellModel;
-import 
org.apache.beehive.netui.databinding.datagrid.runtime.rendering.cell.SpanCellDecorator;
 
 /**
  * @netui:tag name="spanCell" description="Renders a column of data in a NetUI 
grid" body-content="scriptless"

Reply via email to