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 2020/04/10 17:24:30 UTC
[royale-asjs] branch develop updated: styled-renderer-classes:
finish rework of hierarchy in jewel
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 2e77808 styled-renderer-classes: finish rework of hierarchy in jewel
2e77808 is described below
commit 2e778084c96bd3428683b999dabbf4ae57461edb
Author: Carlos Rovira <ca...@apache.org>
AuthorDate: Fri Apr 10 19:24:25 2020 +0200
styled-renderer-classes: finish rework of hierarchy in jewel
---
.../apache/royale/core/StyledMXMLItemRenderer.as | 128 +--------------------
.../TableCellSelectionMouseController.as | 4 +-
.../DataItemRendererFactoryForArrayData.as | 6 +-
.../RemoveTableRowForArrayListData.as | 8 +-
.../TableItemRendererFactoryForCollectionView.as | 8 +-
.../jewel/itemRenderers/StringItemRenderer.as | 4 +-
.../jewel/supportClasses/table/TBodyContentArea.as | 4 +-
7 files changed, 20 insertions(+), 142 deletions(-)
diff --git a/frameworks/projects/Basic/src/main/royale/org/apache/royale/core/StyledMXMLItemRenderer.as b/frameworks/projects/Basic/src/main/royale/org/apache/royale/core/StyledMXMLItemRenderer.as
index 43db82b..1c87471 100644
--- a/frameworks/projects/Basic/src/main/royale/org/apache/royale/core/StyledMXMLItemRenderer.as
+++ b/frameworks/projects/Basic/src/main/royale/org/apache/royale/core/StyledMXMLItemRenderer.as
@@ -18,10 +18,9 @@
////////////////////////////////////////////////////////////////////////////////
package org.apache.royale.core
{
- import org.apache.royale.html.supportClasses.MXMLStatesItemRenderer;
+ import org.apache.royale.html.supportClasses.StyledMXMLStatesItemRenderer;
import org.apache.royale.core.IItemRendererOwnerView;
import org.apache.royale.core.IOwnerViewItemRenderer;
- import org.apache.royale.utils.ClassSelectorList;
import org.apache.royale.utils.IClassSelectorListSupport;
import org.apache.royale.utils.IEmphasis;
@@ -34,7 +33,7 @@ package org.apache.royale.core
* @playerversion AIR 2.6
* @productversion Royale 0.9.3
*/
- public class StyledMXMLItemRenderer extends MXMLStatesItemRenderer implements IClassSelectorListSupport, IEmphasis, IOwnerViewItemRenderer
+ public class StyledMXMLItemRenderer extends StyledMXMLStatesItemRenderer implements IClassSelectorListSupport, IEmphasis, IOwnerViewItemRenderer
{
/**
* constructor.
@@ -48,129 +47,8 @@ package org.apache.royale.core
{
super();
typeNames = "";
- classSelectorList = new ClassSelectorList(this);
}
- protected var classSelectorList:ClassSelectorList;
-
- COMPILE::JS
- override protected function setClassName(value:String):void
- {
- classSelectorList.addNames(value);
- }
-
- /**
- * 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.3
- */
- public function addClass(name:String):void
- {
- COMPILE::JS
- {
- classSelectorList.add(name);
- }
- }
-
- /**
- * 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.3
- */
- public function removeClass(name:String):void
- {
- COMPILE::JS
- {
- classSelectorList.remove(name);
- }
- }
-
- /**
- * 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.3
- */
- public function toggleClass(name:String, value:Boolean):void
- {
- COMPILE::JS
- {
- classSelectorList.toggle(name, value);
- }
- }
-
- /**
- * 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.3
- */
- public function containsClass(name:String):Boolean
- {
- COMPILE::JS
- {
- return classSelectorList.contains(name);
- }
- COMPILE::SWF
- {//not implemented
- return false;
- }
- }
-
- private var _emphasis:String;
- /**
- * Applies emphasis color display. Possible constant values are: PRIMARY, SECONDARY, EMPHASIZED.
- * Colors are defined in royale jewel theme CSS.
- *
- * Left without value to get the default look (light or dark).
- *
- * @langversion 3.0
- * @playerversion Flash 10.2
- * @playerversion AIR 2.6
- * @productversion Royale 0.9.7
- */
- public function get emphasis():String
- {
- return _emphasis;
- }
- [Inspectable(category="General", enumeration="primary,secondary,emphasized")]
- public function set emphasis(value:String):void
- {
- if (_emphasis != value)
- {
- if(_emphasis)
- {
- toggleClass(_emphasis, false);
- }
- _emphasis = value;
-
- toggleClass(_emphasis, value);
- }
- }
-
private var _itemRendererOwnerView:IItemRendererOwnerView;
/**
* The parent container for the itemRenderer instance.
@@ -208,7 +86,7 @@ package org.apache.royale.core
emphasis = (itemRendererOwnerView.host as IEmphasis).emphasis;
} else
{
- emphasis = "primary";
+ emphasis = StyledUIBase.PRIMARY;
}
}
}
diff --git a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/controllers/TableCellSelectionMouseController.as b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/controllers/TableCellSelectionMouseController.as
index 9f488b2..545fceb 100644
--- a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/controllers/TableCellSelectionMouseController.as
+++ b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/controllers/TableCellSelectionMouseController.as
@@ -31,7 +31,7 @@ package org.apache.royale.jewel.beads.controllers
import org.apache.royale.events.ItemClickedEvent;
import org.apache.royale.events.ItemRemovedEvent;
import org.apache.royale.jewel.beads.views.TableView;
- import org.apache.royale.html.supportClasses.DataItemRenderer;
+ import org.apache.royale.html.supportClasses.StyledDataItemRenderer;
import org.apache.royale.jewel.beads.models.TableModel;
/**
@@ -137,7 +137,7 @@ package org.apache.royale.jewel.beads.controllers
protected function selectedHandler(event:ItemClickedEvent):void
{
- var renderer:DataItemRenderer = event.currentTarget as DataItemRenderer;
+ var renderer:StyledDataItemRenderer = event.currentTarget as StyledDataItemRenderer;
model.labelField = renderer.labelField;
model.selectedItem = event.data;
diff --git a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/itemRenderers/DataItemRendererFactoryForArrayData.as b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/itemRenderers/DataItemRendererFactoryForArrayData.as
index 993d1b1..05a4fde 100644
--- a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/itemRenderers/DataItemRendererFactoryForArrayData.as
+++ b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/itemRenderers/DataItemRendererFactoryForArrayData.as
@@ -32,7 +32,7 @@ package org.apache.royale.jewel.beads.itemRenderers
import org.apache.royale.events.IEventDispatcher;
import org.apache.royale.events.ItemRendererEvent;
import org.apache.royale.html.beads.IListView;
- import org.apache.royale.html.supportClasses.DataItemRenderer;
+ import org.apache.royale.html.supportClasses.StyledDataItemRenderer;
import org.apache.royale.core.IOwnerViewItemRenderer;
import org.apache.royale.jewel.beads.itemRenderers.DataFieldProviderBead;
import org.apache.royale.jewel.supportClasses.list.IListPresentationModel;
@@ -156,7 +156,7 @@ package org.apache.royale.jewel.beads.itemRenderers
* @royaleignorecoercion org.apache.royale.core.IListView
* @royaleignorecoercion org.apache.royale.core.UIBase
* @royaleignorecoercion org.apache.royale.core.IIndexedItemRenderer
- * @royaleignorecoercion org.apache.royale.html.supportClasses.DataItemRenderer
+ * @royaleignorecoercion org.apache.royale.html.supportClasses.StyledDataItemRenderer
* @royaleignorecoercion org.apache.royale.jewel.supportClasses.list.IListPresentationModel
* @royaleignorecoercion org.apache.royale.events.IEventDispatcher
* @royaleignorecoercion org.apache.royale.core.ILabelFieldItemRenderer
@@ -178,7 +178,7 @@ package org.apache.royale.jewel.beads.itemRenderers
for (var i:int = 0; i < n; i++)
{
var ir:IIndexedItemRenderer = itemRendererFactory.createItemRenderer() as IIndexedItemRenderer;
- var dataItemRenderer:DataItemRenderer = ir as DataItemRenderer;
+ var dataItemRenderer:StyledDataItemRenderer = ir as StyledDataItemRenderer;
ir.index = i;
diff --git a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/itemRenderers/RemoveTableRowForArrayListData.as b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/itemRenderers/RemoveTableRowForArrayListData.as
index 9cf666d..c9b3d69 100644
--- a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/itemRenderers/RemoveTableRowForArrayListData.as
+++ b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/itemRenderers/RemoveTableRowForArrayListData.as
@@ -27,7 +27,7 @@ package org.apache.royale.jewel.beads.itemRenderers
import org.apache.royale.events.Event;
import org.apache.royale.events.IEventDispatcher;
import org.apache.royale.html.beads.IListView;
- import org.apache.royale.html.supportClasses.DataItemRenderer;
+ import org.apache.royale.html.supportClasses.StyledDataItemRenderer;
import org.apache.royale.jewel.beads.models.TableModel;
import org.apache.royale.jewel.supportClasses.table.TableCell;
import org.apache.royale.jewel.supportClasses.table.TableRow;
@@ -123,12 +123,12 @@ package org.apache.royale.jewel.beads.itemRenderers
*/
protected function handleItemRemoved(event:CollectionEvent):void
{
- var ir:DataItemRenderer;
+ var ir:StyledDataItemRenderer;
var cell:TableCell;
var processedRow:TableRow = (itemRendererOwnerView as UIBase).getElementAt(event.index) as TableRow;
while (processedRow.numElements > 0) {
cell = processedRow.getElementAt(0) as TableCell;
- ir = cell.getElementAt(0) as DataItemRenderer;
+ ir = cell.getElementAt(0) as StyledDataItemRenderer;
itemRendererOwnerView.removeItemRenderer(ir);
cell.removeElement(ir);
processedRow.removeElement(cell);
@@ -139,7 +139,7 @@ package org.apache.royale.jewel.beads.itemRenderers
var len:int = itemRendererOwnerView.numItemRenderers;
for (var i:int = event.index; i < len; i++)
{
- ir = itemRendererOwnerView.getItemRendererAt(i) as DataItemRenderer;
+ ir = itemRendererOwnerView.getItemRendererAt(i) as StyledDataItemRenderer;
ir.index = i;
ir.rowIndex = i;
}
diff --git a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/itemRenderers/TableItemRendererFactoryForCollectionView.as b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/itemRenderers/TableItemRendererFactoryForCollectionView.as
index 0415639..cb1ed52 100644
--- a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/itemRenderers/TableItemRendererFactoryForCollectionView.as
+++ b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/itemRenderers/TableItemRendererFactoryForCollectionView.as
@@ -33,7 +33,7 @@ package org.apache.royale.jewel.beads.itemRenderers
import org.apache.royale.events.EventDispatcher;
import org.apache.royale.events.IEventDispatcher;
import org.apache.royale.html.beads.IListView;
- import org.apache.royale.html.supportClasses.DataItemRenderer;
+ import org.apache.royale.html.supportClasses.StyledDataItemRenderer;
import org.apache.royale.jewel.Label;
import org.apache.royale.jewel.Table;
import org.apache.royale.jewel.beads.controls.TextAlign;
@@ -203,9 +203,9 @@ package org.apache.royale.jewel.beads.itemRenderers
labelField = column.dataField;
var item:Object = dp.getItemAt(i);
- (ir as DataItemRenderer).dataField = labelField;
- (ir as DataItemRenderer).rowIndex = i;
- (ir as DataItemRenderer).columnIndex = j;
+ (ir as StyledDataItemRenderer).dataField = labelField;
+ (ir as StyledDataItemRenderer).rowIndex = i;
+ (ir as StyledDataItemRenderer).columnIndex = j;
fillRenderer(index++, item, (ir as IIndexedItemRenderer), presentationModel);
if(column.align != "")
diff --git a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/itemRenderers/StringItemRenderer.as b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/itemRenderers/StringItemRenderer.as
index 417975a..c309e38 100644
--- a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/itemRenderers/StringItemRenderer.as
+++ b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/itemRenderers/StringItemRenderer.as
@@ -32,7 +32,7 @@ package org.apache.royale.jewel.itemRenderers
}
import org.apache.royale.core.IItemRendererOwnerView;
import org.apache.royale.core.IOwnerViewItemRenderer;
- import org.apache.royale.html.supportClasses.DataItemRenderer;
+ import org.apache.royale.html.supportClasses.StyledDataItemRenderer;
import org.apache.royale.html.util.getLabelFromData;
import org.apache.royale.jewel.beads.controls.TextAlign;
import org.apache.royale.jewel.beads.itemRenderers.IAlignItemRenderer;
@@ -47,7 +47,7 @@ package org.apache.royale.jewel.itemRenderers
* @playerversion AIR 2.6
* @productversion Royale 0.9.4
*/
- public class StringItemRenderer extends DataItemRenderer implements IOwnerViewItemRenderer, ITextItemRenderer, IAlignItemRenderer
+ public class StringItemRenderer extends StyledDataItemRenderer implements IOwnerViewItemRenderer, ITextItemRenderer, IAlignItemRenderer
{
/**
* constructor.
diff --git a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/supportClasses/table/TBodyContentArea.as b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/supportClasses/table/TBodyContentArea.as
index af2c2d9..028f6d0 100644
--- a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/supportClasses/table/TBodyContentArea.as
+++ b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/supportClasses/table/TBodyContentArea.as
@@ -28,7 +28,7 @@ package org.apache.royale.jewel.supportClasses.table
import org.apache.royale.events.IEventDispatcher;
import org.apache.royale.events.ItemAddedEvent;
import org.apache.royale.events.ItemRemovedEvent;
- import org.apache.royale.html.supportClasses.DataItemRenderer;
+ import org.apache.royale.html.supportClasses.StyledDataItemRenderer;
import org.apache.royale.jewel.itemRenderers.ListItemRenderer;
import org.apache.royale.jewel.supportClasses.container.StyledContainerContentArea;
import org.apache.royale.jewel.supportClasses.table.TableRow;
@@ -243,7 +243,7 @@ package org.apache.royale.jewel.supportClasses.table
var n:Number = numElements;
for (var i:Number = 0; i < n; i++)
{
- var renderer:DataItemRenderer = getItemRendererAt(i) as DataItemRenderer;
+ var renderer:StyledDataItemRenderer = getItemRendererAt(i) as StyledDataItemRenderer;
if (renderer) {
renderer.setWidth(this.width,true);
renderer.adjustSize();