details: /erp/devel/pi/rev/74206cdb4aed
changeset: 10338:74206cdb4aed
user: Gorka Ion Damián <gorkaion.damian <at> openbravo.com>
date: Wed Feb 02 18:47:34 2011 +0100
summary: [OBUIAPP] getParameterFixedValue public method must return an Object
instead of String.
details: /erp/devel/pi/rev/564ddb483f4f
changeset: 10339:564ddb483f4f
user: Gorka Ion Damián <gorkaion.damian <at> openbravo.com>
date: Wed Feb 02 18:49:00 2011 +0100
summary: [OBCQL] Allow fixed parameters returning Collection<?> or Object[].
diffstat:
modules/org.openbravo.client.application/src/org/openbravo/client/application/ParameterUtils.java
| 4 ++--
modules/org.openbravo.client.querylist/src/org/openbravo/client/querylist/QueryListDataSource.java
| 10 +++++++++-
2 files changed, 11 insertions(+), 3 deletions(-)
diffs (43 lines):
diff -r 5f8541ceef39 -r 564ddb483f4f
modules/org.openbravo.client.application/src/org/openbravo/client/application/ParameterUtils.java
---
a/modules/org.openbravo.client.application/src/org/openbravo/client/application/ParameterUtils.java
Wed Feb 02 18:34:54 2011 +0100
+++
b/modules/org.openbravo.client.application/src/org/openbravo/client/application/ParameterUtils.java
Wed Feb 02 18:49:00 2011 +0100
@@ -122,10 +122,10 @@
* the parameter we want to get the Fixed Value from
* @return the Fixed Value of the parameter
*/
- public static String getParameterFixedValue(Map<String, String> parameters,
Parameter parameter) {
+ public static Object getParameterFixedValue(Map<String, String> parameters,
Parameter parameter) {
if (parameter.isEvaluateFixedValue()) {
try {
- return (String) getJSExpressionResult(parameters, null,
parameter.getFixedValue());
+ return getJSExpressionResult(parameters, null,
parameter.getFixedValue());
} catch (Exception e) {
// log.error(e.getMessage(), e);
return null;
diff -r 5f8541ceef39 -r 564ddb483f4f
modules/org.openbravo.client.querylist/src/org/openbravo/client/querylist/QueryListDataSource.java
---
a/modules/org.openbravo.client.querylist/src/org/openbravo/client/querylist/QueryListDataSource.java
Wed Feb 02 18:34:54 2011 +0100
+++
b/modules/org.openbravo.client.querylist/src/org/openbravo/client/querylist/QueryListDataSource.java
Wed Feb 02 18:49:00 2011 +0100
@@ -23,6 +23,7 @@
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Calendar;
+import java.util.Collection;
import java.util.Collections;
import java.util.Comparator;
import java.util.Date;
@@ -125,7 +126,14 @@
String namedParam = params[i];
boolean isParamSet = false;
if (parameterValues.containsKey(namedParam)) {
- widgetQuery.setParameter(namedParam,
parameterValues.get(namedParam));
+ Object value = parameterValues.get(namedParam);
+ if (value instanceof Collection<?>) {
+ widgetQuery.setParameterList(namedParam, (Collection<?>) value);
+ } else if (value instanceof Object[]) {
+ widgetQuery.setParameterList(namedParam, (Object[]) value);
+ } else {
+ widgetQuery.setParameter(namedParam, value);
+ }
isParamSet = true;
}
if (!isParamSet) {
------------------------------------------------------------------------------
Special Offer-- Download ArcSight Logger for FREE (a $49 USD value)!
Finally, a world-class log management solution at an even better price-free!
Download using promo code Free_Logger_4_Dev2Dev. Offer expires
February 28th, so secure your free ArcSight Logger TODAY!
http://p.sf.net/sfu/arcsight-sfd2d
_______________________________________________
Openbravo-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
