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 6850c43  Moved IHasLabelField and IHasDataField to Core
6850c43 is described below

commit 6850c432496b485b3e0a9537f8e6aebd1a5549aa
Author: Harbs <[email protected]>
AuthorDate: Sun Dec 19 09:15:13 2021 +0200

    Moved IHasLabelField and IHasDataField to Core
---
 .../royale/org/apache/royale/html/DataContainer.as |   2 +-
 .../royale/org/apache/royale/html/DropDownList.as  |   2 +-
 .../html/beads/models/ArrayListSelectionModel.as   |   2 +-
 .../html/beads/models/ArrayMultiSelectionModel.as  |   2 +-
 .../html/beads/models/ArraySelectionModel.as       |   2 +-
 .../royale/html/beads/models/DataProviderModel.as  |   2 +-
 .../models/MultiSelectionCollectionViewModel.as    |   2 +-
 .../models/SingleSelectionCollectionViewModel.as   |   2 +-
 .../html/beads/models/StringSelectionModel.as      |   2 +-
 .../royale/html/supportClasses/DataGridColumn.as   |   2 +-
 .../royale/html/supportClasses/DataItemRenderer.as |   2 +-
 .../html/supportClasses/GraphicsItemRenderer.as    |   4 +-
 .../html/supportClasses/StyledDataItemRenderer.as  |   2 +-
 .../supportClasses/StyledUIItemRendererBase.as     |   2 +-
 .../html/supportClasses/TextButtonItemRenderer.as  |   2 +-
 .../html/supportClasses/TextFieldItemRenderer.as   |   2 +-
 .../html/supportClasses/UIItemRendererBase.as      |   2 +-
 .../apache/royale/html/util/getLabelFromData.as    |   8 +-
 .../projects/Core/src/main/royale/CoreClasses.as   |   2 +
 .../org/apache/royale/core}/IHasDataField.as       |   6 +-
 .../org/apache/royale/core}/IHasLabelField.as      |   6 +-
 .../inspiretree/InspireTreeBasicControl.as         | 112 ++++++++++-----------
 22 files changed, 88 insertions(+), 82 deletions(-)

diff --git 
a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/DataContainer.as
 
b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/DataContainer.as
index 41b08ee..7c5f7c2 100644
--- 
a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/DataContainer.as
+++ 
b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/DataContainer.as
@@ -47,7 +47,7 @@ package org.apache.royale.html
        import org.apache.royale.html.beads.models.ListPresentationModel;
        import org.apache.royale.html.beads.IListView;
        import org.apache.royale.core.IListWithPresentationModel;
