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=154432&r2=154433 ============================================================================== --- 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 10:08:11 2005 @@ -20,9 +20,9 @@ import java.io.IOException; import javax.servlet.jsp.JspException; -import org.apache.beehive.netui.tags.rendering.AbstractRenderAppender; -import org.apache.beehive.netui.databinding.datagrid.runtime.model.cell.CellModel; +import org.apache.beehive.netui.databinding.datagrid.api.rendering.CellModel; import org.apache.beehive.netui.databinding.datagrid.runtime.model.cell.TemplateCellModel; +import org.apache.beehive.netui.tags.rendering.AbstractRenderAppender; /** * @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=154432&r2=154433 ============================================================================== --- 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 10:08:11 2005 @@ -26,9 +26,9 @@ import org.apache.beehive.netui.test.servlet.HttpServletRequestHandler; import org.apache.beehive.netui.databinding.datagrid.api.pager.PagerModel; -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.api.rendering.DataGridTagModel; import org.apache.beehive.netui.databinding.datagrid.runtime.DataGridFactory; +import org.apache.beehive.netui.databinding.datagrid.runtime.util.PagedDataSet; /** * @@ -52,16 +52,16 @@ initQueryString(((PageContext)jspContext).getRequest(), queryString); } - static final DataGridModel getDataGridModel(JspContext jspContext) { - return buildDataGridModel(jspContext, DEFAULT_DATA_GRID_NAME, getPagedDataSet()); + static final DataGridTagModel getDataGridTagModel(JspContext jspContext) { + return buildDataGridTagModel(jspContext, DEFAULT_DATA_GRID_NAME, getPagedDataSet()); } - static final DataGridModel getDataGridModel(JspContext jspContext, String name) { - return buildDataGridModel(jspContext, name, getPagedDataSet()); + static final DataGridTagModel getDataGridTagModel(JspContext jspContext, String name) { + return buildDataGridTagModel(jspContext, name, getPagedDataSet()); } - static final DataGridModel getEmptyDataGridModel(JspContext jspContext) { - return buildDataGridModel(jspContext, DEFAULT_DATA_GRID_NAME, getEmptyPagedDataSet()); + static final DataGridTagModel getEmptyDataGridTagModel(JspContext jspContext) { + return buildDataGridTagModel(jspContext, DEFAULT_DATA_GRID_NAME, getEmptyPagedDataSet()); } static final PagedDataSet getEmptyPagedDataSet() { @@ -85,14 +85,14 @@ return new PagedDataSet("${actionForm.dataSource}", list.iterator()); } - private static final DataGridModel buildDataGridModel(JspContext jspContext, String name, PagedDataSet dataSet) { - DataGridModel dgm = new DataGridModel(jspContext, name, dataSet, getDataGridFactory()); + private static final DataGridTagModel buildDataGridTagModel(JspContext jspContext, String name, PagedDataSet dataSet) { + DataGridTagModel dgm = new DataGridTagModel(jspContext, name, dataSet, getDataGridFactory()); dgm.getDataGridState().getPagerModel().setPageAction("fauxPageAction.do"); return dgm; } - static final PagerModel getPagerModel(DataGridModel dgm) { + static final PagerModel getPagerModel(DataGridTagModel dgm) { return dgm.getDataGridState().getPagerModel(); } 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=154432&r2=154433 ============================================================================== --- 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 10:08:11 2005 @@ -26,7 +26,7 @@ import org.apache.beehive.netui.test.servlet.ServletFactory; 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.api.rendering.DataGridTagModel; import org.apache.beehive.netui.databinding.datagrid.runtime.DataGridState; import org.apache.beehive.netui.databinding.datagrid.runtime.DataGridURLService; @@ -39,7 +39,7 @@ private JspContext _jspContext = null; public void testEmptyPagerModel() { - DataGridModel dgm = DataGridTestUtil.getDataGridModel(_jspContext); + DataGridTagModel dgm = DataGridTestUtil.getDataGridTagModel(_jspContext); PagerModel pm = DataGridTestUtil.getPagerModel(dgm); assertEquals("Invalid page", PagerModel.DEFAULT_PAGE, pm.getPage()); @@ -55,7 +55,7 @@ */ String name = "bugs"; DataGridTestUtil.initQueryString(_jspContext, "netui_row=bugs~4&netui_pagesize=bugs~2"); - DataGridModel dgm = DataGridTestUtil.getDataGridModel(_jspContext, name); + DataGridTagModel dgm = DataGridTestUtil.getDataGridTagModel(_jspContext, name); PagerModel pm = DataGridTestUtil.getPagerModel(dgm); assertEquals("Invalid page", 2, pm.getPage()); @@ -71,7 +71,7 @@ */ String name = "bugs"; DataGridTestUtil.initQueryString(_jspContext, "netui_row=bugs~7&netui_pagesize=bugs~3"); - DataGridModel dgm = DataGridTestUtil.getDataGridModel(_jspContext, name); + DataGridTagModel dgm = DataGridTestUtil.getDataGridTagModel(_jspContext, name); PagerModel pm = DataGridTestUtil.getPagerModel(dgm); assertEquals("Invalid page", 2, pm.getPage()); @@ -87,7 +87,7 @@ last page: 2 */ DataGridTestUtil.initQueryString(_jspContext, "netui_row=" + DataGridTestUtil.DEFAULT_DATA_GRID_NAME + "~9"); - DataGridModel dgm = DataGridTestUtil.getDataGridModel(_jspContext); + DataGridTagModel dgm = DataGridTestUtil.getDataGridTagModel(_jspContext); PagerModel pm = DataGridTestUtil.getPagerModel(dgm); pm.setPageSize(5); @@ -116,7 +116,7 @@ */ String name = "bugs"; DataGridTestUtil.initQueryString(_jspContext, "netui_pagesize=bugs~2"); - DataGridModel dgm = DataGridTestUtil.getDataGridModel(_jspContext, name); + DataGridTagModel dgm = DataGridTestUtil.getDataGridTagModel(_jspContext, name); PagerModel pm = DataGridTestUtil.getPagerModel(dgm); assertEquals("Invalid page", 0, 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=154432&r2=154433 ============================================================================== --- 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 10:08:11 2005 @@ -24,8 +24,8 @@ import junit.framework.TestSuite; import org.apache.beehive.netui.test.servlet.ServletFactory; +import org.apache.beehive.netui.databinding.datagrid.api.rendering.DataGridTagModel; 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; /** @@ -38,19 +38,19 @@ public void testFPNL() { - DataGridModel dgm = DataGridTestUtil.getDataGridModel(_jspContext); + DataGridTagModel dgm = DataGridTestUtil.getDataGridTagModel(_jspContext); FirstPreviousNextLastPagerRenderer fpnl = new FirstPreviousNextLastPagerRenderer(); - fpnl.setDataGridModel(dgm); + fpnl.setDataGridTagModel(dgm); String pager = fpnl.render(); System.out.println(pager); } public void testFPNL2() { - DataGridModel dgm = DataGridTestUtil.getDataGridModel(_jspContext); + DataGridTagModel dgm = DataGridTestUtil.getDataGridTagModel(_jspContext); DataGridTestUtil.getPagerModel(dgm).setPageSize(5); FirstPreviousNextLastPagerRenderer fpnl = new FirstPreviousNextLastPagerRenderer(); - fpnl.setDataGridModel(dgm); + fpnl.setDataGridTagModel(dgm); String pager = fpnl.render(); @@ -59,11 +59,11 @@ public void testFPNL3() { DataGridTestUtil.initQueryString(_jspContext, "netui_row=" + DataGridTestUtil.DEFAULT_DATA_GRID_NAME + "~9"); - DataGridModel dgm = DataGridTestUtil.getDataGridModel(_jspContext); + DataGridTagModel dgm = DataGridTestUtil.getDataGridTagModel(_jspContext); DataGridTestUtil.getPagerModel(dgm).setPageSize(5); FirstPreviousNextLastPagerRenderer fpnl = new FirstPreviousNextLastPagerRenderer(); - fpnl.setDataGridModel(dgm); + fpnl.setDataGridTagModel(dgm); String pager = fpnl.render(); System.out.println(pager); 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=154432&r2=154433 ============================================================================== --- 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 10:08:11 2005 @@ -3,8 +3,8 @@ import javax.servlet.jsp.JspContext; 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.databinding.datagrid.api.rendering.CellDecorator; +import org.apache.beehive.netui.databinding.datagrid.api.rendering.CellModel; 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=154432&r2=154433 ============================================================================== --- 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 10:08:11 2005 @@ -3,8 +3,8 @@ import javax.servlet.jsp.JspContext; 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.databinding.datagrid.api.rendering.CellDecorator; +import org.apache.beehive.netui.databinding.datagrid.api.rendering.CellModel; 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=154432&r2=154433 ============================================================================== --- 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 10:08:11 2005 @@ -17,7 +17,7 @@ */ package databinding.datagrid.renderer; -import org.apache.beehive.netui.databinding.datagrid.runtime.rendering.pager.PagerRenderer; +import org.apache.beehive.netui.databinding.datagrid.api.rendering.PagerRenderer; /** * Simple implementation of the IPagerRenderer interface. This API is
