Updated Branches: refs/heads/develop 0665f4793 -> edf998940
Additional null checks to make GCC warnings go away Signed-off-by: Erik de Bruin <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/ffb2dcf1 Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/ffb2dcf1 Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/ffb2dcf1 Branch: refs/heads/develop Commit: ffb2dcf13697718b295fc0dd79fe821697fd0ee8 Parents: 0665f47 Author: Erik de Bruin <[email protected]> Authored: Sat Nov 16 19:43:24 2013 +0100 Committer: Erik de Bruin <[email protected]> Committed: Sat Nov 16 19:43:24 2013 +0100 ---------------------------------------------------------------------- .../FlexJS/src/org/apache/flex/core/UIBase.js | 74 +++++++++++--------- .../FlexJS/src/org/apache/flex/core/ViewBase.js | 14 ++-- .../apache/flex/html/staticControls/Button.js | 6 +- .../DataItemRendererFactoryForArrayData.js | 4 +- 4 files changed, 57 insertions(+), 41 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/ffb2dcf1/frameworks/js/FlexJS/src/org/apache/flex/core/UIBase.js ---------------------------------------------------------------------- diff --git a/frameworks/js/FlexJS/src/org/apache/flex/core/UIBase.js b/frameworks/js/FlexJS/src/org/apache/flex/core/UIBase.js index 63f5636..96e6936 100644 --- a/frameworks/js/FlexJS/src/org/apache/flex/core/UIBase.js +++ b/frameworks/js/FlexJS/src/org/apache/flex/core/UIBase.js @@ -139,46 +139,54 @@ org.apache.flex.core.UIBase.prototype.addedToParent = function() { var c; if (this.getBeadByType(org.apache.flex.core.IBeadModel) == null) { - c = org.apache.flex.core.ValuesManager.valuesImpl. - getValue(this, 'iBeadModel'); - if (c) - { - var model = new c(); - if (model) - this.addBead(model); + if (org.apache.flex.core.ValuesManager.valuesImpl.getValue) { + c = org.apache.flex.core.ValuesManager.valuesImpl. + getValue(this, 'iBeadModel'); + if (c) + { + var model = new c(); + if (model) + this.addBead(model); + } } } if (this.getBeadByType(org.apache.flex.core.IBeadView) == null) { - c = org.apache.flex.core.ValuesManager.valuesImpl. - getValue(this, 'iBeadView'); - if (c) - { - var view = new c(); - if (view) - this.addBead(view); + if (org.apache.flex.core.ValuesManager.valuesImpl.getValue) { + c = org.apache.flex.core.ValuesManager.valuesImpl. + getValue(this, 'iBeadView'); + if (c) + { + var view = new c(); + if (view) + this.addBead(view); + } } } if (this.getBeadByType(org.apache.flex.core.IBeadLayout) == null) { - c = org.apache.flex.core.ValuesManager.valuesImpl. - getValue(this, 'iBeadLayout'); - if (c) - { - var layout = new c(); - if (layout) - this.addBead(layout); + if (org.apache.flex.core.ValuesManager.valuesImpl.getValue) { + c = org.apache.flex.core.ValuesManager.valuesImpl. + getValue(this, 'iBeadLayout'); + if (c) + { + var layout = new c(); + if (layout) + this.addBead(layout); + } } } if (this.getBeadByType(org.apache.flex.core.IBeadController) == null) { - c = org.apache.flex.core.ValuesManager.valuesImpl. - getValue(this, 'iBeadController'); - if (c) - { - var controller = new c(); - if (controller) - this.addBead(controller); + if (org.apache.flex.core.ValuesManager.valuesImpl.getValue) { + c = org.apache.flex.core.ValuesManager.valuesImpl. + getValue(this, 'iBeadController'); + if (c) + { + var controller = new c(); + if (controller) + this.addBead(controller); + } } } }; @@ -377,10 +385,12 @@ org.apache.flex.core.UIBase.prototype.get_model = function() { if (this.model == null) { // addbead will set _model - var m = org.apache.flex.core.ValuesManager.valuesImpl. - getValue(this, 'iBeadModel'); - var b = new m; - this.addBead(b); + if (org.apache.flex.core.ValuesManager.valuesImpl.getValue) { + var m = org.apache.flex.core.ValuesManager.valuesImpl. + getValue(this, 'iBeadModel'); + var b = new m; + this.addBead(b); + } } return this.model; }; http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/ffb2dcf1/frameworks/js/FlexJS/src/org/apache/flex/core/ViewBase.js ---------------------------------------------------------------------- diff --git a/frameworks/js/FlexJS/src/org/apache/flex/core/ViewBase.js b/frameworks/js/FlexJS/src/org/apache/flex/core/ViewBase.js index 4b8bf04..4f62918 100644 --- a/frameworks/js/FlexJS/src/org/apache/flex/core/ViewBase.js +++ b/frameworks/js/FlexJS/src/org/apache/flex/core/ViewBase.js @@ -88,7 +88,9 @@ org.apache.flex.core.ViewBase.prototype.MXMLDescriptor = null; org.apache.flex.core.ViewBase.prototype.addedToParent = function() { //goog.base(this,'addedToParent'); - org.apache.flex.core.ValuesManager.valuesImpl.init(this); + if (org.apache.flex.core.ValuesManager.valuesImpl.init) { + org.apache.flex.core.ValuesManager.valuesImpl.init(this); + } org.apache.flex.utils.MXMLDataInterpreter.generateMXMLProperties(this, this.get_MXMLProperties()); @@ -125,10 +127,12 @@ org.apache.flex.core.ViewBase.prototype.get_states = function() { org.apache.flex.core.ViewBase.prototype.set_states = function(value) { this.states_ = value; - var impl = org.apache.flex.core.ValuesManager.valuesImpl. - getValue(this, 'iStatesImpl'); - // TODO: (aharui) check if bead already exists - this.addBead(new impl()); + if (org.apache.flex.core.ValuesManager.valuesImpl.getValue) { + var impl = org.apache.flex.core.ValuesManager.valuesImpl. + getValue(this, 'iStatesImpl'); + // TODO: (aharui) check if bead already exists + this.addBead(new impl()); + } }; http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/ffb2dcf1/frameworks/js/FlexJS/src/org/apache/flex/html/staticControls/Button.js ---------------------------------------------------------------------- diff --git a/frameworks/js/FlexJS/src/org/apache/flex/html/staticControls/Button.js b/frameworks/js/FlexJS/src/org/apache/flex/html/staticControls/Button.js index a8f9e09..5f64d56 100644 --- a/frameworks/js/FlexJS/src/org/apache/flex/html/staticControls/Button.js +++ b/frameworks/js/FlexJS/src/org/apache/flex/html/staticControls/Button.js @@ -50,8 +50,10 @@ org.apache.flex.html.staticControls.Button.prototype.createElement = this.positioner = this.element; this.element.flexjs_wrapper = this; - var impl = org.apache.flex.core.ValuesManager.valuesImpl. - getValue(this, 'iStatesImpl'); + if (org.apache.flex.core.ValuesManager.valuesImpl.getValue) { + var impl = org.apache.flex.core.ValuesManager.valuesImpl. + getValue(this, 'iStatesImpl'); + } return this.element; }; http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/ffb2dcf1/frameworks/js/FlexJS/src/org/apache/flex/html/staticControls/beads/DataItemRendererFactoryForArrayData.js ---------------------------------------------------------------------- diff --git a/frameworks/js/FlexJS/src/org/apache/flex/html/staticControls/beads/DataItemRendererFactoryForArrayData.js b/frameworks/js/FlexJS/src/org/apache/flex/html/staticControls/beads/DataItemRendererFactoryForArrayData.js index 28ca839..b5c1531 100644 --- a/frameworks/js/FlexJS/src/org/apache/flex/html/staticControls/beads/DataItemRendererFactoryForArrayData.js +++ b/frameworks/js/FlexJS/src/org/apache/flex/html/staticControls/beads/DataItemRendererFactoryForArrayData.js @@ -69,7 +69,7 @@ org.apache.flex.html.staticControls.beads.DataItemRendererFactoryForArrayData. this.model.addEventListener('dataProviderChanged', goog.bind(this.dataProviderChangedHandler, this)); - if (this.itemRendererFactory_ == null) { + if (org.apache.flex.core.ValuesManager.valuesImpl.getValue && !this.itemRendererFactory_) { var c = org.apache.flex.core.ValuesManager.valuesImpl.getValue(this.strand_,'iItemRendererClassFactory'); this.itemRendererFactory_ = new c; this.strand_.addBead(this.itemRendererFactory_); @@ -85,7 +85,7 @@ org.apache.flex.html.staticControls.beads.DataItemRendererFactoryForArrayData. */ org.apache.flex.html.staticControls.beads.DataItemRendererFactoryForArrayData. prototype.get_itemRendererClass = function() { - if (this.itemRendererClass_ == null) { + if (org.apache.flex.core.ValuesManager.valuesImpl.getValue && !this.itemRendererClass_) { var c = org.apache.flex.core.ValuesManager.valuesImpl.getValue(this.strand_,'iItemRenderer'); if (c) { this.itemRendererClass_ = c;
