You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flex.apache.org by pi...@apache.org on 2017/01/15 15:34:11 UTC

git commit: [flex-asjs] [refs/heads/develop] - - Clean up Data Binding classes - move some common code to DataBindingBase class - Move DataBindingBase to Binding package

Repository: flex-asjs
Updated Branches:
  refs/heads/develop ba3c2112e -> 1c6c72d1a


- Clean up Data Binding classes - move some common code to DataBindingBase class
- Move DataBindingBase to Binding package


Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/1c6c72d1
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/1c6c72d1
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/1c6c72d1

Branch: refs/heads/develop
Commit: 1c6c72d1a2332fee30c3414eb7ece3171c8eb209
Parents: ba3c211
Author: piotrz <pi...@apache.org>
Authored: Sun Jan 15 16:34:06 2017 +0100
Committer: piotrz <pi...@apache.org>
Committed: Sun Jan 15 16:34:06 2017 +0100

----------------------------------------------------------------------
 .../Binding/src/main/flex/BindingClasses.as     |  22 +-
 .../flex/binding/ApplicationDataBinding.as      | 186 +-----------
 .../apache/flex/binding/ContainerDataBinding.as | 194 +------------
 .../org/apache/flex/binding/DataBindingBase.as  | 285 +++++++++++++++++++
 .../flex/binding/ItemRendererDataBinding.as     | 198 +------------
 .../flex/binding/MXMLBeadViewDataBinding.as     | 192 +------------
 .../org/apache/flex/binding/ViewDataBinding.as  | 211 +-------------
 .../projects/Core/src/main/flex/CoreClasses.as  |   1 -
 .../org/apache/flex/core/DataBindingBase.as     |  45 ---
 9 files changed, 329 insertions(+), 1005 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/1c6c72d1/frameworks/projects/Binding/src/main/flex/BindingClasses.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/Binding/src/main/flex/BindingClasses.as b/frameworks/projects/Binding/src/main/flex/BindingClasses.as
index e9f56a2..1705c50 100644
--- a/frameworks/projects/Binding/src/main/flex/BindingClasses.as
+++ b/frameworks/projects/Binding/src/main/flex/BindingClasses.as
@@ -19,16 +19,16 @@
 package
 {
 
-/**
- *  @private
- *  This class is used to link additional classes into rpc.swc
- *  beyond those that are found by dependecy analysis starting
- *  from the classes specified in manifest.xml.
- */
-internal class BindingClasses
-{	
-    import org.apache.flex.binding.ChainBinding; ChainBinding;
-}
-
+    /**
+     *  @private
+     *  This class is used to link additional classes into rpc.swc
+     *  beyond those that are found by dependecy analysis starting
+     *  from the classes specified in manifest.xml.
+     */
+    internal class BindingClasses
+    {
+        import org.apache.flex.binding.ChainBinding; ChainBinding;
+        import org.apache.flex.binding.DataBindingBase; DataBindingBase;
+    }
 }
 

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/1c6c72d1/frameworks/projects/Binding/src/main/flex/org/apache/flex/binding/ApplicationDataBinding.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/Binding/src/main/flex/org/apache/flex/binding/ApplicationDataBinding.as b/frameworks/projects/Binding/src/main/flex/org/apache/flex/binding/ApplicationDataBinding.as
index 438a809..d6511b4 100644
--- a/frameworks/projects/Binding/src/main/flex/org/apache/flex/binding/ApplicationDataBinding.as
+++ b/frameworks/projects/Binding/src/main/flex/org/apache/flex/binding/ApplicationDataBinding.as
@@ -24,7 +24,6 @@ package org.apache.flex.binding
     import org.apache.flex.binding.PropertyWatcher;
     import org.apache.flex.binding.SimpleBinding;
     import org.apache.flex.binding.WatcherBase;
-    import org.apache.flex.core.DataBindingBase;
     import org.apache.flex.core.IBead;
     import org.apache.flex.core.IStrand;
     import org.apache.flex.events.Event;
@@ -47,7 +46,7 @@ package org.apache.flex.binding
      *  @playerversion AIR 2.6
      *  @productversion FlexJS 0.0
      */
-	public class ApplicationDataBinding extends DataBindingBase implements IBead
+	public class ApplicationDataBinding extends DataBindingBase
 	{
         /**
          *  Constructor.
@@ -61,24 +60,22 @@ package org.apache.flex.binding
 		{
 			super();
 		}
-        
-        private var _strand:IStrand;
-        
+
         /**
          *  @copy org.apache.flex.core.IBead#strand
-         *  
+         *
          *  @langversion 3.0
          *  @playerversion Flash 10.2
          *  @playerversion AIR 2.6
          *  @productversion FlexJS 0.0
          */
-        public function set strand(value:IStrand):void
+        override public function set strand(value:IStrand):void
         {
             _strand = value;
-            IEventDispatcher(_strand).addEventListener("viewChanged", initCompleteHandler);
-        }    
+            IEventDispatcher(_strand).addEventListener("viewChanged", viewChangedHandler);
+        }
 
-        private function initCompleteHandler(event:Event):void
+        private function viewChangedHandler(event:Event):void
         {
             if (!("_bindings" in _strand))
                 return;
@@ -163,29 +160,6 @@ package org.apache.flex.binding
             }
         }
 
-        private function prepareCreatedBinding(binding:IBinding, bindingObject:Object):void
-        {
-            var destinationObject:Object = _strand[bindingObject.destination[0]];
-            var destination:IStrand = destinationObject as IStrand;
-            if (destination)
-            {
-                destination.addBead(binding as IBead);
-            }
-            else
-            {
-                if (destinationObject)
-                {
-                    binding.destination = destinationObject;
-                    _strand.addBead(binding as IBead);
-                }
-                else
-                {
-                    deferredBindings[bindingObject.destination[0]] = binding;
-                    IEventDispatcher(_strand).addEventListener("valueChange", deferredBindingsHandler);
-                }
-            }
-        }
-
         private function makeGenericBinding(binding:Object, index:int, watchers:Object):void
         {
             var gb:GenericBinding = new GenericBinding();
@@ -195,151 +169,5 @@ package org.apache.flex.binding
             gb.source = binding.source;
             setupWatchers(gb, index, watchers.watchers, null);
         }
