You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flex.apache.org by ha...@apache.org on 2017/03/30 22:06:09 UTC
[1/6] git commit: [flex-asjs] [refs/heads/tlf] - eliminate circular
Repository: flex-asjs
Updated Branches:
refs/heads/tlf 577c8594c -> 53fc55802
eliminate circular
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/16ee6cdb
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/16ee6cdb
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/16ee6cdb
Branch: refs/heads/tlf
Commit: 16ee6cdbc4ecc90b4b2d9ef8336635b9e9ad51f8
Parents: 6c71106
Author: Alex Harui <ah...@apache.org>
Authored: Tue Mar 28 13:49:58 2017 -0700
Committer: Alex Harui <ah...@apache.org>
Committed: Tue Mar 28 13:49:58 2017 -0700
----------------------------------------------------------------------
.../projects/HTML/src/main/flex/org/apache/flex/html/Panel.as | 6 ++++++
1 file changed, 6 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/16ee6cdb/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/Panel.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/Panel.as b/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/Panel.as
index 09b5cc1..ab3b114 100644
--- a/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/Panel.as
+++ b/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/Panel.as
@@ -133,6 +133,7 @@ package org.apache.flex.html
/**
* @private
+ * @flexjsignorecoercion org.apache.flex.html.beads.PanelView
*/
override public function addElement(c:IChild, dispatchEvent:Boolean = true):void
{
@@ -143,6 +144,7 @@ package org.apache.flex.html
/**
* @private
+ * @flexjsignorecoercion org.apache.flex.html.beads.PanelView
*/
override public function addElementAt(c:IChild, index:int, dispatchEvent:Boolean = true):void
{
@@ -153,6 +155,7 @@ package org.apache.flex.html
/**
* @private
+ * @flexjsignorecoercion org.apache.flex.html.beads.PanelView
*/
override public function getElementIndex(c:IChild):int
{
@@ -162,6 +165,7 @@ package org.apache.flex.html
/**
* @private
+ * @flexjsignorecoercion org.apache.flex.html.beads.PanelView
*/
override public function removeElement(c:IChild, dispatchEvent:Boolean = true):void
{
@@ -171,6 +175,7 @@ package org.apache.flex.html
/**
* @private
+ * @flexjsignorecoercion org.apache.flex.html.beads.PanelView
*/
override public function get numElements():int
{
@@ -180,6 +185,7 @@ package org.apache.flex.html
/**
* @private
+ * @flexjsignorecoercion org.apache.flex.html.beads.PanelView
*/
override public function getElementAt(index:int):IChild
{
[3/6] git commit: [flex-asjs] [refs/heads/tlf] - disable ListExample
for now
Posted by ha...@apache.org.
disable ListExample for now
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/3dc3eb3f
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/3dc3eb3f
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/3dc3eb3f
Branch: refs/heads/tlf
Commit: 3dc3eb3fb581972b180bcbf68fe1141414bc7e47
Parents: 16ee6cd
Author: Alex Harui <ah...@apache.org>
Authored: Tue Mar 28 21:30:35 2017 -0700
Committer: Alex Harui <ah...@apache.org>
Committed: Tue Mar 28 21:30:35 2017 -0700
----------------------------------------------------------------------
examples/flexjs/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/3dc3eb3f/examples/flexjs/pom.xml
----------------------------------------------------------------------
diff --git a/examples/flexjs/pom.xml b/examples/flexjs/pom.xml
index 0831f2f..d49f223 100644
--- a/examples/flexjs/pom.xml
+++ b/examples/flexjs/pom.xml
@@ -50,7 +50,7 @@
<module>FlexTeamPage_MDL</module>
<module>FlexWebsiteStatsViewer</module>
<module>HelloWorld</module>
- <module>ListExample</module>
+ <!--<module>ListExample</module>-->
<module>MapSearch</module>
<!--module>MDLBlogExample</module>-->
<module>MDLDynamicTabsExample</module>
[4/6] git commit: [flex-asjs] [refs/heads/tlf] - Merge branch
'develop' of https://git-wip-us.apache.org/repos/asf/flex-asjs into develop
Posted by ha...@apache.org.
Merge branch 'develop' of https://git-wip-us.apache.org/repos/asf/flex-asjs into develop
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/f7a36104
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/f7a36104
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/f7a36104
Branch: refs/heads/tlf
Commit: f7a36104baaf7f26b311b95dcfc6000a869de5d5
Parents: 82b51ba 3dc3eb3
Author: piotrz <pi...@apache.org>
Authored: Wed Mar 29 06:32:19 2017 +0200
Committer: piotrz <pi...@apache.org>
Committed: Wed Mar 29 06:32:19 2017 +0200
----------------------------------------------------------------------
examples/flexjs/pom.xml | 2 +-
.../projects/HTML/src/main/flex/org/apache/flex/html/Panel.as | 6 ++++++
2 files changed, 7 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
[6/6] git commit: [flex-asjs] [refs/heads/tlf] - Merge branch
'develop' into tlf
Posted by ha...@apache.org.
Merge branch 'develop' into tlf
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/53fc5580
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/53fc5580
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/53fc5580
Branch: refs/heads/tlf
Commit: 53fc558027692d46458ac11ac85a9b604b2077c1
Parents: 577c859 04ad0ed
Author: Harbs <ha...@in-tools.com>
Authored: Thu Mar 30 18:05:35 2017 -0400
Committer: Harbs <ha...@in-tools.com>
Committed: Thu Mar 30 18:05:35 2017 -0400
----------------------------------------------------------------------
examples/flexjs/ListExample/pom.xml | 33 ----------
.../src/main/flex/MyInitialView.mxml | 4 --
.../src/main/flex/simple/GenericList.as | 66 ++------------------
.../src/main/flex/simple/GenericListView.as | 38 ++---------
.../main/flex/simple/IRFactoryForArrayData.as | 2 +-
.../src/main/flex/org/apache/flex/html/Panel.as | 6 ++
pom.xml | 1 +
7 files changed, 17 insertions(+), 133 deletions(-)
----------------------------------------------------------------------
[5/6] git commit: [flex-asjs] [refs/heads/tlf] - Fix ListExample: -
Cleanup all unnecessary code - Clean up pom - Bring back ListExample to Maven
build
Posted by ha...@apache.org.
Fix ListExample:
- Cleanup all unnecessary code
- Clean up pom
- Bring back ListExample to Maven build
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/04ad0ed7
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/04ad0ed7
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/04ad0ed7
Branch: refs/heads/tlf
Commit: 04ad0ed75ca0ff74b7cfc8916193c64c56eb4e53
Parents: f7a3610
Author: piotrz <pi...@apache.org>
Authored: Wed Mar 29 22:15:55 2017 +0200
Committer: piotrz <pi...@apache.org>
Committed: Wed Mar 29 22:15:55 2017 +0200
----------------------------------------------------------------------
examples/flexjs/ListExample/pom.xml | 33 ----------
.../src/main/flex/MyInitialView.mxml | 4 --
.../src/main/flex/simple/GenericList.as | 66 ++------------------
.../src/main/flex/simple/GenericListView.as | 38 ++---------
.../main/flex/simple/IRFactoryForArrayData.as | 2 +-
examples/flexjs/pom.xml | 2 +-
6 files changed, 11 insertions(+), 134 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/04ad0ed7/examples/flexjs/ListExample/pom.xml
----------------------------------------------------------------------
diff --git a/examples/flexjs/ListExample/pom.xml b/examples/flexjs/ListExample/pom.xml
index 1904e11..190702b 100644
--- a/examples/flexjs/ListExample/pom.xml
+++ b/examples/flexjs/ListExample/pom.xml
@@ -46,30 +46,12 @@
<extensions>true</extensions>
<configuration>
<mainClass>ListExample.mxml</mainClass>
- <removeCirculars>true</removeCirculars>
- <!-- Not a config option of flexjs-maven-plugin -->
- <!--flashVersion>20.0</flashVersion-->
</configuration>
</plugin>
</plugins>
</build>
<dependencies>
- <!-- Already added in parent -->
- <!--dependency>
- <groupId>org.apache.flex.flexjs.framework</groupId>
- <artifactId>Core</artifactId>
- <version>0.8.0-SNAPSHOT</version>
- <type>swc</type>
- </dependency-->
-
- <dependency>
- <groupId>org.apache.flex.flexjs.framework</groupId>
- <artifactId>Network</artifactId>
- <version>0.8.0-SNAPSHOT</version>
- <type>swc</type>
- </dependency>
-
<!-- Needed for Flash compilation -->
<dependency>
<groupId>com.adobe.flash.framework</groupId>
@@ -78,20 +60,5 @@
<type>swc</type>
<scope>provided</scope>
</dependency>
-
- <!-- Needed for JavaScript compilation -->
- <!-- Already added in parent -->
- <!--dependency>
- <groupId>org.apache.flex.flexjs.framework</groupId>
- <artifactId>HTML</artifactId>
- <version>0.8.0-SNAPSHOT</version>
- <type>swc</type>
- </dependency>
- <dependency>
- <groupId>org.apache.flex.flexjs.framework</groupId>
- <artifactId>Language</artifactId>
- <version>0.8.0-SNAPSHOT</version>
- <type>swc</type>
- </dependency-->
</dependencies>
</project>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/04ad0ed7/examples/flexjs/ListExample/src/main/flex/MyInitialView.mxml
----------------------------------------------------------------------
diff --git a/examples/flexjs/ListExample/src/main/flex/MyInitialView.mxml b/examples/flexjs/ListExample/src/main/flex/MyInitialView.mxml
index 154149c..09543ae 100644
--- a/examples/flexjs/ListExample/src/main/flex/MyInitialView.mxml
+++ b/examples/flexjs/ListExample/src/main/flex/MyInitialView.mxml
@@ -20,10 +20,6 @@ limitations under the License.
<js:View xmlns:fx="http://ns.adobe.com/mxml/2009"
xmlns:js="library://ns.apache.org/flexjs/basic"
xmlns:gen="simple.*">
- <fx:Script>
-
- </fx:Script>
-
<fx:Style>
@namespace gen "simple.*";
@namespace js "library://ns.apache.org/flexjs/basic";
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/04ad0ed7/examples/flexjs/ListExample/src/main/flex/simple/GenericList.as
----------------------------------------------------------------------
diff --git a/examples/flexjs/ListExample/src/main/flex/simple/GenericList.as b/examples/flexjs/ListExample/src/main/flex/simple/GenericList.as
index c582b6f..1543167 100644
--- a/examples/flexjs/ListExample/src/main/flex/simple/GenericList.as
+++ b/examples/flexjs/ListExample/src/main/flex/simple/GenericList.as
@@ -18,75 +18,17 @@
////////////////////////////////////////////////////////////////////////////////
package simple
{
- import org.apache.flex.core.IItemRenderer;
- import org.apache.flex.core.IItemRendererParent;
- import org.apache.flex.core.ILayoutHost;
- import org.apache.flex.core.ILayoutParent;
- import org.apache.flex.core.ISelectionModel;
- import org.apache.flex.core.IParentIUIBase;
- import org.apache.flex.core.UIBase;
- import org.apache.flex.core.IChild;
+ import org.apache.flex.html.DataContainer;
- /**
+ /**
* GenericList relies on an itemRenderer factory to produce its children componenents
* and on a layout to arrange them. This is the only UI element aside from the itemRenderers.
*/
- public class GenericList extends UIBase implements IItemRendererParent, ILayoutParent, ILayoutHost
+ public class GenericList extends DataContainer
{
public function GenericList()
{
super();
}
-
- public function get dataProvider():Object
- {
- return ISelectionModel(model).dataProvider;
- }
- public function set dataProvider(value:Object):void
- {
- ISelectionModel(model).dataProvider = value;
- }
-
- public function get labelField():String
- {
- return ISelectionModel(model).labelField;
- }
- public function set labelField(value:String):void
- {
- ISelectionModel(model).labelField = value;
- }
-
- public function getLayoutHost():ILayoutHost
- {
- return this;
- }
-
- public function get contentView():IParentIUIBase
- {
- return this;
- }
-
- public function getItemRendererForIndex(index:int):IItemRenderer
- {
- var child:IItemRenderer = getElementAt(index) as IItemRenderer;
- return child;
- }
-
- public function removeAllElements():void
- {
- while (numElements > 0) {
- var child:IChild = getElementAt(0);
- removeElement(child);
- }
- }
-
- public function updateAllItemRenderers():void
- {
- //todo: IItemRenderer does not define update function but DataItemRenderer does
- //for(var i:int = 0; i < numElements; i++) {
- // var child:IItemRenderer = getElementAt(i) as IItemRenderer;
- // child.update();
- //}
- }
- }
+ }
}
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/04ad0ed7/examples/flexjs/ListExample/src/main/flex/simple/GenericListView.as
----------------------------------------------------------------------
diff --git a/examples/flexjs/ListExample/src/main/flex/simple/GenericListView.as b/examples/flexjs/ListExample/src/main/flex/simple/GenericListView.as
index d14a6f8..f4ee1fb 100644
--- a/examples/flexjs/ListExample/src/main/flex/simple/GenericListView.as
+++ b/examples/flexjs/ListExample/src/main/flex/simple/GenericListView.as
@@ -18,35 +18,24 @@
////////////////////////////////////////////////////////////////////////////////
package simple
{
- import org.apache.flex.core.BeadViewBase;
import org.apache.flex.core.IBeadLayout;
import org.apache.flex.core.IDataProviderItemRendererMapper;
- import org.apache.flex.core.IItemRendererParent;
- import org.apache.flex.core.IParentIUIBase;
import org.apache.flex.core.IStrand;
- import org.apache.flex.core.ISelectionModel;
import org.apache.flex.core.ValuesManager;
- import org.apache.flex.html.beads.IListView;
import org.apache.flex.events.Event;
+ import org.apache.flex.html.beads.ListView;
- /**
+ /**
* GenericListView makes sure the itemRendererFactory and the layout beads are installed.
*/
- public class GenericListView extends BeadViewBase implements IListView
+ public class GenericListView extends ListView
{
public function GenericListView()
{
super();
}
- public function get dataGroup():IItemRendererParent
- {
- return _strand as IItemRendererParent;
- }
-
- protected var listModel:ISelectionModel;
-
override public function set strand(value:IStrand):void
{
super.strand = value;
@@ -62,33 +51,16 @@ package simple
host.addEventListener("itemsCreated", itemsCreatedHandler);
- listModel = _strand.getBeadByType(ISelectionModel) as ISelectionModel;
- listModel.addEventListener("dataProviderChanged", dataProviderChangeHandler);
-
performLayout(null);
}
/**
* @private
*/
- protected function itemsCreatedHandler(event:Event):void
- {
- performLayout(event);
- }
-
- /**
- * @private
- */
- protected function dataProviderChangeHandler(event:Event):void
+ override protected function performLayout(event:Event):void
{
- performLayout(event);
- }
+ super.performLayout(event);
- /**
- * @private
- */
- protected function performLayout(event:Event):void
- {
var layout:IBeadLayout = _strand.getBeadByType(IBeadLayout) as IBeadLayout;
if (layout == null) {
var c:Class = ValuesManager.valuesImpl.getValue(host, "iBeadLayout");
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/04ad0ed7/examples/flexjs/ListExample/src/main/flex/simple/IRFactoryForArrayData.as
----------------------------------------------------------------------
diff --git a/examples/flexjs/ListExample/src/main/flex/simple/IRFactoryForArrayData.as b/examples/flexjs/ListExample/src/main/flex/simple/IRFactoryForArrayData.as
index ad0a37e..956b847 100644
--- a/examples/flexjs/ListExample/src/main/flex/simple/IRFactoryForArrayData.as
+++ b/examples/flexjs/ListExample/src/main/flex/simple/IRFactoryForArrayData.as
@@ -141,7 +141,7 @@ package simple
if (!dp)
return;
- dataGroup.removeAllElements();
+ dataGroup.removeAllItemRenderers();
var listView:IListView = _strand.getBeadByType(IListView) as IListView;
var presentationModel:IListPresentationModel = _strand.getBeadByType(IListPresentationModel) as IListPresentationModel;
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/04ad0ed7/examples/flexjs/pom.xml
----------------------------------------------------------------------
diff --git a/examples/flexjs/pom.xml b/examples/flexjs/pom.xml
index d49f223..0831f2f 100644
--- a/examples/flexjs/pom.xml
+++ b/examples/flexjs/pom.xml
@@ -50,7 +50,7 @@
<module>FlexTeamPage_MDL</module>
<module>FlexWebsiteStatsViewer</module>
<module>HelloWorld</module>
- <!--<module>ListExample</module>-->
+ <module>ListExample</module>
<module>MapSearch</module>
<!--module>MDLBlogExample</module>-->
<module>MDLDynamicTabsExample</module>
[2/6] git commit: [flex-asjs] [refs/heads/tlf] - Exclude .idea folder
from rat checking
Posted by ha...@apache.org.
Exclude .idea folder from rat checking
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/82b51ba2
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/82b51ba2
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/82b51ba2
Branch: refs/heads/tlf
Commit: 82b51ba22bb50ee0c8f89231d05473b80d3a39d8
Parents: 6c71106
Author: piotrz <pi...@apache.org>
Authored: Wed Mar 29 06:20:28 2017 +0200
Committer: piotrz <pi...@apache.org>
Committed: Wed Mar 29 06:20:28 2017 +0200
----------------------------------------------------------------------
pom.xml | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/82b51ba2/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 8cf9166..3b7fb24 100644
--- a/pom.xml
+++ b/pom.xml
@@ -189,6 +189,7 @@
<exclude>testsuite/**</exclude>
<!-- Ignore IntelliJ IDEA project files -->
<exclude>**/*.iml</exclude>
+ <exclude>**/.idea/**</exclude>
</excludes>
</configuration>
<dependencies>