svn commit: r154408 [1/2] - in incubator/beehive/trunk/netui: src/javascript/tags-datagrid/ src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/api/exceptions/ src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/api/util/ src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/exceptions/ src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/model/ src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/rendering/ 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/ 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/rendering/table/ src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/sql/ src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/util/ src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/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 15:40:17 -0000

Author: ekoneil
Date: Sat Feb 19 07:40:01 2005
New Revision: 154408

URL: http://svn.apache.org/viewcvs?view=rev&rev=154408
Log:
Yet more repackaging.


This is happening in order to draw a clear distinction between the public API 
for the data grid and the classes that exist to support the tag implementation 
but are internal APIs.  The internal APIs live in:

  org/apache/beehive/netui/databinding/datagrid/runtime

and the public APIs are in:

  org/apache/beehive/netui/databinding/datagrid/api

This is part one; another change will come in a while that moves some things 
out of runtime/ into api/.

Also includes a bug fix for the netui-datagrid.js file to fix handling of 
NetUIFilter objects when the filter should be ignored.  There was an extra 
comma being put into the URL that shouldn't have been there.

BB: self
DRT: NetUI pass


Added:
    
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/api/exceptions/
      - copied from r154228, 
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/exceptions/
    
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/api/exceptions/CellDecoratorException.java
      - copied, changed from r154405, 
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/exceptions/CellDecoratorException.java
    
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/api/exceptions/DataGridExtensionException.java
      - copied, changed from r154405, 
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/exceptions/DataGridExtensionException.java
    
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/api/exceptions/IllegalFilterException.java
      - copied, changed from r154405, 
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/exceptions/IllegalFilterException.java
    
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/
      - copied from r154228, 
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/model/
    
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/model/DataGridModel.java
      - copied, changed from r154405, 
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/model/DataGridModel.java
    
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/model/cell/
      - copied from r154405, 
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/model/cell/
    
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/model/style/
      - copied from r154405, 
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/model/style/
    
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/rendering/
      - copied from r154228, 
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/rendering/
    
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/rendering/cell/
      - copied from r154405, 
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/rendering/cell/
    
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/rendering/pager/
      - copied from r154405, 
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/rendering/pager/
    
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/rendering/table/
      - copied from r154405, 
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/rendering/table/
    
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/util/
      - copied from r154228, 
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/util/
    
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/util/DataGridResourceProvider.java
      - copied, changed from r154405, 
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/util/DataGridResourceProvider.java
    
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/util/FilterUtil.java
      - copied, changed from r154405, 
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/util/FilterUtil.java
    
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/util/IDataGridMessageKeys.java
      - copied, changed from r154405, 
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/util/IDataGridMessageKeys.java
    
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/util/JspUtil.java
      - copied, changed from r154405, 
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/util/JspUtil.java
    
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/util/PagedDataSet.java
      - copied, changed from r154405, 
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/util/PagedDataSet.java
    
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/util/data-grid-default.properties
      - copied unchanged from r154405, 
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/util/data-grid-default.properties
Removed:
    
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/exceptions/
    
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/model/
    
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/rendering/
    
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/AbstractDataGridFactory.java
    
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/util/
Modified:
    incubator/beehive/trunk/netui/src/javascript/tags-datagrid/netui-datagrid.js
    
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/DataGridURLService.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/CellModel.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/ImageAnchorCellModel.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/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/AnchorCellDecorator.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/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/PagerRenderer.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/databinding/datagrid/runtime/rendering/table/TableRenderer.java
    
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/sql/SQLSupport.java
    
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/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/FilterModelTest.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/src/junitTests/org/apache/beehive/netui/test/datagrid/SortModelTest.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

Modified: 
incubator/beehive/trunk/netui/src/javascript/tags-datagrid/netui-datagrid.js
URL: 
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/javascript/tags-datagrid/netui-datagrid.js?view=diff&r1=154407&r2=154408
==============================================================================
--- 
incubator/beehive/trunk/netui/src/javascript/tags-datagrid/netui-datagrid.js 
(original)
+++ 
incubator/beehive/trunk/netui/src/javascript/tags-datagrid/netui-datagrid.js 
Sat Feb 19 07:40:01 2005
@@ -203,7 +203,7 @@
     if(p == null)
       continue;
 
-    if(i > 0)
+    if(foundFilter && i > 0)
       paramValue += ',';
     paramValue += p;
     foundFilter = true;

Copied: 
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/api/exceptions/CellDecoratorException.java
 (from r154405, 
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/exceptions/CellDecoratorException.java)
URL: 
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/api/exceptions/CellDecoratorException.java?view=diff&rev=154408&p1=incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/exceptions/CellDecoratorException.java&r1=154405&p2=incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/api/exceptions/CellDecoratorException.java&r2=154408
==============================================================================
--- 
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/exceptions/CellDecoratorException.java
 (original)
+++ 
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/api/exceptions/CellDecoratorException.java
 Sat Feb 19 07:40:01 2005
@@ -15,7 +15,7 @@
  *
  * $Header:$
  */
-package org.apache.beehive.netui.databinding.datagrid.exceptions;
+package org.apache.beehive.netui.databinding.datagrid.api.exceptions;
 
 /**
  *

Copied: 
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/api/exceptions/DataGridExtensionException.java
 (from r154405, 
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/exceptions/DataGridExtensionException.java)
URL: 
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/api/exceptions/DataGridExtensionException.java?view=diff&rev=154408&p1=incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/exceptions/DataGridExtensionException.java&r1=154405&p2=incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/api/exceptions/DataGridExtensionException.java&r2=154408
==============================================================================
--- 
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/exceptions/DataGridExtensionException.java
 (original)
+++ 
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/api/exceptions/DataGridExtensionException.java
 Sat Feb 19 07:40:01 2005
@@ -15,7 +15,7 @@
  *
  * $Header:$
  */
