details: /erp/devel/pi/rev/62626fa56b2f
changeset: 9226:62626fa56b2f
user: Antonio Moreno <antonio.moreno <at> openbravo.com>
date: Fri Dec 17 12:54:23 2010 +0100
summary: The EnumUIDefinition will no longer assume that the parent call to
the method always returns a value
details: /erp/devel/pi/rev/2a453163a91b
changeset: 9227:2a453163a91b
user: Antonio Moreno <antonio.moreno <at> openbravo.com>
date: Fri Dec 17 12:54:53 2010 +0100
summary: Use ArrayList instead of Vector
details: /erp/devel/pi/rev/ebc1059c988c
changeset: 9228:ebc1059c988c
user: Antonio Moreno <antonio.moreno <at> openbravo.com>
date: Fri Dec 17 12:55:45 2010 +0100
summary: Modified RequestContext so that it stores a real ServletContext
details: /erp/devel/pi/rev/b83d62ef97ef
changeset: 9229:b83d62ef97ef
user: Antonio Moreno <antonio.moreno <at> openbravo.com>
date: Fri Dec 17 12:58:48 2010 +0100
summary: Get real ServletContext from the RequestContext. Use ArrayList
instead f Vector in the parse method.
diffstat:
modules/org.openbravo.client.application/src/org/openbravo/client/application/window/FormInitializationComponent.java
| 5 ++---
modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/BaseKernelServlet.java
| 1 +
modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/RequestContext.java
| 6 +++++-
modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/reference/EnumUIDefinition.java
| 3 ++-
modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/reference/UIDefinition.java
| 7 +++----
5 files changed, 13 insertions(+), 9 deletions(-)
diffs (110 lines):
diff -r 341a68a61d0d -r b83d62ef97ef
modules/org.openbravo.client.application/src/org/openbravo/client/application/window/FormInitializationComponent.java
---
a/modules/org.openbravo.client.application/src/org/openbravo/client/application/window/FormInitializationComponent.java
Fri Dec 17 12:28:31 2010 +0100
+++
b/modules/org.openbravo.client.application/src/org/openbravo/client/application/window/FormInitializationComponent.java
Fri Dec 17 12:58:48 2010 +0100
@@ -27,7 +27,6 @@
import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import java.util.Vector;
import javax.servlet.ServletContext;
import javax.servlet.http.HttpServletRequest;
@@ -525,7 +524,7 @@
setRequestContextParameters(fields, columnValues);
RequestContext.get().setRequestParameter("inpLastFieldChanged",
lastFieldChanged);
CalloutServletConfig config = new
CalloutServletConfig(calloutClassName, RequestContext
- .getMockServletContext());
+ .getServletContext());
Object[] initArgs = { config };
init.invoke(calloutInstance, initArgs);
CalloutHttpServletResponse fakeResponse = new
CalloutHttpServletResponse(rq.getResponse());
@@ -739,7 +738,7 @@
System.out.println(auxIn.getName() + ":" + code);
String fvalue = null;
if (code.startsWith("@SQL=")) {
- Vector<String> params = new Vector<String>();
+ ArrayList<String> params = new ArrayList<String>();
String sql = UIDefinition.parseSQL(code, params);
// final StringBuffer parametros = new StringBuffer();
// for (final Enumeration<String> e = params.elements();
e.hasMoreElements();) {
diff -r 341a68a61d0d -r b83d62ef97ef
modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/BaseKernelServlet.java
---
a/modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/BaseKernelServlet.java
Fri Dec 17 12:28:31 2010 +0100
+++
b/modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/BaseKernelServlet.java
Fri Dec 17 12:58:48 2010 +0100
@@ -50,6 +50,7 @@
public void init(ServletConfig config) {
super.init(config);
boolHist = false;
+ RequestContext.setServletContext(getServletContext());
}
public void service(final HttpServletRequest request, HttpServletResponse
response)
diff -r 341a68a61d0d -r b83d62ef97ef
modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/RequestContext.java
---
a/modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/RequestContext.java
Fri Dec 17 12:28:31 2010 +0100
+++
b/modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/RequestContext.java
Fri Dec 17 12:58:48 2010 +0100
@@ -73,10 +73,14 @@
private static ThreadLocal<RequestContext> instance = new
ThreadLocal<RequestContext>();
- public static ServletContext getMockServletContext() {
+ public static ServletContext getServletContext() {
return servletContext;
}
+ public static void setServletContext(ServletContext aServletContext) {
+ servletContext = aServletContext;
+ }
+
public static RequestContext get() {
if (instance.get() == null) {
instance.set(new RequestContext());
diff -r 341a68a61d0d -r b83d62ef97ef
modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/reference/EnumUIDefinition.java
---
a/modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/reference/EnumUIDefinition.java
Fri Dec 17 12:28:31 2010 +0100
+++
b/modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/reference/EnumUIDefinition.java
Fri Dec 17 12:58:48 2010 +0100
@@ -48,7 +48,8 @@
if (!field.isDisplayed()) {
return value.toString();
}
- return getValueInComboReference(field, getValueFromSession,
value.getString("value"));
+ return getValueInComboReference(field, getValueFromSession,
value.has("value") ? value
+ .getString("value") : "");
} catch (JSONException e) {
throw new OBException("Error while computing combo data", e);
}
diff -r 341a68a61d0d -r b83d62ef97ef
modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/reference/UIDefinition.java
---
a/modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/reference/UIDefinition.java
Fri Dec 17 12:28:31 2010 +0100
+++
b/modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/reference/UIDefinition.java
Fri Dec 17 12:58:48 2010 +0100
@@ -24,7 +24,6 @@
import java.util.Arrays;
import java.util.HashMap;
import java.util.List;
-import java.util.Vector;
import org.apache.log4j.Logger;
import org.codehaus.jettison.json.JSONArray;
@@ -151,7 +150,7 @@
.getVariablesSecureApp(), field.getColumn().getDBColumnName(),
defaultS, field
.getTab().getWindow().getId(), defaultS);
} else {
- Vector<String> params = new Vector<String>();
+ ArrayList<String> params = new ArrayList<String>();
String sql = parseSQL(defaultS, params);
System.out.println(sql);
int indP = 1;
@@ -395,7 +394,7 @@
// Old method which parses SQL such as the one in Default values of columns,
or auxiliary inputs
// TODO: This method probably shouldn't be here, need to find a better place
to put it
- public static String parseSQL(String code, Vector<String> colNames) {
+ public static String parseSQL(String code, ArrayList<String> colNames) {
if (code == null || code.trim().equals(""))
return "";
String token;
@@ -444,7 +443,7 @@
strOut.append("'" + i + "'");
// String parameter = "<Parameter name=\"" + token + "\"" + strAux +
"/>";
// String paramElement[] = { parameter, modifier };
- colNames.addElement(token);// paramElement);
+ colNames.add(token);// paramElement);
strValue = strValue.substring(j + 1, strValue.length());
strAux = strValue.trim();
if (strAux.length() > 0 && strAux.substring(0, 1).indexOf("'") > -1)
------------------------------------------------------------------------------
Lotusphere 2011
Register now for Lotusphere 2011 and learn how
to connect the dots, take your collaborative environment
to the next level, and enter the era of Social Business.
http://p.sf.net/sfu/lotusphere-d2d
_______________________________________________
Openbravo-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
