Author: ekoneil
Date: Thu Aug 12 16:14:16 2004
New Revision: 36305
Added:
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/util/JspUtil.java
(contents, props changed)
Modified:
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/DataGridModel.java
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/model/impl/AnchorColumnModel.java
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/impl/PreviousNextPagerRenderer.java
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/PagerService.java
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/services/SortService.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/AnchorColumn.java
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/Caption.java
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/DataGrid.java
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/Footer.java
Log:
Decouple the data grid from PageContext and move it onto JspContext. The
PageContext is stil used internally to do URL and action creation, but the APIs
just expose JspContext.
BB: self
DRT: NetUI pass
datagrid pass
Modified:
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/ColumnModel.java
(original)
+++
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/model/ColumnModel.java
Thu Aug 12 16:14:16 2004
@@ -23,10 +23,12 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.jsp.JspException;
import javax.servlet.jsp.PageContext;
+import javax.servlet.jsp.JspContext;
import org.apache.beehive.netui.tags.html.FormatTag;
import org.apache.beehive.netui.databinding.datagrid.util.AttributeHelper;
+import org.apache.beehive.netui.databinding.datagrid.util.JspUtil;
import org.apache.beehive.netui.databinding.datagrid.services.FilterService;
import org.apache.beehive.netui.databinding.datagrid.services.SortService;
import org.apache.beehive.netui.pageflow.scoping.ScopedRequest;
@@ -135,7 +137,7 @@
Object value = _headerText;
//SortService sortService = _dataGridModel.getSortService();
- PageContext pageContext = _dataGridModel.getPageContext();
+ JspContext jspContext = _dataGridModel.getJspContext();
buffer.append(value);
@@ -270,18 +272,19 @@
buffer.append(" ");
}
- // todo: this should be done with cell decorators
+ // todo: this needs to be abstracted into a utilty that takes a JspContext
and can create links
private static final void renderFilterLink(StringBuffer buffer,
DataGridModel dataGridModel,
String filterExpression, String
headerText,
String filterUri, Object value)
{
assert dataGridModel != null;
- assert dataGridModel.getPageContext() != null;
- assert dataGridModel.getPageContext().getRequest() instanceof
HttpServletRequest;
+ assert dataGridModel.getJspContext() != null;
+ assert dataGridModel.getJspContext() instanceof PageContext &&
+ ((PageContext)dataGridModel.getJspContext()).getRequest()
instanceof HttpServletRequest;
String gridName = dataGridModel.getName();
- PageContext pageContext = dataGridModel.getPageContext();
- HttpServletRequest request =
(HttpServletRequest)dataGridModel.getPageContext().getRequest();
+
+ HttpServletRequest request =
JspUtil.getRequest(dataGridModel.getJspContext());
String filterJsp = createResourceUri(dataGridModel, FILTER_JSP);
// split the destination URL into its URI and query parameters. These
are passed separately to the filter service.
@@ -291,7 +294,8 @@
// is accomplished using the ScopedRequest infrastructure in the JPF
framework. The prefix
// here is put in front of any filter that is added to the URL by the
filter window.
String prefix = "";
- ScopedRequest sr =
ScopedServletUtils.unwrapRequest(pageContext.getRequest());
+
+ ScopedRequest sr = ScopedServletUtils.unwrapRequest(request);
if(sr != null)
prefix = sr.getScopeKey().toString();
@@ -329,9 +333,9 @@
private static final String createResourceUri(DataGridModel dataGridModel,
String resourceName)
{
assert dataGridModel != null;
- assert dataGridModel.getPageContext() != null;
+ assert dataGridModel.getJspContext() != null;
- HttpServletRequest request =
(HttpServletRequest)dataGridModel.getPageContext().getRequest();
+ HttpServletRequest request =
JspUtil.getRequest(dataGridModel.getJspContext());
String uri = request.getContextPath() + resourceName;
return uri;
}
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/DataGridModel.java
(original)
+++
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/model/DataGridModel.java
Thu Aug 12 16:14:16 2004
@@ -20,6 +20,7 @@
import java.util.*;
import javax.servlet.jsp.PageContext;
+import javax.servlet.jsp.JspContext;
import org.apache.beehive.netui.databinding.datagrid.rendering.TableRenderer;
import org.apache.beehive.netui.databinding.datagrid.services.FilterService;
@@ -51,18 +52,18 @@
private PagerModel _pagerModel = null;
- private PageContext _pageContext;
+ private JspContext _jspContext;
private PagedDataSet _dataSet = null;
private TableRenderer _tableRenderer = null;
// todo: would be great to not have a PageContext dependency here. This
should just be a smart JavaBean.
- public DataGridModel(PageContext pageContext, String name)
+ public DataGridModel(JspContext jspContext, String name)
{
super();
_name = name;
- _pageContext = pageContext;
+ _jspContext = jspContext;
_pagerModel = new PagerModel(this);
}
@@ -205,7 +206,7 @@
public PagerService getPagerService()
{
if(_pagerService == null)
- _pagerService =
PagerService.getInstance(_pageContext.getRequest(), _name);
+ _pagerService = PagerService.getInstance(_jspContext, _name);
return _pagerService;
}
@@ -222,7 +223,7 @@
public String getName() {return _name;}
- public PageContext getPageContext() {return _pageContext;}
+ public JspContext getJspContext() {return _jspContext;}
public List getColumns()
{
Modified:
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/model/impl/AnchorColumnModel.java
==============================================================================
---
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/model/impl/AnchorColumnModel.java
(original)
+++
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/model/impl/AnchorColumnModel.java
Thu Aug 12 16:14:16 2004
@@ -21,9 +21,11 @@
import java.net.MalformedURLException;
import java.util.HashMap;
import javax.servlet.jsp.PageContext;
+import javax.servlet.jsp.JspContext;
import org.apache.beehive.netui.databinding.datagrid.model.ColumnModel;
import org.apache.beehive.netui.databinding.datagrid.model.DataGridModel;
+import org.apache.beehive.netui.databinding.datagrid.util.JspUtil;
import org.apache.beehive.netui.pageflow.scoping.ScopedServletUtils;
import org.apache.beehive.netui.pageflow.util.URLRewriter;
@@ -74,13 +76,13 @@
public void renderDataCell(StringBuffer buffer)
{
- DataGridModel tm = getDataGridModel();
- assert tm != null;
+ DataGridModel dgm = getDataGridModel();
+ assert dgm != null;
- PageContext pc = tm.getPageContext();
+ PageContext pc = JspUtil.getPageContext(dgm.getJspContext());
assert pc != null;
- if(_scopeId != null)
+ if(_scopeId != null)
addParameter(ScopedServletUtils.SCOPE_ID_PARAM, _scopeId);
String sHref = null;
Modified:
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/impl/FirstPreviousNextLastPagerRenderer.java
(original)
+++
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/rendering/impl/FirstPreviousNextLastPagerRenderer.java
Thu Aug 12 16:14:16 2004
@@ -23,6 +23,9 @@
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.util.JspUtil;
+
+import javax.servlet.jsp.PageContext;
public class FirstPreviousNextLastPagerRenderer
extends AbstractPagerRenderer
@@ -51,7 +54,10 @@
String pageUri = pagerModel.getPageUri();
if(pageUri != null)
- pageUri =
PageflowTagUtils.createActionURL(gridModel.getPageContext(), pageUri);
+ {
+ PageContext pageContext =
JspUtil.getPageContext(gridModel.getJspContext());
+ pageUri = PageflowTagUtils.createActionURL(pageContext, pageUri);
+ }
if(currentPage > PagerModel.FIRST_PAGE)
buildLiveFirstLink(buf, pagerService, pageUri);
Modified:
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/impl/PreviousNextPagerRenderer.java
(original)
+++
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/rendering/impl/PreviousNextPagerRenderer.java
Thu Aug 12 16:14:16 2004
@@ -21,9 +21,12 @@
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.util.JspUtil;
import org.apache.beehive.netui.pageflow.util.PageflowTagUtils;
import org.apache.beehive.netui.util.logging.Logger;
+import javax.servlet.jsp.PageContext;
+
public class PreviousNextPagerRenderer
extends AbstractPagerRenderer
{
@@ -51,7 +54,10 @@
String pageUri = pagerModel.getPageUri();
if(pageUri != null)
- pageUri =
PageflowTagUtils.createActionURL(gridModel.getPageContext(), pageUri);
+ {
+ PageContext pageContext =
JspUtil.getPageContext(gridModel.getJspContext());
+ pageUri = PageflowTagUtils.createActionURL(pageContext, pageUri);
+ }
if(pagerModel.getPreviousPage() > 0)
buildLivePreviousLink(buf, pagerService, pageUri);
Modified:
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/FilterService.java
(original)
+++
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/services/FilterService.java
Thu Aug 12 16:14:16 2004
@@ -24,6 +24,8 @@
import java.util.List;
import java.util.Map;
import javax.servlet.ServletRequest;
+import javax.servlet.jsp.PageContext;
+import javax.servlet.jsp.JspContext;
import org.apache.beehive.netui.databinding.datagrid.model.IFilter;
import org.apache.beehive.netui.util.logging.Logger;
@@ -36,14 +38,21 @@
{
private static final Logger _logger =
Logger.getInstance(FilterService.class);
- public static FilterService getInstance(ServletRequest request, String
namespace)
+ public static FilterService getInstance(JspContext jspContext, String
namespace)
{
- return new FilterService(request, namespace);
+ return FilterService.getInstance(jspContext, namespace, null);
}
- public static FilterService getInstance(ServletRequest request, String
namespace, String queryString)
+ public static FilterService getInstance(JspContext jspContext, String
namespace, String queryString)
{
- return new FilterService(request, namespace, queryString);
+ if(jspContext instanceof PageContext)
+ {
+ ServletRequest request = ((PageContext)jspContext).getRequest();
+ FilterService svc = new FilterService(request, namespace);
+ return svc;
+ }
+ else throw new IllegalArgumentException("Can not create a
FilterService from a JspContext of type " +
+ (jspContext != null ?
jspContext.getClass().getName() : "null"));
}
private ServletRequest _request = null;
Modified:
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/PagerService.java
(original)
+++
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/services/PagerService.java
Thu Aug 12 16:14:16 2004
@@ -19,6 +19,8 @@
package org.apache.beehive.netui.databinding.datagrid.services;
import javax.servlet.ServletRequest;
+import javax.servlet.jsp.JspContext;
+import javax.servlet.jsp.PageContext;
import org.apache.beehive.netui.util.logging.Logger;
@@ -31,10 +33,16 @@
public static String DEFAULT_PAGE_PARAM_NAME = "netui_page";
public static String DEFAULT_PAGE_SIZE_PARAM_NAME = "netui_pagesize";
- public static final PagerService getInstance(ServletRequest request,
String namespace)
+ public static final PagerService getInstance(JspContext jspContext, String
namespace)
{
- PagerService svc = new PagerService(request, namespace);
- return svc;
+ if(jspContext instanceof PageContext)
+ {
+ ServletRequest request = ((PageContext)jspContext).getRequest();
+ PagerService svc = new PagerService(request, namespace);
+ return svc;
+ }
+ else throw new IllegalArgumentException("Can not create a PagerService
from a JspContext of type " +
+ (jspContext != null ?
jspContext.getClass().getName() : "null"));
}
private static final int DEFAULT_PAGE = 1;
Modified:
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/services/SortService.java
==============================================================================
---
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/SortService.java
Thu Aug 12 16:14:16 2004
@@ -25,6 +25,8 @@
import java.util.LinkedHashMap;
import java.util.Map;
import javax.servlet.ServletRequest;
+import javax.servlet.jsp.PageContext;
+import javax.servlet.jsp.JspContext;
import org.apache.beehive.netui.databinding.datagrid.model.ISort;
import org.apache.beehive.netui.databinding.datagrid.model.impl.DefaultSort;
@@ -46,10 +48,16 @@
private static final String SORT_TERM_DELIM = ",";
private static final int DEFAULT_SORT_DIRECTION = ISort.ASCENDING;
- public static final SortService getInstance(ServletRequest request, String
namespace)
+ public static final SortService getInstance(JspContext jspContext, String
namespace)
{
- SortService svc = new SortService(request, namespace);
- return svc;
+ if(jspContext instanceof PageContext)
+ {
+ ServletRequest request = ((PageContext)jspContext).getRequest();
+ SortService svc = new SortService(request, namespace);
+ return svc;
+ }
+ else throw new IllegalArgumentException("Can not create a SortService
from a JspContext of type " +
+ (jspContext != null ?
jspContext.getClass().getName() : "null"));
}
private ServletRequest _request = null;
Added:
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/util/JspUtil.java
==============================================================================
--- (empty file)
+++
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/util/JspUtil.java
Thu Aug 12 16:14:16 2004
@@ -0,0 +1,46 @@
+/*
+ * B E A S Y S T E M S
+ * Copyright 2002-2004 BEA Systems, Inc.
+ *
+ * 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.util;
+
+import org.apache.beehive.netui.util.logging.Logger;
+
+import javax.servlet.jsp.JspContext;
+import javax.servlet.jsp.PageContext;
+import javax.servlet.http.HttpServletRequest;
+
+public class JspUtil
+{
+ private static final Logger _logger = Logger.getInstance(JspUtil.class);
+
+ private JspUtil() {}
+
+ public static final HttpServletRequest getRequest(JspContext jspContext)
+ {
+ PageContext pageContext = getPageContext(jspContext);
+ return (HttpServletRequest)pageContext.getRequest();
+ }
+
+ public static final PageContext getPageContext(JspContext jspContext)
+ {
+ if(!(jspContext instanceof PageContext))
+ throw new IllegalStateException("Can not create a PageContext from
a JspContext of type: " +
+ (jspContext != null ?
jspContext.getClass().getName() : "null"));
+ else return (PageContext)jspContext;
+ }
+}
\ No newline at end of file
Modified:
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/AbstractColumn.java
(original)
+++
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/AbstractColumn.java
Thu Aug 12 16:14:16 2004
@@ -18,10 +18,10 @@
*/
package org.apache.beehive.netui.tags.databinding.datagrid;
-import javax.servlet.jsp.tagext.Tag;
+import javax.servlet.jsp.tagext.SimpleTagSupport;
+import javax.servlet.jsp.tagext.JspTag;
import org.apache.beehive.netui.databinding.datagrid.model.ColumnModel;
-import org.apache.beehive.netui.databinding.datagrid.model.DataGridModel;
import org.apache.beehive.netui.tags.AbstractClassicTag;
import org.apache.beehive.netui.tags.html.Formattable;
@@ -262,7 +262,7 @@
if(_dataGrid != null)
return _dataGrid;
- Tag dataGrid = findAncestorWithClass(this, DataGrid.class);
+ JspTag dataGrid = SimpleTagSupport.findAncestorWithClass(this,
DataGrid.class);
assert dataGrid != null;
_dataGrid = (DataGrid)dataGrid;
Modified:
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/AnchorColumn.java
(original)
+++
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/AnchorColumn.java
Thu Aug 12 16:14:16 2004
@@ -25,7 +25,6 @@
import org.apache.beehive.netui.databinding.datagrid.model.ColumnModel;
import
org.apache.beehive.netui.databinding.datagrid.model.impl.AnchorColumnModel;
-import org.apache.beehive.netui.tags.AbstractClassicTag;
import org.apache.beehive.netui.tags.html.URLParams;
import org.apache.beehive.netui.util.logging.Logger;
Modified:
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/Caption.java
==============================================================================
---
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/Caption.java
(original)
+++
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/Caption.java
Thu Aug 12 16:14:16 2004
@@ -21,7 +21,8 @@
import org.apache.beehive.netui.tags.AbstractClassicTag;
import org.apache.beehive.netui.util.logging.Logger;
-import javax.servlet.jsp.tagext.Tag;
+import javax.servlet.jsp.tagext.JspTag;
+import javax.servlet.jsp.tagext.SimpleTagSupport;
/**
*
@@ -76,7 +77,7 @@
if(_dataGrid != null)
return _dataGrid;
- Tag dataGrid = findAncestorWithClass(this, DataGrid.class);
+ JspTag dataGrid = SimpleTagSupport.findAncestorWithClass(this,
DataGrid.class);
assert dataGrid != null;
_dataGrid = (DataGrid)dataGrid;
Modified:
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/DataGrid.java
(original)
+++
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/DataGrid.java
Thu Aug 12 16:14:16 2004
@@ -22,6 +22,7 @@
import java.util.Iterator;
import javax.servlet.jsp.JspException;
+import javax.servlet.jsp.tagext.SimpleTagSupport;
import org.apache.beehive.netui.databinding.datagrid.model.DataGridModel;
import org.apache.beehive.netui.databinding.datagrid.model.StylePolicy;
@@ -276,7 +277,7 @@
public IDataAccessProvider getProviderParent()
{
- IDataAccessProvider dap =
(IDataAccessProvider)findAncestorWithClass(this, IDataAccessProvider.class);
+ IDataAccessProvider dap =
(IDataAccessProvider)SimpleTagSupport.findAncestorWithClass(this,
IDataAccessProvider.class);
return dap;
}
}
Modified:
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/Footer.java
(original)
+++
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/Footer.java
Thu Aug 12 16:14:16 2004
@@ -18,7 +18,8 @@
*/
package org.apache.beehive.netui.tags.databinding.datagrid;
-import javax.servlet.jsp.tagext.Tag;
+import javax.servlet.jsp.tagext.JspTag;
+import javax.servlet.jsp.tagext.SimpleTagSupport;
import org.apache.beehive.netui.tags.AbstractClassicTag;
@@ -71,7 +72,7 @@
if(_dataGrid != null)
return _dataGrid;
- Tag dataGrid = findAncestorWithClass(this, DataGrid.class);
+ JspTag dataGrid = SimpleTagSupport.findAncestorWithClass(this,
DataGrid.class);
assert dataGrid != null;
_dataGrid = (DataGrid)dataGrid;
