Author: ekoneil
Date: Tue Feb 15 12:54:31 2005
New Revision: 153958
URL: http://svn.apache.org/viewcvs?view=rev&rev=153958
Log:
Data grid fixes.
- rename SQLFilterService to SQLSupport. The latter is more generally
descriptive
- delete some empty directories
BB: self
DRT: NetUI pass
Added:
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/sql/SQLSupport.java
- copied, changed from r153881,
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/sql/SQLFilterService.java
Removed:
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/sql/SQLFilterService.java
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/databinding/controls/
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/databinding/datagrid/util/
incubator/beehive/trunk/netui/test/webapps/drt/coreWeb/databinding/jstl/
Modified:
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/AbstractDataGridFactory.java
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/DataGridURLService.java
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/codec/FilterCodec.java
Modified:
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/AbstractDataGridFactory.java
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/AbstractDataGridFactory.java?view=diff&r1=153957&r2=153958
==============================================================================
---
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/AbstractDataGridFactory.java
(original)
+++
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/AbstractDataGridFactory.java
Tue Feb 15 12:54:31 2005
@@ -31,6 +31,6 @@
/* todo: refactor. implement this so that grid builders can plug-in their
own implementations */
public static final DataGridFactory getInstance(Class factoryClass) {
- return null;
+ throw new UnsupportedOperationException("NYI");
}
}
Modified:
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/DataGridURLService.java
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/DataGridURLService.java?view=diff&r1=153957&r2=153958
==============================================================================
---
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/DataGridURLService.java
(original)
+++
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/DataGridURLService.java
Tue Feb 15 12:54:31 2005
@@ -26,10 +26,8 @@
import javax.servlet.jsp.JspContext;
import javax.servlet.jsp.PageContext;
-import org.apache.beehive.netui.databinding.datagrid.api.sort.SortModel;
import org.apache.beehive.netui.databinding.datagrid.api.sort.Sort;
import org.apache.beehive.netui.databinding.datagrid.api.sort.SortDirection;
-import org.apache.beehive.netui.databinding.datagrid.api.filter.FilterModel;
import org.apache.beehive.netui.databinding.datagrid.api.filter.Filter;
import org.apache.beehive.netui.databinding.datagrid.api.pager.PagerModel;
import org.apache.beehive.netui.databinding.datagrid.runtime.codec.SortCodec;
Modified:
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/codec/FilterCodec.java
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/codec/FilterCodec.java?view=diff&r1=153957&r2=153958
==============================================================================
---
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/codec/FilterCodec.java
(original)
+++
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/codec/FilterCodec.java
Tue Feb 15 12:54:31 2005
@@ -24,7 +24,7 @@
import org.apache.beehive.netui.databinding.datagrid.api.filter.Filter;
import
org.apache.beehive.netui.databinding.datagrid.api.filter.FilterOperation;
-import
org.apache.beehive.netui.databinding.datagrid.runtime.sql.SQLFilterService;
+import org.apache.beehive.netui.databinding.datagrid.runtime.sql.SQLSupport;
import org.apache.beehive.netui.util.logging.Logger;
/* Beehive filter format:
netui_filter=<namespace>;<fExpr>~<fOp>~<fVal>,<fExpr>~<fOp>~<fVal> */
@@ -69,7 +69,7 @@
else if(terms.length == 3) {
try {
/* todo: refactor. need to map String to
FilterOperation */
- FilterOperation fOp =
SQLFilterService.mapStringToOperation(terms[1]);
+ FilterOperation fOp =
SQLSupport.mapStringToOperation(terms[1]);
filter = new Filter();
filter.setFilterExpression(terms[0]);
Copied:
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/sql/SQLSupport.java
(from r153881,
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/sql/SQLFilterService.java)
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/sql/SQLSupport.java?view=diff&rev=153958&p1=incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/sql/SQLFilterService.java&r1=153881&p2=incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/sql/SQLSupport.java&r2=153958
==============================================================================
---
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/sql/SQLFilterService.java
(original)
+++
incubator/beehive/trunk/netui/src/tags-databinding/org/apache/beehive/netui/databinding/datagrid/runtime/sql/SQLSupport.java
Tue Feb 15 12:54:31 2005
@@ -25,12 +25,14 @@
import
org.apache.beehive.netui.databinding.datagrid.api.filter.FilterOperationHint;
import org.apache.beehive.netui.databinding.datagrid.api.filter.Filter;
import org.apache.beehive.netui.databinding.datagrid.api.filter.FilterTypeHint;
+import org.apache.beehive.netui.databinding.datagrid.api.sort.SortDirection;
+import org.apache.beehive.netui.databinding.datagrid.api.sort.Sort;
import
org.apache.beehive.netui.databinding.datagrid.exceptions.IllegalFilterException;
/**
* @netui:jspfunctions
*/
-public class SQLFilterService {
+public class SQLSupport {
private static final String EMPTY_STRING = "";
private static final FilterOperation[] FILTER_OPERATIONS;
@@ -55,7 +57,7 @@
private static final FilterOperation STRING_FILTER_OPERATION =
FILTER_OPERATIONS[9];
private static final FilterOperation OTHER_FILTER_OPERATION =
FILTER_OPERATIONS[1];
- private SQLFilterService() {}
+ private SQLSupport() {}
/**
* @param typeHint
@@ -103,7 +105,26 @@
return fOp.getAbbreviation();
}
- public String createWhereFragment(List<Filter> filters) {
+ public static final String createOrderByFragment(List<Sort> sorts) {
+ if(sorts == null || sorts.size() == 0)
+ return EMPTY_STRING;
+
+ StringBuilder sb = new StringBuilder();
+ sb.append("ORDER BY ");
+
+ for(int i = 0; i < sorts.size(); i++) {
+ Sort sort = sorts.get(i);
+ if(i > 0)
+ sb.append(", ");
+ sb.append(sort.getSortExpression());
+ if(sort.getDirection() == SortDirection.DESCENDING)
+ sb.append(" DESC");
+ }
+
+ return sb.toString();
+ }
+
+ public static String createWhereFragment(List<Filter> filters) {
if(filters == null || filters.size() == 0)
return EMPTY_STRING;
@@ -112,7 +133,7 @@
return sb.toString();
}
- public String createWhereClause(List<Filter> filters) {
+ public static String createWhereClause(List<Filter> filters) {
if(filters == null || filters.size() == 0)
return EMPTY_STRING;
@@ -130,7 +151,7 @@
return null;
}
- private void internalCreateWhereFragment(StringBuilder sb, List<Filter>
filters) {
+ private static void internalCreateWhereFragment(StringBuilder sb,
List<Filter> filters) {
for(int i = 0; i < filters.size(); i++) {
Filter filter = filters.get(i);
@@ -156,7 +177,7 @@
}
}
- private String mapIdToOperator(FilterOperation op) {
+ private static String mapIdToOperator(FilterOperation op) {
if(op.getOperationHint() == FilterOperationHint.EQUAL)
return "=";
else if(op.getOperationHint() == FilterOperationHint.NOT_EQUAL)