-       import org.apache.royale.html.beads.IHasLabelField;
+       import org.apache.royale.core.IHasLabelField;
 
        /**
         *  Indicates that the initialization of the list is complete.
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 90ca0cc..71d6276 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,7 +19,7 @@
 package org.apache.royale.html
 {
     import org.apache.royale.core.ISelectionModel;
-    import org.apache.royale.html.beads.IHasLabelField;
+    import org.apache.royale.core.IHasLabelField;
 
     COMPILE::JS
     {
diff --git 
a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/models/ArrayListSelectionModel.as
 
b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/models/ArrayListSelectionModel.as
index 4d6446e..987e5e8 100644
--- 
a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/models/ArrayListSelectionModel.as
+++ 
b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/models/ArrayListSelectionModel.as
@@ -23,7 +23,7 @@ package org.apache.royale.html.beads.models
        import org.apache.royale.core.ISelectionModel;
        import org.apache.royale.events.Event;
        import org.apache.royale.core.DispatcherBead;
-       import org.apache.royale.html.beads.IHasLabelField;
+       import org.apache.royale.core.IHasLabelField;
 
        /**
         *  The ArrayListSelectionModel class is a selection model for
diff --git 
a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/models/ArrayMultiSelectionModel.as
 
b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/models/ArrayMultiSelectionModel.as
index df18585..964471f 100644
--- 
a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/models/ArrayMultiSelectionModel.as
+++ 
b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/models/ArrayMultiSelectionModel.as
@@ -23,7 +23,7 @@ package org.apache.royale.html.beads.models
        import org.apache.royale.core.IStrand;
        import org.apache.royale.events.Event;
        import org.apache.royale.events.EventDispatcher;
-       import org.apache.royale.html.beads.IHasLabelField;
+       import org.apache.royale.core.IHasLabelField;
                        
        /**
         *  The ArrayMultiSelectionModel class is a selection model for
diff --git 
a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/models/ArraySelectionModel.as
 
b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/models/ArraySelectionModel.as
index 7076d52..d0ed122 100644
--- 
a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/models/ArraySelectionModel.as
+++ 
b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/models/ArraySelectionModel.as
@@ -22,7 +22,7 @@ package org.apache.royale.html.beads.models
        import org.apache.royale.core.IRollOverModel;
        import org.apache.royale.core.ISelectionModel;
        import org.apache.royale.events.Event;
-       import org.apache.royale.html.beads.IHasLabelField;
+       import org.apache.royale.core.IHasLabelField;
                        
     /**
      *  The ArraySelectionModel class is a selection model for
diff --git 
a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/models/DataProviderModel.as
 
b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/models/DataProviderModel.as
index db8e37a..40ac284 100644
--- 
a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/models/DataProviderModel.as
+++ 
b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/models/DataProviderModel.as
@@ -21,7 +21,7 @@ package org.apache.royale.html.beads.models
        import org.apache.royale.core.DispatcherBead;
        import org.apache.royale.core.IDataProviderModel;
        import org.apache.royale.events.Event;
-       import org.apache.royale.html.beads.IHasLabelField;
+       import org.apache.royale.core.IHasLabelField;
                        
     /**
      *  The DataProviderModel class is a model for
diff --git 
a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/models/MultiSelectionCollectionViewModel.as
 
b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/models/MultiSelectionCollectionViewModel.as
index e613426..58a13d4 100644
--- 
a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/models/MultiSelectionCollectionViewModel.as
+++ 
b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/models/MultiSelectionCollectionViewModel.as
@@ -23,7 +23,7 @@ package org.apache.royale.html.beads.models
        import org.apache.royale.core.IMultiSelectionModel;
        import org.apache.royale.core.IRollOverModel;
        import org.apache.royale.events.Event;
-       import org.apache.royale.html.beads.IHasLabelField;
+       import org.apache.royale.core.IHasLabelField;
 
     /**
      *  The MultiSelectionCollectionViewModel class is a selection model for
diff --git 
a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/models/SingleSelectionCollectionViewModel.as
 
b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/models/SingleSelectionCollectionViewModel.as
index 7996c9d..6b0541b 100644
--- 
a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/models/SingleSelectionCollectionViewModel.as
+++ 
b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/models/SingleSelectionCollectionViewModel.as
@@ -23,7 +23,7 @@ package org.apache.royale.html.beads.models
        import org.apache.royale.core.IRollOverModel;
        import org.apache.royale.core.ISelectionModel;
        import org.apache.royale.events.Event;
-       import org.apache.royale.html.beads.IHasLabelField;
+       import org.apache.royale.core.IHasLabelField;
 
     /**
      *  The SingleSelectionCollectionViewModel class is a selection model for
diff --git 
a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/models/StringSelectionModel.as
 
b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/models/StringSelectionModel.as
index 46f0c6a..c3bb598 100644
--- 
a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/models/StringSelectionModel.as
+++ 
b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/models/StringSelectionModel.as
@@ -23,7 +23,7 @@ package org.apache.royale.html.beads.models
        import org.apache.royale.core.IStrand;
        import org.apache.royale.events.Event;
        import org.apache.royale.events.EventDispatcher;
-       import org.apache.royale.html.beads.IHasLabelField;
+       import org.apache.royale.core.IHasLabelField;
                
     /**
      *  The StringSelectionModel class is a selection model for
diff --git 
a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/supportClasses/DataGridColumn.as
 
b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/supportClasses/DataGridColumn.as
index e00671c..01f8c1a 100644
--- 
a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/supportClasses/DataGridColumn.as
+++ 
b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/supportClasses/DataGridColumn.as
@@ -22,7 +22,7 @@ package org.apache.royale.html.supportClasses
        import org.apache.royale.core.IUIBase;
        import org.apache.royale.events.EventDispatcher;
        import org.apache.royale.html.List;
-       import org.apache.royale.html.beads.IHasDataField;
+       import org.apache.royale.core.IHasDataField;
 
        /**
         *  The DataGridColumn class is the collection of properties that 
describe
diff --git 
a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/supportClasses/DataItemRenderer.as
 
b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/supportClasses/DataItemRenderer.as
index d46d683..02890b1 100644
--- 
a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/supportClasses/DataItemRenderer.as
+++ 
b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/supportClasses/DataItemRenderer.as
@@ -29,7 +29,7 @@ package org.apache.royale.html.supportClasses
                import org.apache.royale.core.IBeadController;
        }
        import org.apache.royale.core.ValuesManager;
-       import org.apache.royale.html.beads.IHasDataField;
+       import org.apache.royale.core.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/GraphicsItemRenderer.as
 
b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/supportClasses/GraphicsItemRenderer.as
index 0652c42..614397e 100644
--- 
a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/supportClasses/GraphicsItemRenderer.as
+++ 
b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/supportClasses/GraphicsItemRenderer.as
@@ -26,8 +26,8 @@ package org.apache.royale.html.supportClasses
        import org.apache.royale.svg.CompoundGraphic;
        import org.apache.royale.utils.loadBeadFromValuesManager;
     import org.apache.royale.utils.MXMLDataInterpreter;
-    import org.apache.royale.html.beads.IHasDataField;
-    import org.apache.royale.html.beads.IHasLabelField;
+    import org.apache.royale.core.IHasDataField;
+    import org.apache.royale.core.IHasLabelField;
        
        /**
         *  The GraphicsItemRenderer provides a base class for itemRenderers 
that use graphics rather than
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 415ecc7..db4bdd7 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
@@ -28,7 +28,7 @@ package org.apache.royale.html.supportClasses
                import org.apache.royale.html.util.addElementToWrapper;
                import org.apache.royale.core.IBeadController;
        }
-       import org.apache.royale.html.beads.IHasDataField;
+       import org.apache.royale.core.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/StyledUIItemRendererBase.as
 
b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/supportClasses/StyledUIItemRendererBase.as
index 55ddff6..9f463ed 100644
--- 
a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/supportClasses/StyledUIItemRendererBase.as
+++ 
b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/supportClasses/StyledUIItemRendererBase.as
@@ -23,7 +23,7 @@ package org.apache.royale.html.supportClasses
        import org.apache.royale.events.Event;
        import org.apache.royale.utils.MXMLDataInterpreter;
        import org.apache.royale.core.ILabelFieldItemRenderer;
-       import org.apache.royale.html.beads.IHasLabelField;
+       import org.apache.royale.core.IHasLabelField;
                
        [DefaultProperty("mxmlContent")]
 
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 fc47482..1c31540 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,7 +28,7 @@ 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;
+       import org.apache.royale.core.IHasLabelField;
 
        COMPILE::JS
        {
diff --git 
a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/supportClasses/TextFieldItemRenderer.as
 
b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/supportClasses/TextFieldItemRenderer.as
index db7ce68..5efc71f 100644
--- 
a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/supportClasses/TextFieldItemRenderer.as
+++ 
b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/supportClasses/TextFieldItemRenderer.as
@@ -40,7 +40,7 @@ package org.apache.royale.html.supportClasses
     import org.apache.royale.geom.Rectangle;
     import org.apache.royale.html.beads.ITextItemRenderer;
        import org.apache.royale.utils.loadBeadFromValuesManager;
-       import org.apache.royale.html.beads.IHasLabelField;
+       import org.apache.royale.core.IHasLabelField;
        
        /**
         *  The TextFieldItemRenderer class provides a 
org.apache.royale.html.TextField as an itemRenderer.
diff --git 
a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/supportClasses/UIItemRendererBase.as
 
b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/supportClasses/UIItemRendererBase.as
index b82b75f..617591e 100644
--- 
a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/supportClasses/UIItemRendererBase.as
+++ 
b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/supportClasses/UIItemRendererBase.as
@@ -23,7 +23,7 @@ package org.apache.royale.html.supportClasses
        import org.apache.royale.events.Event;
        import org.apache.royale.utils.MXMLDataInterpreter;
        import org.apache.royale.core.ILabelFieldItemRenderer;
-       import org.apache.royale.html.beads.IHasLabelField;
+       import org.apache.royale.core.IHasLabelField;
                
        [DefaultProperty("mxmlContent")]
 
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 e3923b2..f8613a5 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,16 +19,16 @@
 package org.apache.royale.html.util
 {
 
-    import org.apache.royale.html.beads.IHasLabelField;
-    import org.apache.royale.html.beads.IHasDataField;
+    import org.apache.royale.core.IHasLabelField;
+    import org.apache.royale.core.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
+     *  @royaleignorecoercion org.apache.royale.core.IHasLabelField
+     *  @royaleignorecoercion org.apache.royale.core.IHasDataField
      * Utility function to get a label string from a value object
      */
     public function getLabelFromData(obj:Object,data:Object):String
