flex-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jmcl...@apache.org
Subject [1/7] git commit: [flex-utilities] [refs/heads/develop] - Remove Adobe's trademarked product names
Date Fri, 25 Jul 2014 02:29:40 GMT
Repository: flex-utilities
Updated Branches:
  refs/heads/develop 489bd2475 -> 2d9ca31c6


Remove Adobe's trademarked product names


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

Branch: refs/heads/develop
Commit: 36b7cd493a81e6550e3e134e3f5bdc8ab7ebc5a7
Parents: 489bd24
Author: Justin Mclean <jmclean@apache.org>
Authored: Fri Jul 25 10:52:28 2014 +1000
Committer: Justin Mclean <jmclean@apache.org>
Committed: Fri Jul 25 10:52:28 2014 +1000

----------------------------------------------------------------------
 .../src/controls/ButtonBarExample.mxml          |   8 +-
 .../src/controls/OLAPDataGridExample.mxml       | 107 +++++++++----------
 .../src/controls/ToggleButtonBarExample.mxml    |   8 +-
 3 files changed, 56 insertions(+), 67 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/36b7cd49/TourDeFlex/TourDeFlex3/src/controls/ButtonBarExample.mxml
----------------------------------------------------------------------
diff --git a/TourDeFlex/TourDeFlex3/src/controls/ButtonBarExample.mxml b/TourDeFlex/TourDeFlex3/src/controls/ButtonBarExample.mxml
index 3a6cf22..2a0e80a 100755
--- a/TourDeFlex/TourDeFlex3/src/controls/ButtonBarExample.mxml
+++ b/TourDeFlex/TourDeFlex3/src/controls/ButtonBarExample.mxml
@@ -44,10 +44,10 @@
         <mx:ButtonBar itemClick="clickHandler(event);">
             <mx:dataProvider>
                 <mx:Array>
-                    <mx:String>Flash</mx:String>
-                    <mx:String>Director</mx:String>
-                    <mx:String>Dreamweaver</mx:String>
-                    <mx:String>ColdFusion</mx:String>
+                    <mx:String>Flex SDK</mx:String>
+                    <mx:String>Flex JS</mx:String>
+                    <mx:String>Falcon</mx:String>
+                    <mx:String>Falcon JX</mx:String>
                 </mx:Array>
             </mx:dataProvider>
         </mx:ButtonBar>

http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/36b7cd49/TourDeFlex/TourDeFlex3/src/controls/OLAPDataGridExample.mxml
----------------------------------------------------------------------
diff --git a/TourDeFlex/TourDeFlex3/src/controls/OLAPDataGridExample.mxml b/TourDeFlex/TourDeFlex3/src/controls/OLAPDataGridExample.mxml
index 926ad6a..a823e5e 100755
--- a/TourDeFlex/TourDeFlex3/src/controls/OLAPDataGridExample.mxml
+++ b/TourDeFlex/TourDeFlex3/src/controls/OLAPDataGridExample.mxml
@@ -34,79 +34,68 @@
         import mx.collections.ArrayCollection;
         
         
