details: /erp/devel/pi/rev/605ea335e82f
changeset: 9141:605ea335e82f
user: Antonio Moreno <antonio.moreno <at> openbravo.com>
date: Tue Dec 14 18:37:23 2010 +0100
summary: Optimization in the combo UI definitions for increased performance
(not displayed fields will not be completely computed)
details: /erp/devel/pi/rev/9db29c2e148e
changeset: 9142:9db29c2e148e
user: Antonio Moreno <antonio.moreno <at> openbravo.com>
date: Tue Dec 14 18:38:04 2010 +0100
summary: Now columns with validation will not be computed twice
diffstat:
modules/org.openbravo.client.application/src/org/openbravo/client/application/window/FormInitializationComponent.java
| 2 +-
modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/reference/EnumUIDefinition.java
| 10 ++++++----
modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/reference/FKComboUIDefinition.java
| 10 ++++++----
modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/reference/UIDefinition.java
| 1 -
4 files changed, 13 insertions(+), 10 deletions(-)
diffs (65 lines):
diff -r c3ba57fd49fc -r 9db29c2e148e
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
Tue Dec 14 18:26:29 2010 +0100
+++
b/modules/org.openbravo.client.application/src/org/openbravo/client/application/window/FormInitializationComponent.java
Tue Dec 14 18:38:04 2010 +0100
@@ -184,7 +184,7 @@
// we add the columns not included in the sortedColumns
// (the ones which don't have validations)
for (Field field : fields) {
- if (!allColumns.contains(field.getColumn().getDBColumnName())) {
+ if (!sortedColumns.contains(field.getColumn().getDBColumnName())) {
allColumns.add(field.getColumn().getDBColumnName());
}
}
diff -r c3ba57fd49fc -r 9db29c2e148e
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
Tue Dec 14 18:26:29 2010 +0100
+++
b/modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/reference/EnumUIDefinition.java
Tue Dec 14 18:38:04 2010 +0100
@@ -42,11 +42,13 @@
@Override
public String getFieldProperties(Field field, boolean getValueFromSession) {
- String columnValue;
+ JSONObject value;
try {
- columnValue = new JSONObject(super.getFieldProperties(field,
getValueFromSession))
- .getString("value");
- return getValueInComboReference(field, getValueFromSession, columnValue);
+ value = new JSONObject(super.getFieldProperties(field,
getValueFromSession));
+ if (!field.isDisplayed()) {
+ return value.toString();
+ }
+ return getValueInComboReference(field, getValueFromSession,
value.getString("value"));
} catch (JSONException e) {
throw new OBException("Error while computing combo data", e);
}
diff -r c3ba57fd49fc -r 9db29c2e148e
modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/reference/FKComboUIDefinition.java
---
a/modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/reference/FKComboUIDefinition.java
Tue Dec 14 18:26:29 2010 +0100
+++
b/modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/reference/FKComboUIDefinition.java
Tue Dec 14 18:38:04 2010 +0100
@@ -37,11 +37,13 @@
@Override
public String getFieldProperties(Field field, boolean getValueFromSession) {
- String columnValue;
+ JSONObject value;
try {
- columnValue = new JSONObject(super.getFieldProperties(field,
getValueFromSession))
- .getString("value");
- return getValueInComboReference(field, getValueFromSession, columnValue);
+ value = new JSONObject(super.getFieldProperties(field,
getValueFromSession));
+ if (!field.isDisplayed()) {
+ return value.toString();
+ }
+ return getValueInComboReference(field, getValueFromSession,
value.getString("value"));
} catch (JSONException e) {
throw new OBException("Error while computing combo data", e);
}
diff -r c3ba57fd49fc -r 9db29c2e148e
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
Tue Dec 14 18:26:29 2010 +0100
+++
b/modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/reference/UIDefinition.java
Tue Dec 14 18:38:04 2010 +0100
@@ -292,7 +292,6 @@
protected String getValueInComboReference(Field field, boolean
getValueFromSession,
String columnValue) {
-
try {
RequestContext rq = RequestContext.get();
VariablesSecureApp vars = rq.getVariablesSecureApp();
------------------------------------------------------------------------------
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