diff --git a/frameworks/projects/Core/src/main/royale/CoreClasses.as 
b/frameworks/projects/Core/src/main/royale/CoreClasses.as
index 21593fd..488d788 100644
--- a/frameworks/projects/Core/src/main/royale/CoreClasses.as
+++ b/frameworks/projects/Core/src/main/royale/CoreClasses.as
@@ -290,6 +290,8 @@ internal class CoreClasses
        import org.apache.royale.core.IDataGridHeader; IDataGridHeader;
        import org.apache.royale.core.IDataGridPresentationModel; 
IDataGridPresentationModel;
        import org.apache.royale.core.IDateChooserModelWithChangeCheck; 
IDateChooserModelWithChangeCheck;
+       import org.apache.royale.core.IHasDataField; IHasDataField;
+       import org.apache.royale.core.IHasLabelField; IHasLabelField;
        import org.apache.royale.core.ParentDocumentBead; ParentDocumentBead;
        import org.apache.royale.core.ItemRendererOwnerViewBead; 
ItemRendererOwnerViewBead;
        import org.apache.royale.core.TransformBeadBase; TransformBeadBase;
diff --git 
a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/IHasDataField.as
 
b/frameworks/projects/Core/src/main/royale/org/apache/royale/core/IHasDataField.as
similarity index 93%
rename from 
frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/IHasDataField.as
rename to 
frameworks/projects/Core/src/main/royale/org/apache/royale/core/IHasDataField.as
index a8de2ba..19d6ca4 100644
--- 
a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/IHasDataField.as
+++ 
b/frameworks/projects/Core/src/main/royale/org/apache/royale/core/IHasDataField.as
@@ -16,10 +16,12 @@
 //  limitations under the License.
 //
 