-        
-        /**
-         * @flexjsignorecoercion Function
-         */
-        private function setupWatchers(gb:GenericBinding, index:int, watchers:Array, parentWatcher:WatcherBase):void
-        {
-            var foundWatcher:Boolean = false;
-            
-            var n:int = watchers.length;
-            for (var i:int = 0; i < n; i++)
-            {
-                var watcher:Object = watchers[i];
-                var isValidWatcher:Boolean = false;
-                if (typeof(watcher.bindings) == "number")
-                    isValidWatcher = (watcher.bindings == index);
-                else
-                    isValidWatcher = (watcher.bindings.indexOf(index) != -1);
-                if (isValidWatcher)
-                {
-                    var type:String = watcher.type;
-                    switch (type)
-                    {
-                        case "property":
-                        {
-                            var pw:PropertyWatcher = new PropertyWatcher(_strand, 
-                                watcher.propertyName, 
-                                watcher.eventNames,
-                                (typeof(gb.source) === "function" && watcher.children == null) ? gb.source as Function : watcher.getterFunction);
-                            watcher.watcher = pw;
-                            if (parentWatcher)
-                                pw.parentChanged(parentWatcher.value);
-                            else
-                                pw.parentChanged(_strand);
-                            if (parentWatcher)
-                                parentWatcher.addChild(pw);
-                            if (watcher.children == null)
-                                pw.addBinding(gb);
-                            foundWatcher = true;
-                            break;
-                        }
-                    }
-                    if (watcher.children)
-                    {
-                        setupWatchers(gb, index, watcher.children.watchers, watcher.watcher);
-                    }
-                }
-            }
-            if (!foundWatcher && parentWatcher == null)
-            {
-                // might be a binding to a function that doesn't have change events
-                // so just force an update
-                gb.valueChanged(null);
-            }
-        }
-        
-        private function decodeWatcher(bindingData:Array):Object
-        {
-            var watcherMap:Object = {};
-            var watchers:Array = [];
-            var n:int = bindingData.length;
-            var index:int = 0;
-            var watcherData:Object;
-            while (index < n - 1)
-            {
-                var watcherIndex:int = bindingData[index++];
-                var type:int = bindingData[index++];
-                switch (type)
-                {
-                    case 0:
-                    {
-                        watcherData = { type: "function" };
-                        watcherData.functionName = bindingData[index++];
-						watcherData.paramFunction = bindingData[index++];
-                        watcherData.eventNames = bindingData[index++];
-                        watcherData.bindings = bindingData[index++];
-                        break;
-                    }
-                    case 1:
-					{
-						watcherData = { type: "static" };
-						watcherData.propertyName = bindingData[index++];
-						watcherData.eventNames = bindingData[index++];
-						watcherData.bindings = bindingData[index++];
-						watcherData.getterFunction = bindingData[index++];
-						watcherData.parentObj = bindingData[index++];
-						watcherMap[watcherData.propertyName] = watcherData;
-						break;
-					}
-                    case 2:
-                    {
-                        watcherData = { type: "property" };
-                        watcherData.propertyName = bindingData[index++];
-                        watcherData.eventNames = bindingData[index++];
-                        watcherData.bindings = bindingData[index++];
-                        watcherData.getterFunction = bindingData[index++];
-                        watcherMap[watcherData.propertyName] = watcherData;
-                        break;
-                    }
-                    case 3:
-                    {
-                        watcherData = { type: "xml" };
-                        watcherData.propertyName = bindingData[index++];
-                        watcherData.bindings = bindingData[index++];
-                        watcherMap[watcherData.propertyName] = watcherData;
-                        break;
-                    }
-                }
-                watcherData.children = bindingData[index++];
-                if (watcherData.children != null)
-                {
-                    watcherData.children = decodeWatcher(watcherData.children);
-                }
-                watcherData.index = watcherIndex;
-                watchers.push(watcherData);
-            }            
-            return { watchers: watchers, watcherMap: watcherMap };
-        }
-        
-        private var deferredBindings:Object = {};
-        private function deferredBindingsHandler(event:Event):void
-        {
-            for (var p:String in deferredBindings)
-            {
-                if (_strand[p] != null)
-                {
-					var destination:IStrand = _strand[p] as IStrand;
-					if (destination)
-						destination.addBead(deferredBindings[p]);
-					else
-					{
-						var destObject:Object = _strand[p];
-						if (destObject)
-						{
-							deferredBindings[p].destination = destObject;
-							_strand.addBead(deferredBindings[p]);
-						}
-						else
-						{
-							trace("unexpected condition in deferredBindingsHandler");
-						}
-					}
-					delete deferredBindings[p];
-                }
-            }
-        }
-        
     }
 }

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/1c6c72d1/frameworks/projects/Binding/src/main/flex/org/apache/flex/binding/ContainerDataBinding.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/Binding/src/main/flex/org/apache/flex/binding/ContainerDataBinding.as b/frameworks/projects/Binding/src/main/flex/org/apache/flex/binding/ContainerDataBinding.as
index 1fc5977..bb05f91 100644
--- a/frameworks/projects/Binding/src/main/flex/org/apache/flex/binding/ContainerDataBinding.as
+++ b/frameworks/projects/Binding/src/main/flex/org/apache/flex/binding/ContainerDataBinding.as
@@ -24,7 +24,6 @@ package org.apache.flex.binding
     import org.apache.flex.binding.PropertyWatcher;
     import org.apache.flex.binding.SimpleBinding;
     import org.apache.flex.binding.WatcherBase;
-    import org.apache.flex.core.DataBindingBase;
     import org.apache.flex.core.IBead;
     import org.apache.flex.core.IStrand;
     import org.apache.flex.events.Event;
@@ -60,25 +59,11 @@ package org.apache.flex.binding
 		{
 			super();
 		}
-        
-        private var _strand:IStrand;
-        
-        /**
-         *  @copy org.apache.flex.core.IBead#strand
-         *  
-         *  @langversion 3.0
-         *  @playerversion Flash 10.2
-         *  @playerversion AIR 2.6
-         *  @productversion FlexJS 0.0
-         */
-        public function set strand(value:IStrand):void
-        {
-            _strand = value;
-            IEventDispatcher(_strand).addEventListener("initBindings", initCompleteHandler);
-        }    
 
-        private function initCompleteHandler(event:Event):void
+        override protected function initBindingsHandler(event:Event):void
         {
+            super.initBindingsHandler(event);
+
             if (!("_bindings" in _strand))
                 return;
             var fieldWatcher:Object;
@@ -192,33 +177,6 @@ package org.apache.flex.binding
             }
         }
 
-        private function prepareCreatedBinding(binding:IBinding, bindingObject:Object, destinationObject:Object = null):void
-        {
-            if (!destinationObject)
-            {
-                destinationObject = _strand[bindingObject.destination[0]];
-            }
-
-            var destination:IStrand = destinationObject as IStrand;
-            if (destination)
-            {
-                destination.addBead(binding as IBead);
-            }
-            else
-            {
-                if (destinationObject)
-                {
-                    binding.destination = destinationObject;
-                    _strand.addBead(binding as IBead);
-                }
-                else
-                {
-                    deferredBindings[bindingObject.destination[0]] = binding;
-                    IEventDispatcher(_strand).addEventListener("valueChange", deferredBindingsHandler);
-                }
-            }
-        }
-
         private function makeGenericBinding(binding:Object, index:int, watchers:Object):void
         {
             var gb:GenericBinding = new GenericBinding();
@@ -238,151 +196,5 @@ package org.apache.flex.binding
                 gb.valueChanged(null);  
             }
         }
