You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flex.apache.org by pe...@apache.org on 2015/11/06 17:46:54 UTC
git commit: [flex-asjs] [refs/heads/core_js_to_as] - Added
IItemRendererProvider interface and updated List to implement it.
Repository: flex-asjs
Updated Branches:
refs/heads/core_js_to_as 8d5855703 -> e12fc805d
Added IItemRendererProvider interface and updated List to implement it.
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/e12fc805
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/e12fc805
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/e12fc805
Branch: refs/heads/core_js_to_as
Commit: e12fc805d5ec20f33d2e23587f19d9e6c6a1cbd1
Parents: 8d58557
Author: Peter Ent <pe...@apache.org>
Authored: Fri Nov 6 11:46:48 2015 -0500
Committer: Peter Ent <pe...@apache.org>
Committed: Fri Nov 6 11:46:48 2015 -0500
----------------------------------------------------------------------
frameworks/projects/Core/as/src/CoreClasses.as | 1 +
.../apache/flex/core/IItemRendererProvider.as | 58 ++++++++++++++++++++
.../flex/core/ItemRendererClassFactory.as | 23 ++++----
.../HTML/as/src/org/apache/flex/html/List.as | 30 +++++++++-
4 files changed, 98 insertions(+), 14 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/e12fc805/frameworks/projects/Core/as/src/CoreClasses.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/Core/as/src/CoreClasses.as b/frameworks/projects/Core/as/src/CoreClasses.as
index d1f22b8..f46d940 100644
--- a/frameworks/projects/Core/as/src/CoreClasses.as
+++ b/frameworks/projects/Core/as/src/CoreClasses.as
@@ -58,6 +58,7 @@ internal class CoreClasses
import org.apache.flex.core.IDocument; IDocument;
import org.apache.flex.core.IFormatBead; IFormatBead;
import org.apache.flex.core.IImageModel; IImageModel;
+ 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.IListPresentationModel; IListPresentationModel;
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/e12fc805/frameworks/projects/Core/as/src/org/apache/flex/core/IItemRendererProvider.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/Core/as/src/org/apache/flex/core/IItemRendererProvider.as b/frameworks/projects/Core/as/src/org/apache/flex/core/IItemRendererProvider.as
new file mode 100644
index 0000000..0e85c14
--- /dev/null
+++ b/frameworks/projects/Core/as/src/org/apache/flex/core/IItemRendererProvider.as
@@ -0,0 +1,58 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+// 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.IFactory;
+
+ /**
+ * The IItemRendererProvider interface is implemented by classes that
+ * provide a ClassFactory for itemRenderers.
+ *
+ * @see org.apache.flex.core.IItemRenderer
+ *
+ * @langversion 3.0
+ * @playerversion Flash 10.2
+ * @playerversion AIR 2.6
+ * @productversion FlexJS 0.0
+ */
+ public interface IItemRendererProvider
+ {
+ /**
+ * Returns whether or not the class has an itemRenderer set.
+ * @return true if the itemRenderer has been set, false otherwise.
+ *
+ * @langversion 3.0
+ * @playerversion Flash 10.2
+ * @playerversion AIR 2.6
+ * @productversion FlexJS 0.0
+ */
+ function get hasItemRenderer():Boolean;
+
+ /**
+ * Returns the class factory that will generate instances of the itemRenderer.
+ *
+ * @langversion 3.0
+ * @playerversion Flash 10.2
+ * @playerversion AIR 2.6
+ * @productversion FlexJS 0.0
+ */
+ function get itemRenderer():IFactory;
+ function set itemRenderer(value:IFactory):void;
+ }
+}
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/e12fc805/frameworks/projects/Core/as/src/org/apache/flex/core/ItemRendererClassFactory.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/Core/as/src/org/apache/flex/core/ItemRendererClassFactory.as b/frameworks/projects/Core/as/src/org/apache/flex/core/ItemRendererClassFactory.as
index 16ffd1a..026070f 100644
--- a/frameworks/projects/Core/as/src/org/apache/flex/core/ItemRendererClassFactory.as
+++ b/frameworks/projects/Core/as/src/org/apache/flex/core/ItemRendererClassFactory.as
@@ -21,6 +21,7 @@ package org.apache.flex.core
import org.apache.flex.core.ClassFactory;
import org.apache.flex.core.IFactory;
+ import org.apache.flex.core.IItemRendererProvider;
import org.apache.flex.utils.MXMLDataInterpreter;
@@ -68,22 +69,18 @@ package org.apache.flex.core
public function set strand(value:IStrand):void
{
_strand = value;
-
- // see if the _strand has an itemRenderer property that isn't empty. if that's
- // true, use that value instead of pulling it from the the style
- if (Object(_strand).hasOwnProperty("itemRenderer")) {
- itemRendererFactory = Object(_strand)["itemRenderer"] as ClassFactory;
- if (itemRendererFactory) {
+
+ if (_strand is IItemRendererProvider && (_strand as IItemRendererProvider).hasItemRenderer) {
+ itemRendererFactory = (_strand as IItemRendererProvider).itemRenderer;
+ createFunction = createFromClass;
+ }
+ else {
+ var itemRendererClass:Class = ValuesManager.valuesImpl.getValue(_strand, "iItemRenderer") as Class;
+ if (itemRendererClass) {
+ itemRendererFactory = new ClassFactory(itemRendererClass);
createFunction = createFromClass;
- return;
}
}
-
- var itemRendererClass:Class = ValuesManager.valuesImpl.getValue(_strand, "iItemRenderer") as Class;
- if (itemRendererClass) {
- itemRendererFactory = new ClassFactory(itemRendererClass);
- createFunction = createFromClass;
- }
}
/**
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/e12fc805/frameworks/projects/HTML/as/src/org/apache/flex/html/List.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/HTML/as/src/org/apache/flex/html/List.as b/frameworks/projects/HTML/as/src/org/apache/flex/html/List.as
index 77994d6..63bcf02 100644
--- a/frameworks/projects/HTML/as/src/org/apache/flex/html/List.as
+++ b/frameworks/projects/HTML/as/src/org/apache/flex/html/List.as
@@ -23,6 +23,7 @@ package org.apache.flex.html
import org.apache.flex.core.IDataProviderItemRendererMapper;
import org.apache.flex.core.IFactory;
import org.apache.flex.core.IItemRendererClassFactory;
+ import org.apache.flex.core.IItemRendererProvider;
import org.apache.flex.core.IListPresentationModel;
import org.apache.flex.core.IRollOverModel;
import org.apache.flex.core.ISelectionModel;
@@ -76,7 +77,7 @@ package org.apache.flex.html
* @playerversion AIR 2.6
* @productversion FlexJS 0.0
*/
- public class List extends ListBase
+ public class List extends ListBase implements IItemRendererProvider
{
/**
* constructor.
@@ -234,6 +235,33 @@ package org.apache.flex.html
}
/**
+ * Returns whether or not the itemRenderer property has been set.
+ *
+ * @see org.apache.flex.core.IItemRendererProvider
+ *
+ * @langversion 3.0
+ * @playerversion Flash 10.2
+ * @playerversion AIR 2.6
+ * @productversion FlexJS 0.0
+ */
+ public function get hasItemRenderer():Boolean
+ {
+ var result:Boolean = false;
+
+ COMPILE::AS3 {
+ result = _itemRenderer != null;
+ }
+
+ COMPILE::JS {
+ var test:* = _itemRenderer;
+ result = _itemRenderer !== null && test !== undefined;
+ }
+
+ return result;
+ }
+
+
+ /**
* @private
*/
override public function addedToParent():void