////////////////////////////////////////////////////////////////////////////////
-package org.apache.royale.html.beads
+package org.apache.royale.core
 {
        public interface IHasDataField
        {
-               function get dataField():String;
+               {
+                       function get dataField():String;
+               }
        }
 }
\ No newline at end of file
diff --git 
a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/IHasLabelField.as
 
b/frameworks/projects/Core/src/main/royale/org/apache/royale/core/IHasLabelField.as
similarity index 92%
rename from 
frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/IHasLabelField.as
rename to 
frameworks/projects/Core/src/main/royale/org/apache/royale/core/IHasLabelField.as
index 190109b..16c25bf 100644
--- 
a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/IHasLabelField.as
+++ 
b/frameworks/projects/Core/src/main/royale/org/apache/royale/core/IHasLabelField.as
@@ -16,10 +16,12 @@
 //  limitations under the License.
 //
 
////////////////////////////////////////////////////////////////////////////////
-package org.apache.royale.html.beads
+package org.apache.royale.core
 {
        public interface IHasLabelField
        {
-               function get labelField():String;
+               {
+                       function get labelField():String;
+               }
        }
 }
\ No newline at end of file
diff --git 
a/frameworks/projects/ExternsJS/src/main/royale/org/apache/royale/externsjs/inspiretree/InspireTreeBasicControl.as
 
b/frameworks/projects/ExternsJS/src/main/royale/org/apache/royale/externsjs/inspiretree/InspireTreeBasicControl.as
index 3e7a079..03c2a2e 100644
--- 
a/frameworks/projects/ExternsJS/src/main/royale/org/apache/royale/externsjs/inspiretree/InspireTreeBasicControl.as
+++ 
b/frameworks/projects/ExternsJS/src/main/royale/org/apache/royale/externsjs/inspiretree/InspireTreeBasicControl.as
@@ -18,34 +18,35 @@
 
