You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@royale.apache.org by ha...@apache.org on 2018/09/02 21:31:28 UTC
[royale-asjs] branch feature/new_merge created (now 4b322d5)
This is an automated email from the ASF dual-hosted git repository.
harbs pushed a change to branch feature/new_merge
in repository https://gitbox.apache.org/repos/asf/royale-asjs.git.
at 4b322d5 Missed this conflict
This branch includes the following new commits:
new 08a7ef2 Moveed files to Basic
new a86a7f6 Untangled classes
new 70e9ba6 Unused imports
new ef291ef Fixed some more dependencies
new fb24e5f Missing import
new e34be41 Icons needs Basic
new 8b64e10 I think this is needed
new 451a2c0 Merge branch 'feature/MXRoyale' into feature/new_merge
new 038f40b Use IList
new 4b322d5 Missed this conflict
The 10 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
[royale-asjs] 07/10: I think this is needed
Posted by ha...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
harbs pushed a commit to branch feature/new_merge
in repository https://gitbox.apache.org/repos/asf/royale-asjs.git
commit 8b64e104bf5a9163405d68513cc3c11e2c17482a
Author: Harbs <ha...@in-tools.com>
AuthorDate: Sun Sep 2 20:22:14 2018 +0300
I think this is needed
(at least for now)
---
frameworks/projects/Icons/pom.xml | 14 ++++++++++++++
frameworks/projects/Jewel/pom.xml | 14 ++++++++++++++
2 files changed, 28 insertions(+)
diff --git a/frameworks/projects/Icons/pom.xml b/frameworks/projects/Icons/pom.xml
index fa4b888..e23a329 100644
--- a/frameworks/projects/Icons/pom.xml
+++ b/frameworks/projects/Icons/pom.xml
@@ -86,6 +86,20 @@
<type>swc</type>
<classifier>js</classifier>
</dependency>
+ <dependency>
+ <groupId>org.apache.royale.framework</groupId>
+ <artifactId>Basic</artifactId>
+ <version>0.9.3-SNAPSHOT</version>
+ <type>swc</type>
+ <classifier>swf</classifier>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.royale.framework</groupId>
+ <artifactId>Basic</artifactId>
+ <version>0.9.3-SNAPSHOT</version>
+ <type>swc</type>
+ <classifier>js</classifier>
+ </dependency>
</dependencies>
</project>
diff --git a/frameworks/projects/Jewel/pom.xml b/frameworks/projects/Jewel/pom.xml
index 885aece..bbd9ded 100644
--- a/frameworks/projects/Jewel/pom.xml
+++ b/frameworks/projects/Jewel/pom.xml
@@ -167,6 +167,20 @@
<type>swc</type>
<classifier>js</classifier>
</dependency>
+ <dependency>
+ <groupId>org.apache.royale.framework</groupId>
+ <artifactId>Basic</artifactId>
+ <version>0.9.3-SNAPSHOT</version>
+ <type>swc</type>
+ <classifier>swf</classifier>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.royale.framework</groupId>
+ <artifactId>Basic</artifactId>
+ <version>0.9.3-SNAPSHOT</version>
+ <type>swc</type>
+ <classifier>js</classifier>
+ </dependency>
</dependencies>
</project>
[royale-asjs] 10/10: Missed this conflict
Posted by ha...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
harbs pushed a commit to branch feature/new_merge
in repository https://gitbox.apache.org/repos/asf/royale-asjs.git
commit 4b322d53f4eef4baf805a1c683c6ac644ee946d1
Author: Harbs <ha...@in-tools.com>
AuthorDate: Mon Sep 3 00:27:45 2018 +0300
Missed this conflict
---
.../royale/net/remoting/messages/AcknowledgeMessageExt.as | 10 ----------
1 file changed, 10 deletions(-)
diff --git a/frameworks/projects/Network/src/main/royale/org/apache/royale/net/remoting/messages/AcknowledgeMessageExt.as b/frameworks/projects/Network/src/main/royale/org/apache/royale/net/remoting/messages/AcknowledgeMessageExt.as
index 6573d47..3704c48 100644
--- a/frameworks/projects/Network/src/main/royale/org/apache/royale/net/remoting/messages/AcknowledgeMessageExt.as
+++ b/frameworks/projects/Network/src/main/royale/org/apache/royale/net/remoting/messages/AcknowledgeMessageExt.as
@@ -18,24 +18,14 @@
////////////////////////////////////////////////////////////////////////////////
package org.apache.royale.net.remoting.messages
{
-<<<<<<< HEAD
import org.apache.royale.net.utils.IDataOutput;
import org.apache.royale.net.utils.IExternalizable;
-=======
- // import flash.utils.IDataOutput;
- // import flash.utils.IExternalizable;
- import org.apache.royale.net.utils.IDataOutput;
->>>>>>> feature/MXRoyale
[RemoteClass(alias="DSK")]
/**
* @private
*/
-<<<<<<< HEAD
public class AcknowledgeMessageExt extends AcknowledgeMessage implements IExternalizable
-=======
- public class AcknowledgeMessageExt extends AcknowledgeMessage// implements IExternalizable
->>>>>>> feature/MXRoyale
{
//--------------------------------------------------------------------------
//
[royale-asjs] 09/10: Use IList
Posted by ha...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
harbs pushed a commit to branch feature/new_merge
in repository https://gitbox.apache.org/repos/asf/royale-asjs.git
commit 038f40b41dadc577f42e5ae9564c06cea032a4a3
Author: Harbs <ha...@in-tools.com>
AuthorDate: Mon Sep 3 00:27:28 2018 +0300
Use IList
---
.../apache/royale/html/supportClasses/IDataGridColumnList.as | 4 ++--
.../Core/src/main/royale/org/apache/royale/core/IList.as | 10 ----------
2 files changed, 2 insertions(+), 12 deletions(-)
diff --git a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/supportClasses/IDataGridColumnList.as b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/supportClasses/IDataGridColumnList.as
index 488cb18..ccb12bf 100644
--- a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/supportClasses/IDataGridColumnList.as
+++ b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/supportClasses/IDataGridColumnList.as
@@ -18,7 +18,7 @@
////////////////////////////////////////////////////////////////////////////////
package org.apache.royale.html.supportClasses
{
- import org.apache.royale.core.IListWithPresentationModel;
+ import org.apache.royale.core.IList;
import org.apache.royale.core.IStrand;
import org.apache.royale.events.IEventDispatcher;
@@ -30,7 +30,7 @@ package org.apache.royale.html.supportClasses
* @playerversion AIR 2.6
* @productversion Royale 0.9.3
*/
- public interface IDataGridColumnList extends IListWithPresentationModel, IStrand, IEventDispatcher
+ public interface IDataGridColumnList extends IList, IStrand, IEventDispatcher
{
function set className(value:String):void;
function set labelField(value:String):void;
diff --git a/frameworks/projects/Core/src/main/royale/org/apache/royale/core/IList.as b/frameworks/projects/Core/src/main/royale/org/apache/royale/core/IList.as
index f25d036..84007a7 100644
--- a/frameworks/projects/Core/src/main/royale/org/apache/royale/core/IList.as
+++ b/frameworks/projects/Core/src/main/royale/org/apache/royale/core/IList.as
@@ -33,16 +33,6 @@ package org.apache.royale.core
*/
public interface IList extends IItemRendererProvider
{
- /**
- * Returns the component within the list (maybe even the list shell itself)
- * which will be the parent of each itemRenderer.
- *
- * @langversion 3.0
- * @playerversion Flash 10.2
- * @playerversion AIR 2.6
- * @productversion Royale 0.0
- */
- function get dataGroup():IItemRendererParent;
}
}
[royale-asjs] 05/10: Missing import
Posted by ha...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
harbs pushed a commit to branch feature/new_merge
in repository https://gitbox.apache.org/repos/asf/royale-asjs.git
commit fb24e5f9f8d17f2588a8dbd5c861de207e2d375f
Author: Harbs <ha...@in-tools.com>
AuthorDate: Sun Sep 2 20:14:05 2018 +0300
Missing import
---
.../main/royale/org/apache/royale/html/beads/DragDropListView.as | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/frameworks/projects/DragDrop/src/main/royale/org/apache/royale/html/beads/DragDropListView.as b/frameworks/projects/DragDrop/src/main/royale/org/apache/royale/html/beads/DragDropListView.as
index cfc47ed..cdfccd4 100644
--- a/frameworks/projects/DragDrop/src/main/royale/org/apache/royale/html/beads/DragDropListView.as
+++ b/frameworks/projects/DragDrop/src/main/royale/org/apache/royale/html/beads/DragDropListView.as
@@ -19,6 +19,7 @@
package org.apache.royale.html.beads
{
import org.apache.royale.core.IStrand;
+ import org.apache.royale.core.IContainer;
import org.apache.royale.core.UIBase;
import org.apache.royale.html.beads.ListView;
@@ -43,6 +44,7 @@ package org.apache.royale.html.beads
/**
* @private
+ * @royaleignorecoercion org.apache.royale.core.UIBase
*/
override public function set strand(value:IStrand):void
{
@@ -63,6 +65,7 @@ package org.apache.royale.html.beads
/**
* @private
+ * @royaleignorecoercion org.apache.royale.core.UIBase
*/
override public function afterLayout():void
{
@@ -97,6 +100,8 @@ package org.apache.royale.html.beads
/**
* @private
+ * @royaleignorecoercion org.apache.royale.core.IContainer
+
*/
override public function set strand(value:IStrand):void
{
@@ -114,6 +119,7 @@ package org.apache.royale.html.beads
/**
* @private
+ * @royaleignorecoercion org.apache.royale.core.UIBase
*/
override public function afterLayout():void
{
[royale-asjs] 04/10: Fixed some more dependencies
Posted by ha...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
harbs pushed a commit to branch feature/new_merge
in repository https://gitbox.apache.org/repos/asf/royale-asjs.git
commit ef291eface273104409417a56198a5e9a87e9dc5
Author: Harbs <ha...@in-tools.com>
AuthorDate: Sun Sep 2 20:08:36 2018 +0300
Fixed some more dependencies
---
.../projects/Basic/src/main/royale/org/apache/royale/core/GroupBase.as | 1 +
.../{Core => Basic}/src/main/royale/org/apache/royale/core/UIBase.as | 0
.../src/main/royale/org/apache/royale/html/util/addElementToWrapper.as | 0
frameworks/projects/Core/src/main/royale/CoreClasses.as | 2 +-
.../projects/Core/src/main/royale/org/apache/royale/core/LayoutBase.as | 1 -
.../royale/org/apache/royale/graphics/utils/addSvgElementToElement.as | 1 -
6 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/frameworks/projects/Basic/src/main/royale/org/apache/royale/core/GroupBase.as b/frameworks/projects/Basic/src/main/royale/org/apache/royale/core/GroupBase.as
index 241afc5..93148bb 100644
--- a/frameworks/projects/Basic/src/main/royale/org/apache/royale/core/GroupBase.as
+++ b/frameworks/projects/Basic/src/main/royale/org/apache/royale/core/GroupBase.as
@@ -22,6 +22,7 @@ package org.apache.royale.core
import org.apache.royale.core.ILayoutParent;
import org.apache.royale.core.ILayoutHost;
import org.apache.royale.core.ILayoutView;
+ import org.apache.royale.core.UIBase;
import org.apache.royale.core.ValuesManager;
import org.apache.royale.events.Event;
import org.apache.royale.events.ValueChangeEvent;
diff --git a/frameworks/projects/Core/src/main/royale/org/apache/royale/core/UIBase.as b/frameworks/projects/Basic/src/main/royale/org/apache/royale/core/UIBase.as
similarity index 100%
rename from frameworks/projects/Core/src/main/royale/org/apache/royale/core/UIBase.as
rename to frameworks/projects/Basic/src/main/royale/org/apache/royale/core/UIBase.as
diff --git a/frameworks/projects/Core/src/main/royale/org/apache/royale/html/util/addElementToWrapper.as b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/util/addElementToWrapper.as
similarity index 100%
rename from frameworks/projects/Core/src/main/royale/org/apache/royale/html/util/addElementToWrapper.as
rename to frameworks/projects/Basic/src/main/royale/org/apache/royale/html/util/addElementToWrapper.as
diff --git a/frameworks/projects/Core/src/main/royale/CoreClasses.as b/frameworks/projects/Core/src/main/royale/CoreClasses.as
index 524237b..3ac091c 100644
--- a/frameworks/projects/Core/src/main/royale/CoreClasses.as
+++ b/frameworks/projects/Core/src/main/royale/CoreClasses.as
@@ -27,7 +27,7 @@ package {
internal class CoreClasses
{
import org.apache.royale.core.IId; IId;
- import org.apache.royale.core.UIBase; UIBase;
+ 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;
diff --git a/frameworks/projects/Core/src/main/royale/org/apache/royale/core/LayoutBase.as b/frameworks/projects/Core/src/main/royale/org/apache/royale/core/LayoutBase.as
index 2126202..21c812e 100644
--- a/frameworks/projects/Core/src/main/royale/org/apache/royale/core/LayoutBase.as
+++ b/frameworks/projects/Core/src/main/royale/org/apache/royale/core/LayoutBase.as
@@ -301,7 +301,6 @@ package org.apache.royale.core
* @playerversion AIR 2.6
* @productversion Royale 0.8
* @royaleignorecoercion org.apache.royale.core.ILayoutParent
- * @royaleignorecoercion org.apache.royale.core.UIBase
* @royaleignorecoercion org.apache.royale.events.IEventDispatcher
*/
public function performLayout():void
diff --git a/frameworks/projects/Graphics/src/main/royale/org/apache/royale/graphics/utils/addSvgElementToElement.as b/frameworks/projects/Graphics/src/main/royale/org/apache/royale/graphics/utils/addSvgElementToElement.as
index 57acda0..4d31df4 100644
--- a/frameworks/projects/Graphics/src/main/royale/org/apache/royale/graphics/utils/addSvgElementToElement.as
+++ b/frameworks/projects/Graphics/src/main/royale/org/apache/royale/graphics/utils/addSvgElementToElement.as
@@ -20,7 +20,6 @@ package org.apache.royale.graphics.utils
{
COMPILE::JS
{
- import org.apache.royale.core.UIBase;
import org.apache.royale.core.WrappedHTMLElement;
}
[royale-asjs] 01/10: Moveed files to Basic
Posted by ha...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
harbs pushed a commit to branch feature/new_merge
in repository https://gitbox.apache.org/repos/asf/royale-asjs.git
commit 08a7ef229e0904b0d3bdd2144b49173edc9348aa
Author: Harbs <ha...@in-tools.com>
AuthorDate: Sun Sep 2 18:20:56 2018 +0300
Moveed files to Basic
merges on moved files is very difficult
---
.../{Core => Basic}/src/main/royale/org/apache/royale/html/Group.as | 0
.../src/main/royale/org/apache/royale/html/MXMLBeadView.as | 0
.../src/main/royale/org/apache/royale/html/beads/ContainerView.as | 0
.../src/main/royale/org/apache/royale/html/beads/DataContainerView.as | 0
.../src/main/royale/org/apache/royale/html/beads/GroupView.as | 0
.../src/main/royale/org/apache/royale/html/beads/TextFieldViewBase.as | 0
.../royale/org/apache/royale/html/beads/layouts/LayoutChangeNotifier.as | 0
.../royale/org/apache/royale/html/beads/models/ArraySelectionModel.as | 0
.../src/main/royale/org/apache/royale/html/beads/models/ViewportModel.as | 0
.../src/main/royale/org/apache/royale/html/supportClasses/Border.as | 0
.../royale/org/apache/royale/html/supportClasses/ContainerContentArea.as | 0
.../src/main/royale/org/apache/royale/html/supportClasses/DataGroup.as | 0
.../main/royale/org/apache/royale/html/supportClasses/DataItemRenderer.as | 0
.../main/royale/org/apache/royale/html/supportClasses/MXMLItemRenderer.as | 0
.../royale/org/apache/royale/html/supportClasses/UIItemRendererBase.as | 0
.../src/main/royale/org/apache/royale/html/supportClasses/Viewport.as | 0
16 files changed, 0 insertions(+), 0 deletions(-)
diff --git a/frameworks/projects/Core/src/main/royale/org/apache/royale/html/Group.as b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/Group.as
similarity index 100%
rename from frameworks/projects/Core/src/main/royale/org/apache/royale/html/Group.as
rename to frameworks/projects/Basic/src/main/royale/org/apache/royale/html/Group.as
diff --git a/frameworks/projects/Core/src/main/royale/org/apache/royale/html/MXMLBeadView.as b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/MXMLBeadView.as
similarity index 100%
rename from frameworks/projects/Core/src/main/royale/org/apache/royale/html/MXMLBeadView.as
rename to frameworks/projects/Basic/src/main/royale/org/apache/royale/html/MXMLBeadView.as
diff --git a/frameworks/projects/Core/src/main/royale/org/apache/royale/html/beads/ContainerView.as b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/ContainerView.as
similarity index 100%
rename from frameworks/projects/Core/src/main/royale/org/apache/royale/html/beads/ContainerView.as
rename to frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/ContainerView.as
diff --git a/frameworks/projects/Core/src/main/royale/org/apache/royale/html/beads/DataContainerView.as b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/DataContainerView.as
similarity index 100%
rename from frameworks/projects/Core/src/main/royale/org/apache/royale/html/beads/DataContainerView.as
rename to frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/DataContainerView.as
diff --git a/frameworks/projects/Core/src/main/royale/org/apache/royale/html/beads/GroupView.as b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/GroupView.as
similarity index 100%
rename from frameworks/projects/Core/src/main/royale/org/apache/royale/html/beads/GroupView.as
rename to frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/GroupView.as
diff --git a/frameworks/projects/Core/src/main/royale/org/apache/royale/html/beads/TextFieldViewBase.as b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/TextFieldViewBase.as
similarity index 100%
rename from frameworks/projects/Core/src/main/royale/org/apache/royale/html/beads/TextFieldViewBase.as
rename to frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/TextFieldViewBase.as
diff --git a/frameworks/projects/Core/src/main/royale/org/apache/royale/html/beads/layouts/LayoutChangeNotifier.as b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/layouts/LayoutChangeNotifier.as
similarity index 100%
rename from frameworks/projects/Core/src/main/royale/org/apache/royale/html/beads/layouts/LayoutChangeNotifier.as
rename to frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/layouts/LayoutChangeNotifier.as
diff --git a/frameworks/projects/Core/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
similarity index 100%
rename from frameworks/projects/Core/src/main/royale/org/apache/royale/html/beads/models/ArraySelectionModel.as
rename to frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/models/ArraySelectionModel.as
diff --git a/frameworks/projects/Core/src/main/royale/org/apache/royale/html/beads/models/ViewportModel.as b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/models/ViewportModel.as
similarity index 100%
rename from frameworks/projects/Core/src/main/royale/org/apache/royale/html/beads/models/ViewportModel.as
rename to frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/models/ViewportModel.as
diff --git a/frameworks/projects/Core/src/main/royale/org/apache/royale/html/supportClasses/Border.as b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/supportClasses/Border.as
similarity index 100%
rename from frameworks/projects/Core/src/main/royale/org/apache/royale/html/supportClasses/Border.as
rename to frameworks/projects/Basic/src/main/royale/org/apache/royale/html/supportClasses/Border.as
diff --git a/frameworks/projects/Core/src/main/royale/org/apache/royale/html/supportClasses/ContainerContentArea.as b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/supportClasses/ContainerContentArea.as
similarity index 100%
rename from frameworks/projects/Core/src/main/royale/org/apache/royale/html/supportClasses/ContainerContentArea.as
rename to frameworks/projects/Basic/src/main/royale/org/apache/royale/html/supportClasses/ContainerContentArea.as
diff --git a/frameworks/projects/Core/src/main/royale/org/apache/royale/html/supportClasses/DataGroup.as b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/supportClasses/DataGroup.as
similarity index 100%
rename from frameworks/projects/Core/src/main/royale/org/apache/royale/html/supportClasses/DataGroup.as
rename to frameworks/projects/Basic/src/main/royale/org/apache/royale/html/supportClasses/DataGroup.as
diff --git a/frameworks/projects/Core/src/main/royale/org/apache/royale/html/supportClasses/DataItemRenderer.as b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/supportClasses/DataItemRenderer.as
similarity index 100%
rename from frameworks/projects/Core/src/main/royale/org/apache/royale/html/supportClasses/DataItemRenderer.as
rename to frameworks/projects/Basic/src/main/royale/org/apache/royale/html/supportClasses/DataItemRenderer.as
diff --git a/frameworks/projects/Core/src/main/royale/org/apache/royale/html/supportClasses/MXMLItemRenderer.as b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/supportClasses/MXMLItemRenderer.as
similarity index 100%
rename from frameworks/projects/Core/src/main/royale/org/apache/royale/html/supportClasses/MXMLItemRenderer.as
rename to frameworks/projects/Basic/src/main/royale/org/apache/royale/html/supportClasses/MXMLItemRenderer.as
diff --git a/frameworks/projects/Core/src/main/royale/org/apache/royale/html/supportClasses/UIItemRendererBase.as b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/supportClasses/UIItemRendererBase.as
similarity index 100%
rename from frameworks/projects/Core/src/main/royale/org/apache/royale/html/supportClasses/UIItemRendererBase.as
rename to frameworks/projects/Basic/src/main/royale/org/apache/royale/html/supportClasses/UIItemRendererBase.as
diff --git a/frameworks/projects/Core/src/main/royale/org/apache/royale/html/supportClasses/Viewport.as b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/supportClasses/Viewport.as
similarity index 100%
rename from frameworks/projects/Core/src/main/royale/org/apache/royale/html/supportClasses/Viewport.as
rename to frameworks/projects/Basic/src/main/royale/org/apache/royale/html/supportClasses/Viewport.as
[royale-asjs] 02/10: Untangled classes
Posted by ha...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
harbs pushed a commit to branch feature/new_merge
in repository https://gitbox.apache.org/repos/asf/royale-asjs.git
commit a86a7f6064e2322782c4aa92790cceee63196a3b
Author: Harbs <ha...@in-tools.com>
AuthorDate: Sun Sep 2 19:47:04 2018 +0300
Untangled classes
View was duplicated.
---
.../Basic/src/main/resources/basic-manifest.xml | 8 ++
.../projects/Basic/src/main/royale/BasicClasses.as | 38 ++++++-
.../royale/org/apache/royale/core/ContainerBase.as | 0
.../org/apache/royale/core/DataContainerBase.as | 0
.../royale/org/apache/royale/core/GroupBase.as | 0
.../apache/royale/core/StyledMXMLItemRenderer.as | 0
.../royale/org/apache/royale/core/StyledUIBase.as | 0
.../main/royale/org/apache/royale/core/ViewBase.as | 0
.../royale/core/supportClasses/StyledImageBase.as | 0
.../Core/src/main/resources/basic-manifest.xml | 12 --
.../projects/Core/src/main/royale/CoreClasses.as | 25 +----
.../src/main/royale/org/apache/royale/core/View.as | 125 ---------------------
12 files changed, 43 insertions(+), 165 deletions(-)
diff --git a/frameworks/projects/Basic/src/main/resources/basic-manifest.xml b/frameworks/projects/Basic/src/main/resources/basic-manifest.xml
index 316e74b..e658641 100644
--- a/frameworks/projects/Basic/src/main/resources/basic-manifest.xml
+++ b/frameworks/projects/Basic/src/main/resources/basic-manifest.xml
@@ -25,6 +25,7 @@
<component id="AirApplication" class="org.apache.royale.core.AirApplication"/>
<component id="View" class="org.apache.royale.core.View"/>
<component id="Container" class="org.apache.royale.html.Container"/>
+ <component id="Border" class="org.apache.royale.html.supportClasses.Border"/>
<component id="Button" class="org.apache.royale.html.Button"/>
<component id="CloseButton" class="org.apache.royale.html.CloseButton"/>
<component id="ButtonBar" class="org.apache.royale.html.ButtonBar"/>
@@ -52,6 +53,7 @@
<component id="RadioButton" class="org.apache.royale.html.RadioButton"/>
<component id="ComboBox" class="org.apache.royale.html.ComboBox"/>
<component id="ComboBoxList" class="org.apache.royale.html.supportClasses.ComboBoxList"/>
+ <component id="Group" class="org.apache.royale.html.Group"/>
<component id="HGroup" class="org.apache.royale.html.HGroup"/>
<component id="VGroup" class="org.apache.royale.html.VGroup"/>
<component id="Accordion" class="org.apache.royale.html.Accordion"/>
@@ -70,11 +72,13 @@
<component id="TitleBar" class="org.apache.royale.html.TitleBar"/>
<component id="TitleBarTitle" class="org.apache.royale.html.beads.TitleBarTitle"/>
<component id="ImageModel" class="org.apache.royale.html.beads.models.ImageModel"/>
+ <component id="ArraySelectionModel" class="org.apache.royale.html.beads.models.ArraySelectionModel"/>
<component id="TitleBarModel" class="org.apache.royale.html.beads.models.TitleBarModel"/>
<component id="ToolTip" class="org.apache.royale.html.ToolTip"/>
<component id="Tree" class="org.apache.royale.html.Tree"/>
<component id="BasicLayout" class="org.apache.royale.html.beads.layouts.BasicLayout"/>
<component id="RemovableBasicLayout" class="org.apache.royale.html.beads.layouts.RemovableBasicLayout"/>
+ <component id="LayoutChangeNotifier" class="org.apache.royale.html.beads.layouts.LayoutChangeNotifier"/>
<component id="VerticalLayout" class="org.apache.royale.html.beads.layouts.VerticalLayout"/>
<component id="VirtualListView" class="org.apache.royale.html.beads.VirtualListView"/>
<component id="VirtualListVerticalLayout" class="org.apache.royale.html.beads.layouts.VirtualListVerticalLayout"/>
@@ -110,6 +114,9 @@
<component id="SpinnerButton" class="org.apache.royale.html.supportClasses.SpinnerButton"/>
<component id="Slider" class="org.apache.royale.html.Slider"/>
<component id="NumericStepper" class="org.apache.royale.html.NumericStepper" />
+ <component id="DataItemRenderer" class="org.apache.royale.html.supportClasses.DataItemRenderer"/>
+ <component id="MXMLBeadView" class="org.apache.royale.html.MXMLBeadView"/>
+ <component id="MXMLItemRenderer" class="org.apache.royale.html.supportClasses.MXMLItemRenderer"/>
<component id="AlternatingBackgroundColorStringItemRenderer" class="org.apache.royale.html.supportClasses.AlternatingBackgroundColorStringItemRenderer"/>
<component id="StringItemRenderer" class="org.apache.royale.html.supportClasses.StringItemRenderer"/>
<component id="AccordionItemRenderer" class="org.apache.royale.html.supportClasses.AccordionItemRenderer"/>
@@ -149,6 +156,7 @@
<!--
<component id="ImageAndTextButtonView" class="org.apache.royale.html.beads.ImageAndTextButtonView" />
-->
+ <component id="Viewport" class="org.apache.royale.html.supportClasses.Viewport" />
<component id="ScrollingViewport" class="org.apache.royale.html.supportClasses.ScrollingViewport" />
<component id="HScrollViewport" class="org.apache.royale.html.supportClasses.HScrollViewport" />
<component id="VScrollViewport" class="org.apache.royale.html.supportClasses.VScrollViewport" />
diff --git a/frameworks/projects/Basic/src/main/royale/BasicClasses.as b/frameworks/projects/Basic/src/main/royale/BasicClasses.as
index 200ed73..603a0e6 100644
--- a/frameworks/projects/Basic/src/main/royale/BasicClasses.as
+++ b/frameworks/projects/Basic/src/main/royale/BasicClasses.as
@@ -67,10 +67,11 @@ internal class BasicClasses
import org.apache.royale.html.beads.controllers.CascadingMenuSelectionMouseController; CascadingMenuSelectionMouseController;
import org.apache.royale.html.supportClasses.CascadingMenuItemRenderer; CascadingMenuItemRenderer;
-
COMPILE::SWF
{
import org.apache.royale.html.beads.BackgroundImageBead; BackgroundImageBead;
+ import org.apache.royale.html.supportClasses.ContainerContentArea; ContainerContentArea;
+ import org.apache.royale.html.beads.TextFieldViewBase; TextFieldViewBase;
}
import org.apache.royale.html.beads.ButtonBarView; ButtonBarView;
COMPILE::SWF
@@ -78,7 +79,12 @@ internal class BasicClasses
import org.apache.royale.html.beads.CheckBoxView; CheckBoxView;
}
import org.apache.royale.html.beads.ComboBoxView; ComboBoxView;
-
+ import org.apache.royale.html.MXMLBeadView; MXMLBeadView;
+ import org.apache.royale.html.beads.GroupView; GroupView;
+ import org.apache.royale.html.beads.ContainerView; ContainerView;
+ import org.apache.royale.core.supportClasses.StyledImageBase; StyledImageBase;
+
+
COMPILE::SWF
{
import org.apache.royale.html.beads.ControlBarMeasurementBead; ControlBarMeasurementBead;
@@ -94,6 +100,7 @@ internal class BasicClasses
import org.apache.royale.html.beads.ImageButtonView; ImageButtonView;
import org.apache.royale.html.beads.BinaryImageLoader; BinaryImageLoader;
import org.apache.royale.html.beads.models.BinaryImageModel; BinaryImageModel;
+
import org.apache.royale.html.beads.ListView; ListView;
import org.apache.royale.html.beads.NumericStepperView; NumericStepperView;
import org.apache.royale.html.beads.PanelView; PanelView;
@@ -103,6 +110,9 @@ internal class BasicClasses
import org.apache.royale.html.beads.layouts.VerticalSliderLayout; VerticalSliderLayout;
import org.apache.royale.html.beads.PanelWithControlBarView; PanelWithControlBarView;
import org.apache.royale.html.beads.AccordionItemRendererView; AccordionItemRendererView;
+ import org.apache.royale.html.supportClasses.MXMLItemRenderer; MXMLItemRenderer;
+ import org.apache.royale.core.StyledMXMLItemRenderer; StyledMXMLItemRenderer;
+
COMPILE::SWF
{
import org.apache.royale.html.beads.RadioButtonView; RadioButtonView;
@@ -115,6 +125,7 @@ internal class BasicClasses
import org.apache.royale.html.beads.SliderTrackView; SliderTrackView;
import org.apache.royale.html.beads.SingleLineBorderWithChangeListenerBead; SingleLineBorderWithChangeListenerBead;
}
+
import org.apache.royale.html.beads.SpinnerView; SpinnerView;
COMPILE::SWF
{
@@ -129,6 +140,7 @@ internal class BasicClasses
import org.apache.royale.html.beads.TextInputWithBorderView; TextInputWithBorderView;
}
import org.apache.royale.html.beads.models.AlertModel; AlertModel;
+ import org.apache.royale.html.beads.models.ArraySelectionModel; ArraySelectionModel;
import org.apache.royale.html.beads.models.ArrayListSelectionModel; ArrayListSelectionModel;
import org.apache.royale.html.beads.models.SingleSelectionCollectionViewModel; SingleSelectionCollectionViewModel;
import org.apache.royale.html.beads.models.TreeModel; TreeModel;
@@ -136,6 +148,8 @@ internal class BasicClasses
import org.apache.royale.html.beads.models.RangeModel; RangeModel;
import org.apache.royale.html.beads.models.RangeModelExtended; RangeModelExtended;
import org.apache.royale.html.beads.models.ComboBoxModel; ComboBoxModel;
+ import org.apache.royale.html.beads.models.ViewportModel; ViewportModel;
+
COMPILE::SWF
{
import org.apache.royale.html.beads.models.ImageModel; ImageModel;
@@ -154,6 +168,7 @@ internal class BasicClasses
{
import org.apache.royale.html.beads.models.ValueToggleButtonModel; ValueToggleButtonModel;
}
+ import org.apache.royale.html.beads.models.ViewportModel; ViewportModel;
COMPILE::SWF
{
import org.apache.royale.html.beads.controllers.DropDownListController; DropDownListController;
@@ -161,6 +176,7 @@ internal class BasicClasses
}
import org.apache.royale.html.beads.controllers.ComboBoxController; ComboBoxController;
import org.apache.royale.html.beads.controllers.AccordionItemRendererMouseController; AccordionItemRendererMouseController;
+ import org.apache.royale.html.beads.controllers.ItemRendererMouseController; ItemRendererMouseController;
import org.apache.royale.html.beads.controllers.ListSingleSelectionMouseController; ListSingleSelectionMouseController;
import org.apache.royale.html.beads.controllers.TreeSingleSelectionMouseController; TreeSingleSelectionMouseController;
import org.apache.royale.html.beads.controllers.MenuSelectionMouseController; MenuSelectionMouseController;
@@ -184,10 +200,13 @@ internal class BasicClasses
import org.apache.royale.html.beads.layouts.OneFlexibleChildHorizontalLayout; OneFlexibleChildHorizontalLayout;
import org.apache.royale.html.beads.layouts.OneFlexibleChildVerticalLayout; OneFlexibleChildVerticalLayout;
+
+
COMPILE::SWF
{
import org.apache.royale.html.beads.layouts.HScrollBarLayout; HScrollBarLayout;
import org.apache.royale.html.beads.layouts.VScrollBarLayout; VScrollBarLayout;
+ import org.apache.royale.html.supportClasses.ContainerContentArea; ContainerContentArea;
}
import org.apache.royale.html.beads.layouts.TileLayout; TileLayout;
import org.apache.royale.html.beads.TextItemRendererFactoryForArrayData; TextItemRendererFactoryForArrayData;
@@ -195,9 +214,13 @@ internal class BasicClasses
import org.apache.royale.html.beads.DynamicItemsRendererFactoryForArrayListData; DynamicItemsRendererFactoryForArrayListData;
import org.apache.royale.html.beads.DataItemRendererFactoryForArrayList; DataItemRendererFactoryForArrayList;
import org.apache.royale.html.beads.DataItemRendererFactoryForHierarchicalData; DataItemRendererFactoryForHierarchicalData;
+ import org.apache.royale.html.beads.DataItemRendererFactoryForCollectionView; DataItemRendererFactoryForCollectionView;
+ import org.apache.royale.html.supportClasses.DataGroup; DataGroup;
+ import org.apache.royale.html.supportClasses.Border; Border;
+ import org.apache.royale.html.supportClasses.Viewport; Viewport;
import org.apache.royale.html.supportClasses.ScrollingViewport; ScrollingViewport;
import org.apache.royale.html.supportClasses.TextButtonItemRenderer; TextButtonItemRenderer;
-
+ import org.apache.royale.html.supportClasses.UIItemRendererBase; UIItemRendererBase;
import org.apache.royale.html.DataGridButtonBarTextButton; DataGridButtonBarTextButton;
import org.apache.royale.html.DataGridButtonBar; DataGridButtonBar;
import org.apache.royale.html.beads.DataGridColumnView; DataGridColumnView;
@@ -206,6 +229,7 @@ internal class BasicClasses
import org.apache.royale.html.beads.DataGridPercentageView; DataGridPercentageView;
import org.apache.royale.html.beads.layouts.DataGridLayout; DataGridLayout;
import org.apache.royale.html.beads.layouts.DataGridPercentageLayout; DataGridPercentageLayout;
+ import org.apache.royale.html.beads.layouts.LayoutChangeNotifier; LayoutChangeNotifier;
import org.apache.royale.html.beads.DateChooserView; DateChooserView;
import org.apache.royale.html.beads.DateFieldView; DateFieldView;
import org.apache.royale.html.beads.DecrementButtonView; DecrementButtonView;
@@ -235,7 +259,12 @@ internal class BasicClasses
import org.apache.royale.core.Lookalike; Lookalike;
import org.apache.royale.core.FilledRectangle; FilledRectangle;
-
+ import org.apache.royale.core.UIBase; UIBase;
+ import org.apache.royale.core.StyledUIBase; StyledUIBase;
+ import org.apache.royale.core.GroupBase; GroupBase;
+ import org.apache.royale.core.ContainerBase; ContainerBase;
+ import org.apache.royale.core.ViewBase; ViewBase;
+
COMPILE::JS
{
import org.apache.royale.core.UIElement; UIElement;
@@ -256,6 +285,7 @@ internal class BasicClasses
import org.apache.royale.svg.CompoundGraphic; CompoundGraphic;
import org.apache.royale.html.beads.models.DataProviderModel; DataProviderModel;
+ import org.apache.royale.html.beads.DataContainerView; DataContainerView;
COMPILE::SWF
{
diff --git a/frameworks/projects/Core/src/main/royale/org/apache/royale/core/ContainerBase.as b/frameworks/projects/Basic/src/main/royale/org/apache/royale/core/ContainerBase.as
similarity index 100%
rename from frameworks/projects/Core/src/main/royale/org/apache/royale/core/ContainerBase.as
rename to frameworks/projects/Basic/src/main/royale/org/apache/royale/core/ContainerBase.as
diff --git a/frameworks/projects/Core/src/main/royale/org/apache/royale/core/DataContainerBase.as b/frameworks/projects/Basic/src/main/royale/org/apache/royale/core/DataContainerBase.as
similarity index 100%
rename from frameworks/projects/Core/src/main/royale/org/apache/royale/core/DataContainerBase.as
rename to frameworks/projects/Basic/src/main/royale/org/apache/royale/core/DataContainerBase.as
diff --git a/frameworks/projects/Core/src/main/royale/org/apache/royale/core/GroupBase.as b/frameworks/projects/Basic/src/main/royale/org/apache/royale/core/GroupBase.as
similarity index 100%
rename from frameworks/projects/Core/src/main/royale/org/apache/royale/core/GroupBase.as
rename to frameworks/projects/Basic/src/main/royale/org/apache/royale/core/GroupBase.as
diff --git a/frameworks/projects/Core/src/main/royale/org/apache/royale/core/StyledMXMLItemRenderer.as b/frameworks/projects/Basic/src/main/royale/org/apache/royale/core/StyledMXMLItemRenderer.as
similarity index 100%
rename from frameworks/projects/Core/src/main/royale/org/apache/royale/core/StyledMXMLItemRenderer.as
rename to frameworks/projects/Basic/src/main/royale/org/apache/royale/core/StyledMXMLItemRenderer.as
diff --git a/frameworks/projects/Core/src/main/royale/org/apache/royale/core/StyledUIBase.as b/frameworks/projects/Basic/src/main/royale/org/apache/royale/core/StyledUIBase.as
similarity index 100%
rename from frameworks/projects/Core/src/main/royale/org/apache/royale/core/StyledUIBase.as
rename to frameworks/projects/Basic/src/main/royale/org/apache/royale/core/StyledUIBase.as
diff --git a/frameworks/projects/Core/src/main/royale/org/apache/royale/core/ViewBase.as b/frameworks/projects/Basic/src/main/royale/org/apache/royale/core/ViewBase.as
similarity index 100%
rename from frameworks/projects/Core/src/main/royale/org/apache/royale/core/ViewBase.as
rename to frameworks/projects/Basic/src/main/royale/org/apache/royale/core/ViewBase.as
diff --git a/frameworks/projects/Core/src/main/royale/org/apache/royale/core/supportClasses/StyledImageBase.as b/frameworks/projects/Basic/src/main/royale/org/apache/royale/core/supportClasses/StyledImageBase.as
similarity index 100%
rename from frameworks/projects/Core/src/main/royale/org/apache/royale/core/supportClasses/StyledImageBase.as
rename to frameworks/projects/Basic/src/main/royale/org/apache/royale/core/supportClasses/StyledImageBase.as
diff --git a/frameworks/projects/Core/src/main/resources/basic-manifest.xml b/frameworks/projects/Core/src/main/resources/basic-manifest.xml
index 2243cea..5556ce8 100644
--- a/frameworks/projects/Core/src/main/resources/basic-manifest.xml
+++ b/frameworks/projects/Core/src/main/resources/basic-manifest.xml
@@ -50,17 +50,5 @@
<component id="StyleChangeNotifier" class="org.apache.royale.core.StyleChangeNotifier"/>
- <component id="DataItemRenderer" class="org.apache.royale.html.supportClasses.DataItemRenderer"/>
- <component id="MXMLItemRenderer" class="org.apache.royale.html.supportClasses.MXMLItemRenderer"/>
-
- <component id="MXMLBeadView" class="org.apache.royale.html.MXMLBeadView"/>
- <component id="LayoutChangeNotifier" class="org.apache.royale.html.beads.layouts.LayoutChangeNotifier"/>
-
- <component id="Group" class="org.apache.royale.html.Group"/>
- <component id="Viewport" class="org.apache.royale.html.supportClasses.Viewport" />
- <component id="Border" class="org.apache.royale.html.supportClasses.Border"/>
-
- <component id="ArraySelectionModel" class="org.apache.royale.html.beads.models.ArraySelectionModel" />
-
<component id="State" class="org.apache.royale.states.State"/>
</componentPackage>
diff --git a/frameworks/projects/Core/src/main/royale/CoreClasses.as b/frameworks/projects/Core/src/main/royale/CoreClasses.as
index 3b95f7f..524237b 100644
--- a/frameworks/projects/Core/src/main/royale/CoreClasses.as
+++ b/frameworks/projects/Core/src/main/royale/CoreClasses.as
@@ -29,25 +29,15 @@ internal class CoreClasses
import org.apache.royale.core.IId; IId;
import org.apache.royale.core.UIBase; UIBase;
import org.apache.royale.utils.IClassSelectorListSupport; IClassSelectorListSupport;
- import org.apache.royale.core.StyledUIBase; StyledUIBase;
- import org.apache.royale.core.supportClasses.StyledImageBase; StyledImageBase;
- import org.apache.royale.core.StyledMXMLItemRenderer; StyledMXMLItemRenderer;
import org.apache.royale.core.LayoutBase; LayoutBase;
- import org.apache.royale.core.ViewBase; ViewBase;
- import org.apache.royale.core.GroupBase; GroupBase;
- import org.apache.royale.core.ContainerBase; ContainerBase;
import org.apache.royale.core.ContainerBaseStrandChildren; ContainerBaseStrandChildren;
import org.apache.royale.core.ApplicationBase; ApplicationBase;
- import org.apache.royale.core.DataContainerBase; DataContainerBase;
- import org.apache.royale.html.supportClasses.UIItemRendererBase; UIItemRendererBase;
- import org.apache.royale.html.supportClasses.DataItemRenderer; DataItemRenderer;
- import org.apache.royale.html.supportClasses.MXMLItemRenderer; MXMLItemRenderer;
import org.apache.royale.core.IList; IList;
import org.apache.royale.core.IIcon; IIcon;
import org.apache.royale.core.IIconSupport; IIconSupport;
import org.apache.royale.html.beads.IListView; IListView;
import org.apache.royale.events.ItemAddedEvent; ItemAddedEvent;
- import org.apache.royale.events.ItemRemovedEvent; ItemRemovedEvent;
+import org.apache.royale.events.ItemRemovedEvent; ItemRemovedEvent;
import org.apache.royale.html.beads.IDropDownListView; IDropDownListView;
import org.apache.royale.events.ItemAddedEvent; ItemAddedEvent;
@@ -55,19 +45,9 @@ internal class CoreClasses
import org.apache.royale.events.ItemRemovedEvent; ItemRemovedEvent;
import org.apache.royale.events.ItemRendererEvent; ItemRendererEvent;
- import org.apache.royale.html.MXMLBeadView; MXMLBeadView;
- import org.apache.royale.html.beads.GroupView; GroupView;
- import org.apache.royale.html.beads.ContainerView; ContainerView;
- import org.apache.royale.html.beads.DataContainerView; DataContainerView;
import org.apache.royale.html.beads.IBackgroundBead; IBackgroundBead;
import org.apache.royale.html.beads.IBorderBead; IBorderBead;
- import org.apache.royale.html.supportClasses.DataGroup; DataGroup;
- import org.apache.royale.html.supportClasses.Border; Border;
- import org.apache.royale.html.supportClasses.Viewport; Viewport;
-
- import org.apache.royale.html.beads.models.ViewportModel; ViewportModel;
-
import org.apache.royale.core.BeadViewBase; BeadViewBase;
import org.apache.royale.core.ImageViewBase; ImageViewBase;
import org.apache.royale.core.BrowserWindow; BrowserWindow;
@@ -77,10 +57,8 @@ internal class CoreClasses
COMPILE::SWF
{
import org.apache.royale.core.UIButtonBase; UIButtonBase;
- import org.apache.royale.html.supportClasses.ContainerContentArea; ContainerContentArea;
import org.apache.royale.core.CSSTextField; CSSTextField;
import org.apache.royale.html.beads.ITextFieldView; ITextFieldView;
- import org.apache.royale.html.beads.TextFieldViewBase; TextFieldViewBase;
// import Promise; Promise;
import org.apache.royale.core.ApplicationFactory; ApplicationFactory;
import org.apache.royale.core.CSSShape; CSSShape;
@@ -164,7 +142,6 @@ internal class CoreClasses
import org.apache.royale.core.IViewportModel; IViewportModel;
import org.apache.royale.core.IApplicationView; IApplicationView;
- import org.apache.royale.html.beads.models.ArraySelectionModel; ArraySelectionModel;
COMPILE::SWF
{
diff --git a/frameworks/projects/Core/src/main/royale/org/apache/royale/core/View.as b/frameworks/projects/Core/src/main/royale/org/apache/royale/core/View.as
deleted file mode 100644
index 88632e0..0000000
--- a/frameworks/projects/Core/src/main/royale/org/apache/royale/core/View.as
+++ /dev/null
@@ -1,125 +0,0 @@
-////////////////////////////////////////////////////////////////////////////////
-//
-// Licensed to the Apache Software Foundation (ASF) under one or more
-// 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 "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
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
-////////////////////////////////////////////////////////////////////////////////
-package org.apache.royale.core
-{
- import org.apache.royale.core.IMXMLDocument;
- import org.apache.royale.core.ValuesManager;
- import org.apache.royale.events.Event;
- import org.apache.royale.utils.MXMLDataInterpreter;
-
- /**
- * The default property uses when additional MXML content appears within an element's
- * definition in an MXML file.
- */
- [DefaultProperty("mxmlContent")]
-
- /**
- * The View class is the class for most views in a Royale
- * application. It is generally used as the root tag of MXML
- * documents and UI controls and containers are added to it.
- *
- * @langversion 3.0
- * @playerversion Flash 10.2
- * @playerversion AIR 2.6
- * @productversion Royale 0.0
- */
- public class View extends ViewBase implements IMXMLDocument
- {
- public function View()
- {
- super();
- }
-
- private var _mxmlDescriptor:Array;
- private var _mxmlDocument:Object = this;
- private var _initialized:Boolean;
-
- /**
- * @private
- */
- override public function addedToParent():void
- {
- if (!_initialized)
- {
- // each MXML file can also have styles in fx:Style block
- ValuesManager.valuesImpl.init(this);
- }
-
- super.addedToParent();
-
- if (!_initialized)
- {
- MXMLDataInterpreter.generateMXMLInstances(_mxmlDocument, this, MXMLDescriptor);
-
- dispatchEvent(new Event("initBindings"));
- dispatchEvent(new Event("initComplete"));
- _initialized = true;
-
- // - why was this added here? childrenAdded(); //?? Is this necessary since MXMLDataInterpreter will already have called it
- }
- }
-
- /**
- * @copy org.apache.royale.core.Application#MXMLDescriptor
- *
- * @langversion 3.0
- * @playerversion Flash 10.2
- * @playerversion AIR 2.6
- * @productversion Royale 0.8
- */
- public function get MXMLDescriptor():Array
- {
- return _mxmlDescriptor;
- }
-
- /**
- * @private
- */
- public function setMXMLDescriptor(document:Object, value:Array):void
- {
- _mxmlDocument = document;
- _mxmlDescriptor = value;
- }
-
- /**
- * @copy org.apache.royale.core.Application#generateMXMLAttributes()
- *
- * @langversion 3.0
- * @playerversion Flash 10.2
- * @playerversion AIR 2.6
- * @productversion Royale 0.8
- */
- public function generateMXMLAttributes(data:Array):void
- {
- MXMLDataInterpreter.generateMXMLProperties(this, data);
- }
-
- /**
- * @copy org.apache.royale.core.ItemRendererClassFactory#mxmlContent
- *
- * @langversion 3.0
- * @playerversion Flash 10.2
- * @playerversion AIR 2.6
- * @productversion Royale 0.8
- *
- * @royalesuppresspublicvarwarning
- */
- public var mxmlContent:Array;
- }
-}
[royale-asjs] 08/10: Merge branch 'feature/MXRoyale' into
feature/new_merge
Posted by ha...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
harbs pushed a commit to branch feature/new_merge
in repository https://gitbox.apache.org/repos/asf/royale-asjs.git
commit 451a2c00a99ab9687d9314d19aea10ed8e07e632
Merge: 8b64e10 7f71ed3
Author: Harbs <ha...@in-tools.com>
AuthorDate: Sun Sep 2 21:24:52 2018 +0300
Merge branch 'feature/MXRoyale' into feature/new_merge
# Conflicts:
# .gitignore
# build.xml
# frameworks/projects/Basic/src/main/resources/basic-manifest.xml
# frameworks/projects/Basic/src/main/royale/BasicClasses.as
# frameworks/projects/Basic/src/main/royale/org/apache/royale/core/IList.as
# frameworks/projects/Basic/src/main/royale/org/apache/royale/core/IStrandWithPresentationModel.as
# frameworks/projects/Basic/src/main/royale/org/apache/royale/core/UIBase.as
# frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/ContainerView.as
# frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/DataContainerView.as
# frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/PanelView.as
# frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/TreeGridView.as
# frameworks/projects/Basic/src/main/royale/org/apache/royale/html/supportClasses/DataGroup.as
# frameworks/projects/Basic/src/main/royale/org/apache/royale/html/supportClasses/DateFieldDateChooser.as
# frameworks/projects/Basic/src/main/royale/org/apache/royale/html/supportClasses/TreeItemRenderer.as
# frameworks/projects/Core/src/main/royale/org/apache/royale/core/IList.as
# frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/List.as
# frameworks/projects/MXRoyale/src/main/royale/mx/controls/listClasses/ListBase.as
# frameworks/projects/Network/src/main/royale/NetworkClasses.as
# frameworks/projects/Network/src/main/royale/org/apache/royale/net/RemoteObject.as
# frameworks/projects/Network/src/main/royale/org/apache/royale/net/remoting/Operation.as
# frameworks/projects/Network/src/main/royale/org/apache/royale/net/remoting/messages/AbstractMessage.as
# frameworks/projects/Network/src/main/royale/org/apache/royale/net/remoting/messages/AcknowledgeMessageExt.as
# frameworks/projects/Network/src/main/royale/org/apache/royale/net/remoting/messages/AsyncMessage.as
# frameworks/projects/pom.xml
.gitignore | 7 +-
build.xml | 35 +-
examples/mxroyale/tourdeflexmodules/README | 80 +
examples/mxroyale/tourdeflexmodules/RELEASE_NOTES | 68 +
examples/mxroyale/tourdeflexmodules/build.xml | 578 ++
.../html-template/history/history.css | 22 +
.../html-template/history/history.js | 694 ++
.../html-template/history/historyFrame.html | 45 +
.../html-template/index.template.html | 124 +
examples/mxroyale/tourdeflexmodules/installer.xml | 127 +
.../mxroyale/tourdeflexmodules/src/3rdparty.xml | 30 +
.../mxroyale/tourdeflexmodules/src/SourceTab.mxml | 98 +
.../tourdeflexmodules/src/SpellingConfig.xml | 24 +-
.../tourdeflexmodules/src/ThirdPartyTab.mxml | 31 +
.../mxroyale/tourdeflexmodules/src/Welcome.mxml | 52 +
.../src/apache/ApacheFlex4_10_0.mxml | 55 +
.../src/apache/ApacheFlex4_11_0.mxml | 55 +
.../src/apache/ApacheFlex4_12_1.mxml | 57 +
.../src/apache/ApacheFlex4_13_0.mxml | 53 +
.../src/apache/ApacheFlex4_14_0.mxml | 53 +
.../src/apache/ApacheFlex4_8_0.mxml | 51 +
.../src/apache/ApacheFlex4_9_0.mxml | 57 +
.../tourdeflexmodules/src/apache/Squiggly1_1.mxml | 50 +
.../src/apache/assets/ApacheFlexLogo.png | Bin 0 -> 71228 bytes
.../src/apache/containers/CalloutExample.mxml | 43 +-
.../apache/controls/MaskedTextInputExample.mxml | 35 +-
.../controls/SparkRichTextEditorExample.mxml | 57 +
.../formatters/PostCodeFormatterExample.mxml | 88 +
.../src/apache/i18n/DateExample.mxml | 84 +
.../src/apache/i18n/LocaleExample.mxml | 67 +
.../src/apache/i18n/MillisecondExample.mxml | 57 +
.../src/apache/i18n/NumericStepperExample.mxml | 36 +-
.../src/apache/i18n/ScientificExample.mxml | 44 +
.../src/apache/i18n/TimeZoneExample.mxml | 67 +
.../src/apache/squiggly/SpellingConfig.xml | 24 +-
.../src/apache/squiggly/SpellingExExample.mxml | 44 +
.../src/apache/squiggly/SpellingExample.mxml | 49 +
.../validators/PostCodeValidatorExample.mxml | 85 +
.../mxroyale/tourdeflexmodules/src/explorer.mxml | 235 +
.../mxroyale/tourdeflexmodules/src/explorer.xml | 486 +
.../mxroyale/tourdeflexmodules/src/favicon.ico | Bin 0 -> 1150 bytes
examples/mxroyale/tourdeflexmodules/src/index.html | 79 +
.../tourdeflexmodules/src/loaderPanel.mxml | 74 +
.../src/mx/charts/BubbleChartExample.mxml | 64 +
.../src/mx/charts/CandlestickChartExample.mxml | 90 +
.../src/mx/charts/Column_BarChartExample.mxml | 119 +
.../src/mx/charts/DateTimeAxisExample.mxml | 72 +
.../src/mx/charts/GridLinesExample.mxml | 71 +
.../src/mx/charts/HLOCChartExample.mxml | 81 +
.../src/mx/charts/Line_AreaChartExample.mxml | 91 +
.../src/mx/charts/LogAxisExample.mxml | 65 +
.../src/mx/charts/PieChartExample.mxml | 86 +
.../src/mx/charts/PlotChartExample.mxml | 81 +
.../src/mx/charts/SeriesInterpolateExample.mxml | 99 +
.../src/mx/charts/SeriesSlideExample.mxml | 101 +
.../src/mx/charts/SeriesZoomExample.mxml | 101 +
.../src/mx/containers/AccordionExample.mxml | 56 +
.../src/mx/containers/DividedBoxExample.mxml | 42 +
.../src/mx/containers/FormExample.mxml | 88 +
.../src/mx/containers/GridLayoutExample.mxml | 70 +
.../src/mx/containers/HBoxExample.mxml | 42 +
.../src/mx/containers/HDividedBoxExample.mxml | 44 +
.../SimpleApplicationControlBarExample.mxml | 58 +
.../src/mx/containers/SimpleBoxExample.mxml | 49 +
.../src/mx/containers/SimpleCanvasExample.mxml | 48 +
.../src/mx/containers/SimpleControlBarExample.mxml | 44 +
.../src/mx/containers/SimplePanelExample.mxml | 47 +
.../mx/containers/SimpleTitleWindowExample.mxml | 52 +
.../src/mx/containers/TabNavigatorExample.mxml | 57 +
.../src/mx/containers/TileLayoutExample.mxml | 45 +
.../src/mx/containers/TitleWindowApp.mxml | 66 +
.../src/mx/containers/VBoxExample.mxml | 42 +
.../src/mx/containers/VDividedBoxExample.mxml | 44 +
.../src/mx/containers/ViewStackExample.mxml | 60 +
.../src/mx/containers/assets/ApacheFlexLogo.png | Bin 0 -> 71228 bytes
.../src/mx/controls/AdvancedDataGridExample.mxml | 78 +
.../src/mx/controls/ButtonBarExample.mxml | 58 +
.../src/mx/controls/ButtonExample.mxml | 65 +
.../src/mx/controls/CheckBoxExample.mxml | 78 +
.../src/mx/controls/ColorPickerExample.mxml | 35 +
.../src/mx/controls/DateChooserExample.mxml | 70 +
.../src/mx/controls/DateFieldExample.mxml | 60 +
.../src/mx/controls/HScrollBarExample.mxml | 58 +
.../src/mx/controls/HorizontalListExample.mxml | 70 +
.../src/mx/controls/LabelExample.mxml | 50 +
.../src/mx/controls/LinkBarExample.mxml | 50 +
.../src/mx/controls/LinkButtonExample.mxml | 40 +
.../tourdeflexmodules/src/mx/controls/Local.mxml | 26 +
.../src/mx/controls/MenuBarExample.mxml | 81 +
.../src/mx/controls/NumericStepperExample.mxml | 45 +
.../src/mx/controls/OLAPDataGridExample.mxml | 208 +
.../src/mx/controls/PopUpButtonExample.mxml | 68 +
.../src/mx/controls/PopUpButtonMenuExample.mxml | 59 +
.../src/mx/controls/RadioButtonExample.mxml | 44 +
.../src/mx/controls/RadioButtonGroupExample.mxml | 64 +
.../src/mx/controls/RichTextEditorExample.mxml | 39 +
.../src/mx/controls/SimpleAlert.mxml | 78 +
.../src/mx/controls/SimpleComboBox.mxml | 55 +
.../src/mx/controls/SimpleDataGrid.mxml | 81 +
.../src/mx/controls/SimpleHRule.mxml | 38 +
.../src/mx/controls/SimpleImage.mxml | 32 +
.../src/mx/controls/SimpleImageHSlider.mxml | 60 +
.../src/mx/controls/SimpleImageVSlider.mxml | 64 +
.../src/mx/controls/SimpleList.mxml | 62 +
.../src/mx/controls/SimpleLoader.mxml | 34 +
.../src/mx/controls/SimpleMenuExample.mxml | 75 +
.../src/mx/controls/SimpleProgressBar.mxml | 60 +
.../src/mx/controls/SimpleVRule.mxml | 34 +
.../src/mx/controls/SpacerExample.mxml | 39 +
.../src/mx/controls/TabBarExample.mxml | 60 +
.../src/mx/controls/TextAreaExample.mxml | 40 +
.../src/mx/controls/TextExample.mxml | 42 +
.../src/mx/controls/TextInputExample.mxml | 35 +
.../src/mx/controls/TileListExample.mxml | 71 +
.../src/mx/controls/ToggleButtonBarExample.mxml | 58 +
.../src/mx/controls/TreeExample.mxml | 70 +
.../src/mx/controls/VScrollBarExample.mxml | 58 +
.../src/mx/controls/VideoDisplayExample.mxml | 40 +
.../src/mx/controls/assets/ApacheFlexIcon.png | Bin 0 -> 7983 bytes
.../src/mx/controls/assets/ApacheFlexLogo.png | Bin 0 -> 71228 bytes
.../src/mx/controls/assets/buttonDisabled.gif | Bin 0 -> 537 bytes
.../src/mx/controls/assets/buttonDown.gif | Bin 0 -> 592 bytes
.../src/mx/controls/assets/buttonOver.gif | Bin 0 -> 1175 bytes
.../src/mx/controls/assets/buttonUp.gif | Bin 0 -> 626 bytes
.../src/mx/controls/assets/flexinstaller.mp4 | Bin 0 -> 511625 bytes
.../src/mx/core/RepeaterExample.mxml | 54 +
.../src/mx/core/SimpleApplicationExample.mxml | 61 +
.../src/mx/effects/AddItemActionEffectExample.mxml | 103 +
.../mx/effects/AnimatePropertyEffectExample.mxml | 42 +
.../src/mx/effects/BlurEffectExample.mxml | 46 +
.../src/mx/effects/CompositeEffectExample.mxml | 101 +
.../src/mx/effects/DefaultListEffectExample.mxml | 80 +
.../mx/effects/DefaultTileListEffectExample.mxml | 82 +
.../src/mx/effects/DissolveEffectExample.mxml | 61 +
.../src/mx/effects/FadeEffectExample.mxml | 57 +
.../src/mx/effects/GlowEffectExample.mxml | 50 +
.../src/mx/effects/IrisEffectExample.mxml | 44 +
.../src/mx/effects/MoveEffectExample.mxml | 54 +
.../src/mx/effects/ParallelEffectExample.mxml | 54 +
.../src/mx/effects/PauseEffectExample.mxml | 50 +
.../src/mx/effects/ResizeEffectExample.mxml | 45 +
.../src/mx/effects/RotateEffectExample.mxml | 69 +
.../src/mx/effects/SequenceEffectExample.mxml | 50 +
.../src/mx/effects/SimpleEffectExample.mxml | 70 +
.../src/mx/effects/SimpleTweenEffectExample.mxml | 76 +
.../src/mx/effects/SoundEffectExample.mxml | 40 +
.../src/mx/effects/WipeDownExample.mxml | 49 +
.../src/mx/effects/WipeLeftExample.mxml | 49 +
.../src/mx/effects/WipeRightExample.mxml | 49 +
.../src/mx/effects/WipeUpExample.mxml | 49 +
.../src/mx/effects/ZoomEffectExample.mxml | 59 +
.../src/mx/effects/assets/ApacheFlexLogo.png | Bin 0 -> 71228 bytes
.../src/mx/effects/assets/OpenSans-Regular.ttf | Bin 0 -> 217360 bytes
.../src/mx/effects/assets/ping.mp3 | Bin 0 -> 91582 bytes
.../mx/formatters/CurrencyFormatterExample.mxml | 74 +
.../src/mx/formatters/DateFormatterExample.mxml | 68 +
.../src/mx/formatters/NumberFormatterExample.mxml | 71 +
.../src/mx/formatters/PhoneFormatterExample.mxml | 70 +
.../src/mx/formatters/SimpleFormatterExample.mxml | 68 +
.../formatters/SwitchSymbolFormatterExample.mxml | 66 +
.../src/mx/formatters/ZipCodeFormatterExample.mxml | 69 +
.../mx/printing/AdvancedPrintDataGridExample.mxml | 107 +
.../src/mx/printing/FormPrintFooter.mxml | 34 +
.../src/mx/printing/FormPrintHeader.mxml | 25 +
.../src/mx/printing/FormPrintView.mxml | 77 +
.../src/mx/printing/PrintDataGridExample.mxml | 145 +
.../src/mx/states/StatesExample.mxml | 59 +
.../src/mx/states/TransitionExample.mxml | 85 +
.../mx/validators/CreditCardValidatorExample.mxml | 71 +
.../mx/validators/CurrencyValidatorExample.mxml | 48 +
.../src/mx/validators/DateValidatorExample.mxml | 55 +
.../src/mx/validators/EmailValidatorExample.mxml | 48 +
.../src/mx/validators/NumberValidatorExample.mxml | 49 +
.../mx/validators/PhoneNumberValidatorExample.mxml | 48 +
.../src/mx/validators/RegExValidatorExample.mxml | 88 +
.../src/mx/validators/SimpleValidatorExample.mxml | 79 +
.../validators/SocialSecurityValidatorExample.mxml | 48 +
.../src/mx/validators/StringValidatorExample.mxml | 51 +
.../src/mx/validators/ZipCodeValidatorExample.mxml | 48 +
.../src/spark/charts/AreaChartExample.mxml | 63 +
.../src/spark/charts/BarChartExample.mxml | 61 +
.../src/spark/charts/BubbleChartExample.mxml | 64 +
.../src/spark/charts/CandleStickChartExample.mxml | 70 +
.../src/spark/charts/ColumnChartExample.mxml | 61 +
.../src/spark/charts/HLOCChartExample.mxml | 69 +
.../src/spark/charts/LineChartExample.mxml | 63 +
.../src/spark/charts/PieChartExample.mxml | 68 +
.../src/spark/charts/PlotChartExample.mxml | 57 +
.../src/spark/charts/SeriesInterpolateExample.mxml | 105 +
.../src/spark/charts/SeriesSlideExample.mxml | 107 +
.../src/spark/charts/SeriesZoomExample.mxml | 106 +
.../src/spark/components/SearchBox.as | 176 +
.../src/spark/components/SearchBoxEvent.as | 38 +-
.../src/spark/components/SearchExample.mxml | 81 +
.../src/spark/components/VideoPlayer.mxml | 96 +
.../src/spark/components/VideoPlayerExample.mxml | 41 +-
.../src/spark/components/VideoPlayerModule.mxml | 48 +-
.../spark/components/VideoPlayerModuleLoader.mxml | 36 +-
.../src/spark/components/assets/FlexInstaller.mp4 | Bin 0 -> 511625 bytes
.../spark/components/assets/control_pause_blue.png | Bin 0 -> 721 bytes
.../spark/components/assets/control_play_blue.png | Bin 0 -> 717 bytes
.../spark/components/assets/control_stop_blue.png | Bin 0 -> 695 bytes
.../src/spark/components/assets/icon_close.png | Bin 0 -> 59707 bytes
.../src/spark/containers/BorderExample.mxml | 74 +
.../src/spark/containers/Contact.as | 67 +-
.../src/spark/containers/GroupExample.mxml | 70 +
.../src/spark/containers/PanelExample.mxml | 65 +
.../src/spark/containers/SampleHGroup.mxml | 92 +
.../src/spark/containers/SampleVGroup.mxml | 92 +
.../containers/SampleVerticalHorizontalAlign.mxml | 87 +
.../containers/SkinnableDataContainerExample.mxml | 65 +
.../src/spark/containers/TabNavigator1Example.mxml | 103 +
.../src/spark/containers/TabNavigator2Example.mxml | 110 +
.../src/spark/containers/TileGroupExample.mxml | 100 +
.../src/spark/containers/assets/arrow_icon_sm.png | Bin 0 -> 527 bytes
.../src/spark/containers/personIcon.png | Bin 0 -> 3859 bytes
.../containers/skins/CustomTabBarButtonSkin.mxml | 264 +
.../spark/containers/skins/CustomTabBarSkin.mxml | 97 +
.../src/spark/controls/AccordionExample.mxml | 59 +
.../spark/controls/AdvancedDatagridExample.mxml | 87 +
.../src/spark/controls/ButtonBarExample.mxml | 105 +
.../src/spark/controls/ButtonExample.mxml | 61 +
.../src/spark/controls/CheckboxExample.mxml | 76 +
.../src/spark/controls/ColorPickerExample.mxml | 41 +
.../src/spark/controls/ComboBoxExample.mxml | 61 +
.../src/spark/controls/CustomDataGridSkin.mxml | 375 +
.../controls/DataGridCustomRendererExample.mxml | 62 +
.../DataGridCustomRendererPrepareExample.mxml | 68 +
.../spark/controls/DataGridCustomSkinExample.mxml | 40 +-
.../src/spark/controls/DataGridExample.mxml | 86 +
.../src/spark/controls/DataGridExample2.mxml | 49 +-
.../controls/DataGridSimpleColumnsExample.mxml | 49 +
.../controls/DataGridSimpleNoWrapExample.mxml | 38 +-
.../src/spark/controls/DataGridSizingExample.mxml | 47 +
.../src/spark/controls/DataGroupExample.mxml | 134 +
.../src/spark/controls/DateChooserExample.mxml | 71 +
.../src/spark/controls/DateFieldExample.mxml | 85 +
.../src/spark/controls/DropdownExample.mxml | 86 +
.../src/spark/controls/FormExample.mxml | 82 +
.../src/spark/controls/ImageExample.mxml | 57 +
.../tourdeflexmodules/src/spark/controls/Item.as | 63 +-
.../src/spark/controls/LinkBarExample.mxml | 82 +
.../src/spark/controls/LinkButtonExample.mxml | 42 +-
.../src/spark/controls/ListDataPagingExample.mxml | 80 +
.../src/spark/controls/ListExample.mxml | 103 +
.../src/spark/controls/MenuExample.mxml | 93 +
.../src/spark/controls/MyListItemRenderer.mxml | 39 +
.../src/spark/controls/MyTextFlow.xml | 24 +-
.../src/spark/controls/NumericStepperExample.mxml | 87 +
.../src/spark/controls/OLAPDataGridExample.mxml | 223 +
.../src/spark/controls/OSMFExample.mxml | 28 +-
.../src/spark/controls/PagedList.as | 510 +
.../src/spark/controls/PopUpAnchor1Example.mxml | 85 +
.../src/spark/controls/PopUpAnchor2Example.mxml | 80 +
.../src/spark/controls/PopupButtonExample.mxml | 75 +
.../src/spark/controls/ProgressBarExample.mxml | 62 +
.../src/spark/controls/RadioButtonExample.mxml | 94 +
.../spark/controls/RichEditableTextExample.mxml | 95 +
.../src/spark/controls/SWFLoaderExample.mxml | 47 +
.../src/spark/controls/SampleHelpFormExample.mxml | 51 +
.../spark/controls/SampleSequenceFormExample.mxml | 46 +-
.../spark/controls/SampleSimpleFormExample.mxml | 46 +-
.../spark/controls/SampleStackedFormExample.mxml | 45 +
.../src/spark/controls/ScrollBarExample.mxml | 81 +
.../src/spark/controls/Scroller1Example.mxml | 77 +
.../src/spark/controls/Scroller2Example.mxml | 83 +
.../spark/controls/SimpleTitleWindowExample.mxml | 62 +
.../src/spark/controls/SliderExample.mxml | 72 +
.../src/spark/controls/SpinnerExample.mxml | 52 +
.../spark/controls/TDFGradientBackgroundSkin.mxml | 51 +-
.../src/spark/controls/TabNavigatorExample.mxml | 60 +
.../src/spark/controls/TextAreaExample.mxml | 89 +
.../src/spark/controls/TextInputExample.mxml | 100 +
.../src/spark/controls/TextLayout1Example.mxml | 163 +
.../src/spark/controls/TextLayout2Example.mxml | 143 +
.../src/spark/controls/TextLayout3Example.mxml | 91 +
.../src/spark/controls/TextLayout4Example.mxml | 78 +
.../src/spark/controls/TitleWindowExample.mxml | 71 +
.../src/spark/controls/ToggleButton2Example.mxml | 144 +
.../src/spark/controls/ToggleButtonBarExample.mxml | 64 +
.../src/spark/controls/ToggleButtonExample.mxml | 78 +
.../src/spark/controls/ToolTipExample.mxml | 39 +-
.../src/spark/controls/TreeExample.mxml | 78 +
.../src/spark/controls/VideoDisplayExample.mxml | 63 +
.../src/spark/controls/VideoPlayerExample.mxml | 73 +
.../src/spark/controls/ViewStackExample.mxml | 103 +
.../src/spark/controls/assets/ApacheFlexLogo.png | Bin 0 -> 71228 bytes
.../src/spark/controls/assets/FlexInstaller.mp4 | Bin 0 -> 511625 bytes
.../src/spark/controls/assets/arrow_icon.png | Bin 0 -> 817 bytes
.../src/spark/controls/assets/arrow_icon_sm.png | Bin 0 -> 527 bytes
.../spark/controls/assets/control_pause_blue.png | Bin 0 -> 721 bytes
.../spark/controls/assets/control_play_blue.png | Bin 0 -> 717 bytes
.../spark/controls/assets/control_stop_blue.png | Bin 0 -> 695 bytes
.../src/spark/controls/assets/icon_close.png | Bin 0 -> 59707 bytes
.../src/spark/controls/iconclose.gif | Bin 0 -> 340 bytes
.../src/spark/controls/iconinfo.gif | Bin 0 -> 227 bytes
.../src/spark/controls/images/arrow_icon_sm.png | Bin 0 -> 527 bytes
.../src/spark/controls/skins/CloseButtonSkin.mxml | 184 +
.../src/spark/controls/skins/MyPanelSkin.mxml | 101 +
.../spark/css/CSSDescendantSelectorExample.mxml | 79 +
.../src/spark/css/CSSIDSelectorExample.mxml | 72 +
.../src/spark/css/CSSTypeClassSelectorExample.mxml | 74 +
.../spark/effects/AnimatePropertiesExample.mxml | 80 +
.../src/spark/effects/AnimateTransformExample.mxml | 79 +
.../src/spark/effects/CrossFadeExample.mxml | 66 +
.../src/spark/effects/FadeExample.mxml | 57 +
.../src/spark/effects/Move3DExample.mxml | 95 +
.../src/spark/effects/Rotate3DExample.mxml | 76 +
.../src/spark/effects/Scale3DExample.mxml | 79 +
.../src/spark/effects/WipeExample.mxml | 72 +
.../src/spark/effects/assets/ApacheFlexIcon.png | Bin 0 -> 7983 bytes
.../src/spark/effects/assets/ApacheFlexLogo.png | Bin 0 -> 71228 bytes
.../src/spark/effects/assets/back.png | Bin 0 -> 121035 bytes
.../src/spark/effects/assets/images/2.jpg | Bin 0 -> 549 bytes
.../src/spark/effects/assets/images/3.jpg | Bin 0 -> 418 bytes
.../src/spark/effects/assets/images/4.jpg | Bin 0 -> 911 bytes
.../src/spark/effects/assets/images/5.jpg | Bin 0 -> 1617 bytes
.../src/spark/effects/assets/images/6.jpg | Bin 0 -> 1061 bytes
.../src/spark/effects/assets/images/7.jpg | Bin 0 -> 1754 bytes
.../src/spark/effects/assets/images/8.jpg | Bin 0 -> 1716 bytes
.../src/spark/effects/assets/images/9.jpg | Bin 0 -> 1552 bytes
.../src/spark/events/EventExample1.mxml | 46 +-
.../src/spark/events/EventExample2.mxml | 50 +-
.../src/spark/events/EventExample3.mxml | 51 +-
.../src/spark/events/EventExample4.mxml | 56 +
.../src/spark/events/EventExample5.mxml | 50 +-
.../src/spark/events/EventExample6.mxml | 53 +-
.../src/spark/events/FiveSecondTrigger.as | 43 +-
.../tourdeflexmodules/src/spark/events/MyEvent.as | 36 +-
.../spark/events/TDFGradientBackgroundSkin.mxml | 51 +-
.../spark/formatters/CurrencyFormatterExample.mxml | 77 +
.../src/spark/formatters/DateFormatterExample.mxml | 72 +
.../spark/formatters/NumberFormatterExample.mxml | 73 +
.../spark/formatters/PhoneFormatterExample.mxml | 73 +
.../spark/formatters/SwitchFormatterExample.mxml | 75 +
.../formatters/TDFGradientBackgroundSkin.mxml | 51 +-
.../spark/formatters/ZipCodeFormatterExample.mxml | 74 +
.../src/spark/fxg/BitmapImageExample.mxml | 69 +
.../src/spark/fxg/DropShadowGraphicExample.mxml | 66 +
.../src/spark/fxg/EclipseExample.mxml | 46 +
.../src/spark/fxg/EllipseTransformExample.mxml | 71 +
.../src/spark/fxg/LineExample.mxml | 96 +
.../fxg/LinearGradientsSpreadMethodExample.mxml | 63 +
.../src/spark/fxg/OrangeCrayonStar.fxg | 47 +
.../src/spark/fxg/RectExample.mxml | 82 +
.../src/spark/fxg/RichTextExample.mxml | 58 +
.../src/spark/fxg/StaticFXGExample.mxml | 52 +
.../src/spark/fxg/assets/ApacheFlexIcon.png | Bin 0 -> 7983 bytes
.../src/spark/fxg/assets/ApacheFlexLogo.png | Bin 0 -> 71228 bytes
.../src/spark/i18n/SparkCollator2Example.mxml | 86 +
.../src/spark/i18n/SparkCollatorExample.mxml | 142 +
.../spark/i18n/SparkCurrencyFormatter2Example.mxml | 57 +
.../spark/i18n/SparkCurrencyFormatterExample.mxml | 94 +
.../spark/i18n/SparkCurrencyValidator2Example.mxml | 58 +
.../spark/i18n/SparkCurrencyValidatorExample.mxml | 105 +
.../spark/i18n/SparkDateTimeFormatter2Example.mxml | 59 +
.../spark/i18n/SparkDateTimeFormatterExample.mxml | 86 +
.../src/spark/i18n/SparkFormatterExample.mxml | 60 +
.../spark/i18n/SparkNumberFormatter2Example.mxml | 56 +
.../spark/i18n/SparkNumberFormatterExample.mxml | 79 +
.../spark/i18n/SparkNumberValidator2Example.mxml | 56 +
.../spark/i18n/SparkNumberValidatorExample.mxml | 83 +
.../spark/i18n/SparkSortandSortField2Example.mxml | 67 +
.../spark/i18n/SparkSortandSortFieldExample.mxml | 107 +
.../src/spark/i18n/SparkStringToolsExample.mxml | 102 +
.../src/spark/itemRenderers/Item.as | 63 +-
.../spark/itemRenderers/ItemRenderer1Example.mxml | 58 +
.../spark/itemRenderers/ItemRenderer2Example.mxml | 69 +
.../itemRenderers/ListItemRendererExample.mxml | 102 +
.../spark/itemRenderers/MyListItemRenderer.mxml | 39 +
.../src/spark/itemRenderers/assets/1.jpg | Bin 0 -> 549 bytes
.../src/spark/itemRenderers/assets/2.jpg | Bin 0 -> 549 bytes
.../src/spark/itemRenderers/assets/3.jpg | Bin 0 -> 418 bytes
.../src/spark/itemRenderers/assets/4.jpg | Bin 0 -> 911 bytes
.../src/spark/itemRenderers/assets/5.jpg | Bin 0 -> 1617 bytes
.../src/spark/itemRenderers/assets/6.jpg | Bin 0 -> 1061 bytes
.../src/spark/itemRenderers/assets/7.jpg | Bin 0 -> 1754 bytes
.../src/spark/itemRenderers/assets/8.jpg | Bin 0 -> 1716 bytes
.../src/spark/itemRenderers/assets/9.jpg | Bin 0 -> 1552 bytes
.../spark/itemRenderers/assets/ApacheFlexIcon.png | Bin 0 -> 7983 bytes
.../src/spark/itemRenderers/data/list.xml | 96 +
.../itemRenderers/renderers/ImageRenderer1.mxml | 56 +
.../itemRenderers/renderers/ImageRenderer2.mxml | 54 +
.../spark/layouts/CustomLayoutAnimatedExample.mxml | 105 +
.../layouts/CustomLayoutFlickrWheelExample.mxml | 84 +
.../src/spark/layouts/CustomLayoutFlowExample.mxml | 85 +
.../layouts/CustomLayoutHBaselineExample.mxml | 116 +
.../src/spark/layouts/FlickrThumbnail.mxml | 80 +
.../src/spark/layouts/FlowLayout1.as | 195 +
.../src/spark/layouts/HBaselineLayout.as | 199 +
.../spark/layouts/NumberInterpolatorWrapping.as | 110 +
.../src/spark/layouts/WheelLayout.as | 516 +
.../src/spark/layouts/assets/ApacheFlexIcon.png | Bin 0 -> 7983 bytes
.../src/spark/layouts/assets/xdslider.png | Bin 0 -> 359 bytes
.../src/spark/layouts/data/catalog.xml | 179 +
.../spark/layouts/layouts/FilteredTileLayout.as | 260 +
.../src/spark/layouts/renderers/PhoneRenderer.mxml | 60 +
.../src/spark/modules/Module1.mxml | 25 +-
.../src/spark/modules/Module2.mxml | 25 +-
.../src/spark/modules/ModuleExample.mxml | 83 +
.../spark/modules/TDFGradientBackgroundSkin.mxml | 51 +-
.../spark/other/BidirectionalBinding1Example.mxml | 42 +
.../spark/other/BidirectionalBinding2Example.mxml | 101 +
.../tourdeflexmodules/src/spark/other/Contact.as | 70 +-
.../spark/other/ControllingViewportExample.mxml | 49 +
.../src/spark/other/Cursor1Example.mxml | 50 +-
.../src/spark/other/Cursor2Example.mxml | 63 +
.../src/spark/other/DragAndDrop1Example.mxml | 51 +
.../src/spark/other/DragAndDrop2Example.mxml | 82 +
.../src/spark/other/FilterExample.mxml | 88 +
.../src/spark/other/RepeaterExample.mxml | 56 +
.../src/spark/other/ScrollBarsExample.mxml | 98 +
.../src/spark/other/TDFGradientBackgroundSkin.mxml | 51 +-
.../src/spark/other/assets/ApacheFlexIcon.png | Bin 0 -> 7983 bytes
.../src/spark/other/assets/ApacheFlexLogo.png | Bin 0 -> 71228 bytes
.../spark/other/skins/CustomTabBarButtonSkin.mxml | 262 +
.../src/spark/other/skins/CustomTabBarSkin.mxml | 97 +
.../src/spark/skinning/ButtonWithIconExample.mxml | 48 +
.../skinning/SkinningApplication1Example.mxml | 44 +
.../skinning/SkinningApplication2Example.mxml | 44 +-
.../skinning/SkinningApplication3Example.mxml | 48 +
.../spark/skinning/SkinningContainerExample.mxml | 49 +
.../src/spark/skinning/assets/arrow_icon_sm.png | Bin 0 -> 527 bytes
.../src/spark/skinning/assets/icon_add.png | Bin 0 -> 737 bytes
.../src/spark/skinning/assets/icon_check.png | Bin 0 -> 481 bytes
.../src/spark/skinning/assets/icon_close16.png | Bin 0 -> 59709 bytes
.../src/spark/skinning/assets/icon_plus.png | Bin 0 -> 58539 bytes
.../src/spark/skinning/assets/icon_remove.png | Bin 0 -> 693 bytes
.../src/spark/skinning/assets/wood-bg.png | Bin 0 -> 628195 bytes
.../src/spark/skinning/skins/AddButtonSkin.mxml | 183 +
.../skinning/skins/BackgroundImageAppSkin.mxml | 42 +-
.../src/spark/skinning/skins/CloseButtonSkin.mxml | 184 +
.../skinning/skins/CustomControlBarAppSkin.mxml | 106 +
.../skins/CustomSkinnableContainerSkin.mxml | 55 +
.../src/spark/skinning/skins/FancyButtonSkin.mxml | 271 +
.../skinning/skins/GradientBackgroundAppSkin.mxml | 53 +
.../spark/skinning/skins/IconTextButtonSkin.mxml | 195 +
.../src/spark/skinning/skins/MyPanelSkin.mxml | 101 +
.../states/AnimateShaderTransitionEffect.mxml | 58 +
.../src/spark/states/assets/back.png | Bin 0 -> 121035 bytes
.../src/spark/tlf/TextLayoutEditorCanvas.mxml | 439 +
.../src/spark/tlf/TextLayoutEditorSample.mxml | 30 +-
.../spark/tlf/assets/%scroll_arrow_down_over.png | Bin 0 -> 109642 bytes
.../src/spark/tlf/assets/%scroll_arrow_up_over.png | Bin 0 -> 109644 bytes
.../src/spark/tlf/assets/combo_drop_down_arrow.png | Bin 0 -> 505 bytes
.../src/spark/tlf/assets/header_close_icon.png | Bin 0 -> 3084 bytes
.../src/spark/tlf/assets/header_open_icon.png | Bin 0 -> 3095 bytes
.../src/spark/tlf/assets/scroll_arrow_down.png | Bin 0 -> 332 bytes
.../spark/tlf/assets/scroll_arrow_down_over.png | Bin 0 -> 47147 bytes
.../src/spark/tlf/assets/scroll_arrow_up.png | Bin 0 -> 311 bytes
.../src/spark/tlf/assets/scroll_arrow_up_over.png | Bin 0 -> 47155 bytes
.../src/spark/tlf/flashx/textLayout/UiClasses.as | 54 +
.../spark/tlf/flashx/textLayout/ui/MultiPanel.as | 206 +
.../flashx/textLayout/ui/MultiPanelHeaderSkin.as | 58 +
.../tlf/flashx/textLayout/ui/PanelWithEdgeBars.as | 266 +
.../tlf/flashx/textLayout/ui/VellumGUIStyles.css | 254 +
.../ui/assets/%scroll_arrow_down_over.png | Bin 0 -> 109642 bytes
.../textLayout/ui/assets/%scroll_arrow_up_over.png | Bin 0 -> 109644 bytes
.../textLayout/ui/assets/combo_drop_down_arrow.png | Bin 0 -> 505 bytes
.../textLayout/ui/assets/header_close_icon.png | Bin 0 -> 3084 bytes
.../textLayout/ui/assets/header_open_icon.png | Bin 0 -> 3095 bytes
.../textLayout/ui/assets/scroll_arrow_down.png | Bin 0 -> 332 bytes
.../ui/assets/scroll_arrow_down_over.png | Bin 0 -> 47147 bytes
.../textLayout/ui/assets/scroll_arrow_up.png | Bin 0 -> 311 bytes
.../textLayout/ui/assets/scroll_arrow_up_over.png | Bin 0 -> 47155 bytes
.../ui/inspectors/AdvancedTextPropertyEditor.as | 190 +
.../ui/inspectors/AntiAliasPropertyEditor.as | 51 +
.../ui/inspectors/CharacterPropertyEditor.as | 179 +
.../ui/inspectors/DynamicTextPropertyEditor.as | 74 +
.../textLayout/ui/inspectors/LinkPropertyEditor.as | 63 +-
.../ui/inspectors/ParagraphPropertyEditor.as | 226 +
.../ui/inspectors/SelectionUpdateEvent.as | 42 +-
.../textLayout/ui/inspectors/TabPropertyEditor.as | 64 +
.../ui/inspectors/TextContainerPropertyEditor.as | 151 +
.../ui/inspectors/TextFlowPropertyEditor.as | 71 +
.../ui/inspectors/TextInspectorController.as | 614 ++
.../ui/inspectors/assets/align_center_icon.png | Bin 0 -> 2834 bytes
.../ui/inspectors/assets/align_end_icon.png | Bin 0 -> 2866 bytes
.../ui/inspectors/assets/align_justify_icon.png | Bin 0 -> 2812 bytes
.../inspectors/assets/align_last_center_icon.png | Bin 0 -> 2826 bytes
.../ui/inspectors/assets/align_last_left_icon.png | Bin 0 -> 2812 bytes
.../ui/inspectors/assets/align_last_right_icon.png | Bin 0 -> 2815 bytes
.../ui/inspectors/assets/align_left_icon.png | Bin 0 -> 2827 bytes
.../ui/inspectors/assets/align_right_icon.png | Bin 0 -> 2828 bytes
.../ui/inspectors/assets/align_start_icon.png | Bin 0 -> 2915 bytes
.../textLayout/ui/inspectors/assets/bold_icon.png | Bin 0 -> 2887 bytes
.../inspectors/assets/cont_align_bottom_icon.png | Bin 0 -> 287 bytes
.../inspectors/assets/cont_align_justify_icon.png | Bin 0 -> 299 bytes
.../inspectors/assets/cont_align_middle_icon.png | Bin 0 -> 313 bytes
.../ui/inspectors/assets/cont_align_top_icon.png | Bin 0 -> 310 bytes
.../ui/inspectors/assets/italic_icon.png | Bin 0 -> 2909 bytes
.../ui/inspectors/assets/strikethrough_icon.png | Bin 0 -> 2899 bytes
.../ui/inspectors/assets/subscript_icon.png | Bin 0 -> 2886 bytes
.../ui/inspectors/assets/superscript_icon.png | Bin 0 -> 2892 bytes
.../textLayout/ui/inspectors/assets/tcy_icon.png | Bin 0 -> 2973 bytes
.../ui/inspectors/assets/underline_icon.png | Bin 0 -> 2892 bytes
.../ui/rulers/ParagraphPropertyMarker.as | 98 +
.../ui/rulers/ParagraphPropertyMarkerSkin.as | 103 +
.../tlf/flashx/textLayout/ui/rulers/RulerBar.as | 672 ++
.../textLayout/ui/rulers/RulerDragTracker.as | 88 +
.../tlf/flashx/textLayout/ui/rulers/RulerMarker.as | 124 +
.../tlf/flashx/textLayout/ui/rulers/TabMarker.as | 86 +
.../flashx/textLayout/ui/rulers/TabMarkerSkin.as | 94 +
.../flashx/textLayout/ui/styles/PopupMenuSkin.as | 70 +
.../ui/styles/ScrollbarDownArrowUpSkin.as | 48 +-
.../textLayout/ui/styles/ScrollbarThumbOverSkin.as | 89 +
.../textLayout/ui/styles/ScrollbarThumbUpSkin.as | 89 +
.../textLayout/ui/styles/ScrollbarTrackSkin.as | 68 +
.../textLayout/ui/styles/ScrollbarUpArrowUpSkin.as | 48 +-
.../spark/tlf/textEditBar/FeatureSetChangeEvent.as | 41 +-
.../src/spark/tlf/textEditBar/FileEvent.as | 40 +-
.../src/spark/tlf/textEditBar/FileIOHelper.as | 268 +
.../src/spark/tlf/textEditBar/FileServices.mxml | 96 +
.../src/spark/tlf/textEditBar/GraphicBar.mxml | 153 +
.../spark/tlf/textEditBar/GraphicChangeEvent.as | 61 +
.../src/spark/tlf/textEditBar/LinkBar.mxml | 158 +
.../src/spark/tlf/textEditBar/LinkChangeEvent.as | 52 +-
.../spark/tlf/textEditBar/SingleContainerView.mxml | 80 +
.../src/spark/tlf/textEditBar/SpriteWithIME.as | 102 +
.../src/spark/tlf/textEditBar/StatusPopup.mxml | 39 +
.../src/spark/tlf/textEditBar/StyleChangeEvent.as | 47 +-
.../src/spark/tlf/textEditBar/assets/%icon_tcy.png | Bin 0 -> 110058 bytes
.../textEditBar/assets/BreakOpportunityType.png | Bin 0 -> 26281 bytes
.../tlf/textEditBar/assets/EmbedDeleteIcon.png | Bin 0 -> 47172 bytes
.../textEditBar/assets/EmbedDeleteIconDisabled.png | Bin 0 -> 48199 bytes
.../textEditBar/assets/P_TextAlignBottom_Sm_N.png | Bin 0 -> 287 bytes
.../textEditBar/assets/P_TextAlignJustify_Sm_N.png | Bin 0 -> 299 bytes
.../textEditBar/assets/P_TextAlignMiddle_Sm_N.png | Bin 0 -> 313 bytes
.../tlf/textEditBar/assets/P_TextAlignTop_Sm_N.png | Bin 0 -> 310 bytes
.../assets/P_TextBaselineShift_Md_N.png | Bin 0 -> 713 bytes
.../textEditBar/assets/P_TextBottomOffset_Md_N.png | Bin 0 -> 527 bytes
.../assets/P_TextFirstLineIndent_Md_N.png | Bin 0 -> 627 bytes
.../textEditBar/assets/P_TextLeftIndent_Md_N.png | Bin 0 -> 697 bytes
.../textEditBar/assets/P_TextLeftOffset_Md_N.png | Bin 0 -> 519 bytes
.../textEditBar/assets/P_TextRightIndent_Md_N.png | Bin 0 -> 739 bytes
.../textEditBar/assets/P_TextRightOffset_Md_N.png | Bin 0 -> 513 bytes
.../textEditBar/assets/P_TextSmallCaps_Md_N.png | Bin 0 -> 647 bytes
.../textEditBar/assets/P_TextSpaceAfter_Md_N.png | Bin 0 -> 578 bytes
.../textEditBar/assets/P_TextSpaceBefore_Md_N.png | Bin 0 -> 572 bytes
.../textEditBar/assets/P_TextTopOffset_Md_N.png | Bin 0 -> 530 bytes
.../textEditBar/assets/TextAutoLeadingPercent.png | Bin 0 -> 27667 bytes
.../src/spark/tlf/textEditBar/assets/digitCase.png | Bin 0 -> 2964 bytes
.../spark/tlf/textEditBar/assets/digitWidth.png | Bin 0 -> 3123 bytes
.../tlf/textEditBar/assets/elementBaseline.png | Bin 0 -> 26703 bytes
.../textEditBar/assets/icon_align_all_but_last.png | Bin 0 -> 26692 bytes
.../tlf/textEditBar/assets/icon_align_center.png | Bin 0 -> 27220 bytes
.../tlf/textEditBar/assets/icon_align_end.PNG | Bin 0 -> 215 bytes
.../tlf/textEditBar/assets/icon_align_justify.png | Bin 0 -> 27095 bytes
.../tlf/textEditBar/assets/icon_align_left.png | Bin 0 -> 27210 bytes
.../tlf/textEditBar/assets/icon_align_right.png | Bin 0 -> 27210 bytes
.../tlf/textEditBar/assets/icon_align_start.PNG | Bin 0 -> 184 bytes
.../spark/tlf/textEditBar/assets/icon_bullet.png | Bin 0 -> 27234 bytes
.../tlf/textEditBar/assets/icon_style_bold.png | Bin 0 -> 27205 bytes
.../tlf/textEditBar/assets/icon_style_italic.png | Bin 0 -> 27229 bytes
.../assets/icon_style_strikethrough.png | Bin 0 -> 26697 bytes
.../textEditBar/assets/icon_style_underline.png | Bin 0 -> 27197 bytes
.../src/spark/tlf/textEditBar/assets/icon_tcy.png | Bin 0 -> 59524 bytes
.../src/spark/tlf/textEditBar/assets/ligatures.png | Bin 0 -> 3045 bytes
.../spark/tlf/textEditBar/assets/lineBaseline.png | Bin 0 -> 26737 bytes
.../validators/CreditCardValidatorExample.mxml | 78 +
.../spark/validators/CurrencyValidatorExample.mxml | 53 +
.../src/spark/validators/DateValidatorExample.mxml | 61 +
.../spark/validators/EmailValidatorExample.mxml | 56 +
.../src/spark/validators/FormValidatorExample.mxml | 83 +
.../spark/validators/NumberValidatorExample.mxml | 75 +
.../spark/validators/RegExpValidatorExample.mxml | 92 +
.../validators/SocialSecurityValidatorExample.mxml | 55 +
.../spark/validators/StringValidatorExample.mxml | 58 +
.../validators/TDFGradientBackgroundSkin.mxml | 51 +-
.../spark/validators/ZipCodeValidatorExample.mxml | 55 +
.../mxroyale/tourdeflexmodules/src/swfobject.js | 777 ++
.../mxroyale/tourdeflexmodules/src/viewsource.mxml | 70 +
frameworks/air-config-template.xml | 4 +
frameworks/build.xml | 5 +
frameworks/flex-config-template.xml | 4 +
frameworks/js/projects/MXRoyaleJS/build.xml | 1 +
.../src/main/config/compile-js-config.xml | 4 +
.../{MXRoyaleJS => SparkRoyaleJS}/build.xml | 2 +-
.../src/main/config/compile-js-config.xml | 20 +-
.../Basic/src/main/resources/basic-manifest.xml | 5 +
.../projects/Basic/src/main/resources/defaults.css | 18 +
.../projects/Basic/src/main/royale/BasicClasses.as | 3 +
.../royale/org/apache/royale/core/ContainerBase.as | 4 +-
.../org/apache/royale/core/DataContainerBase.as | 158 +-
.../royale/org/apache/royale/core/IDataGrid.as} | 21 +-
...ionModel.as => IStrandWithPresentationModel.as} | 17 +-
.../apache/royale/core/ListBaseStrandChildren.as | 2 +-
.../main/royale/org/apache/royale/core/UIBase.as | 5 +-
.../royale/org/apache/royale/html/DataContainer.as | 8 +-
.../main/royale/org/apache/royale/html/DataGrid.as | 23 +-
.../src/main/royale/org/apache/royale/html/List.as | 6 +-
.../src/main/royale/org/apache/royale/html/Menu.as | 8 +-
.../main/royale/org/apache/royale/html/Panel.as | 37 +-
.../org/apache/royale/html/UIModuleLoader.as | 128 +-
.../royale/html/accessories/TextPromptBead.as | 4 +-
.../royale/html/beads/AccordionCollapseBead.as | 4 +-
.../org/apache/royale/html/beads/AccordionView.as | 2 +-
.../royale/html/beads/BackgroundImageBead.as | 2 +-
.../org/apache/royale/html/beads/ContainerView.as | 25 +-
.../apache/royale/html/beads/DataContainerView.as | 305 +-
.../org/apache/royale/html/beads/DataGridView.as | 15 +-
.../beads/DataItemRendererFactoryForArrayData.as | 10 +-
.../beads/DataItemRendererFactoryForArrayList.as | 11 +-
.../DataItemRendererFactoryForCollectionView.as | 12 +-
.../org/apache/royale/html/beads/DateFieldView.as | 15 +-
.../DynamicAddItemRendererForArrayListData.as | 10 +-
.../DynamicItemsRendererFactoryForArrayListData.as | 4 +-
...cRemoveAllByNullItemRendererForArrayListData.as | 9 +-
...DynamicRemoveAllItemRendererForArrayListData.as | 9 +-
.../DynamicRemoveItemRendererForArrayListData.as | 9 +-
.../DynamicUpdateItemRendererForArrayListData.as | 9 +-
.../org/apache/royale/html/beads/HScrollBarView.as | 8 +-
.../org/apache/royale/html/beads/ListView.as | 1 -
.../apache/royale/html/beads/NumericStepperView.as | 6 +-
.../org/apache/royale/html/beads/PanelView.as | 141 +-
.../org/apache/royale/html/beads/SpinnerView.as | 4 +-
.../apache/royale/html/beads/TextFieldViewBase.as | 4 +-
.../beads/TextItemRendererFactoryForArrayData.as | 10 +-
.../TextItemRendererFactoryForStringVectorData.as | 11 +-
.../org/apache/royale/html/beads/TreeGridView.as | 6 +-
.../org/apache/royale/html/beads/VScrollBarView.as | 8 +-
.../royale/html/beads/VirtualDataContainerView.as | 1 -
.../VirtualDataItemRendererFactoryForArrayData.as | 37 +-
.../apache/royale/html/beads/VirtualListView.as | 84 +-
.../org/apache/royale/html/beads/WebBrowserView.as | 2 +-
.../beads/controllers/DateFieldMouseController.as | 8 +-
.../controllers/ItemRendererMouseController.as | 1 -
.../beads/controllers/MenuBarMouseController.as | 10 +-
.../controllers/MenuSelectionMouseController.as | 17 +-
.../TreeSingleSelectionMouseController.as | 23 +-
.../royale/html/beads/layouts/ButtonBarLayout.as | 9 +-
.../beads/layouts/VirtualListVerticalLayout.as | 15 +-
.../royale/html/beads/models/ButtonBarModel.as | 1 +
.../html/supportClasses/AccordionItemRenderer.as | 2 +-
.../apache/royale/html/supportClasses/DataGroup.as | 121 +-
.../supportClasses/DateFieldDateChooser.as} | 27 +-
.../royale/html/supportClasses/IDateChooser.as | 39 +-
.../html/supportClasses/MenuBarItemRenderer.as | 4 +
.../royale/html/supportClasses/MenuItemRenderer.as | 4 +
.../royale/html/supportClasses/PanelLayoutProxy.as | 108 +-
.../supportClasses/TreeGridControlItemRenderer.as | 10 +
.../royale/html/supportClasses/TreeItemRenderer.as | 1 +
.../html/supportClasses/TreeXMLItemRenderer.as} | 43 +-
.../UIModuleLoader.as => utils/UIModuleUtils.as} | 43 +-
.../layouts/LineChartCategoryVsLinearLayout.as | 2 +-
.../beads/layouts/LineChartLinearVsLinearLayout.as | 2 +-
.../apache/royale/charts/core/IChartDataGroup.as | 2 +-
.../royale/charts/optimized/SVGChartDataGroup.as | 27 +
.../royale/charts/supportClasses/ChartDataGroup.as | 151 +-
.../org/apache/royale/collections/ITreeData.as} | 21 +-
.../org/apache/royale/collections/TreeData.as | 2 +-
.../projects/Core/src/main/royale/CoreClasses.as | 3 +-
.../royale/org/apache/royale/core/BrowserWindow.as | 2 +-
.../royale/core/ContainerBaseStrandChildren.as | 8 +-
...vate.as => IContainerBaseStrandChildrenHost.as} | 11 +-
.../main/royale/org/apache/royale/core/IImage.as | 14 +-
.../org/apache/royale/core/IItemRendererParent.as | 4 +-
.../apache/royale/core/IItemRendererProvider.as | 10 -
.../{BrowserWindow.as => IStrandWithModelView.as} | 37 +-
.../royale/org/apache/royale/core/ImageViewBase.as | 24 +-
.../apache/royale/core/ItemRendererClassFactory.as | 2 +-
.../royale/org/apache/royale/core/LayoutBase.as | 7 +
.../main/royale/org/apache/royale/events/Event.as | 2 +
.../org/apache/royale/events/EventDispatcher.as | 10 +-
.../org/apache/royale/events/KeyboardEvent.as | 9 +
.../effects/beads/EasyAccordionCollapseBead.as | 8 +-
.../main/royale/org/apache/royale/jewel/List.as | 16 +-
.../royale/org/apache/royale/utils/Language.as | 2 +-
frameworks/projects/MXRoyale/build.xml | 2 +
frameworks/projects/MXRoyale/pom.xml | 97 +-
.../src/main/config/compile-swf-config.xml | 2 +
.../MXRoyale/src/main/resources/defaults.css | 214 +-
.../src/main/resources/mx-royale-manifest.xml | 117 +-
.../MXRoyale/src/main/royale/MXRoyaleClasses.as | 129 +-
.../src/main/royale/mx/charts/AreaChart.as | 240 +
.../src/main/royale/mx/charts/CategoryAxis.as | 332 +
.../MXRoyale/src/main/royale/mx/charts/Legend.as | 311 +
.../src/main/royale/mx/charts/LinearAxis.as | 268 +
.../src/main/royale/mx/charts/PlotChart.as | 152 +
.../chartClasses/CartesianTransform.as} | 59 +-
.../royale/mx/charts/chartClasses/ChartBase.as | 70 +-
.../main/royale/mx/charts/chartClasses/DataTip.as | 169 +
.../mx/charts/chartClasses/GraphicsUtilities.as | 642 ++
.../main/royale/mx/charts/chartClasses/IAxis.as | 398 +
.../main/royale/mx/charts/chartClasses/Series.as | 2464 +++++
.../main/royale/mx/charts/events/ChartItemEvent.as | 142 +
.../renderers/ShadowLineRenderer.as} | 50 +-
.../src/main/royale/mx/charts/series/AreaSeries.as | 203 +
.../src/main/royale/mx/charts/series/BarSeries.as | 137 +
.../main/royale/mx/charts/series/ColumnSeries.as | 146 +
.../src/main/royale/mx/charts/series/LineSeries.as | 2225 +++++
.../src/main/royale/mx/charts/series/PieSeries.as | 787 ++
.../src/main/royale/mx/charts/series/PlotSeries.as | 107 +
.../mx/charts/series/items/ColumnSeriesItem.as | 121 +
.../royale/mx/charts/series/items/PieSeriesItem.as | 311 +
.../main/royale/mx/collections/ArrayCollection.as | 151 +
.../royale/mx/collections/GroupingCollection2.as | 1793 ++++
.../main/royale/mx/collections/ICollectionView.as | 7 +-
.../src/main/royale/mx/collections/ISort.as | 353 +
.../src/main/royale/mx/collections/ISortField.as | 272 +
.../royale/mx/collections/ListCollectionView.as | 2862 ++++++
.../src/main/royale/mx/collections/Sort.as | 825 ++
.../src/main/royale/mx/collections/SortField.as | 848 ++
.../royale/mx/collections/SortFieldCompareTypes.as | 117 +
.../main/royale/mx/collections/XMLListAdapter.as | 825 ++
.../royale/mx/collections/XMLListCollection.as | 467 +
.../errors/CursorError.as} | 37 +-
.../errors/SortError.as} | 36 +-
.../MXRoyale/src/main/royale/mx/containers/Box.as | 33 +-
.../MXRoyale/src/main/royale/mx/containers/Form.as | 510 +
.../src/main/royale/mx/containers/FormHeading.as | 162 +-
.../src/main/royale/mx/containers/FormItem.as | 1460 +++
.../FormItemDirection.as} | 45 +-
.../MXRoyale/src/main/royale/mx/containers/Grid.as | 828 ++
.../src/main/royale/mx/containers/GridItem.as | 470 +-
.../src/main/royale/mx/containers/GridRow.as | 1263 +--
.../src/main/royale/mx/containers/Panel.as | 156 +-
.../src/main/royale/mx/containers/PanelTitleBar.as | 53 +-
.../src/main/royale/mx/containers/TabNavigator.as | 500 +
.../src/main/royale/mx/containers/TitleWindow.as | 291 +
.../src/main/royale/mx/containers/ViewStack.as | 1651 ++++
.../main/royale/mx/containers/beads/BoxLayout.as | 59 +-
.../main/royale/mx/containers/beads/PanelView.as | 110 +
.../royale/mx/containers/beads/TabNavigatorView.as | 201 +
.../royale/mx/containers/beads/ViewStackLayout.as | 131 +
.../models/PanelModel.as} | 59 +-
.../mx/containers/gridClasses/GridColumnInfo.as | 11 +-
.../mx/containers/gridClasses/GridRowInfo.as | 309 +-
.../royale/mx/containers/utilityClasses/Flex.as | 32 +-
.../main/royale/mx/controls/AdvancedDataGrid.as | 9658 +++++++++++++++++++
.../MXRoyale/src/main/royale/mx/controls/Alert.as | 612 ++
.../MXRoyale/src/main/royale/mx/controls/Button.as | 59 +-
.../src/main/royale/mx/controls/ColorPicker.as | 648 ++
.../src/main/royale/mx/controls/ComboBase.as | 4 +
.../src/main/royale/mx/controls/ComboBox.as | 98 +-
.../src/main/royale/mx/controls/DataGrid.as | 831 ++
.../src/main/royale/mx/controls/DateChooser.as | 59 +-
.../src/main/royale/mx/controls/DateField.as | 2882 ++++++
.../Tween.as => controls/FormItemLabel.as} | 54 +-
.../MXRoyale/src/main/royale/mx/controls/Image.as | 55 +-
.../MXRoyale/src/main/royale/mx/controls/Label.as | 9 -
.../MXRoyale/src/main/royale/mx/controls/List.as | 360 +
.../src/main/royale/mx/controls/MenuBar.as | 2193 +++++
.../src/main/royale/mx/controls/NumericStepper.as | 9 -
.../src/main/royale/mx/controls/RichTextEditor.as | 795 ++
.../main/royale/mx/controls/RichTextEditor.mxml | 1090 +++
.../MXRoyale/src/main/royale/mx/controls/Spacer.as | 8 -
.../IFocusManager.as => controls/TabBar.as} | 66 +-
.../src/main/royale/mx/controls/TextArea.as | 4 +-
.../src/main/royale/mx/controls/TextInput.as | 35 +-
.../src/main/royale/mx/controls/ToggleButtonBar.as | 452 +
.../MXRoyale/src/main/royale/mx/controls/Tree.as | 3740 ++++++++
.../src/main/royale/mx/controls/VScrollBar.as | 308 +
.../AdvancedDataGridColumn.as | 2050 ++++
.../AdvancedDataGridColumnGroup.as | 283 +
.../AdvancedDataGridHeaderRenderer.as | 871 ++
.../AdvancedDataGridItemRenderer.as | 797 ++
.../MXAdvancedDataGridItemRenderer.as | 94 +
.../royale/mx/controls/beads/DateFieldView.as} | 41 +-
.../mx/controls/beads/NumericStepperView.as} | 40 +-
.../beads/controllers/MenuBarMouseController.as} | 49 +-
.../mx/controls/beads/models/MenuBarModel.as} | 54 +-
.../models/SingleSelectionICollectionViewModel.as | 271 +
.../beads/models/SingleSelectionIListModel.as | 247 +
.../mx/controls/colorPickerClasses/SwatchPanel.as | 1464 +++
.../mx/controls/dataGridClasses/DataGridColumn.as | 399 +
.../dateFieldClasses/DateFieldDateChooser.as | 40 +-
.../mx/controls/listClasses/AdvancedListBase.as | 9914 ++++++++++++++++++++
.../listClasses/IDropInListItemRenderer.as | 163 +
.../royale/mx/controls/listClasses/ListBase.as | 1102 ++-
.../listClasses/ListItemRenderer.as} | 40 +-
.../mx/controls/richTextEditorClasses/ToolBar.as | 221 +
.../royale/mx/controls/textClasses/TextRange.as | 217 +
...rerFactoryForICollectionViewHierarchicalData.as | 165 +
.../controls/treeClasses/DefaultDataDescriptor.as | 780 ++
.../treeClasses/HierarchicalCollectionView.as | 1232 +++
.../controls/treeClasses/HierarchicalViewCursor.as | 1006 ++
.../mx/controls/treeClasses/ITreeDataDescriptor.as | 111 +
.../controls/treeClasses/ITreeDataDescriptor2.as | 107 +
.../mx/controls/treeClasses/TreeItemRenderer.as | 253 +
.../src/main/royale/mx/core/Application.as | 90 +-
.../MXRoyale/src/main/royale/mx/core/Container.as | 342 +-
.../main/royale/mx/core/ContainerCreationPolicy.as | 109 +
.../IFocusManager.as => core/FlexCSSStyles.as} | 44 +-
.../src/main/royale/mx/core/FlexVersion.as | 144 +
.../MXRoyale/src/main/royale/mx/core/IChildList.as | 36 +-
.../ITreeDataDescriptor.as => core/IFlexModule.as} | 26 +-
.../src/main/royale/mx/core/IFlexModuleFactory.as | 153 +
.../src/main/royale/mx/core/ILayoutElement.as | 845 ++
.../src/main/royale/mx/core/INavigatorContent.as | 68 +
.../main/royale/mx/core/IPropertyChangeNotifier.as | 97 +
.../src/main/royale/mx/core/IUIComponent.as | 6 +-
.../mx/{managers/IFocusManager.as => core/IUID.as} | 50 +-
.../src/main/royale/mx/core/IVisualElement.as | 2 +-
.../IVisualElementContainer.as} | 22 +-
.../mx/core/LayoutElementUIComponentUtils.as | 592 ++
.../src/main/royale/mx/core/ScrollControlBase.as | 65 +-
.../src/main/royale/mx/core/UIComponent.as | 1604 +++-
.../src/main/royale/mx/core/UITextField.as | 2740 ++++++
.../{graphics/SolidColor.as => display/Bitmap.as} | 44 +-
.../SolidColor.as => display/Graphics.as} | 30 +-
.../MXRoyale/src/main/royale/mx/effects/Effect.as | 53 +
.../MXRoyale/src/main/royale/mx/effects/Glow.as | 360 +
.../src/main/royale/mx/effects/Parallel.as | 180 +
.../MXRoyale/src/main/royale/mx/effects/Tween.as | 6 +-
.../src/main/royale/mx/effects/TweenEffect.as | 242 +
.../main/royale/mx/effects/easing/Exponential.as | 131 +
.../effects/effectClasses/TweenEffectInstance.as | 449 +
.../IFocusManager.as => errors/EOFError.as} | 63 +-
.../src/main/royale/mx/events/FlexEvent.as | 157 +-
.../src/main/royale/mx/events/FocusEvent.as | 112 +
.../src/main/royale/mx/events/HTTPStatusEvent.as | 107 +
.../src/main/royale/mx/events/IOErrorEvent.as | 109 +
.../src/main/royale/mx/events/ItemClickEvent.as | 24 +-
.../src/main/royale/mx/events/KeyboardEvent.as | 166 +
.../src/main/royale/mx/events/MenuEvent.as | 479 +
.../src/main/royale/mx/events/ModuleEvent.as | 314 +
.../src/main/royale/mx/events/MouseEvent.as | 133 +
.../main/royale/mx/events/SecurityErrorEvent.as | 107 +
.../src/main/royale/mx/events/TextEvent.as | 117 +
.../ExternalInterface.as} | 30 +-
.../LinearGradient.as => filters/BitmapFilter.as} | 77 +-
.../ColorMatrixFilter.as} | 85 +-
.../src/main/royale/mx/formatters/DateFormatter.as | 762 ++
.../main/royale/mx/formatters/NumberFormatter.as | 644 ++
.../royale/mx/formatters/SwitchSymbolFormatter.as | 152 +
.../src/main/royale/mx/geom/Matrix.as} | 34 +-
.../src/main/royale/mx/graphics/LinearGradient.as | 5 +-
.../royale/mx/graphics/LinearGradientStroke.as | 368 +
.../src/main/royale/mx/graphics/SolidColor.as | 4 +-
.../main/royale/mx/graphics/SolidColorStroke.as | 45 +-
.../MXRoyale/src/main/royale/mx/logging/Log.as | 493 +
.../main/royale/mx/logging/targets/TraceTarget.as | 314 +
.../src/main/royale/mx/managers/CursorManager.as | 455 +
.../CursorManagerPriority.as} | 28 +-
.../src/main/royale/mx/managers/DragManager.as | 207 +
.../src/main/royale/mx/managers/FocusManager.as | 41 +
.../src/main/royale/mx/managers/IBrowserManager.as | 4 +
.../src/main/royale/mx/managers/IFocusManager.as | 3 +
.../src/main/royale/mx/managers/ISystemManager.as | 26 +-
.../src/main/royale/mx/managers/PopUpManager.as | 229 +
.../src/main/royale/mx/managers/SystemManager.as | 3681 ++++++++
.../SystemManagerBase.as} | 90 +-
.../Effect.as => managers/SystemManagerGlobals.as} | 45 +-
.../src/main/royale/mx/messaging/ChannelSet.as | 2157 +++++
.../royale/mx/messaging/channels/AMFChannel.as | 592 ++
.../MXRoyale/src/main/royale/mx/modules/IModule.as | 79 +-
.../src/main/royale/mx/modules/IModuleInfo.as | 328 +
.../MXRoyale/src/main/royale/mx/modules/Module.as | 171 +
.../src/main/royale/mx/modules/ModuleLoader.as | 351 +
.../src/main/royale/mx/modules/ModuleManager.as | 76 +
.../mx/{effects/Effect.as => net/FileFilter.as} | 108 +-
.../mx/{effects/Effect.as => net/FileReference.as} | 60 +-
.../src/main/royale/mx/printing/FlexPrintJob.as | 618 ++
.../royale/mx/printing/FlexPrintJobScaleType.as | 107 +
.../src/main/royale/mx/rpc/AsyncResponder.as | 133 +
.../MXRoyale/src/main/royale/mx/rpc/AsyncToken.as | 268 +
.../MXRoyale/src/main/royale/mx/rpc/Fault.as | 171 +
.../MXRoyale/src/main/royale/mx/rpc/Responder.as | 92 +
.../src/main/royale/mx/rpc/events/FaultEvent.as | 274 +
.../src/main/royale/mx/rpc/events/InvokeEvent.as | 121 +
.../src/main/royale/mx/rpc/events/ResultEvent.as | 281 +
.../src/main/royale/mx/rpc/http/HTTPService.as | 290 +
.../main/royale/mx/rpc/http/mxml/HTTPService.as | 187 +
.../main/royale/mx/rpc/remoting/RemoteObject.as | 270 +
.../royale/mx/rpc/remoting/mxml/RemoteObject.as | 166 +
.../src/main/royale/mx/rpc/soap/WebService.as | 443 +
.../src/main/royale/mx/skins/ProgrammaticSkin.as | 941 ++
.../src/main/royale/mx/skins/RectangularBorder.as | 494 +
.../MXRoyale/src/main/royale/mx/states/State.as | 19 +
.../main/royale/mx/styles/CSSStyleDeclaration.as | 216 +
.../main/royale/mx/styles/ISimpleStyleClient.as | 94 +
.../src/main/royale/mx/styles/IStyleClient.as | 268 +
.../IStyleManager2.as} | 26 +-
.../src/main/royale/mx/styles/StyleManager.as | 835 ++
.../src/main/royale/mx/styles/StyleManagerImpl.as | 2114 +++++
.../src/main/royale/mx/styles/StyleProxy.as | 492 +
.../src/main/royale/mx/utils/Base64Decoder.as | 260 +
.../src/main/royale/mx/utils/Base64Encoder.as | 435 +
.../src/main/royale/mx/utils/Base64JSWrapper.as | 54 +-
.../MXRoyale/src/main/royale/mx/utils/ByteArray.as | 59 +-
.../IXMLNotifiable.as} | 24 +-
.../main/royale/mx/utils/TextEncoderLiteWrapper.as | 53 +-
.../MXRoyale/src/main/royale/mx/utils/UIDUtil.as | 298 +
.../MXRoyale/src/main/royale/mx/utils/URLUtil.as | 773 ++
.../src/main/royale/mx/utils/XMLNotifier.as | 276 +
.../src/main/royale/mx/validators/DateValidator.as | 299 +
.../main/royale/mx/validators/EmailValidator.as | 139 +
.../main/royale/mx/validators/NumberValidator.as | 787 ++
.../royale/mx/validators/PhoneNumberValidator.as | 185 +
.../main/royale/mx/validators/RegExpValidator.as | 438 +
.../main/royale/mx/validators/StringValidator.as | 387 +
.../src/main/royale/mx/validators/Validator.as | 1151 +++
.../royale/org/apache/royale/mdl/DropDownList.as | 27 -
.../src/main/royale/org/apache/royale/mdl/Table.as | 65 -
.../TabsDataItemRendererFactoryForArrayListData.as | 13 +-
.../Network/src/main/royale/NetworkClasses.as | 1 +
.../org/apache/royale/net/URLBinaryLoader.as | 2 +-
.../main/royale/org/apache/royale/net/URLLoader.as | 403 +-
.../royale/net/{URLLoader.as => URLLoaderBase.as} | 12 +-
.../net/remoting/messages/AcknowledgeMessageExt.as | 10 +
.../org/apache/royale/net/utils/RPCUIDUtil.as | 261 +
.../projects/{MXRoyale => SparkRoyale}/build.xml | 2 +-
.../projects/{MXRoyale => SparkRoyale}/pom.xml | 22 +-
.../src/main/config/compile-swf-config.xml | 36 +-
.../src/main/resources/defaults.css | 63 +-
.../src/main/resources/spark-royale-manifest.xml | 91 +
.../src/main/royale/SparkRoyaleClasses.as | 45 +
.../main/royale/spark/components/Application.as | 2209 +++++
.../royale/spark/components/BorderContainer.as | 369 +
.../src/main/royale/spark/components/Button.as | 179 +
.../src/main/royale/spark/components/CheckBox.as | 318 +
.../src/main/royale/spark/components/ComboBox.as | 1223 +++
.../src/main/royale/spark/components/DataGroup.as | 2053 ++++
.../main/royale/spark/components/DataRenderer.as | 135 +
.../main/royale/spark/components/DropDownList.as | 381 +
.../src/main/royale/spark/components/Group.as | 706 ++
.../src/main/royale/spark/components/HGroup.as | 611 ++
.../src/main/royale/spark/components/Image.as | 1403 +++
.../src/main/royale/spark/components/Label.as | 1665 ++++
.../src/main/royale/spark/components/List.as | 2941 ++++++
.../royale/spark/components/NavigatorContent.as | 238 +
.../main/royale/spark/components/NumericStepper.as | 920 ++
.../src/main/royale/spark/components/Panel.as | 651 ++
.../main/royale/spark/components/PopUpAnchor.as | 652 ++
.../main/royale/spark/components/RadioButton.as | 806 ++
.../royale/spark/components/RadioButtonGroup.as | 800 ++
.../royale/spark/components/RichEditableText.as | 4899 ++++++++++
.../src/main/royale/spark/components/RichText.as | 1469 +++
.../src/main/royale/spark/components/Scroller.as | 3864 ++++++++
.../royale/spark/components/SkinnableContainer.as | 1163 +++
.../src/main/royale/spark/components/TabBar.as | 186 +
.../src/main/royale/spark/components/TextArea.as | 761 ++
.../src/main/royale/spark/components/TextInput.as | 379 +
.../main/royale/spark/components/TitleWindow.as | 690 ++
.../main/royale/spark/components/ToggleButton.as | 117 +
.../src/main/royale/spark/components/VGroup.as | 610 ++
.../spark/components/supportClasses/ButtonBase.as | 464 +
.../components/supportClasses/DropDownListBase.as | 1075 +++
.../spark/components/supportClasses/GroupBase.as | 2224 +++++
.../components/supportClasses/ItemRenderer.as | 775 ++
.../spark/components/supportClasses/ListBase.as | 2076 ++++
.../spark/components/supportClasses/Range.as | 538 ++
.../royale/spark/components/supportClasses/Skin.as | 93 +
.../supportClasses/SkinnableComponent.as | 417 +
.../components/supportClasses/SkinnableTextBase.as | 2779 ++++++
.../spark/components/supportClasses/TextBase.as | 1184 +++
.../components/supportClasses/ToggleButtonBase.as | 255 +
.../main/royale/spark/core/CSSTextLayoutFormat.as | 153 +
.../src/main/royale/spark/core/NavigationUnit.as | 181 +
.../main/royale/spark/events/IndexChangeEvent.as | 243 +
.../main/royale/spark/events/TextOperationEvent.as | 205 +
.../src/main/royale/spark/layouts/BasicLayout.as | 551 ++
.../main/royale/spark/layouts/HorizontalAlign.as | 94 +
.../main/royale/spark/layouts/HorizontalLayout.as | 2557 +++++
.../src/main/royale/spark/layouts/TileLayout.as | 2513 +++++
.../src/main/royale/spark/layouts/VerticalAlign.as | 104 +
.../main/royale/spark/layouts/VerticalLayout.as | 2397 +++++
.../royale/spark/layouts/supportClasses/Block.as} | 33 +-
.../spark/layouts/supportClasses/DropLocation.as | 90 +
.../spark/layouts/supportClasses/LayoutBase.as | 2091 +++++
.../layouts/supportClasses/LayoutElementHelper.as | 156 +
.../layouts/supportClasses/LinearLayoutVector.as | 1169 +++
.../layouts/supportClasses/SparkLayoutBead.as | 122 +
.../main/royale/spark/primitives/BitmapImage.as | 2059 ++++
.../src/main/royale/spark/primitives/Line.as | 636 ++
.../src/main/royale/spark/primitives/Path.as | 2953 ++++++
.../src/main/royale/spark/primitives/Rect.as | 1280 +++
.../spark/primitives/RectangularDropShadow.as | 467 +
.../src/main/royale/spark/skins/SparkSkin.as | 209 +
.../spark/skins/spark/BorderContainerSkin.as} | 149 +-
.../spark/skins/spark/ComboBoxButtonSkin.mxml | 229 +
.../spark/skins/spark/ComboBoxTextInputSkin.mxml | 254 +
.../spark/skins/spark/DefaultItemRenderer.as | 179 +
.../spark/skins/spark/DropDownListButtonSkin.mxml | 252 +
.../skins/spark/TitleWindowCloseButtonSkin.mxml | 121 +
frameworks/projects/TLF/pom.xml | 23 +-
.../royale/textLayout/formats/TextLayoutFormat.as | 2 +
frameworks/projects/XML/src/main/royale/XML.as | 27 +
frameworks/projects/pom.xml | 1 +
frameworks/royale-config-template.xml | 4 +
.../main/java/marmotinni/AssertPropertyValue.java | 10 +-
.../java/marmotinni/DispatchMouseClickEvent.java | 62 +-
.../main/java/marmotinni/DispatchMouseEvent.java | 4 +-
mustella/src/main/java/marmotinni/SetProperty.java | 4 +-
mustella/src/main/royale/AssertPropertyValue.as | 2 +-
mustella/src/main/royale/RunCodeEvent.as | 9 +-
mustella/src/main/royale/SetProperty.as | 2 +-
mustella/src/main/royale/UnitTester.as | 6 +-
.../tests/mxtests/basicTests/BasicTests-config.xml | 8 +-
mustella/tests/mxtests/basicTests/BasicTests.mxml | 18 +-
mustella/tests/mxtests/basicTests/RoyaleContext.as | 2 +-
.../halo/scripts/DateFieldTestScript.mxml | 8 +-
.../halo/scripts/ListAndDataGridTestScript.mxml | 4 +-
.../basicTests/halo/scripts/MenuBarTestScript.mxml | 28 +-
.../basicTests/halo/scripts/MenuTestScript.mxml | 27 +-
.../halo/scripts/NumericStepperTestScript.mxml | 26 +-
.../basicTests/halo/views/DateFieldTests.mxml | 4 +-
.../halo/views/ListAndDataGridTests.mxml | 2 +-
.../basicTests/halo/views/MenuBarTests.mxml | 4 +-
.../mxtests/basicTests/halo/views/MenuTests.mxml | 4 +-
.../basicTests/halo/views/NumericStepperTests.mxml | 3 +-
.../basicTests/spark/scripts/ButtonTestScript.mxml | 2 +-
.../basicTests/spark/views/ButtonTests.mxml | 4 +-
pom.xml | 2 +
1005 files changed, 210993 insertions(+), 4957 deletions(-)
diff --cc .gitignore
index dfe4d19,2c1495b..69498fb
--- a/.gitignore
+++ b/.gitignore
@@@ -1,153 -1,157 +1,158 @@@
-# eclipse conf file
-.settings
-.classpath
-.project
-.manager
-.scala_dependencies
-.cache
-.actionScriptProperties
-.flexProperties
-.flexLibProperties
-
-# idea conf files
-.idea
-*.iml
-*.ipr
-*.iws
-
-# VSCode conf files
-.vscode/settings.json
-
-# building
-target/
-[Bb]uild/
-null
-tmp
-temp
-dist
-test-output
-build.log
-release
-fonts
-out
-gen
-bin-debug
-bin-release
-binjs-debug
-binjs-release
-examples/FlexJSTest_again/html-template
-examples/FlexJSTest_again/bin
-rat.report
-mustella/tests/basicTests/bin
-mustella/tests/mxtests/basicTests/bin
-asdoc-output
-
-#Apache Flex Projects
-lib/
-libs/
-in/
-swfobject/
-flex2/
-thirdparty/
-3.0.33/
-3.0.33
-
-*.pbj
-*.vms
-*.ser
-*.mxp
-bundles.properties
-empty.properties
-css_*.properties
-FXGException_*.properties
-FXGLog_*.properties
-FABridge.js
-frameworks/projects/spark/manifest.xml
-frameworks/air-config.xml
-frameworks/createjs-config.xml
-frameworks/flex-config.xml
-frameworks/jquery-config.xml
-frameworks/js-config.xml
-frameworks/node-config.xml
-frameworks/royale-config.xml
-env.properties
-local.properties
-/flex-sdk-description.xml
-/royale-sdk-description.xml
-
-#OS junk files
-[Tt]humbs.db
-*.DS_Store
-
-#Files we fake for Flash Builder SDKs
-frameworks/airmobile-config.xml
-frameworks/mxml-manifest.xml
-frameworks/spark-manifest.xml
-frameworks/themes/Halo/Halo.swc
-frameworks/themes/Spark/spark.css
-ide/flashbuilder/flashbuilder-config.xml
-
-#Visual Studio files
-*.[Oo]bj
-*.user
-*.aps
-*.pch
-*.vspscc
-*.vssscc
-*_i.c
-*_p.c
-*.ncb
-*.suo
-*.tlb
-*.tlh
-*.bak
-*.[Cc]ache
-*.ilk
-*.log
-*.lib
-*.sbr
-*.sdf
-ipch/
-obj/
-[Dd]ebug/
-[Rr]elease*/
-Ankh.NoLoad
-!releasemgr
-
-#Tooling
-_ReSharper*/
-*.resharper
-
-#CVS files
-.svn
-.git
-
-# Office Temp Files
-~$*
-
-#Binaries
-*.dll
-*.bin
-*.com
-*.exe
-*.class
-*.jar
-*.swf
-*.swc
-
-#Compressed Files
-*.zip
-*.rar
-*.tar
-
-#VF2JS generated files
-vf2js/frameworks/js/
-
-#Royale generated files
-frameworks/js/Royale/generated-sources
-manualtests/RoyaleTest_SVG/bin
-*.css.map
-
-#npm
-node_modules
-npm/cli/test
-
-frameworks/projects/MXRoyale/.vscode
-.gitignore
-.gitignore
+# eclipse conf file
+.settings
+.classpath
+.project
+.manager
+.scala_dependencies
+.cache
+.actionScriptProperties
+.flexProperties
+.flexLibProperties
+
+# idea conf files
+.idea
+*.iml
+*.ipr
+*.iws
+
+# VSCode conf files
+**/.vscode/**
+
++
+# building
+target/
+[Bb]uild/
+null
+tmp
+temp
+dist
+test-output
+build.log
+release
+fonts
+out
+gen
+bin-debug
+bin-release
+binjs-debug
+binjs-release
+examples/FlexJSTest_again/html-template
+examples/FlexJSTest_again/bin
+rat.report
+mustella/tests/basicTests/bin
+mustella/tests/mxtests/basicTests/bin
+asdoc-output
+
+#Apache Flex Projects
+lib/
+libs/
+in/
+swfobject/
+flex2/
+thirdparty/
+3.0.33/
+3.0.33
+
+*.pbj
+*.vms
+*.ser
+*.mxp
+bundles.properties
+empty.properties
+css_*.properties
+FXGException_*.properties
+FXGLog_*.properties
+FABridge.js
+frameworks/projects/spark/manifest.xml
+frameworks/air-config.xml
+frameworks/createjs-config.xml
+frameworks/flex-config.xml
+frameworks/jquery-config.xml
+frameworks/js-config.xml
+frameworks/node-config.xml
+frameworks/royale-config.xml
+env.properties
+local.properties
+/flex-sdk-description.xml
+/royale-sdk-description.xml
+
+#OS junk files
+[Tt]humbs.db
+*.DS_Store
+
+#Files we fake for Flash Builder SDKs
+frameworks/airmobile-config.xml
+frameworks/mxml-manifest.xml
+frameworks/spark-manifest.xml
+frameworks/themes/Halo/Halo.swc
+frameworks/themes/Spark/spark.css
+ide/flashbuilder/flashbuilder-config.xml
+
+#Visual Studio files
+*.[Oo]bj
+*.user
+*.aps
+*.pch
+*.vspscc
+*.vssscc
+*_i.c
+*_p.c
+*.ncb
+*.suo
+*.tlb
+*.tlh
+*.bak
+*.[Cc]ache
+*.ilk
+*.log
+*.lib
+*.sbr
+*.sdf
+ipch/
+obj/
+[Dd]ebug/
+[Rr]elease*/
+Ankh.NoLoad
+!releasemgr
+
+#Tooling
+_ReSharper*/
+*.resharper
+
+#CVS files
+.svn
+.git
+
+# Office Temp Files
+~$*
+
+#Binaries
+*.dll
+*.bin
+*.com
+*.exe
+*.class
+*.jar
+*.swf
+*.swc
+
+#Compressed Files
+*.zip
+*.rar
+*.tar
+
+#VF2JS generated files
+vf2js/frameworks/js/
+
+#Royale generated files
+frameworks/js/Royale/generated-sources
+manualtests/RoyaleTest_SVG/bin
+*.css.map
+
+#npm
+node_modules
- npm/cli/test
++npm/cli/test
++
++frameworks/projects/MXRoyale/.vscode
++.gitignore
++.gitignore
diff --cc frameworks/build.xml
index 2bb3a55,1511c88..db45fcc
--- a/frameworks/build.xml
+++ b/frameworks/build.xml
@@@ -139,9 -139,9 +139,10 @@@
<antcall target="Express"/>
<antcall target="RoyaleSite"/>
<antcall target="MXRoyale"/>
+ <antcall target="SparkRoyale"/>
<antcall target="Jewel"/>
<antcall target="JewelTheme"/>
+ <antcall target="Icons"/>
</target>
<target name="fonts">
@@@ -197,8 -197,8 +198,9 @@@
<ant dir="${basedir}/projects/TLF" target="clean"/>
<ant dir="${basedir}/projects/RoyaleSite" target="clean"/>
<ant dir="${basedir}/projects/MXRoyale" target="clean"/>
+ <ant dir="${basedir}/projects/SparkRoyale" target="clean"/>
<ant dir="${basedir}/projects/Jewel" target="clean"/>
+ <ant dir="${basedir}/projects/Icons" target="clean"/>
<ant dir="${basedir}/themes/JewelTheme" target="clean"/>
<ant dir="${basedir}/fontsrc" target="clean"/>
diff --cc frameworks/projects/Basic/src/main/royale/BasicClasses.as
index 603a0e6,f0c3701..e5560ab
--- a/frameworks/projects/Basic/src/main/royale/BasicClasses.as
+++ b/frameworks/projects/Basic/src/main/royale/BasicClasses.as
@@@ -319,8 -298,9 +319,11 @@@ internal class BasicClasse
import org.apache.royale.html.beads.models.TreeGridModel; TreeGridModel;
import org.apache.royale.html.beads.layouts.TreeGridLayout; TreeGridLayout;
import org.apache.royale.html.beads.TreeGridView; TreeGridView;
+
+ import org.apache.royale.utils.UIModuleUtils; UIModuleUtils;
+
+
+ import org.apache.royale.html.util.getLabelFromData; getLabelFromData;
}
}
diff --cc frameworks/projects/Basic/src/main/royale/org/apache/royale/core/UIBase.as
index 4a4e728,e73cc4f..704cc3f
--- a/frameworks/projects/Basic/src/main/royale/org/apache/royale/core/UIBase.as
+++ b/frameworks/projects/Basic/src/main/royale/org/apache/royale/core/UIBase.as
@@@ -27,6 -27,6 +27,7 @@@ package org.apache.royale.cor
import org.apache.royale.events.utils.MouseEventConverter;
}
++ import org.apache.royale.core.IId;
import org.apache.royale.events.Event;
import org.apache.royale.events.IEventDispatcher;
import org.apache.royale.events.MouseEvent;
@@@ -182,7 -171,7 +183,7 @@@
* @playerversion AIR 2.6
* @productversion Royale 0.0
*/
- public class UIBase extends HTMLElementWrapper implements IStrandWithModel, IEventDispatcher, IParentIUIBase, IStyleableObject, ILayoutChild, IRoyaleElement, IId
- public class UIBase extends HTMLElementWrapper implements IStrandWithModelView, IEventDispatcher, IParentIUIBase, IStyleableObject, ILayoutChild, IRoyaleElement
++ public class UIBase extends HTMLElementWrapper implements IStrandWithModelView, IEventDispatcher, IParentIUIBase, IStyleableObject, ILayoutChild, IRoyaleElement, IId
{
/**
* Constructor.
diff --cc frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/ContainerView.as
index 8bf7bd3,84c40e1..fae6a90
--- a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/ContainerView.as
+++ b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/ContainerView.as
@@@ -30,13 -37,17 +30,13 @@@ package org.apache.royale.html.bead
import org.apache.royale.core.IUIBase;
import org.apache.royale.core.IViewport;
import org.apache.royale.core.IViewportModel;
- import org.apache.royale.core.layout.EdgeData;
import org.apache.royale.core.UIBase;
import org.apache.royale.core.ValuesManager;
+ import org.apache.royale.core.layout.EdgeData;
import org.apache.royale.events.Event;
- import org.apache.royale.events.IEventDispatcher;
- import org.apache.royale.geom.Rectangle;
import org.apache.royale.geom.Size;
- import org.apache.royale.html.Container;
import org.apache.royale.html.beads.models.ViewportModel;
import org.apache.royale.html.supportClasses.Border;
- import org.apache.royale.html.supportClasses.ContainerContentArea;
import org.apache.royale.html.supportClasses.Viewport;
import org.apache.royale.utils.loadBeadFromValuesManager;
diff --cc frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/DataContainerView.as
index afc4042,2ea13b8..3641ad8
--- a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/DataContainerView.as
+++ b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/DataContainerView.as
@@@ -18,19 -18,36 +18,32 @@@
////////////////////////////////////////////////////////////////////////////////
package org.apache.royale.html.beads
{
- import org.apache.royale.core.BeadViewBase;
- import org.apache.royale.core.ContainerBase;
import org.apache.royale.core.IBead;
+ import org.apache.royale.core.IBeadLayout;
+ import org.apache.royale.core.IBeadModel;
+ import org.apache.royale.core.IBeadView;
+ import org.apache.royale.core.IChild;
+ import org.apache.royale.core.IDataProviderItemRendererMapper;
import org.apache.royale.core.IDataProviderModel;
import org.apache.royale.core.IItemRenderer;
+ import org.apache.royale.core.IItemRendererClassFactory;
import org.apache.royale.core.IItemRendererParent;
- import org.apache.royale.core.IList;
import org.apache.royale.core.IParent;
- import org.apache.royale.core.IParentIUIBase;
- import org.apache.royale.core.ISelectableItemRenderer;
- import org.apache.royale.core.ISelectionModel;
import org.apache.royale.core.IStrand;
import org.apache.royale.core.IUIBase;
- import org.apache.royale.core.LayoutBase;
import org.apache.royale.core.Strand;
import org.apache.royale.core.UIBase;
+ import org.apache.royale.core.ValuesManager;
+ import org.apache.royale.events.Event;
+ import org.apache.royale.events.IEventDispatcher;
+ import org.apache.royale.events.ItemAddedEvent;
+ import org.apache.royale.events.ItemRemovedEvent;
+ import org.apache.royale.html.supportClasses.Border;
import org.apache.royale.html.supportClasses.DataGroup;
+ import org.apache.royale.html.beads.IListView;
+ import org.apache.royale.events.Event;
+ import org.apache.royale.html.supportClasses.DataItemRenderer;
+ import org.apache.royale.utils.loadBeadFromValuesManager;
/**
* The DataContainerView provides the visual elements for the DataContainer.
diff --cc frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/DataGridView.as
index 438e2d4,462159c..89689f0
--- a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/DataGridView.as
+++ b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/DataGridView.as
@@@ -31,10 -30,9 +32,9 @@@ package org.apache.royale.html.bead
import org.apache.royale.events.Event;
import org.apache.royale.events.IEventDispatcher;
import org.apache.royale.html.Container;
- import org.apache.royale.html.DataGrid;
import org.apache.royale.html.DataGridButtonBar;
import org.apache.royale.html.beads.layouts.ButtonBarLayout;
- import org.apache.royale.html.supportClasses.DataGridColumnList;
+ import org.apache.royale.html.supportClasses.IDataGridColumnList;
import org.apache.royale.html.supportClasses.IDataGridColumn;
import org.apache.royale.html.supportClasses.Viewport;
@@@ -211,14 -210,16 +212,14 @@@
*/
private function createLists():void
{
- var host:DataGrid = _strand as DataGrid;
+ var host:IDataGrid = _strand as IDataGrid;
// get the name of the class to use for the columns
- var columnClassName:String = ValuesManager.valuesImpl.getValue(host, "columnClassName") as String;
- if (columnClassName == null) {
- columnClassName = "DataGridColumnList";
- }
+ var columnClass:Class = ValuesManager.valuesImpl.getValue(host, "columnClass") as Class;
+ assert(columnClass != null,"ColumnClass for DataGrid must be set!")
var sharedModel:IDataGridModel = host.model as IDataGridModel;
- var presentationModel:IDataGridPresentationModel = host.presentationModel;
+ var presentationModel:IDataGridPresentationModel = host.presentationModel as IDataGridPresentationModel;
_lists = [];
diff --cc frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/TreeGridView.as
index 6fc61f2,757d04b..1a5bb4c
--- a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/TreeGridView.as
+++ b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/TreeGridView.as
@@@ -137,11 -136,7 +137,12 @@@ package org.apache.royale.html.bead
/**
* @private
+ * @royaleignorecoercion org.apache.royale.core.IBeadModel
+ * @royaleignorecoercion org.apache.royale.core.IDataGridModel
+ * @royaleignorecoercion org.apache.royale.events.IEventDispatcher
+ * @royaleignorecoercion org.apache.royale.html.supportClasses.IDataGridColumn
+ * @royaleignorecoercion org.apache.royale.html.TreeGrid
+ * @royaleignorecoercion org.apache.royale.core.IDataGridPresentationModel
*/
protected function finishSetup(event:Event):void
{
@@@ -255,15 -249,19 +256,16 @@@
/**
* @private
+ * @royaleignorecoercion Class
+ * @royaleignorecoercion org.apache.royale.core.IDataGridModel
+ * @royaleignorecoercion org.apache.royale.html.supportClasses.IDataGridColumn
+ * @royaleignorecoercion org.apache.royale.core.IDataGridPresentationModel
*/
private function createColumns():void
{
var host:TreeGrid = _strand as TreeGrid;
-
- // get the name of the class to use for the columns
- var columnClassName:String = ValuesManager.valuesImpl.getValue(host, "columnClassName") as String;
- if (columnClassName == null) {
- columnClassName = "TreeGridColumn";
- }
-
+
- var presentationModel:IDataGridPresentationModel = host.presentationModel;
+ var presentationModel:IDataGridPresentationModel = host.presentationModel as IDataGridPresentationModel;
var sharedModel:IDataGridModel = host.model as IDataGridModel;
_lists = new Array();
diff --cc frameworks/projects/Basic/src/main/royale/org/apache/royale/html/supportClasses/DataGroup.as
index c72ce93,9b6b38a..faafa09
--- a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/supportClasses/DataGroup.as
+++ b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/supportClasses/DataGroup.as
@@@ -19,13 -19,15 +19,10 @@@
package org.apache.royale.html.supportClasses
{
import org.apache.royale.core.IChild;
- import org.apache.royale.core.IContentView;
import org.apache.royale.core.IItemRenderer;
import org.apache.royale.core.IItemRendererParent;
- import org.apache.royale.core.IRollOverModel;
- import org.apache.royale.core.ISelectionModel;
- import org.apache.royale.core.IStrand;
- import org.apache.royale.core.UIBase;
import org.apache.royale.events.IEventDispatcher;
import org.apache.royale.events.Event;
- import org.apache.royale.events.ItemAddedEvent;
- import org.apache.royale.events.ItemRemovedEvent;
- import org.apache.royale.html.supportClasses.DataItemRenderer;
/**
* The DataGroup class is the IItemRendererParent used internally
diff --cc frameworks/projects/Core/src/main/royale/org/apache/royale/core/LayoutBase.as
index 21c812e,0000000..1ca0ffa
mode 100644,000000..100644
--- a/frameworks/projects/Core/src/main/royale/org/apache/royale/core/LayoutBase.as
+++ b/frameworks/projects/Core/src/main/royale/org/apache/royale/core/LayoutBase.as
@@@ -1,362 -1,0 +1,369 @@@
+////////////////////////////////////////////////////////////////////////////////
+//
+// Licensed to the Apache Software Foundation (ASF) under one or more
+// 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 "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
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+////////////////////////////////////////////////////////////////////////////////
+package org.apache.royale.core
+{
+ import org.apache.royale.core.IBeadLayout;
+ import org.apache.royale.core.IBorderPaddingMarginValuesImpl;
+ import org.apache.royale.core.ILayoutChild;
+ import org.apache.royale.core.ILayoutHost;
+ import org.apache.royale.core.ILayoutParent;
+ import org.apache.royale.core.ILayoutView;
+ import org.apache.royale.core.IStrand;
+ import org.apache.royale.core.IUIBase;
+ import org.apache.royale.core.ValuesManager;
+ import org.apache.royale.core.layout.EdgeData;
+ import org.apache.royale.core.layout.MarginData;
+ import org.apache.royale.events.Event;
+ import org.apache.royale.events.IEventDispatcher;
+
+ /**
+ * This class is the base class for most, if not all, layouts.
+ *
+ * @langversion 3.0
+ * @playerversion Flash 10.2
+ * @playerversion AIR 2.6
+ * @productversion Royale 0.8
+ */
+ public class LayoutBase implements IBeadLayout
+ {
+ /**
+ * Constructor.
+ *
+ * @langversion 3.0
+ * @playerversion Flash 10.2
+ * @playerversion AIR 2.6
+ * @productversion Royale 0.8
+ */
+ public function LayoutBase()
+ {
+ }
+
+ private var sawInitComplete:Boolean;
+
+ /**
+ * The strand/host container is also an ILayoutChild because
+ * it can have its size dictated by the host's parent which is
+ * important to know for layout optimization.
+ *
+ * @langversion 3.0
+ * @playerversion Flash 10.2
+ * @playerversion AIR 2.6
+ * @productversion Royale 0.8
+ */
+ protected var host:ILayoutChild;
+
+ /**
+ * @copy org.apache.royale.core.IBead#strand
+ *
+ * @langversion 3.0
+ * @playerversion Flash 10.2
+ * @playerversion AIR 2.6
+ * @productversion Royale 0.8
+ *
+ * @royaleignorecoercion org.apache.royale.core.ILayoutChild
+ * @royaleignorecoercion org.apache.royale.events.IEventDispatcher
+ */
+ public function set strand(value:IStrand):void
+ {
+ host = value as ILayoutChild;
+ var sizeChange:Function = handleSizeChange;
+ (value as IEventDispatcher).addEventListener("widthChanged", sizeChange);
+ (value as IEventDispatcher).addEventListener("heightChanged", sizeChange);
+ (value as IEventDispatcher).addEventListener("sizeChanged", sizeChange);
+
+ (value as IEventDispatcher).addEventListener("childrenAdded", handleChildrenAdded);
+ (value as IEventDispatcher).addEventListener("initComplete", handleInitComplete);
+ (value as IEventDispatcher).addEventListener("layoutNeeded", handleLayoutNeeded);
+
+ }
+
++ private var lastWidth:Number = -1;
++ private var lastHeight:Number = -1;
++
+ /**
+ * Changes in size to the host strand are handled (by default) by running the
+ * layout sequence. Subclasses can override this function and use event.type
+ * to handle specific changes in dimension.
+ *
+ * @langversion 3.0
+ * @playerversion Flash 10.2
+ * @playerversion AIR 2.6
+ * @productversion Royale 0.8
+ */
+ protected function handleSizeChange(event:Event):void
+ {
++ if (host.width == lastWidth &&
++ host.height == lastHeight) return;
+ performLayout();
++ lastWidth = host.width;
++ lastHeight = host.height;
+ }
+
+ /**
+ * Handles the addition of children to the host's layoutView by listening for
+ * size changes in the children.
+ *
+ * @langversion 3.0
+ * @playerversion Flash 10.2
+ * @playerversion AIR 2.6
+ * @productversion Royale 0.8
+ */
+ protected function handleChildrenAdded(event:Event):void
+ {
+ COMPILE::SWF {
+ if (sawInitComplete)
+ {
+ performLayout();
+ }
+ else
+ {
+ var n:Number = layoutView.numElements;
+ for(var i:int=0; i < n; i++) {
+ var child:IEventDispatcher = layoutView.getElementAt(i) as IEventDispatcher;
+ child.addEventListener("widthChanged", childResizeHandler);
+ child.addEventListener("heightChanged", childResizeHandler);
+ child.addEventListener("sizeChanged", childResizeHandler);
+ }
+ }
+ }
+ COMPILE::JS {
+ if (sawInitComplete) {
+ performLayout();
+ }
+ }
+ }
+
+ /**
+ * If changes happen to a layoutView's child, this function will perform the
+ * layout again.
+ *
+ * @langversion 3.0
+ * @playerversion Flash 10.2
+ * @playerversion AIR 2.6
+ * @productversion Royale 0.8
+ * @royaleignorecoercion org.apache.royale.core.ILayoutParent
+ */
+ protected function childResizeHandler(event:Event):void
+ {
+ var viewBead:ILayoutHost;
+
+ // don't layout in response to child size changes if sized by parent
+ // or explicitly sized
+ if (event.type == "widthChanged" &&
+ !(host.isWidthSizedToContent() || !isNaN(host.explicitWidth)))
+ {
+ // but do call this to update scrolling viewports
+ viewBead = (host as ILayoutParent).getLayoutHost();
+ viewBead.beforeLayout();
+ viewBead.afterLayout();
+ return;
+ }
+ // don't layout in response to child size changes if sized by parent
+ // or explicitly sized
+ if (event.type == "heightChanged" &&
+ !(host.isHeightSizedToContent() || !isNaN(host.explicitHeight)))
+ {
+ // but do call this to update scrolling viewports
+ viewBead = (host as ILayoutParent).getLayoutHost();
+ viewBead.beforeLayout();
+ viewBead.afterLayout();
+ return;
+ }
+ // don't layout in response to child size changes if sized by parent
+ // or explicitly sized
+ if (event.type == "sizeChanged" &&
+ !(host.isHeightSizedToContent() || !isNaN(host.explicitHeight)) &&
+ !(host.isWidthSizedToContent() || !isNaN(host.explicitWidth)))
+ {
+ // but do call this to update scrolling viewports
+ viewBead = (host as ILayoutParent).getLayoutHost();
+ viewBead.beforeLayout();
+ viewBead.afterLayout();
+ return;
+ }
+ performLayout();
+ }
+
+ /**
+ * Called whenever "layoutNeeded" event is dispatched against the host strand.
+ *
+ * @langversion 3.0
+ * @playerversion Flash 10.2
+ * @playerversion AIR 2.6
+ * @productversion Royale 0.8
+ */
+ protected function handleLayoutNeeded(event:Event):void
+ {
+ performLayout();
+ }
+
+ /**
+ * Handles the final start-up condition by running the layout an initial time.
+ *
+ * @langversion 3.0
+ * @playerversion Flash 10.2
+ * @playerversion AIR 2.6
+ * @productversion Royale 0.8
+ */
+ protected function handleInitComplete(event:Event):void
+ {
+ sawInitComplete = true;
+
+ COMPILE::SWF
+ {
+ // Complete the setup if the height is sized to content or has been explicitly set
+ // and the width is sized to content or has been explicitly set
+ if ((host.isHeightSizedToContent() || !isNaN(host.explicitHeight)) &&
+ (host.isWidthSizedToContent() || !isNaN(host.explicitWidth)))
+ performLayout();
+ }
+ COMPILE::JS
+ {
+ // always run layout since there are no size change events
+ performLayout();
+ }
+ }
+
+ /**
+ * Returns an object of margins for the given child.
+ *
+ * @param child Object The element whose margins are required.
+ * @param hostWidth Number The usable width dimension of the host.
+ * @param hostHeight Number The usable height dimension of the host.
+ *
+ * @return Object A structure of {top:Number, left:Number, bottom:Number, right:Number}
+ *
+ * @langversion 3.0
+ * @playerversion Flash 10.2
+ * @playerversion AIR 2.6
+ * @productversion Royale 0.8
+ * @royaleignorecoercion org.apache.royale.core.IBorderPaddingMarginValuesImpl
+ * @royaleignorecoercion org.apache.royale.core.IUIBase
+ */
+ protected function childMargins(child:Object, hostWidth:Number, hostHeight:Number):MarginData
+ {
+ var md:MarginData = (ValuesManager.valuesImpl as IBorderPaddingMarginValuesImpl).getMargins(child as IUIBase, hostWidth, hostHeight);
+ return md;
+ }
+
+ /**
+ * Returns an object containing the child's positioning values.
+ *
+ * @param child Object The element whose positions are required.
+ *
+ * @return Object A structure of {top:Number, left:Number, bottom:Number, right:Number}
+ *
+ * @langversion 3.0
+ * @playerversion Flash 10.2
+ * @playerversion AIR 2.6
+ * @productversion Royale 0.8
+ * @royaleignorecoercion org.apache.royale.core.IBorderPaddingMarginValuesImpl
+ * @royaleignorecoercion org.apache.royale.core.IUIBase
+ */
+ protected function childPositions(child:Object):EdgeData
+ {
+ var ed:EdgeData = (ValuesManager.valuesImpl as IBorderPaddingMarginValuesImpl).getPositions(child as IUIBase);
+ return ed;
+ }
+
+ /**
+ * Returns the ILayoutView for the host.
+ *
+ * @langversion 3.0
+ * @playerversion Flash 10.2
+ * @playerversion AIR 2.6
+ * @productversion Royale 0.8
+ *
+ * @royaleignorecoercion org.apache.royale.core.ILayoutParent
+ */
+ protected function get layoutView():ILayoutView
+ {
+ var viewBead:ILayoutHost = (host as ILayoutParent).getLayoutHost();
+ return viewBead.contentView;
+ }
+
+ private var isLayoutRunning:Boolean = false;
+
+ /**
+ * Performs the layout in three parts: before, layout, after.
+ *
+ * @langversion 3.0
+ * @playerversion Flash 10.2
+ * @playerversion AIR 2.6
+ * @productversion Royale 0.8
+ * @royaleignorecoercion org.apache.royale.core.ILayoutParent
+ * @royaleignorecoercion org.apache.royale.events.IEventDispatcher
+ */
+ public function performLayout():void
+ {
+ // avoid running this layout instance recursively.
+ if (isLayoutRunning) return;
+
+ isLayoutRunning = true;
+ /* Not all components need measurement
+ COMPILE::SWF
+ {
+ host.measuredHeight = host.height;
+ host.measuredWidth = host.width;
+ }
+ */
+
+ var viewBead:ILayoutHost = (host as ILayoutParent).getLayoutHost();
+
+ viewBead.beforeLayout();
+ if (layout()) {
+ viewBead.afterLayout();
+ }
+
+ isLayoutRunning = false;
+
+ host.dispatchEvent(new Event("layoutComplete"));
+
+ /* measurement may not matter for all components
+ COMPILE::SWF
+ {
+ // check sizes to see if layout changed the size or not
+ // and send an event to re-layout parent of host
+ if (host.width != host.measuredWidth ||
+ host.height != host.measuredHeight)
+ {
+ isLayoutRunning = true;
+ host.dispatchEvent(new Event("sizeChanged"));
+ isLayoutRunning = false;
+ }
+ }
+ */
+
+ }
+
+ /**
+ * @copy org.apache.royale.core.IBeadLayout#layout
+ *
+ * @langversion 3.0
+ * @playerversion Flash 10.2
+ * @playerversion AIR 2.6
+ * @productversion Royale 0.8
+ */
+ public function layout():Boolean
+ {
+ // override in subclass
+ return false;
+ }
+ }
+}
diff --cc frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/List.as
index fbefff5,eb9cb0b..a59e5ee
--- 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
@@@ -177,16 -133,16 +177,16 @@@ package org.apache.royale.jewe
* @langversion 3.0
* @playerversion Flash 10.2
* @playerversion AIR 2.6
- * @productversion Royale 0.9.3
+ * @productversion Royale 0.9.4
*/
- public function get rowHeight():Number
- {
- return presentationModel.rowHeight;
- }
- public function set rowHeight(value:Number):void
- {
- presentationModel.rowHeight = value;
- }
+ public function get rowHeight():Number
+ {
+ return (presentationModel as IListPresentationModel).rowHeight;
+ }
+ public function set rowHeight(value:Number):void
+ {
+ (presentationModel as IListPresentationModel).rowHeight = value;
+ }
/**
* The item currently selected. Changing this value also
diff --cc frameworks/projects/MXRoyale/src/main/resources/mx-royale-manifest.xml
index 1b28105,0358b09..c2db677
--- a/frameworks/projects/MXRoyale/src/main/resources/mx-royale-manifest.xml
+++ b/frameworks/projects/MXRoyale/src/main/resources/mx-royale-manifest.xml
@@@ -43,10 -45,11 +45,12 @@@
<component id="Container" class="mx.core.Container" />
<component id="HBox" class="mx.containers.HBox" />
<component id="HDividedBox" class="mx.containers.HDividedBox" />
- <component id="VBox" class="mx.containers.VBox" />
+ <component id="Panel" class="mx.containers.Panel" />
+ <component id="VBox" class="mx.containers.VBox" />
<component id="VDividedBox" class="mx.containers.VDividedBox" />
- <!--<component id="ViewStack" class="mx.containers.ViewStack" /> waiting for commit -->
+ <component id="Panel" class="mx.containers.Panel" />
+ <component id="ViewStack" class="mx.containers.ViewStack" />
+ <component id="TabNavigator" class="mx.containers.TabNavigator" />
<component id="ApplicationLayout" class="mx.containers.beads.ApplicationLayout" />
<component id="BoxLayout" class="mx.containers.beads.BoxLayout" />
<component id="CanvasLayout" class="mx.containers.beads.CanvasLayout" />
diff --cc frameworks/projects/Network/src/main/royale/org/apache/royale/net/remoting/messages/AcknowledgeMessageExt.as
index 3704c48,25d54a8..6573d47
--- a/frameworks/projects/Network/src/main/royale/org/apache/royale/net/remoting/messages/AcknowledgeMessageExt.as
+++ b/frameworks/projects/Network/src/main/royale/org/apache/royale/net/remoting/messages/AcknowledgeMessageExt.as
@@@ -18,14 -18,15 +18,24 @@@
////////////////////////////////////////////////////////////////////////////////
package org.apache.royale.net.remoting.messages
{
++<<<<<<< HEAD
+ import org.apache.royale.net.utils.IDataOutput;
+ import org.apache.royale.net.utils.IExternalizable;
++=======
+ // import flash.utils.IDataOutput;
+ // import flash.utils.IExternalizable;
+ import org.apache.royale.net.utils.IDataOutput;
++>>>>>>> feature/MXRoyale
[RemoteClass(alias="DSK")]
/**
* @private
*/
++<<<<<<< HEAD
+ public class AcknowledgeMessageExt extends AcknowledgeMessage implements IExternalizable
++=======
+ public class AcknowledgeMessageExt extends AcknowledgeMessage// implements IExternalizable
++>>>>>>> feature/MXRoyale
{
//--------------------------------------------------------------------------
//
diff --cc frameworks/projects/pom.xml
index 5a98543,d562703..59ac1a1
--- a/frameworks/projects/pom.xml
+++ b/frameworks/projects/pom.xml
@@@ -61,7 -61,7 +61,8 @@@
<module>TLF</module>
<module>RoyaleSite</module>
<module>MXRoyale</module>
+ <module>Icons</module>
+ <module>SparkRoyale</module>
<module>Jewel</module>
</modules>
[royale-asjs] 06/10: Icons needs Basic
Posted by ha...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
harbs pushed a commit to branch feature/new_merge
in repository https://gitbox.apache.org/repos/asf/royale-asjs.git
commit e34be417b6b4f5ce26395a230144dfed906d7221
Author: Harbs <ha...@in-tools.com>
AuthorDate: Sun Sep 2 20:20:04 2018 +0300
Icons needs Basic
---
frameworks/js/projects/IconsJS/src/main/config/compile-js-config.xml | 1 +
1 file changed, 1 insertion(+)
diff --git a/frameworks/js/projects/IconsJS/src/main/config/compile-js-config.xml b/frameworks/js/projects/IconsJS/src/main/config/compile-js-config.xml
index a4c8a39..7d10f0b 100644
--- a/frameworks/js/projects/IconsJS/src/main/config/compile-js-config.xml
+++ b/frameworks/js/projects/IconsJS/src/main/config/compile-js-config.xml
@@ -61,6 +61,7 @@
if these swcs are on the external-library-path then their requires
will not be listed -->
<path-element>../../../../../libs/CoreJS.swc</path-element>
+ <path-element>../../../../../libs/BasicJS.swc</path-element>
</library-path>
<namespaces>
[royale-asjs] 03/10: Unused imports
Posted by ha...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
harbs pushed a commit to branch feature/new_merge
in repository https://gitbox.apache.org/repos/asf/royale-asjs.git
commit 70e9ba6c7047c1bcd6c264ea3f7a343295e1a2d3
Author: Harbs <ha...@in-tools.com>
AuthorDate: Sun Sep 2 19:47:16 2018 +0300
Unused imports
---
.../main/royale/org/apache/royale/html/beads/DragDropListView.as | 7 -------
1 file changed, 7 deletions(-)
diff --git a/frameworks/projects/DragDrop/src/main/royale/org/apache/royale/html/beads/DragDropListView.as b/frameworks/projects/DragDrop/src/main/royale/org/apache/royale/html/beads/DragDropListView.as
index bb4e423..cfc47ed 100644
--- a/frameworks/projects/DragDrop/src/main/royale/org/apache/royale/html/beads/DragDropListView.as
+++ b/frameworks/projects/DragDrop/src/main/royale/org/apache/royale/html/beads/DragDropListView.as
@@ -18,16 +18,9 @@
////////////////////////////////////////////////////////////////////////////////
package org.apache.royale.html.beads
{
- import org.apache.royale.core.IItemRendererParent;
- import org.apache.royale.core.IContainer;
import org.apache.royale.core.IStrand;
import org.apache.royale.core.UIBase;
- import org.apache.royale.events.Event;
- import org.apache.royale.events.IEventDispatcher;
import org.apache.royale.html.beads.ListView;
- import org.apache.royale.html.beads.layouts.VerticalLayout;
- import org.apache.royale.core.supportClasses.DataGroup;
- import org.apache.royale.html.supportClasses.ScrollingViewport;
/**