-package org.apache.beehive.netui.databinding.datagrid.exceptions;
+package org.apache.beehive.netui.databinding.datagrid.api.exceptions;
 
 /**
  * Exception thrown when an error occurs while extending the data grid.

Copied: 
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/api/exceptions/IllegalFilterException.java
 (from r154405, 
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/exceptions/IllegalFilterException.java)
URL: 
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/api/exceptions/IllegalFilterException.java?view=diff&rev=154408&p1=incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/exceptions/IllegalFilterException.java&r1=154405&p2=incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/api/exceptions/IllegalFilterException.java&r2=154408
==============================================================================
--- 
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/exceptions/IllegalFilterException.java
 (original)
+++ 
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/api/exceptions/IllegalFilterException.java
 Sat Feb 19 07:40:01 2005
@@ -15,7 +15,7 @@
  *
  * $Header:$
  */
-package org.apache.beehive.netui.databinding.datagrid.exceptions;
+package org.apache.beehive.netui.databinding.datagrid.api.exceptions;
 
 /**
  *

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=154407&r2=154408
==============================================================================
--- 
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 07:40:01 2005
@@ -24,13 +24,17 @@
 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.rendering.pager.PagerRenderer;
-import 
org.apache.beehive.netui.databinding.datagrid.util.DataGridResourceProvider;
+import 
org.apache.beehive.netui.databinding.datagrid.runtime.rendering.pager.PagerRenderer;
+import 
org.apache.beehive.netui.databinding.datagrid.runtime.util.DataGridResourceProvider;
 
 /**
  *
  */
 public abstract class DataGridFactory {
+
+    public static DataGridFactory getInstance() {
+        return new DefaultDataGridFactory();
+    }
 
     public abstract DataGridState createDataGridState();
 

Modified: 
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/DataGridURLService.java
URL: 
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/DataGridURLService.java?view=diff&r1=154407&r2=154408
==============================================================================
--- 
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/DataGridURLService.java
 (original)
+++ 
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/DataGridURLService.java
 Sat Feb 19 07:40:01 2005
@@ -78,7 +78,6 @@
         }
     }
 
-    private ServletRequest _request = null;
     private Map _urlParams = null;
     private HashMap<String, DataGridState> _state = null;
 
@@ -92,7 +91,6 @@
     /* end: need to delete these */
 
     private DataGridURLService(ServletRequest request) {
-        _request = request;
         _urlParams = request.getParameterMap();
 
         _sortCodec = new SortCodec();
@@ -107,7 +105,10 @@
         _state = new HashMap<String, DataGridState>();
     }
 
