This is an automated email from the ASF dual-hosted git repository.
harbs pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/royale-asjs.git
The following commit(s) were added to refs/heads/develop by this push:
new fe370eb missed a few model getters
fe370eb is described below
commit fe370eb9b20c3a2c472d4b27919e6f6fb40d1cdc
Author: Harbs <ha...@in-tools.com>
AuthorDate: Tue Jan 4 11:04:59 2022 +0200
missed a few model getters
---
.../src/main/royale/org/apache/royale/html/BinaryImage.as | 8 ++------
.../royale/org/apache/royale/html/beads/BinaryImageLoader.as | 8 +++-----
.../main/royale/org/apache/royale/core/HTMLElementWrapper.as | 4 ++--
.../src/main/royale/org/apache/royale/core/StrandWithModel.as | 4 ++--
.../src/main/royale/org/apache/royale/core/UIButtonBase.as | 4 ++--
.../main/royale/org/apache/royale/core/UIHTMLElementWrapper.as | 10 ++--------
6 files changed, 13 insertions(+), 25 deletions(-)
diff --git
a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/BinaryImage.as
b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/BinaryImage.as
index d021975..7d6b66f 100644
---
a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/BinaryImage.as
+++
b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/BinaryImage.as
@@ -23,6 +23,7 @@ package org.apache.royale.html
import org.apache.royale.core.ValuesManager;
import org.apache.royale.core.IBinaryImageLoader;
import org.apache.royale.utils.BinaryData;
+ import org.apache.royale.utils.loadBeadFromValuesManager;
/**
@@ -58,12 +59,7 @@ package org.apache.royale.html
*/
override public function addedToParent():void
{
- var c:Class = ValuesManager.valuesImpl.getValue(this,
"iBinaryImageLoader");
- if (c)
- {
- var loader:IBinaryImageLoader = (new c()) as
IBinaryImageLoader;
- addBead(loader);
- }
+
loadBeadFromValuesManager(IBinaryImageLoader,"iBinaryImageLoader",this);
super.addedToParent();
}
diff --git
a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/BinaryImageLoader.as
b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/BinaryImageLoader.as
index f34c651..5f11b74 100644
---
a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/BinaryImageLoader.as
+++
b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/BinaryImageLoader.as
@@ -33,6 +33,7 @@ package org.apache.royale.html.beads
import goog.events;
import org.apache.royale.utils.URLUtils;
import org.apache.royale.core.IBinaryImage;
+ import org.apache.royale.core.IStrandWithModel;
}
@@ -61,17 +62,14 @@ package org.apache.royale.html.beads
private var _objectURL:String;
private var _strand:IStrand;
- private var _model:IBinaryImageModel;
/**
* @royaleignorecoercion org.apache.royale.core.IBinaryImageModel
+ * @royaleignorecoercion org.apache.royale.core.IStrandWithModel
*
*/
private function get model():IBinaryImageModel
{
- if(!_model)
- _model =
loadBeadFromValuesManager(IBinaryImageModel, "iBeadModel", _strand) as
IBinaryImageModel;
-
- return _model;
+ return (_strand as IStrandWithModel).model as
IBinaryImageModel;
}
/**
diff --git
a/frameworks/projects/Core/src/main/royale/org/apache/royale/core/HTMLElementWrapper.as
b/frameworks/projects/Core/src/main/royale/org/apache/royale/core/HTMLElementWrapper.as
index 4eefa8c..694f20a 100644
---
a/frameworks/projects/Core/src/main/royale/org/apache/royale/core/HTMLElementWrapper.as
+++
b/frameworks/projects/Core/src/main/royale/org/apache/royale/core/HTMLElementWrapper.as
@@ -42,6 +42,7 @@ package org.apache.royale.core
import org.apache.royale.utils.loadBeadFromValuesManager;
import org.apache.royale.debugging.assert;
}
+ import org.apache.royale.utils.loadBeadFromValuesManager;
COMPILE::SWF
public class HTMLElementWrapper extends Sprite implements IStrand,
IEventDispatcher
@@ -125,8 +126,7 @@ package org.apache.royale.core
{
if (_model == null)
{
- // addbead will set _model
- addBead(new (ValuesManager.valuesImpl.getValue(this,
"iBeadModel")) as IBead);
+ _model =
loadBeadFromValuesManager(IBeadModel,"iBeadModel",this) as IBeadModel;
}
return _model;
}
diff --git
a/frameworks/projects/Core/src/main/royale/org/apache/royale/core/StrandWithModel.as
b/frameworks/projects/Core/src/main/royale/org/apache/royale/core/StrandWithModel.as
index 9d78d72..6fe69cc 100644
---
a/frameworks/projects/Core/src/main/royale/org/apache/royale/core/StrandWithModel.as
+++
b/frameworks/projects/Core/src/main/royale/org/apache/royale/core/StrandWithModel.as
@@ -21,6 +21,7 @@ package org.apache.royale.core
import org.apache.royale.events.Event;
import org.apache.royale.events.EventDispatcher;
import org.apache.royale.utils.sendStrandEvent;
+ import org.apache.royale.utils.loadBeadFromValuesManager;
/**
* The Strand class is the base class for non-display object
@@ -64,8 +65,7 @@ package org.apache.royale.core
{
if (_model == null)
{
- // addbead will set _model
- addBead(new (ValuesManager.valuesImpl.getValue(this,
"iBeadModel")) as IBead);
+ _model =
loadBeadFromValuesManager(IBeadModel,"iBeadModel",this) as IBeadModel;
}
return _model;
}
diff --git
a/frameworks/projects/Core/src/main/royale/org/apache/royale/core/UIButtonBase.as
b/frameworks/projects/Core/src/main/royale/org/apache/royale/core/UIButtonBase.as
index 51492cf..7620dd5 100644
---
a/frameworks/projects/Core/src/main/royale/org/apache/royale/core/UIButtonBase.as
+++
b/frameworks/projects/Core/src/main/royale/org/apache/royale/core/UIButtonBase.as
@@ -30,6 +30,7 @@ package org.apache.royale.core
import org.apache.royale.events.Event;
import org.apache.royale.events.utils.MouseEventConverter;
import org.apache.royale.events.IEventDispatcher;
+ import org.apache.royale.utils.loadBeadFromValuesManager;
//--------------------------------------
// Events
@@ -563,8 +564,7 @@ package org.apache.royale.core
{
if (_model == null)
{
- // addbead will set _model
- addBead(new (ValuesManager.valuesImpl.getValue(this,
"iBeadModel")) as IBead);
+ _model =
loadBeadFromValuesManager(IBeadModel,"iBeadModel",this) as IBeadModel;
}
return _model;
}
diff --git
a/frameworks/projects/Core/src/main/royale/org/apache/royale/core/UIHTMLElementWrapper.as
b/frameworks/projects/Core/src/main/royale/org/apache/royale/core/UIHTMLElementWrapper.as
index f472df1..ea75424 100644
---
a/frameworks/projects/Core/src/main/royale/org/apache/royale/core/UIHTMLElementWrapper.as
+++
b/frameworks/projects/Core/src/main/royale/org/apache/royale/core/UIHTMLElementWrapper.as
@@ -35,6 +35,7 @@ COMPILE::SWF
import org.apache.royale.events.utils.MouseEventConverter;
import org.apache.royale.events.EventDispatcher;
import org.apache.royale.events.IEventDispatcher;
+ import org.apache.royale.utils.loadBeadFromValuesManager;
//--------------------------------------
// Events
@@ -108,14 +109,7 @@ COMPILE::SWF
{
if (_model == null)
{
- // addbead will set _model
- var m:Class = org.apache.royale.core.ValuesManager.valuesImpl.
- getValue(this, 'iBeadModel') as Class;
- if (m)
- {
- var b:IBeadModel = new m() as IBeadModel;
- addBead(b);
- }
+ _model = loadBeadFromValuesManager(IBeadModel, "iBeadModel",
this) as IBeadModel;
}
return _model;
}