-        
-        /**
-         * @flexjsignorecoercion Function
-         */
-        private function setupWatchers(gb:GenericBinding, index:int, watchers:Array, parentWatcher:WatcherBase):void
-        {
-            var foundWatcher:Boolean = false;
-            
-            var n:int = watchers.length;
-            for (var i:int = 0; i < n; i++)
-            {
-                var watcher:Object = watchers[i];
-                var isValidWatcher:Boolean = false;
-                if (typeof(watcher.bindings) == "number")
-                    isValidWatcher = (watcher.bindings == index);
-                else
-                    isValidWatcher = (watcher.bindings.indexOf(index) != -1);
-                if (isValidWatcher)
-                {
-                    var type:String = watcher.type;
-                    switch (type)
-                    {
-                        case "property":
-                        {
-                            var pw:PropertyWatcher = new PropertyWatcher(_strand, 
-                                watcher.propertyName, 
-                                watcher.eventNames,
-                                (typeof(gb.source) === "function" && watcher.children == null) ? gb.source as Function : watcher.getterFunction);
-                            watcher.watcher = pw;
-                            if (parentWatcher)
-                                pw.parentChanged(parentWatcher.value);
-                            else
-                                pw.parentChanged(_strand);
-                            if (parentWatcher)
-                                parentWatcher.addChild(pw);
-                            if (watcher.children == null)
-                                pw.addBinding(gb);
-                            foundWatcher = true;
-                            break;
-                        }
-                    }
-                    if (watcher.children)
-                    {
-                        setupWatchers(gb, index, watcher.children.watchers, watcher.watcher);
-                    }
-                }
-            }
-            if (!foundWatcher && parentWatcher == null)
-            {
-                // might be a binding to a function that doesn't have change events
-                // so just force an update
-                gb.valueChanged(null);
-            }
-        }
-        
-        private function decodeWatcher(bindingData:Array):Object
-        {
-            var watcherMap:Object = {};
-            var watchers:Array = [];
-            var n:int = bindingData.length;
-            var index:int = 0;
-            var watcherData:Object;
-            while (index < n - 1)
-            {
-                var watcherIndex:int = bindingData[index++];
-                var type:int = bindingData[index++];
-                switch (type)
-                {
-                    case 0:
-                    {
-                        watcherData = { type: "function" };
-                        watcherData.functionName = bindingData[index++];
-						watcherData.paramFunction = bindingData[index++];
-                        watcherData.eventNames = bindingData[index++];
-                        watcherData.bindings = bindingData[index++];
-                        break;
-                    }
-                    case 1:
-					{
-						watcherData = { type: "static" };
-						watcherData.propertyName = bindingData[index++];
-						watcherData.eventNames = bindingData[index++];
-						watcherData.bindings = bindingData[index++];
-						watcherData.getterFunction = bindingData[index++];
-						watcherData.parentObj = bindingData[index++];
-						watcherMap[watcherData.propertyName] = watcherData;
-						break;
-					}
-                    case 2:
-                    {
-                        watcherData = { type: "property" };
-                        watcherData.propertyName = bindingData[index++];
-                        watcherData.eventNames = bindingData[index++];
-                        watcherData.bindings = bindingData[index++];
-                        watcherData.getterFunction = bindingData[index++];
-                        watcherMap[watcherData.propertyName] = watcherData;
-                        break;
-                    }
-                    case 3:
-                    {
-                        watcherData = { type: "xml" };
-                        watcherData.propertyName = bindingData[index++];
-                        watcherData.bindings = bindingData[index++];
-                        watcherMap[watcherData.propertyName] = watcherData;
-                        break;
-                    }
-                }
-                watcherData.children = bindingData[index++];
-                if (watcherData.children != null)
-                {
-                    watcherData.children = decodeWatcher(watcherData.children);
-                }
-                watcherData.index = watcherIndex;
-                watchers.push(watcherData);
-            }            
-            return { watchers: watchers, watcherMap: watcherMap };
-        }
-        
-        private var deferredBindings:Object = {};
-        private function deferredBindingsHandler(event:Event):void
-        {
-            for (var p:String in deferredBindings)
-            {
-                if (_strand[p] != null)
-                {
-					var destination:IStrand = _strand[p] as IStrand;
-					if (destination)
-						destination.addBead(deferredBindings[p]);
-					else
-					{
-						var destObject:Object = _strand[p];
-						if (destObject)
-						{
-							deferredBindings[p].destination = destObject;
-							_strand.addBead(deferredBindings[p]);
-						}
-						else
-						{
-							trace("unexpected condition in deferredBindingsHandler");
-						}
-					}
-					delete deferredBindings[p];
-                }
-            }
-        }
-        
     }
 }

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/1c6c72d1/frameworks/projects/Binding/src/main/flex/org/apache/flex/binding/DataBindingBase.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/Binding/src/main/flex/org/apache/flex/binding/DataBindingBase.as b/frameworks/projects/Binding/src/main/flex/org/apache/flex/binding/DataBindingBase.as
new file mode 100644
index 0000000..af73d86
--- /dev/null
+++ b/frameworks/projects/Binding/src/main/flex/org/apache/flex/binding/DataBindingBase.as
@@ -0,0 +1,285 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  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.binding
+{
+    import org.apache.flex.core.IBead;
+    import org.apache.flex.core.IStrand;
+    import org.apache.flex.events.Event;
+    import org.apache.flex.events.IEventDispatcher;
+    import org.apache.flex.core.IBinding;
+
+    /**
+     *  The DataBindingBase class is the base class for custom data binding
+     *  implementations that can be cross-compiled.
+     *  
+     *  @langversion 3.0
+     *  @playerversion Flash 10.2
+     *  @playerversion AIR 2.6
+     *  @productversion FlexJS 0.0
+     */
+	public class DataBindingBase implements IBead
+	{
+        /**
+         *  Constructor.
+         *  
+         *  @langversion 3.0
+         *  @playerversion Flash 10.2
+         *  @playerversion AIR 2.6
+         *  @productversion FlexJS 0.0
+         */
+		public function DataBindingBase()
+		{
+		}
+
+		protected var _strand:IStrand;
+
+        protected var deferredBindings:Object = {};
+
+        /**
+         *  @copy org.apache.flex.core.IBead#strand
+         *
+         *  @langversion 3.0
+         *  @playerversion Flash 10.2
+         *  @playerversion AIR 2.6
+         *  @productversion FlexJS 0.0
+         */
+        public function set strand(value:IStrand):void
+        {
+            _strand = value;
+            IEventDispatcher(_strand).addEventListener("initBindings", initBindingsHandler);
+        }
+
+        protected function initBindingsHandler(event:Event):void
+        {
+        }
+
+        protected function prepareCreatedBinding(binding:IBinding, bindingObject:Object, destinationObject:Object = null):void
+        {
+            if (!destinationObject)
+            {
+                destinationObject = _strand[bindingObject.destination[0]];
+            }
+
+            var destination:IStrand = destinationObject as IStrand;
+            if (destination)
+            {
+                destination.addBead(binding as IBead);
+            }
+            else
+            {
+                if (destinationObject)
+                {
+                    binding.destination = destinationObject;
+                    _strand.addBead(binding as IBead);
+                }
+                else
+                {
+                    deferredBindings[bindingObject.destination[0]] = binding;
+                    IEventDispatcher(_strand).addEventListener("valueChange", deferredBindingsHandler);
+                }
+            }
+        }
+
+        /**
+         * @flexjsignorecoercion Function
+         */
+        protected function setupWatchers(gb:GenericBinding, index:int, watchers:Array, parentWatcher:WatcherBase):void
+        {
+            var foundWatcher:Boolean = false;
+            var n:int = watchers.length;
+
+            for (var i:int = 0; i < n; i++)
+            {
+                var watcher:Object = watchers[i];
+                var isValidWatcher:Boolean = false;
+                if (typeof(watcher.bindings) == "number")
+                {
+                    isValidWatcher = (watcher.bindings == index);
+                }
+                else
+                {
+                    isValidWatcher = (watcher.bindings.indexOf(index) != -1);
+                }
+
+                if (isValidWatcher)
+                {
+                    var type:String = watcher.type;
+                    var parentObj:Object = _strand;
+                    switch (type)
+                    {
+                        case "static":
+                        {
+                            parentObj = watcher.parentObj;
+                            gb.staticRoot = parentObj;
+                            gb.isStatic = true;
+
+                            break;
+                        }
+                        case "property":
+                        {
+                            var getterFunction:Function = watcher.getterFunction;
+                            if (typeof(gb.source) === "function" && watcher.children == null)
+                            {
+                               getterFunction = gb.source as Function;
+                            }
+
+                            var pw:PropertyWatcher = new PropertyWatcher(_strand,
+                                    watcher.propertyName,
+                                    watcher.eventNames,
+                                    getterFunction);
+                            watcher.watcher = pw;
+                            if (parentWatcher)
+                            {
+                                pw.parentChanged(parentWatcher.value);
+                            }
+                            else
+                            {
+                                pw.parentChanged(parentObj);
+                            }
+
+                            if (parentWatcher)
+                            {
+                                parentWatcher.addChild(pw);
+                            }
+
+                            if (watcher.children == null)
+                            {
+                                pw.addBinding(gb);
+                            }
+
+                            foundWatcher = true;
+                            break;
+                        }
+                    }
+
+                    if (watcher.children)
+                    {
+                        setupWatchers(gb, index, watcher.children.watchers, watcher.watcher);
+                    }
+                }
+            }
+
+            if (!foundWatcher)
+            {
+                // might be a binding to a function that doesn't have change events
+                // so just force an update via parentWatcher (if it is set, null if not)
+                if (parentWatcher)
+                {
+                    gb.valueChanged(parentWatcher.value);
+                }
+                else
+                {
+                    gb.valueChanged(null);
+                }
+            }
+        }
+
+        protected function decodeWatcher(bindingData:Array):Object
+        {
+            var watcherMap:Object = {};
+            var watchers:Array = [];
+            var n:int = bindingData.length;
+            var index:int = 0;
+            var watcherData:Object;
+            while (index < n - 1)
+            {
+                var watcherIndex:int = bindingData[index++];
+                var type:int = bindingData[index++];
+                switch (type)
+                {
+                    case 0:
+                    {
+                        watcherData = { type: "function" };
+                        watcherData.functionName = bindingData[index++];
+                        watcherData.paramFunction = bindingData[index++];
+                        watcherData.eventNames = bindingData[index++];
+                        watcherData.bindings = bindingData[index++];
+                        break;
+                    }
+                    case 1:
+                    {
+                        watcherData = { type: "static" };
+                        watcherData.propertyName = bindingData[index++];
+                        watcherData.eventNames = bindingData[index++];
+                        watcherData.bindings = bindingData[index++];
+                        watcherData.getterFunction = bindingData[index++];
+                        watcherData.parentObj = bindingData[index++];
+                        watcherMap[watcherData.propertyName] = watcherData;
+                        break;
+                    }
+                    case 2:
+                    {
+                        watcherData = { type: "property" };
+                        watcherData.propertyName = bindingData[index++];
+                        watcherData.eventNames = bindingData[index++];
+                        watcherData.bindings = bindingData[index++];
+                        watcherData.getterFunction = bindingData[index++];
+                        watcherMap[watcherData.propertyName] = watcherData;
+                        break;
+                    }
+                    case 3:
+                    {
+                        watcherData = { type: "xml" };
+                        watcherData.propertyName = bindingData[index++];
+                        watcherData.bindings = bindingData[index++];
+                        watcherMap[watcherData.propertyName] = watcherData;
+                        break;
+                    }
+                }
+                watcherData.children = bindingData[index++];
+                if (watcherData.children != null)
+                {
+                    watcherData.children = decodeWatcher(watcherData.children);
+                }
+                watcherData.index = watcherIndex;
+                watchers.push(watcherData);
+            }
+            return { watchers: watchers, watcherMap: watcherMap };
+        }
+
+        private function deferredBindingsHandler(event:Event):void
+        {
+            for (var p:String in deferredBindings)
+            {
+                if (_strand[p] != null)
+                {
+                    var destination:IStrand = _strand[p] as IStrand;
+                    if (destination)
+                    {
+                        destination.addBead(deferredBindings[p]);
+                    }
+                    else
+                    {
+                        var destObject:Object = _strand[p];
+                        if (destObject)
+                        {
+                            deferredBindings[p].destination = destObject;
+                            _strand.addBead(deferredBindings[p]);
+                        }
+                        else
+                        {
+                            trace("unexpected condition in deferredBindingsHandler");
+                        }
+                    }
+                    delete deferredBindings[p];
+                }
+            }
+        }
+    }
+}

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/1c6c72d1/frameworks/projects/Binding/src/main/flex/org/apache/flex/binding/ItemRendererDataBinding.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/Binding/src/main/flex/org/apache/flex/binding/ItemRendererDataBinding.as b/frameworks/projects/Binding/src/main/flex/org/apache/flex/binding/ItemRendererDataBinding.as
index 46301dc..53459c8 100644
--- a/frameworks/projects/Binding/src/main/flex/org/apache/flex/binding/ItemRendererDataBinding.as
+++ b/frameworks/projects/Binding/src/main/flex/org/apache/flex/binding/ItemRendererDataBinding.as
@@ -42,7 +42,7 @@ package org.apache.flex.binding
      *  @playerversion AIR 2.6
      *  @productversion FlexJS 0.0
      */