-    public DataGridState getDataGridState(String name, DataGridFactory 
factory) {
+    public DataGridState getDataGridState(String name) {
+        /* todo: refactor.  this factory needs to be externally configured; 
need a way to do this... */
+        DataGridFactory factory = DataGridFactory.getInstance();
+
         if(name == null || name.equals(""))
             throw new IllegalArgumentException("Unable to create data grid 
state for invalid name: " + name);
 

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=154407&r2=154408
==============================================================================
--- 
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 07:40:01 2005
@@ -24,9 +24,9 @@
 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.rendering.pager.PagerRenderer;
-import 
org.apache.beehive.netui.databinding.datagrid.rendering.pager.PreviousNextPagerRenderer;
-import 
org.apache.beehive.netui.databinding.datagrid.util.DataGridResourceProvider;
+import 
org.apache.beehive.netui.databinding.datagrid.runtime.rendering.pager.PagerRenderer;
+import 
org.apache.beehive.netui.databinding.datagrid.runtime.rendering.pager.PreviousNextPagerRenderer;
+import 
org.apache.beehive.netui.databinding.datagrid.runtime.util.DataGridResourceProvider;
 
 /**
  *

Copied: 
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/model/DataGridModel.java
 (from r154405, 
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/model/DataGridModel.java)
URL: 
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/model/DataGridModel.java?view=diff&rev=154408&p1=incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/model/DataGridModel.java&r1=154405&p2=incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/model/DataGridModel.java&r2=154408
==============================================================================
--- 
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/model/DataGridModel.java
 (original)
+++ 
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/model/DataGridModel.java
 Sat Feb 19 07:40:01 2005
@@ -15,24 +15,24 @@
  *
  * $Header:$
  */
-package org.apache.beehive.netui.databinding.datagrid.model;
+package org.apache.beehive.netui.databinding.datagrid.runtime.model;
 
 import java.util.Map;
 import javax.servlet.jsp.JspContext;
 import javax.servlet.http.HttpServletRequest;
 
-import org.apache.beehive.netui.databinding.datagrid.model.style.StylePolicy;
+import 
org.apache.beehive.netui.databinding.datagrid.runtime.model.style.StylePolicy;
 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.rendering.table.TableRenderer;
-import 
org.apache.beehive.netui.databinding.datagrid.rendering.pager.PagerRenderer;
+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.util.PagedDataSet;
-import org.apache.beehive.netui.databinding.datagrid.util.IDataGridMessageKeys;
-import org.apache.beehive.netui.databinding.datagrid.util.JspUtil;
-import 
org.apache.beehive.netui.databinding.datagrid.util.DataGridResourceProvider;
+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;
 
 /**
@@ -67,7 +67,7 @@
     private HttpServletRequest _request = null;
 
     public DataGridModel(JspContext jspContext, String name, PagedDataSet 
dataSet, DataGridFactory factory) {
-        super();
+        super();                 
 
         /* todo: refactor. this assembly could should be externalized */
         _name = name;
@@ -75,7 +75,7 @@
         _dataSet = dataSet;
         _dataGridFactory = factory;
         _dgss = DataGridURLService.getInstance(jspContext);
-        _dataGridState = _dgss.getDataGridState(name, _dataGridFactory);
+        _dataGridState = _dgss.getDataGridState(name);
         _dataGridState.getPagerModel().setDataSetSize(_dataSet.getSize());
         _resourceProvider = factory.getResourceProvider();
         _resourceProvider.setLocale(JspUtil.getLocale(jspContext));

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=154405&r2=154408
==============================================================================
--- 
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 07:40:01 2005
@@ -15,7 +15,7 @@
  *
  * $Header:$
  */
-package org.apache.beehive.netui.databinding.datagrid.model.cell;
+package org.apache.beehive.netui.databinding.datagrid.runtime.model.cell;
 
 import java.util.HashMap;
 

Modified: 
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/runtime/model/cell/CellModel.java?view=diff&r1=154405&r2=154408
==============================================================================
--- 
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/runtime/model/cell/CellModel.java
 Sat Feb 19 07:40:01 2005
@@ -15,14 +15,14 @@
  *
  * $Header:$
  */
-package org.apache.beehive.netui.databinding.datagrid.model.cell;
+package org.apache.beehive.netui.databinding.datagrid.runtime.model.cell;
 
 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.model.DataGridModel;
+import 
org.apache.beehive.netui.databinding.datagrid.runtime.model.DataGridModel;
 
 /**
  */

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=154405&r2=154408
==============================================================================
--- 
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 07:40:01 2005
@@ -15,7 +15,7 @@
  *
  * $Header:$
  */
-package org.apache.beehive.netui.databinding.datagrid.model.cell;
+package org.apache.beehive.netui.databinding.datagrid.runtime.model.cell;
 
 /**
  *

Modified: 
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/model/cell/ImageAnchorCellModel.java
URL: 
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/model/cell/ImageAnchorCellModel.java?view=diff&r1=154405&r2=154408
==============================================================================
--- 
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/model/cell/ImageAnchorCellModel.java
 (original)
+++ 
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/model/cell/ImageAnchorCellModel.java
 Sat Feb 19 07:40:01 2005
@@ -15,7 +15,7 @@
  *
  * $Header:$
  */
-package org.apache.beehive.netui.databinding.datagrid.model.cell;
+package org.apache.beehive.netui.databinding.datagrid.runtime.model.cell;
 
 import org.apache.beehive.netui.tags.rendering.ImageTag;
 import org.apache.beehive.netui.tags.rendering.ImageTag.State;

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=154405&r2=154408
==============================================================================
--- 
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 07:40:01 2005
@@ -15,7 +15,7 @@
  *
  * $Header:$
  */
-package org.apache.beehive.netui.databinding.datagrid.model.cell;
+package org.apache.beehive.netui.databinding.datagrid.runtime.model.cell;
 
 import org.apache.beehive.netui.tags.rendering.ImageTag;
 import org.apache.beehive.netui.tags.rendering.ImageTag.State;

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=154405&r2=154408
==============================================================================
--- 
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 07:40:01 2005
@@ -15,7 +15,7 @@
  *
  * $Header:$
  */
-package org.apache.beehive.netui.databinding.datagrid.model.cell;
+package org.apache.beehive.netui.databinding.datagrid.runtime.model.cell;
 
 import org.apache.beehive.netui.tags.rendering.SpanTag;
 import org.apache.beehive.netui.tags.rendering.SpanTag.State;

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=154405&r2=154408
==============================================================================
--- 
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 07:40:01 2005
@@ -15,7 +15,7 @@
  *
  * $Header:$
  */
-package org.apache.beehive.netui.databinding.datagrid.model.cell;
+package org.apache.beehive.netui.databinding.datagrid.runtime.model.cell;
 
 /**
  *

Modified: 
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/DefaultStylePolicy.java?view=diff&r1=154405&r2=154408
==============================================================================
--- 
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/DefaultStylePolicy.java
 Sat Feb 19 07:40:01 2005
@@ -15,7 +15,7 @@
  *
  * $Header:$
  */
-package org.apache.beehive.netui.databinding.datagrid.model.style;
+package org.apache.beehive.netui.databinding.datagrid.runtime.model.style;
 
 /**
  *

Modified: 
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/EmptyStylePolicy.java?view=diff&r1=154405&r2=154408
==============================================================================
--- 
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/EmptyStylePolicy.java
 Sat Feb 19 07:40:01 2005
@@ -15,7 +15,7 @@
  *
  * $Header:$
  */
-package org.apache.beehive.netui.databinding.datagrid.model.style;
+package org.apache.beehive.netui.databinding.datagrid.runtime.model.style;
 
 /**
  *

Modified: 
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/runtime/model/style/StylePolicy.java?view=diff&r1=154405&r2=154408
==============================================================================
--- 
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/runtime/model/style/StylePolicy.java
 Sat Feb 19 07:40:01 2005
@@ -15,7 +15,7 @@
  *
  * $Header:$
  */
-package org.apache.beehive.netui.databinding.datagrid.model.style;
+package org.apache.beehive.netui.databinding.datagrid.runtime.model.style;
 
 import java.util.List;
 

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=154405&r2=154408
==============================================================================
--- 
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 07:40:01 2005
@@ -15,17 +15,17 @@
  *
  * $Header:$
  */
-package org.apache.beehive.netui.databinding.datagrid.rendering.cell;
+package org.apache.beehive.netui.databinding.datagrid.runtime.rendering.cell;
 
 import java.net.URISyntaxException;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.jsp.JspContext;
 
-import org.apache.beehive.netui.databinding.datagrid.model.DataGridModel;
-import 
org.apache.beehive.netui.databinding.datagrid.model.cell.AnchorCellModel;
-import org.apache.beehive.netui.databinding.datagrid.model.cell.CellModel;
-import org.apache.beehive.netui.databinding.datagrid.util.JspUtil;
-import 
org.apache.beehive.netui.databinding.datagrid.exceptions.CellDecoratorException;
+import 
org.apache.beehive.netui.databinding.datagrid.runtime.model.DataGridModel;
+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.util.JspUtil;
+import 
org.apache.beehive.netui.databinding.datagrid.api.exceptions.CellDecoratorException;
 import org.apache.beehive.netui.tags.rendering.AbstractRenderAppender;
 import org.apache.beehive.netui.tags.rendering.SpanTag;
 import org.apache.beehive.netui.tags.rendering.AnchorTag;

Modified: 
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/runtime/rendering/cell/CellDecorator.java?view=diff&r1=154405&r2=154408
==============================================================================
--- 
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/runtime/rendering/cell/CellDecorator.java
 Sat Feb 19 07:40:01 2005
@@ -15,13 +15,13 @@
  *
  * $Header:$
  */
-package org.apache.beehive.netui.databinding.datagrid.rendering.cell;
+package org.apache.beehive.netui.databinding.datagrid.runtime.rendering.cell;
 
 import javax.servlet.jsp.JspContext;
 
 import org.apache.beehive.netui.tags.rendering.AbstractRenderAppender;
-import org.apache.beehive.netui.databinding.datagrid.model.cell.CellModel;
-import 
org.apache.beehive.netui.databinding.datagrid.exceptions.CellDecoratorException;
+import 
org.apache.beehive.netui.databinding.datagrid.runtime.model.cell.CellModel;
+import 
org.apache.beehive.netui.databinding.datagrid.api.exceptions.CellDecoratorException;
 
 /**
  *

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=154405&r2=154408
==============================================================================
--- 
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 07:40:01 2005
@@ -15,14 +15,14 @@
  *
  * $Header:$
  */
-package org.apache.beehive.netui.databinding.datagrid.rendering.cell;
+package org.apache.beehive.netui.databinding.datagrid.runtime.rendering.cell;
 
 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.model.cell.HeaderCellModel;
-import org.apache.beehive.netui.databinding.datagrid.model.cell.CellModel;
-import 
org.apache.beehive.netui.databinding.datagrid.exceptions.CellDecoratorException;
+import 
org.apache.beehive.netui.databinding.datagrid.runtime.model.cell.HeaderCellModel;
+import 
org.apache.beehive.netui.databinding.datagrid.runtime.model.cell.CellModel;
 
 /**
  *

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=154405&r2=154408
==============================================================================
--- 
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 07:40:01 2005
@@ -15,7 +15,7 @@
  *
  * $Header:$
  */
-package org.apache.beehive.netui.databinding.datagrid.rendering.cell;
+package org.apache.beehive.netui.databinding.datagrid.runtime.rendering.cell;
 
 import java.net.URISyntaxException;
 import javax.servlet.jsp.JspContext;
@@ -26,11 +26,11 @@
 import org.apache.beehive.netui.tags.rendering.ImageTag;
 import org.apache.beehive.netui.tags.rendering.TagRenderingBase;
 import org.apache.beehive.netui.tags.databinding.datagrid.DataGridUtil;
-import org.apache.beehive.netui.databinding.datagrid.model.cell.CellModel;
-import org.apache.beehive.netui.databinding.datagrid.model.DataGridModel;
-import 
org.apache.beehive.netui.databinding.datagrid.model.cell.ImageAnchorCellModel;
-import org.apache.beehive.netui.databinding.datagrid.util.JspUtil;
-import 
org.apache.beehive.netui.databinding.datagrid.exceptions.CellDecoratorException;
+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.runtime.model.cell.ImageAnchorCellModel;
+import org.apache.beehive.netui.databinding.datagrid.runtime.util.JspUtil;
 import org.apache.beehive.netui.util.logging.Logger;
 
 /**

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=154405&r2=154408
==============================================================================
--- 
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 07:40:01 2005
@@ -15,17 +15,17 @@
  *
  * $Header:$
  */
-package org.apache.beehive.netui.databinding.datagrid.rendering.cell;
+package org.apache.beehive.netui.databinding.datagrid.runtime.rendering.cell;
 
 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.model.cell.CellModel;
-import org.apache.beehive.netui.databinding.datagrid.model.cell.ImageCellModel;
-import org.apache.beehive.netui.databinding.datagrid.util.JspUtil;
-import 
org.apache.beehive.netui.databinding.datagrid.exceptions.CellDecoratorException;
+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.cell.ImageCellModel;
+import org.apache.beehive.netui.databinding.datagrid.runtime.util.JspUtil;
 
 /**
  *

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=154405&r2=154408
==============================================================================
--- 
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 07:40:01 2005
@@ -15,7 +15,7 @@
  *
  * $Header:$
  */
-package org.apache.beehive.netui.databinding.datagrid.rendering.cell;
+package org.apache.beehive.netui.databinding.datagrid.runtime.rendering.cell;
 
 import java.util.Map;
 import java.net.URISyntaxException;
@@ -29,13 +29,13 @@
 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.model.cell.CellModel;
-import 
org.apache.beehive.netui.databinding.datagrid.model.cell.HeaderCellModel;
-import org.apache.beehive.netui.databinding.datagrid.model.DataGridModel;
+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.util.JspUtil;
-import 
org.apache.beehive.netui.databinding.datagrid.exceptions.CellDecoratorException;
+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;
 
 /**

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=154405&r2=154408
==============================================================================
--- 
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 07:40:01 2005
@@ -15,17 +15,17 @@
  *
  * $Header:$
  */
-package org.apache.beehive.netui.databinding.datagrid.rendering.cell;
+package org.apache.beehive.netui.databinding.datagrid.runtime.rendering.cell;
 
 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.model.cell.CellModel;
-import org.apache.beehive.netui.databinding.datagrid.model.cell.SpanCellModel;
-import org.apache.beehive.netui.databinding.datagrid.util.JspUtil;
-import 
org.apache.beehive.netui.databinding.datagrid.exceptions.CellDecoratorException;
+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.cell.SpanCellModel;
+import org.apache.beehive.netui.databinding.datagrid.runtime.util.JspUtil;
 
 /**
  *

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=154405&r2=154408
==============================================================================
--- 
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 07:40:01 2005
@@ -15,10 +15,10 @@
  *
  * $Header:$
  */
-package org.apache.beehive.netui.databinding.datagrid.rendering.pager;
+package org.apache.beehive.netui.databinding.datagrid.runtime.rendering.pager;
 
-import org.apache.beehive.netui.databinding.datagrid.util.IDataGridMessageKeys;
 import org.apache.beehive.netui.databinding.datagrid.api.pager.PagerModel;
+import 
org.apache.beehive.netui.databinding.datagrid.runtime.util.IDataGridMessageKeys;
 
 /**
  * 

Modified: 
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/runtime/rendering/pager/PagerRenderer.java?view=diff&r1=154405&r2=154408
==============================================================================
--- 
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/runtime/rendering/pager/PagerRenderer.java
 Sat Feb 19 07:40:01 2005
@@ -15,17 +15,17 @@
  *
  * $Header:$
  */
-package org.apache.beehive.netui.databinding.datagrid.rendering.pager;
+package org.apache.beehive.netui.databinding.datagrid.runtime.rendering.pager;
 
 import java.util.Map;
 import java.net.URISyntaxException;
 import javax.servlet.http.HttpServletRequest;
 
+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.model.DataGridModel;
-import org.apache.beehive.netui.databinding.datagrid.util.JspUtil;
-import org.apache.beehive.netui.databinding.datagrid.util.IDataGridMessageKeys;
-import 
org.apache.beehive.netui.databinding.datagrid.exceptions.CellDecoratorException;
+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;

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=154405&r2=154408
==============================================================================
--- 
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 07:40:01 2005
@@ -15,10 +15,10 @@
  *
  * $Header:$
  */
-package org.apache.beehive.netui.databinding.datagrid.rendering.pager;
+package org.apache.beehive.netui.databinding.datagrid.runtime.rendering.pager;
 
-import org.apache.beehive.netui.databinding.datagrid.util.IDataGridMessageKeys;
 import org.apache.beehive.netui.databinding.datagrid.api.pager.PagerModel;
+import 
org.apache.beehive.netui.databinding.datagrid.runtime.util.IDataGridMessageKeys;
 
 public class PreviousNextPagerRenderer
     extends PagerRenderer {

Modified: 
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/rendering/table/TableRenderer.java
URL: 
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/rendering/table/TableRenderer.java?view=diff&r1=154405&r2=154408
==============================================================================
--- 
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/rendering/table/TableRenderer.java
 (original)
+++ 
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/rendering/table/TableRenderer.java
 Sat Feb 19 07:40:01 2005
@@ -15,7 +15,7 @@
  *
  * $Header:$
  */
-package org.apache.beehive.netui.databinding.datagrid.rendering.table;
+package org.apache.beehive.netui.databinding.datagrid.runtime.rendering.table;
 
 import javax.servlet.http.HttpServletRequest;
 

Modified: 
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/sql/SQLSupport.java
URL: 
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/sql/SQLSupport.java?view=diff&r1=154407&r2=154408
==============================================================================
--- 
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/sql/SQLSupport.java
 (original)
+++ 
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/sql/SQLSupport.java
 Sat Feb 19 07:40:01 2005
@@ -27,7 +27,7 @@
 import org.apache.beehive.netui.databinding.datagrid.api.filter.FilterTypeHint;
 import org.apache.beehive.netui.databinding.datagrid.api.sort.SortDirection;
 import org.apache.beehive.netui.databinding.datagrid.api.sort.Sort;
-import 
org.apache.beehive.netui.databinding.datagrid.exceptions.IllegalFilterException;
+import 
org.apache.beehive.netui.databinding.datagrid.api.exceptions.IllegalFilterException;
 
 /**
  * @netui:jspfunctions
@@ -37,8 +37,11 @@
     private static final String EMPTY_STRING = "";
     private static final FilterOperation[] FILTER_OPERATIONS;
 
+    /* todo: the QUOTE_CHAR needs to be read from DatabaseMetaData */
+    private static final String QUOTE_CHAR = "'";
+
     static {
-        FILTER_OPERATIONS = new FilterOperation[] {
+        FILTER_OPERATIONS = new FilterOperation[]{
             new FilterOperation(0, "*", "filter.sql.none.", 
FilterOperationHint.NONE),
             new FilterOperation(1, "eq", "filter.sql.equal", 
FilterOperationHint.EQUAL),
             new FilterOperation(2, "ne", "filter.sql.notequal", 
FilterOperationHint.NOT_EQUAL),
@@ -57,13 +60,14 @@
     private static final FilterOperation STRING_FILTER_OPERATION = 
FILTER_OPERATIONS[9];
     private static final FilterOperation OTHER_FILTER_OPERATION = 
FILTER_OPERATIONS[1];
 
-    private SQLSupport() {}
+    private SQLSupport() {
+    }
 
     /**
      * @param typeHint
      * @return
      * @netui:jspfunction name="lookupFilterOperations"
-     *                    signature="java.util.Map 
lookupFilterOperations(java.lang.String)"
+     * signature="java.util.Map lookupFilterOperations(java.lang.String)"
      */
     public static Map lookupFilterOperations(String typeHint) {
         LinkedHashMap ops = new LinkedHashMap<String, String>();
@@ -95,7 +99,7 @@
      * @param typeHint
      * @return
      * @netui:jspfunction name="lookupDefaultFilterOperation"
-     *                    signature="java.lang.String 
lookupDefaultFilterOperations(java.lang.String)"
+     * signature="java.lang.String 
lookupDefaultFilterOperations(java.lang.String)"
      */
     public static String lookupDefaultFilterOperation(String typeHint) {
         FilterOperation fOp = OTHER_FILTER_OPERATION;
@@ -151,55 +155,143 @@
         return null;
     }
 
-    private static void internalCreateWhereFragment(StringBuilder sb, 
List<Filter> filters) {
+    private static void internalCreateWhereFragment(StringBuilder sql, 
List<Filter> filters) {
 
         for(int i = 0; i < filters.size(); i++) {
             Filter filter = filters.get(i);
 
-            /* todo: pluggable conjunctions AND and OR here */
+            /* todo: feature. pluggable conjunctions AND and OR here */
             if(i > 0)
-                sb.append(" AND ");
+                sql.append(" AND ");
 
-            sb.append(filter.getFilterExpression());
-            FilterOperation op = filter.getOperation();
-            sb.append(" ");
-            sb.append(mapIdToOperator(op));
-            sb.append(" ");
-
-            if(filter.getTypeHint() == FilterTypeHint.STRING) {
-                sb.append("'");
-                sb.append(filter.getValue());
-                sb.append("'");
+            if (filter.getValue() == null) {
+                if (filter.getOperation().getOperationHint() == 
FilterOperationHint.EQUAL) {
+                    sql.append("(");
+                    sql.append(filter.getFilterExpression());
+                    sql.append(" IS NULL)");
+                }
+                else if (filter.getOperation().getOperationHint() == 
FilterOperationHint.NOT_EQUAL) {
+                    sql.append("(");
+                    sql.append(filter.getFilterExpression());
+                    sql.append(" IS NOT NULL)");
+                }
             }
-            else {
-                sb.append(filter.getValue());
+
+            switch(filter.getOperation().getOperationHint()) {
+                case STARTS_WITH:
+                case CONTAINS:
+                    {
+                        boolean bEscape = true;
+/* todo: there is architectural work needed here to return a SQLSupport 
instance that exposes getter / setter methods for the things DatabaseMetaData 
is used for */
+/*
+                        try {
+                            bEscape = null == _mdDatabase || 
_mdDatabase.supportsLikeEscapeClause();
+                        } catch(SQLException x) {
+                        }
+*/
+                        String strValue = bEscape ? 
convertSQLPattern(filter.getValue()) : filter.getValue().toString();
+                        strValue = convertSQLString(strValue);
+                        
sql.append("(").append(filter.getFilterExpression()).append(" LIKE '");
+                        if(filter.getOperation().getOperationHint() == 
FilterOperationHint.CONTAINS)
+                            sql.append("%");
+                        sql.append(strValue).append("%'");
+                        if(bEscape)
+                            sql.append(" ESCAPE '\\'");
+                        sql.append(')');
+                        break;
+                    }
+                case IS_EMPTY:
+                    {
+                        if("0".equals(filter.getValue()))
+                            
sql.append("(").append(filter.getFilterExpression()).append(" IS NOT NULL)");
+                        else
+                            
sql.append("(").append(filter.getFilterExpression()).append(" IS NULL)");
+                        break;
+                    }
+                case EQUAL:
+                case LESS_THAN:
+                case LESS_THAN_OR_EQUAL:
+                case GREATER_THAN:
+                case GREATER_THAN_OR_EQUAL:
+                case NOT_EQUAL:
+                    {
+                        /* todo: conider using SQLFragment from the 
DatabaseControl here. */
+                        sql.append("(");
+                        sql.append(filter.getFilterExpression());
+                        
sql.append(lookupOperator(filter.getOperation().getOperationHint()));
+                        addParameter(sql, filter.getValue(), 
filter.getTypeHint());
+                        if(filter.getOperation().getOperationHint() == 
FilterOperationHint.NOT_EQUAL) {
+                            sql.append(" OR ");
+                            sql.append(filter.getFilterExpression());
+                            sql.append(" IS NULL");
+                        }
+                        sql.append(")");
+                        break;
+                    }
+                case IS_ONE_OF:
+                    {
+                        Object[] arr;
+                        if(filter.getValue().getClass().isArray())
+                            arr = (Object[])filter.getValue();
+                        else arr = new Object[]{filter.getValue()};
+
+                        if(arr.length == 0)
+                            break;
+
+                        sql.append("(");
+                        sql.append(filter.getFilterExpression());
+                        sql.append(" IN (");
+                        String comma = "";
+                        for(int j = 0; j < arr.length; j++) {
+                            sql.append(comma);
+                            /* todo: date handling. probably some type 
normalization required here */
+                            addParameter(sql, arr[i], filter.getTypeHint());
+                            comma = ",";
+                        }
+                        sql.append("))");
+                    }
+                default:
+                    throw new IllegalFilterException("Found an unknown filter 
operation");
             }
         }
     }
 
-    private static String mapIdToOperator(FilterOperation op) {
-        if(op.getOperationHint() == FilterOperationHint.EQUAL)
-            return "=";
-        else if(op.getOperationHint() == FilterOperationHint.NOT_EQUAL)
-            return "!=";
-        else if(op.getOperationHint() == FilterOperationHint.GREATER_THAN)
-            return ">";
-        else if(op.getOperationHint() == FilterOperationHint.LESS_THAN)
-            return "<";
-        else if(op.getOperationHint() == 
FilterOperationHint.GREATER_THAN_OR_EQUAL)
-            return ">=";
-        else if(op.getOperationHint() == 
FilterOperationHint.LESS_THAN_OR_EQUAL)
-            return "<=";
-        else if(op.getOperationHint() == FilterOperationHint.IS_ONE_OF)
-            return "NYI";
-        else if(op.getOperationHint() == FilterOperationHint.STARTS_WITH)
-            return "NYI";
-        else if(op.getOperationHint() == FilterOperationHint.CONTAINS)
-            return "NYI";
-        else if(op.getOperationHint() == FilterOperationHint.IS_EMPTY)
-            return "NYI";
-        else if(op.getOperationHint() == FilterOperationHint.IS_NOT_EMPTY)
-            return "NYI";
-        else throw new IllegalFilterException("Can not create a SQL statement 
from the unknown filter operation " + op);
+    private static String convertSQLPattern(Object o) {
+        String s = o.toString();
+        s = s.replaceAll("\\\\", "\\\\\\\\");
+        s = s.replaceAll("%", "\\\\%");
+        s = s.replaceAll("_", "\\\\_");
+        return s;
+    }
+
+
+    private static String convertSQLString(Object o) {
+        String s = o.toString();
+        s = s.replaceAll("'", "''");
+        return s;
+    }
+
+    private static void addParameter(StringBuilder sql, Object value, 
FilterTypeHint typeHint) {
+        if(typeHint == FilterTypeHint.STRING) {
+            sql.append(QUOTE_CHAR);
+            sql.append(value);
+            sql.append(QUOTE_CHAR);
+        } else {
+            sql.append(value);
+        }
+    }
+
+    private static String lookupOperator(FilterOperationHint op) {
+        switch(op) {
+        case EQUAL: return "=";
+        case NOT_EQUAL: return "!=";
+        case GREATER_THAN: return ">";
+        case LESS_THAN: return "<";
+        case GREATER_THAN_OR_EQUAL: return ">=";
+        case LESS_THAN_OR_EQUAL : return "<=";
+        default: assert false : "lookupOperation received an invalid 
FilterOperation: " + op;
+        }
+
+        return null;
     }
 }

Copied: 
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/util/DataGridResourceProvider.java
 (from r154405, 
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/util/DataGridResourceProvider.java)
URL: 
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/util/DataGridResourceProvider.java?view=diff&rev=154408&p1=incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/util/DataGridResourceProvider.java&r1=154405&p2=incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/util/DataGridResourceProvider.java&r2=154408
==============================================================================
--- 
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/util/DataGridResourceProvider.java
 (original)
+++ 
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/util/DataGridResourceProvider.java
 Sat Feb 19 07:40:01 2005
@@ -15,7 +15,7 @@
  *
  * $Header:$
  */
-package org.apache.beehive.netui.databinding.datagrid.util;
+package org.apache.beehive.netui.databinding.datagrid.runtime.util;
 
 import java.text.MessageFormat;
 import java.util.ResourceBundle;
@@ -24,14 +24,13 @@
 import java.util.HashMap;
 import java.util.Collections;
 import java.util.Enumeration;
-import javax.servlet.jsp.JspContext;
 
 /**
  *
  */
 public class DataGridResourceProvider {
 
-    private String DEFAULT_RESOURCE_BUNDLE = 
"org.apache.beehive.netui.databinding.datagrid.util.data-grid-default";
+    private String DEFAULT_RESOURCE_BUNDLE = 
"org.apache.beehive.netui.databinding.datagrid.runtime.util.data-grid-default";
     private static final Object VALUE_PLACEHOLDER = new Object();
 
     private boolean _enableChaining = false;

Copied: 
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/util/FilterUtil.java
 (from r154405, 
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/util/FilterUtil.java)
URL: 
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/util/FilterUtil.java?view=diff&rev=154408&p1=incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/util/FilterUtil.java&r1=154405&p2=incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/util/FilterUtil.java&r2=154408
==============================================================================
--- 
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/util/FilterUtil.java
 (original)
+++ 
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/util/FilterUtil.java
 Sat Feb 19 07:40:01 2005
@@ -15,7 +15,7 @@
  *
  * $Header:$
  */
-package org.apache.beehive.netui.databinding.datagrid.util;
+package org.apache.beehive.netui.databinding.datagrid.runtime.util;
 
 import java.util.List;
 import java.util.ArrayList;

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

Copied: 
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/util/JspUtil.java
 (from r154405, 
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/util/JspUtil.java)
URL: 
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/util/JspUtil.java?view=diff&rev=154408&p1=incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/util/JspUtil.java&r1=154405&p2=incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/util/JspUtil.java&r2=154408
==============================================================================
--- 
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/util/JspUtil.java
 (original)
+++ 
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/util/JspUtil.java
 Sat Feb 19 07:40:01 2005
@@ -15,7 +15,7 @@
  *
  * $Header:$
  */
-package org.apache.beehive.netui.databinding.datagrid.util;
+package org.apache.beehive.netui.databinding.datagrid.runtime.util;
 
 import java.net.URISyntaxException;
 import java.util.HashMap;

Copied: 
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/util/PagedDataSet.java
 (from r154405, 
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/util/PagedDataSet.java)
URL: 
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/util/PagedDataSet.java?view=diff&rev=154408&p1=incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/util/PagedDataSet.java&r1=154405&p2=incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/util/PagedDataSet.java&r2=154408
==============================================================================
--- 
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/util/PagedDataSet.java
 (original)
+++ 
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/util/PagedDataSet.java
 Sat Feb 19 07:40:01 2005
@@ -15,7 +15,7 @@
  *
  * $Header:$
  */
-package org.apache.beehive.netui.databinding.datagrid.util;
+package org.apache.beehive.netui.databinding.datagrid.runtime.util;
 
 import java.util.Iterator;
 import java.util.ArrayList;

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=154407&r2=154408
==============================================================================
--- 
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 07:40:01 2005
@@ -20,8 +20,8 @@
 import java.io.IOException;
 import javax.servlet.jsp.JspException;
 
-import org.apache.beehive.netui.databinding.datagrid.model.DataGridModel;
-import org.apache.beehive.netui.databinding.datagrid.model.cell.CellModel;
+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.tags.AbstractSimpleTag;
 import org.apache.beehive.netui.tags.rendering.AbstractRenderAppender;
 import org.apache.beehive.netui.tags.rendering.StringBuilderRenderAppender;

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=154407&r2=154408
==============================================================================
--- 
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 07:40:01 2005
@@ -23,8 +23,8 @@
 import javax.servlet.jsp.tagext.JspFragment;
 import javax.servlet.jsp.JspException;
 
-import org.apache.beehive.netui.databinding.datagrid.model.DataGridModel;
-import 
org.apache.beehive.netui.databinding.datagrid.rendering.table.TableRenderer;
+import 
org.apache.beehive.netui.databinding.datagrid.runtime.model.DataGridModel;
+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;
 import org.apache.beehive.netui.tags.html.HtmlConstants;

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=154407&r2=154408
==============================================================================
--- 
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 07:40:01 2005
@@ -19,9 +19,9 @@
 
 import javax.servlet.jsp.JspException;
 
-import 
org.apache.beehive.netui.databinding.datagrid.model.cell.AnchorCellModel;
-import org.apache.beehive.netui.databinding.datagrid.model.cell.CellModel;
-import 
org.apache.beehive.netui.databinding.datagrid.rendering.cell.AnchorCellDecorator;
+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;
 import org.apache.beehive.netui.tags.rendering.AbstractHtmlState;

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=154407&r2=154408
==============================================================================
--- 
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 07:40:01 2005
@@ -28,9 +28,9 @@
 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.model.DataGridModel;
-import org.apache.beehive.netui.databinding.datagrid.model.style.StylePolicy;
-import 
org.apache.beehive.netui.databinding.datagrid.rendering.table.TableRenderer;
+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.rendering.table.TableRenderer;
 
 /**
  * @netui:tag name="caption" body-content="scriptless" description="Renders a 
caption into a NetUI data grid"

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=154407&r2=154408
==============================================================================
--- 
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 07:40:01 2005
@@ -20,12 +20,12 @@
 import javax.servlet.jsp.JspException;
 import javax.servlet.http.HttpServletRequest;
 
-import org.apache.beehive.netui.databinding.datagrid.model.DataGridModel;
-import 
org.apache.beehive.netui.databinding.datagrid.rendering.pager.PagerRenderer;
-import 
org.apache.beehive.netui.databinding.datagrid.rendering.pager.FirstPreviousNextLastPagerRenderer;
-import 
org.apache.beehive.netui.databinding.datagrid.rendering.pager.PreviousNextPagerRenderer;
-import org.apache.beehive.netui.databinding.datagrid.util.JspUtil;
-import 
org.apache.beehive.netui.databinding.datagrid.exceptions.DataGridExtensionException;
+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.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;
 import org.apache.beehive.netui.databinding.datagrid.api.pager.PagerModel;
 import org.apache.beehive.netui.tags.AbstractSimpleTag;
 import org.apache.beehive.netui.util.logging.Logger;

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=154407&r2=154408
==============================================================================
--- 
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 07:40:01 2005
@@ -26,14 +26,13 @@
 import javax.servlet.jsp.tagext.JspFragment;
 import javax.servlet.http.HttpServletRequest;
 
-import org.apache.beehive.netui.databinding.datagrid.model.DataGridModel;
-import org.apache.beehive.netui.databinding.datagrid.model.style.StylePolicy;
-import 
org.apache.beehive.netui.databinding.datagrid.model.style.DefaultStylePolicy;
-import 
org.apache.beehive.netui.databinding.datagrid.model.style.EmptyStylePolicy;
-import org.apache.beehive.netui.databinding.datagrid.util.PagedDataSet;
-import 
org.apache.beehive.netui.databinding.datagrid.rendering.table.TableRenderer;
+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.runtime.util.PagedDataSet;
+import 
org.apache.beehive.netui.databinding.datagrid.runtime.rendering.table.TableRenderer;
 import org.apache.beehive.netui.databinding.datagrid.api.pager.PagerModel;
-import 
org.apache.beehive.netui.databinding.datagrid.runtime.AbstractDataGridFactory;
 import org.apache.beehive.netui.databinding.datagrid.runtime.DataGridFactory;
 import org.apache.beehive.netui.script.common.IDataAccessProvider;
 import org.apache.beehive.netui.script.common.DataAccessProviderStack;
@@ -153,7 +152,7 @@
         else if(_stylePolicyName != null && 
_stylePolicyName.equals(EMPTY_STYLE_POLICY_NAME))
             stylePolicy = EMPTY_STYLE_POLICY;
 
-        DataGridFactory dgf = AbstractDataGridFactory.getInstance();
+        DataGridFactory dgf = DataGridFactory.getInstance();
 
         _gridModel = new DataGridModel(getJspContext(), _name, dataSet, dgf);
         _gridModel.setStylePolicy(stylePolicy);

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=154407&r2=154408
==============================================================================
--- 
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 07:40:01 2005
@@ -19,9 +19,9 @@
 
 import javax.servlet.jsp.JspContext;
 
-import org.apache.beehive.netui.databinding.datagrid.model.DataGridModel;
-import org.apache.beehive.netui.databinding.datagrid.model.cell.CellModel;
-import 
org.apache.beehive.netui.databinding.datagrid.exceptions.DataGridExtensionException;
+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.util.logging.Logger;
 
 /**

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=154407&r2=154408
==============================================================================
--- 
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 07:40:01 2005
@@ -29,9 +29,9 @@
 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.model.DataGridModel;
-import org.apache.beehive.netui.databinding.datagrid.model.style.StylePolicy;
-import 
org.apache.beehive.netui.databinding.datagrid.rendering.table.TableRenderer;
+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.rendering.table.TableRenderer;
 
 /**
  * @netui:tag name="footer"

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=154407&r2=154408
==============================================================================
--- 
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 07:40:01 2005
@@ -30,10 +30,9 @@
 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.model.DataGridModel;
-import org.apache.beehive.netui.databinding.datagrid.model.style.StylePolicy;
-import 
org.apache.beehive.netui.databinding.datagrid.rendering.table.TableRenderer;
-import org.apache.beehive.netui.util.logging.Logger;
+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.rendering.table.TableRenderer;
 
 /**
  * @netui:tag name="header" description="Render an HTML table head tag" 
body-content="scriptless"

Reply via email to