Author: ekoneil
Date: Tue Apr 12 17:09:46 2005
New Revision: 161137
URL: http://svn.apache.org/viewcvs?view=rev&rev=161137
Log:
Databinding tag code cleanup.
These are fixes after the port to JDK 1.4 checked in recently. Includes
changes that switch from Iterators in for(...) loops to using indexed
references and code reformatting.
BB: self
DRT: NetUI pass
Modified:
incubator/beehive/trunk/netui/src/tags-databinding/build.xml
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/api/DataGridState.java
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/api/DataGridURLBuilder.java
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/api/exceptions/CellDecoratorException.java
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/api/exceptions/DataGridExtensionException.java
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/api/exceptions/IllegalFilterException.java
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/api/filter/FilterModel.java
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/api/filter/FilterOperation.java
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/api/filter/FilterOperationHint.java
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/api/filter/FilterTypeHint.java
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/api/pager/PagerModel.java
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/api/rendering/CellDecorator.java
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/api/rendering/CellModel.java
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/api/rendering/DataGridTagModel.java
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/api/rendering/PagerRenderer.java
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/api/rendering/StyleModel.java
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/api/sort/SortDirection.java
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/api/sort/SortModel.java
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/api/sort/SortStrategy.java
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/config/DefaultDataGridConfig.java
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/config/DefaultDataGridResourceProvider.java
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/config/DefaultDataGridStateCodec.java
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/config/DefaultDataGridURLBuilder.java
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/config/DefaultSortStrategy.java
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/model/cell/AnchorCellModel.java
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/model/cell/HeaderCellModel.java
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/model/cell/ImageAnchorCellModel.java
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/model/cell/ImageCellModel.java
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/model/cell/SpanCellModel.java
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/model/cell/TemplateCellModel.java
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/model/style/DefaultStyleModel.java
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/model/style/EmptyStyleModel.java
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/rendering/cell/AnchorCellDecorator.java
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/rendering/cell/HeaderCellDecorator.java
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/rendering/cell/ImageAnchorCellDecorator.java
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/rendering/cell/ImageCellDecorator.java
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/rendering/cell/SortedCellDecorator.java
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/rendering/cell/SpanCellDecorator.java
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/rendering/pager/FirstPreviousNextLastPagerRenderer.java
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/rendering/pager/PreviousNextPagerRenderer.java
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/sql/DatabaseMetaDataSQLSupportConfig.java
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/sql/DefaultSQLSupportConfig.java
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/sql/SQLSupport.java
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/sql/SQLSupportConfigFactory.java
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/util/ExtensionUtil.java
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/util/JspFunctions.java
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/util/JspUtil.java
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/util/PagedDataSet.java
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/bundle/DeclareBundle.java
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/cellrepeater/CellRepeater.java
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/cellrepeater/style/CellRepeaterStyleBean.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/AbstractHtmlTableCell.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/Caption.java
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/ConfigurePager.java
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/DataGrid.java
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/Footer.java
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/GetDataGridState.java
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/Header.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/RenderPager.java
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/datagrid/Rows.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/src/tags-databinding/org/apache/beehive/netui/tags/databinding/invoke/AbstractCallMethod.java
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/invoke/CallMethod.java
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/invoke/CallPageFlow.java
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/invoke/MethodParameter.java
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/invoke/ObjectNotFoundException.java
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/message/Message.java
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/message/MessageArg.java
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/pageinput/DeclarePageInput.java
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/repeater/Repeater.java
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/repeater/RepeaterComponent.java
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/repeater/RepeaterFooter.java
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/repeater/RepeaterHeader.java
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/repeater/RepeaterItem.java
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/repeater/pad/Pad.java
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/script/GetData.java
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/tags/databinding/xml/SerializeXML.java
incubator/beehive/trunk/netui/src/util/org/apache/beehive/netui/util/netui.properties
Modified: incubator/beehive/trunk/netui/src/tags-databinding/build.xml
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-databinding/build.xml?view=diff&r1=161136&r2=161137
==============================================================================
--- incubator/beehive/trunk/netui/src/tags-databinding/build.xml (original)
+++ incubator/beehive/trunk/netui/src/tags-databinding/build.xml Tue Apr 12
17:09:46 2005
@@ -27,13 +27,13 @@
<mkdir dir="${module.classes.dir}"/>
<javac srcdir="${module.dir}"
- destdir="${module.classes.dir}"
- classpathref="module.classpath"
- debug="${compile.debug}"
- deprecation="${compile.deprecation}"
- optimize="${compile.optimize}"
- source="${compile.source}"
- target="${compile.target}">
+ destdir="${module.classes.dir}"
+ classpathref="module.classpath"
+ debug="${compile.debug}"
+ deprecation="${compile.deprecation}"
+ optimize="${compile.optimize}"
+ source="${compile.source}"
+ target="${compile.target}">
<include name="**/*.java"/>
</javac>
@@ -44,39 +44,39 @@
<echo>Generate TLD and TLDx</echo>
<taskdef name="webdoclet"
classname="xdoclet.modules.web.WebDocletTask"
classpathref="webdoclet.dependency.path"/>
<webdoclet
- destdir="${build.lib.dir}"
- excludedtags="@version,@author,@todo"
- force="true"
- verbose="true">
+ destdir="${build.lib.dir}"
+ excludedtags="@version,@author,@todo"
+ force="true"
+ verbose="true">
<fileset dir="${src.dir}/tags-databinding">
- <include name="**/*.java"/>
+ <include name="**/*.java"/>
</fileset>
<fileset dir="${src.dir}/tags-html">
<include name="**/*.java"/>
</fileset>
- <netuitldgen
- xmlencoding="UTF-8"
- taglibversion="1.0"
- jspversion="1.2"
- shortname="netui-data"
- uri="http://beehive.apache.org/netui/tags-databinding-1.0";
- description="NetUI Databinding Tag Library."
- filename="${netui-tags-databinding.tld.name}"
- destdir="${build.lib.dir}"
- validateXml="true"
- packageName="org.apache.beehive.netui.tags.databinding"
- functionPackage="org.apache.beehive.netui.databinding"
- />
+ <netuitldgen
+ xmlencoding="UTF-8"
+ taglibversion="1.0"
+ jspversion="1.2"
+ shortname="netui-data"
+ uri="http://beehive.apache.org/netui/tags-databinding-1.0";
+ description="NetUI Databinding Tag Library."
+ filename="${netui-tags-databinding.tld.name}"
+ destdir="${build.lib.dir}"
+ validateXml="true"
+ packageName="org.apache.beehive.netui.tags.databinding"
+ functionPackage="org.apache.beehive.netui.databinding"
+ />
<netuitldxgen
- xmlencoding="UTF-8"
-
paletteGenerator="workshop.netui.jspdesigner.generators.NetuiDatabindingPaletteGenerator"
- uri="http://beehive.apache.org/netui/tags-databinding-1.0";
- tldxVersion="1.0"
- filename="${netui-tags-databinding.tldx.name}"
- packageName="org.apache.beehive.netui.tags.databinding"
- />
+ xmlencoding="UTF-8"
+
paletteGenerator="workshop.netui.jspdesigner.generators.NetuiDatabindingPaletteGenerator"
+ uri="http://beehive.apache.org/netui/tags-databinding-1.0";
+ tldxVersion="1.0"
+ filename="${netui-tags-databinding.tldx.name}"
+ packageName="org.apache.beehive.netui.tags.databinding"
+ />
</webdoclet>
<jar jarfile="${build.lib.dir}/${tags-databinding.jar.name}">
Modified:
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/api/DataGridState.java
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/api/DataGridState.java?view=diff&r1=161136&r2=161137
==============================================================================
---
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/api/DataGridState.java
(original)
+++
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/api/DataGridState.java
Tue Apr 12 17:09:46 2005
@@ -24,7 +24,7 @@
/**
*
*/
-public class DataGridState {
+public class DataGridState {
private FilterModel _filterModel;
private SortModel _sortModel;
Modified:
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/api/DataGridURLBuilder.java
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/api/DataGridURLBuilder.java?view=diff&r1=161136&r2=161137
==============================================================================
---
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/api/DataGridURLBuilder.java
(original)
+++
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/api/DataGridURLBuilder.java
Tue Apr 12 17:09:46 2005
@@ -22,7 +22,7 @@
import org.apache.beehive.netui.databinding.datagrid.api.sort.SortDirection;
public abstract class DataGridURLBuilder {
-
+
public abstract Map getQueryParams();
public abstract Map getQueryParamsForFirstPage();
Modified:
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/api/exceptions/CellDecoratorException.java
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/api/exceptions/CellDecoratorException.java?view=diff&r1=161136&r2=161137
==============================================================================
---
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/api/exceptions/CellDecoratorException.java
(original)
+++
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/api/exceptions/CellDecoratorException.java
Tue Apr 12 17:09:46 2005
@@ -21,7 +21,7 @@
*
*/
public class CellDecoratorException
- extends RuntimeException {
+ extends RuntimeException {
public CellDecoratorException() {
super();
Modified:
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/api/exceptions/DataGridExtensionException.java
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/api/exceptions/DataGridExtensionException.java?view=diff&r1=161136&r2=161137
==============================================================================
---
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/api/exceptions/DataGridExtensionException.java
(original)
+++
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/api/exceptions/DataGridExtensionException.java
Tue Apr 12 17:09:46 2005
@@ -21,7 +21,7 @@
* Exception thrown when an error occurs while extending the data grid.
*/
public class DataGridExtensionException
- extends RuntimeException {
+ extends RuntimeException {
public DataGridExtensionException() {
super();
Modified:
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/api/exceptions/IllegalFilterException.java
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/api/exceptions/IllegalFilterException.java?view=diff&r1=161136&r2=161137
==============================================================================
---
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/api/exceptions/IllegalFilterException.java
(original)
+++
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/api/exceptions/IllegalFilterException.java
Tue Apr 12 17:09:46 2005
@@ -21,7 +21,7 @@
*
*/
public class IllegalFilterException
- extends RuntimeException {
+ extends RuntimeException {
public IllegalFilterException() {
super();
Modified:
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/api/filter/FilterModel.java
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/api/filter/FilterModel.java?view=diff&r1=161136&r2=161137
==============================================================================
---
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/api/filter/FilterModel.java
(original)
+++
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/api/filter/FilterModel.java
Tue Apr 12 17:09:46 2005
@@ -35,13 +35,15 @@
public List/*<Filter>*/ getFilters() {
if(_filters == null)
return null;
- else return _filters;
+ else
+ return _filters;
}
public List/*<Filter>*/ getFilters(String filterExpression) {
if(_filters == null || filterExpression == null)
return null;
- else return lookupFilters(filterExpression);
+ else
+ return lookupFilters(filterExpression);
}
public boolean isFiltered(String filterExpression) {
@@ -50,7 +52,8 @@
if(lookupFilters(filterExpression).size() > 0)
return true;
- else return false;
+ else
+ return false;
}
private List/*<Filter>*/ lookupFilters(String filterExpression) {
@@ -59,9 +62,9 @@
/* todo: perf. caching or abstraction to make this faster */
ArrayList/*<Filter>*/ filters = new ArrayList/*<Filter>*/();
- for (Iterator i = _filters.iterator(); i.hasNext();)
- {
- Filter filter = (Filter) i.next();
+ for(int i = 0; i < _filters.size(); i++) {
+ assert _filters.get(i) instanceof Filter;
+ Filter filter = (Filter)_filters.get(i);
if(filter.getFilterExpression().equals(filterExpression))
filters.add(filter);
}
Modified:
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/api/filter/FilterOperation.java
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/api/filter/FilterOperation.java?view=diff&r1=161136&r2=161137
==============================================================================
---
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/api/filter/FilterOperation.java
(original)
+++
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/api/filter/FilterOperation.java
Tue Apr 12 17:09:46 2005
@@ -25,7 +25,6 @@
private int _id;
private String _abbreviation;
private String _resourceKey;
-
private FilterOperationHint _operationHint;
public FilterOperation(int id, String abbreviation, String resourceKey,
FilterOperationHint operationHint) {
Modified:
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/api/filter/FilterOperationHint.java
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/api/filter/FilterOperationHint.java?view=diff&r1=161136&r2=161137
==============================================================================
---
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/api/filter/FilterOperationHint.java
(original)
+++
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/api/filter/FilterOperationHint.java
Tue Apr 12 17:09:46 2005
@@ -55,7 +55,7 @@
}
public final String toString() {
- switch (_val) {
+ switch(_val) {
case INT_NONE:
return "NONE";
case INT_EQUAL:
@@ -82,18 +82,20 @@
return "IS_NOT_EMPTY";
}
- assert false : _val;
- return "<unknown FilterOperationHint>";
+ String message = "Encountered an unknown filter operation with value
\"" + _val + "\"";
+ assert false : message;
+
+ throw new IllegalStateException(message);
}
- public boolean equals(Object o) {
- if(o == this)
+ public boolean equals(Object value) {
+ if(value == this)
return true;
- if(o == null || !(o instanceof FilterOperationHint))
+ if(value == null || !(value instanceof FilterOperationHint))
return false;
- return ((FilterOperationHint)o)._val == _val;
+ return ((FilterOperationHint)value)._val == _val;
}
public int hashCode() {
Modified:
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=diff&r1=161136&r2=161137
==============================================================================
---
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/api/filter/FilterTypeHint.java
(original)
+++
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/api/filter/FilterTypeHint.java
Tue Apr 12 17:09:46 2005
@@ -17,15 +17,17 @@
*/
package org.apache.beehive.netui.databinding.datagrid.api.filter;
+import org.apache.beehive.netui.util.Bundle;
+
/**
*
*/
public class FilterTypeHint {
- private static final String STR_DATE = "date";
- private static final String STR_STRING = "string";
- private static final String STR_NUMERIC = "numeric";
-
+ private static final String STR_DATE = "DATE";
+ private static final String STR_STRING = "STRING";
+ private static final String STR_NUMERIC = "NUMERIC";
+
public static final FilterTypeHint DATE = new FilterTypeHint(STR_DATE);
public static final FilterTypeHint STRING = new FilterTypeHint(STR_STRING);
public static final FilterTypeHint NUMERIC = new
FilterTypeHint(STR_NUMERIC);
@@ -44,9 +46,15 @@
return STRING;
}
+ /* todo: this is static; consider providing on a concrete / overridable
object */
public static FilterTypeHint getTypeHint(String hint) {
if(STRING.getHint().equals(hint))
return STRING;
- else return NUMERIC;
+ else if(NUMERIC.getHint().equals(hint))
+ return NUMERIC;
+ else if(DATE.getHint().equals(hint))
+ return DATE;
+ else throw new
IllegalArgumentException(Bundle.getErrorString("FilterTypeHint_UnknownHintString",
+ new
Object[] {hint}));
}
}
Modified:
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/api/pager/PagerModel.java
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/api/pager/PagerModel.java?view=diff&r1=161136&r2=161137
==============================================================================
---
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/api/pager/PagerModel.java
(original)
+++
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/api/pager/PagerModel.java
Tue Apr 12 17:09:46 2005
@@ -71,7 +71,8 @@
public int getDataSetSize() {
if(_dataSetSize == null)
return 0;
- else return _dataSetSize.intValue();
+ else
+ return _dataSetSize.intValue();
}
public String getPageAction() {
@@ -124,10 +125,10 @@
}
public int getLastRowForPage() {
- if(_dataSetSize != null) {
+ if(_dataSetSize != null) {
if(_dataSetSize.intValue() - _currentRow.intValue() <
getPageSize())
return _currentRow.intValue() + (_dataSetSize.intValue() -
_currentRow.intValue()) - 1;
- else return _currentRow.intValue() + getPageSize() -1;
+ else return _currentRow.intValue() + getPageSize() - 1;
}
else return _currentRow.intValue() + getPageSize() - 1;
}
@@ -153,8 +154,7 @@
private void updatePagerState() {
if(getRow() == 0)
_currentPage = new Integer(DEFAULT_PAGE);
- else
- _currentPage = new Integer((int)Math.floor((double)getRow() /
(double)getPageSize()));
+ else _currentPage = new Integer((int)Math.floor((double)getRow() /
(double)getPageSize()));
_prevPage = _currentPage.intValue() - 1;
_nextPage = _currentPage.intValue() + 1;
Modified:
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/api/rendering/CellDecorator.java
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/api/rendering/CellDecorator.java?view=diff&r1=161136&r2=161137
==============================================================================
---
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/api/rendering/CellDecorator.java
(original)
+++
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/api/rendering/CellDecorator.java
Tue Apr 12 17:09:46 2005
@@ -45,8 +45,6 @@
_cellDecorator = cellDecorator;
}
- public abstract void decorate(JspContext jspContext,
- AbstractRenderAppender appender,
- CellModel cellModel)
- throws CellDecoratorException;
+ public abstract void decorate(JspContext jspContext,
AbstractRenderAppender appender, CellModel cellModel)
+ throws CellDecoratorException;
}
Modified:
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/api/rendering/CellModel.java
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/api/rendering/CellModel.java?view=diff&r1=161136&r2=161137
==============================================================================
---
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/api/rendering/CellModel.java
(original)
+++
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/api/rendering/CellModel.java
Tue Apr 12 17:09:46 2005
@@ -22,7 +22,6 @@
import javax.servlet.jsp.JspException;
import org.apache.beehive.netui.tags.html.FormatTag.Formatter;
-import org.apache.beehive.netui.tags.html.FormatTag;
import org.apache.beehive.netui.util.logging.Logger;
import org.apache.beehive.netui.util.Bundle;
@@ -66,15 +65,19 @@
return value.toString();
Object formatted = value;
- for (Iterator i = _formatters.iterator(); i.hasNext();)
- {
- Formatter formatter = (Formatter) i.next();
+ for(int i = 0; i < _formatters.size(); i++) {
+ assert _formatters.get(i) instanceof Formatter :
+ "Found invalid formatter type \"" +
+ (_formatters.get(i) != null ?
_formatters.get(i).getClass().getName() : "null") + "\"";
+
+ Formatter formatter = (Formatter)_formatters.get(i);
assert formatter != null;
try {
formatted = formatter.format(formatted);
- } catch(JspException e) {
+ }
+ catch(JspException e) {
/* todo: error reporting */
-
LOGGER.error(Bundle.getErrorString("CellModel_FormatterThrewException", new
Object[] {formatter.getClass().getName(), e}), e);
+
LOGGER.error(Bundle.getErrorString("CellModel_FormatterThrewException", new
Object[]{formatter.getClass().getName(), e}), e);
}
}
Modified:
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/api/rendering/DataGridTagModel.java
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/api/rendering/DataGridTagModel.java?view=diff&r1=161136&r2=161137
==============================================================================
---
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/api/rendering/DataGridTagModel.java
(original)
+++
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/api/rendering/DataGridTagModel.java
Tue Apr 12 17:09:46 2005
@@ -264,7 +264,7 @@
------------------------------------------------------------- */
private final class OverridableDataGridResourceProvider
- extends DataGridResourceProvider {
+ extends DataGridResourceProvider {
private DataGridResourceProvider _delegate = null;
private HashMap/*<String, String>*/ _resourceOverrides = null;
@@ -285,20 +285,23 @@
String msg = internalGetMessage(key);
if(msg != null)
return msg;
- else return _delegate.getMessage(key);
+ else
+ return _delegate.getMessage(key);
}
public String formatMessage(String key, Object[] args) {
String pattern = internalGetMessage(key);
if(pattern != null)
return internalFormatMessage(pattern, args);
- else return _delegate.formatMessage(key, args);
+ else
+ return _delegate.formatMessage(key, args);
}
private final String internalGetMessage(String key) {
if(_resourceOverrides != null &&
_resourceOverrides.containsKey(key))
return (String)_resourceOverrides.get(key);
- else return null;
+ else
+ return null;
}
}
}
Modified:
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/api/rendering/PagerRenderer.java
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/api/rendering/PagerRenderer.java?view=diff&r1=161136&r2=161137
==============================================================================
---
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/api/rendering/PagerRenderer.java
(original)
+++
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/api/rendering/PagerRenderer.java
Tue Apr 12 17:09:46 2005
@@ -70,7 +70,7 @@
protected DataGridTagModel getDataGridTagModel() {
return _gridModel;
}
-
+
protected String internalRender() {
return EMPTY_STRING;
}
@@ -151,17 +151,16 @@
String href = _pagerModel.getPageHref() != null ?
_pagerModel.getPageHref() : _request.getRequestURI();
try {
- uri = JspUtil.createURL(
- href,
- _pagerModel.getPageAction(),
- null,
- null,
- queryParams,
- _gridModel.getJspContext());
- } catch(URISyntaxException mue) {
- String message = Bundle.getErrorString("Rendering_URLException",
new Object[] {_pagerModel.getPageHref(), _pagerModel.getPageAction()});
- if(LOGGER.isErrorEnabled())
- LOGGER.error(message, mue);
+ uri = JspUtil.createURL(href,
+ _pagerModel.getPageAction(),
+ null,
+ null,
+ queryParams,
+ _gridModel.getJspContext());
+ }
+ catch(URISyntaxException mue) {
+ String message = Bundle.getErrorString("Rendering_URLException",
new Object[]{_pagerModel.getPageHref(), _pagerModel.getPageAction()});
+ LOGGER.error(message, mue);
throw new CellDecoratorException(message, mue);
}
Modified:
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/api/rendering/StyleModel.java
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/api/rendering/StyleModel.java?view=diff&r1=161136&r2=161137
==============================================================================
---
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/api/rendering/StyleModel.java
(original)
+++
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/api/rendering/StyleModel.java
Tue Apr 12 17:09:46 2005
@@ -101,7 +101,8 @@
protected String buildStyleClass(String baseStyle) {
if(_stylePrefix != null)
return prefix(baseStyle);
- else return baseStyle;
+ else
+ return baseStyle;
}
/* @todo: perf - could cache the style names once they've been produced */
Modified:
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/api/sort/SortDirection.java
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/api/sort/SortDirection.java?view=diff&r1=161136&r2=161137
==============================================================================
---
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/api/sort/SortDirection.java
(original)
+++
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/api/sort/SortDirection.java
Tue Apr 12 17:09:46 2005
@@ -19,8 +19,8 @@
/**
*/
-public class SortDirection
-{
+public class SortDirection {
+
public static final int INT_ASCENDING = 0;
public static final int INT_DESCENDING = 1;
public static final int INT_NONE = 2;
@@ -31,39 +31,39 @@
private int _val;
- private SortDirection( int val )
- {
+ private SortDirection(int val) {
_val = val;
}
- public String toString()
- {
- switch ( _val )
- {
- case INT_ASCENDING: return "ASCENDING";
- case INT_DESCENDING: return "DESCENDING";
- case INT_NONE: return "NONE";
+ public String toString() {
+ switch(_val) {
+ case INT_ASCENDING:
+ return "ASCENDING";
+ case INT_DESCENDING:
+ return "DESCENDING";
+ case INT_NONE:
+ return "NONE";
}
- assert false : _val;
- return "<unknown SortDirection>";
+ String message = "Encountered an unknown sort direction with value \""
+ _val + "\"";
+ assert false : message;
+ throw new IllegalStateException(message);
}
- public boolean equals( Object o )
- {
- if ( o == null ) return false;
- if ( o == this ) return true;
- if ( ! ( o instanceof SortDirection ) ) return false;
- return ( ( SortDirection ) o )._val == _val;
+ public boolean equals(Object value) {
+ if(value == this)
+ return true;
+ if(value == null || !(value instanceof SortDirection))
+ return false;
+
+ return ((SortDirection)value)._val == _val;
}
- public int hashCode()
- {
+ public int hashCode() {
return _val;
}
- public int getValue()
- {
+ public int getValue() {
return _val;
}
}
Modified:
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/api/sort/SortModel.java
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/api/sort/SortModel.java?view=diff&r1=161136&r2=161137
==============================================================================
---
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/api/sort/SortModel.java
(original)
+++
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/api/sort/SortModel.java
Tue Apr 12 17:09:46 2005
@@ -45,7 +45,8 @@
public List/*<Sort>*/ getSorts() {
if(_sorts == null)
return null;
- else return _sorts;
+ else
+ return _sorts;
}
public boolean isPrimarySort(String sortExpression) {
@@ -54,10 +55,11 @@
/* optimizing for the case where the sortExpression *is* the primary
sort */
if(_sorts != null &&
- _sorts.size() > 0 &&
- ((Sort)_sorts.get(0)).getSortExpression().equals(sortExpression)) {
+ _sorts.size() > 0 &&
+ ((Sort)_sorts.get(0)).getSortExpression().equals(sortExpression)) {
return true;
- } else
+ }
+ else
return false;
}
@@ -68,8 +70,7 @@
Sort term = findSort(sortExpression);
if(term == null || term.getDirection() == SortDirection.NONE)
return false;
- else
- return true;
+ else return true;
}
public SortDirection getSortDirection(String sortExpression) {
@@ -85,8 +86,9 @@
if(_sorts == null)
return null;
- for ( Iterator i = _sorts.iterator(); i.hasNext(); ) {
- Sort sort = ( Sort ) i.next();
+ for(int i = 0; i < _sorts.size(); i++) {
+ assert _sorts.get(i) instanceof Sort;
+ Sort sort = (Sort)_sorts.get(i);
if(sort.getSortExpression().equals(sortExpression))
return sort;
}
Modified:
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/api/sort/SortStrategy.java
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/api/sort/SortStrategy.java?view=diff&r1=161136&r2=161137
==============================================================================
---
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/api/sort/SortStrategy.java
(original)
+++
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/api/sort/SortStrategy.java
Tue Apr 12 17:09:46 2005
@@ -23,6 +23,6 @@
public abstract class SortStrategy {
public abstract SortDirection getDefaultDirection();
-
+
public abstract SortDirection nextDirection(SortDirection direction);
}
Modified:
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/config/DefaultDataGridConfig.java
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/config/DefaultDataGridConfig.java?view=diff&r1=161136&r2=161137
==============================================================================
---
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/config/DefaultDataGridConfig.java
(original)
+++
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/config/DefaultDataGridConfig.java
Tue Apr 12 17:09:46 2005
@@ -41,7 +41,7 @@
*
*/
public class DefaultDataGridConfig
- extends DataGridConfig {
+ extends DataGridConfig {
private static final String STYLE_POLICY_NAME_EMPTY = "empty";
private static final String STYLE_POLICY_NAME_DEFAULT = "default";
@@ -50,7 +50,7 @@
private static final StyleModel DEFAULT_STYLE_POLICY = new
DefaultStyleModel(STYLE_PREFIX_DEFAULT);
private static final StyleModel EMPTY_STYLE_POLICY = new EmptyStyleModel();
private static final SortStrategy SORT_STRATEGY = new
DefaultSortStrategy();
-
+
public DataGridState createDataGridState() {
return new DataGridState();
}
@@ -102,9 +102,9 @@
if(name == null || name.equals(STYLE_POLICY_NAME_DEFAULT)) {
if(classPrefix != null)
return new DefaultStyleModel(classPrefix);
- else
- return DEFAULT_STYLE_POLICY;
- } else if(name != null && name.equals(STYLE_POLICY_NAME_EMPTY))
+ else return DEFAULT_STYLE_POLICY;
+ }
+ else if(name != null && name.equals(STYLE_POLICY_NAME_EMPTY))
return EMPTY_STYLE_POLICY;
else return DEFAULT_STYLE_POLICY;
}
Modified:
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/config/DefaultDataGridResourceProvider.java
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/config/DefaultDataGridResourceProvider.java?view=diff&r1=161136&r2=161137
==============================================================================
---
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/config/DefaultDataGridResourceProvider.java
(original)
+++
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/config/DefaultDataGridResourceProvider.java
Tue Apr 12 17:09:46 2005
@@ -28,7 +28,7 @@
*
*/
class DefaultDataGridResourceProvider
- extends DataGridResourceProvider {
+ extends DataGridResourceProvider {
private static final Object VALUE_PLACEHOLDER = new Object();
private static final String DEFAULT_RESOURCE_BUNDLE =
"org.apache.beehive.netui.databinding.datagrid.runtime.util.data-grid-default";
@@ -66,7 +66,8 @@
if(!isEnableChaining() || _resourceBundleKeys.containsKey(key))
return _resourceBundle.getString(key);
- else return _defaultResourceBundle.getString(key);
+ else
+ return _defaultResourceBundle.getString(key);
}
}
Modified:
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/config/DefaultDataGridStateCodec.java
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/config/DefaultDataGridStateCodec.java?view=diff&r1=161136&r2=161137
==============================================================================
---
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/config/DefaultDataGridStateCodec.java
(original)
+++
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/config/DefaultDataGridStateCodec.java
Tue Apr 12 17:09:46 2005
@@ -44,7 +44,7 @@
*
*/
class DefaultDataGridStateCodec
- extends DataGridStateCodec {
+ extends DataGridStateCodec {
/* filter format:
netui_filter=<namespace>;<fExpr>~<fOp>~<fVal>,<fExpr>~<fOp>~<fVal> */
/* sort format: netui_sort=<namespace>;<expr>,-<expr> */
@@ -71,7 +71,6 @@
* The ServletRequest needs to be processed such that the parameter values
of
* interest are removed from the query param map. Then, the Map is
stateless
* relative to the state that the current data grid needs to add.
- *
*/
private HashMap _queryParams = null;
private DataGridConfig _config = null;
@@ -118,7 +117,7 @@
return null;
else {
HashMap params = new HashMap();
- params.put(PARAM_KEY_SORT, new String[] {encoded});
+ params.put(PARAM_KEY_SORT, new String[]{encoded});
return params;
}
}
@@ -132,7 +131,7 @@
return null;
else {
HashMap params = new HashMap();
- params.put(PARAM_KEY_FILTER, new String[] {encoded});
+ params.put(PARAM_KEY_FILTER, new String[]{encoded});
return params;
}
}
@@ -140,7 +139,7 @@
Map buildPageParamMap(Integer row, Integer pageSize) {
HashMap map = new HashMap();
if(row != null && row.intValue() != DEFAULT_ROW)
- map.put(PARAM_KEY_ROW, new String[] {encodeRow(row.intValue())});
+ map.put(PARAM_KEY_ROW, new String[]{encodeRow(row.intValue())});
/* only encode the page size if it is not equal to the default page
size for this data grid
@@ -148,7 +147,7 @@
to be 50, the default will read 20 but overridden pageSize value
should be encoded in the URL
*/
if(pageSize != null && pageSize.intValue() !=
_state.getPagerModel().getDefaultPageSize())
- map.put(PARAM_KEY_PAGE_SIZE, new String[]
{encodePageSize(pageSize.intValue())});
+ map.put(PARAM_KEY_PAGE_SIZE, new
String[]{encodePageSize(pageSize.intValue())});
return map;
}
@@ -169,7 +168,8 @@
String value = values[i];
if(value.startsWith(namespacePrefix))
sorts = decodeSort(value);
- else addParam(key, value);
+ else
+ addParam(key, value);
}
SortModel sortModel = _config.createSortModel(sorts);
_state.setSortModel(sortModel);
@@ -180,7 +180,8 @@
String value = values[i];
if(value.startsWith(namespacePrefix))
filters = decodeFilter(value);
- else addParam(key, value);
+ else
+ addParam(key, value);
}
FilterModel filterModel = _config.createFilterModel(filters);
_state.setFilterModel(filterModel);
@@ -191,7 +192,8 @@
String value = values[i];
if(value.startsWith(namespacePrefix))
row = decodeRow(value).intValue();
- else addParam(key, value);
+ else
+ addParam(key, value);
}
PagerModel pagerModel = _state.getPagerModel();
if(pagerModel == null) {
@@ -206,7 +208,8 @@
String value = values[i];
if(value.startsWith(namespacePrefix))
pageSize = decodeRow(value).intValue();
- else addParam(key, value);
+ else
+ addParam(key, value);
}
PagerModel pagerModel = _state.getPagerModel();
if(pagerModel == null) {
@@ -215,7 +218,8 @@
}
pagerModel.setPageSize(pageSize);
}
- else addParam(key, values);
+ else
+ addParam(key, values);
}
/* ensure that there is something created for the grid state model
objects */
@@ -259,8 +263,9 @@
int intValue = defaultValue;
try {
intValue = Integer.parseInt(value);
- } catch(NumberFormatException nfe) {
-
LOGGER.error(Bundle.getErrorString("DataGridStateCodec_IllegalIntegerValue",
new Object[] {value, nfe}));
+ }
+ catch(NumberFormatException nfe) {
+
LOGGER.error(Bundle.getErrorString("DataGridStateCodec_IllegalIntegerValue",
new Object[]{value, nfe}));
}
return intValue;
}
@@ -282,12 +287,13 @@
// two columns of the bugs grid would be sorted as:
//
// netui_sort=bugs~id,-priority
- for (int i = 0; i < sortStrings.length; i++) {
+ for(int i = 0; i < sortStrings.length; i++) {
String sort = sortStrings[i];
SortDirection sortDirection = SortDirection.NONE;
if(sort.startsWith("-"))
sortDirection = SortDirection.DESCENDING;
- else sortDirection = SortDirection.ASCENDING;
+ else
+ sortDirection = SortDirection.ASCENDING;
String sortExpression = (sortDirection == SortDirection.DESCENDING
? sort.substring(1) : sort);
Sort gridSort = _config.createSort();
gridSort.setSortExpression(sortExpression);
@@ -311,7 +317,8 @@
if(hasSorts)
sb.append(DELIM_SORT_TERM);
- else hasSorts = true;
+ else
+ hasSorts = true;
if(sort.getDirection() == SortDirection.DESCENDING)
sb.append(SORT_DESCENDING);
@@ -320,7 +327,8 @@
if(!hasSorts)
return null;
- else return sb.toString();
+ else
+ return sb.toString();
}
/*
@@ -341,14 +349,15 @@
if(terms.length == 2 && terms[1].equals("*"))
continue;
- else if (terms.length == 3) {
+ else if(terms.length == 3) {
FilterOperation fOp =
SQLSupport.mapFilterAbbreviationToOperation(terms[1]);
filter = _config.createFilter();
filter.setFilterExpression(terms[0]);
filter.setOperation(fOp);
filter.setValue(terms[2]);
- } else {
-
LOGGER.error(Bundle.getErrorString("DataGridStateCodec_IllegalFilter", new
Object[] {filter}));
+ }
+ else {
+
LOGGER.error(Bundle.getErrorString("DataGridStateCodec_IllegalFilter", new
Object[]{filter}));
continue;
}
Modified:
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/config/DefaultDataGridURLBuilder.java
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/config/DefaultDataGridURLBuilder.java?view=diff&r1=161136&r2=161137
==============================================================================
---
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/config/DefaultDataGridURLBuilder.java
(original)
+++
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/config/DefaultDataGridURLBuilder.java
Tue Apr 12 17:09:46 2005
@@ -29,13 +29,13 @@
/**
* A class that is used to expose various URL parameter maps that can be data
bound during JSP rendering.
- *
+ * <p/>
* Methods exposed here are useful for building URLs that can be clicked on in
the <i>future</i>. A case
* of this would be a pager URL that will move a UI to the "next" page of
data. The URL parameters would be
* computed using this class and rendered to the UI so that it is clickable
for the next HTTP submit.
*/
class DefaultDataGridURLBuilder
- extends DataGridURLBuilder {
+ extends DataGridURLBuilder {
private String _namespace;
private DefaultDataGridStateCodec _codec;
@@ -73,7 +73,7 @@
addSortParams(newParams);
addFilterParams(newParams);
newParams.putAll(_codec.buildPageParamMap(new
Integer(pagerModel.getFirstPage() * pagerModel.getPageSize()),
- new
Integer(pagerModel.getPageSize())));
+ new Integer(pagerModel.getPageSize())));
params = mergeMaps(params, newParams);
params = transformMap(params);
@@ -91,7 +91,7 @@
addSortParams(newParams);
addFilterParams(newParams);
newParams.putAll(_codec.buildPageParamMap(new
Integer(pagerModel.getPreviousPage() * pagerModel.getPageSize()),
- new
Integer(pagerModel.getPageSize())));
+ new Integer(pagerModel.getPageSize())));
params = mergeMaps(params, newParams);
params = transformMap(params);
@@ -109,7 +109,7 @@
addSortParams(newParams);
addFilterParams(newParams);
newParams.putAll(_codec.buildPageParamMap(new
Integer(pagerModel.getNextPage() * pagerModel.getPageSize()),
- new
Integer(pagerModel.getPageSize())));
+ new Integer(pagerModel.getPageSize())));
params = mergeMaps(params, newParams);
params = transformMap(params);
@@ -127,7 +127,7 @@
addSortParams(newParams);
addFilterParams(newParams);
newParams.putAll(_codec.buildPageParamMap(new
Integer(pagerModel.getLastPage() * pagerModel.getPageSize()),
- new
Integer(pagerModel.getPageSize())));
+ new Integer(pagerModel.getPageSize())));
params = mergeMaps(params, newParams);
params = transformMap(params);
@@ -216,7 +216,7 @@
private void addPagerParams(Map map) {
Map tmp = _codec.buildPageParamMap(new
Integer(getDataGridState().getPagerModel().getRow()),
- new
Integer(getDataGridState().getPagerModel().getPageSize()));
+ new Integer(getDataGridState().getPagerModel().getPageSize()));
if(tmp != null)
map.putAll(tmp);
}
@@ -239,10 +239,12 @@
currList.add(values[i]);
}
}
- else throw new
IllegalStateException(Bundle.getErrorString("DataGridURLBuilder_UnableToMergeValues",
- new
Object[] {currValues.getClass().getName()}));
+ else
+ throw new
IllegalStateException(Bundle.getErrorString("DataGridURLBuilder_UnableToMergeValues",
+ new Object[]{currValues.getClass().getName()}));
}
- else newMap.put(key, values);
+ else
+ newMap.put(key, values);
}
return newMap;
}
@@ -259,7 +261,8 @@
newMap.put(key, ((List)values).toArray(new String[0]));
else if(values == null)
newMap.put(key, null);
- else assert false : "Found invalid type in map: " +
values.getClass().getName();
+ else
+ assert false : "Found invalid type in map: " +
values.getClass().getName();
}
return newMap;
Modified:
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/config/DefaultSortStrategy.java
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/config/DefaultSortStrategy.java?view=diff&r1=161136&r2=161137
==============================================================================
---
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/config/DefaultSortStrategy.java
(original)
+++
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/config/DefaultSortStrategy.java
Tue Apr 12 17:09:46 2005
@@ -25,11 +25,11 @@
*
*/
class DefaultSortStrategy
- extends SortStrategy {
+ extends SortStrategy {
DefaultSortStrategy() {
}
-
+
public SortDirection getDefaultDirection() {
return SortDirection.ASCENDING;
}
@@ -41,6 +41,6 @@
return SortDirection.DESCENDING;
else if(direction == SortDirection.DESCENDING)
return SortDirection.NONE;
- else throw new
IllegalStateException(Bundle.getErrorString("SortStrategy_InvalidSortDirection",
new Object[] {direction}));
+ else throw new
IllegalStateException(Bundle.getErrorString("SortStrategy_InvalidSortDirection",
new Object[]{direction}));
}
}
Modified:
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/model/cell/AnchorCellModel.java
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/model/cell/AnchorCellModel.java?view=diff&r1=161136&r2=161137
==============================================================================
---
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/model/cell/AnchorCellModel.java
(original)
+++
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/model/cell/AnchorCellModel.java
Tue Apr 12 17:09:46 2005
@@ -27,7 +27,7 @@
*
*/
public class AnchorCellModel
- extends CellModel {
+ extends CellModel {
private String _linkName = null;
private String _value = null;
@@ -94,5 +94,5 @@
public void setLinkName(String linkName) {
_linkName = linkName;
- }
+ }
}
Modified:
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/model/cell/HeaderCellModel.java
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/model/cell/HeaderCellModel.java?view=diff&r1=161136&r2=161137
==============================================================================
---
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/model/cell/HeaderCellModel.java
(original)
+++
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/model/cell/HeaderCellModel.java
Tue Apr 12 17:09:46 2005
@@ -23,7 +23,7 @@
*
*/
public class HeaderCellModel
- extends CellModel {
+ extends CellModel {
private String _headerText = null;
private String _bodyContent = null;
Modified:
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/model/cell/ImageAnchorCellModel.java
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/model/cell/ImageAnchorCellModel.java?view=diff&r1=161136&r2=161137
==============================================================================
---
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/model/cell/ImageAnchorCellModel.java
(original)
+++
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/model/cell/ImageAnchorCellModel.java
Tue Apr 12 17:09:46 2005
@@ -24,7 +24,7 @@
*
*/
public final class ImageAnchorCellModel
- extends AnchorCellModel {
+ extends AnchorCellModel {
private ImageTag.State _imageState = null;
Modified:
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/model/cell/ImageCellModel.java
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/model/cell/ImageCellModel.java?view=diff&r1=161136&r2=161137
==============================================================================
---
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/model/cell/ImageCellModel.java
(original)
+++
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/model/cell/ImageCellModel.java
Tue Apr 12 17:09:46 2005
@@ -25,7 +25,7 @@
*
*/
public final class ImageCellModel
- extends CellModel {
+ extends CellModel {
private ImageTag.State _imageState = null;
Modified:
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/model/cell/SpanCellModel.java
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/model/cell/SpanCellModel.java?view=diff&r1=161136&r2=161137
==============================================================================
---
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/model/cell/SpanCellModel.java
(original)
+++
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/model/cell/SpanCellModel.java
Tue Apr 12 17:09:46 2005
@@ -25,7 +25,7 @@
*
*/
public final class SpanCellModel
- extends CellModel {
+ extends CellModel {
private static final SpanTag.State DEFAULT_SPAN_STATE = new
SpanTag.State();
Modified:
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/model/cell/TemplateCellModel.java
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/model/cell/TemplateCellModel.java?view=diff&r1=161136&r2=161137
==============================================================================
---
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/model/cell/TemplateCellModel.java
(original)
+++
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/model/cell/TemplateCellModel.java
Tue Apr 12 17:09:46 2005
@@ -23,5 +23,5 @@
*
*/
public final class TemplateCellModel
- extends CellModel {
+ extends CellModel {
}
Modified:
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/model/style/DefaultStyleModel.java
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/model/style/DefaultStyleModel.java?view=diff&r1=161136&r2=161137
==============================================================================
---
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/model/style/DefaultStyleModel.java
(original)
+++
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/model/style/DefaultStyleModel.java
Tue Apr 12 17:09:46 2005
@@ -23,7 +23,7 @@
*
*/
public class DefaultStyleModel
- extends StyleModel {
+ extends StyleModel {
private static final String CLASS_ROW_HEADER = "header";
private static final String CLASS_ROW_FOOTER = "footer";
Modified:
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/model/style/EmptyStyleModel.java
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/model/style/EmptyStyleModel.java?view=diff&r1=161136&r2=161137
==============================================================================
---
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/model/style/EmptyStyleModel.java
(original)
+++
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/model/style/EmptyStyleModel.java
Tue Apr 12 17:09:46 2005
@@ -21,7 +21,7 @@
*
*/
public class EmptyStyleModel
- extends DefaultStyleModel {
+ extends DefaultStyleModel {
protected String buildStyleClass(String baseStyle) {
return baseStyle;
Modified:
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/rendering/cell/AnchorCellDecorator.java
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/rendering/cell/AnchorCellDecorator.java?view=diff&r1=161136&r2=161137
==============================================================================
---
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/rendering/cell/AnchorCellDecorator.java
(original)
+++
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/rendering/cell/AnchorCellDecorator.java
Tue Apr 12 17:09:46 2005
@@ -39,12 +39,12 @@
*
*/
public final class AnchorCellDecorator
- extends CellDecorator {
+ extends CellDecorator {
private static final Logger LOGGER =
Logger.getInstance(AnchorCellDecorator.class);
public void decorate(JspContext jspContext, AbstractRenderAppender
appender, CellModel columnModel)
- throws CellDecoratorException {
+ throws CellDecoratorException {
assert columnModel instanceof AnchorCellModel;
@@ -60,13 +60,14 @@
String url = null;
try {
url = JspUtil.createURL(anchorCellModel.getHref(),
- anchorCellModel.getAction(),
- null,
- anchorCellModel.getScopeId(),
- anchorCellModel.getParams(),
- jspContext);
- } catch(URISyntaxException use) {
- String message = Bundle.getErrorString("Rendering_URLException",
new Object[] {anchorCellModel.getHref(), anchorCellModel.getAction()});
+ anchorCellModel.getAction(),
+ null,
+ anchorCellModel.getScopeId(),
+ anchorCellModel.getParams(),
+ jspContext);
+ }
+ catch(URISyntaxException use) {
+ String message = Bundle.getErrorString("Rendering_URLException",
new Object[]{anchorCellModel.getHref(), anchorCellModel.getAction()});
LOGGER.error(message, use);
throw new CellDecoratorException(message, use);
}
Modified:
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/rendering/cell/HeaderCellDecorator.java
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/rendering/cell/HeaderCellDecorator.java?view=diff&r1=161136&r2=161137
==============================================================================
---
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/rendering/cell/HeaderCellDecorator.java
(original)
+++
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/rendering/cell/HeaderCellDecorator.java
Tue Apr 12 17:09:46 2005
@@ -24,15 +24,17 @@
import
org.apache.beehive.netui.databinding.datagrid.api.rendering.CellDecorator;
import
org.apache.beehive.netui.databinding.datagrid.runtime.model.cell.HeaderCellModel;
import org.apache.beehive.netui.tags.rendering.AbstractRenderAppender;
+import org.apache.beehive.netui.tags.rendering.ConstantRendering;
+import org.apache.beehive.netui.tags.rendering.TagRenderingBase;
/**
*
*/
public class HeaderCellDecorator
- extends CellDecorator {
+ extends CellDecorator {
public void decorate(JspContext jspContext, AbstractRenderAppender
appender, CellModel cellModel)
- throws CellDecoratorException {
+ throws CellDecoratorException {
assert cellModel instanceof HeaderCellModel;
HeaderCellModel headerCellModel = (HeaderCellModel)cellModel;
Modified:
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/rendering/cell/ImageAnchorCellDecorator.java
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/rendering/cell/ImageAnchorCellDecorator.java?view=diff&r1=161136&r2=161137
==============================================================================
---
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/rendering/cell/ImageAnchorCellDecorator.java
(original)
+++
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/rendering/cell/ImageAnchorCellDecorator.java
Tue Apr 12 17:09:46 2005
@@ -38,12 +38,12 @@
/**
*/
public final class ImageAnchorCellDecorator
- extends CellDecorator {
+ extends CellDecorator {
private static final Logger LOGGER =
Logger.getInstance(ImageAnchorCellDecorator.class);
public void decorate(JspContext jspContext, AbstractRenderAppender
appender, CellModel cellModel)
- throws CellDecoratorException {
+ throws CellDecoratorException {
HttpServletRequest request = JspUtil.getRequest(jspContext);
@@ -60,13 +60,14 @@
String url = null;
try {
url = JspUtil.createURL(imageAnchorCellModel.getHref(),
- imageAnchorCellModel.getAction(),
- null,
- imageAnchorCellModel.getScopeId(),
- imageAnchorCellModel.getParams(),
- jspContext);
- } catch(URISyntaxException use) {
- String message = Bundle.getErrorString("Rendering_URLException",
new Object[] {imageAnchorCellModel.getHref(),
imageAnchorCellModel.getAction()});
+ imageAnchorCellModel.getAction(),
+ null,
+ imageAnchorCellModel.getScopeId(),
+ imageAnchorCellModel.getParams(),
+ jspContext);
+ }
+ catch(URISyntaxException use) {
+ String message = Bundle.getErrorString("Rendering_URLException",
new Object[]{imageAnchorCellModel.getHref(), imageAnchorCellModel.getAction()});
if(LOGGER.isErrorEnabled())
LOGGER.error(message, use);
throw new CellDecoratorException(message, use);
Modified:
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/rendering/cell/ImageCellDecorator.java
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/rendering/cell/ImageCellDecorator.java?view=diff&r1=161136&r2=161137
==============================================================================
---
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/rendering/cell/ImageCellDecorator.java
(original)
+++
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/rendering/cell/ImageCellDecorator.java
Tue Apr 12 17:09:46 2005
@@ -32,10 +32,10 @@
*
*/
public final class ImageCellDecorator
- extends CellDecorator {
+ extends CellDecorator {
public void decorate(JspContext jspContext, AbstractRenderAppender
appender, CellModel cellModel)
- throws CellDecoratorException {
+ throws CellDecoratorException {
assert cellModel instanceof ImageCellModel;
Modified:
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/rendering/cell/SortedCellDecorator.java
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/rendering/cell/SortedCellDecorator.java?view=diff&r1=161136&r2=161137
==============================================================================
---
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/rendering/cell/SortedCellDecorator.java
(original)
+++
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/rendering/cell/SortedCellDecorator.java
Tue Apr 12 17:09:46 2005
@@ -46,7 +46,7 @@
*
*/
public final class SortedCellDecorator
- extends CellDecorator {
+ extends CellDecorator {
private static final Logger LOGGER =
Logger.getInstance(SortedCellDecorator.class);
@@ -55,13 +55,13 @@
}
public void decorate(JspContext jspContext, AbstractRenderAppender
appender, CellModel cellModel)
- throws CellDecoratorException {
+ throws CellDecoratorException {
assert cellModel instanceof HeaderCellModel;
HeaderCellModel headerCellModel = (HeaderCellModel)cellModel;
assert getNestedDecorator() != null : "SortedCellDecorator did not
find a nested decorator and requires one";
-
+
getNestedDecorator().decorate(jspContext, appender, cellModel);
if(headerCellModel.isSortable()) {
@@ -92,7 +92,8 @@
/* build icon for existing sort */
if(sortModel.isSorted(cellModel.getSortExpression()))
imgTag.src = dgm.getResourcePath() +
dgm.getSortImagePath(sortDirection);
- else imgTag.src = dgm.getResourcePath() +
dgm.getDefaultSortImagePath();
+ else
+ imgTag.src = dgm.getResourcePath() + dgm.getDefaultSortImagePath();
imgTag.registerAttribute(AbstractHtmlState.ATTR_GENERAL,
HtmlConstants.BORDER, "false");
@@ -101,13 +102,14 @@
String href = null;
try {
href = JspUtil.createURL(cellModel.getSortHref(),
- cellModel.getSortAction(),
- null,
- cellModel.getScopeId(),
- queryParams,
- dgm.getJspContext());
- } catch(URISyntaxException use) {
- String message = Bundle.getErrorString("Rendering_URLException",
new Object[] {cellModel.getSortHref(), cellModel.getSortAction()});
+ cellModel.getSortAction(),
+ null,
+ cellModel.getScopeId(),
+ queryParams,
+ dgm.getJspContext());
+ }
+ catch(URISyntaxException use) {
+ String message = Bundle.getErrorString("Rendering_URLException",
new Object[]{cellModel.getSortHref(), cellModel.getSortAction()});
if(LOGGER.isErrorEnabled())
LOGGER.error(message, use);
throw new CellDecoratorException(message, use);
Modified:
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/rendering/cell/SpanCellDecorator.java
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/rendering/cell/SpanCellDecorator.java?view=diff&r1=161136&r2=161137
==============================================================================
---
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/rendering/cell/SpanCellDecorator.java
(original)
+++
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/rendering/cell/SpanCellDecorator.java
Tue Apr 12 17:09:46 2005
@@ -32,10 +32,10 @@
*
*/
public final class SpanCellDecorator
- extends CellDecorator {
+ extends CellDecorator {
public void decorate(JspContext jspContext, AbstractRenderAppender
appender, CellModel cellModel)
- throws CellDecoratorException {
+ throws CellDecoratorException {
assert cellModel instanceof SpanCellModel;
SpanCellModel literalColumnModel = (SpanCellModel)cellModel;
Modified:
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/rendering/pager/FirstPreviousNextLastPagerRenderer.java
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/rendering/pager/FirstPreviousNextLastPagerRenderer.java?view=diff&r1=161136&r2=161137
==============================================================================
---
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/rendering/pager/FirstPreviousNextLastPagerRenderer.java
(original)
+++
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/rendering/pager/FirstPreviousNextLastPagerRenderer.java
Tue Apr 12 17:09:46 2005
@@ -27,7 +27,7 @@
*
*/
public final class FirstPreviousNextLastPagerRenderer
- extends PagerRenderer {
+ extends PagerRenderer {
protected String internalRender() {
InternalStringBuilder buf = new InternalStringBuilder();
@@ -37,7 +37,8 @@
/* Page # of # First / Previous Next / Last */
buf.append(getDataGridTagModel().formatMessage(IDataGridMessageKeys.PAGER_FMT_BANNER,
- new Integer[]{new Integer(currentPage + 1), new
Integer(pagerModel.getLastPage() + 1)}));
+ new Integer[]{new
Integer(currentPage + 1),
+ new
Integer(pagerModel.getLastPage() + 1)}));
buf.append(" ");
if(currentPage > pagerModel.getFirstPage())
Modified:
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/rendering/pager/PreviousNextPagerRenderer.java
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/rendering/pager/PreviousNextPagerRenderer.java?view=diff&r1=161136&r2=161137
==============================================================================
---
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/rendering/pager/PreviousNextPagerRenderer.java
(original)
+++
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/rendering/pager/PreviousNextPagerRenderer.java
Tue Apr 12 17:09:46 2005
@@ -24,7 +24,7 @@
import
org.apache.beehive.netui.databinding.datagrid.api.rendering.PagerRenderer;
public final class PreviousNextPagerRenderer
- extends PagerRenderer {
+ extends PagerRenderer {
protected String internalRender() {
InternalStringBuilder buf = new InternalStringBuilder();
@@ -33,8 +33,8 @@
int lastPage = pagerModel.getLastPage();
buf.append(getDataGridTagModel().formatMessage(IDataGridMessageKeys.PAGER_FMT_BANNER,
- new Integer[]{new
Integer(currentPage + 1),
- new
Integer(pagerModel.getLastPage() + 1)}));
+ new Integer[]{new Integer(currentPage + 1),
+ new Integer(pagerModel.getLastPage() + 1)}));
buf.append(" ");
if(pagerModel.getPreviousPage() >= 0)
buf.append(buildLivePreviousLink());
Modified:
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/sql/DatabaseMetaDataSQLSupportConfig.java
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/sql/DatabaseMetaDataSQLSupportConfig.java?view=diff&r1=161136&r2=161137
==============================================================================
---
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/sql/DatabaseMetaDataSQLSupportConfig.java
(original)
+++
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/sql/DatabaseMetaDataSQLSupportConfig.java
Tue Apr 12 17:09:46 2005
@@ -24,10 +24,10 @@
*
*/
class DatabaseMetaDataSQLSupportConfig
- extends DefaultSQLSupportConfig {
+ extends DefaultSQLSupportConfig {
DatabaseMetaDataSQLSupportConfig(DatabaseMetaData databaseMetaData)
- throws SQLException {
+ throws SQLException {
setQuoteChar(databaseMetaData.getIdentifierQuoteString());
setSupportsLikeEscapeClause(databaseMetaData.supportsLikeEscapeClause());
}
Modified:
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/sql/DefaultSQLSupportConfig.java
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/sql/DefaultSQLSupportConfig.java?view=diff&r1=161136&r2=161137
==============================================================================
---
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/sql/DefaultSQLSupportConfig.java
(original)
+++
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/sql/DefaultSQLSupportConfig.java
Tue Apr 12 17:09:46 2005
@@ -21,7 +21,7 @@
*
*/
class DefaultSQLSupportConfig
- extends SQLSupportConfig {
+ extends SQLSupportConfig {
private static final String DEFAULT_QUOTE_CHAR = "'";
private static final boolean DEFAULT_SUPPORTS_LIKE_ESCAPE_CLAUSE = true;