-	public class ItemRendererDataBinding implements IBead
+	public class ItemRendererDataBinding extends DataBindingBase
 	{
         /**
          *  Constructor.
@@ -56,26 +56,11 @@ package org.apache.flex.binding
 		{
 			super();
 		}
-        
-        private var _strand:IStrand;
-        
-        /**
-         *  @copy org.apache.flex.core.IBead#strand
-         *  
-         *  @langversion 3.0
-         *  @playerversion Flash 10.2
-         *  @playerversion AIR 2.6
-         *  @productversion FlexJS 0.0
-         */
-        public function set strand(value:IStrand):void
-        {
-            _strand = value;
 
-            IEventDispatcher(_strand).addEventListener("initBindings", initCompleteHandler);
-        }
-
-        private function initCompleteHandler(event:Event):void
+        override protected function initBindingsHandler(event:Event):void
         {
+            super.initBindingsHandler(event);
+
             if (!("_bindings" in _strand))
                 return;
 
@@ -172,29 +157,6 @@ package org.apache.flex.binding
             }
         }
 
-        private function prepareCreatedBinding(binding:IBinding, bindingObject:Object):void
-        {
-            var destinationObject:Object = _strand[bindingObject.destination[0]];
-            var destination:IStrand = destinationObject as IStrand;
-            if (destination)
-            {
-                destination.addBead(binding as IBead);
-            }
-            else
-            {
-                if (destinationObject)
-                {
-                    binding.destination = destinationObject;
-                    _strand.addBead(binding as IBead);
-                }
-                else
-                {
-                    deferredBindings[bindingObject.destination[0]] = binding;
-                    IEventDispatcher(_strand).addEventListener("valueChange", deferredBindingsHandler);
-                }
-            }
-        }
-
         private function makeConstantBinding(binding:Object):void{
             var cb:ConstantBinding = new ConstantBinding();
             cb.destinationPropertyName = binding.destination[1];
@@ -218,157 +180,5 @@ package org.apache.flex.binding
             gb.source = binding.source;
             setupWatchers(gb, index, watchers.watchers, null);
         }
