details: /erp/devel/pi/rev/1fa684afd40d
changeset: 10825:1fa684afd40d
user: Gorka Ion Damián <gorkaion.damian <at> openbravo.com>
date: Tue Feb 22 10:39:04 2011 +0100
summary: [OBUISEL] Use ParameterUtils.getJSExpressionResult method instead of
reimplementing it.
diffstat:
modules/org.openbravo.userinterface.selector/src/org/openbravo/userinterface/selector/SelectorDataSourceFilter.java
| 28 +++------
1 files changed, 11 insertions(+), 17 deletions(-)
diffs (84 lines):
diff -r 9113294f841e -r 1fa684afd40d
modules/org.openbravo.userinterface.selector/src/org/openbravo/userinterface/selector/SelectorDataSourceFilter.java
---
a/modules/org.openbravo.userinterface.selector/src/org/openbravo/userinterface/selector/SelectorDataSourceFilter.java
Mon Feb 21 19:01:40 2011 +0100
+++
b/modules/org.openbravo.userinterface.selector/src/org/openbravo/userinterface/selector/SelectorDataSourceFilter.java
Tue Feb 22 10:39:04 2011 +0100
@@ -25,8 +25,6 @@
import java.util.List;
import java.util.Map;
-import javax.script.ScriptEngine;
-import javax.script.ScriptEngineManager;
import javax.servlet.http.HttpServletRequest;
import org.apache.log4j.Logger;
@@ -34,7 +32,7 @@
import org.openbravo.base.model.Entity;
import org.openbravo.base.model.ModelProvider;
import org.openbravo.base.model.Property;
-import org.openbravo.client.application.OBBindings;
+import org.openbravo.client.application.ParameterUtils;
import org.openbravo.dal.core.OBContext;
import org.openbravo.dal.service.OBCriteria;
import org.openbravo.dal.service.OBDal;
@@ -85,18 +83,12 @@
return;
}
- final ScriptEngineManager manager = new ScriptEngineManager();
- final ScriptEngine engine = manager.getEngineByName("js");
-
- // Initializing the OB JavaScript object
- engine.put("OB", new OBBindings(OBContext.getOBContext(), parameters,
request.getSession()));
-
// Applying filter expression
- applyFilterExpression(sel, engine, parameters);
+ applyFilterExpression(sel, parameters, request);
// Applying default expression for selector fields when is not a
selector window request
if (!"Window".equals(requestType)) {
- applyDefaultExpressions(sel, engine, parameters, sfc, request);
+ applyDefaultExpressions(sel, parameters, sfc, request);
}
} catch (Exception e) {
@@ -110,8 +102,8 @@
/**
* Evaluates the Selector filter expression and modifies the parameters map
for data filtering
*/
- private void applyFilterExpression(Selector sel, ScriptEngine engine,
- Map<String, String> parameters) {
+ private void applyFilterExpression(Selector sel, Map<String, String>
parameters,
+ HttpServletRequest request) {
if (sel.getFilterExpression() == null) {
return;
@@ -121,7 +113,8 @@
String dynamicWhere = "";
try {
- result = engine.eval(sel.getFilterExpression());
+ result = ParameterUtils.getJSExpressionResult(parameters,
request.getSession(), sel
+ .getFilterExpression());
if (result != null && !result.toString().equals("")) {
dynamicWhere = result.toString();
}
@@ -145,8 +138,8 @@
/**
* Evaluates the default expressions and modifies the parameters map for
data filtering
*/
- private void applyDefaultExpressions(Selector sel, ScriptEngine engine,
- Map<String, String> parameters, OBCriteria<SelectorField> sfc,
HttpServletRequest request) {
+ private void applyDefaultExpressions(Selector sel, Map<String, String>
parameters,
+ OBCriteria<SelectorField> sfc, HttpServletRequest request) {
if (sfc.count() == 0) {
return;
@@ -196,7 +189,8 @@
final Property property = properties.get(properties.size() - 1);
try {
- result = engine.eval(sf.getDefaultExpression());
+ result = ParameterUtils.getJSExpressionResult(parameters,
request.getSession(), sf
+ .getDefaultExpression());
if (result == null || result.toString().equals("")) {
continue;
------------------------------------------------------------------------------
Index, Search & Analyze Logs and other IT data in Real-Time with Splunk
Collect, index and harness all the fast moving IT data generated by your
applications, servers and devices whether physical, virtual or in the cloud.
Deliver compliance at lower cost and gain new business insights.
Free Software Download: http://p.sf.net/sfu/splunk-dev2dev
_______________________________________________
Openbravo-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
