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
commit b5958488ccd2d8db321f935b894bced967dba7d1 Author: Harbs <[email protected]> AuthorDate: Sun Dec 19 08:56:59 2021 +0200 Fixed imports --- .../Basic/src/main/royale/org/apache/royale/html/DropDownList.as | 2 +- .../apache/royale/html/supportClasses/StyledDataItemRenderer.as | 4 ++-- .../apache/royale/html/supportClasses/TextButtonItemRenderer.as | 2 +- .../main/royale/org/apache/royale/html/util/getLabelFromData.as | 9 +++++++-- 4 files changed, 11 insertions(+), 6 deletions(-) diff --git a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/DropDownList.as b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/DropDownList.as index b14c1b4..90ca0cc 100644 --- a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/DropDownList.as +++ b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/DropDownList.as @@ -19,6 +19,7 @@ package org.apache.royale.html { import org.apache.royale.core.ISelectionModel; + import org.apache.royale.html.beads.IHasLabelField; COMPILE::JS { @@ -26,7 +27,6 @@ package org.apache.royale.html import org.apache.royale.core.WrappedHTMLElement; import org.apache.royale.html.beads.models.ArraySelectionModel; import org.apache.royale.html.util.addElementToWrapper; - import org.apache.royale.html.beads.IHasLabelField; } //-------------------------------------- diff --git a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/supportClasses/StyledDataItemRenderer.as b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/supportClasses/StyledDataItemRenderer.as index 01afc08..415ecc7 100644 --- a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/supportClasses/StyledDataItemRenderer.as +++ b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/supportClasses/StyledDataItemRenderer.as @@ -25,10 +25,10 @@ package org.apache.royale.html.supportClasses COMPILE::JS { import org.apache.royale.core.WrappedHTMLElement; - import org.apache.royale.html.util.addElementToWrapper; + import org.apache.royale.html.util.addElementToWrapper; import org.apache.royale.core.IBeadController; - import org.apache.royale.html.beads.IHasDataField; } + import org.apache.royale.html.beads.IHasDataField; /** * The DataItemRenderer class is the base class for most itemRenderers. This class diff --git a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/supportClasses/TextButtonItemRenderer.as b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/supportClasses/TextButtonItemRenderer.as index 03abebc..fc47482 100644 --- a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/supportClasses/TextButtonItemRenderer.as +++ b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/supportClasses/TextButtonItemRenderer.as @@ -28,11 +28,11 @@ package org.apache.royale.html.supportClasses import org.apache.royale.html.beads.ITextItemRenderer; import org.apache.royale.events.ItemClickedEvent; import org.apache.royale.html.util.getLabelFromData; + import org.apache.royale.html.beads.IHasLabelField; COMPILE::JS { import org.apache.royale.core.WrappedHTMLElement; - import org.apache.royale.html.beads.IHasLabelField; } /** diff --git a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/util/getLabelFromData.as b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/util/getLabelFromData.as index f5853b4..e3923b2 100644 --- a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/util/getLabelFromData.as +++ b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/util/getLabelFromData.as @@ -19,11 +19,16 @@ package org.apache.royale.html.util { + import org.apache.royale.html.beads.IHasLabelField; + import org.apache.royale.html.beads.IHasDataField; + /** * @langversion 3.0 * @playerversion Flash 10.2 * @playerversion AIR 2.6 * @productversion Royale 0.9.3 + * @royaleignorecoercion org.apache.royale.html.beads.IHasLabelField + * @royaleignorecoercion org.apache.royale.html.beads.IHasDataField * Utility function to get a label string from a value object */ public function getLabelFromData(obj:Object,data:Object):String @@ -32,8 +37,8 @@ package org.apache.royale.html.util if (data is String) return "" + data; if(!data) return ""; - if (obj["labelField"]) return "" + data[obj["labelField"]]; - if (obj["dataField"]) return "" + data[obj["dataField"]]; + if (obj is IHasLabelField && (obj as IHasLabelField).labelField && data[(obj as IHasLabelField).labelField] != null) return "" + data[(obj as IHasLabelField).labelField]; + if (obj is IHasDataField && (obj as IHasDataField).dataField && data[(obj as IHasDataField).dataField] != null) return "" + data[(obj as IHasDataField).dataField]; var label:String = data["label"]; if(label != null){ return label;
