git commit: [flex-sdk] [refs/heads/develop] - Split various Mustella runs
Updated Branches:
refs/heads/develop 64f0c1419 - 541083ce1
Split various Mustella runs
I've split up the various Mustella runs - main, AIR, mobile - into three
consecutive jobs by adding a command line switch (-t or --type) that directs
'jenkins.sh' to run a specific set of tests.
Signed-off-by: Erik de Bruin e...@ixsoftware.nl
Project: http://git-wip-us.apache.org/repos/asf/flex-sdk/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-sdk/commit/541083ce
Tree: http://git-wip-us.apache.org/repos/asf/flex-sdk/tree/541083ce
Diff: http://git-wip-us.apache.org/repos/asf/flex-sdk/diff/541083ce
Branch: refs/heads/develop
Commit: 541083ce147e511d62d053e8c4aa8d6097df0d28
Parents: 64f0c14
Author: Erik de Bruin e...@ixsoftware.nl
Authored: Tue Jun 25 20:59:11 2013 +0200
Committer: Erik de Bruin e...@ixsoftware.nl
Committed: Tue Jun 25 20:59:11 2013 +0200
--
mustella/jenkins.sh | 102 ---
1 file changed, 34 insertions(+), 68 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/541083ce/mustella/jenkins.sh
--
diff --git a/mustella/jenkins.sh b/mustella/jenkins.sh
index edfae8f..53949d1 100755
--- a/mustella/jenkins.sh
+++ b/mustella/jenkins.sh
@@ -35,96 +35,62 @@ set -o igncr
-MAIN_FAILED=false
-AIR_FAILED=false
-MOBILE_FAILED=false
-
-
-
# CLEAN
rm -f local.properties
-# MAIN
-sh ./mini_run.sh -timeout=6 -all
-
-if [[ -s failures.txt ]]
-then
- echo Some 'main' tests failed: running '-failures'
- sh ./mini_run.sh -timeout=6 -failures
- if [[ -s failures.txt ]]
- then
-MAIN_FAILED=true
- else
-echo All 'main' tests passed after running '-failures'
- fi
-else
- echo All main tests passed on first run
-fi
-
+RUN_TYPE=main
+while [ $1 != ]; do
+ case $1 in
+-t | --type )
+ shift
+ RUN_TYPE=$1
+ ;;
+* )
+ esac
+ shift
+done
-# AIR
-sh ./mini_run.sh -apollo tests/apollo
-if [[ -s failures.txt ]]
+if [ $RUN_TYPE == main ]
then
- echo Some AIR tests failed: running '-apollo -failures'
- sh ./mini_run.sh -apollo -failures
- if [[ -s failures.txt ]]
- then
-AIR_FAILED=true
- else
-echo All AIR tests passed after running '-apollo -failures'
- fi
-else
- echo All AIR tests passed on first run
-fi
-
-
-
-# MOBILE
-cat local.properties END
-target_os_name=android
+ TEST_COMMAND=-timeout=6
+ TEST_SET=-all
+elif [ $RUN_TYPE == air ]
+then
+ TEST_COMMAND=-apollo
+ TEST_SET=tests/apollo
+elif [ $RUN_TYPE == mobile ]
+then
+ cat local.properties END
+arget_os_name=android
android_sdk=C:/ApacheFlex/dependencies/AndroidSDK/adt-bundle-windows-x86_64-20130522/sdk
runtimeApk=${AIR_HOME}/runtimes/air/android/emulator/Runtime.apk
device_name=win
END
-sh ./mini_run.sh -mobile tests/mobile
+ TEST_COMMAND=-mobile
+ TEST_SET=tests/mobile
+fi
+
+
+
+sh ./mini_run.sh $TEST_COMMAND $TEST_SET
if [[ -s failures.txt ]]
then
- echo Some mobile tests failed: running '-mobile -failures'
- sh ./mini_run.sh -mobile -failures
+ echo Some tests failed: running '-failures'
+ sh ./mini_run.sh $TEST_COMMAND -failures
if [[ -s failures.txt ]]
then
-MOBILE_FAILED=true
+echo Some of tests failed, even after running '-failures'...
else
-echo All mobile tests passed after running '-mobile -failures'
+echo All tests passed after running '-failures'
fi
else
- echo All mobile tests passed on first run
+ echo All tests passed on first run
fi
rm -f local.properties
-
-
-
-if [[ $MAIN_FAILED ]]
-then
- echo Some of the 'main' tests failed, even after running '-failures'...
-elif [[ $AIR_FAILED ]]
-then
- echo Some of the AIR tests failed, even after running '-apollo
-failures'...
-elif [[ $MOBILE_FAILED ]]
-then
- echo Some of the mobile tests failed, even after running '-mobile
-failures'...
-fi
-
-# Make the Jenkins job fail if any tests failed:
-if [[ $MAIN_FAILED || $AIR_FAILED || $MOBILE_FAILED ]]
-then
- exit 1
-fi
git commit: [flex-sdk] [refs/heads/develop] - FLEX-14522: Added enabledField and support during button creation. Minor logic changes.
Updated Branches:
refs/heads/develop 571cd9fc5 - 712b1ba76
FLEX-14522: Added enabledField and support during button creation. Minor logic
changes.
Project: http://git-wip-us.apache.org/repos/asf/flex-sdk/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-sdk/commit/712b1ba7
Tree: http://git-wip-us.apache.org/repos/asf/flex-sdk/tree/712b1ba7
Diff: http://git-wip-us.apache.org/repos/asf/flex-sdk/diff/712b1ba7
Branch: refs/heads/develop
Commit: 712b1ba7680a969a3c25d4bc76c8ce40e7e3eebe
Parents: 571cd9f
Author: Mark Kessler kesslerconsult...@gmail.com
Authored: Tue Jun 25 21:06:16 2013 -0400
Committer: Mark Kessler kesslerconsult...@gmail.com
Committed: Tue Jun 25 21:11:51 2013 -0400
--
.../projects/mx/src/mx/controls/NavBar.as | 79
1 file changed, 63 insertions(+), 16 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/712b1ba7/frameworks/projects/mx/src/mx/controls/NavBar.as
--
diff --git a/frameworks/projects/mx/src/mx/controls/NavBar.as
b/frameworks/projects/mx/src/mx/controls/NavBar.as
index 37f2e33..60849a3 100644
--- a/frameworks/projects/mx/src/mx/controls/NavBar.as
+++ b/frameworks/projects/mx/src/mx/controls/NavBar.as
@@ -106,6 +106,7 @@ use namespace mx_internal;
* lt;mx:itagname/i
*strongProperties/strong
*dataProvider=iNo default/i
+ *enabledField=enabled
*iconField=icon
*labeField=label
*selectedIndex=-1
@@ -404,7 +405,6 @@ public class NavBar extends Box
if (_dataProvider)
{
-// use weak reference
_dataProvider.removeEventListener(CollectionEvent.COLLECTION_CHANGE,
collectionChangeHandler);
}
@@ -463,6 +463,52 @@ public class NavBar extends Box
dispatchEvent(new Event(collectionChange));
}
+
+//--
+// enabledField
+//--
+
+/**
+ * @private
+ * Storage for the enabled property.
+ */
+private var _enabledField:String = enabled;
+
+[Bindable(enabledFieldChanged)]
+[Inspectable(category=Data)]
+
+/**
+ * Name of the the field in the codedataProvider/code object
+ * to use as the enabled label.
+ *
+ * @default enabled
+ *
+ * @langversion 3.0
+ * @playerversion Flash 11.1
+ * @playerversion AIR 3.4
+ * @productversion Flex 4.10
+ */
+public function get enabledField():String
+{
+return _enabledField;
+}
+
+/**
+ * @private
+ */
+public function set enabledField(value:String):void
+{
+_enabledField = value;
+
+// If we have a data provider, update here to
+// reflect new enabled field.
+if (_dataProvider)
+dataProvider = _dataProvider;
+
+dispatchEvent(new Event(enabledFieldChanged));
+}
+
+
//--
// iconField
//--
@@ -955,13 +1001,15 @@ public class NavBar extends Box
if (item is String labelFunction == null)
{
navItem = Button(createNavItem(String(item)));
+
+navItem.enabled = enabled;
}
else
{
var label:String = itemToLabel(item);
// if labelField doesn't exist in item, label will be null;
-if (iconField)
+if (iconField != )
{
var iconValue:Object = null;
@@ -989,24 +1037,23 @@ public class NavBar extends Box
navItem = Button(createNavItem(label, null));
}
-// Assigning undefined to a String coerces to ,
-// which cancels an ancestor's tooltip.
-// So we have to change undefined to null.
-if (toolTipField)
+//Check for toolTip field and assign it to the individual
button if it exists.
+if (_toolTipField != item.hasOwnProperty(_toolTipField))
{
-try
-{
-navItem.toolTip = (item[toolTipField] === undefined
- ? null
- : item[toolTipField]);
-}
-catch(e:Error)
-{
-}
+navItem.toolTip = String(item[_toolTipField]);
+}
+
+//Check for enabled field and assign it to the individual
button if it exists.
+if (_enabledField != item.hasOwnProperty(_enabledField))
+{
+
git commit: [flex-sdk] [refs/heads/develop] - Added an addition issue and updated the sdk changes.
Updated Branches: refs/heads/develop 712b1ba76 - a374632f5 Added an addition issue and updated the sdk changes. Project: http://git-wip-us.apache.org/repos/asf/flex-sdk/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-sdk/commit/a374632f Tree: http://git-wip-us.apache.org/repos/asf/flex-sdk/tree/a374632f Diff: http://git-wip-us.apache.org/repos/asf/flex-sdk/diff/a374632f Branch: refs/heads/develop Commit: a374632f52d0873c7f0709faab3d81ea5e7acb8e Parents: 712b1ba Author: Mark Kessler kesslerconsult...@gmail.com Authored: Tue Jun 25 22:00:51 2013 -0400 Committer: Mark Kessler kesslerconsult...@gmail.com Committed: Tue Jun 25 22:01:17 2013 -0400 -- RELEASE_NOTES | 2 ++ 1 file changed, 2 insertions(+) -- http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/a374632f/RELEASE_NOTES -- diff --git a/RELEASE_NOTES b/RELEASE_NOTES index 3a49eb7..6a3fb14 100644 --- a/RELEASE_NOTES +++ b/RELEASE_NOTES @@ -41,6 +41,7 @@ SDK Changes - Spark RadioButtonGroup now has a selectedIndex property. - Spark ButtonBar and TabBar can now enable/disable buttons. - Spark ButtonBar and TabBar can now prevent the selection / toggling of their buttons. + - Added enabled property when buttons are created for the MX ButtonBar. - Fixed RTEs in Advanced DataGrid when dynamically assigning columns. - Improved support of dates including DD/MM/ support, single digit day and month in date formats and international dates including Japanese, Chinese @@ -290,6 +291,7 @@ FLEX-14787 Confusing, implicit cast to Number FLEX-14773 ListBase::findKey is invoked with event.keyCode instead of event.charCode Fixed FLEX-14630 Flex-SDK cannot be built entirely from source Fixed FLEX-14581 Mx.Controls.DateChooser - Setting .monthNames to Array of Length 12 causes Null months Fixed +FLEX-14522 enable/disable items within the building phase of the ButtonBar component not possible Implemented FLEX-14450 NumberValidator maxValue/minValue don't work with non-english settings Fixed FLEX-14316 mx.core.UITextField.truncateToFit() contains dead code Fixed FLEX-14153 Unrequired cast of calHeader in DateChooser Fixed
git commit: [flex-sdk] [refs/heads/develop] - FLEX-14522: Made boolean comparison more consistent.
Updated Branches:
refs/heads/develop a374632f5 - 643dc5bad
FLEX-14522: Made boolean comparison more consistent.
Project: http://git-wip-us.apache.org/repos/asf/flex-sdk/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-sdk/commit/643dc5ba
Tree: http://git-wip-us.apache.org/repos/asf/flex-sdk/tree/643dc5ba
Diff: http://git-wip-us.apache.org/repos/asf/flex-sdk/diff/643dc5ba
Branch: refs/heads/develop
Commit: 643dc5bade5292e95321809f6ca1829a15c6db3d
Parents: a374632
Author: Mark Kessler kesslerconsult...@gmail.com
Authored: Tue Jun 25 22:10:24 2013 -0400
Committer: Mark Kessler kesslerconsult...@gmail.com
Committed: Tue Jun 25 22:11:13 2013 -0400
--
frameworks/projects/mx/src/mx/controls/NavBar.as | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/643dc5ba/frameworks/projects/mx/src/mx/controls/NavBar.as
--
diff --git a/frameworks/projects/mx/src/mx/controls/NavBar.as
b/frameworks/projects/mx/src/mx/controls/NavBar.as
index 60849a3..58d6093 100644
--- a/frameworks/projects/mx/src/mx/controls/NavBar.as
+++ b/frameworks/projects/mx/src/mx/controls/NavBar.as
@@ -1038,13 +1038,13 @@ public class NavBar extends Box
}
//Check for toolTip field and assign it to the individual
button if it exists.
-if (_toolTipField != item.hasOwnProperty(_toolTipField))
+if (_toolTipField != item.hasOwnProperty(_toolTipField)
== true)
{
navItem.toolTip = String(item[_toolTipField]);
}
//Check for enabled field and assign it to the individual
button if it exists.
-if (_enabledField != item.hasOwnProperty(_enabledField))
+if (_enabledField != item.hasOwnProperty(_enabledField)
== true)
{
navItem.enabled = Boolean(item[_enabledField]);
}
[3/4] git commit: [flex-falcon] [refs/heads/develop] - fix tests broken by previous changes
fix tests broken by previous changes
Project: http://git-wip-us.apache.org/repos/asf/flex-falcon/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-falcon/commit/a50776c3
Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/a50776c3
Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/a50776c3
Branch: refs/heads/develop
Commit: a50776c331b835d1c3974cc9ec6ce184cca9cdd2
Parents: bd64874
Author: Alex Harui aha...@apache.org
Authored: Mon Jun 24 23:58:17 2013 -0700
Committer: Alex Harui aha...@apache.org
Committed: Mon Jun 24 23:58:17 2013 -0700
--
.../compiler/internal/codegen/mxml/flexjs/MXMLFlexJSEmitter.java | 2 ++
.../compiler/internal/codegen/databinding/BindingDatabase.java | 4 ++--
2 files changed, 4 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/a50776c3/compiler.jx/src/org/apache/flex/compiler/internal/codegen/mxml/flexjs/MXMLFlexJSEmitter.java
--
diff --git
a/compiler.jx/src/org/apache/flex/compiler/internal/codegen/mxml/flexjs/MXMLFlexJSEmitter.java
b/compiler.jx/src/org/apache/flex/compiler/internal/codegen/mxml/flexjs/MXMLFlexJSEmitter.java
index 09fe26a..eb94f27 100644
---
a/compiler.jx/src/org/apache/flex/compiler/internal/codegen/mxml/flexjs/MXMLFlexJSEmitter.java
+++
b/compiler.jx/src/org/apache/flex/compiler/internal/codegen/mxml/flexjs/MXMLFlexJSEmitter.java
@@ -236,6 +236,8 @@ public class MXMLFlexJSEmitter extends MXMLEmitter
implements
protected void emitBindingData(String cname, IClassDefinition cdef)
{
BindingDatabase bd = BindingDatabase.bindingMap.get(cdef);
+if (bd == null)
+return;
if (bd.getBindingInfo().isEmpty())
return;
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/a50776c3/compiler/src/org/apache/flex/compiler/internal/codegen/databinding/BindingDatabase.java
--
diff --git
a/compiler/src/org/apache/flex/compiler/internal/codegen/databinding/BindingDatabase.java
b/compiler/src/org/apache/flex/compiler/internal/codegen/databinding/BindingDatabase.java
index f55aba1..ff66319 100644
---
a/compiler/src/org/apache/flex/compiler/internal/codegen/databinding/BindingDatabase.java
+++
b/compiler/src/org/apache/flex/compiler/internal/codegen/databinding/BindingDatabase.java
@@ -21,13 +21,13 @@ package
org.apache.flex.compiler.internal.codegen.databinding;
import java.util.ArrayList;
import java.util.Collection;
-import java.util.HashMap;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
import java.util.Set;
import java.util.TreeSet;
+import java.util.WeakHashMap;
import org.apache.flex.compiler.definitions.IClassDefinition;
import
org.apache.flex.compiler.internal.as.codegen.MXMLClassDirectiveProcessor;
@@ -91,7 +91,7 @@ public class BindingDatabase
private static ListBindingDatabase _diagnosticLogger;
- public static MapIClassDefinition, BindingDatabase bindingMap = new
HashMapIClassDefinition, BindingDatabase();
+ public static WeakHashMapIClassDefinition, BindingDatabase bindingMap =
new WeakHashMapIClassDefinition, BindingDatabase();
/**
* test only field. Total number of watcher info's of all types
[2/4] git commit: [flex-falcon] [refs/heads/develop] - changes to support databinding in FlexJS
changes to support databinding in FlexJS
Project: http://git-wip-us.apache.org/repos/asf/flex-falcon/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-falcon/commit/734f9bec
Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/734f9bec
Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/734f9bec
Branch: refs/heads/develop
Commit: 734f9bec02c81034eb39d85bff4595bc3870e0b5
Parents: 8611dcb
Author: Alex Harui aha...@apache.org
Authored: Sat Jun 22 07:21:08 2013 -0700
Committer: Alex Harui aha...@apache.org
Committed: Mon Jun 24 22:53:18 2013 -0700
--
.../flex/compiler/config/Configuration.java | 122 +-
.../internal/as/codegen/BindableHelper.java | 14 +-
.../as/codegen/MXMLClassDirectiveProcessor.java | 34 ++-
.../databinding/MXMLBindingDirectiveHelper.java | 226 +++
.../projects/FlexProjectConfigurator.java | 45
5 files changed, 424 insertions(+), 17 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/734f9bec/compiler/src/org/apache/flex/compiler/config/Configuration.java
--
diff --git a/compiler/src/org/apache/flex/compiler/config/Configuration.java
b/compiler/src/org/apache/flex/compiler/config/Configuration.java
index 6cbb8a7..b8afa21 100644
--- a/compiler/src/org/apache/flex/compiler/config/Configuration.java
+++ b/compiler/src/org/apache/flex/compiler/config/Configuration.java
@@ -1551,7 +1551,127 @@ public class Configuration
allowSourcePathOverlap = b;
}
-/**
+//
+// 'compiler.binding-value-change-event' option
+//
+
+private String bindingValueChangeEvent = mx.events.PropertyChangeEvent;
+
+public String getBindingValueChangeEvent()
+{
+return bindingValueChangeEvent;
+}
+
+/**
+ * The change event class for generated binding code
+ */
+@Config(advanced = true)
+public void setCompilerBindingValueChangeEvent(ConfigurationValue cv,
String b)
+{
+bindingValueChangeEvent = b;
+}
+
+//
+// 'compiler.binding-value-change-event-kind' option
+//
+
+private String bindingValueChangeEventKind =
mx.events.PropertyChangeEventKind;
+
+public String getBindingValueChangeEventKind()
+{
+return bindingValueChangeEventKind;
+}
+
+/**
+ * The change event kind for generated binding code
+ */
+@Config(advanced = true)
+public void setCompilerBindingValueChangeEventKind(ConfigurationValue cv,
String b)
+{
+bindingValueChangeEventKind = b;
+}
+
+//
+// 'compiler.binding-value-change-event-type' option
+//
+
+private String bindingValueChangeEventType = propertyChange;
+
+public String getBindingValueChangeEventType()
+{
+return bindingValueChangeEventType;
+}
+
+/**
+ * The change event type for generated binding code
+ */
+@Config(advanced = true)
+public void setCompilerBindingValueChangeEventType(ConfigurationValue cv,
String b)
+{
+bindingValueChangeEventType = b;
+}
+
+//
+// 'compiler.binding-event-handler-event' option
+//
+
+private String bindingEventHandlerEvent = flash.events.Event;
+
+public String getBindingEventHandlerEvent()
+{
+return bindingEventHandlerEvent;
+}
+
+/**
+ * The event handler event for generated binding code
+ */
+@Config(advanced = true)
+public void setCompilerBindingEventHandlerEvent(ConfigurationValue cv,
String b)
+{
+bindingEventHandlerEvent = b;
+}
+
+//
+// 'compiler.binding-event-handler-class' option
+//
+
+private String bindingEventHandlerClass = flash.events.EventDispatcher;
+
+public String getBindingEventHandlerClass()
+{
+return bindingEventHandlerClass;
+}
+
+/**
+ * The event handler class for generated binding code
+ */
+@Config(advanced = true)
+public void setCompilerBindingEventHandlerClass(ConfigurationValue cv,
String b)
+{
+bindingEventHandlerClass = b;
+}
+
+//
+// 'compiler.binding-event-handler-interface' option
+//
+
+private String bindingEventHandlerInterface =
flash.events.IEventDispatcher;
+
+public String getBindingEventHandlerInterface()
+{
+return bindingEventHandlerInterface;
+}
+
+/**
+ * The event handler interface for generated binding code
+ */
+@Config(advanced = true)
+public void setCompilerBindingEventHandlerInterface(ConfigurationValue cv,
String b)
+{
+bindingEventHandlerInterface = b;
+}
+
+/**
* Syntax:br/
* code-define=lt;namegt;,lt;valuegt;/code
* where name is codeNAMESPACE::name/code and value is a legal
definition value
[1/4] git commit: [flex-falcon] [refs/heads/develop] - changes to get model databinding to work in JS
Updated Branches: refs/heads/develop 8611dcb87 - 4af7ad216 changes to get model databinding to work in JS Project: http://git-wip-us.apache.org/repos/asf/flex-falcon/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-falcon/commit/bd648741 Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/bd648741 Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/bd648741 Branch: refs/heads/develop Commit: bd64874191821dccd18f54dba47a57c29a72608a Parents: 734f9be Author: Alex Harui aha...@apache.org Authored: Mon Jun 24 22:50:16 2013 -0700 Committer: Alex Harui aha...@apache.org Committed: Mon Jun 24 22:53:18 2013 -0700 -- .../codegen/mxml/flexjs/MXMLFlexJSEmitter.java | 305 ++- .../codegen/databinding/BindingDatabase.java| 4 + .../databinding/MXMLBindingDirectiveHelper.java | 1 + .../codegen/databinding/WatcherInfoBase.java| 2 +- 4 files changed, 310 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/bd648741/compiler.jx/src/org/apache/flex/compiler/internal/codegen/mxml/flexjs/MXMLFlexJSEmitter.java -- diff --git a/compiler.jx/src/org/apache/flex/compiler/internal/codegen/mxml/flexjs/MXMLFlexJSEmitter.java b/compiler.jx/src/org/apache/flex/compiler/internal/codegen/mxml/flexjs/MXMLFlexJSEmitter.java index 127df84..09fe26a 100644 --- a/compiler.jx/src/org/apache/flex/compiler/internal/codegen/mxml/flexjs/MXMLFlexJSEmitter.java +++ b/compiler.jx/src/org/apache/flex/compiler/internal/codegen/mxml/flexjs/MXMLFlexJSEmitter.java @@ -19,10 +19,14 @@ package org.apache.flex.compiler.internal.codegen.mxml.flexjs; + import java.io.FilterWriter; import java.util.ArrayList; import java.util.List; +import java.util.Set; +import java.util.Map.Entry; +import org.apache.flex.abc.semantics.MethodInfo; import org.apache.flex.abc.semantics.Name; import org.apache.flex.abc.semantics.Namespace; import org.apache.flex.compiler.codegen.as.IASEmitter; @@ -30,19 +34,31 @@ import org.apache.flex.compiler.codegen.mxml.flexjs.IMXMLFlexJSEmitter; import org.apache.flex.compiler.definitions.IClassDefinition; import org.apache.flex.compiler.definitions.IDefinition; import org.apache.flex.compiler.internal.codegen.as.ASEmitterTokens; +import org.apache.flex.compiler.internal.codegen.databinding.BindingDatabase; +import org.apache.flex.compiler.internal.codegen.databinding.BindingInfo; +import org.apache.flex.compiler.internal.codegen.databinding.FunctionWatcherInfo; +import org.apache.flex.compiler.internal.codegen.databinding.PropertyWatcherInfo; +import org.apache.flex.compiler.internal.codegen.databinding.WatcherInfoBase; +import org.apache.flex.compiler.internal.codegen.databinding.XMLWatcherInfo; +import org.apache.flex.compiler.internal.codegen.databinding.WatcherInfoBase.WatcherType; import org.apache.flex.compiler.internal.codegen.js.flexjs.JSFlexJSEmitter; import org.apache.flex.compiler.internal.codegen.js.goog.JSGoogEmitterTokens; import org.apache.flex.compiler.internal.codegen.mxml.MXMLEmitter; import org.apache.flex.compiler.internal.projects.FlexJSProject; import org.apache.flex.compiler.internal.projects.FlexProject; import org.apache.flex.compiler.internal.scopes.ASProjectScope; +import org.apache.flex.compiler.internal.tree.as.FunctionCallNode; +import org.apache.flex.compiler.internal.tree.as.IdentifierNode; +import org.apache.flex.compiler.internal.tree.as.MemberAccessExpressionNode; import org.apache.flex.compiler.internal.tree.mxml.MXMLDocumentNode; import org.apache.flex.compiler.projects.ICompilerProject; import org.apache.flex.compiler.tree.ASTNodeID; import org.apache.flex.compiler.tree.as.IASNode; +import org.apache.flex.compiler.tree.as.IExpressionNode; import org.apache.flex.compiler.tree.as.IImportNode; import org.apache.flex.compiler.tree.mxml.IMXMLArrayNode; import org.apache.flex.compiler.tree.mxml.IMXMLClassDefinitionNode; +import org.apache.flex.compiler.tree.mxml.IMXMLDataBindingNode; import org.apache.flex.compiler.tree.mxml.IMXMLDocumentNode; import org.apache.flex.compiler.tree.mxml.IMXMLEventSpecifierNode; import org.apache.flex.compiler.tree.mxml.IMXMLInstanceNode; @@ -124,7 +140,7 @@ public class MXMLFlexJSEmitter extends MXMLEmitter implements emitClassDeclStart(cname, node, false); emitPropertyDecls(); - + emitClassDeclEnd(cname, node); emitScripts(); @@ -134,6 +150,9 @@ public class MXMLFlexJSEmitter extends MXMLEmitter implements emitPropertyGetterSetters(cname); emitMXMLDescriptorFuncs(cname); + +emitBindingData(cname, cdef); + } //-- @@ -212,6 +231,252 @@ public class MXMLFlexJSEmitter
[2/2] git commit: [flex-asjs] [refs/heads/develop] - more fixes for databinding
more fixes for databinding
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/286147c1
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/286147c1
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/286147c1
Branch: refs/heads/develop
Commit: 286147c15f3c309de9108000fcd473c6db907d47
Parents: 132a29b
Author: Alex Harui aha...@apache.org
Authored: Tue Jun 25 22:41:41 2013 -0700
Committer: Alex Harui aha...@apache.org
Committed: Tue Jun 25 22:46:40 2013 -0700
--
.../org/apache/flex/core/ViewBaseDataBinding.as | 4 +--
.../org/apache/flex/core/ViewBaseDataBinding.js | 38 ++--
2 files changed, 29 insertions(+), 13 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/286147c1/frameworks/as/src/org/apache/flex/core/ViewBaseDataBinding.as
--
diff --git a/frameworks/as/src/org/apache/flex/core/ViewBaseDataBinding.as
b/frameworks/as/src/org/apache/flex/core/ViewBaseDataBinding.as
index 0d5b876..2761295 100644
--- a/frameworks/as/src/org/apache/flex/core/ViewBaseDataBinding.as
+++ b/frameworks/as/src/org/apache/flex/core/ViewBaseDataBinding.as
@@ -83,7 +83,7 @@ package org.apache.flex.core
else
{
deferredBindings[binding.destination[0]] = sb;
-
IEventDispatcher(_strand).addEventListener(propertyChange,
deferredBindingsHandler);
+
IEventDispatcher(_strand).addEventListener(valueChange,
deferredBindingsHandler);
}
}
else if (fieldWatcher.eventNames == null)
@@ -99,7 +99,7 @@ package org.apache.flex.core
else
{
deferredBindings[binding.destination[0]] = cb;
-
IEventDispatcher(_strand).addEventListener(propertyChange,
deferredBindingsHandler);
+
IEventDispatcher(_strand).addEventListener(valueChange,
deferredBindingsHandler);
}
}
}
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/286147c1/frameworks/js/FlexJS/src/org/apache/flex/core/ViewBaseDataBinding.js
--
diff --git
a/frameworks/js/FlexJS/src/org/apache/flex/core/ViewBaseDataBinding.js
b/frameworks/js/FlexJS/src/org/apache/flex/core/ViewBaseDataBinding.js
index 5f7b5d0..7a94187 100644
--- a/frameworks/js/FlexJS/src/org/apache/flex/core/ViewBaseDataBinding.js
+++ b/frameworks/js/FlexJS/src/org/apache/flex/core/ViewBaseDataBinding.js
@@ -61,7 +61,7 @@ org.apache.flex.core.ViewBaseDataBinding.prototype.set_strand
=
org.apache.flex.core.ViewBaseDataBinding.prototype.initCompleteHandler =
function(event) {
-var bindingData = this.strand_[_bindings];
+var bindingData = this.strand_['_bindings'];
var n = bindingData[0];
var bindings = [];
var i;
@@ -80,10 +80,10 @@
org.apache.flex.core.ViewBaseDataBinding.prototype.initCompleteHandler =
if (binding.source != null)
{
// try to determine if it is an array
-if (typeof(binding.source) == object
-typeof(binding.source.slice) == function)
+if (typeof(binding.source) == 'object'
+typeof(binding.source.slice) == 'function')
{
-if (binding.source[0] == applicationModel)
+if (binding.source[0] == 'applicationModel')
{
if (binding.source.length == 2
binding.destination.length == 2)
@@ -91,10 +91,10 @@
org.apache.flex.core.ViewBaseDataBinding.prototype.initCompleteHandler =
var destination;
// can be simplebinding or constantbinding
var modelWatcher =
-watchers.watcherMap[applicationModel];
+watchers.watcherMap['applicationModel'];
var childMap = modelWatcher.children.watcherMap
var fieldWatcher = childMap[binding.source[1]];
-if (typeof(fieldWatcher.eventNames) == string)
+if (typeof(fieldWatcher.eventNames) == 'string')
{
var sb;
sb = new org.apache.flex.binding.SimpleBinding();
@@ -106,13 +106,18 @@
