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/29 10:51:50 UTC
[royale-asjs] branch develop updated: new IStyledUIBase interface
and refactor of IEmphasis Interface
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 3f5f664 new IStyledUIBase interface and refactor of IEmphasis Interface
3f5f664 is described below
commit 3f5f6646f6592f89dcce2a4be90dce3b91b1d9c4
Author: Carlos Rovira <ca...@apache.org>
AuthorDate: Sun Dec 29 11:51:38 2019 +0100
new IStyledUIBase interface and refactor of IEmphasis Interface
---
.../org/apache/royale/core/StyledMXMLItemRenderer.as | 1 +
.../royale/org/apache/royale/core/StyledUIBase.as | 2 +-
.../projects/Core/src/main/royale/CoreClasses.as | 2 +-
.../royale/org/apache/royale/core/IStyledUIBase.as} | 19 +++++++++----------
.../main/royale/org/apache/royale/utils}/IEmphasis.as | 2 +-
.../main/royale/org/apache/royale/jewel/DataGrid.as | 2 +-
.../src/main/royale/org/apache/royale/jewel/List.as | 2 +-
.../org/apache/royale/jewel/beads/controls/Badge.as | 2 +-
.../apache/royale/jewel/beads/views/DataGridView.as | 2 +-
.../jewel/itemRenderers/IconButtonBarItemRenderer.as | 6 +-----
.../jewel/supportClasses/button/SimpleButton.as | 4 +---
.../supportClasses/datagrid/IDataGridColumnList.as | 2 +-
12 files changed, 20 insertions(+), 26 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 9959ad0..f0c3ca7 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
@@ -21,6 +21,7 @@ package org.apache.royale.core
import org.apache.royale.html.supportClasses.MXMLItemRenderer;
import org.apache.royale.utils.ClassSelectorList;
import org.apache.royale.utils.IClassSelectorListSupport;
+ import org.apache.royale.utils.IEmphasis;
/**
* The StyledMXMLItemRenderer class is the base class for itemRenderers that are MXML-based
diff --git a/frameworks/projects/Basic/src/main/royale/org/apache/royale/core/StyledUIBase.as b/frameworks/projects/Basic/src/main/royale/org/apache/royale/core/StyledUIBase.as
index 02ca2ef..88a713f 100644
--- a/frameworks/projects/Basic/src/main/royale/org/apache/royale/core/StyledUIBase.as
+++ b/frameworks/projects/Basic/src/main/royale/org/apache/royale/core/StyledUIBase.as
@@ -40,7 +40,7 @@ package org.apache.royale.core
* @playerversion AIR 2.6
* @productversion Royale 0.9.3
*/
- public class StyledUIBase extends UIBase implements IClassSelectorListSupport, IEmphasis
+ public class StyledUIBase extends UIBase implements IStyledUIBase
{
/**
* Constructor.
diff --git a/frameworks/projects/Core/src/main/royale/CoreClasses.as b/frameworks/projects/Core/src/main/royale/CoreClasses.as
index 4f7bc6d..1cc8c29 100644
--- a/frameworks/projects/Core/src/main/royale/CoreClasses.as
+++ b/frameworks/projects/Core/src/main/royale/CoreClasses.as
@@ -28,7 +28,6 @@ internal class CoreClasses
{
import org.apache.royale.core.IId; IId;
import org.apache.royale.core.HTMLElementWrapper; HTMLElementWrapper;
- import org.apache.royale.utils.IClassSelectorListSupport; IClassSelectorListSupport;
import org.apache.royale.core.LayoutBase; LayoutBase;
import org.apache.royale.core.ContainerBaseStrandChildren; ContainerBaseStrandChildren;
import org.apache.royale.core.ApplicationBase; ApplicationBase;
@@ -146,6 +145,7 @@ internal class CoreClasses
import org.apache.royale.core.ITitleBarModel; ITitleBarModel;
import org.apache.royale.core.IToggleButtonModel; IToggleButtonModel;
import org.apache.royale.core.IUIBase; IUIBase;
+ import org.apache.royale.core.IStyledUIBase; IStyledUIBase;
import org.apache.royale.core.IValueToggleButtonModel; IValueToggleButtonModel;
import org.apache.royale.core.IViewport; IViewport;
import org.apache.royale.core.IScrollingViewport; IScrollingViewport;
diff --git a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/supportClasses/datagrid/IDataGridColumnList.as b/frameworks/projects/Core/src/main/royale/org/apache/royale/core/IStyledUIBase.as
similarity index 64%
copy from frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/supportClasses/datagrid/IDataGridColumnList.as
copy to frameworks/projects/Core/src/main/royale/org/apache/royale/core/IStyledUIBase.as
index c8a0dbc..23b9762 100644
--- a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/supportClasses/datagrid/IDataGridColumnList.as
+++ b/frameworks/projects/Core/src/main/royale/org/apache/royale/core/IStyledUIBase.as
@@ -4,7 +4,7 @@
// contributor license agreements. See the NOTICE file distributed with
// this work for additional information regarding copyright ownership.
// The ASF licenses this file to You under the Apache License, Version 2.0
-// (the "Licens"); you may not use this file except in compliance with
+// (the "License"); you may not use this file except in compliance with
// the License. You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
@@ -16,22 +16,21 @@
// limitations under the License.
//
////////////////////////////////////////////////////////////////////////////////
-package org.apache.royale.jewel.supportClasses.datagrid
+package org.apache.royale.core
{
- import org.apache.royale.html.supportClasses.IDataGridColumnList;
- import org.apache.royale.core.IEmphasis;
+ import org.apache.royale.utils.IClassSelectorListSupport;
+ import org.apache.royale.utils.IEmphasis;
/**
- * The Jewel IDataGridColumnList interface is a marker interface for Jewel DataGrid Column Lists
- *
+ * The IStyledUIBase interface is the interface for advanced user interface components.
+ * Used in StyledUIBase that is the core component in the Jewel UI Set
+ *
* @langversion 3.0
* @playerversion Flash 10.2
* @playerversion AIR 2.6
* @productversion Royale 0.9.7
*/
- public interface IDataGridColumnList extends org.apache.royale.html.supportClasses.IDataGridColumnList, IEmphasis
- {
- function get rollOverIndex():int;
- function set rollOverIndex(value:int):void;
+ public interface IStyledUIBase extends IUIBase, IClassSelectorListSupport, IEmphasis
+ {
}
}
\ No newline at end of file
diff --git a/frameworks/projects/Basic/src/main/royale/org/apache/royale/core/IEmphasis.as b/frameworks/projects/Core/src/main/royale/org/apache/royale/utils/IEmphasis.as
similarity index 98%
rename from frameworks/projects/Basic/src/main/royale/org/apache/royale/core/IEmphasis.as
rename to frameworks/projects/Core/src/main/royale/org/apache/royale/utils/IEmphasis.as
index cb46c1e..d0dd95b 100644
--- a/frameworks/projects/Basic/src/main/royale/org/apache/royale/core/IEmphasis.as
+++ b/frameworks/projects/Core/src/main/royale/org/apache/royale/utils/IEmphasis.as
@@ -16,7 +16,7 @@
// limitations under the License.
//
////////////////////////////////////////////////////////////////////////////////
-package org.apache.royale.core
+package org.apache.royale.utils
{
/**
* The IEmphasis is the interface a jewel control implements to get diferent jewel
diff --git a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/DataGrid.as b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/DataGrid.as
index a8e3225..7d5a3ff 100644
--- a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/DataGrid.as
+++ b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/DataGrid.as
@@ -22,8 +22,8 @@ package org.apache.royale.jewel
import org.apache.royale.core.IDataGrid;
import org.apache.royale.core.IDataGridModel;
import org.apache.royale.core.IDataGridPresentationModel;
- import org.apache.royale.core.IEmphasis;
import org.apache.royale.core.ValuesManager;
+ import org.apache.royale.utils.IEmphasis;
[Event(name="change", type="org.apache.royale.events.Event")]
diff --git a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/List.as b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/List.as
index 3b769ee..e956765 100644
--- a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/List.as
+++ b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/List.as
@@ -19,12 +19,12 @@
package org.apache.royale.jewel
{
import org.apache.royale.core.IDataProviderModel;
- import org.apache.royale.core.IEmphasis;
import org.apache.royale.core.IListPresentationModel;
import org.apache.royale.core.IRollOverModel;
import org.apache.royale.core.ISelectionModel;
import org.apache.royale.jewel.beads.models.ListPresentationModel;
import org.apache.royale.jewel.supportClasses.DataContainerBase;
+ import org.apache.royale.utils.IEmphasis;
/**
* Indicates that the initialization of the list is complete.
diff --git a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/controls/Badge.as b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/controls/Badge.as
index c27283f..04d703f 100644
--- a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/controls/Badge.as
+++ b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/controls/Badge.as
@@ -19,10 +19,10 @@
package org.apache.royale.jewel.beads.controls
{
import org.apache.royale.core.IBead;
- import org.apache.royale.core.IEmphasis;
import org.apache.royale.core.IStrand;
import org.apache.royale.core.UIBase;
import org.apache.royale.jewel.Label;
+ import org.apache.royale.utils.IEmphasis;
/**
* The Badge class provides a small status descriptors for UI elements.
diff --git a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/views/DataGridView.as b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/views/DataGridView.as
index baca499..c4a6015 100644
--- a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/views/DataGridView.as
+++ b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/views/DataGridView.as
@@ -26,7 +26,6 @@ package org.apache.royale.jewel.beads.views
import org.apache.royale.core.IDataGrid;
import org.apache.royale.core.IDataGridModel;
import org.apache.royale.core.IDataGridPresentationModel;
- import org.apache.royale.core.IEmphasis;
import org.apache.royale.core.IParent;
import org.apache.royale.core.IStrand;
import org.apache.royale.core.IUIBase;
@@ -41,6 +40,7 @@ package org.apache.royale.jewel.beads.views
import org.apache.royale.jewel.supportClasses.datagrid.DataGridButtonBar;
import org.apache.royale.jewel.supportClasses.datagrid.IDataGridColumn;
import org.apache.royale.jewel.supportClasses.datagrid.IDataGridColumnList;
+ import org.apache.royale.utils.IEmphasis;
/**
* The DataGridView class is the visual bead for the org.apache.royale.jewel.DataGrid.
diff --git a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/itemRenderers/IconButtonBarItemRenderer.as b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/itemRenderers/IconButtonBarItemRenderer.as
index a03e35a..6fb1916 100644
--- a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/itemRenderers/IconButtonBarItemRenderer.as
+++ b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/itemRenderers/IconButtonBarItemRenderer.as
@@ -18,11 +18,6 @@
////////////////////////////////////////////////////////////////////////////////
package org.apache.royale.jewel.itemRenderers
{
- COMPILE::JS
- {
-
- }
- import org.apache.royale.core.IEmphasis;
import org.apache.royale.core.IIcon;
import org.apache.royale.core.SimpleCSSStylesWithFlex;
import org.apache.royale.core.ValuesManager;
@@ -33,6 +28,7 @@ package org.apache.royale.jewel.itemRenderers
import org.apache.royale.jewel.IconButton;
import org.apache.royale.jewel.IconButtonBar;
import org.apache.royale.jewel.beads.views.ButtonBarView;
+ import org.apache.royale.utils.IEmphasis;
/**
* The IconButtonBarItemRenderer class extends IconButton and turns it into an itemRenderer
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 f68a980..b28c173 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
@@ -20,19 +20,17 @@ package org.apache.royale.jewel.supportClasses.button
{
COMPILE::SWF
{
- import org.apache.royale.core.IEmphasis;
import org.apache.royale.core.UIButtonBase;
import org.apache.royale.utils.ClassSelectorList;
import org.apache.royale.utils.IClassSelectorListSupport;
+ import org.apache.royale.utils.IEmphasis;
}
-
COMPILE::JS
{
import org.apache.royale.core.StyledUIBase;
import org.apache.royale.core.WrappedHTMLElement;
import org.apache.royale.html.util.addElementToWrapper;
}
-
import org.apache.royale.core.IStrand;
import org.apache.royale.core.IUIBase;
import org.apache.royale.events.IEventDispatcher;
diff --git a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/supportClasses/datagrid/IDataGridColumnList.as b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/supportClasses/datagrid/IDataGridColumnList.as
index c8a0dbc..0ba3608 100644
--- a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/supportClasses/datagrid/IDataGridColumnList.as
+++ b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/supportClasses/datagrid/IDataGridColumnList.as
@@ -19,7 +19,7 @@
package org.apache.royale.jewel.supportClasses.datagrid
{
import org.apache.royale.html.supportClasses.IDataGridColumnList;
- import org.apache.royale.core.IEmphasis;
+ import org.apache.royale.utils.IEmphasis;
/**
* The Jewel IDataGridColumnList interface is a marker interface for Jewel DataGrid Column Lists