You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flex.apache.org by ah...@apache.org on 2014/01/09 16:43:52 UTC

[1/3] git commit: [flex-asjs] [refs/heads/develop] - fix windows java location

Updated Branches:
  refs/heads/develop 457e2db51 -> bbf1b0f4e


fix windows java location


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

Branch: refs/heads/develop
Commit: 19ff7e957eb7a2a0a5ab7383c882c30092de02e8
Parents: 457e2db
Author: Alex Harui <ah...@apache.org>
Authored: Wed Jan 8 11:20:38 2014 -0800
Committer: Alex Harui <ah...@apache.org>
Committed: Wed Jan 8 11:20:53 2014 -0800

----------------------------------------------------------------------
 installer.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/19ff7e95/installer.xml
----------------------------------------------------------------------
diff --git a/installer.xml b/installer.xml
index 32eb4b8..eb00fa8 100644
--- a/installer.xml
+++ b/installer.xml
@@ -122,7 +122,7 @@
         <condition property="java.executable" value="${java.home}/bin/java.exe" >
             <and>
                 <isset property="java.home" />
-                <available file="${java.home}/java.exe" />
+                <available file="${java.home}/bin/java.exe" />
             </and>
         </condition>
     </target>


[2/3] git commit: [flex-asjs] [refs/heads/develop] - this should probably not use createJS components

Posted by ah...@apache.org.
this should probably not use createJS components


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

Branch: refs/heads/develop
Commit: d390fc23bd4718b2c32e1778c5ecf1695223c191
Parents: 19ff7e9
Author: Alex Harui <ah...@apache.org>
Authored: Thu Jan 9 07:42:42 2014 -0800
Committer: Alex Harui <ah...@apache.org>
Committed: Thu Jan 9 07:42:42 2014 -0800

----------------------------------------------------------------------
 examples/ListsTest/src/products/ProductItemRenderer.as | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/d390fc23/examples/ListsTest/src/products/ProductItemRenderer.as
----------------------------------------------------------------------
diff --git a/examples/ListsTest/src/products/ProductItemRenderer.as b/examples/ListsTest/src/products/ProductItemRenderer.as
index cd7453c..2e39669 100644
--- a/examples/ListsTest/src/products/ProductItemRenderer.as
+++ b/examples/ListsTest/src/products/ProductItemRenderer.as
@@ -18,7 +18,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 package products
 {	
-	import org.apache.flex.createjs.staticControls.Label;
+	import org.apache.flex.html.staticControls.Label;
 	import org.apache.flex.html.staticControls.Image;
 	import org.apache.flex.html.staticControls.supportClasses.DataItemRenderer;
 


[3/3] git commit: [flex-asjs] [refs/heads/develop] - fix up mx.core.ClassFactory.js

Posted by ah...@apache.org.
fix up mx.core.ClassFactory.js


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

Branch: refs/heads/develop
Commit: bbf1b0f4e59a570322adc0090fa599a51be61ba3
Parents: d390fc2
Author: Alex Harui <ah...@apache.org>
Authored: Thu Jan 9 07:43:11 2014 -0800
Committer: Alex Harui <ah...@apache.org>
Committed: Thu Jan 9 07:43:11 2014 -0800

----------------------------------------------------------------------
 .../js/FlexJS/src/mx/core/ClassFactory.js       | 22 ++++++++++++++------
 1 file changed, 16 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/bbf1b0f4/frameworks/js/FlexJS/src/mx/core/ClassFactory.js
----------------------------------------------------------------------
diff --git a/frameworks/js/FlexJS/src/mx/core/ClassFactory.js b/frameworks/js/FlexJS/src/mx/core/ClassFactory.js
index f87f327..46b94d3 100644
--- a/frameworks/js/FlexJS/src/mx/core/ClassFactory.js
+++ b/frameworks/js/FlexJS/src/mx/core/ClassFactory.js
@@ -22,11 +22,21 @@ goog.require('mx.core.IFactory');
  * @constructor
  * @implements {mx.core.IFactory}
  */
-mx.core.ClassFactory = function() {
-  this.generator = null;
+mx.core.ClassFactory = function(generator) {
+  this.generator = generator;
   this.properties = null;
 };
 
+/**
+ * Metadata
+ *
+ * @type {Object.<string, Array.<Object>>}
+ */
+mx.core.ClassFactory.prototype.
+    FLEXJS_CLASS_INFO =
+        { names: [{ name: 'ClassFactory',
+           qName: 'mx.core.ClassFactory' }],
+    interfaces: [mx.core.IFactory] };
 
 /**
  * @expose
@@ -34,12 +44,12 @@ mx.core.ClassFactory = function() {
  */
 mx.core.ClassFactory.
     prototype.newInstance = function() {
-  var obj = new generator();
+  var obj = new this.generator();
 
-  if (properties) {
+  if (this.properties) {
     var prop;
-    for each(prop in properties) {
-      obj[prop] = properties[prop];
+    for (prop in this.properties) {
+      obj[prop] = this.properties[prop];
     }
   }