You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@beehive.apache.org by ek...@apache.org on 2004/12/30 16:00:36 UTC
svn commit: r123722 - in incubator/beehive/trunk/netui: src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/model src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/model/cell src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/model/filter src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/model/impl src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/model/sort src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/model/style src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/rendering src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/rendering/cell src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/rendering/impl src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/rendering/pager src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/rendering/table src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/services src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/services/filter src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/services/pager src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/services/sort 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
Author: ekoneil
Date: Thu Dec 30 07:00:34 2004
New Revision: 123722
URL: http://svn.apache.org/viewcvs?view=rev&rev=123722
Log:
Grid cleanup and repackaging.
- make package names useful -- get rid of "impl" and replace with "sort", "filter", etc
- remove unused loggers
BB: self
DRT: NetUI pass
Added:
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/model/CellModel.java
- copied, changed from r123694, incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/model/ColumnModel.java
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/model/filter/
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/model/filter/DefaultFilter.java
- copied, changed from r123694, incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/model/impl/DefaultFilter.java
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/model/filter/IFilter.java
- copied, changed from r123589, incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/model/IFilter.java
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/model/sort/
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/model/sort/DefaultSort.java
- copied, changed from r123694, incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/model/impl/DefaultSort.java
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/model/sort/ISort.java
- copied, changed from r123589, incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/model/ISort.java
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/model/style/DefaultStylePolicy.java
- copied, changed from r123589, incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/model/impl/DefaultStylePolicy.java
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/model/style/EmptyStylePolicy.java
- copied, changed from r123589, incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/model/impl/EmptyStylePolicy.java
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/model/style/StylePolicy.java
- copied, changed from r123589, incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/model/StylePolicy.java
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/rendering/pager/
- copied from r123589, incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/rendering/impl/
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/rendering/pager/AbstractPagerRenderer.java
- copied, changed from r123694, incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/rendering/impl/AbstractPagerRenderer.java
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/rendering/pager/FirstPreviousNextLastPagerRenderer.java
- copied, changed from r123694, incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/rendering/impl/FirstPreviousNextLastPagerRenderer.java
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/rendering/pager/IPagerRenderer.java
- copied, changed from r123589, incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/rendering/IPagerRenderer.java
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/rendering/pager/PreviousNextPagerRenderer.java
- copied, changed from r123694, incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/rendering/impl/PreviousNextPagerRenderer.java
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/rendering/table/TableRenderer.java
- copied, changed from r123589, incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/rendering/TableRenderer.java
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/services/filter/
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/services/filter/FilterService.java
- copied, changed from r123589, incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/services/FilterService.java
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/services/filter/IllegalFilterException.java
- copied, changed from r123589, incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/services/IllegalFilterException.java
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/services/pager/
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/services/pager/PagerService.java
- copied, changed from r123589, incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/services/PagerService.java
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/services/sort/
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/services/sort/SortFactory.java
- copied, changed from r123589, incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/services/SortFactory.java
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/services/sort/SortService.java
- copied, changed from r123694, incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/services/SortService.java
Removed:
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/model/ColumnModel.java
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/model/IFilter.java
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/model/ISort.java
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/model/StylePolicy.java
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/model/impl/
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/rendering/IPagerRenderer.java
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/rendering/TableRenderer.java
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/rendering/impl/
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/services/FilterService.java
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/services/IllegalFilterException.java
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/services/PagerService.java
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/services/SortFactory.java
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/services/SortService.java
Modified:
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/model/PagerModel.java
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/model/cell/AnchorCellModel.java
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/model/cell/HeaderCellModel.java
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/model/cell/ImageCellModel.java
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/model/cell/LiteralCellModel.java
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/rendering/cell/AnchorCellDecorator.java
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/rendering/cell/CellDecorator.java
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/rendering/cell/HeaderCellDecorator.java
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/rendering/cell/ImageCellDecorator.java
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/rendering/cell/LiteralCellDecorator.java
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/rendering/cell/SortedCellDecorator.java
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/services/DataGridStateService.java
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/util/PagedDataSet.java
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/AbstractColumn.java
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/AbstractHtmlColumn.java
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/AnchorColumn.java
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/Columns.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/ImageColumn.java
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/LiteralColumn.java
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/RenderPager.java
incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/datagrid/DefaultSortTest.java
incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/datagrid/SortServiceTest.java
Copied: incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/model/CellModel.java (from r123694, incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/model/ColumnModel.java)
Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/model/CellModel.java?view=diff&rev=123722&p1=incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/model/ColumnModel.java&r1=123694&p2=incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/model/CellModel.java&r2=123722
==============================================================================
--- incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/model/ColumnModel.java (original)
+++ incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/model/CellModel.java Thu Dec 30 07:00:34 2004
@@ -25,15 +25,15 @@
/**
*/
-public class ColumnModel {
+public class CellModel {
- private static final Logger LOGGER = Logger.getInstance(ColumnModel.class);
+ private static final Logger LOGGER = Logger.getInstance(CellModel.class);
private ColumnsModel _columnsModel;
private DataGridModel _dataGridModel;
private ArrayList<Formatter> _formatters;
- public ColumnModel() {
+ public CellModel() {
}
public boolean isRenderingHeader() {
Deleted: /incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/model/ColumnModel.java
Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/model/ColumnModel.java?view=auto&rev=123721
==============================================================================
Modified: 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/model/DataGridModel.java?view=diff&rev=123722&p1=incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/model/DataGridModel.java&r1=123721&p2=incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/model/DataGridModel.java&r2=123722
==============================================================================
--- 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/model/DataGridModel.java Thu Dec 30 07:00:34 2004
@@ -20,15 +20,13 @@
import javax.servlet.jsp.JspContext;
import javax.servlet.jsp.PageContext;
-import org.apache.beehive.netui.databinding.datagrid.rendering.TableRenderer;
-import org.apache.beehive.netui.databinding.datagrid.services.PagerService;
+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.rendering.pager.IPagerRenderer;
+import org.apache.beehive.netui.databinding.datagrid.rendering.pager.PreviousNextPagerRenderer;
+import org.apache.beehive.netui.databinding.datagrid.services.pager.PagerService;
import org.apache.beehive.netui.databinding.datagrid.services.DataGridStateService;
-import org.apache.beehive.netui.databinding.datagrid.services.PagerService;
import org.apache.beehive.netui.databinding.datagrid.util.PagedDataSet;
-import org.apache.beehive.netui.databinding.datagrid.rendering.IPagerRenderer;
-import org.apache.beehive.netui.databinding.datagrid.rendering.TableRenderer;
-import org.apache.beehive.netui.databinding.datagrid.rendering.impl.PreviousNextPagerRenderer;
-import org.apache.beehive.netui.databinding.datagrid.rendering.impl.PreviousNextPagerRenderer;
import org.apache.beehive.netui.tags.rendering.AbstractRenderAppender;
/**
Deleted: /incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/model/IFilter.java
Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/model/IFilter.java?view=auto&rev=123721
==============================================================================
Deleted: /incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/model/ISort.java
Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/model/ISort.java?view=auto&rev=123721
==============================================================================
Modified: incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/model/PagerModel.java
Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/model/PagerModel.java?view=diff&rev=123722&p1=incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/model/PagerModel.java&r1=123721&p2=incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/model/PagerModel.java&r2=123722
==============================================================================
--- incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/model/PagerModel.java (original)
+++ incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/model/PagerModel.java Thu Dec 30 07:00:34 2004
@@ -17,8 +17,7 @@
*/
package org.apache.beehive.netui.databinding.datagrid.model;
-import org.apache.beehive.netui.databinding.datagrid.services.PagerService;
-import org.apache.beehive.netui.databinding.datagrid.services.PagerService;
+import org.apache.beehive.netui.databinding.datagrid.services.pager.PagerService;
import org.apache.beehive.netui.databinding.datagrid.util.JspUtil;
import org.apache.beehive.netui.pageflow.internal.InternalUtils;
import org.apache.beehive.netui.util.logging.Logger;
Deleted: /incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/model/StylePolicy.java
Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/model/StylePolicy.java?view=auto&rev=123721
==============================================================================
Modified: incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/model/cell/AnchorCellModel.java
Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/model/cell/AnchorCellModel.java?view=diff&rev=123722&p1=incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/model/cell/AnchorCellModel.java&r1=123721&p2=incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/model/cell/AnchorCellModel.java&r2=123722
==============================================================================
--- incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/model/cell/AnchorCellModel.java (original)
+++ incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/model/cell/AnchorCellModel.java Thu Dec 30 07:00:34 2004
@@ -21,13 +21,13 @@
import org.apache.beehive.netui.tags.rendering.AnchorTag;
import org.apache.beehive.netui.tags.rendering.AnchorTag.State;
-import org.apache.beehive.netui.databinding.datagrid.model.ColumnModel;
+import org.apache.beehive.netui.databinding.datagrid.model.CellModel;
/**
*
*/
public class AnchorCellModel
- extends ColumnModel {
+ extends CellModel {
public AnchorCellModel() {
super();
Modified: incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/model/cell/HeaderCellModel.java
Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/model/cell/HeaderCellModel.java?view=diff&rev=123722&p1=incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/model/cell/HeaderCellModel.java&r1=123721&p2=incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/model/cell/HeaderCellModel.java&r2=123722
==============================================================================
--- incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/model/cell/HeaderCellModel.java (original)
+++ incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/model/cell/HeaderCellModel.java Thu Dec 30 07:00:34 2004
@@ -17,13 +17,13 @@
*/
package org.apache.beehive.netui.databinding.datagrid.model.cell;
-import org.apache.beehive.netui.databinding.datagrid.model.ColumnModel;
+import org.apache.beehive.netui.databinding.datagrid.model.CellModel;
/**
*
*/
public class HeaderCellModel
- extends ColumnModel {
+ extends CellModel {
private String _headerText = null;
private String _bodyContent = null;
Modified: incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/model/cell/ImageCellModel.java
Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/model/cell/ImageCellModel.java?view=diff&rev=123722&p1=incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/model/cell/ImageCellModel.java&r1=123721&p2=incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/model/cell/ImageCellModel.java&r2=123722
==============================================================================
--- incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/model/cell/ImageCellModel.java (original)
+++ incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/model/cell/ImageCellModel.java Thu Dec 30 07:00:34 2004
@@ -19,13 +19,13 @@
import org.apache.beehive.netui.tags.rendering.ImageTag;
import org.apache.beehive.netui.tags.rendering.ImageTag.State;
-import org.apache.beehive.netui.databinding.datagrid.model.ColumnModel;
+import org.apache.beehive.netui.databinding.datagrid.model.CellModel;
/**
*
*/
public class ImageCellModel
- extends ColumnModel {
+ extends CellModel {
private ImageTag.State _imageState = null;
Modified: incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/model/cell/LiteralCellModel.java
Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/model/cell/LiteralCellModel.java?view=diff&rev=123722&p1=incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/model/cell/LiteralCellModel.java&r1=123721&p2=incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/model/cell/LiteralCellModel.java&r2=123722
==============================================================================
--- incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/model/cell/LiteralCellModel.java (original)
+++ incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/model/cell/LiteralCellModel.java Thu Dec 30 07:00:34 2004
@@ -19,13 +19,13 @@
import org.apache.beehive.netui.tags.rendering.SpanTag;
import org.apache.beehive.netui.tags.rendering.SpanTag.State;
-import org.apache.beehive.netui.databinding.datagrid.model.ColumnModel;
+import org.apache.beehive.netui.databinding.datagrid.model.CellModel;
/**
*
*/
public class LiteralCellModel
- extends ColumnModel {
+ extends CellModel {
private static final SpanTag.State DEFAULT_SPAN_STATE = new SpanTag.State();
Copied: incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/model/filter/DefaultFilter.java (from r123694, incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/model/impl/DefaultFilter.java)
Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/model/filter/DefaultFilter.java?view=diff&rev=123722&p1=incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/model/impl/DefaultFilter.java&r1=123694&p2=incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/model/filter/DefaultFilter.java&r2=123722
==============================================================================
--- incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/model/impl/DefaultFilter.java (original)
+++ incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/model/filter/DefaultFilter.java Thu Dec 30 07:00:34 2004
@@ -15,22 +15,20 @@
*
* $Header:$
*/
-package org.apache.beehive.netui.databinding.datagrid.model.impl;
+package org.apache.beehive.netui.databinding.datagrid.model.filter;
import java.util.HashMap;
-import org.apache.beehive.netui.databinding.datagrid.model.IFilter;
-import org.apache.beehive.netui.databinding.datagrid.services.IllegalFilterException;
-import org.apache.beehive.netui.databinding.datagrid.services.IllegalFilterException;
+import org.apache.beehive.netui.databinding.datagrid.services.filter.IllegalFilterException;
import org.apache.beehive.netui.util.logging.Logger;
/**
*
*/
public class DefaultFilter
- implements IFilter {
+ implements IFilter {
- private static final Logger _logger = Logger.getInstance(DefaultFilter.class);
+ private static final Logger LOGGER = Logger.getInstance(DefaultFilter.class);
private static final HashMap STRING_TO_INT;
private static final HashMap INT_TO_STRING;
@@ -112,8 +110,8 @@
DefaultFilter f = new DefaultFilter(terms[1], terms[2], terms[3]);
return f;
} catch (NumberFormatException nfe) {
- if (_logger.isErrorEnabled())
- _logger.error("An error occurred parsing a URL filter with syntax \"" + filter + "\".");
+ if (LOGGER.isErrorEnabled())
+ LOGGER.error("An error occurred parsing a URL filter with syntax \"" + filter + "\".");
throw new IllegalFilterException("An exception occurred parsing the filter \"" + filter + "\". Cause: " + nfe, nfe);
}
} else
Copied: incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/model/filter/IFilter.java (from r123589, incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/model/IFilter.java)
Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/model/filter/IFilter.java?view=diff&rev=123722&p1=incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/model/IFilter.java&r1=123589&p2=incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/model/filter/IFilter.java&r2=123722
==============================================================================
--- incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/model/IFilter.java (original)
+++ incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/model/filter/IFilter.java Thu Dec 30 07:00:34 2004
@@ -15,7 +15,7 @@
*
* $Header:$
*/
-package org.apache.beehive.netui.databinding.datagrid.model;
+package org.apache.beehive.netui.databinding.datagrid.model.filter;
/**
*
Copied: incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/model/sort/DefaultSort.java (from r123694, incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/model/impl/DefaultSort.java)
Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/model/sort/DefaultSort.java?view=diff&rev=123722&p1=incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/model/impl/DefaultSort.java&r1=123694&p2=incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/model/sort/DefaultSort.java&r2=123722
==============================================================================
--- incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/model/impl/DefaultSort.java (original)
+++ incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/model/sort/DefaultSort.java Thu Dec 30 07:00:34 2004
@@ -15,10 +15,7 @@
*
* $Header:$
*/
-package org.apache.beehive.netui.databinding.datagrid.model.impl;
-
-import org.apache.beehive.netui.databinding.datagrid.model.ISort;
-import org.apache.beehive.netui.util.logging.Logger;
+package org.apache.beehive.netui.databinding.datagrid.model.sort;
/*
* Default sort syntax: netui_sort=<gridNamespace>~[+|-]<expr>
@@ -28,8 +25,6 @@
*/
public class DefaultSort
implements ISort {
-
- private static final Logger LOGGER = Logger.getInstance(DefaultSort.class);
private String _expr;
private int _dir;
Copied: incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/model/sort/ISort.java (from r123589, incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/model/ISort.java)
Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/model/sort/ISort.java?view=diff&rev=123722&p1=incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/model/ISort.java&r1=123589&p2=incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/model/sort/ISort.java&r2=123722
==============================================================================
--- incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/model/ISort.java (original)
+++ incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/model/sort/ISort.java Thu Dec 30 07:00:34 2004
@@ -15,7 +15,7 @@
*
* $Header:$
*/
-package org.apache.beehive.netui.databinding.datagrid.model;
+package org.apache.beehive.netui.databinding.datagrid.model.sort;
/**
*
Copied: incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/model/style/DefaultStylePolicy.java (from r123589, incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/model/impl/DefaultStylePolicy.java)
Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/model/style/DefaultStylePolicy.java?view=diff&rev=123722&p1=incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/model/impl/DefaultStylePolicy.java&r1=123589&p2=incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/model/style/DefaultStylePolicy.java&r2=123722
==============================================================================
--- incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/model/impl/DefaultStylePolicy.java (original)
+++ incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/model/style/DefaultStylePolicy.java Thu Dec 30 07:00:34 2004
@@ -15,9 +15,7 @@
*
* $Header:$
*/
-package org.apache.beehive.netui.databinding.datagrid.model.impl;
-
-import org.apache.beehive.netui.databinding.datagrid.model.StylePolicy;
+package org.apache.beehive.netui.databinding.datagrid.model.style;
/**
*
Copied: incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/model/style/EmptyStylePolicy.java (from r123589, incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/model/impl/EmptyStylePolicy.java)
Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/model/style/EmptyStylePolicy.java?view=diff&rev=123722&p1=incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/model/impl/EmptyStylePolicy.java&r1=123589&p2=incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/model/style/EmptyStylePolicy.java&r2=123722
==============================================================================
--- incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/model/impl/EmptyStylePolicy.java (original)
+++ incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/model/style/EmptyStylePolicy.java Thu Dec 30 07:00:34 2004
@@ -15,10 +15,7 @@
*
* $Header:$
*/
-package org.apache.beehive.netui.databinding.datagrid.model.impl;
-
-import org.apache.beehive.netui.databinding.datagrid.model.StylePolicy;
-import org.apache.beehive.netui.util.logging.Logger;
+package org.apache.beehive.netui.databinding.datagrid.model.style;
/**
*
Copied: incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/model/style/StylePolicy.java (from r123589, incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/model/StylePolicy.java)
Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/model/style/StylePolicy.java?view=diff&rev=123722&p1=incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/model/StylePolicy.java&r1=123589&p2=incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/model/style/StylePolicy.java&r2=123722
==============================================================================
--- incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/model/StylePolicy.java (original)
+++ incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/model/style/StylePolicy.java Thu Dec 30 07:00:34 2004
@@ -15,7 +15,7 @@
*
* $Header:$
*/
-package org.apache.beehive.netui.databinding.datagrid.model;
+package org.apache.beehive.netui.databinding.datagrid.model.style;
import org.apache.beehive.netui.util.logging.Logger;
@@ -24,8 +24,9 @@
*/
public abstract class StylePolicy
{
- private static final Logger _logger = Logger.getInstance(StylePolicy.class);
+ private static final Logger LOGGER = Logger.getInstance(StylePolicy.class);
+ /* todo: enum-ize this */
public static final int TABLE_CLASS = 1;
public static final int HEADER_ROW_CLASS = 2;
public static final int FOOTER_ROW_CLASS = 3;
@@ -82,7 +83,8 @@
case HEADER_CELL_SORTED_CLASS: return getHeaderCellSortedClass();
default:
{
- if(_logger.isDebugEnabled()) _logger.debug("Unable to file style class for class type \"" + cssClassType + "\".");
+ if(LOGGER.isDebugEnabled())
+ LOGGER.debug("Unable to file style class for class type \"" + cssClassType + "\".");
return "";
}
}
Deleted: /incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/rendering/IPagerRenderer.java
Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/rendering/IPagerRenderer.java?view=auto&rev=123721
==============================================================================
Deleted: /incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/rendering/TableRenderer.java
Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/rendering/TableRenderer.java?view=auto&rev=123721
==============================================================================
Modified: incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/rendering/cell/AnchorCellDecorator.java
Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/rendering/cell/AnchorCellDecorator.java?view=diff&rev=123722&p1=incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/rendering/cell/AnchorCellDecorator.java&r1=123721&p2=incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/rendering/cell/AnchorCellDecorator.java&r2=123722
==============================================================================
--- incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/rendering/cell/AnchorCellDecorator.java (original)
+++ incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/rendering/cell/AnchorCellDecorator.java Thu Dec 30 07:00:34 2004
@@ -21,13 +21,11 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.jsp.JspContext;
-import org.apache.beehive.netui.databinding.datagrid.model.ColumnModel;
+import org.apache.beehive.netui.databinding.datagrid.model.CellModel;
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.AnchorCellModel;
import org.apache.beehive.netui.databinding.datagrid.util.JspUtil;
-import org.apache.beehive.netui.databinding.datagrid.rendering.cell.CellDecorator;
-import org.apache.beehive.netui.databinding.datagrid.rendering.cell.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;
@@ -44,7 +42,7 @@
private static final Logger LOGGER = Logger.getInstance(AnchorCellDecorator.class);
/* todo: need to tie this into the grid's error reporting */
- public void decorate(JspContext jspContext, AbstractRenderAppender appender, ColumnModel columnModel)
+ public void decorate(JspContext jspContext, AbstractRenderAppender appender, CellModel columnModel)
throws CellDecoratorException {
assert columnModel instanceof AnchorCellModel;
Modified: incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/rendering/cell/CellDecorator.java
Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/rendering/cell/CellDecorator.java?view=diff&rev=123722&p1=incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/rendering/cell/CellDecorator.java&r1=123721&p2=incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/rendering/cell/CellDecorator.java&r2=123722
==============================================================================
--- incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/rendering/cell/CellDecorator.java (original)
+++ incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/rendering/cell/CellDecorator.java Thu Dec 30 07:00:34 2004
@@ -20,7 +20,7 @@
import javax.servlet.jsp.JspContext;
import org.apache.beehive.netui.tags.rendering.AbstractRenderAppender;
-import org.apache.beehive.netui.databinding.datagrid.model.ColumnModel;
+import org.apache.beehive.netui.databinding.datagrid.model.CellModel;
/**
*
@@ -29,6 +29,6 @@
public abstract void decorate(JspContext jspContext,
AbstractRenderAppender appender,
- ColumnModel columnModel)
+ CellModel cellModel)
throws CellDecoratorException;
}
Modified: incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/rendering/cell/HeaderCellDecorator.java
Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/rendering/cell/HeaderCellDecorator.java?view=diff&rev=123722&p1=incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/rendering/cell/HeaderCellDecorator.java&r1=123721&p2=incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/rendering/cell/HeaderCellDecorator.java&r2=123722
==============================================================================
--- incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/rendering/cell/HeaderCellDecorator.java (original)
+++ incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/rendering/cell/HeaderCellDecorator.java Thu Dec 30 07:00:34 2004
@@ -20,9 +20,8 @@
import javax.servlet.jsp.JspContext;
import org.apache.beehive.netui.tags.rendering.AbstractRenderAppender;
-import org.apache.beehive.netui.databinding.datagrid.model.ColumnModel;
-import org.apache.beehive.netui.databinding.datagrid.model.cell.HeaderCellModel;
import org.apache.beehive.netui.databinding.datagrid.model.cell.HeaderCellModel;
+import org.apache.beehive.netui.databinding.datagrid.model.CellModel;
/**
*
@@ -30,11 +29,11 @@
public class HeaderCellDecorator
extends CellDecorator {
- public void decorate(JspContext jspContext, AbstractRenderAppender appender, ColumnModel columnModel)
+ public void decorate(JspContext jspContext, AbstractRenderAppender appender, CellModel cellModel)
throws CellDecoratorException {
- assert columnModel instanceof HeaderCellModel;
- HeaderCellModel headerCellModel = (HeaderCellModel)columnModel;
+ assert cellModel instanceof HeaderCellModel;
+ HeaderCellModel headerCellModel = (HeaderCellModel)cellModel;
if (headerCellModel.getHeaderText() != null)
appender.append(headerCellModel.getHeaderText());
Modified: incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/rendering/cell/ImageCellDecorator.java
Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/rendering/cell/ImageCellDecorator.java?view=diff&rev=123722&p1=incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/rendering/cell/ImageCellDecorator.java&r1=123721&p2=incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/rendering/cell/ImageCellDecorator.java&r2=123722
==============================================================================
--- incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/rendering/cell/ImageCellDecorator.java (original)
+++ incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/rendering/cell/ImageCellDecorator.java Thu Dec 30 07:00:34 2004
@@ -22,7 +22,7 @@
import org.apache.beehive.netui.tags.rendering.AbstractRenderAppender;
import org.apache.beehive.netui.tags.rendering.TagRenderingBase;
-import org.apache.beehive.netui.databinding.datagrid.model.ColumnModel;
+import org.apache.beehive.netui.databinding.datagrid.model.CellModel;
import org.apache.beehive.netui.databinding.datagrid.model.cell.ImageCellModel;
import org.apache.beehive.netui.databinding.datagrid.util.JspUtil;
@@ -32,12 +32,12 @@
public class ImageCellDecorator
extends CellDecorator {
- public void decorate(JspContext jspContext, AbstractRenderAppender appender, ColumnModel columnModel)
+ public void decorate(JspContext jspContext, AbstractRenderAppender appender, CellModel cellModel)
throws CellDecoratorException {
- assert columnModel instanceof ImageCellModel;
+ assert cellModel instanceof ImageCellModel;
- ImageCellModel imageColumnModel = (ImageCellModel)columnModel;
+ ImageCellModel imageColumnModel = (ImageCellModel)cellModel;
HttpServletRequest request = JspUtil.getRequest(jspContext);
TagRenderingBase br = TagRenderingBase.Factory.getRendering(TagRenderingBase.IMAGE_TAG, request);
Modified: incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/rendering/cell/LiteralCellDecorator.java
Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/rendering/cell/LiteralCellDecorator.java?view=diff&rev=123722&p1=incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/rendering/cell/LiteralCellDecorator.java&r1=123721&p2=incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/rendering/cell/LiteralCellDecorator.java&r2=123722
==============================================================================
--- incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/rendering/cell/LiteralCellDecorator.java (original)
+++ incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/rendering/cell/LiteralCellDecorator.java Thu Dec 30 07:00:34 2004
@@ -22,7 +22,7 @@
import org.apache.beehive.netui.tags.rendering.AbstractRenderAppender;
import org.apache.beehive.netui.tags.rendering.TagRenderingBase;
-import org.apache.beehive.netui.databinding.datagrid.model.ColumnModel;
+import org.apache.beehive.netui.databinding.datagrid.model.CellModel;
import org.apache.beehive.netui.databinding.datagrid.model.cell.LiteralCellModel;
import org.apache.beehive.netui.databinding.datagrid.util.JspUtil;
@@ -32,17 +32,17 @@
public class LiteralCellDecorator
extends CellDecorator {
- public void decorate(JspContext jspContext, AbstractRenderAppender appender, ColumnModel columnModel)
+ public void decorate(JspContext jspContext, AbstractRenderAppender appender, CellModel cellModel)
throws CellDecoratorException {
- assert columnModel instanceof LiteralCellModel;
- LiteralCellModel literalColumnModel = (LiteralCellModel)columnModel;
+ assert cellModel instanceof LiteralCellModel;
+ LiteralCellModel literalColumnModel = (LiteralCellModel)cellModel;
HttpServletRequest request = JspUtil.getRequest(jspContext);
TagRenderingBase span = TagRenderingBase.Factory.getRendering(TagRenderingBase.SPAN_TAG, request);
/* todo: need to support formatting here */
- String formatted = columnModel.formatText(literalColumnModel.getValue());
+ String formatted = cellModel.formatText(literalColumnModel.getValue());
span.doStartTag(appender, literalColumnModel.getSpanState());
appender.append(formatted);
Modified: incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/rendering/cell/SortedCellDecorator.java
Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/rendering/cell/SortedCellDecorator.java?view=diff&rev=123722&p1=incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/rendering/cell/SortedCellDecorator.java&r1=123721&p2=incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/rendering/cell/SortedCellDecorator.java&r2=123722
==============================================================================
--- incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/rendering/cell/SortedCellDecorator.java (original)
+++ incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/rendering/cell/SortedCellDecorator.java Thu Dec 30 07:00:34 2004
@@ -29,12 +29,12 @@
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.ColumnModel;
+import org.apache.beehive.netui.databinding.datagrid.model.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.util.JspUtil;
import org.apache.beehive.netui.databinding.datagrid.services.DataGridStateService;
-import org.apache.beehive.netui.databinding.datagrid.services.SortService;
+import org.apache.beehive.netui.databinding.datagrid.services.sort.SortService;
import org.apache.beehive.netui.util.logging.Logger;
/**
@@ -51,15 +51,15 @@
_decorator = decorator;
}
- public void decorate(JspContext jspContext, AbstractRenderAppender appender, ColumnModel columnModel)
+ public void decorate(JspContext jspContext, AbstractRenderAppender appender, CellModel cellModel)
throws CellDecoratorException {
- assert columnModel instanceof HeaderCellModel;
- HeaderCellModel headerCellModel = (HeaderCellModel)columnModel;
+ assert cellModel instanceof HeaderCellModel;
+ HeaderCellModel headerCellModel = (HeaderCellModel)cellModel;
String sortLink = null;
- _decorator.decorate(jspContext, appender, columnModel);
+ _decorator.decorate(jspContext, appender, cellModel);
if(headerCellModel.isSortable()) {
sortLink = buildSortLink(jspContext, headerCellModel);
Copied: incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/rendering/pager/AbstractPagerRenderer.java (from r123694, incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/rendering/impl/AbstractPagerRenderer.java)
Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/rendering/pager/AbstractPagerRenderer.java?view=diff&rev=123722&p1=incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/rendering/impl/AbstractPagerRenderer.java&r1=123694&p2=incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/rendering/pager/AbstractPagerRenderer.java&r2=123722
==============================================================================
--- incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/rendering/impl/AbstractPagerRenderer.java (original)
+++ incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/rendering/pager/AbstractPagerRenderer.java Thu Dec 30 07:00:34 2004
@@ -15,14 +15,12 @@
*
* $Header:$
*/
-package org.apache.beehive.netui.databinding.datagrid.rendering.impl;
+package org.apache.beehive.netui.databinding.datagrid.rendering.pager;
import org.apache.beehive.netui.util.logging.Logger;
-import org.apache.beehive.netui.databinding.datagrid.services.PagerService;
-import org.apache.beehive.netui.databinding.datagrid.services.PagerService;
+import org.apache.beehive.netui.databinding.datagrid.services.pager.PagerService;
import org.apache.beehive.netui.databinding.datagrid.model.PagerModel;
import org.apache.beehive.netui.databinding.datagrid.model.DataGridModel;
-import org.apache.beehive.netui.databinding.datagrid.rendering.IPagerRenderer;
/**
* todo: lots of i18n here
@@ -30,8 +28,6 @@
public abstract class AbstractPagerRenderer
implements IPagerRenderer
{
- private static final Logger _logger = Logger.getInstance(AbstractPagerRenderer.class);
-
private PagerModel _pagerModel;
private DataGridModel _gridModel;
Copied: incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/rendering/pager/FirstPreviousNextLastPagerRenderer.java (from r123694, incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/rendering/impl/FirstPreviousNextLastPagerRenderer.java)
Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/rendering/pager/FirstPreviousNextLastPagerRenderer.java?view=diff&rev=123722&p1=incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/rendering/impl/FirstPreviousNextLastPagerRenderer.java&r1=123694&p2=incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/rendering/pager/FirstPreviousNextLastPagerRenderer.java&r2=123722
==============================================================================
--- incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/rendering/impl/FirstPreviousNextLastPagerRenderer.java (original)
+++ incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/rendering/pager/FirstPreviousNextLastPagerRenderer.java Thu Dec 30 07:00:34 2004
@@ -15,22 +15,16 @@
*
* $Header:$
*/
-package org.apache.beehive.netui.databinding.datagrid.rendering.impl;
+package org.apache.beehive.netui.databinding.datagrid.rendering.pager;
import org.apache.beehive.netui.util.logging.Logger;
import org.apache.beehive.netui.databinding.datagrid.model.PagerModel;
import org.apache.beehive.netui.databinding.datagrid.model.DataGridModel;
-import org.apache.beehive.netui.databinding.datagrid.services.PagerService;
-import org.apache.beehive.netui.databinding.datagrid.services.PagerService;
-import org.apache.beehive.netui.databinding.datagrid.services.PagerService;
-import org.apache.beehive.netui.databinding.datagrid.rendering.impl.AbstractPagerRenderer;
-import org.apache.beehive.netui.databinding.datagrid.rendering.impl.AbstractPagerRenderer;
+import org.apache.beehive.netui.databinding.datagrid.services.pager.PagerService;
public class FirstPreviousNextLastPagerRenderer
extends AbstractPagerRenderer
{
- private static final Logger _logger = Logger.getInstance(FirstPreviousNextLastPagerRenderer.class);
-
public FirstPreviousNextLastPagerRenderer(DataGridModel gridModel, PagerModel pagerModel)
{
super(gridModel, pagerModel);
Copied: incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/rendering/pager/IPagerRenderer.java (from r123589, incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/rendering/IPagerRenderer.java)
Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/rendering/pager/IPagerRenderer.java?view=diff&rev=123722&p1=incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/rendering/IPagerRenderer.java&r1=123589&p2=incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/rendering/pager/IPagerRenderer.java&r2=123722
==============================================================================
--- incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/rendering/IPagerRenderer.java (original)
+++ incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/rendering/pager/IPagerRenderer.java Thu Dec 30 07:00:34 2004
@@ -15,9 +15,7 @@
*
* $Header:$
*/
-package org.apache.beehive.netui.databinding.datagrid.rendering;
-
-import org.apache.beehive.netui.databinding.datagrid.model.PagerModel;
+package org.apache.beehive.netui.databinding.datagrid.rendering.pager;
/**
*
Copied: incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/rendering/pager/PreviousNextPagerRenderer.java (from r123694, incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/rendering/impl/PreviousNextPagerRenderer.java)
Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/rendering/pager/PreviousNextPagerRenderer.java?view=diff&rev=123722&p1=incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/rendering/impl/PreviousNextPagerRenderer.java&r1=123694&p2=incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/rendering/pager/PreviousNextPagerRenderer.java&r2=123722
==============================================================================
--- incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/rendering/impl/PreviousNextPagerRenderer.java (original)
+++ incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/rendering/pager/PreviousNextPagerRenderer.java Thu Dec 30 07:00:34 2004
@@ -15,22 +15,16 @@
*
* $Header:$
*/
-package org.apache.beehive.netui.databinding.datagrid.rendering.impl;
+package org.apache.beehive.netui.databinding.datagrid.rendering.pager;
import org.apache.beehive.netui.databinding.datagrid.model.PagerModel;
import org.apache.beehive.netui.databinding.datagrid.model.DataGridModel;
-import org.apache.beehive.netui.databinding.datagrid.services.PagerService;
-import org.apache.beehive.netui.databinding.datagrid.services.PagerService;
-import org.apache.beehive.netui.databinding.datagrid.services.PagerService;
-import org.apache.beehive.netui.databinding.datagrid.rendering.impl.AbstractPagerRenderer;
-import org.apache.beehive.netui.databinding.datagrid.rendering.impl.AbstractPagerRenderer;
+import org.apache.beehive.netui.databinding.datagrid.services.pager.PagerService;
import org.apache.beehive.netui.util.logging.Logger;
public class PreviousNextPagerRenderer
extends AbstractPagerRenderer
{
- private static final Logger _logger = Logger.getInstance(PreviousNextPagerRenderer.class);
-
public PreviousNextPagerRenderer(DataGridModel gridModel, PagerModel pagerModel)
{
super(gridModel, pagerModel);
Copied: incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/rendering/table/TableRenderer.java (from r123589, incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/rendering/TableRenderer.java)
Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/rendering/table/TableRenderer.java?view=diff&rev=123722&p1=incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/rendering/TableRenderer.java&r1=123589&p2=incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/rendering/table/TableRenderer.java&r2=123722
==============================================================================
--- incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/rendering/TableRenderer.java (original)
+++ incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/rendering/table/TableRenderer.java Thu Dec 30 07:00:34 2004
@@ -15,7 +15,7 @@
*
* $Header:$
*/
-package org.apache.beehive.netui.databinding.datagrid.rendering;
+package org.apache.beehive.netui.databinding.datagrid.rendering.table;
import javax.servlet.http.HttpServletRequest;
@@ -27,7 +27,7 @@
import org.apache.beehive.netui.tags.rendering.CaptionTag;
import org.apache.beehive.netui.tags.rendering.THeadTag;
import org.apache.beehive.netui.tags.rendering.AbstractRenderAppender;
-import org.apache.beehive.netui.databinding.datagrid.model.StylePolicy;
+import org.apache.beehive.netui.databinding.datagrid.model.style.StylePolicy;
public class TableRenderer
{
Modified: incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/services/DataGridStateService.java
Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/services/DataGridStateService.java?view=diff&rev=123722&p1=incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/services/DataGridStateService.java&r1=123721&p2=incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/services/DataGridStateService.java&r2=123722
==============================================================================
--- incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/services/DataGridStateService.java (original)
+++ incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/services/DataGridStateService.java Thu Dec 30 07:00:34 2004
@@ -23,9 +23,9 @@
import java.util.ArrayList;
import javax.servlet.ServletRequest;
-import org.apache.beehive.netui.util.logging.Logger;
-import org.apache.beehive.netui.databinding.datagrid.model.ISort;
-import org.apache.beehive.netui.databinding.datagrid.model.impl.DefaultSort;
+import org.apache.beehive.netui.databinding.datagrid.model.sort.ISort;
+import org.apache.beehive.netui.databinding.datagrid.model.sort.DefaultSort;
+import org.apache.beehive.netui.databinding.datagrid.services.sort.SortService;
/**
* todo: need to support registering URL prefixes that have state service handlers
@@ -33,8 +33,6 @@
*/
public class DataGridStateService
implements java.io.Serializable {
-
- private static final Logger LOGGER = Logger.getInstance(DataGridStateService.class);
private String _namespace = null;
private SortService _sortService = null;
Deleted: /incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/services/FilterService.java
Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/services/FilterService.java?view=auto&rev=123721
==============================================================================
Deleted: /incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/services/IllegalFilterException.java
Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/services/IllegalFilterException.java?view=auto&rev=123721
==============================================================================
Deleted: /incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/services/PagerService.java
Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/services/PagerService.java?view=auto&rev=123721
==============================================================================
Deleted: /incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/services/SortFactory.java
Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/services/SortFactory.java?view=auto&rev=123721
==============================================================================
Deleted: /incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/services/SortService.java
Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/services/SortService.java?view=auto&rev=123721
==============================================================================
Copied: incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/services/filter/FilterService.java (from r123589, incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/services/FilterService.java)
Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/services/filter/FilterService.java?view=diff&rev=123722&p1=incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/services/FilterService.java&r1=123589&p2=incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/services/filter/FilterService.java&r2=123722
==============================================================================
--- incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/services/FilterService.java (original)
+++ incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/services/filter/FilterService.java Thu Dec 30 07:00:34 2004
@@ -15,7 +15,7 @@
*
* $Header:$
*/
-package org.apache.beehive.netui.databinding.datagrid.services;
+package org.apache.beehive.netui.databinding.datagrid.services.filter;
import java.util.ArrayList;
import java.util.Iterator;
@@ -26,7 +26,7 @@
import javax.servlet.jsp.PageContext;
import javax.servlet.jsp.JspContext;
-import org.apache.beehive.netui.databinding.datagrid.model.IFilter;
+import org.apache.beehive.netui.databinding.datagrid.model.filter.IFilter;
import org.apache.beehive.netui.util.logging.Logger;
/**
@@ -34,7 +34,7 @@
*/
public class FilterService
{
- private static final Logger _logger = Logger.getInstance(FilterService.class);
+ private static final Logger LOGGER = Logger.getInstance(FilterService.class);
public static FilterService getInstance(JspContext jspContext, String namespace)
{
@@ -130,7 +130,7 @@
public String getFilterQueryStringOmitFilter(String filterExpression)
{
- if(_logger.isDebugEnabled()) _logger.debug("get query string omit filter: " + filterExpression);
+ if(LOGGER.isDebugEnabled()) LOGGER.debug("get query string omit filter: " + filterExpression);
return getFilterQueryStringInternal(filterExpression);
}
@@ -280,8 +280,8 @@
}
}
- if(_logger.isDebugEnabled()) _logger.debug("filter query string: " + buf.toString());
- if(_logger.isDebugEnabled()) _logger.debug("alt params size: " + _altParams != null ? "" + _altParams.size() : "null");
+ if(LOGGER.isDebugEnabled()) LOGGER.debug("filter query string: " + buf.toString());
+ if(LOGGER.isDebugEnabled()) LOGGER.debug("alt params size: " + _altParams != null ? "" + _altParams.size() : "null");
if(_altParams != null && _altParams.size() > 0)
{
@@ -305,7 +305,7 @@
}
}
- if(_logger.isDebugEnabled()) _logger.debug("filter query string with alt params: " + buf.toString());
+ if(LOGGER.isDebugEnabled()) LOGGER.debug("filter query string with alt params: " + buf.toString());
return buf.toString();
}
@@ -350,7 +350,7 @@
}
}
- if(_logger.isDebugEnabled()) _logger.debug("alt params map: " + mapToString(_altParams));
+ if(LOGGER.isDebugEnabled()) LOGGER.debug("alt params map: " + mapToString(_altParams));
}
private static final Map createFilters(String[] queryParams, String namespace)
@@ -364,7 +364,7 @@
if(!queryParams[i].startsWith(namespace + "~"))
continue;
- IFilter f = org.apache.beehive.netui.databinding.datagrid.model.impl.DefaultFilter.parse(namespace, queryParams[i]);
+ IFilter f = org.apache.beehive.netui.databinding.datagrid.model.filter.DefaultFilter.parse(namespace, queryParams[i]);
assert f != null;
@@ -429,7 +429,7 @@
if(query[i].equals(""))
continue;
- if(_logger.isDebugEnabled()) _logger.debug("split query param: '" + query[i] + "'");
+ if(LOGGER.isDebugEnabled()) LOGGER.debug("split query param: '" + query[i] + "'");
assert query[i].indexOf("=") > -1;
Copied: incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/services/filter/IllegalFilterException.java (from r123589, incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/services/IllegalFilterException.java)
Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/services/filter/IllegalFilterException.java?view=diff&rev=123722&p1=incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/services/IllegalFilterException.java&r1=123589&p2=incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/services/filter/IllegalFilterException.java&r2=123722
==============================================================================
--- incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/services/IllegalFilterException.java (original)
+++ incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/services/filter/IllegalFilterException.java Thu Dec 30 07:00:34 2004
@@ -15,7 +15,7 @@
*
* $Header:$
*/
-package org.apache.beehive.netui.databinding.datagrid.services;
+package org.apache.beehive.netui.databinding.datagrid.services.filter;
/**
*
Copied: incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/services/pager/PagerService.java (from r123589, incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/services/PagerService.java)
Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/services/pager/PagerService.java?view=diff&rev=123722&p1=incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/services/PagerService.java&r1=123589&p2=incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/services/pager/PagerService.java&r2=123722
==============================================================================
--- incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/services/PagerService.java (original)
+++ incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/services/pager/PagerService.java Thu Dec 30 07:00:34 2004
@@ -15,7 +15,7 @@
*
* $Header:$
*/
-package org.apache.beehive.netui.databinding.datagrid.services;
+package org.apache.beehive.netui.databinding.datagrid.services.pager;
import javax.servlet.ServletRequest;
import javax.servlet.jsp.JspContext;
@@ -28,7 +28,8 @@
*/
public class PagerService
{
- private static final Logger _logger = Logger.getInstance(PagerService.class);
+ private static final Logger LOGGER = Logger.getInstance(PagerService.class);
+
public static String DEFAULT_PAGE_PARAM_NAME = "netui_page";
public static String DEFAULT_PAGE_SIZE_PARAM_NAME = "netui_pagesize";
@@ -65,19 +66,19 @@
{
String[] params = _request.getParameterValues(DEFAULT_PAGE_PARAM_NAME);
- if(_logger.isDebugEnabled()) _logger.debug("found " + (params != null ? ""+params.length : "null") + " page parameters");
+ if(LOGGER.isDebugEnabled()) LOGGER.debug("found " + (params != null ? ""+params.length : "null") + " page parameters");
if(params != null)
{
String prefix = _namespace + DELIM;
- if(_logger.isDebugEnabled()) _logger.debug("search for prefix: " + prefix);
+ if(LOGGER.isDebugEnabled()) LOGGER.debug("search for prefix: " + prefix);
for(int i = 0; i < params.length; i++)
{
if(params[i].startsWith(prefix))
{
- if(_logger.isDebugEnabled()) _logger.debug("found current page query param: " + params[i]);
+ if(LOGGER.isDebugEnabled()) LOGGER.debug("found current page query param: " + params[i]);
String pageString = null;
try
@@ -88,8 +89,8 @@
}
catch(NumberFormatException nfe)
{
- if(_logger.isErrorEnabled())
- _logger.error("Invalid current page value \"" + pageString + "\". Cause: " + nfe, nfe);
+ if(LOGGER.isErrorEnabled())
+ LOGGER.error("Invalid current page value \"" + pageString + "\". Cause: " + nfe, nfe);
}
}
}
@@ -98,8 +99,8 @@
int page = _currentPage != null ? _currentPage.intValue() : DEFAULT_PAGE;
- if(_logger.isDebugEnabled())
- _logger.debug("current page: " + page);
+ if(LOGGER.isDebugEnabled())
+ LOGGER.debug("current page: " + page);
assert page >= 1;
@@ -127,8 +128,8 @@
}
catch(NumberFormatException nfe)
{
- if(_logger.isErrorEnabled())
- _logger.error("Invalid page size value \"" + pageSizeString + "\". Cause: " + nfe, nfe);
+ if(LOGGER.isErrorEnabled())
+ LOGGER.error("Invalid page size value \"" + pageSizeString + "\". Cause: " + nfe, nfe);
_pageSize = null;
}
@@ -139,8 +140,8 @@
int size = (_pageSize != null ? _pageSize.intValue() : DEFAULT_PAGE_SIZE);
- if(_logger.isDebugEnabled())
- _logger.debug("page size: " + size);
+ if(LOGGER.isDebugEnabled())
+ LOGGER.debug("page size: " + size);
assert size >= 1;
Copied: incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/services/sort/SortFactory.java (from r123589, incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/services/SortFactory.java)
Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/services/sort/SortFactory.java?view=diff&rev=123722&p1=incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/services/SortFactory.java&r1=123589&p2=incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/services/sort/SortFactory.java&r2=123722
==============================================================================
--- incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/services/SortFactory.java (original)
+++ incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/services/sort/SortFactory.java Thu Dec 30 07:00:34 2004
@@ -15,10 +15,10 @@
*
* $Header:$
*/
-package org.apache.beehive.netui.databinding.datagrid.services;
+package org.apache.beehive.netui.databinding.datagrid.services.sort;
-import org.apache.beehive.netui.databinding.datagrid.model.ISort;
-import org.apache.beehive.netui.databinding.datagrid.model.impl.DefaultSort;
+import org.apache.beehive.netui.databinding.datagrid.model.sort.ISort;
+import org.apache.beehive.netui.databinding.datagrid.model.sort.DefaultSort;
/**
*
Copied: incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/services/sort/SortService.java (from r123694, incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/services/SortService.java)
Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/services/sort/SortService.java?view=diff&rev=123722&p1=incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/services/SortService.java&r1=123694&p2=incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/services/sort/SortService.java&r2=123722
==============================================================================
--- incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/services/SortService.java (original)
+++ incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/services/sort/SortService.java Thu Dec 30 07:00:34 2004
@@ -15,21 +15,20 @@
*
* $Header:$
*/
-package org.apache.beehive.netui.databinding.datagrid.services;
+package org.apache.beehive.netui.databinding.datagrid.services.sort;
import java.util.ArrayList;
import java.util.List;
import javax.servlet.ServletRequest;
-import org.apache.beehive.netui.databinding.datagrid.model.ISort;
-import org.apache.beehive.netui.databinding.datagrid.model.impl.DefaultSort;
+import org.apache.beehive.netui.databinding.datagrid.model.sort.ISort;
+import org.apache.beehive.netui.databinding.datagrid.model.sort.DefaultSort;
import org.apache.beehive.netui.util.logging.Logger;
/**
*/
public class SortService
implements java.io.Serializable {
- private static final Logger LOGGER = Logger.getInstance(SortService.class);
private static final String SORT_DELIM = "~";
private static final String SORT_TERM_DELIM = ",";
Modified: 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/util/JspUtil.java?view=diff&rev=123722&p1=incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/util/JspUtil.java&r1=123721&p2=incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/util/JspUtil.java&r2=123722
==============================================================================
--- 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/util/JspUtil.java Thu Dec 30 07:00:34 2004
@@ -25,14 +25,11 @@
import javax.servlet.http.HttpServletRequest;
import org.apache.beehive.netui.core.urls.MutableURI;
-import org.apache.beehive.netui.util.logging.Logger;
import org.apache.beehive.netui.pageflow.scoping.ScopedServletUtils;
import org.apache.beehive.netui.tags.internal.PageFlowTagUtils;
public class JspUtil
{
- private static final Logger LOGGER = Logger.getInstance(JspUtil.class);
-
/* do not construct */
private JspUtil() {}
Modified: 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/util/PagedDataSet.java?view=diff&rev=123722&p1=incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/util/PagedDataSet.java&r1=123721&p2=incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/util/PagedDataSet.java&r2=123722
==============================================================================
--- 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/util/PagedDataSet.java Thu Dec 30 07:00:34 2004
@@ -29,7 +29,7 @@
public class PagedDataSet
implements Iterator
{
- private Logger _logger = Logger.getInstance(PagedDataSet.class);
+ private Logger LOGGER = Logger.getInstance(PagedDataSet.class);
private ArrayList _list = null;
private Iterator _dataSetIterator = null;
@@ -51,14 +51,14 @@
_dataSetIterator = Collections.EMPTY_LIST.iterator();
else _dataSetIterator = iterator;
- if(_logger.isDebugEnabled()) _logger.debug("iterator type: " + _dataSetIterator.getClass().getName());
+ if(LOGGER.isDebugEnabled()) LOGGER.debug("iterator type: " + _dataSetIterator.getClass().getName());
_list = new ArrayList();
while(_dataSetIterator.hasNext())
{
_list.add(_dataSetIterator.next());
_dataSetSize++;
- if(_logger.isDebugEnabled()) _logger.debug("dataSetSize: " + _dataSetSize);
+ if(LOGGER.isDebugEnabled()) LOGGER.debug("dataSetSize: " + _dataSetSize);
}
_dataSetIterator = _list.iterator();
}
@@ -85,7 +85,7 @@
}
else if(_endWindow > -1 && (_currentIndex >= _endWindow))
{
- if(_logger.isDebugEnabled()) _logger.debug("current index: " + _currentIndex + " _endRenderWindiw: " +
+ if(LOGGER.isDebugEnabled()) LOGGER.debug("current index: " + _currentIndex + " _endRenderWindiw: " +
_endWindow + " end data set: " + (_currentIndex >= _endWindow));
return false;
}
Modified: incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/AbstractColumn.java
Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/AbstractColumn.java?view=diff&rev=123722&p1=incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/AbstractColumn.java&r1=123721&p2=incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/AbstractColumn.java&r2=123722
==============================================================================
--- incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/AbstractColumn.java (original)
+++ incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/AbstractColumn.java Thu Dec 30 07:00:34 2004
@@ -18,12 +18,11 @@
package org.apache.beehive.netui.tags.databinding.datagrid;
import java.io.IOException;
-import java.util.ArrayList;
import javax.servlet.jsp.tagext.JspTag;
import javax.servlet.jsp.JspException;
import org.apache.beehive.netui.databinding.datagrid.model.DataGridModel;
-import org.apache.beehive.netui.databinding.datagrid.model.ColumnModel;
+import org.apache.beehive.netui.databinding.datagrid.model.CellModel;
import org.apache.beehive.netui.databinding.datagrid.model.ColumnsModel;
import org.apache.beehive.netui.tags.AbstractSimpleTag;
import org.apache.beehive.netui.tags.rendering.AbstractRenderAppender;
@@ -56,7 +55,7 @@
}
public void addFormatter(Formatter formatter) {
- internalGetColumnModel().addFormatter(formatter);
+ internalGetCellModel().addFormatter(formatter);
}
/**
@@ -100,7 +99,7 @@
assert renderState == ColumnsModel.DATA_RENDER_STATE ||
renderState == ColumnsModel.HEADER_RENDER_STATE;
- ColumnModel model = internalGetColumnModel();
+ CellModel model = internalGetCellModel();
model.setDataGridModel(dataGridModel);
model.setColumnsModel(columns);
@@ -131,7 +130,7 @@
return;
}
- protected abstract ColumnModel internalGetColumnModel();
+ protected abstract CellModel internalGetCellModel();
protected abstract void renderHeaderCell(AbstractRenderAppender appender) throws IOException, JspException;
Modified: incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/AbstractHtmlColumn.java
Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/AbstractHtmlColumn.java?view=diff&rev=123722&p1=incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/AbstractHtmlColumn.java&r1=123721&p2=incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/AbstractHtmlColumn.java&r2=123722
==============================================================================
--- incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/AbstractHtmlColumn.java (original)
+++ incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/AbstractHtmlColumn.java Thu Dec 30 07:00:34 2004
@@ -24,7 +24,7 @@
import org.apache.beehive.netui.databinding.datagrid.model.DataGridModel;
import org.apache.beehive.netui.databinding.datagrid.model.cell.HeaderCellModel;
-import org.apache.beehive.netui.databinding.datagrid.rendering.TableRenderer;
+import org.apache.beehive.netui.databinding.datagrid.rendering.table.TableRenderer;
import org.apache.beehive.netui.databinding.datagrid.rendering.cell.HeaderCellDecorator;
import org.apache.beehive.netui.databinding.datagrid.rendering.cell.CellDecorator;
import org.apache.beehive.netui.databinding.datagrid.rendering.cell.SortedCellDecorator;
Modified: incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/AnchorColumn.java
Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/AnchorColumn.java?view=diff&rev=123722&p1=incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/AnchorColumn.java&r1=123721&p2=incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/AnchorColumn.java&r2=123722
==============================================================================
--- incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/AnchorColumn.java (original)
+++ incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/AnchorColumn.java Thu Dec 30 07:00:34 2004
@@ -20,8 +20,7 @@
import javax.servlet.jsp.JspException;
import org.apache.beehive.netui.databinding.datagrid.model.cell.AnchorCellModel;
-import org.apache.beehive.netui.databinding.datagrid.model.ColumnModel;
-import org.apache.beehive.netui.databinding.datagrid.model.cell.AnchorCellModel;
+import org.apache.beehive.netui.databinding.datagrid.model.CellModel;
import org.apache.beehive.netui.databinding.datagrid.rendering.cell.AnchorCellDecorator;
import org.apache.beehive.netui.tags.html.URLParams;
import org.apache.beehive.netui.tags.rendering.AbstractHtmlState;
@@ -102,7 +101,7 @@
DECORATOR.decorate(getJspContext(), appender, _anchorCellModel);
}
- protected ColumnModel internalGetColumnModel() {
+ protected CellModel internalGetCellModel() {
return _anchorCellModel;
}
}
Modified: incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/Columns.java
Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/Columns.java?view=diff&rev=123722&p1=incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/Columns.java&r1=123721&p2=incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/Columns.java&r2=123722
==============================================================================
--- incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/Columns.java (original)
+++ incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/Columns.java Thu Dec 30 07:00:34 2004
@@ -25,8 +25,8 @@
import org.apache.beehive.netui.databinding.datagrid.model.ColumnsModel;
import org.apache.beehive.netui.databinding.datagrid.model.DataGridModel;
-import org.apache.beehive.netui.databinding.datagrid.model.StylePolicy;
-import org.apache.beehive.netui.databinding.datagrid.rendering.TableRenderer;
+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.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/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&rev=123722&p1=incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/ConfigurePager.java&r1=123721&p2=incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/ConfigurePager.java&r2=123722
==============================================================================
--- 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 Thu Dec 30 07:00:34 2004
@@ -17,16 +17,14 @@
*/
package org.apache.beehive.netui.tags.databinding.datagrid;
+import javax.servlet.jsp.JspException;
+
import org.apache.beehive.netui.databinding.datagrid.model.DataGridModel;
import org.apache.beehive.netui.databinding.datagrid.model.PagerModel;
-import org.apache.beehive.netui.databinding.datagrid.rendering.IPagerRenderer;
-import org.apache.beehive.netui.databinding.datagrid.rendering.impl.FirstPreviousNextLastPagerRenderer;
-import org.apache.beehive.netui.databinding.datagrid.rendering.impl.FirstPreviousNextLastPagerRenderer;
-import org.apache.beehive.netui.databinding.datagrid.rendering.impl.PreviousNextPagerRenderer;
+import org.apache.beehive.netui.databinding.datagrid.rendering.pager.IPagerRenderer;
+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.tags.AbstractSimpleTag;
-import org.apache.beehive.netui.util.logging.Logger;
-
-import javax.servlet.jsp.JspException;
/**
* @netui:tag name="configurePager" body-content="empty"
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&rev=123722&p1=incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/DataGrid.java&r1=123721&p2=incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/DataGrid.java&r2=123722
==============================================================================
--- 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 Thu Dec 30 07:00:34 2004
@@ -27,13 +27,13 @@
import javax.servlet.http.HttpServletRequest;
import org.apache.beehive.netui.databinding.datagrid.model.DataGridModel;
-import org.apache.beehive.netui.databinding.datagrid.model.StylePolicy;
import org.apache.beehive.netui.databinding.datagrid.model.PagerModel;
-import org.apache.beehive.netui.databinding.datagrid.model.impl.DefaultStylePolicy;
-import org.apache.beehive.netui.databinding.datagrid.model.impl.EmptyStylePolicy;
+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.TableRenderer;
-import org.apache.beehive.netui.databinding.datagrid.rendering.TableRenderer;
+import org.apache.beehive.netui.databinding.datagrid.rendering.table.TableRenderer;
+import org.apache.beehive.netui.databinding.datagrid.rendering.table.TableRenderer;
import org.apache.beehive.netui.databinding.datagrid.services.DataGridStateService;
import org.apache.beehive.netui.script.common.IDataAccessProvider;
import org.apache.beehive.netui.script.common.DataAccessProviderStack;
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&rev=123722&p1=incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/DataGridUtil.java&r1=123721&p2=incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/DataGridUtil.java&r2=123722
==============================================================================
--- 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 Thu Dec 30 07:00:34 2004
@@ -21,7 +21,7 @@
import org.apache.beehive.netui.databinding.datagrid.model.DataGridModel;
import org.apache.beehive.netui.databinding.datagrid.model.ColumnsModel;
-import org.apache.beehive.netui.databinding.datagrid.model.ColumnModel;
+import org.apache.beehive.netui.databinding.datagrid.model.CellModel;
/* todo: need to provide add / remove methods here so that the data model and JspContext interactions are captured in a single location */
@@ -65,8 +65,8 @@
jspContext.removeAttribute(COLUMNS_MODEL_KEY);
}
- public static final void putColumnModel(JspContext jspContext, ColumnModel columnModel) {
- jspContext.setAttribute(COLUMN_MODEL_KEY, columnModel);
+ public static final void putColumnModel(JspContext jspContext, CellModel cellModel) {
+ jspContext.setAttribute(COLUMN_MODEL_KEY, cellModel);
}
public static final void removeColumnModel(JspContext jspContext) {
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&rev=123722&p1=incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/Footer.java&r1=123721&p2=incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/Footer.java&r2=123722
==============================================================================
--- 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 Thu Dec 30 07:00:34 2004
@@ -19,7 +19,6 @@
import java.io.IOException;
import java.io.StringWriter;
-
import javax.servlet.jsp.tagext.JspFragment;
import javax.servlet.jsp.JspException;
Modified: incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/ImageColumn.java
Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/ImageColumn.java?view=diff&rev=123722&p1=incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/ImageColumn.java&r1=123721&p2=incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/ImageColumn.java&r2=123722
==============================================================================
--- incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/ImageColumn.java (original)
+++ incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/ImageColumn.java Thu Dec 30 07:00:34 2004
@@ -18,7 +18,7 @@
package org.apache.beehive.netui.tags.databinding.datagrid;
import org.apache.beehive.netui.databinding.datagrid.model.cell.ImageCellModel;
-import org.apache.beehive.netui.databinding.datagrid.model.ColumnModel;
+import org.apache.beehive.netui.databinding.datagrid.model.CellModel;
import org.apache.beehive.netui.databinding.datagrid.rendering.cell.ImageCellDecorator;
import org.apache.beehive.netui.tags.rendering.AbstractHtmlState;
import org.apache.beehive.netui.tags.rendering.AbstractRenderAppender;
@@ -35,7 +35,7 @@
{
private static final ImageCellDecorator DECORATOR = new ImageCellDecorator();
- private ImageCellModel _imageColumnModel = null;
+ private ImageCellModel _imageCellModel = null;
/**
* @jsptagref.attributedescription The source of the image to display.
@@ -45,21 +45,21 @@
* @netui.tldx:attribute propertyclass="workshop.jspdesigner.properties.URIPropertyClass" reftype="img-url"
*/
public void setSrc(String src) {
- _imageColumnModel.getImageState().src = src;
+ _imageCellModel.getImageState().src = src;
}
/**
* @netui:attribute required="false" rtexprvalue="true"
*/
public void setAlign(String align) {
- _imageColumnModel.getImageState().registerAttribute(AbstractHtmlState.ATTR_GENERAL, HtmlConstants.ALIGN, align);
+ _imageCellModel.getImageState().registerAttribute(AbstractHtmlState.ATTR_GENERAL, HtmlConstants.ALIGN, align);
}
/**
* @netui:attribute required="false" rtexprvalue="true"
*/
public void setHspace(String hspace) {
- _imageColumnModel.getImageState().registerAttribute(AbstractHtmlState.ATTR_GENERAL, HtmlConstants.HSPACE, hspace);
+ _imageCellModel.getImageState().registerAttribute(AbstractHtmlState.ATTR_GENERAL, HtmlConstants.HSPACE, hspace);
}
/**
@@ -69,14 +69,14 @@
* @netui:attribute required="false" rtexprvalue="true"
*/
public void setVspace(String vspace) {
- _imageColumnModel.getImageState().registerAttribute(AbstractHtmlState.ATTR_GENERAL, HtmlConstants.VSPACE, vspace);
+ _imageCellModel.getImageState().registerAttribute(AbstractHtmlState.ATTR_GENERAL, HtmlConstants.VSPACE, vspace);
}
/**
* @netui:attribute required="false" rtexprvalue="true"
*/
public void setBorder(String border) {
- _imageColumnModel.getImageState().registerAttribute(AbstractHtmlState.ATTR_GENERAL, HtmlConstants.BORDER, border);
+ _imageCellModel.getImageState().registerAttribute(AbstractHtmlState.ATTR_GENERAL, HtmlConstants.BORDER, border);
}
/**
@@ -86,7 +86,7 @@
* @netui:attribute required="false" rtexprvalue="true"
*/
public void setHeight(String height) {
- _imageColumnModel.getImageState().registerAttribute(AbstractHtmlState.ATTR_GENERAL, HtmlConstants.HEIGHT, height);
+ _imageCellModel.getImageState().registerAttribute(AbstractHtmlState.ATTR_GENERAL, HtmlConstants.HEIGHT, height);
}
/**
@@ -96,7 +96,7 @@
* @netui:attribute required="false" rtexprvalue="true"
*/
public void setWidth(String width) {
- _imageColumnModel.getImageState().registerAttribute(AbstractHtmlState.ATTR_GENERAL, HtmlConstants.WIDTH, width);
+ _imageCellModel.getImageState().registerAttribute(AbstractHtmlState.ATTR_GENERAL, HtmlConstants.WIDTH, width);
}
public String getTagName()
@@ -106,11 +106,11 @@
public void renderDataCellContents(AbstractRenderAppender appender)
{
- DECORATOR.decorate(getJspContext(), appender, _imageColumnModel);
+ DECORATOR.decorate(getJspContext(), appender, _imageCellModel);
}
private AbstractHtmlState internalGetImageState() {
- return _imageColumnModel.getImageState();
+ return _imageCellModel.getImageState();
}
protected AbstractHtmlState internalGetHtmlState()
@@ -118,8 +118,8 @@
return internalGetImageState();
}
- protected ColumnModel internalGetColumnModel() {
- return _imageColumnModel;
+ protected CellModel internalGetCellModel() {
+ return _imageCellModel;
}
}
Modified: incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/LiteralColumn.java
Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/LiteralColumn.java?view=diff&rev=123722&p1=incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/LiteralColumn.java&r1=123721&p2=incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/LiteralColumn.java&r2=123722
==============================================================================
--- incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/LiteralColumn.java (original)
+++ incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/LiteralColumn.java Thu Dec 30 07:00:34 2004
@@ -17,19 +17,12 @@
*/
package org.apache.beehive.netui.tags.databinding.datagrid;
-import org.apache.beehive.netui.tags.rendering.SpanTag;
import org.apache.beehive.netui.tags.rendering.AbstractHtmlState;
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.LiteralCellModel;
-import org.apache.beehive.netui.databinding.datagrid.model.ColumnModel;
import org.apache.beehive.netui.databinding.datagrid.model.cell.LiteralCellModel;
+import org.apache.beehive.netui.databinding.datagrid.model.CellModel;
import org.apache.beehive.netui.databinding.datagrid.rendering.cell.LiteralCellDecorator;
-import javax.servlet.jsp.JspException;
-import javax.servlet.jsp.PageContext;
-import javax.servlet.http.HttpServletRequest;
-
/**
*
* @netui:tag name="literalColumn"
@@ -43,7 +36,7 @@
{
private static final LiteralCellDecorator DECORATOR = new LiteralCellDecorator();
- private LiteralCellModel _literalColumnModel = new LiteralCellModel();
+ private LiteralCellModel _literalCellModel = new LiteralCellModel();
public String getTagName() {
return "LiteralCellModel";
@@ -53,19 +46,19 @@
* @netui:attribute required="true" rtexprvalue="true"
*/
public void setValue(String value) {
- _literalColumnModel.setValue(value);
+ _literalCellModel.setValue(value);
}
protected void renderDataCellContents(AbstractRenderAppender appender) {
- DECORATOR.decorate(getJspContext(), appender, _literalColumnModel);
+ DECORATOR.decorate(getJspContext(), appender, _literalCellModel);
}
protected AbstractHtmlState internalGetHtmlState()
{
- return _literalColumnModel.getSpanState();
+ return _literalCellModel.getSpanState();
}
- protected ColumnModel internalGetColumnModel() {
- return _literalColumnModel;
+ protected CellModel internalGetCellModel() {
+ return _literalCellModel;
}
}
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&rev=123722&p1=incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/RenderPager.java&r1=123721&p2=incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/RenderPager.java&r2=123722
==============================================================================
--- 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 Thu Dec 30 07:00:34 2004
@@ -22,7 +22,6 @@
import org.apache.beehive.netui.databinding.datagrid.model.DataGridModel;
import org.apache.beehive.netui.tags.AbstractSimpleTag;
-import org.apache.beehive.netui.util.logging.Logger;
/**
* @netui:tag name="renderPager" body-content="empty"
@@ -32,8 +31,6 @@
public class RenderPager
extends AbstractSimpleTag
{
- private static final Logger _logger = Logger.getInstance(RenderPager.class);
-
public String getTagName()
{
return "RenderPager";
Modified: incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/datagrid/DefaultSortTest.java
Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/datagrid/DefaultSortTest.java?view=diff&rev=123722&p1=incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/datagrid/DefaultSortTest.java&r1=123721&p2=incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/datagrid/DefaultSortTest.java&r2=123722
==============================================================================
--- incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/datagrid/DefaultSortTest.java (original)
+++ incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/datagrid/DefaultSortTest.java Thu Dec 30 07:00:34 2004
@@ -17,9 +17,9 @@
*/
package org.apache.beehive.netui.test.datagrid;
-import org.apache.beehive.netui.databinding.datagrid.model.ISort;
-import org.apache.beehive.netui.databinding.datagrid.model.impl.DefaultSort;
-import org.apache.beehive.netui.databinding.datagrid.services.SortFactory;
+import org.apache.beehive.netui.databinding.datagrid.model.sort.ISort;
+import org.apache.beehive.netui.databinding.datagrid.model.sort.DefaultSort;
+import org.apache.beehive.netui.databinding.datagrid.services.sort.SortFactory;
import junit.framework.Test;
import junit.framework.TestCase;
Modified: incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/datagrid/SortServiceTest.java
Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/datagrid/SortServiceTest.java?view=diff&rev=123722&p1=incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/datagrid/SortServiceTest.java&r1=123721&p2=incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/datagrid/SortServiceTest.java&r2=123722
==============================================================================
--- incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/datagrid/SortServiceTest.java (original)
+++ incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/datagrid/SortServiceTest.java Thu Dec 30 07:00:34 2004
@@ -21,8 +21,8 @@
import javax.servlet.ServletRequest;
import javax.servlet.http.HttpServletRequest;
-import org.apache.beehive.netui.databinding.datagrid.services.SortService;
-import org.apache.beehive.netui.databinding.datagrid.model.ISort;
+import org.apache.beehive.netui.databinding.datagrid.services.sort.SortService;
+import org.apache.beehive.netui.databinding.datagrid.model.sort.ISort;
import org.apache.beehive.netui.test.servlet.ServletFactory;
import org.apache.beehive.netui.test.servlet.HttpServletRequestHandler;