details: /erp/devel/pi/rev/8f39df7b5565
changeset: 8200:8f39df7b5565
user: Martin Taal <martin.taal <at> openbravo.com>
date: Mon Aug 23 16:04:54 2010 +0200
summary: Removed usage of deprecated api
details: /erp/devel/pi/rev/7423df7bd3ff
changeset: 8201:7423df7bd3ff
user: Martin Taal <martin.taal <at> openbravo.com>
date: Mon Aug 23 16:05:02 2010 +0200
summary: Code improvement
diffstat:
src/org/openbravo/erpCommon/utility/ComboTableData.java | 7 ++-----
src/org/openbravo/reference/ui/UIReference.java | 4 ++--
2 files changed, 4 insertions(+), 7 deletions(-)
diffs (31 lines):
diff -r 437ee4de45ac -r 7423df7bd3ff
src/org/openbravo/erpCommon/utility/ComboTableData.java
--- a/src/org/openbravo/erpCommon/utility/ComboTableData.java Mon Aug 23
14:15:41 2010 +0200
+++ b/src/org/openbravo/erpCommon/utility/ComboTableData.java Mon Aug 23
16:05:02 2010 +0200
@@ -811,11 +811,8 @@
if (field == null) {
uiref = Reference.getUIReference(getReferenceType(), null);
} else {
- String referenceId = field.getField("referenceValue");
- if (referenceId == null || referenceId.length() == 0) {
- referenceId = field.getField("reference");
- }
- uiref = Reference.getUIReference(referenceId, null);
+ uiref = Reference.getUIReference(field.getField("reference"), field
+ .getField("referenceValue"));
}
uiref.setComboTableDataIdentifier(this, tableName, field);
}
diff -r 437ee4de45ac -r 7423df7bd3ff
src/org/openbravo/reference/ui/UIReference.java
--- a/src/org/openbravo/reference/ui/UIReference.java Mon Aug 23 14:15:41
2010 +0200
+++ b/src/org/openbravo/reference/ui/UIReference.java Mon Aug 23 16:05:02
2010 +0200
@@ -77,8 +77,8 @@
if (!UIReferenceUtility.checkTableTranslation(tableSql, parentTableName,
field, reference,
identifierName, realName, tableRef)) {
- tableSql.addSelectField(UIReferenceUtility.formatField(reference,
tableSql, (parentTableName
- + "." + field.getProperty("ColumnName"))), identifierName);
+
tableSql.addSelectField(UIReferenceUtility.formatField(tableSql.getVars(),
reference,
+ (parentTableName + "." + field.getProperty("ColumnName"))),
identifierName);
}
}
------------------------------------------------------------------------------
This SF.net email is sponsored by
Make an app they can't live without
Enter the BlackBerry Developer Challenge
http://p.sf.net/sfu/RIM-dev2dev
_______________________________________________
Openbravo-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