-        
-        /**
-         * @flexjsignorecoercion Function
-         */
-        private function setupWatchers(gb:GenericBinding, index:int, watchers:Array, parentWatcher:WatcherBase):void
-        {
-            var foundWatcher:Boolean = false;
-            
-            var n:int = watchers.length;
-            for (var i:int = 0; i < n; i++)
-            {
-                var watcher:Object = watchers[i];
-                var isValidWatcher:Boolean = false;
-                if (typeof(watcher.bindings) == "number")
-                    isValidWatcher = (watcher.bindings == index);
-                else
-                    isValidWatcher = (watcher.bindings.indexOf(index) != -1);
-                if (isValidWatcher)
-                {
-                    var type:String = watcher.type;
-					var parentObj:Object = _strand;
-                    switch (type)
-                    {
-						case "static":
-                            parentObj = watcher.parentObj;
-                            gb.staticRoot = parentObj;
-                            gb.isStatic = true;
-                        case "property":
-                        {
-                            var pw:PropertyWatcher = new PropertyWatcher(_strand, 
-                                        watcher.propertyName, 
-                                        watcher.eventNames,
-                                        (typeof(gb.source) === "function" && watcher.children == null) ? gb.source as Function : watcher.getterFunction);
-                            watcher.watcher = pw;
-                            if (parentWatcher)
-                                pw.parentChanged(parentWatcher.value);
-                            else
-                                pw.parentChanged(parentObj);
-                            if (parentWatcher)
-                                parentWatcher.addChild(pw);
-                            if (watcher.children == null)
-                                pw.addBinding(gb);
-                            foundWatcher = true;
-                            break;
-                        }
-
-                    }
-                    if (watcher.children)
-                    {
-                        setupWatchers(gb, index, watcher.children.watchers, watcher.watcher);
-                    }
-                }
-            }
-            if (!foundWatcher )            {
-                // might be a binding to a function that doesn't have change events
-                // so just force an update via parentWatcher (if it is set, null if not)
-                if (parentWatcher) gb.valueChanged(parentWatcher.value);
-                else gb.valueChanged(null);
-
-            }
-        }
-        
-        private function decodeWatcher(bindingData:Array):Object
-        {
-            var watcherMap:Object = {};
-            var watchers:Array = [];
-            var n:int = bindingData.length;
-            var index:int = 0;
-            var watcherData:Object;
-            while (index < n - 1)
-            {
-                var watcherIndex:int = bindingData[index++];
-                var type:int = bindingData[index++];
-                switch (type)
-                {
-                    case 0:
-                    {
-                        watcherData = { type: "function" };
-                        watcherData.functionName = bindingData[index++];
-						watcherData.paramFunction = bindingData[index++];
-                        watcherData.eventNames = bindingData[index++];
-                        watcherData.bindings = bindingData[index++];
-                        break;
-                    }
-                    case 1:
-					{
-						watcherData = { type: "static" };
-						watcherData.propertyName = bindingData[index++];
-						watcherData.eventNames = bindingData[index++];
-						watcherData.bindings = bindingData[index++];
-						watcherData.getterFunction = bindingData[index++];
-						watcherData.parentObj = bindingData[index++];
-						watcherMap[watcherData.propertyName] = watcherData;
-						break;
-					}
-                    case 2:
-                    {
-                        watcherData = { type: "property" };
-                        watcherData.propertyName = bindingData[index++];
-                        watcherData.eventNames = bindingData[index++];
-                        watcherData.bindings = bindingData[index++];
-                        watcherData.getterFunction = bindingData[index++];
-                        watcherMap[watcherData.propertyName] = watcherData;
-                        break;
-                    }
-                    case 3:
-                    {
-                        watcherData = { type: "xml" };
-                        watcherData.propertyName = bindingData[index++];
-                        watcherData.bindings = bindingData[index++];
-                        watcherMap[watcherData.propertyName] = watcherData;
-                        break;
-                    }
-                }
-                watcherData.children = bindingData[index++];
-                if (watcherData.children != null)
-                {
-                    watcherData.children = decodeWatcher(watcherData.children);
-                }
-                watcherData.index = watcherIndex;
-                watchers.push(watcherData);
-            }            
-            return { watchers: watchers, watcherMap: watcherMap };
-        }
-        
-        private var deferredBindings:Object = {};
-        private function deferredBindingsHandler(event:Event):void
-        {
-            for (var p:String in deferredBindings)
-            {
-                if (_strand[p] != null)
-                {
-                    var destination:IStrand = _strand[p] as IStrand;
-					if (destination)
-	                    destination.addBead(deferredBindings[p]);
-					else
-					{
-						var destObject:Object = _strand[p];
-						if (destObject)
-						{
-							deferredBindings[p].destination = destObject;
-							_strand.addBead(deferredBindings[p]);
-						}
-						else
-						{
-							trace("unexpected condition in deferredBindingsHandler");
-						}
-					}
-                    delete deferredBindings[p];
-                }
-            }
-        }
     }
 }

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/1c6c72d1/frameworks/projects/Binding/src/main/flex/org/apache/flex/binding/MXMLBeadViewDataBinding.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/Binding/src/main/flex/org/apache/flex/binding/MXMLBeadViewDataBinding.as b/frameworks/projects/Binding/src/main/flex/org/apache/flex/binding/MXMLBeadViewDataBinding.as
index 9c78e4e..e3a76e7 100644
--- a/frameworks/projects/Binding/src/main/flex/org/apache/flex/binding/MXMLBeadViewDataBinding.as
+++ b/frameworks/projects/Binding/src/main/flex/org/apache/flex/binding/MXMLBeadViewDataBinding.as
@@ -24,7 +24,6 @@ package org.apache.flex.binding
     import org.apache.flex.binding.SimpleBinding;
     import org.apache.flex.core.IBinding;
     import org.apache.flex.binding.WatcherBase;