-        //
-        // Format of Objects in the ArrayCollection:
-        //
-        //  data:Object = {
-        //    customer:"AAA", 
-        //    product:"ColdFusion",
-        //    quarter:"Q1"
-        //    revenue: "100.00" 
-        //  }
-        //
-
         [Bindable]
         private var flatData:ArrayCollection = new ArrayCollection(
         [
-         {customer:"AAA", product:"ColdFusion", quarter:"Q1", revenue:210, cost:25},
-         {customer:"AAA", product:"Flex", quarter:"Q2", revenue:210, cost:25},
-         {customer:"AAA", product:"Dreamweaver", quarter:"Q3", revenue:250, cost:125},
-         {customer:"AAA", product:"Flash", quarter:"Q4", revenue:430, cost:75},
+         {customer:"AAA", product:"Flex SDK", quarter:"Q1", revenue:210, cost:25},
+         {customer:"AAA", product:"Flex JS", quarter:"Q2", revenue:210, cost:25},
+         {customer:"AAA", product:"Falcon", quarter:"Q3", revenue:250, cost:125},
+         {customer:"AAA", product:"Falcon JX", quarter:"Q4", revenue:430, cost:75},
 
-         {customer:"BBB", product:"ColdFusion", quarter:"Q2", revenue:125, cost:20},
-         {customer:"BBB", product:"Flex", quarter:"Q3", revenue:210, cost:20},
-         {customer:"BBB", product:"Dreamweaver", quarter:"Q4", revenue:320, cost:120},
-         {customer:"BBB", product:"Flash", quarter:"Q1", revenue:280, cost:70},
+         {customer:"BBB", product:"Flex SDK", quarter:"Q2", revenue:125, cost:20},
+         {customer:"BBB", product:"Flex JS", quarter:"Q3", revenue:210, cost:20},
+         {customer:"BBB", product:"Falcon", quarter:"Q4", revenue:320, cost:120},
+         {customer:"BBB", product:"Falcon JX", quarter:"Q1", revenue:280, cost:70},
 
-         {customer:"CCC", product:"ColdFusion", quarter:"Q3", revenue:375, cost:120},
-         {customer:"CCC", product:"Flex", quarter:"Q4", revenue:430, cost:120},
-         {customer:"CCC", product:"Dreamweaver", quarter:"Q1", revenue:470, cost:220},
-         {customer:"CCC", product:"Flash", quarter:"Q2", revenue:570, cost:170},
+         {customer:"CCC", product:"Flex SDK", quarter:"Q3", revenue:375, cost:120},
+         {customer:"CCC", product:"Flex JS", quarter:"Q4", revenue:430, cost:120},
+         {customer:"CCC", product:"Falcon", quarter:"Q1", revenue:470, cost:220},
+         {customer:"CCC", product:"Falcon JX", quarter:"Q2", revenue:570, cost:170},
     
-         {customer:"AAA", product:"ColdFusion", quarter:"Q4", revenue:215, cost:90},
-         {customer:"AAA", product:"Flex", quarter:"Q1", revenue:210, cost:90},
-         {customer:"AAA", product:"Dreamweaver", quarter:"Q2", revenue:175, cost:190},
-         {customer:"AAA", product:"Flash", quarter:"Q3", revenue:670, cost:75},
+         {customer:"AAA", product:"Flex SDK", quarter:"Q4", revenue:215, cost:90},
+         {customer:"AAA", product:"Flex JS", quarter:"Q1", revenue:210, cost:90},
+         {customer:"AAA", product:"Falcon", quarter:"Q2", revenue:175, cost:190},
+         {customer:"AAA", product:"Falcon JX", quarter:"Q3", revenue:670, cost:75},
     
-         {customer:"BBB", product:"ColdFusion", quarter:"Q1", revenue:175, cost:20},
-         {customer:"BBB", product:"Flex", quarter:"Q2", revenue:210, cost:20},
-         {customer:"BBB", product:"Dreamweaver",quarter:"Q3", revenue:120, cost:120},
-         {customer:"BBB", product:"Flash", quarter:"Q4", revenue:310, cost:70},
+         {customer:"BBB", product:"Flex SDK", quarter:"Q1", revenue:175, cost:20},
+         {customer:"BBB", product:"Flex JS", quarter:"Q2", revenue:210, cost:20},
+         {customer:"BBB", product:"Falcon",quarter:"Q3", revenue:120, cost:120},
+         {customer:"BBB", product:"Falcon JX", quarter:"Q4", revenue:310, cost:70},
     
-         {customer:"CCC", product:"ColdFusion", quarter:"Q1", revenue:385, cost:120},
-         {customer:"CCC", product:"Flex", quarter:"Q2", revenue:340, cost:120},
-         {customer:"CCC", product:"Dreamweaver", quarter:"Q3", revenue:470, cost:220},
-         {customer:"CCC", product:"Flash", quarter:"Q4", revenue:270, cost:170},
+         {customer:"CCC", product:"Flex SDK", quarter:"Q1", revenue:385, cost:120},
+         {customer:"CCC", product:"Flex JS", quarter:"Q2", revenue:340, cost:120},
+         {customer:"CCC", product:"Falcon", quarter:"Q3", revenue:470, cost:220},
+         {customer:"CCC", product:"Falcon JX", quarter:"Q4", revenue:270, cost:170},
     
-         {customer:"AAA", product:"ColdFusion", quarter:"Q1", revenue:100, cost:25},
-         {customer:"AAA", product:"Flex", quarter:"Q2", revenue:150, cost:25},
-         {customer:"AAA", product:"Dreamweaver", quarter:"Q3", revenue:200, cost:125},
-         {customer:"AAA", product:"Flash", quarter:"Q4", revenue:300, cost:75},
+         {customer:"AAA", product:"Flex SDK", quarter:"Q1", revenue:100, cost:25},
+         {customer:"AAA", product:"Flex JS", quarter:"Q2", revenue:150, cost:25},
+         {customer:"AAA", product:"Falcon", quarter:"Q3", revenue:200, cost:125},
+         {customer:"AAA", product:"Falcon JX", quarter:"Q4", revenue:300, cost:75},
     
-         {customer:"BBB", product:"ColdFusion", quarter:"Q2", revenue:175, cost:20},
-         {customer:"BBB", product:"Flex", quarter:"Q3", revenue:100, cost:20},
-         {customer:"BBB", product:"Dreamweaver", quarter:"Q4", revenue:270, cost:120},
-         {customer:"BBB", product:"Flash", quarter:"Q1", revenue:370, cost:70},
+         {customer:"BBB", product:"Flex SDK", quarter:"Q2", revenue:175, cost:20},
+         {customer:"BBB", product:"Flex JS", quarter:"Q3", revenue:100, cost:20},
+         {customer:"BBB", product:"Falcon", quarter:"Q4", revenue:270, cost:120},
+         {customer:"BBB", product:"Falcon JX", quarter:"Q1", revenue:370, cost:70},
     
-         {customer:"CCC", product:"ColdFusion", quarter:"Q3", revenue:410, cost:120},
-         {customer:"CCC", product:"Flex", quarter:"Q4", revenue:300, cost:320},
-         {customer:"CCC", product:"Dreamweaver", quarter:"Q1", revenue:510, cost:220},
-         {customer:"CCC", product:"Flash", quarter:"Q2", revenue:620, cost:170},
+         {customer:"CCC", product:"Flex SDK", quarter:"Q3", revenue:410, cost:120},
+         {customer:"CCC", product:"Flex JS", quarter:"Q4", revenue:300, cost:320},
+         {customer:"CCC", product:"Falcon", quarter:"Q1", revenue:510, cost:220},
+         {customer:"CCC", product:"Falcon JX", quarter:"Q2", revenue:620, cost:170},
     
-         {customer:"AAA", product:"ColdFusion", quarter:"Q4", revenue:215, cost:90},
-         {customer:"AAA", product:"Flex", quarter:"Q1", revenue:210, cost:90},
-         {customer:"AAA", product:"Dreamweaver", quarter:"Q2", revenue:175, cost:190},
-         {customer:"AAA", product:"Flash", quarter:"Q3", revenue:420, cost:75},
+         {customer:"AAA", product:"Flex SDK", quarter:"Q4", revenue:215, cost:90},
+         {customer:"AAA", product:"Flex JS", quarter:"Q1", revenue:210, cost:90},
+         {customer:"AAA", product:"Falcon", quarter:"Q2", revenue:175, cost:190},
+         {customer:"AAA", product:"Falcon JX", quarter:"Q3", revenue:420, cost:75},
     
-         {customer:"BBB", product:"ColdFusion", quarter:"Q1", revenue:240, cost:20},
-         {customer:"BBB", product:"Flex", quarter:"Q2", revenue:100, cost:20},
-         {customer:"BBB", product:"Dreamweaver", quarter:"Q3", revenue:270, cost:120},
-         {customer:"BBB", product:"Flash", quarter:"Q4", revenue:370, cost:70},
+         {customer:"BBB", product:"Flex SDK", quarter:"Q1", revenue:240, cost:20},
+         {customer:"BBB", product:"Flex JS", quarter:"Q2", revenue:100, cost:20},
+         {customer:"BBB", product:"Falcon", quarter:"Q3", revenue:270, cost:120},
+         {customer:"BBB", product:"Falcon JX", quarter:"Q4", revenue:370, cost:70},
     
-         {customer:"CCC", product:"ColdFusion", quarter:"Q1", revenue:375, cost:120},
-         {customer:"CCC", product:"Flex", quarter:"Q2", revenue:420, cost:120},
-         {customer:"CCC", product:"Dreamweaver", quarter:"Q3", revenue:680, cost:220},
-         {customer:"CCC", product:"Flash", quarter:"Q4", revenue:570, cost:170}         
+         {customer:"CCC", product:"Flex SDK", quarter:"Q1", revenue:375, cost:120},
+         {customer:"CCC", product:"Flex JS", quarter:"Q2", revenue:420, cost:120},
+         {customer:"CCC", product:"Falcon", quarter:"Q3", revenue:680, cost:220},
+         {customer:"CCC", product:"Falcon JX", quarter:"Q4", revenue:570, cost:170}     
   
         ]);
     
         private function creationCompleteHandler():void {

http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/36b7cd49/TourDeFlex/TourDeFlex3/src/controls/ToggleButtonBarExample.mxml
----------------------------------------------------------------------
diff --git a/TourDeFlex/TourDeFlex3/src/controls/ToggleButtonBarExample.mxml b/TourDeFlex/TourDeFlex3/src/controls/ToggleButtonBarExample.mxml
index acb9391..4fa686e 100755
--- a/TourDeFlex/TourDeFlex3/src/controls/ToggleButtonBarExample.mxml
+++ b/TourDeFlex/TourDeFlex3/src/controls/ToggleButtonBarExample.mxml
@@ -44,10 +44,10 @@
         <mx:ToggleButtonBar itemClick="clickHandler(event);">
             <mx:dataProvider>
                 <mx:Array>
-                    <mx:String>Flash</mx:String>
-                    <mx:String>Director</mx:String>
-                    <mx:String>Dreamweaver</mx:String>
-                    <mx:String>ColdFusion</mx:String>
+                    <mx:String>Flex SDK</mx:String>
+                    <mx:String>Flex JS</mx:String>
+                    <mx:String>Falcon</mx:String>
+                    <mx:String>Falcon JX</mx:String>
                 </mx:Array>
             </mx:dataProvider>
         </mx:ToggleButtonBar>


Mime
View raw message