////////////////////////////////////////////////////////////////////////////////
 package org.apache.royale.externsjs.inspiretree
 {
-    COMPILE::SWF {
-    import flash.events.Event;
-    }
+       COMPILE::SWF {
+       import flash.events.Event;
+       }
 
        COMPILE::JS
        {
                import org.apache.royale.externsjs.inspiretree.InspireTree;
                import org.apache.royale.externsjs.inspiretree.InspireTreeDOM;
-       import org.apache.royale.core.IDataProviderModel;
-       import org.apache.royale.core.ISelectionModel;
+               import org.apache.royale.core.IDataProviderModel;
+               import org.apache.royale.core.ISelectionModel;
                import org.apache.royale.core.StyledUIBase;
-        import org.apache.royale.core.WrappedHTMLElement;
-       import org.apache.royale.events.Event;
-        import org.apache.royale.html.util.addElementToWrapper;
-       import 
org.apache.royale.externsjs.inspiretree.beads.models.InspireTreeModel;
-       import org.apache.royale.externsjs.inspiretree.vos.ItemTreeNode;
-       import org.apache.royale.core.StyledUIBase;
+               import org.apache.royale.core.WrappedHTMLElement;
+               import org.apache.royale.events.Event;
+               import org.apache.royale.html.util.addElementToWrapper;
+               import 
org.apache.royale.externsjs.inspiretree.beads.models.InspireTreeModel;
+               import org.apache.royale.externsjs.inspiretree.vos.ItemTreeNode;
        }
-    /**
-     *  It triggers just before launching the creation.  
+       import org.apache.royale.core.IHasLabelField;
+
+       /**
+        *  It triggers just before launching the creation.  
         * 
         *  It can be captured to make adjustments before creating the js 
instance.
         *  (See InspireTreePaginateBead)
-     */
+        */
        [Event(name="onBeforeCreation", type="org.apache.royale.events.Event")]
-    /**
-     *  Indicates that the creation is complete.  
-     */
+       /**
+        *  Indicates that the creation is complete.  
+        */
        [Event(name="onCreationComplete", 
type="org.apache.royale.events.Event")]
        /*
 
@@ -53,31 +54,31 @@ package org.apache.royale.externsjs.inspiretree
        [Event(name="onPrepareTreeDataComplete", 
type="org.apache.royale.events.Event")]
 
        COMPILE::JS
-       public class InspireTreeBasicControl extends StyledUIBase implements 
IInspireTree
+       public class InspireTreeBasicControl extends StyledUIBase implements 
IInspireTree, IHasLabelField
        {
                /**
                 * @royaleignorecoercion 
org.apache.royale.core.WrappedHTMLElement
                 * @royaleignorecoercion 
org.apache.royale.html.util.addElementToWrapper
-         */
-        override protected function createElement():WrappedHTMLElement
-        {
+                */
+               override protected function createElement():WrappedHTMLElement
+               {
                        addElementToWrapper(this, 'div');
-            return element;
-        }
-        /**
-         *  Constructor.
-         */
+                       return element;
+               }
+               /**
+                *  Constructor.
+                */
                public function InspireTreeBasicControl()
                {
                        super();                        
                        //typeNames = "inspiretree";
-            addEventListener("beadsAdded", beadsAddedHandler);
-        }
+                       addEventListener("beadsAdded", beadsAddedHandler);
+               }
 