-    import org.apache.flex.core.DataBindingBase;
     import org.apache.flex.core.IBead;
     import org.apache.flex.core.IStrand;
     import org.apache.flex.events.Event;
@@ -43,7 +42,7 @@ package org.apache.flex.binding
      *  @playerversion AIR 2.6
      *  @productversion FlexJS 0.0
      */
-	public class MXMLBeadViewDataBinding extends DataBindingBase implements IBead
+	public class MXMLBeadViewDataBinding extends DataBindingBase
 	{
         /**
          *  Constructor.
@@ -57,25 +56,11 @@ package org.apache.flex.binding
 		{
 			super();
 		}
-        
-        private var _strand:IStrand;
-        
-        /**
-         *  @copy org.apache.flex.core.IBead#strand
-         *  
-         *  @langversion 3.0
-         *  @playerversion Flash 10.2
-         *  @playerversion AIR 2.6
-         *  @productversion FlexJS 0.0
-         */
-        public function set strand(value:IStrand):void
-        {
-            _strand = value;
-            IEventDispatcher(_strand).addEventListener("initBindings", initCompleteHandler);
-        }    
 
-        private function initCompleteHandler(event:Event):void
+        override protected function initBindingsHandler(event:Event):void
         {
+            super.initBindingsHandler(event);
+
             if (!("_bindings" in _strand))
                 return;
 
@@ -160,29 +145,6 @@ package org.apache.flex.binding
             }
         }
 
-        private function prepareCreatedBinding(binding:IBinding, bindingObject:Object):void
-        {
-            var destinationObject:Object = _strand[bindingObject.destination[0]];
-            var destination:IStrand = destinationObject as IStrand;
-            if (destination)
-            {
-                destination.addBead(binding as IBead);
-            }
-            else
-            {
-                if (destinationObject)
-                {
-                    binding.destination = destinationObject;
-                    _strand.addBead(binding as IBead);
-                }
-                else
-                {
-                    deferredBindings[bindingObject.destination[0]] = binding;
-                    IEventDispatcher(_strand).addEventListener("valueChange", deferredBindingsHandler);
-                }
-            }
-        }
-
         private function makeGenericBinding(binding:Object, index:int, watchers:Object):void
         {
             var gb:GenericBinding = new GenericBinding();
@@ -192,151 +154,5 @@ package org.apache.flex.binding
             gb.source = binding.source;
             setupWatchers(gb, index, watchers.watchers, null);
         }
