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=154407&r2=154408 ============================================================================== --- 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 07:40:01 2005 @@ -28,14 +28,14 @@ import org.apache.beehive.netui.tags.rendering.ThTag; import org.apache.beehive.netui.tags.rendering.AbstractHtmlState; import org.apache.beehive.netui.tags.rendering.AbstractRenderAppender; -import org.apache.beehive.netui.databinding.datagrid.model.cell.HeaderCellModel; -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.rendering.cell.CellDecorator; -import org.apache.beehive.netui.databinding.datagrid.rendering.cell.HeaderCellDecorator; -import org.apache.beehive.netui.databinding.datagrid.rendering.cell.SortedCellDecorator; -import org.apache.beehive.netui.databinding.datagrid.rendering.table.TableRenderer; -import org.apache.beehive.netui.databinding.datagrid.util.JspUtil; +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.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; +import org.apache.beehive.netui.databinding.datagrid.runtime.util.JspUtil; import org.apache.beehive.netui.databinding.datagrid.api.sort.SortModel; import org.apache.beehive.netui.util.Bundle;
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=154407&r2=154408 ============================================================================== --- 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 07:40:01 2005 @@ -26,9 +26,9 @@ 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.model.cell.CellModel; -import org.apache.beehive.netui.databinding.datagrid.model.cell.ImageAnchorCellModel; -import org.apache.beehive.netui.databinding.datagrid.rendering.cell.ImageAnchorCellDecorator; +import org.apache.beehive.netui.databinding.datagrid.runtime.model.cell.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=154407&r2=154408 ============================================================================== --- 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 07:40:01 2005 @@ -19,9 +19,9 @@ import javax.servlet.jsp.JspException; -import org.apache.beehive.netui.databinding.datagrid.model.cell.ImageCellModel; -import org.apache.beehive.netui.databinding.datagrid.model.cell.CellModel; -import org.apache.beehive.netui.databinding.datagrid.rendering.cell.ImageCellDecorator; +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; import org.apache.beehive.netui.tags.rendering.ImageTag; 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=154407&r2=154408 ============================================================================== --- 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 07:40:01 2005 @@ -20,7 +20,7 @@ import javax.servlet.jsp.JspContext; import javax.servlet.jsp.JspException; -import org.apache.beehive.netui.databinding.datagrid.model.DataGridModel; +import org.apache.beehive.netui.databinding.datagrid.runtime.model.DataGridModel; import org.apache.beehive.netui.tags.AbstractSimpleTag; /** 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=154407&r2=154408 ============================================================================== --- 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 07:40:01 2005 @@ -23,9 +23,9 @@ import javax.servlet.jsp.JspContext; import javax.servlet.jsp.tagext.JspFragment; -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; import org.apache.beehive.netui.tags.AbstractSimpleTag; import org.apache.beehive.netui.tags.rendering.StringBuilderRenderAppender; import org.apache.beehive.netui.tags.rendering.AbstractRenderAppender; 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=154407&r2=154408 ============================================================================== --- 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 07:40:01 2005 @@ -23,9 +23,9 @@ 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.model.cell.SpanCellModel; -import org.apache.beehive.netui.databinding.datagrid.model.cell.CellModel; -import org.apache.beehive.netui.databinding.datagrid.rendering.cell.SpanCellDecorator; +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" Modified: incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/TemplateCell.java URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/TemplateCell.java?view=diff&r1=154407&r2=154408 ============================================================================== --- incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/TemplateCell.java (original) +++ incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/TemplateCell.java Sat Feb 19 07:40:01 2005 @@ -21,8 +21,8 @@ import javax.servlet.jsp.JspException; 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.model.cell.TemplateCellModel; +import org.apache.beehive.netui.databinding.datagrid.runtime.model.cell.CellModel; +import org.apache.beehive.netui.databinding.datagrid.runtime.model.cell.TemplateCellModel; /** * @netui:tag name="templateCell" description="Renders a column templated by the body of the JSP tag" Modified: incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/datagrid/DataGridTestUtil.java URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/datagrid/DataGridTestUtil.java?view=diff&r1=154407&r2=154408 ============================================================================== --- incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/datagrid/DataGridTestUtil.java (original) +++ incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/datagrid/DataGridTestUtil.java Sat Feb 19 07:40:01 2005 @@ -25,10 +25,9 @@ import javax.servlet.jsp.PageContext; import org.apache.beehive.netui.test.servlet.HttpServletRequestHandler; -import org.apache.beehive.netui.databinding.datagrid.util.PagedDataSet; -import org.apache.beehive.netui.databinding.datagrid.model.DataGridModel; 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.util.PagedDataSet; +import org.apache.beehive.netui.databinding.datagrid.runtime.model.DataGridModel; import org.apache.beehive.netui.databinding.datagrid.runtime.DataGridFactory; /** @@ -98,6 +97,6 @@ } static final DataGridFactory getDataGridFactory() { - return AbstractDataGridFactory.getInstance(); + return DataGridFactory.getInstance(); } } Modified: incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/datagrid/FilterModelTest.java URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/datagrid/FilterModelTest.java?view=diff&r1=154407&r2=154408 ============================================================================== --- incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/datagrid/FilterModelTest.java (original) +++ incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/datagrid/FilterModelTest.java Sat Feb 19 07:40:01 2005 @@ -44,14 +44,14 @@ public void testSortModelSimple() { DataGridTestUtil.initQueryString(_request, "netui_filter=" + _namespace + ";CUSTOMERNAME~eq~homer&netui_filter=products;ID~ne~1234"); DataGridURLService dgss = DataGridURLService.getInstance(_request); - FilterModel fm = dgss.getDataGridState(_namespace, DataGridTestUtil.getDataGridFactory()).getFilterModel(); + FilterModel fm = dgss.getDataGridState(_namespace).getFilterModel(); assertNotNull(fm); assertNotNull(fm.getFilters("CUSTOMERNAME")); assertTrue(fm.isFiltered("CUSTOMERNAME")); assertEquals(FilterOperationHint.EQUAL, fm.getFilters("CUSTOMERNAME").get(0).getOperation().getOperationHint()); - fm = dgss.getDataGridState("products", DataGridTestUtil.getDataGridFactory()).getFilterModel(); + fm = dgss.getDataGridState("products").getFilterModel(); assertNotNull(fm); assertNotNull(fm.getFilters("ID")); assertTrue(fm.isFiltered("ID")); Modified: incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/datagrid/PagerModelTest.java URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/datagrid/PagerModelTest.java?view=diff&r1=154407&r2=154408 ============================================================================== --- incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/datagrid/PagerModelTest.java (original) +++ incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/datagrid/PagerModelTest.java Sat Feb 19 07:40:01 2005 @@ -25,8 +25,8 @@ import junit.framework.TestSuite; import org.apache.beehive.netui.test.servlet.ServletFactory; -import org.apache.beehive.netui.databinding.datagrid.model.DataGridModel; 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.DataGridState; import org.apache.beehive.netui.databinding.datagrid.runtime.DataGridURLService; @@ -131,7 +131,7 @@ String namespace = "bugs"; DataGridURLService dgss = DataGridURLService.getInstance(_jspContext); - DataGridState dgs = dgss.getDataGridState(namespace, DataGridTestUtil.getDataGridFactory()); + DataGridState dgs = dgss.getDataGridState(namespace); PagerModel pm = dgs.getPagerModel(); assertNotNull("Expected non-null PagerModel", pm); @@ -160,7 +160,7 @@ DataGridTestUtil.initQueryString(_jspContext, "netui_row=bugs~21"); DataGridURLService dgss = DataGridURLService.getInstance(_jspContext); - DataGridState dgs = dgss.getDataGridState(namespace, DataGridTestUtil.getDataGridFactory()); + DataGridState dgs = dgss.getDataGridState(namespace); PagerModel pm = dgs.getPagerModel(); assertEquals("Invalid current row", 21, pm.getRow()); @@ -175,7 +175,7 @@ DataGridTestUtil.initQueryString(_jspContext, "netui_row=bugs~21&netui_pagesize=bugs~6"); DataGridURLService dgss = DataGridURLService.getInstance(_jspContext); - PagerModel pm = dgss.getDataGridState(namespace, DataGridTestUtil.getDataGridFactory()).getPagerModel(); + PagerModel pm = dgss.getDataGridState(namespace).getPagerModel(); assertEquals("Invalid current row", 21, pm.getRow()); assertEquals("Invalid current page", 3, pm.getPage()); @@ -186,12 +186,12 @@ DataGridTestUtil.initQueryString(_jspContext, "netui_row=bugs~21&netui_pagesize=bugs~6&netui_row=issues~39"); DataGridURLService dgss = DataGridURLService.getInstance(_jspContext); - PagerModel pm = dgss.getDataGridState(namespace, DataGridTestUtil.getDataGridFactory()).getPagerModel(); + PagerModel pm = dgss.getDataGridState(namespace).getPagerModel(); assertEquals("Invalid current row", 21, pm.getRow()); assertEquals("Invalid current page", 3, pm.getPage()); - pm = dgss.getDataGridState("issues", DataGridTestUtil.getDataGridFactory()).getPagerModel(); + pm = dgss.getDataGridState("issues").getPagerModel(); assertEquals("Invalid current row", 39, pm.getRow()); assertEquals("Invalid current page size", 10, pm.getPageSize()); assertEquals("Invalid current page", 3, pm.getPage()); Modified: incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/datagrid/PagerRendererTest.java URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/datagrid/PagerRendererTest.java?view=diff&r1=154407&r2=154408 ============================================================================== --- incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/datagrid/PagerRendererTest.java (original) +++ incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/datagrid/PagerRendererTest.java Sat Feb 19 07:40:01 2005 @@ -24,8 +24,8 @@ import junit.framework.TestSuite; import org.apache.beehive.netui.test.servlet.ServletFactory; -import org.apache.beehive.netui.databinding.datagrid.rendering.pager.FirstPreviousNextLastPagerRenderer; -import org.apache.beehive.netui.databinding.datagrid.model.DataGridModel; +import org.apache.beehive.netui.databinding.datagrid.runtime.rendering.pager.FirstPreviousNextLastPagerRenderer; +import org.apache.beehive.netui.databinding.datagrid.runtime.model.DataGridModel; import org.apache.beehive.netui.util.config.ConfigUtil; /** Modified: incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/datagrid/SortModelTest.java URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/datagrid/SortModelTest.java?view=diff&r1=154407&r2=154408 ============================================================================== --- incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/datagrid/SortModelTest.java (original) +++ incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/datagrid/SortModelTest.java Sat Feb 19 07:40:01 2005 @@ -43,7 +43,7 @@ public void testSortModelSimple() { DataGridURLService dgss = DataGridURLService.getInstance(_servletRequest); - SortModel sortModel = dgss.getDataGridState(GRID_NAME, DataGridTestUtil.getDataGridFactory()).getSortModel(); + SortModel sortModel = dgss.getDataGridState(GRID_NAME).getSortModel(); List<Sort> sorts = sortModel.getSorts(); assert sorts == null; @@ -52,7 +52,7 @@ public void testSortModelSimple2() { DataGridTestUtil.initQueryString(_servletRequest, "foo=bar"); DataGridURLService dgss = DataGridURLService.getInstance(_servletRequest); - SortModel sortModel = dgss.getDataGridState(GRID_NAME, DataGridTestUtil.getDataGridFactory()).getSortModel(); + SortModel sortModel = dgss.getDataGridState(GRID_NAME).getSortModel(); List<Sort> sorts = sortModel.getSorts(); assert sorts == null; @@ -67,7 +67,7 @@ public void testSortModelSimple3() { DataGridTestUtil.initQueryString(_servletRequest, "foo=bar&netui_sort=bugs~id"); DataGridURLService dgss = DataGridURLService.getInstance(_servletRequest); - SortModel sortModel = dgss.getDataGridState(GRID_NAME, DataGridTestUtil.getDataGridFactory()).getSortModel(); + SortModel sortModel = dgss.getDataGridState(GRID_NAME).getSortModel(); List<Sort> sorts = sortModel.getSorts(); assert sorts != null; @@ -89,7 +89,7 @@ public void testSortModelSimple4() { DataGridTestUtil.initQueryString(_servletRequest, "foo=bar&netui_sort=bugs~id,-name"); DataGridURLService dgss = DataGridURLService.getInstance(_servletRequest); - SortModel sortModel = dgss.getDataGridState(GRID_NAME, DataGridTestUtil.getDataGridFactory()).getSortModel(); + SortModel sortModel = dgss.getDataGridState(GRID_NAME).getSortModel(); List<Sort> sorts = sortModel.getSorts(); assert sorts != null; @@ -113,7 +113,7 @@ public void testSortModelSimple5() { DataGridTestUtil.initQueryString(_servletRequest, "foo=bar&netui_sort=bugs~id,-name"); DataGridURLService dgss = DataGridURLService.getInstance(_servletRequest); - SortModel sortModel = dgss.getDataGridState(GRID_NAME, DataGridTestUtil.getDataGridFactory()).getSortModel(); + SortModel sortModel = dgss.getDataGridState(GRID_NAME).getSortModel(); List<Sort> sorts = sortModel.getSorts(); assert sorts != null; @@ -192,7 +192,7 @@ public void testSortModelSimple6() { DataGridTestUtil.initQueryString(_servletRequest, "foo=bar&netui_sort=bugs~-id,-name"); DataGridURLService dgss = DataGridURLService.getInstance(_servletRequest); - SortModel sortModel = dgss.getDataGridState(GRID_NAME, DataGridTestUtil.getDataGridFactory()).getSortModel(); + SortModel sortModel = dgss.getDataGridState(GRID_NAME).getSortModel(); /* now, add a new column "newcolumn" and explicitly set its direction */ Map queryParams = dgss.buildSortQueryParamsMap(GRID_NAME, "id", SortDirection.NONE); @@ -209,7 +209,7 @@ public void testSortModelSimple7() { DataGridTestUtil.initQueryString(_servletRequest, "foo=bar&netui_sort=bugs~-id"); DataGridURLService dgss = DataGridURLService.getInstance(_servletRequest); - SortModel sortModel = dgss.getDataGridState(GRID_NAME, DataGridTestUtil.getDataGridFactory()).getSortModel(); + SortModel sortModel = dgss.getDataGridState(GRID_NAME).getSortModel(); /* now, add a new column "newcolumn" and explicitly set its direction */ Map queryParams = dgss.buildSortQueryParamsMap(GRID_NAME, "id", SortDirection.NONE); @@ -223,7 +223,7 @@ public void testSortModelSimple8() { DataGridTestUtil.initQueryString(_servletRequest, "foo=bar&netui_sort=bugs~id,-name&netui_sort=developers~bugcount,-milestone"); DataGridURLService dgss = DataGridURLService.getInstance(_servletRequest); - SortModel sortModel = dgss.getDataGridState(GRID_NAME, DataGridTestUtil.getDataGridFactory()).getSortModel(); + SortModel sortModel = dgss.getDataGridState(GRID_NAME).getSortModel(); List<Sort> sorts = sortModel.getSorts(); assert sorts != null; Modified: incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/WEB-INF/src/databinding/datagrid/decorator/FooDecorator.java URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/WEB-INF/src/databinding/datagrid/decorator/FooDecorator.java?view=diff&r1=154407&r2=154408 ============================================================================== --- incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/WEB-INF/src/databinding/datagrid/decorator/FooDecorator.java (original) +++ incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/WEB-INF/src/databinding/datagrid/decorator/FooDecorator.java Sat Feb 19 07:40:01 2005 @@ -2,9 +2,9 @@ import javax.servlet.jsp.JspContext; -import org.apache.beehive.netui.databinding.datagrid.exceptions.CellDecoratorException; -import org.apache.beehive.netui.databinding.datagrid.model.cell.CellModel; -import org.apache.beehive.netui.databinding.datagrid.rendering.cell.CellDecorator; +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.rendering.cell.CellDecorator; import org.apache.beehive.netui.tags.rendering.AbstractRenderAppender; /** Modified: incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/WEB-INF/src/databinding/datagrid/decorator/HelloWorldDecorator.java URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/WEB-INF/src/databinding/datagrid/decorator/HelloWorldDecorator.java?view=diff&r1=154407&r2=154408 ============================================================================== --- incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/WEB-INF/src/databinding/datagrid/decorator/HelloWorldDecorator.java (original) +++ incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/WEB-INF/src/databinding/datagrid/decorator/HelloWorldDecorator.java Sat Feb 19 07:40:01 2005 @@ -2,9 +2,9 @@ import javax.servlet.jsp.JspContext; -import org.apache.beehive.netui.databinding.datagrid.exceptions.CellDecoratorException; -import org.apache.beehive.netui.databinding.datagrid.model.cell.CellModel; -import org.apache.beehive.netui.databinding.datagrid.rendering.cell.CellDecorator; +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.rendering.cell.CellDecorator; import org.apache.beehive.netui.tags.rendering.AbstractRenderAppender; /** Modified: incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/WEB-INF/src/databinding/datagrid/renderer/HelloWorldPagerRenderer.java URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/WEB-INF/src/databinding/datagrid/renderer/HelloWorldPagerRenderer.java?view=diff&r1=154407&r2=154408 ============================================================================== --- incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/WEB-INF/src/databinding/datagrid/renderer/HelloWorldPagerRenderer.java (original) +++ incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/WEB-INF/src/databinding/datagrid/renderer/HelloWorldPagerRenderer.java Sat Feb 19 07:40:01 2005 @@ -17,7 +17,7 @@ */ package databinding.datagrid.renderer; -import org.apache.beehive.netui.databinding.datagrid.rendering.pager.PagerRenderer; +import org.apache.beehive.netui.databinding.datagrid.runtime.rendering.pager.PagerRenderer; /** * Simple implementation of the IPagerRenderer interface. This API is
