You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flex.apache.org by cd...@apache.org on 2016/11/05 15:22:46 UTC
[40/54] [abbrv] git commit: [flex-asjs]
[refs/heads/feature-autobuild/example-maven-dirs] - Merge branch 'develop' of
https://git-wip-us.apache.org/repos/asf/flex-asjs into develop
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/661fb353
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/661fb353
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/661fb353
Branch: refs/heads/feature-autobuild/example-maven-dirs
Commit: 661fb3536643762604c4b8ee1f4a675434f5c30c
Parents: 956037a 5f8b165
Author: Alex Harui <ah...@apache.org>
Authored: Tue Nov 1 23:22:07 2016 -0700
Committer: Alex Harui <ah...@apache.org>
Committed: Tue Nov 1 23:22:07 2016 -0700
----------------------------------------------------------------------
.../main/flex/org/apache/flex/core/ListBase.as | 11 ++-
.../main/flex/org/apache/flex/core/ViewBase.as | 16 ++++-
.../projects/Core/src/main/flex/CoreClasses.as | 1 +
.../flex/org/apache/flex/core/ILayoutParent.as | 34 +++++++++
.../main/flex/org/apache/flex/html/Container.as | 9 ++-
.../DataItemRendererFactoryForArrayData.as | 3 +-
.../DataItemRendererFactoryForArrayList.as | 2 +-
.../DataItemRendererFactoryForColumnData.as | 2 +-
.../flex/html/beads/layouts/BasicLayout.as | 7 +-
.../FlexibleFirstChildHorizontalLayout.as | 5 +-
.../flex/html/beads/layouts/HorizontalLayout.as | 6 +-
.../layouts/OneFlexibleChildHorizontalLayout.as | 6 +-
.../layouts/OneFlexibleChildVerticalLayout.as | 5 +-
.../flex/html/beads/layouts/TileLayout.as | 9 +--
.../html/beads/layouts/VerticalColumnLayout.as | 5 +-
.../flex/html/beads/layouts/VerticalLayout.as | 5 +-
.../html/supportClasses/MXMLItemRenderer.as | 72 ++++++++++++++++++++
.../html/supportClasses/UIItemRendererBase.as | 7 +-
.../HTML/src/main/resources/basic-manifest.xml | 1 +
19 files changed, 182 insertions(+), 24 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/661fb353/frameworks/projects/Basic/src/main/flex/org/apache/flex/core/ListBase.as
----------------------------------------------------------------------
diff --cc frameworks/projects/Basic/src/main/flex/org/apache/flex/core/ListBase.as
index f9c0aaa,0000000..562e74e
mode 100644,000000..100644
--- a/frameworks/projects/Basic/src/main/flex/org/apache/flex/core/ListBase.as
+++ b/frameworks/projects/Basic/src/main/flex/org/apache/flex/core/ListBase.as
@@@ -1,126 -1,0 +1,135 @@@
+////////////////////////////////////////////////////////////////////////////////
+//
+// 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.flex.core
+{
+ import org.apache.flex.core.IMXMLDocument;
+ import org.apache.flex.core.ValuesManager;
++ import org.apache.flex.core.ILayoutParent;
+ import org.apache.flex.events.Event;
+ import org.apache.flex.events.ValueChangeEvent;
+ import org.apache.flex.states.State;
+ import org.apache.flex.utils.MXMLDataInterpreter;
+
+ /**
+ * The ListBase class is the base class for most lists
+ * in FlexJS.
+ *
+ * @langversion 3.0
+ * @playerversion Flash 10.2
+ * @playerversion AIR 2.6
+ * @productversion FlexJS 0.0
+ */
- public class ListBase extends UIBase implements IContentViewHost
++ public class ListBase extends UIBase implements IContentViewHost, ILayoutParent
+ {
+ /**
+ * Constructor.
+ *
+ * @langversion 3.0
+ * @playerversion Flash 10.2
+ * @playerversion AIR 2.6
+ * @productversion FlexJS 0.0
+ */
+ public function ListBase()
+ {
+ super();
+
+ _strandChildren = new ListBaseStrandChildren(this);
+ }
+
+ private var _strandChildren:ListBaseStrandChildren;
+
+ /**
+ * @private
+ */
+ public function get strandChildren():IParent
+ {
+ return _strandChildren;
+ }
+
+ /**
+ * @private
++ */
++ public function getLayoutHost():ILayoutHost
++ {
++ return view as ILayoutHost;
++ }
++
++ /**
++ * @private
+ * @suppress {undefinedNames}
+ * Support strandChildren.
+ */
+ public function $numElements():int
+ {
+ return super.numElements();
+ }
+
+
+ /**
+ * @private
+ * @suppress {undefinedNames}
+ * Support strandChildren.
+ */
+ public function $addElement(c:IChild, dispatchEvent:Boolean = true):void
+ {
+ super.addElement(c, dispatchEvent);
+ }
+
+ /**
+ * @private
+ * @suppress {undefinedNames}
+ * Support strandChildren.
+ */
+ public function $addElementAt(c:IChild, index:int, dispatchEvent:Boolean = true):void
+ {
+ super.addElementAt(c, index, dispatchEvent);
+ }
+
+ /**
+ * @private
+ * @suppress {undefinedNames}
+ * Support strandChildren.
+ */
+ public function $removeElement(c:IChild, dispatchEvent:Boolean = true):void
+ {
+ super.removeElement(c, dispatchEvent);
+ }
+
+ /**
+ * @private
+ * @suppress {undefinedNames}
+ * Support strandChildren.
+ */
+ public function $getElementIndex(c:IChild):int
+ {
+ return super.getElementIndex(c);
+ }
+
+ /**
+ * @private
+ * @suppress {undefinedNames}
+ * Support strandChildren.
+ */
+ public function $getElementAt(index:int):IChild
+ {
+ return super.getElementAt(index);
+ }
+
+ }
+}
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/661fb353/frameworks/projects/Basic/src/main/flex/org/apache/flex/core/ViewBase.as
----------------------------------------------------------------------
diff --cc frameworks/projects/Basic/src/main/flex/org/apache/flex/core/ViewBase.as
index 7e4b65e,0000000..73092af
mode 100644,000000..100644
--- a/frameworks/projects/Basic/src/main/flex/org/apache/flex/core/ViewBase.as
+++ b/frameworks/projects/Basic/src/main/flex/org/apache/flex/core/ViewBase.as
@@@ -1,97 -1,0 +1,111 @@@
+////////////////////////////////////////////////////////////////////////////////
+//
+// 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.flex.core
+{
+ import org.apache.flex.events.Event;
+
+ //--------------------------------------
+ // Events
+ //--------------------------------------
+
+ /**
+ * Dispatched at startup. Attributes and sub-instances of
+ * the MXML document have been created and assigned.
+ * The component lifecycle is different
+ * than the Flex SDK. There is no creationComplete event.
+ *
+ * @langversion 3.0
+ * @playerversion Flash 10.2
+ * @playerversion AIR 2.6
+ * @productversion FlexJS 0.0
+ */
+ [Event(name="initComplete", type="org.apache.flex.events.Event")]
+
+ [DefaultProperty("mxmlContent")]
+
+ /**
+ * The ViewBase class is the base class for most views in a FlexJS
+ * application.
+ *
+ * @langversion 3.0
+ * @playerversion Flash 10.2
+ * @playerversion AIR 2.6
+ * @productversion FlexJS 0.0
+ */
- public class ViewBase extends ContainerBase implements IPopUpHost, IApplicationView
++ public class ViewBase extends ContainerBase implements IPopUpHost, IApplicationView, ILayoutParent
+ {
+ /**
+ * Constructor.
+ *
+ * @langversion 3.0
+ * @playerversion Flash 10.2
+ * @playerversion AIR 2.6
+ * @productversion FlexJS 0.0
+ */
+ public function ViewBase()
+ {
+ super();
+
+ className = "flexjs";
+ }
+
+ private var _applicationModel:Object;
+
+ [Bindable("modelChanged")]
+
+ /**
+ * A reference to the Application's model. Usually,
+ * a view is displaying the main model for an
+ * application.
+ *
+ * @langversion 3.0
+ * @playerversion Flash 10.2
+ * @playerversion AIR 2.6
+ * @productversion FlexJS 0.0
+ */
+ public function get applicationModel():Object
+ {
+ return _applicationModel;
+ }
+
+ /**
+ * @private
+ */
+ public function set applicationModel(value:Object):void
+ {
+ _applicationModel = value;
+ dispatchEvent(new Event("modelChanged"));
+ }
++
++ /**
++ * Implements the ILayoutParent protocol by returning the bead that
++ * is acting as the host for layout.
++ *
++ * @langversion 3.0
++ * @playerversion Flash 10.2
++ * @playerversion AIR 2.6
++ * @productversion FlexJS 0.0
++ */
++ public function getLayoutHost():ILayoutHost
++ {
++ return getBeadByType(ILayoutHost) as ILayoutHost;
++ }
+
+ }
+}
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/661fb353/frameworks/projects/Core/src/main/flex/CoreClasses.as
----------------------------------------------------------------------
diff --cc frameworks/projects/Core/src/main/flex/CoreClasses.as
index aff0dbc,232c9b3..d8c65ef
--- a/frameworks/projects/Core/src/main/flex/CoreClasses.as
+++ b/frameworks/projects/Core/src/main/flex/CoreClasses.as
@@@ -74,8 -62,8 +74,9 @@@ internal class CoreClasse
import org.apache.flex.core.IItemRendererProvider; IItemRendererProvider;
import org.apache.flex.core.ILayoutChild; ILayoutChild;
import org.apache.flex.core.ILayoutHost; ILayoutHost;
+ import org.apache.flex.core.ILayoutParent; ILayoutParent;
import org.apache.flex.core.IListPresentationModel; IListPresentationModel;
+ import org.apache.flex.core.IMeasurementBead; IMeasurementBead;
import org.apache.flex.core.IPanelModel; IPanelModel;
import org.apache.flex.core.IParent; IParent;
import org.apache.flex.core.IParentIUIBase; IParentIUIBase;
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/661fb353/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/layouts/BasicLayout.as
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/661fb353/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/layouts/HorizontalLayout.as
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/661fb353/frameworks/projects/HTML/src/main/resources/basic-manifest.xml
----------------------------------------------------------------------