-        
-        /**
-         * @flexjsignorecoercion Function
-         */
-        private function setupWatchers(gb:GenericBinding, index:int, watchers:Array, parentWatcher:WatcherBase):void
-        {
-            var foundWatcher:Boolean = false;
-            
-            var n:int = watchers.length;
-            for (var i:int = 0; i < n; i++)
-            {
-                var watcher:Object = watchers[i];
-                var isValidWatcher:Boolean = false;
-                if (typeof(watcher.bindings) == "number")
-                    isValidWatcher = (watcher.bindings == index);
-                else
-                    isValidWatcher = (watcher.bindings.indexOf(index) != -1);
-                if (isValidWatcher)
-                {
-                    var type:String = watcher.type;
-                    switch (type)
-                    {
-                        case "property":
-                        {
-                            var pw:PropertyWatcher = new PropertyWatcher(_strand, 
-                                watcher.propertyName, 
-                                watcher.eventNames,
-                                (typeof(gb.source) === "function" && watcher.children == null) ? gb.source as Function : watcher.getterFunction);
-                            watcher.watcher = pw;
-                            if (parentWatcher)
-                                pw.parentChanged(parentWatcher.value);
-                            else
-                                pw.parentChanged(_strand);
-                            if (parentWatcher)
-                                parentWatcher.addChild(pw);
-                            if (watcher.children == null)
-                                pw.addBinding(gb);
-                            foundWatcher = true;
-                            break;
-                        }
-                    }
-                    if (watcher.children)
-                    {
-                        setupWatchers(gb, index, watcher.children.watchers, watcher.watcher);
-                    }
-                }
-            }
-            if (!foundWatcher && parentWatcher == null)
-            {
-                // might be a binding to a function that doesn't have change events
-                // so just force an update
-                gb.valueChanged(null);
-            }
-        }
-        
-        private function decodeWatcher(bindingData:Array):Object
-        {
-            var watcherMap:Object = {};
-            var watchers:Array = [];
-            var n:int = bindingData.length;
-            var index:int = 0;
-            var watcherData:Object;
-            while (index < n - 1)
-            {
-                var watcherIndex:int = bindingData[index++];
-                var type:int = bindingData[index++];
-                switch (type)
-                {
-                    case 0:
-                    {
-                        watcherData = { type: "function" };
-                        watcherData.functionName = bindingData[index++];
-						watcherData.paramFunction = bindingData[index++];
-                        watcherData.eventNames = bindingData[index++];
-                        watcherData.bindings = bindingData[index++];
-                        break;
-                    }
-                    case 1:
-					{
-						watcherData = { type: "static" };
-						watcherData.propertyName = bindingData[index++];
-						watcherData.eventNames = bindingData[index++];
-						watcherData.bindings = bindingData[index++];
-						watcherData.getterFunction = bindingData[index++];
-						watcherData.parentObj = bindingData[index++];
-						watcherMap[watcherData.propertyName] = watcherData;
-						break;
-					}
-                    case 2:
-                    {
-                        watcherData = { type: "property" };
-                        watcherData.propertyName = bindingData[index++];
-                        watcherData.eventNames = bindingData[index++];
-                        watcherData.bindings = bindingData[index++];
-                        watcherData.getterFunction = bindingData[index++];
-                        watcherMap[watcherData.propertyName] = watcherData;
-                        break;
-                    }
-                    case 3:
-                    {
-                        watcherData = { type: "xml" };
-                        watcherData.propertyName = bindingData[index++];
-                        watcherData.bindings = bindingData[index++];
-                        watcherMap[watcherData.propertyName] = watcherData;
-                        break;
-                    }
-                }
-                watcherData.children = bindingData[index++];
-                if (watcherData.children != null)
-                {
-                    watcherData.children = decodeWatcher(watcherData.children);
-                }
-                watcherData.index = watcherIndex;
-                watchers.push(watcherData);
-            }            
-            return { watchers: watchers, watcherMap: watcherMap };
-        }
-        
-        private var deferredBindings:Object = {};
-        private function deferredBindingsHandler(event:Event):void
-        {
-            for (var p:String in deferredBindings)
-            {
-                if (_strand[p] != null)
-                {
-					var destination:IStrand = _strand[p] as IStrand;
-					if (destination)
-						destination.addBead(deferredBindings[p]);
-					else
-					{
-						var destObject:Object = _strand[p];
-						if (destObject)
-						{
-							deferredBindings[p].destination = destObject;
-							_strand.addBead(deferredBindings[p]);
-						}
-						else
-						{
-							trace("unexpected condition in deferredBindingsHandler");
-						}
-					}
-					delete deferredBindings[p];
-                }
-            }
-        }
-        
     }
 }

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/1c6c72d1/frameworks/projects/Binding/src/main/flex/org/apache/flex/binding/ViewDataBinding.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/Binding/src/main/flex/org/apache/flex/binding/ViewDataBinding.as b/frameworks/projects/Binding/src/main/flex/org/apache/flex/binding/ViewDataBinding.as
index b12c0d5..d82667e 100644
--- a/frameworks/projects/Binding/src/main/flex/org/apache/flex/binding/ViewDataBinding.as
+++ b/frameworks/projects/Binding/src/main/flex/org/apache/flex/binding/ViewDataBinding.as
@@ -27,7 +27,6 @@ package org.apache.flex.binding
     import org.apache.flex.core.IBinding;
     import org.apache.flex.core.IBead;
     import org.apache.flex.core.IStrand;
-    import org.apache.flex.core.DataBindingBase;
     import org.apache.flex.events.Event;
     import org.apache.flex.events.IEventDispatcher;
     
@@ -44,7 +43,7 @@ package org.apache.flex.binding
      *  @playerversion AIR 2.6
      *  @productversion FlexJS 0.0
      */
-	public class ViewDataBinding extends DataBindingBase implements IBead
+	public class ViewDataBinding extends DataBindingBase
 	{
         /**
          *  Constructor.
@@ -58,25 +57,11 @@ package org.apache.flex.binding
 		{
 			super();
 		}
-        
-        private var _strand:IStrand;
-        
-        /**
-         *  @copy org.apache.flex.core.IBead#strand
-         *  
-         *  @langversion 3.0
-         *  @playerversion Flash 10.2
-         *  @playerversion AIR 2.6
-         *  @productversion FlexJS 0.0
-         */
-        public function set strand(value:IStrand):void
-        {
-            _strand = value;
-            IEventDispatcher(_strand).addEventListener("initBindings", initCompleteHandler);
-        }    
 
-        private function initCompleteHandler(event:Event):void
+        override protected function initBindingsHandler(event:Event):void
         {
+            super.initBindingsHandler(event);
+
             if (!("_bindings" in _strand))
                 return;
 
@@ -125,7 +110,7 @@ package org.apache.flex.binding
                             sb.setDocument(_strand);
                         }
 
-                        prepareCreatedBinding(sb, binding);
+                        prepareCreatedBinding(sb as IBinding, binding);
                     }
                 }
                 else if (binding.source is Array
@@ -160,6 +145,16 @@ package org.apache.flex.binding
                         prepareCreatedBinding(cb as IBinding, binding);
                     }
                 }
+             /*   else if (binding.source is Array && binding.source[0] in _strand)
+                {
+                    compWatcher = watchers.watcherMap[binding.source[0]];
+                    var chb:ChainBinding = new ChainBinding();
+                    chb.destination = binding.destination;
+                    chb.source = binding.source;
+                    chb.watcherChain = compWatcher;
+                    chb.setDocument(_strand);
+                    _strand.addBead(chb);
+                } */
                 else
                 {
                     makeGenericBinding(binding, i, watchers);
@@ -183,29 +178,6 @@ package org.apache.flex.binding
             prepareCreatedBinding(cb as IBinding, binding);
         }
 
-        private function prepareCreatedBinding(binding:IBinding, bindingObject:Object):void
-        {
-            var destinationObject:Object = _strand[bindingObject.destination[0]];
-            var destination:IStrand = destinationObject as IStrand;
-            if (destination)
-            {
-                destination.addBead(binding as IBead);
-            }
-            else
-            {
-                if (destinationObject)
-                {
-                    binding.destination = destinationObject;
-                    _strand.addBead(binding as IBead);
-                }
-                else
-                {
-                    deferredBindings[bindingObject.destination[0]] = binding;
-                    IEventDispatcher(_strand).addEventListener("valueChange", deferredBindingsHandler);
-                }
-            }
-        }
-
         private function makeGenericBinding(binding:Object, index:int, watchers:Object):void
         {
             var gb:GenericBinding = new GenericBinding();
@@ -215,158 +187,5 @@ package org.apache.flex.binding
             gb.source = binding.source;
             setupWatchers(gb, index, watchers.watchers, null);
         }
