You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@royale.apache.org by ca...@apache.org on 2019/12/29 10:17:33 UTC
[royale-asjs] branch develop updated: Move Interface
IListWithPresentationModel to Core again,
it was left from some old undone refactor
This is an automated email from the ASF dual-hosted git repository.
carlosrovira pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/royale-asjs.git
The following commit(s) were added to refs/heads/develop by this push:
new 9b9118e Move Interface IListWithPresentationModel to Core again, it was left from some old undone refactor
9b9118e is described below
commit 9b9118e02db24a66aa716ef77b2860b6de0973ba
Author: Carlos Rovira <ca...@apache.org>
AuthorDate: Sun Dec 29 11:17:24 2019 +0100
Move Interface IListWithPresentationModel to Core again, it was left from some old undone refactor
---
.../Basic/src/main/royale/org/apache/royale/html/DataContainer.as | 3 ++-
frameworks/projects/Core/src/main/royale/CoreClasses.as | 1 +
.../royale/org/apache/royale/core/IListWithPresentationModel.as | 6 +-----
.../Jewel/src/main/royale/org/apache/royale/jewel/DataContainer.as | 3 ++-
4 files changed, 6 insertions(+), 7 deletions(-)
diff --git a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/DataContainer.as b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/DataContainer.as
index dbb390e..34ffcc5 100644
--- a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/DataContainer.as
+++ b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/DataContainer.as
@@ -46,6 +46,7 @@ package org.apache.royale.html
import org.apache.royale.events.IEventDispatcher;
import org.apache.royale.html.beads.models.ListPresentationModel;
import org.apache.royale.html.beads.IListView;
+ import org.apache.royale.core.IListWithPresentationModel;
/**
* Indicates that the initialization of the list is complete.
@@ -73,7 +74,7 @@ package org.apache.royale.html
* @playerversion AIR 2.6
* @productversion Royale 0.0
*/
- public class DataContainer extends DataContainerBase implements IStrandWithPresentationModel
+ public class DataContainer extends DataContainerBase implements IStrandWithPresentationModel, IListWithPresentationModel
{
/**
* constructor.
diff --git a/frameworks/projects/Core/src/main/royale/CoreClasses.as b/frameworks/projects/Core/src/main/royale/CoreClasses.as
index 965d4c4..4f7bc6d 100644
--- a/frameworks/projects/Core/src/main/royale/CoreClasses.as
+++ b/frameworks/projects/Core/src/main/royale/CoreClasses.as
@@ -150,6 +150,7 @@ internal class CoreClasses
import org.apache.royale.core.IViewport; IViewport;
import org.apache.royale.core.IScrollingViewport; IScrollingViewport;
import org.apache.royale.core.IViewportModel; IViewportModel;
+ import org.apache.royale.core.IListWithPresentationModel; IListWithPresentationModel;
import org.apache.royale.core.IApplicationView; IApplicationView;
diff --git a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/core/IListWithPresentationModel.as b/frameworks/projects/Core/src/main/royale/org/apache/royale/core/IListWithPresentationModel.as
similarity index 91%
rename from frameworks/projects/Jewel/src/main/royale/org/apache/royale/core/IListWithPresentationModel.as
rename to frameworks/projects/Core/src/main/royale/org/apache/royale/core/IListWithPresentationModel.as
index 360a940..987bac8 100644
--- a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/core/IListWithPresentationModel.as
+++ b/frameworks/projects/Core/src/main/royale/org/apache/royale/core/IListWithPresentationModel.as
@@ -18,9 +18,6 @@
////////////////////////////////////////////////////////////////////////////////
package org.apache.royale.core
{
- import org.apache.royale.core.IList
- import org.apache.royale.core.IListPresentationModel;
-
/**
* The IListWithPresentationModel interface is implemented by any IList
* that supports a separate IListPresentationModel
@@ -41,7 +38,6 @@ package org.apache.royale.core
* @playerversion AIR 2.6
* @productversion Royale 0.0
*/
- function get presentationModel():IListPresentationModel;
-
+ function get presentationModel():IBead;
}
}
diff --git a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/DataContainer.as b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/DataContainer.as
index b46e7f6..1198377 100644
--- a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/DataContainer.as
+++ b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/DataContainer.as
@@ -18,6 +18,7 @@
////////////////////////////////////////////////////////////////////////////////
package org.apache.royale.jewel
{
+ import org.apache.royale.core.IBead;
import org.apache.royale.core.IDataProviderModel;
import org.apache.royale.core.IListPresentationModel;
import org.apache.royale.core.IListWithPresentationModel;
@@ -119,7 +120,7 @@ package org.apache.royale.jewel
* @productversion Royale 0.9
* @royaleignorecoercion org.apache.royale.core.IListPresentationModel
*/
- public function get presentationModel():IListPresentationModel
+ public function get presentationModel():IBead
{
var presModel:IListPresentationModel = getBeadByType(IListPresentationModel) as IListPresentationModel;
if (presModel == null) {