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 2005/02/14 23:34:46 UTC
svn commit: r153867 - in incubator/beehive/trunk/netui:
src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/api/filter/
src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/api/sort/
src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/exceptions/
src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/model/
src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/model/cell/
src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/rendering/cell/
src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/rendering/pager/
src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/
src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/codec/
src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/sql/
src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/util/
src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/
test/src/junitTests/org/apache/beehive/netui/test/datagrid/
test/webapps/drt/coreWeb/WEB-INF/src/databinding/datagrid/decorator/
Author: ekoneil
Date: Mon Feb 14 14:34:39 2005
New Revision: 153867
URL: http://svn.apache.org/viewcvs?view=rev&rev=153867
Log:
Data grid work.
- add a DataGridFactory which exposes methods for getting model and rendering objects
In the long run, this will provide a way for dataGrid authors to extend the objects used by the grid to render.
- move the CellModel into model/cell
- move the CellDecoratorException to exceptions/
BB: self
DRT: NetUI pass / datagrid pass
Added:
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/api/filter/FilterTypeHint.java (with props)
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/exceptions/CellDecoratorException.java
- copied, changed from r153818, incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/rendering/cell/CellDecoratorException.java
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/model/cell/CellModel.java
- copied, changed from r153818, incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/model/CellModel.java
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/AbstractDataGridFactory.java (with props)
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/DataGridFactory.java
- copied, changed from r153818, incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/DataGridStateFactory.java
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/DefaultDataGridFactory.java (with props)
Removed:
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/model/CellModel.java
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/rendering/cell/CellDecoratorException.java
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/DataGridStateFactory.java
Modified:
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/api/filter/Filter.java
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/api/sort/Sort.java
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/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/SpanCellModel.java
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/model/cell/TemplateCellModel.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/ImageAnchorCellDecorator.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/SortedCellDecorator.java
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/rendering/cell/SpanCellDecorator.java
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/rendering/pager/PagerRenderer.java
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/DataGridURLService.java
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/codec/FilterCodec.java
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/sql/SQLFilterService.java
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/util/DataGridResourceProvider.java
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/util/PagedDataSet.java
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/AbstractCell.java
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/AnchorCell.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/HeaderCell.java
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/ImageAnchorCell.java
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/ImageCell.java
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/SpanCell.java
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/TemplateCell.java
incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/datagrid/DataGridTestUtil.java
incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/datagrid/FilterModelTest.java
incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/datagrid/PagerModelTest.java
incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/datagrid/SortModelTest.java
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/WEB-INF/src/databinding/datagrid/decorator/FooDecorator.java
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/WEB-INF/src/databinding/datagrid/decorator/HelloWorldDecorator.java
Modified: incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/api/filter/Filter.java
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/api/filter/Filter.java?view=diff&r1=153866&r2=153867
==============================================================================
--- incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/api/filter/Filter.java (original)
+++ incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/api/filter/Filter.java Mon Feb 14 14:34:39 2005
@@ -26,15 +26,17 @@
private FilterOperation _filterOperation;
private Object _value;
+ private FilterTypeHint _typeHint = FilterTypeHint.getDefault();
+
public Filter() {
}
- public Filter(String filterExpression, FilterOperation filterOperation, Object value) {
- this();
+ public FilterTypeHint getTypeHint() {
+ return _typeHint;
+ }
- _filterExpression = filterExpression;
- _filterOperation = filterOperation;
- _value = value;
+ public void setTypeHint(FilterTypeHint typeHint) {
+ _typeHint = typeHint;
}
public void setFilterExpression(String filterExpression) {
Added: incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/api/filter/FilterTypeHint.java
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/api/filter/FilterTypeHint.java?view=auto&rev=153867
==============================================================================
--- incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/api/filter/FilterTypeHint.java (added)
+++ incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/api/filter/FilterTypeHint.java Mon Feb 14 14:34:39 2005
@@ -0,0 +1,48 @@
+/*
+ * Copyright 2004 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * $Header:$
+ */
+package org.apache.beehive.netui.databinding.datagrid.api.filter;
+
+/**
+ *
+ */
+public enum FilterTypeHint {
+
+ DATE("date"),
+ STRING("string"),
+ NUMERIC("numeric");
+
+ private String _hint = null;
+
+ FilterTypeHint(String hint) {
+ _hint = hint;
+ }
+
+ public String getHint() {
+ return _hint;
+ }
+
+ public static FilterTypeHint getDefault() {
+ return STRING;
+ }
+
+ public static FilterTypeHint getTypeHint(String hint) {
+ if(STRING.getHint().equals(hint))
+ return STRING;
+ else return NUMERIC;
+ }
+}
Propchange: incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/api/filter/FilterTypeHint.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/api/sort/Sort.java
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/api/sort/Sort.java?view=diff&r1=153866&r2=153867
==============================================================================
--- incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/api/sort/Sort.java (original)
+++ incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/api/sort/Sort.java Mon Feb 14 14:34:39 2005
@@ -56,16 +56,4 @@
public void changeSortDirection() {
_sortDirection = _sortDirection.flipDirection();
}
-
- public String toString() {
- StringBuilder buf = new StringBuilder(32);
- buf.append("\n");
- buf.append("expr: ");
- buf.append(_sortExpression);
- buf.append("\n");
- buf.append("dir: ");
- buf.append(_sortDirection);
- buf.append("\n");
- return buf.toString();
- }
}
Copied: incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/exceptions/CellDecoratorException.java (from r153818, incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/rendering/cell/CellDecoratorException.java)
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/exceptions/CellDecoratorException.java?view=diff&rev=153867&p1=incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/rendering/cell/CellDecoratorException.java&r1=153818&p2=incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/exceptions/CellDecoratorException.java&r2=153867
==============================================================================
--- incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/rendering/cell/CellDecoratorException.java (original)
+++ incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/exceptions/CellDecoratorException.java Mon Feb 14 14:34:39 2005
@@ -15,7 +15,7 @@
*
* $Header:$
*/
-package org.apache.beehive.netui.databinding.datagrid.rendering.cell;
+package org.apache.beehive.netui.databinding.datagrid.exceptions;
/**
*
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&r1=153866&r2=153867
==============================================================================
--- 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 Mon Feb 14 14:34:39 2005
@@ -26,9 +26,9 @@
import org.apache.beehive.netui.databinding.datagrid.api.sort.SortDirection;
import org.apache.beehive.netui.databinding.datagrid.rendering.table.TableRenderer;
import org.apache.beehive.netui.databinding.datagrid.rendering.pager.PagerRenderer;
-import org.apache.beehive.netui.databinding.datagrid.rendering.pager.PreviousNextPagerRenderer;
import org.apache.beehive.netui.databinding.datagrid.runtime.DataGridURLService;
import org.apache.beehive.netui.databinding.datagrid.runtime.DataGridState;
+import org.apache.beehive.netui.databinding.datagrid.runtime.DataGridFactory;
import org.apache.beehive.netui.databinding.datagrid.util.PagedDataSet;
import org.apache.beehive.netui.databinding.datagrid.util.IDataGridMessageKeys;
import org.apache.beehive.netui.databinding.datagrid.util.JspUtil;
@@ -61,24 +61,25 @@
private DataGridURLService _dgss = null;
private DataGridResourceProvider _resourceProvider = null;
private DataGridState _dataGridState = null;
+ private DataGridFactory _dataGridFactory;
private JspContext _jspContext = null;
private HttpServletRequest _request = null;
- public DataGridModel(JspContext jspContext, String name, PagedDataSet dataSet) {
+ public DataGridModel(JspContext jspContext, String name, PagedDataSet dataSet, DataGridFactory factory) {
super();
/* todo: refactor. this assembly could should be externalized */
_name = name;
_jspContext = jspContext;
_dataSet = dataSet;
+ _dataGridFactory = factory;
_dgss = DataGridURLService.getInstance(jspContext);
- _dataGridState = _dgss.getDataGridState(name);
+ _dataGridState = _dgss.getDataGridState(name, _dataGridFactory);
_dataGridState.getPagerModel().setDataSetSize(_dataSet.getSize());
-
+ _resourceProvider = factory.getResourceProvider();
+ _resourceProvider.setLocale(JspUtil.getLocale(jspContext));
_request = JspUtil.getRequest(_jspContext);
-
- _resourceProvider = DataGridResourceProvider.getInstance(jspContext);
}
public String getName() {
@@ -108,8 +109,7 @@
public PagerRenderer getPagerRenderer() {
if(_pagerRenderer == null) {
- /* todo: need a factory to do this wireup */
- _pagerRenderer = new PreviousNextPagerRenderer();
+ _pagerRenderer = _dataGridFactory.getDefaultPagerRenderer();
_pagerRenderer.setDataGridModel(this);
}
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&r1=153866&r2=153867
==============================================================================
--- 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 Mon Feb 14 14:34:39 2005
@@ -21,17 +21,12 @@
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.CellModel;
/**
*
*/
public class AnchorCellModel
extends CellModel {
-
- public AnchorCellModel() {
- super();
- }
private String _linkName = null;
private String _value = null;
Copied: incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/model/cell/CellModel.java (from r153818, incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/model/CellModel.java)
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/model/cell/CellModel.java?view=diff&rev=153867&p1=incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/model/CellModel.java&r1=153818&p2=incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/model/cell/CellModel.java&r2=153867
==============================================================================
--- incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/model/CellModel.java (original)
+++ incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/model/cell/CellModel.java Mon Feb 14 14:34:39 2005
@@ -15,13 +15,14 @@
*
* $Header:$
*/
-package org.apache.beehive.netui.databinding.datagrid.model;
+package org.apache.beehive.netui.databinding.datagrid.model.cell;
import java.util.ArrayList;
import javax.servlet.jsp.JspException;
import org.apache.beehive.netui.tags.html.FormatTag.Formatter;
import org.apache.beehive.netui.util.logging.Logger;
+import org.apache.beehive.netui.databinding.datagrid.model.DataGridModel;
/**
*/
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&r1=153866&r2=153867
==============================================================================
--- 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 Mon Feb 14 14:34:39 2005
@@ -17,8 +17,6 @@
*/
package org.apache.beehive.netui.databinding.datagrid.model.cell;
-import org.apache.beehive.netui.databinding.datagrid.model.CellModel;
-
/**
*
*/
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&r1=153866&r2=153867
==============================================================================
--- 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 Mon Feb 14 14:34:39 2005
@@ -19,7 +19,6 @@
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.CellModel;
/**
*
Modified: incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/model/cell/SpanCellModel.java
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/model/cell/SpanCellModel.java?view=diff&r1=153866&r2=153867
==============================================================================
--- incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/model/cell/SpanCellModel.java (original)
+++ incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/model/cell/SpanCellModel.java Mon Feb 14 14:34:39 2005
@@ -19,7 +19,6 @@
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.CellModel;
/**
*
Modified: incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/model/cell/TemplateCellModel.java
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/model/cell/TemplateCellModel.java?view=diff&r1=153866&r2=153867
==============================================================================
--- incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/model/cell/TemplateCellModel.java (original)
+++ incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/model/cell/TemplateCellModel.java Mon Feb 14 14:34:39 2005
@@ -17,8 +17,6 @@
*/
package org.apache.beehive.netui.databinding.datagrid.model.cell;
-import org.apache.beehive.netui.databinding.datagrid.model.CellModel;
-
/**
*
*/
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&r1=153866&r2=153867
==============================================================================
--- 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 Mon Feb 14 14:34:39 2005
@@ -21,11 +21,11 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.jsp.JspContext;
-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.model.cell.CellModel;
import org.apache.beehive.netui.databinding.datagrid.util.JspUtil;
+import org.apache.beehive.netui.databinding.datagrid.exceptions.CellDecoratorException;
import org.apache.beehive.netui.tags.rendering.AbstractRenderAppender;
import org.apache.beehive.netui.tags.rendering.SpanTag;
import org.apache.beehive.netui.tags.rendering.AnchorTag;
Modified: incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/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&r1=153866&r2=153867
==============================================================================
--- 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 Mon Feb 14 14:34:39 2005
@@ -20,7 +20,8 @@
import javax.servlet.jsp.JspContext;
import org.apache.beehive.netui.tags.rendering.AbstractRenderAppender;
-import org.apache.beehive.netui.databinding.datagrid.model.CellModel;
+import org.apache.beehive.netui.databinding.datagrid.model.cell.CellModel;
+import org.apache.beehive.netui.databinding.datagrid.exceptions.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&r1=153866&r2=153867
==============================================================================
--- 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 Mon Feb 14 14:34:39 2005
@@ -21,7 +21,8 @@
import org.apache.beehive.netui.tags.rendering.AbstractRenderAppender;
import org.apache.beehive.netui.databinding.datagrid.model.cell.HeaderCellModel;
-import org.apache.beehive.netui.databinding.datagrid.model.CellModel;
+import org.apache.beehive.netui.databinding.datagrid.model.cell.CellModel;
+import org.apache.beehive.netui.databinding.datagrid.exceptions.CellDecoratorException;
/**
*
Modified: incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/rendering/cell/ImageAnchorCellDecorator.java
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/rendering/cell/ImageAnchorCellDecorator.java?view=diff&r1=153866&r2=153867
==============================================================================
--- incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/rendering/cell/ImageAnchorCellDecorator.java (original)
+++ incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/rendering/cell/ImageAnchorCellDecorator.java Mon Feb 14 14:34:39 2005
@@ -26,10 +26,11 @@
import org.apache.beehive.netui.tags.rendering.ImageTag;
import org.apache.beehive.netui.tags.rendering.TagRenderingBase;
import org.apache.beehive.netui.tags.databinding.datagrid.DataGridUtil;
-import org.apache.beehive.netui.databinding.datagrid.model.CellModel;
+import org.apache.beehive.netui.databinding.datagrid.model.cell.CellModel;
import org.apache.beehive.netui.databinding.datagrid.model.DataGridModel;
import org.apache.beehive.netui.databinding.datagrid.model.cell.ImageAnchorCellModel;
import org.apache.beehive.netui.databinding.datagrid.util.JspUtil;
+import org.apache.beehive.netui.databinding.datagrid.exceptions.CellDecoratorException;
import org.apache.beehive.netui.util.logging.Logger;
/**
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&r1=153866&r2=153867
==============================================================================
--- 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 Mon Feb 14 14:34:39 2005
@@ -22,9 +22,10 @@
import org.apache.beehive.netui.tags.rendering.AbstractRenderAppender;
import org.apache.beehive.netui.tags.rendering.TagRenderingBase;
-import org.apache.beehive.netui.databinding.datagrid.model.CellModel;
+import org.apache.beehive.netui.databinding.datagrid.model.cell.CellModel;
import org.apache.beehive.netui.databinding.datagrid.model.cell.ImageCellModel;
import org.apache.beehive.netui.databinding.datagrid.util.JspUtil;
+import org.apache.beehive.netui.databinding.datagrid.exceptions.CellDecoratorException;
/**
*
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&r1=153866&r2=153867
==============================================================================
--- 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 Mon Feb 14 14:34:39 2005
@@ -29,12 +29,13 @@
import org.apache.beehive.netui.tags.rendering.ImageTag;
import org.apache.beehive.netui.tags.rendering.AbstractHtmlState;
import org.apache.beehive.netui.tags.html.HtmlConstants;
-import org.apache.beehive.netui.databinding.datagrid.model.CellModel;
+import org.apache.beehive.netui.databinding.datagrid.model.cell.CellModel;
import org.apache.beehive.netui.databinding.datagrid.model.cell.HeaderCellModel;
import org.apache.beehive.netui.databinding.datagrid.model.DataGridModel;
import org.apache.beehive.netui.databinding.datagrid.api.sort.SortModel;
import org.apache.beehive.netui.databinding.datagrid.api.sort.SortDirection;
import org.apache.beehive.netui.databinding.datagrid.util.JspUtil;
+import org.apache.beehive.netui.databinding.datagrid.exceptions.CellDecoratorException;
import org.apache.beehive.netui.util.logging.Logger;
/**
Modified: incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/rendering/cell/SpanCellDecorator.java
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/rendering/cell/SpanCellDecorator.java?view=diff&r1=153866&r2=153867
==============================================================================
--- incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/rendering/cell/SpanCellDecorator.java (original)
+++ incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/rendering/cell/SpanCellDecorator.java Mon Feb 14 14:34:39 2005
@@ -22,9 +22,10 @@
import org.apache.beehive.netui.tags.rendering.AbstractRenderAppender;
import org.apache.beehive.netui.tags.rendering.TagRenderingBase;
-import org.apache.beehive.netui.databinding.datagrid.model.CellModel;
+import org.apache.beehive.netui.databinding.datagrid.model.cell.CellModel;
import org.apache.beehive.netui.databinding.datagrid.model.cell.SpanCellModel;
import org.apache.beehive.netui.databinding.datagrid.util.JspUtil;
+import org.apache.beehive.netui.databinding.datagrid.exceptions.CellDecoratorException;
/**
*
Modified: incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/rendering/pager/PagerRenderer.java
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/rendering/pager/PagerRenderer.java?view=diff&r1=153866&r2=153867
==============================================================================
--- incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/rendering/pager/PagerRenderer.java (original)
+++ incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/rendering/pager/PagerRenderer.java Mon Feb 14 14:34:39 2005
@@ -25,7 +25,7 @@
import org.apache.beehive.netui.databinding.datagrid.model.DataGridModel;
import org.apache.beehive.netui.databinding.datagrid.util.JspUtil;
import org.apache.beehive.netui.databinding.datagrid.util.IDataGridMessageKeys;
-import org.apache.beehive.netui.databinding.datagrid.rendering.cell.CellDecoratorException;
+import org.apache.beehive.netui.databinding.datagrid.exceptions.CellDecoratorException;
import org.apache.beehive.netui.util.logging.Logger;
import org.apache.beehive.netui.tags.rendering.AnchorTag;
import org.apache.beehive.netui.tags.rendering.TagRenderingBase;
Added: incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/AbstractDataGridFactory.java
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/AbstractDataGridFactory.java?view=auto&rev=153867
==============================================================================
--- incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/AbstractDataGridFactory.java (added)
+++ incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/AbstractDataGridFactory.java Mon Feb 14 14:34:39 2005
@@ -0,0 +1,36 @@
+/*
+ * Copyright 2004 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * $Header:$
+ */
+package org.apache.beehive.netui.databinding.datagrid.runtime;
+
+/**
+ *
+ */
+public class AbstractDataGridFactory {
+
+ private AbstractDataGridFactory() {
+ }
+
+ public static final DataGridFactory getInstance() {
+ return new DefaultDataGridFactory();
+ }
+
+ /* todo: refactor. implement this so that grid builders can plug-in their own implementations */
+ public static final DataGridFactory getInstance(Class factoryClass) {
+ return null;
+ }
+}
Propchange: incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/AbstractDataGridFactory.java
------------------------------------------------------------------------------
svn:eol-style = native
Copied: incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/DataGridFactory.java (from r153818, incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/DataGridStateFactory.java)
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/DataGridFactory.java?view=diff&rev=153867&p1=incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/DataGridStateFactory.java&r1=153818&p2=incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/DataGridFactory.java&r2=153867
==============================================================================
--- incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/DataGridStateFactory.java (original)
+++ incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/DataGridFactory.java Mon Feb 14 14:34:39 2005
@@ -17,19 +17,35 @@
*/
package org.apache.beehive.netui.databinding.datagrid.runtime;
-import javax.servlet.ServletRequest;
+import java.util.List;
+
+import org.apache.beehive.netui.databinding.datagrid.api.sort.Sort;
+import org.apache.beehive.netui.databinding.datagrid.api.sort.SortModel;
+import org.apache.beehive.netui.databinding.datagrid.api.filter.Filter;
+import org.apache.beehive.netui.databinding.datagrid.api.filter.FilterModel;
+import org.apache.beehive.netui.databinding.datagrid.api.pager.PagerModel;
+import org.apache.beehive.netui.databinding.datagrid.runtime.url.DataGridURL;
+import org.apache.beehive.netui.databinding.datagrid.rendering.pager.PagerRenderer;
+import org.apache.beehive.netui.databinding.datagrid.util.DataGridResourceProvider;
/**
*
*/
-public class DataGridStateFactory {
+public abstract class DataGridFactory {
+
+ public abstract DataGridState createDataGridState();
+
+ public abstract Sort createSort();
+
+ public abstract SortModel createSortModel(List<Sort> sorts);
+
+ public abstract Filter createFilter();
+
+ public abstract FilterModel createFilterModel(List<Filter> filters);
+
+ public abstract PagerModel createPagerModel();
- private DataGridStateFactory() {
- }
+ public abstract PagerRenderer getDefaultPagerRenderer();
- public static Object instantiate(ServletRequest request, Class type) {
- if(type == DataGridState.class)
- return new DataGridState();
- else throw new IllegalArgumentException("Could not find a factory for type \"" + type + "\"");
- }
-}
+ public abstract DataGridResourceProvider getResourceProvider();
+}
\ No newline at end of file
Modified: incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/DataGridURLService.java
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/DataGridURLService.java?view=diff&r1=153866&r2=153867
==============================================================================
--- incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/DataGridURLService.java (original)
+++ incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/DataGridURLService.java Mon Feb 14 14:34:39 2005
@@ -109,16 +109,16 @@
_state = new HashMap<String, DataGridState>();
}
- public DataGridState getDataGridState(String name) {
+ public DataGridState getDataGridState(String name, DataGridFactory factory) {
if(name == null || name.equals(""))
throw new IllegalArgumentException("Unable to create data grid state for invalid name: " + name);
DataGridState dgs = _state.get(name);
if(dgs == null) {
- dgs = (DataGridState)DataGridStateFactory.instantiate(_request, DataGridState.class);
+ dgs = factory.createDataGridState();
dgs.setPagerModel(getPagerModel(name));
- dgs.setFilterModel(new FilterModel(getFilters(name)));
- dgs.setSortModel(new SortModel(getSorts(name)));
+ dgs.setFilterModel(factory.createFilterModel(getFilters(name)));
+ dgs.setSortModel(factory.createSortModel(getSorts(name)));
_state.put(name, dgs);
}
@@ -151,7 +151,7 @@
List<Sort> sorts = getSorts(namespace);
String sortParamValue = null;
- boolean isSorted = getDataGridState(namespace).getSortModel().isSorted(sortExpression);
+ boolean isSorted = _state.get(namespace).getSortModel().isSorted(sortExpression);
if(sorts != null) {
sortParamValue = _sortCodec.encode(namespace, sorts, sortExpression, sortDirection, isSorted);
} else if(sortDirection != SortDirection.NONE && !isSorted) {
@@ -178,22 +178,22 @@
}
public Map getQueryParamsForPreviousPage(String namespace) {
- PagerModel pagerModel = getDataGridState(namespace).getPagerModel();
+ PagerModel pagerModel = _state.get(namespace).getPagerModel();
return buildQueryParamMap_pager(namespace, pagerModel.getPreviousPage());
}
public Map getQueryParamsForNextPage(String namespace) {
- PagerModel pagerModel = getDataGridState(namespace).getPagerModel();
+ PagerModel pagerModel = _state.get(namespace).getPagerModel();
return buildQueryParamMap_pager(namespace, pagerModel.getNextPage());
}
public Map getQueryParamsForLastPage(String namespace) {
- PagerModel pagerModel = getDataGridState(namespace).getPagerModel();
+ PagerModel pagerModel = _state.get(namespace).getPagerModel();
return buildQueryParamMap_pager(namespace, pagerModel.getLastPage());
}
public String[] getPagerParamValues(String namespace) {
- PagerModel pagerModel = getDataGridState(namespace).getPagerModel();
+ PagerModel pagerModel = _state.get(namespace).getPagerModel();
String[] params = new String[pagerModel.getLastPage() + 1];
Added: incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/DefaultDataGridFactory.java
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/DefaultDataGridFactory.java?view=auto&rev=153867
==============================================================================
--- incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/DefaultDataGridFactory.java (added)
+++ incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/DefaultDataGridFactory.java Mon Feb 14 14:34:39 2005
@@ -0,0 +1,69 @@
+/*
+ * Copyright 2004 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * $Header:$
+ */
+package org.apache.beehive.netui.databinding.datagrid.runtime;
+
+import java.util.List;
+
+import org.apache.beehive.netui.databinding.datagrid.api.sort.Sort;
+import org.apache.beehive.netui.databinding.datagrid.api.sort.SortModel;
+import org.apache.beehive.netui.databinding.datagrid.api.filter.Filter;
+import org.apache.beehive.netui.databinding.datagrid.api.filter.FilterModel;
+import org.apache.beehive.netui.databinding.datagrid.api.pager.PagerModel;
+import org.apache.beehive.netui.databinding.datagrid.runtime.url.DataGridURL;
+import org.apache.beehive.netui.databinding.datagrid.rendering.pager.PagerRenderer;
+import org.apache.beehive.netui.databinding.datagrid.rendering.pager.PreviousNextPagerRenderer;
+import org.apache.beehive.netui.databinding.datagrid.util.DataGridResourceProvider;
+
+/**
+ *
+ */
+public class DefaultDataGridFactory
+ extends DataGridFactory {
+
+ public DataGridState createDataGridState() {
+ return new DataGridState();
+ }
+
+ public Sort createSort() {
+ return new Sort();
+ }
+
+ public Filter createFilter() {
+ return new Filter();
+ }
+
+ public SortModel createSortModel(List<Sort> sorts) {
+ return new SortModel(sorts);
+ }
+
+ public FilterModel createFilterModel(List<Filter> filters) {
+ return new FilterModel(filters);
+ }
+
+ public PagerModel createPagerModel() {
+ return new PagerModel();
+ }
+
+ public PagerRenderer getDefaultPagerRenderer() {
+ return new PreviousNextPagerRenderer();
+ }
+
+ public DataGridResourceProvider getResourceProvider() {
+ return new DataGridResourceProvider();
+ }
+}
Propchange: incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/DefaultDataGridFactory.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/codec/FilterCodec.java
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/codec/FilterCodec.java?view=diff&r1=153866&r2=153867
==============================================================================
--- incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/codec/FilterCodec.java (original)
+++ incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/codec/FilterCodec.java Mon Feb 14 14:34:39 2005
@@ -70,7 +70,12 @@
try {
/* todo: refactor. need to map String to FilterOperation */
FilterOperation fOp = SQLFilterService.mapStringToOperation(terms[1]);
- filter = new Filter(terms[0], fOp, terms[2]);
+
+ filter = new Filter();
+ filter.setFilterExpression(terms[0]);
+ filter.setOperation(fOp);
+ filter.setValue(terms[2]);
+
} catch(NumberFormatException nfe) {
if(LOGGER.isErrorEnabled())
LOGGER.error("An error occurred parsing a URL filter with syntax \"" + filter + "\".");
Modified: incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/sql/SQLFilterService.java
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/sql/SQLFilterService.java?view=diff&r1=153866&r2=153867
==============================================================================
--- incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/sql/SQLFilterService.java (original)
+++ incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/sql/SQLFilterService.java Mon Feb 14 14:34:39 2005
@@ -24,6 +24,7 @@
import org.apache.beehive.netui.databinding.datagrid.api.filter.FilterOperation;
import org.apache.beehive.netui.databinding.datagrid.api.filter.FilterOperationHint;
import org.apache.beehive.netui.databinding.datagrid.api.filter.Filter;
+import org.apache.beehive.netui.databinding.datagrid.api.filter.FilterTypeHint;
import org.apache.beehive.netui.databinding.datagrid.exceptions.IllegalFilterException;
/**
@@ -51,9 +52,6 @@
};
}
- private static final String TYPE_HINT_STRING = "string";
- private static final String TYPE_HINT_DATE = "date";
-
private static final FilterOperation STRING_FILTER_OPERATION = FILTER_OPERATIONS[9];
private static final FilterOperation OTHER_FILTER_OPERATION = FILTER_OPERATIONS[1];
@@ -77,11 +75,11 @@
ops.put(FILTER_OPERATIONS[5].getAbbreviation(), "Is Greater Than or Equal To");
ops.put(FILTER_OPERATIONS[6].getAbbreviation(), "Is Less Than or Equal To");
- if(!typeHint.equals(TYPE_HINT_DATE)) {
+ if(!(FilterTypeHint.DATE == FilterTypeHint.getTypeHint(typeHint))) {
ops.put(FILTER_OPERATIONS[7].getAbbreviation(), "Is One Of (eg: 1;2;3)");
}
- if(typeHint == null || typeHint.equals(TYPE_HINT_STRING)) {
+ if(typeHint == null || FilterTypeHint.STRING == FilterTypeHint.getTypeHint(typeHint)) {
ops.put(FILTER_OPERATIONS[8].getAbbreviation(), "Starts With");
ops.put(FILTER_OPERATIONS[9].getAbbreviation(), "Contains");
ops.put(FILTER_OPERATIONS[10].getAbbreviation(), "Is Empty");
@@ -99,7 +97,7 @@
*/
public static String lookupDefaultFilterOperation(String typeHint) {
FilterOperation fOp = OTHER_FILTER_OPERATION;
- if(typeHint == null || typeHint.equals(TYPE_HINT_STRING))
+ if(typeHint == null || FilterTypeHint.STRING == FilterTypeHint.getTypeHint(typeHint))
fOp = STRING_FILTER_OPERATION;
return fOp.getAbbreviation();
@@ -144,15 +142,17 @@
sb.append(filter.getFilterExpression());
FilterOperation op = filter.getOperation();
sb.append(" ");
-
- /* todo: need to map the ID to an operator in a filter-implementation specific way */
sb.append(mapIdToOperator(op));
sb.append(" ");
- /* todo: handling type hints and quoting */
- sb.append("\"");
- sb.append(filter.getValue());
- sb.append("\"");
+ if(filter.getTypeHint() == FilterTypeHint.STRING) {
+ sb.append("\"");
+ sb.append(filter.getValue());
+ sb.append("\"");
+ }
+ else {
+ sb.append(filter.getValue());
+ }
}
}
Modified: incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/util/DataGridResourceProvider.java
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/util/DataGridResourceProvider.java?view=diff&r1=153866&r2=153867
==============================================================================
--- incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/util/DataGridResourceProvider.java (original)
+++ incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/util/DataGridResourceProvider.java Mon Feb 14 14:34:39 2005
@@ -43,13 +43,7 @@
private HashMap _resourceBundleKeys = null;
private Locale _locale = null;
- public static final DataGridResourceProvider getInstance(JspContext jspContext) {
- DataGridResourceProvider rp = new DataGridResourceProvider();
- rp.setLocale(JspUtil.getLocale(jspContext));
- return rp;
- }
-
- private DataGridResourceProvider() {
+ public DataGridResourceProvider() {
}
public boolean isEnableChaining() {
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&r1=153866&r2=153867
==============================================================================
--- 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 Mon Feb 14 14:34:39 2005
@@ -29,7 +29,7 @@
public class PagedDataSet
implements Iterator {
- private Logger LOGGER = Logger.getInstance(PagedDataSet.class);
+ private static final Logger LOGGER = Logger.getInstance(PagedDataSet.class);
private boolean _advancedToPage = false;
Modified: incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/AbstractCell.java
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/AbstractCell.java?view=diff&r1=153866&r2=153867
==============================================================================
--- incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/AbstractCell.java (original)
+++ incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/AbstractCell.java Mon Feb 14 14:34:39 2005
@@ -21,7 +21,7 @@
import javax.servlet.jsp.JspException;
import org.apache.beehive.netui.databinding.datagrid.model.DataGridModel;
-import org.apache.beehive.netui.databinding.datagrid.model.CellModel;
+import org.apache.beehive.netui.databinding.datagrid.model.cell.CellModel;
import org.apache.beehive.netui.tags.AbstractSimpleTag;
import org.apache.beehive.netui.tags.rendering.AbstractRenderAppender;
import org.apache.beehive.netui.tags.rendering.StringBuilderRenderAppender;
Modified: incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/AnchorCell.java
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/AnchorCell.java?view=diff&r1=153866&r2=153867
==============================================================================
--- incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/AnchorCell.java (original)
+++ incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/AnchorCell.java Mon Feb 14 14:34:39 2005
@@ -20,7 +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.CellModel;
+import org.apache.beehive.netui.databinding.datagrid.model.cell.CellModel;
import org.apache.beehive.netui.databinding.datagrid.rendering.cell.AnchorCellDecorator;
import org.apache.beehive.netui.tags.html.IUrlParams;
import org.apache.beehive.netui.tags.html.HtmlConstants;
Modified: incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/DataGrid.java
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/DataGrid.java?view=diff&r1=153866&r2=153867
==============================================================================
--- 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 Mon Feb 14 14:34:39 2005
@@ -18,7 +18,6 @@
package org.apache.beehive.netui.tags.databinding.datagrid;
import java.util.Iterator;
-import java.util.HashMap;
import java.io.IOException;
import java.io.StringWriter;
import javax.servlet.jsp.JspException;
@@ -34,6 +33,8 @@
import org.apache.beehive.netui.databinding.datagrid.util.PagedDataSet;
import org.apache.beehive.netui.databinding.datagrid.rendering.table.TableRenderer;
import org.apache.beehive.netui.databinding.datagrid.api.pager.PagerModel;
+import org.apache.beehive.netui.databinding.datagrid.runtime.AbstractDataGridFactory;
+import org.apache.beehive.netui.databinding.datagrid.runtime.DataGridFactory;
import org.apache.beehive.netui.script.common.IDataAccessProvider;
import org.apache.beehive.netui.script.common.DataAccessProviderStack;
import org.apache.beehive.netui.tags.ExpressionHandling;
@@ -152,7 +153,9 @@
else if(_stylePolicyName != null && _stylePolicyName.equals(EMPTY_STYLE_POLICY_NAME))
stylePolicy = EMPTY_STYLE_POLICY;
- _gridModel = new DataGridModel(getJspContext(), _name, dataSet);
+ DataGridFactory dgf = AbstractDataGridFactory.getInstance();
+
+ _gridModel = new DataGridModel(getJspContext(), _name, dataSet, dgf);
_gridModel.setStylePolicy(stylePolicy);
_gridModel.setTableRenderer(tableRenderer);
_gridModel.setResourceBundlePath(_resourceBundlePath);
Modified: incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/DataGridUtil.java
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/DataGridUtil.java?view=diff&r1=153866&r2=153867
==============================================================================
--- 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 Mon Feb 14 14:34:39 2005
@@ -20,7 +20,7 @@
import javax.servlet.jsp.JspContext;
import org.apache.beehive.netui.databinding.datagrid.model.DataGridModel;
-import org.apache.beehive.netui.databinding.datagrid.model.CellModel;
+import org.apache.beehive.netui.databinding.datagrid.model.cell.CellModel;
import org.apache.beehive.netui.databinding.datagrid.exceptions.DataGridExtensionException;
import org.apache.beehive.netui.util.logging.Logger;
Modified: incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/HeaderCell.java
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/HeaderCell.java?view=diff&r1=153866&r2=153867
==============================================================================
--- incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/HeaderCell.java (original)
+++ incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/HeaderCell.java Mon Feb 14 14:34:39 2005
@@ -30,7 +30,7 @@
import org.apache.beehive.netui.tags.rendering.AbstractRenderAppender;
import org.apache.beehive.netui.databinding.datagrid.model.cell.HeaderCellModel;
import org.apache.beehive.netui.databinding.datagrid.model.DataGridModel;
-import org.apache.beehive.netui.databinding.datagrid.model.CellModel;
+import org.apache.beehive.netui.databinding.datagrid.model.cell.CellModel;
import org.apache.beehive.netui.databinding.datagrid.rendering.cell.CellDecorator;
import org.apache.beehive.netui.databinding.datagrid.rendering.cell.HeaderCellDecorator;
import org.apache.beehive.netui.databinding.datagrid.rendering.cell.SortedCellDecorator;
Modified: incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/ImageAnchorCell.java
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/ImageAnchorCell.java?view=diff&r1=153866&r2=153867
==============================================================================
--- incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/ImageAnchorCell.java (original)
+++ incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/ImageAnchorCell.java Mon Feb 14 14:34:39 2005
@@ -26,7 +26,7 @@
import org.apache.beehive.netui.tags.html.HtmlConstants;
import org.apache.beehive.netui.tags.html.IFormattable;
import org.apache.beehive.netui.tags.html.IUrlParams;
-import org.apache.beehive.netui.databinding.datagrid.model.CellModel;
+import org.apache.beehive.netui.databinding.datagrid.model.cell.CellModel;
import org.apache.beehive.netui.databinding.datagrid.model.cell.ImageAnchorCellModel;
import org.apache.beehive.netui.databinding.datagrid.rendering.cell.ImageAnchorCellDecorator;
import org.apache.beehive.netui.util.ParamHelper;
Modified: incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/ImageCell.java
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/ImageCell.java?view=diff&r1=153866&r2=153867
==============================================================================
--- incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/ImageCell.java (original)
+++ incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/ImageCell.java Mon Feb 14 14:34:39 2005
@@ -20,7 +20,7 @@
import javax.servlet.jsp.JspException;
import org.apache.beehive.netui.databinding.datagrid.model.cell.ImageCellModel;
-import org.apache.beehive.netui.databinding.datagrid.model.CellModel;
+import org.apache.beehive.netui.databinding.datagrid.model.cell.CellModel;
import org.apache.beehive.netui.databinding.datagrid.rendering.cell.ImageCellDecorator;
import org.apache.beehive.netui.tags.rendering.AbstractHtmlState;
import org.apache.beehive.netui.tags.rendering.AbstractRenderAppender;
Modified: incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/SpanCell.java
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/SpanCell.java?view=diff&r1=153866&r2=153867
==============================================================================
--- incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/SpanCell.java (original)
+++ incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/SpanCell.java Mon Feb 14 14:34:39 2005
@@ -24,7 +24,7 @@
import org.apache.beehive.netui.tags.rendering.SpanTag;
import org.apache.beehive.netui.tags.html.HtmlConstants;
import org.apache.beehive.netui.databinding.datagrid.model.cell.SpanCellModel;
-import org.apache.beehive.netui.databinding.datagrid.model.CellModel;
+import org.apache.beehive.netui.databinding.datagrid.model.cell.CellModel;
import org.apache.beehive.netui.databinding.datagrid.rendering.cell.SpanCellDecorator;
/**
Modified: incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/TemplateCell.java
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/TemplateCell.java?view=diff&r1=153866&r2=153867
==============================================================================
--- incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/TemplateCell.java (original)
+++ incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/TemplateCell.java Mon Feb 14 14:34:39 2005
@@ -21,7 +21,7 @@
import javax.servlet.jsp.JspException;
import org.apache.beehive.netui.tags.rendering.AbstractRenderAppender;
-import org.apache.beehive.netui.databinding.datagrid.model.CellModel;
+import org.apache.beehive.netui.databinding.datagrid.model.cell.CellModel;
import org.apache.beehive.netui.databinding.datagrid.model.cell.TemplateCellModel;
/**
Modified: incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/datagrid/DataGridTestUtil.java
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/datagrid/DataGridTestUtil.java?view=diff&r1=153866&r2=153867
==============================================================================
--- incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/datagrid/DataGridTestUtil.java (original)
+++ incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/datagrid/DataGridTestUtil.java Mon Feb 14 14:34:39 2005
@@ -28,6 +28,8 @@
import org.apache.beehive.netui.databinding.datagrid.util.PagedDataSet;
import org.apache.beehive.netui.databinding.datagrid.model.DataGridModel;
import org.apache.beehive.netui.databinding.datagrid.api.pager.PagerModel;
+import org.apache.beehive.netui.databinding.datagrid.runtime.AbstractDataGridFactory;
+import org.apache.beehive.netui.databinding.datagrid.runtime.DataGridFactory;
/**
*
@@ -85,7 +87,7 @@
}
private static final DataGridModel buildDataGridModel(JspContext jspContext, String name, PagedDataSet dataSet) {
- DataGridModel dgm = new DataGridModel(jspContext, name, dataSet);
+ DataGridModel dgm = new DataGridModel(jspContext, name, dataSet, getDataGridFactory());
dgm.getDataGridState().getPagerModel().setPageAction("fauxPageAction.do");
return dgm;
@@ -93,5 +95,9 @@
static final PagerModel getPagerModel(DataGridModel dgm) {
return dgm.getDataGridState().getPagerModel();
+ }
+
+ static final DataGridFactory getDataGridFactory() {
+ return AbstractDataGridFactory.getInstance();
}
}
Modified: incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/datagrid/FilterModelTest.java
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/datagrid/FilterModelTest.java?view=diff&r1=153866&r2=153867
==============================================================================
--- incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/datagrid/FilterModelTest.java (original)
+++ incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/datagrid/FilterModelTest.java Mon Feb 14 14:34:39 2005
@@ -44,14 +44,14 @@
public void testSortModelSimple() {
DataGridTestUtil.initQueryString(_request, "netui_filter=" + _namespace + ";CUSTOMERNAME~eq~homer&netui_filter=products;ID~ne~1234");
DataGridURLService dgss = DataGridURLService.getInstance(_request);
- FilterModel fm = dgss.getDataGridState(_namespace).getFilterModel();
+ FilterModel fm = dgss.getDataGridState(_namespace, DataGridTestUtil.getDataGridFactory()).getFilterModel();
assertNotNull(fm);
assertNotNull(fm.getFilters("CUSTOMERNAME"));
assertTrue(fm.isFiltered("CUSTOMERNAME"));
assertEquals(FilterOperationHint.EQUAL, fm.getFilters("CUSTOMERNAME").get(0).getOperation().getOperationHint());
- fm = dgss.getDataGridState("products").getFilterModel();
+ fm = dgss.getDataGridState("products", DataGridTestUtil.getDataGridFactory()).getFilterModel();
assertNotNull(fm);
assertNotNull(fm.getFilters("ID"));
assertTrue(fm.isFiltered("ID"));
Modified: incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/datagrid/PagerModelTest.java
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/datagrid/PagerModelTest.java?view=diff&r1=153866&r2=153867
==============================================================================
--- incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/datagrid/PagerModelTest.java (original)
+++ incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/datagrid/PagerModelTest.java Mon Feb 14 14:34:39 2005
@@ -131,7 +131,7 @@
String namespace = "bugs";
DataGridURLService dgss = DataGridURLService.getInstance(_jspContext);
- DataGridState dgs = dgss.getDataGridState(namespace);
+ DataGridState dgs = dgss.getDataGridState(namespace, DataGridTestUtil.getDataGridFactory());
PagerModel pm = dgs.getPagerModel();
assertNotNull("Expected non-null PagerModel", pm);
@@ -160,7 +160,7 @@
DataGridTestUtil.initQueryString(_jspContext, "netui_row=bugs~21");
DataGridURLService dgss = DataGridURLService.getInstance(_jspContext);
- DataGridState dgs = dgss.getDataGridState(namespace);
+ DataGridState dgs = dgss.getDataGridState(namespace, DataGridTestUtil.getDataGridFactory());
PagerModel pm = dgs.getPagerModel();
assertEquals("Invalid current row", 21, pm.getRow());
@@ -175,7 +175,7 @@
DataGridTestUtil.initQueryString(_jspContext, "netui_row=bugs~21&netui_pagesize=bugs~6");
DataGridURLService dgss = DataGridURLService.getInstance(_jspContext);
- PagerModel pm = dgss.getDataGridState(namespace).getPagerModel();
+ PagerModel pm = dgss.getDataGridState(namespace, DataGridTestUtil.getDataGridFactory()).getPagerModel();
assertEquals("Invalid current row", 21, pm.getRow());
assertEquals("Invalid current page", 3, pm.getPage());
@@ -186,12 +186,12 @@
DataGridTestUtil.initQueryString(_jspContext, "netui_row=bugs~21&netui_pagesize=bugs~6&netui_row=issues~39");
DataGridURLService dgss = DataGridURLService.getInstance(_jspContext);
- PagerModel pm = dgss.getDataGridState(namespace).getPagerModel();
+ PagerModel pm = dgss.getDataGridState(namespace, DataGridTestUtil.getDataGridFactory()).getPagerModel();
assertEquals("Invalid current row", 21, pm.getRow());
assertEquals("Invalid current page", 3, pm.getPage());
- pm = dgss.getDataGridState("issues").getPagerModel();
+ pm = dgss.getDataGridState("issues", DataGridTestUtil.getDataGridFactory()).getPagerModel();
assertEquals("Invalid current row", 39, pm.getRow());
assertEquals("Invalid current page size", 10, pm.getPageSize());
assertEquals("Invalid current page", 3, pm.getPage());
Modified: incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/datagrid/SortModelTest.java
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/datagrid/SortModelTest.java?view=diff&r1=153866&r2=153867
==============================================================================
--- incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/datagrid/SortModelTest.java (original)
+++ incubator/beehive/trunk/netui/test/src/junitTests/org/apache/beehive/netui/test/datagrid/SortModelTest.java Mon Feb 14 14:34:39 2005
@@ -43,7 +43,7 @@
public void testSortModelSimple() {
DataGridURLService dgss = DataGridURLService.getInstance(_servletRequest);
- SortModel sortModel = dgss.getDataGridState(GRID_NAME).getSortModel();
+ SortModel sortModel = dgss.getDataGridState(GRID_NAME, DataGridTestUtil.getDataGridFactory()).getSortModel();
List<Sort> sorts = sortModel.getSorts();
assert sorts == null;
@@ -52,7 +52,7 @@
public void testSortModelSimple2() {
DataGridTestUtil.initQueryString(_servletRequest, "foo=bar");
DataGridURLService dgss = DataGridURLService.getInstance(_servletRequest);
- SortModel sortModel = dgss.getDataGridState(GRID_NAME).getSortModel();
+ SortModel sortModel = dgss.getDataGridState(GRID_NAME, DataGridTestUtil.getDataGridFactory()).getSortModel();
List<Sort> sorts = sortModel.getSorts();
assert sorts == null;
@@ -67,7 +67,7 @@
public void testSortModelSimple3() {
DataGridTestUtil.initQueryString(_servletRequest, "foo=bar&netui_sort=bugs~id");
DataGridURLService dgss = DataGridURLService.getInstance(_servletRequest);
- SortModel sortModel = dgss.getDataGridState(GRID_NAME).getSortModel();
+ SortModel sortModel = dgss.getDataGridState(GRID_NAME, DataGridTestUtil.getDataGridFactory()).getSortModel();
List<Sort> sorts = sortModel.getSorts();
assert sorts != null;
@@ -89,7 +89,7 @@
public void testSortModelSimple4() {
DataGridTestUtil.initQueryString(_servletRequest, "foo=bar&netui_sort=bugs~id,-name");
DataGridURLService dgss = DataGridURLService.getInstance(_servletRequest);
- SortModel sortModel = dgss.getDataGridState(GRID_NAME).getSortModel();
+ SortModel sortModel = dgss.getDataGridState(GRID_NAME, DataGridTestUtil.getDataGridFactory()).getSortModel();
List<Sort> sorts = sortModel.getSorts();
assert sorts != null;
@@ -113,7 +113,7 @@
public void testSortModelSimple5() {
DataGridTestUtil.initQueryString(_servletRequest, "foo=bar&netui_sort=bugs~id,-name");
DataGridURLService dgss = DataGridURLService.getInstance(_servletRequest);
- SortModel sortModel = dgss.getDataGridState(GRID_NAME).getSortModel();
+ SortModel sortModel = dgss.getDataGridState(GRID_NAME, DataGridTestUtil.getDataGridFactory()).getSortModel();
List<Sort> sorts = sortModel.getSorts();
assert sorts != null;
@@ -192,7 +192,7 @@
public void testSortModelSimple6() {
DataGridTestUtil.initQueryString(_servletRequest, "foo=bar&netui_sort=bugs~-id,-name");
DataGridURLService dgss = DataGridURLService.getInstance(_servletRequest);
- SortModel sortModel = dgss.getDataGridState(GRID_NAME).getSortModel();
+ SortModel sortModel = dgss.getDataGridState(GRID_NAME, DataGridTestUtil.getDataGridFactory()).getSortModel();
/* now, add a new column "newcolumn" and explicitly set its direction */
Map queryParams = dgss.buildSortQueryParamsMap(GRID_NAME, "id", SortDirection.NONE);
@@ -209,7 +209,7 @@
public void testSortModelSimple7() {
DataGridTestUtil.initQueryString(_servletRequest, "foo=bar&netui_sort=bugs~-id");
DataGridURLService dgss = DataGridURLService.getInstance(_servletRequest);
- SortModel sortModel = dgss.getDataGridState(GRID_NAME).getSortModel();
+ SortModel sortModel = dgss.getDataGridState(GRID_NAME, DataGridTestUtil.getDataGridFactory()).getSortModel();
/* now, add a new column "newcolumn" and explicitly set its direction */
Map queryParams = dgss.buildSortQueryParamsMap(GRID_NAME, "id", SortDirection.NONE);
@@ -223,7 +223,7 @@
public void testSortModelSimple8() {
DataGridTestUtil.initQueryString(_servletRequest, "foo=bar&netui_sort=bugs~id,-name&netui_sort=developers~bugcount,-milestone");
DataGridURLService dgss = DataGridURLService.getInstance(_servletRequest);
- SortModel sortModel = dgss.getDataGridState(GRID_NAME).getSortModel();
+ SortModel sortModel = dgss.getDataGridState(GRID_NAME, DataGridTestUtil.getDataGridFactory()).getSortModel();
List<Sort> sorts = sortModel.getSorts();
assert sorts != null;
Modified: incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/WEB-INF/src/databinding/datagrid/decorator/FooDecorator.java
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/WEB-INF/src/databinding/datagrid/decorator/FooDecorator.java?view=diff&r1=153866&r2=153867
==============================================================================
--- incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/WEB-INF/src/databinding/datagrid/decorator/FooDecorator.java (original)
+++ incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/WEB-INF/src/databinding/datagrid/decorator/FooDecorator.java Mon Feb 14 14:34:39 2005
@@ -2,9 +2,9 @@
import javax.servlet.jsp.JspContext;
+import org.apache.beehive.netui.databinding.datagrid.exceptions.CellDecoratorException;
+import org.apache.beehive.netui.databinding.datagrid.model.cell.CellModel;
import org.apache.beehive.netui.databinding.datagrid.rendering.cell.CellDecorator;
-import org.apache.beehive.netui.databinding.datagrid.rendering.cell.CellDecoratorException;
-import org.apache.beehive.netui.databinding.datagrid.model.CellModel;
import org.apache.beehive.netui.tags.rendering.AbstractRenderAppender;
/**
Modified: incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/WEB-INF/src/databinding/datagrid/decorator/HelloWorldDecorator.java
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/WEB-INF/src/databinding/datagrid/decorator/HelloWorldDecorator.java?view=diff&r1=153866&r2=153867
==============================================================================
--- incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/WEB-INF/src/databinding/datagrid/decorator/HelloWorldDecorator.java (original)
+++ incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/WEB-INF/src/databinding/datagrid/decorator/HelloWorldDecorator.java Mon Feb 14 14:34:39 2005
@@ -2,9 +2,9 @@
import javax.servlet.jsp.JspContext;
+import org.apache.beehive.netui.databinding.datagrid.exceptions.CellDecoratorException;
+import org.apache.beehive.netui.databinding.datagrid.model.cell.CellModel;
import org.apache.beehive.netui.databinding.datagrid.rendering.cell.CellDecorator;
-import org.apache.beehive.netui.databinding.datagrid.rendering.cell.CellDecoratorException;
-import org.apache.beehive.netui.databinding.datagrid.model.CellModel;
import org.apache.beehive.netui.tags.rendering.AbstractRenderAppender;
/**