-        
-        /**
-         * @flexjsignorecoercion Function
-         */
-        private function setupWatchers(gb:GenericBinding, index:int, watchers:Array, parentWatcher:WatcherBase):void
-        {
-            var foundWatcher:Boolean = false;
-            
-            var n:int = watchers.length;
-            for (var i:int = 0; i < n; i++)
-            {
-                var watcher:Object = watchers[i];
-                var isValidWatcher:Boolean = false;
-                if (typeof(watcher.bindings) == "number")
-                    isValidWatcher = (watcher.bindings == index);
-                else
-                    isValidWatcher = (watcher.bindings.indexOf(index) != -1);
-                if (isValidWatcher)
-                {
-                    var type:String = watcher.type;
-					var parentObj:Object = _strand;
-                    switch (type)
-                    {
-						case "static":
-                            parentObj = watcher.parentObj;
-                            gb.staticRoot = parentObj;
-                            gb.isStatic = true;
-                        case "property":
-                        {
-                            var pw:PropertyWatcher = new PropertyWatcher(_strand, 
-                                        watcher.propertyName, 
-                                        watcher.eventNames,
-                                        (typeof(gb.source) === "function" && watcher.children == null) ? gb.source as Function : watcher.getterFunction);
-                            watcher.watcher = pw;
-                            if (parentWatcher)
-                                pw.parentChanged(parentWatcher.value);
-                            else
-                                pw.parentChanged(parentObj);
-                            if (parentWatcher)
-                                parentWatcher.addChild(pw);
-                            if (watcher.children == null)
-                                pw.addBinding(gb);
-                            foundWatcher = true;
-                            break;
-                        }
-
-                    }
-                    if (watcher.children)
-                    {
-                        setupWatchers(gb, index, watcher.children.watchers, watcher.watcher);
-                    }
-                }
-            }
-            if (!foundWatcher )            {
-                // might be a binding to a function that doesn't have change events
-                // so just force an update via parentWatcher (if it is set, null if not)
-                if (parentWatcher) gb.valueChanged(parentWatcher.value);
-                else gb.valueChanged(null);
-
-            }
-        }
-        
-        private function decodeWatcher(bindingData:Array):Object
-        {
-            var watcherMap:Object = {};
-            var watchers:Array = [];
-            var n:int = bindingData.length;
-            var index:int = 0;
-            var watcherData:Object;
-            while (index < n - 1)
-            {
-                var watcherIndex:int = bindingData[index++];
-                var type:int = bindingData[index++];
-                switch (type)
-                {
-                    case 0:
-                    {
-                        watcherData = { type: "function" };
-                        watcherData.functionName = bindingData[index++];
-						watcherData.paramFunction = bindingData[index++];
-                        watcherData.eventNames = bindingData[index++];
-                        watcherData.bindings = bindingData[index++];
-                        break;
-                    }
-                    case 1:
-					{
-						watcherData = { type: "static" };
-						watcherData.propertyName = bindingData[index++];
-						watcherData.eventNames = bindingData[index++];
-						watcherData.bindings = bindingData[index++];
-						watcherData.getterFunction = bindingData[index++];
-						watcherData.parentObj = bindingData[index++];
-						watcherMap[watcherData.propertyName] = watcherData;
-						break;
-					}
-                    case 2:
-                    {
-                        watcherData = { type: "property" };
-                        watcherData.propertyName = bindingData[index++];
-                        watcherData.eventNames = bindingData[index++];
-                        watcherData.bindings = bindingData[index++];
-                        watcherData.getterFunction = bindingData[index++];
-                        watcherMap[watcherData.propertyName] = watcherData;
-                        break;
-                    }
-                    case 3:
-                    {
-                        watcherData = { type: "xml" };
-                        watcherData.propertyName = bindingData[index++];
-                        watcherData.bindings = bindingData[index++];
-                        watcherMap[watcherData.propertyName] = watcherData;
-                        break;
-                    }
-                }
-                watcherData.children = bindingData[index++];
-                if (watcherData.children != null)
-                {
-                    watcherData.children = decodeWatcher(watcherData.children);
-                }
-                watcherData.index = watcherIndex;
-                watchers.push(watcherData);
-            }            
-            return { watchers: watchers, watcherMap: watcherMap };
-        }
-        
-        private var deferredBindings:Object = {};
-        private function deferredBindingsHandler(event:Event):void
-        {
-            for (var p:String in deferredBindings)
-            {
-                if (_strand[p] != null)
-                {
-                    var destination:IStrand = _strand[p] as IStrand;
-					if (destination)
-	                    destination.addBead(deferredBindings[p]);
-					else
-					{
-						var destObject:Object = _strand[p];
-						if (destObject)
-						{
-							deferredBindings[p].destination = destObject;
-							_strand.addBead(deferredBindings[p]);
-						}
-						else
-						{
-							trace("unexpected condition in deferredBindingsHandler");
-						}
-					}
-                    delete deferredBindings[p];
-                }
-            }
-        }
-        
     }
 }

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/1c6c72d1/frameworks/projects/Core/src/main/flex/CoreClasses.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/Core/src/main/flex/CoreClasses.as b/frameworks/projects/Core/src/main/flex/CoreClasses.as
index 68483d7..4c97c06 100644
--- a/frameworks/projects/Core/src/main/flex/CoreClasses.as
+++ b/frameworks/projects/Core/src/main/flex/CoreClasses.as
@@ -107,7 +107,6 @@ internal class CoreClasses
 		import org.apache.flex.core.IViewportScroller; IViewportScroller;
 	}
     import org.apache.flex.core.SimpleStatesImpl; SimpleStatesImpl;
-    import org.apache.flex.core.DataBindingBase; DataBindingBase;
 	import org.apache.flex.events.CustomEvent; CustomEvent;
     import org.apache.flex.events.Event; Event;
     import org.apache.flex.events.ProgressEvent; ProgressEvent;

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/1c6c72d1/frameworks/projects/Core/src/main/flex/org/apache/flex/core/DataBindingBase.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/Core/src/main/flex/org/apache/flex/core/DataBindingBase.as b/frameworks/projects/Core/src/main/flex/org/apache/flex/core/DataBindingBase.as
deleted file mode 100644
index c096232..0000000
--- a/frameworks/projects/Core/src/main/flex/org/apache/flex/core/DataBindingBase.as
+++ /dev/null
@@ -1,45 +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.flex.core
-{
-    /**
-     *  The DataBindingBase class is the base class for custom data binding
-     *  implementations that can be cross-compiled.
-     *  
-     *  @langversion 3.0
-     *  @playerversion Flash 10.2
-     *  @playerversion AIR 2.6
-     *  @productversion FlexJS 0.0
-     */
-	public class DataBindingBase
-	{
-        /**
-         *  Constructor.
-         *  
-         *  @langversion 3.0
-         *  @playerversion Flash 10.2
-         *  @playerversion AIR 2.6
-         *  @productversion FlexJS 0.0
-         */
-		public function DataBindingBase()
-		{
-		}
-		
-	}
-}