You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flex.apache.org by jm...@apache.org on 2014/01/03 07:51:34 UTC
[1/3] git commit: [flex-sdk] [refs/heads/develop] - changed private
to protected
Updated Branches:
refs/heads/develop b155e0144 -> 7e101d8de
changed private to protected
Project: http://git-wip-us.apache.org/repos/asf/flex-sdk/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-sdk/commit/229c5de9
Tree: http://git-wip-us.apache.org/repos/asf/flex-sdk/tree/229c5de9
Diff: http://git-wip-us.apache.org/repos/asf/flex-sdk/diff/229c5de9
Branch: refs/heads/develop
Commit: 229c5de966829045a209e2275f2f3552aa039806
Parents: b155e01
Author: Justin Mclean <jm...@apache.org>
Authored: Fri Jan 3 16:28:45 2014 +1100
Committer: Justin Mclean <jm...@apache.org>
Committed: Fri Jan 3 16:28:45 2014 +1100
----------------------------------------------------------------------
frameworks/projects/mx/src/mx/controls/PopUpMenuButton.as | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/229c5de9/frameworks/projects/mx/src/mx/controls/PopUpMenuButton.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/mx/src/mx/controls/PopUpMenuButton.as b/frameworks/projects/mx/src/mx/controls/PopUpMenuButton.as
index bb5b055..aedd4ea 100644
--- a/frameworks/projects/mx/src/mx/controls/PopUpMenuButton.as
+++ b/frameworks/projects/mx/src/mx/controls/PopUpMenuButton.as
@@ -818,10 +818,7 @@ public class PopUpMenuButton extends PopUpButton
//
//--------------------------------------------------------------------------
- /**
- * @private
- */
- private function menuClickHandler(event:MouseEvent):void
+ protected function menuClickHandler(event:MouseEvent):void
{
if (selectedIndex >= 0)
{
[3/3] git commit: [flex-sdk] [refs/heads/develop] - CXForm add
toString method
Posted by jm...@apache.org.
CXForm add toString method
Project: http://git-wip-us.apache.org/repos/asf/flex-sdk/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-sdk/commit/7e101d8d
Tree: http://git-wip-us.apache.org/repos/asf/flex-sdk/tree/7e101d8d
Diff: http://git-wip-us.apache.org/repos/asf/flex-sdk/diff/7e101d8d
Branch: refs/heads/develop
Commit: 7e101d8de83a1edf18f9cafa9a82d3f9f6d99b25
Parents: e3ade5a
Author: Justin Mclean <jm...@apache.org>
Authored: Fri Jan 3 17:51:18 2014 +1100
Committer: Justin Mclean <jm...@apache.org>
Committed: Fri Jan 3 17:51:18 2014 +1100
----------------------------------------------------------------------
modules/swfutils/src/java/flash/swf/types/CXFormWithAlpha.java | 6 ++++++
1 file changed, 6 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/7e101d8d/modules/swfutils/src/java/flash/swf/types/CXFormWithAlpha.java
----------------------------------------------------------------------
diff --git a/modules/swfutils/src/java/flash/swf/types/CXFormWithAlpha.java b/modules/swfutils/src/java/flash/swf/types/CXFormWithAlpha.java
index f7b196a..c1fdd43 100644
--- a/modules/swfutils/src/java/flash/swf/types/CXFormWithAlpha.java
+++ b/modules/swfutils/src/java/flash/swf/types/CXFormWithAlpha.java
@@ -57,5 +57,11 @@ public class CXFormWithAlpha extends CXForm
return isEqual;
}
+
+ public String toString()
+ {
+ String base = super.toString();
+ return base + " " + alphaMultTerm + "a" + (alphaAddTerm>=0 ? "+" : "") + alphaAddTerm;
+ }
}
[2/3] git commit: [flex-sdk] [refs/heads/develop] - made code
constant in both classes
Posted by jm...@apache.org.
made code constant in both classes
Project: http://git-wip-us.apache.org/repos/asf/flex-sdk/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-sdk/commit/e3ade5a5
Tree: http://git-wip-us.apache.org/repos/asf/flex-sdk/tree/e3ade5a5
Diff: http://git-wip-us.apache.org/repos/asf/flex-sdk/diff/e3ade5a5
Branch: refs/heads/develop
Commit: e3ade5a5eed6782591a740292a01bcf74b78a3f4
Parents: 229c5de
Author: Justin Mclean <jm...@apache.org>
Authored: Fri Jan 3 17:42:53 2014 +1100
Committer: Justin Mclean <jm...@apache.org>
Committed: Fri Jan 3 17:42:53 2014 +1100
----------------------------------------------------------------------
.../AdvancedDataGridColumn.as | 35 +++++++++++---------
.../AdvancedDataGridColumnGroup.as | 2 ++
2 files changed, 22 insertions(+), 15 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/e3ade5a5/frameworks/projects/advancedgrids/src/mx/controls/advancedDataGridClasses/AdvancedDataGridColumn.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/advancedgrids/src/mx/controls/advancedDataGridClasses/AdvancedDataGridColumn.as b/frameworks/projects/advancedgrids/src/mx/controls/advancedDataGridClasses/AdvancedDataGridColumn.as
index dbebdff..2cf14b5 100644
--- a/frameworks/projects/advancedgrids/src/mx/controls/advancedDataGridClasses/AdvancedDataGridColumn.as
+++ b/frameworks/projects/advancedgrids/src/mx/controls/advancedDataGridClasses/AdvancedDataGridColumn.as
@@ -1778,10 +1778,13 @@ public class AdvancedDataGridColumn extends CSSStyleDeclaration implements IIMES
if (typeof(data) == "object" || typeof(data) == "xml")
{
- if (dataField in data)
- data = data[dataField];
- else
- data = null;
+ if (dataField != null)
+ {
+ if (dataField in data)
+ data = data[dataField];
+ else
+ data = null;
+ }
}
if (data is String)
@@ -1834,17 +1837,19 @@ public class AdvancedDataGridColumn extends CSSStyleDeclaration implements IIMES
var field:String = dataTipField;
if (!field)
field = owner.dataTipField;
- data = null;
- try
- {
- if (data[field] != null)
- data = data[field];
- else if (data[dataField] != null)
- data = data[dataField];
- }
- catch(e:Error)
- {
- }
+
+ if (field != null)
+ {
+ if (field in data && data[field] != null)
+ data = data[field];
+ }
+ else if (dataField != null)
+ {
+ if (dataField in data && data[dataField] != null)
+ data = data[dataField];
+ else
+ data = null;
+ }
}
if (data is String)
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/e3ade5a5/frameworks/projects/advancedgrids/src/mx/controls/advancedDataGridClasses/AdvancedDataGridColumnGroup.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/advancedgrids/src/mx/controls/advancedDataGridClasses/AdvancedDataGridColumnGroup.as b/frameworks/projects/advancedgrids/src/mx/controls/advancedDataGridClasses/AdvancedDataGridColumnGroup.as
index 88e9e80..98efd76 100644
--- a/frameworks/projects/advancedgrids/src/mx/controls/advancedDataGridClasses/AdvancedDataGridColumnGroup.as
+++ b/frameworks/projects/advancedgrids/src/mx/controls/advancedDataGridClasses/AdvancedDataGridColumnGroup.as
@@ -265,10 +265,12 @@ public class AdvancedDataGridColumnGroup extends AdvancedDataGridColumn
if (typeof(data) == "object" || typeof(data) == "xml")
{
if (dataField != null)
+ {
if (dataField in data)
data = data[dataField];
else
data = null;
+ }
}
return data;
}