This is an automated email from the ASF dual-hosted git repository.

hiedra 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 8dfae0d317 [jewel/InterfaceInputButton] New Jewel IInputAndButtonView 
interface for the views of controls composed by a textinput and a button. 
(#1197)
8dfae0d317 is described below

commit 8dfae0d317586b7239f4a5c628dcff7993e1749f
Author: Hiedra <[email protected]>
AuthorDate: Wed May 18 11:34:31 2022 +0200

    [jewel/InterfaceInputButton] New Jewel IInputAndButtonView interface for 
the views of controls composed by a textinput and a button. (#1197)
    
    Implemented in Jewel ComboBox and Jewel DateField.
    
    New generic "Disabled" and "ReadOnly" beads for controls implementing the 
IInputAndButtonView interface.
    
    For compatibility, temporarily, they have been kept:
    - ComboBoxDisabled, ComboBoxReadOnly and DateFieldDisabled beads.
    - The previous properties "textInput" ('I' uppercase) and menuButton in the 
DateFieldView bead.
---
 .../Jewel/src/main/resources/jewel-manifest.xml    |  2 +
 .../projects/Jewel/src/main/royale/JewelClasses.as |  1 +
 ...isabled.as => InputAndButtonControlDisabled.as} | 13 +++---
 ...eadOnly.as => InputAndButtonControlReadOnly.as} | 15 +++----
 .../beads/controls/combobox/ComboBoxDisabled.as    | 49 +--------------------
 .../beads/controls/combobox/ComboBoxReadOnly.as    | 51 ++--------------------
 .../jewel/beads/controls/combobox/IComboBoxView.as | 26 ++---------
 .../beads/controls/datefield/DateFieldDisabled.as  | 49 +--------------------
 .../royale/jewel/beads/views/DateFieldView.as      | 22 ++++++++--
 .../IInputAndButtonView.as}                        | 33 +++-----------
 10 files changed, 50 insertions(+), 211 deletions(-)

diff --git a/frameworks/projects/Jewel/src/main/resources/jewel-manifest.xml 
b/frameworks/projects/Jewel/src/main/resources/jewel-manifest.xml
index 5b72817994..a9970df233 100644
--- a/frameworks/projects/Jewel/src/main/resources/jewel-manifest.xml
+++ b/frameworks/projects/Jewel/src/main/resources/jewel-manifest.xml
@@ -185,11 +185,13 @@
     <component id="BadgeWithMouseClick" 
class="org.apache.royale.jewel.beads.controls.BadgeWithMouseClick"/>
     <component id="ToolTip" 
class="org.apache.royale.jewel.beads.controls.ToolTip"/>
     <component id="Disabled" 
class="org.apache.royale.jewel.beads.controls.Disabled"/>
+    <component id="InputAndButtonControlDisabled" 
class="org.apache.royale.jewel.beads.controls.InputAndButtonControlDisabled"/>
     <component id="SizeControl" 
class="org.apache.royale.jewel.beads.controls.SizeControl"/>
     <component id="ResponsiveSize" 
class="org.apache.royale.jewel.beads.controls.ResponsiveSize"/>
     <component id="TextAlign" 
class="org.apache.royale.jewel.beads.controls.TextAlign"/>
     <component id="ResponsiveVisibility" 
class="org.apache.royale.jewel.beads.layouts.ResponsiveVisibility"/>
     <component id="ReadOnly" 
class="org.apache.royale.jewel.beads.controls.ReadOnly"/>
+    <component id="InputAndButtonControlReadOnly" 
class="org.apache.royale.jewel.beads.controls.InputAndButtonControlReadOnly"/>
 
     <component id="ResponsiveDrawer" 
class="org.apache.royale.jewel.beads.controls.drawer.ResponsiveDrawer"/>
 
diff --git a/frameworks/projects/Jewel/src/main/royale/JewelClasses.as 
b/frameworks/projects/Jewel/src/main/royale/JewelClasses.as
index 125e17f12a..3bcfd45a7f 100644
--- a/frameworks/projects/Jewel/src/main/royale/JewelClasses.as
+++ b/frameworks/projects/Jewel/src/main/royale/JewelClasses.as
@@ -64,6 +64,7 @@ import org.apache.royale.utils.observeElementSize;
         import org.apache.royale.jewel.beads.controllers.WizardController; 
