You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@royale.apache.org by ca...@apache.org on 2019/12/23 17:08:42 UTC
[royale-asjs] branch develop updated: jewel clean
IClassSelectotListSupport from classes that already has in hierchy
This is an automated email from the ASF dual-hosted git repository.
carlosrovira 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 d140049 jewel clean IClassSelectotListSupport from classes that already has in hierchy
d140049 is described below
commit d14004977c7a14ad355c9993b9e2fe42f43f39b3
Author: Carlos Rovira <ca...@apache.org>
AuthorDate: Mon Dec 23 18:08:30 2019 +0100
jewel clean IClassSelectotListSupport from classes that already has in hierchy
---
.../royale/org/apache/royale/jewel/Application.as | 49 +++++++-------
.../org/apache/royale/jewel/DataContainer.as | 3 +-
.../supportClasses/button/SelectableButtonBase.as | 75 +---------------------
.../jewel/supportClasses/button/SimpleButton.as | 9 +--
4 files changed, 30 insertions(+), 106 deletions(-)
diff --git a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/Application.as b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/Application.as
index 70ef0ad..1a646ed 100644
--- a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/Application.as
+++ b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/Application.as
@@ -18,38 +18,39 @@
////////////////////////////////////////////////////////////////////////////////
package org.apache.royale.jewel
{
+ COMPILE::SWF {
+ import flash.display.DisplayObject;
+ import flash.display.StageAlign;
+ import flash.display.StageQuality;
+ import flash.display.StageScaleMode;
+ import flash.events.Event;
+
+ import org.apache.royale.core.ILayoutChild;
+ import org.apache.royale.events.utils.MouseEventConverter;
+ }
+
+ COMPILE::JS {
+ import org.apache.royale.core.UIBase;
+ }
+ import org.apache.royale.core.AllCSSValuesImpl;
import org.apache.royale.core.ApplicationBase;
+ import org.apache.royale.core.IApplicationView;
+ import org.apache.royale.core.IBead;
+ import org.apache.royale.core.IChild;
+ import org.apache.royale.core.IInitialViewApplication;
import org.apache.royale.core.IParent;
+ import org.apache.royale.core.IPopUpHost;
import org.apache.royale.core.IPopUpHostParent;
+ import org.apache.royale.core.IRenderedObject;
+ import org.apache.royale.core.IStrand;
+ import org.apache.royale.core.IUIBase;
+ import org.apache.royale.core.IValuesImpl;
+ import org.apache.royale.core.ValuesManager;
import org.apache.royale.events.Event;
import org.apache.royale.events.IEventDispatcher;
import org.apache.royale.utils.MXMLDataInterpreter;
import org.apache.royale.utils.Timer;
- import org.apache.royale.core.IStrand;
- import org.apache.royale.core.IInitialViewApplication;
- import org.apache.royale.core.IPopUpHost;
- import org.apache.royale.core.IRenderedObject;
- import org.apache.royale.core.AllCSSValuesImpl;
- import org.apache.royale.core.IBead;
- import org.apache.royale.core.ILayoutChild;
- import org.apache.royale.core.ValuesManager;
- import org.apache.royale.core.IValuesImpl;
- import org.apache.royale.core.IChild;
- import org.apache.royale.core.IUIBase;
- import org.apache.royale.core.IApplicationView;
- COMPILE::SWF {
- import flash.display.DisplayObject;
- import flash.display.StageAlign;
- import flash.display.StageQuality;
- import flash.display.StageScaleMode;
- import flash.events.Event;
- import org.apache.royale.events.utils.MouseEventConverter;
- }
-
- COMPILE::JS {
- import org.apache.royale.core.UIBase;
- }
//--------------------------------------
// Events
diff --git a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/DataContainer.as b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/DataContainer.as
index f3684f9..b46e7f6 100644
--- a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/DataContainer.as
+++ b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/DataContainer.as
@@ -23,7 +23,6 @@ package org.apache.royale.jewel
import org.apache.royale.core.IListWithPresentationModel;
import org.apache.royale.jewel.beads.models.ListPresentationModel;
import org.apache.royale.jewel.supportClasses.DataContainerBase;
- import org.apache.royale.utils.IClassSelectorListSupport;
/**
* Indicates that the initialization of the list is complete.
@@ -51,7 +50,7 @@ package org.apache.royale.jewel
* @playerversion AIR 2.6
* @productversion Royale 0.9.4
*/
- public class DataContainer extends DataContainerBase implements IListWithPresentationModel, IClassSelectorListSupport
+ public class DataContainer extends DataContainerBase implements IListWithPresentationModel
{
/**
* constructor.
diff --git a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/supportClasses/button/SelectableButtonBase.as b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/supportClasses/button/SelectableButtonBase.as
index 061ff56..4a95dc8 100644
--- a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/supportClasses/button/SelectableButtonBase.as
+++ b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/supportClasses/button/SelectableButtonBase.as
@@ -23,7 +23,7 @@ package org.apache.royale.jewel.supportClasses.button
import org.apache.royale.core.UIButtonBase;
import org.apache.royale.events.MouseEvent;
import org.apache.royale.utils.ClassSelectorList;
- import org.apache.royale.utils.IClassSelectorListSupport;
+ import org.apache.royale.events.Event;
}
COMPILE::JS
@@ -32,7 +32,6 @@ package org.apache.royale.jewel.supportClasses.button
}
import org.apache.royale.core.ISelectable;
- import org.apache.royale.events.Event;
//--------------------------------------
// Events
@@ -59,7 +58,7 @@ package org.apache.royale.jewel.supportClasses.button
* @productversion Royale 0.9.6
*/
COMPILE::SWF
- public class SelectableButtonBase extends UIButtonBase implements ISelectable, IClassSelectorListSupport
+ public class SelectableButtonBase extends UIButtonBase implements ISelectable
{
/**
* Constructor.
@@ -72,8 +71,6 @@ package org.apache.royale.jewel.supportClasses.button
public function SelectableButtonBase()
{
super();
-
- classSelectorList = new ClassSelectorList(this);
addEventListener(MouseEvent.CLICK, internalMouseHandler);
}
@@ -86,74 +83,6 @@ package org.apache.royale.jewel.supportClasses.button
dispatchEvent(new Event(Event.CHANGE));
}
- protected var classSelectorList:ClassSelectorList;
-
- /**
- * Add a class selector to the list.
- *
- * @param name Name of selector to add.
- *
- * @langversion 3.0
- * @playerversion Flash 10.2
- * @playerversion AIR 2.6
- * @productversion Royale 0.9.6
- */
- public function addClass(name:String):void
- {
- // To implement. Need to implement this interface or extensions will not compile
- }
-
- /**
- * Removes a class selector from the list.
- *
- * @param name Name of selector to remove.
- *
- * @royaleignorecoercion HTMLElement
- * @royaleignorecoercion DOMTokenList
- *
- * @langversion 3.0
- * @playerversion Flash 10.2
- * @playerversion AIR 2.6
- * @productversion Royale 0.9.6
- */
- public function removeClass(name:String):void
- {
- // To implement. Need to implement this interface or extensions will not compile
- }
-
- /**
- * Add or remove a class selector to/from the list.
- *
- * @param name Name of selector to add or remove.
- * @param value True to add, False to remove.
- *
- * @langversion 3.0
- * @playerversion Flash 10.2
- * @playerversion AIR 2.6
- * @productversion Royale 0.9.6
- */
- public function toggleClass(name:String, value:Boolean):void
- {
- // To implement. Need to implement this interface or extensions will not compile
- }
-
- /**
- * Search for the name in the element class list
- *
- * @param name Name of selector to find.
- * @return return true if the name is found or false otherwise.
- *
- * @langversion 3.0
- * @playerversion Flash 10.2
- * @playerversion AIR 2.6
- * @productversion Royale 0.9.6
- */
- public function containsClass(name:String):Boolean
- {
- // To implement. Need to implement this interface or extensions will not compile
- return false;
- }
-
/**
* <code>true</code> if selected, <code>false</code> otherwise.
*
diff --git a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/supportClasses/button/SimpleButton.as b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/supportClasses/button/SimpleButton.as
index d5e2043..03346cd 100644
--- a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/supportClasses/button/SimpleButton.as
+++ b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/supportClasses/button/SimpleButton.as
@@ -33,8 +33,6 @@ package org.apache.royale.jewel.supportClasses.button
import org.apache.royale.core.IStrand;
import org.apache.royale.core.IUIBase;
import org.apache.royale.events.IEventDispatcher;
- import org.apache.royale.utils.ClassSelectorList;
- import org.apache.royale.utils.IClassSelectorListSupport;
import org.apache.royale.jewel.supportClasses.IEmphasis;
//--------------------------------------
@@ -159,7 +157,7 @@ package org.apache.royale.jewel.supportClasses.button
* @productversion Royale 0.9.6
*/
COMPILE::SWF
- public class SimpleButton extends UIButtonBase implements IStrand, IUIBase, IEventDispatcher, IClassSelectorListSupport, IEmphasis
+ public class SimpleButton extends UIButtonBase implements IStrand, IUIBase, IEventDispatcher, IEmphasis
{
public static const PRIMARY:String = "primary";
public static const SECONDARY:String = "secondary";
@@ -177,12 +175,9 @@ package org.apache.royale.jewel.supportClasses.button
{
super();
- classSelectorList = new ClassSelectorList(this);
typeNames = "jewel button";
}
- protected var classSelectorList:ClassSelectorList;
-
private var _emphasis:String;
/**
* Applies emphasis color display. Possible constant values are: PRIMARY, SECONDARY, EMPHASIZED.
@@ -298,7 +293,7 @@ package org.apache.royale.jewel.supportClasses.button
* @productversion Royale 0.9.6
*/
COMPILE::JS
- public class SimpleButton extends StyledUIBase implements IStrand, IUIBase, IEventDispatcher, IClassSelectorListSupport, IEmphasis
+ public class SimpleButton extends StyledUIBase implements IStrand, IUIBase, IEventDispatcher, IEmphasis
{
public static const PRIMARY:String = "primary";
public static const SECONDARY:String = "secondary";