Updated Branches: refs/heads/develop edd6e20f5 -> b155e0144
remove try catch to improve performance. ADG tests pass. Project: http://git-wip-us.apache.org/repos/asf/flex-sdk/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-sdk/commit/a7109bab Tree: http://git-wip-us.apache.org/repos/asf/flex-sdk/tree/a7109bab Diff: http://git-wip-us.apache.org/repos/asf/flex-sdk/diff/a7109bab Branch: refs/heads/develop Commit: a7109bab8409cb60cc0b64de07ce01bad875b701 Parents: edd6e20 Author: Justin Mclean <[email protected]> Authored: Fri Jan 3 13:35:21 2014 +1100 Committer: Justin Mclean <[email protected]> Committed: Fri Jan 3 13:35:21 2014 +1100 ---------------------------------------------------------------------- .../advancedDataGridClasses/AdvancedDataGridColumn.as | 14 +++++--------- .../AdvancedDataGridColumnGroup.as | 14 +++++--------- 2 files changed, 10 insertions(+), 18 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/a7109bab/frameworks/projects/advancedgrids/src/mx/controls/advancedDataGridClasses/AdvancedDataGridColumn.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/advancedgrids/src/mx/controls/advancedDataGridClasses/AdvancedDataGridColumn.as b/frameworks/projects/advancedgrids/src/mx/controls/advancedDataGridClasses/AdvancedDataGridColumn.as index 034bb51..dbebdff 100644 --- a/frameworks/projects/advancedgrids/src/mx/controls/advancedDataGridClasses/AdvancedDataGridColumn.as +++ b/frameworks/projects/advancedgrids/src/mx/controls/advancedDataGridClasses/AdvancedDataGridColumn.as @@ -1778,14 +1778,10 @@ public class AdvancedDataGridColumn extends CSSStyleDeclaration implements IIMES if (typeof(data) == "object" || typeof(data) == "xml") { - try - { + if (dataField in data) data = data[dataField]; - } - catch(e:Error) - { - data = null; - } + else + data = null; } if (data is String) @@ -1838,7 +1834,8 @@ public class AdvancedDataGridColumn extends CSSStyleDeclaration implements IIMES var field:String = dataTipField; if (!field) field = owner.dataTipField; - try + data = null; + try { if (data[field] != null) data = data[field]; @@ -1847,7 +1844,6 @@ public class AdvancedDataGridColumn extends CSSStyleDeclaration implements IIMES } catch(e:Error) { - data = null; } } http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/a7109bab/frameworks/projects/advancedgrids/src/mx/controls/advancedDataGridClasses/AdvancedDataGridColumnGroup.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/advancedgrids/src/mx/controls/advancedDataGridClasses/AdvancedDataGridColumnGroup.as b/frameworks/projects/advancedgrids/src/mx/controls/advancedDataGridClasses/AdvancedDataGridColumnGroup.as index 8bcf3a2..88e9e80 100644 --- a/frameworks/projects/advancedgrids/src/mx/controls/advancedDataGridClasses/AdvancedDataGridColumnGroup.as +++ b/frameworks/projects/advancedgrids/src/mx/controls/advancedDataGridClasses/AdvancedDataGridColumnGroup.as @@ -264,15 +264,11 @@ public class AdvancedDataGridColumnGroup extends AdvancedDataGridColumn } if (typeof(data) == "object" || typeof(data) == "xml") { - try - { - if(dataField !=null) - data = data[dataField]; - } - catch(e:Error) - { - data = null; - } + if (dataField != null) + if (dataField in data) + data = data[dataField]; + else + data = null; } return data; }