-        private function beadsAddedHandler(event:Event):void
-        {
+               private function beadsAddedHandler(event:Event):void
+               {
                        removeEventListener("beadsAdded", beadsAddedHandler);
-        }
+               }
 
                override public function addedToParent():void
                {
@@ -96,7 +97,7 @@ package org.apache.royale.externsjs.inspiretree
                public function set uid(value:String):void{ _uid = value; }
 
                private var _initialized:Boolean = false;
-        public function isInitialized():Boolean { return _initialized ? 
true:false;};
+               public function isInitialized():Boolean { return _initialized ? 
true:false;};
 
                private var _jsTree:InspireTree;
                public function get jsTree():InspireTree{ return _jsTree; }
@@ -107,7 +108,7 @@ package org.apache.royale.externsjs.inspiretree
 
                // Init ---------------------------------------- Data 
configuration [wip] -------------------------------------------------
 
-        [Bindable("labelFieldChanged")]
+               [Bindable("labelFieldChanged")]
                public function get labelField():String
                {
                        return IDataProviderModel(model).labelField;
@@ -117,7 +118,7 @@ package org.apache.royale.externsjs.inspiretree
                 */
                public function set labelField(value:String):void
                {
-            IDataProviderModel(model).labelField = value;
+                       IDataProviderModel(model).labelField = value;
                }
 
                /**
@@ -131,7 +132,7 @@ package org.apache.royale.externsjs.inspiretree
                public function get boundField():String { return 
InspireTreeModel(model).boundField; }
                public function set boundField(value:String):void{ 
InspireTreeModel(model).boundField = value; }
 
-        [Bindable("dataProviderChanged")]
+               [Bindable("dataProviderChanged")]
                public function get dataProvider():Object
                {
                        return IDataProviderModel(model).dataProvider;
@@ -145,7 +146,7 @@ package org.apache.royale.externsjs.inspiretree
                        updateDataViewTree();            
                }
 
-        [Bindable("selectionChanged")]
+               [Bindable("selectionChanged")]
                public function get selectedIndex():int
                {
                        return ISelectionModel(model).selectedIndex;
@@ -158,7 +159,7 @@ package org.apache.royale.externsjs.inspiretree
                        ISelectionModel(model).selectedIndex = value;
                }
 
-        [Bindable("selectionChanged")]
+               [Bindable("selectionChanged")]
                public function get selectedItem():Object
                {
                        return ISelectionModel(model).selectedItem;
@@ -168,7 +169,7 @@ package org.apache.royale.externsjs.inspiretree
                        ISelectionModel(model).selectedItem = value;
                }
 
-        //[Bindable("allowDragAndDropChanged")]
+               //[Bindable("allowDragAndDropChanged")]
                /**
                 * Allow Drag and Drop
                 */
@@ -183,23 +184,23 @@ package org.apache.royale.externsjs.inspiretree
                /**
                 * Function to obtain the description of the parent nodes.
                 * <p>The <code>labelFunctionParent</code> property takes a 
reference to a function. 
-        * The function takes a single argument which is the item in the data 
provider and returns a String:</p>
-        * 
-                *  <pre>myLabelFunction(item:Object):String</pre>
-        * 
-        *  @param item The data item. Null items return the empty string. 
-                */
+                * The function takes a single argument which is the item in 
the data provider and returns a String:</p>
+                       * 
+                       *  <pre>myLabelFunction(item:Object):String</pre>
+                       * 
+                       *  @param item The data item. Null items return the 
empty string. 
+                       */
                public function get labelFunctionParent():Function{ return 
InspireTreeModel(model).labelFunctionParent; }
                public function set labelFunctionParent(value:Function):void{ 
InspireTreeModel(model).labelFunctionParent = value; }
                /**
                 * Function to obtain the description of the parent nodes.
                 * <p>The <code>labelFunctionChild</code> property takes a 
reference to a function. 
-        * The function takes a single argument which is the item in the data 
provider and returns a String:</p>
-        * 
-                *  <pre>myLabelFunction(item:Object):String</pre>
-        * 
-        *  @param item The data item. Null items return the empty string. 
-                */
+                * The function takes a single argument which is the item in 
the data provider and returns a String:</p>
+                       * 
+                       *  <pre>myLabelFunction(item:Object):String</pre>
+                       * 
+                       *  @param item The data item. Null items return the 
empty string. 
+                       */
                public function get labelFunctionChild():Function { return 
InspireTreeModel(model).labelFunctionChild; }
                public function set labelFunctionChild(value:Function):void{ 
InspireTreeModel(model).labelFunctionChild = value; }
 
@@ -208,7 +209,7 @@ package org.apache.royale.externsjs.inspiretree
                        // The dpArray should be sorted according to the 
desired display
                        var localdataProviderTree:Array = new Array();
                        for (var idxGen:int=0; idxGen < dpArray.length; 
idxGen++)
-               {
+                       {
                                var itemGroup:Object = new ItemTreeNode();
                                itemGroup.text = 
labelFunctionParent(dpArray[idxGen]);
 
@@ -241,18 +242,18 @@ package org.apache.royale.externsjs.inspiretree
 
                
                public function updateDataViewTree():void
-        { 
+               { 
                        if(!_initialized)
                                return;
 
                        jsTree.reload();
-        }
+               }
                /**
                 * Recreate the InspireTree instance with the current options.
                 */
                public function reCreateViewTree(onlyView:Boolean=false):void
                {                       
-            dispatchEvent(new Event("onBeforeCreation"));
+                       dispatchEvent(new Event("onBeforeCreation"));
 
                        //if(!onlyView || !jsTree)
                                jsTree = new 
InspireTree(InspireTreeModel(model).configOption);
@@ -261,7 +262,7 @@ package org.apache.royale.externsjs.inspiretree
 
                        uid = element.getAttribute('data-uid');
                        trace(uid);
-            dispatchEvent(new Event("onCreationComplete"));
+                       dispatchEvent(new Event("onCreationComplete"));
                }
                
        }       
@@ -273,5 +274,4 @@ package org.apache.royale.externsjs.inspiretree
                {
                }
        }
-       
 }
\ No newline at end of file

Reply via email to