WizardController;
 
         import org.apache.royale.jewel.beads.views.PopUpView; PopUpView;
+        import org.apache.royale.jewel.beads.views.IInputAndButtonView; 
IInputAndButtonView;
         import org.apache.royale.jewel.beads.views.ImageView; ImageView;
         import org.apache.royale.jewel.beads.views.SpinnerView; SpinnerView;
         import org.apache.royale.jewel.beads.views.NumericStepperView; 
NumericStepperView;
diff --git 
a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/controls/combobox/ComboBoxDisabled.as
 
b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/controls/InputAndButtonControlDisabled.as
similarity index 85%
copy from 
frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/controls/combobox/ComboBoxDisabled.as
copy to 
frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/controls/InputAndButtonControlDisabled.as
index ca7fb61a18..2f59342daf 100644
--- 
a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/controls/combobox/ComboBoxDisabled.as
+++ 
b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/controls/InputAndButtonControlDisabled.as
@@ -16,26 +16,27 @@
 //  limitations under the License.
 //
 
////////////////////////////////////////////////////////////////////////////////
-package org.apache.royale.jewel.beads.controls.combobox
+package org.apache.royale.jewel.beads.controls
 {
        COMPILE::JS
        {
        import org.apache.royale.core.HTMLElementWrapper;
        import org.apache.royale.core.UIBase;
-       import org.apache.royale.jewel.beads.views.ComboBoxView;
        }
        import org.apache.royale.core.IUIBase;
        import org.apache.royale.jewel.beads.controls.Disabled;
+    import org.apache.royale.jewel.beads.views.IInputAndButtonView;
        
        /**
-        *  The ComboBoxDisabled bead class is a specialty bead that can be 
used to disable a Jewel ComboBox.
+        *  The InputAndButtonControlDisabled bead class is a generic Disabled 
bead that can be used to disable a 
+        *  Jewel control that implements the IInputAndButtonView interface.
         *  
         *  @langversion 3.0
         *  @playerversion Flash 10.2
         *  @playerversion AIR 2.6
         *  @productversion Royale 0.9.6
         */
-       public class ComboBoxDisabled extends Disabled
+       public class InputAndButtonControlDisabled extends Disabled
        {
                /**
                 *  constructor.
@@ -45,7 +46,7 @@ package org.apache.royale.jewel.beads.controls.combobox
                 *  @playerversion AIR 2.6
                 *  @productversion Royale 0.9.6
                 */
-               public function ComboBoxDisabled()
+               public function InputAndButtonControlDisabled()
                {
                }
 
@@ -58,7 +59,7 @@ package org.apache.royale.jewel.beads.controls.combobox
                {
                        COMPILE::JS
                        {
-                       var view:ComboBoxView = (_strand as UIBase).view as 
ComboBoxView;
+                       var view:IInputAndButtonView = (_strand as UIBase).view 
as IInputAndButtonView;
 
                        if (view) {
                                var pos:HTMLElement = (_strand as 
IUIBase).positioner;
diff --git 
a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/controls/combobox/ComboBoxReadOnly.as
 
b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/controls/InputAndButtonControlReadOnly.as
similarity index 85%
copy from 
frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/controls/combobox/ComboBoxReadOnly.as
copy to 
frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/controls/InputAndButtonControlReadOnly.as
index be54551d85..ed1922f316 100644
--- 
a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/controls/combobox/ComboBoxReadOnly.as
+++ 
b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/controls/InputAndButtonControlReadOnly.as
@@ -16,28 +16,27 @@
 //  limitations under the License.
 //
 
////////////////////////////////////////////////////////////////////////////////
-package org.apache.royale.jewel.beads.controls.combobox
+package org.apache.royale.jewel.beads.controls
 {
        COMPILE::JS
        {
        import org.apache.royale.core.HTMLElementWrapper;
        import org.apache.royale.core.UIBase;
-       import org.apache.royale.jewel.beads.views.ComboBoxView;
+    import org.apache.royale.jewel.beads.views.IInputAndButtonView;
        }
        import org.apache.royale.core.IUIBase;
        import org.apache.royale.jewel.beads.controls.ReadOnly;
        
        /**
-        *  The ComboBoxReadOnly bead class is a specialty ReadOnly bead that 
can be used to lock a Jewel ComboBox.
-        *  
-        *  Based on the ComboBoxDisabled bead for the Jewel ComboBox control.
+        *  The InputAndButtonControlReadOnly bead class is a generic ReadOnly 
bead that can be used to lock a 
+        *  Jewel control that implements the IInputAndButtonView interface.
         * 
         *  @langversion 3.0
         *  @playerversion Flash 10.2
         *  @playerversion AIR 2.6
         *  @productversion Royale 0.9.6
         */
-       public class ComboBoxReadOnly extends ReadOnly
+       public class InputAndButtonControlReadOnly extends ReadOnly
        {
                /**
                 *  constructor.
@@ -47,7 +46,7 @@ package org.apache.royale.jewel.beads.controls.combobox
                 *  @playerversion AIR 2.6
                 *  @productversion Royale 0.9.9
                 */
-               public function ComboBoxReadOnly()
+               public function InputAndButtonControlReadOnly()
                {
                }
 
@@ -60,7 +59,7 @@ package org.apache.royale.jewel.beads.controls.combobox
                {
                        COMPILE::JS
                        {
-                       var view:ComboBoxView = (_strand as UIBase).view as 
ComboBoxView;
+                       var view:IInputAndButtonView = (_strand as UIBase).view 
as IInputAndButtonView;
 
                        if (view) {
                                var pos:HTMLElement = (_strand as 
IUIBase).positioner;
diff --git 
a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/controls/combobox/ComboBoxDisabled.as
 
b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/controls/combobox/ComboBoxDisabled.as
index ca7fb61a18..4fa08cedc4 100644
--- 
a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/controls/combobox/ComboBoxDisabled.as
+++ 
b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/controls/combobox/ComboBoxDisabled.as
@@ -18,14 +18,7 @@
 
////////////////////////////////////////////////////////////////////////////////
 package org.apache.royale.jewel.beads.controls.combobox
 {
-       COMPILE::JS
-       {
-       import org.apache.royale.core.HTMLElementWrapper;
-       import org.apache.royale.core.UIBase;
-       import org.apache.royale.jewel.beads.views.ComboBoxView;
-       }
-       import org.apache.royale.core.IUIBase;
-       import org.apache.royale.jewel.beads.controls.Disabled;
+       import 
org.apache.royale.jewel.beads.controls.InputAndButtonControlDisabled;
        
        /**
         *  The ComboBoxDisabled bead class is a specialty bead that can be 
used to disable a Jewel ComboBox.
@@ -35,7 +28,7 @@ package org.apache.royale.jewel.beads.controls.combobox
         *  @playerversion AIR 2.6
         *  @productversion Royale 0.9.6
         */
-       public class ComboBoxDisabled extends Disabled
+       public class ComboBoxDisabled extends InputAndButtonControlDisabled
        {
                /**
                 *  constructor.
@@ -49,43 +42,5 @@ package org.apache.royale.jewel.beads.controls.combobox
                {
                }
 
-               COMPILE::JS
-               protected var lastTextInputElementTabVal:String = null;
-               COMPILE::JS
-               protected var lastButtonElementTabVal:String = null;
-
-               override protected function updateHost():void
-               {
-                       COMPILE::JS
-                       {
-                       var view:ComboBoxView = (_strand as UIBase).view as 
ComboBoxView;
-
-                       if (view) {
-                               var pos:HTMLElement = (_strand as 
IUIBase).positioner;
-                               
-                               if(!initialized)
-                               {
-                                       initialized = true;
-                                       lastElementTabVal = (_strand as 
HTMLElementWrapper).element.getAttribute("tabindex");
-                                       lastTextInputElementTabVal = 
view.textinput.element.getAttribute("tabindex");
-                                       lastButtonElementTabVal = 
view.button.element.getAttribute("tabindex");
-                               }
-                               
-                if(disabled) {
-                                       setDisableAndTabIndex(pos, true);
-                                       
setDisableAndTabIndex(view.textinput.positioner, true);
-                                       
setDisableAndTabIndex(view.textinput.element);
-                                       
setDisableAndTabIndex(view.button.positioner, true);
-                                       
setDisableAndTabIndex(view.button.element);
-                               } else {
-                                       removeDisableAndTabIndex(pos, true);
-                                       
removeDisableAndTabIndex(view.textinput.positioner, true);
-                                       
removeDisableAndTabIndex(view.textinput.element, false, 
lastTextInputElementTabVal);
-                                       
removeDisableAndTabIndex(view.button.positioner, true);
-                                       
removeDisableAndTabIndex(view.button.element, false, lastButtonElementTabVal);
-                               }
-            }
-                       }
-               }
        }
 }
diff --git 
a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/controls/combobox/ComboBoxReadOnly.as
 
b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/controls/combobox/ComboBoxReadOnly.as
index be54551d85..6b6f295e97 100644
--- 
a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/controls/combobox/ComboBoxReadOnly.as
+++ 
b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/controls/combobox/ComboBoxReadOnly.as
@@ -18,14 +18,7 @@
 
////////////////////////////////////////////////////////////////////////////////
 package org.apache.royale.jewel.beads.controls.combobox
 {
-       COMPILE::JS
-       {
-       import org.apache.royale.core.HTMLElementWrapper;
-       import org.apache.royale.core.UIBase;
-       import org.apache.royale.jewel.beads.views.ComboBoxView;
-       }
-       import org.apache.royale.core.IUIBase;
-       import org.apache.royale.jewel.beads.controls.ReadOnly;
+       import 
org.apache.royale.jewel.beads.controls.InputAndButtonControlReadOnly;
        
        /**
         *  The ComboBoxReadOnly bead class is a specialty ReadOnly bead that 
can be used to lock a Jewel ComboBox.
@@ -37,7 +30,7 @@ package org.apache.royale.jewel.beads.controls.combobox
         *  @playerversion AIR 2.6
         *  @productversion Royale 0.9.6
         */
-       public class ComboBoxReadOnly extends ReadOnly
+       public class ComboBoxReadOnly extends InputAndButtonControlReadOnly
        {
                /**
                 *  constructor.
@@ -50,44 +43,6 @@ package org.apache.royale.jewel.beads.controls.combobox
                public function ComboBoxReadOnly()
                {
                }
-
-               COMPILE::JS
-               protected var lastTextInputElementTabVal:String = null;
-               COMPILE::JS
-               protected var lastButtonElementTabVal:String = null;
-
-               override protected function updateHost():void
-               {
-                       COMPILE::JS
-                       {
-                       var view:ComboBoxView = (_strand as UIBase).view as 
ComboBoxView;
-
-                       if (view) {
-                               var pos:HTMLElement = (_strand as 
IUIBase).positioner;
-                               
-                               if(!initialized)
-                               {
-                                       initialized = true;
-                                       lastElementTabVal = (_strand as 
HTMLElementWrapper).element.getAttribute("tabindex");
-                                       lastTextInputElementTabVal = 
view.textinput.element.getAttribute("tabindex");
-                                       lastButtonElementTabVal = 
view.button.element.getAttribute("tabindex");
-                               }
-                               
-                if(readOnly) {
-                                       setReadOnlyAndTabIndex(pos, true);
-                                       
setReadOnlyAndTabIndex(view.textinput.positioner, true);
-                                       
setReadOnlyAndTabIndex(view.textinput.element);
-                                       
setReadOnlyAndTabIndex(view.button.positioner, true);
-                                       
setReadOnlyAndTabIndex(view.button.element);
-                               } else {
-                                       removeReadOnlyAndTabIndex(pos, true);
-                                       
removeReadOnlyAndTabIndex(view.textinput.positioner, true);
-                                       
removeReadOnlyAndTabIndex(view.textinput.element, false, 
lastTextInputElementTabVal);
-                                       
removeReadOnlyAndTabIndex(view.button.positioner, true);
-                                       
removeReadOnlyAndTabIndex(view.button.element, false, lastButtonElementTabVal);
-                               }
-            }
-                       }
-               }
+               
        }
 }
diff --git 
a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/controls/combobox/IComboBoxView.as
 
b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/controls/combobox/IComboBoxView.as
index 9f4f62dfda..5293457590 100644
--- 
a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/controls/combobox/IComboBoxView.as
+++ 
b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/controls/combobox/IComboBoxView.as
@@ -18,7 +18,7 @@
 
////////////////////////////////////////////////////////////////////////////////
 package org.apache.royale.jewel.beads.controls.combobox
 {
-    import org.apache.royale.core.IBeadView;
+    import org.apache.royale.jewel.beads.views.IInputAndButtonView;
     
        /**
         *  The IComboBoxView interface provides the protocol for any bead that
@@ -29,28 +29,8 @@ package org.apache.royale.jewel.beads.controls.combobox
         *  @playerversion AIR 2.6
         *  @productversion Royale 0.9.4
         */
-       public interface IComboBoxView extends IBeadView
-       {
-               /**
-                *  The sub-component used for the input area of the ComboBox.
-                *
-                *  @langversion 3.0
-                *  @playerversion Flash 10.2
-                *  @playerversion AIR 2.6
-                *  @productversion Royale 0.9.4
-                */
-               function get textinput():Object;
-               
-               /**
-                *  The sub-component used for the button to activate the 
pop-up.
-                *
-                *  @langversion 3.0
-                *  @playerversion Flash 10.2
-                *  @playerversion AIR 2.6
-                *  @productversion Royale 0.9.4
-                */
-               function get button():Object;
-               
+       public interface IComboBoxView extends IInputAndButtonView
+       {               
                /**
                 *  The component housing the selection list. The main 
component must be a placeholder
                 *  that support responsiveness and holds a subcomponent that 
parents the list or other possible
diff --git 
a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/controls/datefield/DateFieldDisabled.as
 
b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/controls/datefield/DateFieldDisabled.as
index 05d0bc0426..13f63b511f 100644
--- 
a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/controls/datefield/DateFieldDisabled.as
+++ 
b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/controls/datefield/DateFieldDisabled.as
@@ -18,14 +18,7 @@
 
////////////////////////////////////////////////////////////////////////////////
 package org.apache.royale.jewel.beads.controls.datefield
 {
-       COMPILE::JS
-       {
-       import org.apache.royale.core.HTMLElementWrapper;
-       import org.apache.royale.jewel.DateField;
-       import org.apache.royale.jewel.beads.views.DateFieldView;
-       }
-       import org.apache.royale.core.IUIBase;
-       import org.apache.royale.jewel.beads.controls.Disabled;
+       import 
org.apache.royale.jewel.beads.controls.InputAndButtonControlDisabled;
 
        /**
         *  The DateFieldDisabled bead class is a specialty bead that can be 
used to disable a Jewel DateField control.
@@ -36,7 +29,7 @@ package org.apache.royale.jewel.beads.controls.datefield
         *  @playerversion AIR 2.6
         *  @productversion Royale 0.9.6
         */
-       public class DateFieldDisabled extends Disabled
+       public class DateFieldDisabled extends InputAndButtonControlDisabled
        {
                /**
                 *  constructor.
@@ -50,43 +43,5 @@ package org.apache.royale.jewel.beads.controls.datefield
                {
                }
                
-               COMPILE::JS
-               protected var lastTextInputElementTabVal:String = null;
-               COMPILE::JS
-               protected var lastButtonElementTabVal:String = null;
-
-               override protected function updateHost():void
-               {
-                       COMPILE::JS
-                       {
-                       var view:DateFieldView = (_strand as DateField).view as 
DateFieldView;
-                       
-                       if (view) {
-                               var pos:HTMLElement = (_strand as 
IUIBase).positioner;
-
-                               if(!initialized)
-                               {
-                                       initialized = true;
-                                       lastElementTabVal = (_strand as 
HTMLElementWrapper).element.getAttribute("tabindex");
-                                       lastTextInputElementTabVal = 
view.textInput.element.getAttribute("tabindex");
-                                       lastButtonElementTabVal = 
view.menuButton.element.getAttribute("tabindex");
-                               }
-
-                               if (disabled) {
-                                       setDisableAndTabIndex(pos, true);
-                                       
setDisableAndTabIndex(view.textInput.positioner, true);
-                                       
setDisableAndTabIndex(view.textInput.element);
-                                       
setDisableAndTabIndex(view.menuButton.positioner, true);
-                                       
setDisableAndTabIndex(view.menuButton.element);
-                               } else {
-                                       removeDisableAndTabIndex(pos, true);
-                                       
removeDisableAndTabIndex(view.textInput.positioner, true);
-                                       
removeDisableAndTabIndex(view.textInput.element, false, 
lastTextInputElementTabVal);
-                                       
removeDisableAndTabIndex(view.menuButton.positioner, true);
-                                       
removeDisableAndTabIndex(view.menuButton.element, false, 
lastButtonElementTabVal);
-                               }
-                       }
-                       }
-               }
        }
 }
diff --git 
a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/views/DateFieldView.as
 
b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/views/DateFieldView.as
index 0fe9cfd835..19948f59b8 100644
--- 
a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/views/DateFieldView.as
+++ 
b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/views/DateFieldView.as
@@ -29,7 +29,7 @@ package org.apache.royale.jewel.beads.views
        import 
org.apache.royale.jewel.supportClasses.util.positionInsideBoundingClientRect;
        }
        import org.apache.royale.core.BeadViewBase;
-       import org.apache.royale.core.IBeadView;
+       import org.apache.royale.jewel.beads.views.IInputAndButtonView;
        import org.apache.royale.core.IDateChooserModel;
        import org.apache.royale.core.IDateFormatter;
        import org.apache.royale.core.IFormatter;
@@ -63,7 +63,7 @@ package org.apache.royale.jewel.beads.views
         *  @playerversion AIR 2.6
         *  @productversion Royale 0.9.4
         */
-       public class DateFieldView extends BeadViewBase implements IBeadView
+       public class DateFieldView extends BeadViewBase implements 
IInputAndButtonView
        {
                /**
                 *  constructor.
@@ -88,7 +88,14 @@ package org.apache.royale.jewel.beads.views
                 *  @playerversion AIR 2.6
                 *  @productversion Royale 0.9.4
                 */
-               public function get menuButton():Button
+               public function get button():Object
+               {
+                       return _button;
+               }
+               /**
+                * deprecated
+                */
+               public function get menuButton():Object
                {
                        return _button;
                }
@@ -101,7 +108,14 @@ package org.apache.royale.jewel.beads.views
                 *  @playerversion AIR 2.6
                 *  @productversion Royale 0.9.4
                 */
-               public function get textInput():TextInput
+               public function get textinput():Object
+               {
+                       return _textInput;
+               }
+               /**
+                * deprecated
+                */
+               public function get textInput():Object
                {
                        return _textInput;
                }
diff --git 
a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/controls/combobox/IComboBoxView.as
 
b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/views/IInputAndButtonView.as
similarity index 60%
copy from 
frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/controls/combobox/IComboBoxView.as
copy to 
frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/views/IInputAndButtonView.as
index 9f4f62dfda..0d7142e9f9 100644
--- 
a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/controls/combobox/IComboBoxView.as
+++ 
b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/views/IInputAndButtonView.as
@@ -16,23 +16,23 @@
 //  limitations under the License.
 //
 
////////////////////////////////////////////////////////////////////////////////
-package org.apache.royale.jewel.beads.controls.combobox
+package org.apache.royale.jewel.beads.views
 {
     import org.apache.royale.core.IBeadView;
     
        /**
-        *  The IComboBoxView interface provides the protocol for any bead that
-        *  creates the visual parts for a org.apache.royale.jewel.ComboBox 
control.
+        *  The IInputAndButtonView interface provides the protocol for any 
bead that
+        *  creates the visual parts for a control containing a input and a 
button.
         *  
         *  @langversion 3.0
         *  @playerversion Flash 10.2
         *  @playerversion AIR 2.6
         *  @productversion Royale 0.9.4
         */
-       public interface IComboBoxView extends IBeadView
+       public interface IInputAndButtonView extends IBeadView
        {
                /**
-                *  The sub-component used for the input area of the ComboBox.
+                *  The sub-component used for the input area of the Control.
                 *
                 *  @langversion 3.0
                 *  @playerversion Flash 10.2
@@ -50,28 +50,5 @@ package org.apache.royale.jewel.beads.controls.combobox
                 *  @productversion Royale 0.9.4
                 */
                function get button():Object;
-               
-               /**
-                *  The component housing the selection list. The main 
component must be a placeholder
-                *  that support responsiveness and holds a subcomponent that 
parents the list or other possible
-                *  components needed in other implementations.
-                *
-                *  @langversion 3.0
-                *  @playerversion Flash 10.2
-                *  @playerversion AIR 2.6
-                *  @productversion Royale 0.9.4
-                */
-               function get popup():Object;
-               
-               /**
-                *  Determines whether or not the pop-up with the selection 
list is visible or not.
-                *
-                *  @langversion 3.0
-                *  @playerversion Flash 10.2
-                *  @playerversion AIR 2.6
-                *  @productversion Royale 0.9.4
-                */
-               function get popUpVisible():Boolean;
-               function set popUpVisible(value:Boolean):void;
        }
 }

Reply via email to