royale-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bigosma...@apache.org
Subject [royale-asjs] branch feature/echarts updated: Revert to using public vars. The getters/setters done seem to be working
Date Fri, 16 Mar 2018 09:03:13 GMT
This is an automated email from the ASF dual-hosted git repository.

bigosmallm pushed a commit to branch feature/echarts
in repository https://gitbox.apache.org/repos/asf/royale-asjs.git


The following commit(s) were added to refs/heads/feature/echarts by this push:
     new 6d7ccd6  Revert to using public vars.  The getters/setters done seem to be working
6d7ccd6 is described below

commit 6d7ccd6d11b853b8219feec77b87ae378dd4720a
Author: Om Muppirala <bigosmallm@apache.org>
AuthorDate: Fri Mar 16 02:02:05 2018 -0700

    Revert to using public vars.  The getters/setters done seem to be working
---
 examples/royale/ECharts/src/Main.mxml              | 27 +-----------
 examples/royale/ECharts/src/echarts/ECharts.as     |  4 +-
 .../royale/ECharts/src/echarts/EChartsOptions.as   | 48 ++--------------------
 examples/royale/ECharts/src/echarts/Series.as      | 37 ++---------------
 examples/royale/ECharts/src/echarts/Title.as       | 48 ++--------------------
 examples/royale/ECharts/src/echarts/XAxis.as       | 13 +-----
 examples/royale/ECharts/src/echarts/YAxis.as       |  1 -
 7 files changed, 16 insertions(+), 162 deletions(-)

diff --git a/examples/royale/ECharts/src/Main.mxml b/examples/royale/ECharts/src/Main.mxml
index ddbca38..f06b421 100644
--- a/examples/royale/ECharts/src/Main.mxml
+++ b/examples/royale/ECharts/src/Main.mxml
@@ -6,32 +6,9 @@
 				   >
 	<fx:Script>
         <![CDATA[
-        private var _data:Array = ["shirt","cardign","chiffon shirt","pants","heels","socks"];
+        [Bindable] public var data:Array = ["shirt","cardign","chiffon shirt","pants","heels","socks"];
+        [Bindable] public var seriesData:Array = [5, 20, 36, 10, 10, 20];
 
-        [Bindable]
-		public function get data():Array
-		{
-			return _data;
-		}
-
-		public function set data(value:Array):void
-		{
-			_data = value;
-		}
-        
-        
-        private var _seriesData:Array = [5, 20, 36, 10, 10, 20];
-
-        [Bindable]
-		private function get seriesData():Array
-		{
-			return _seriesData;
-		}
-
-		private function set seriesData(value:Array):void
-		{
-			_seriesData = value;
-		}
         
         ]]>
     </fx:Script>
diff --git a/examples/royale/ECharts/src/echarts/ECharts.as b/examples/royale/ECharts/src/echarts/ECharts.as
index a25dd45..dee7a1a 100644
--- a/examples/royale/ECharts/src/echarts/ECharts.as
+++ b/examples/royale/ECharts/src/echarts/ECharts.as
@@ -45,14 +45,14 @@ package echarts
                 }           
             };
 
-            echartsInstance.setOption(option);
+            //echartsInstance.setOption(option);
 
             return echartsContainer;
         }
 
         public function set chartOptions(v:EChartsOptions):void {
             this._chartOptions = v;
-            //echartsInstance.setOption(v);
+            echartsInstance.setOption(v);
         }
 
         public function get chartOptions():EChartsOptions {
diff --git a/examples/royale/ECharts/src/echarts/EChartsOptions.as b/examples/royale/ECharts/src/echarts/EChartsOptions.as
index a1e27a7..f9bf75a 100644
--- a/examples/royale/ECharts/src/echarts/EChartsOptions.as
+++ b/examples/royale/ECharts/src/echarts/EChartsOptions.as
@@ -1,49 +1,9 @@
 package echarts
 {
     public class EChartsOptions{
-        private var _title:Title;
-        private var _xAxis:XAxis;
-        private var _yAxis:YAxis = new YAxis();
-		private var _series:Array = [];
-
-		private function get series():Array
-		{
-			return _series;
-		}
-
-		private function set series(value:Array):void
-		{
-			_series = value;
-		}
-
-		private function get yAxis():YAxis
-		{
-			return _yAxis;
-		}
-
-		private function set yAxis(value:YAxis):void
-		{
-			_yAxis = value;
-		}
-
-		public function get xAxis():XAxis
-		{
-			return _xAxis;
-		}
-
-		public function set xAxis(value:XAxis):void
-		{
-			_xAxis = value;
-		}
-
-		private function get title():Title
-		{
-			return _title;
-		}
-
-		private function set title(value:Title):void
-		{
-			_title = value;
-		}
+        public var title:Title;
+        public var xAxis:XAxis;
+        public var yAxis:YAxis = new YAxis();
+		public var series:Array = [];
     }
 }
\ No newline at end of file
diff --git a/examples/royale/ECharts/src/echarts/Series.as b/examples/royale/ECharts/src/echarts/Series.as
index 5932eb9..d74f131 100644
--- a/examples/royale/ECharts/src/echarts/Series.as
+++ b/examples/royale/ECharts/src/echarts/Series.as
@@ -2,39 +2,8 @@ package echarts
 {
 
     public class Series{
-		private var _data:Array = [5, 20, 36, 10, 10, 20];
-		private var _name:String;
-		private var _type:String;
-
-		public function get type():String
-		{
-			return _type;
-		}
-
-		public function set type(value:String):void
-		{
-			_type = value;
-		}
-
-		private function get name():String
-		{
-			return _name;
-		}
-
-		private function set name(value:String):void
-		{
-			_name = value;
-		}
-
-		public function get data():Array
-		{
-			return _data;
-		}
-
-		public function set data(value:Array):void
-		{
-			_data = value;
-		}
-		
+		public var data:Array = [];
+		public var name:String;
+		public var type:String;
     }
 }
\ No newline at end of file
diff --git a/examples/royale/ECharts/src/echarts/Title.as b/examples/royale/ECharts/src/echarts/Title.as
index 071f0b9..b524e7d 100644
--- a/examples/royale/ECharts/src/echarts/Title.as
+++ b/examples/royale/ECharts/src/echarts/Title.as
@@ -2,49 +2,9 @@ package echarts
 {
 
     public class Title{
-        private var _text:String;
-        private var _show:Boolean;
-        private var _link:String;
-        private var _target:String;
-
-		private function get text():String
-		{
-			return _text;
-		}
-
-		private function set text(value:String):void
-		{
-			_text = value;
-		}
-
-		private function get show():Boolean
-		{
-			return _show;
-		}
-
-		private function set show(value:Boolean):void
-		{
-			_show = value;
-		}
-
-		private function get link():String
-		{
-			return _link;
-		}
-
-		private function set link(value:String):void
-		{
-			_link = value;
-		}
-
-		private function get target():String
-		{
-			return _target;
-		}
-
-		private function set target(value:String):void
-		{
-			_target = value;
-		}
+        public var text:String;
+        public var show:Boolean;
+        public var link:String;
+        public var target:String;
     }
 }
\ No newline at end of file
diff --git a/examples/royale/ECharts/src/echarts/XAxis.as b/examples/royale/ECharts/src/echarts/XAxis.as
index 5fae733..3fc859c 100644
--- a/examples/royale/ECharts/src/echarts/XAxis.as
+++ b/examples/royale/ECharts/src/echarts/XAxis.as
@@ -1,17 +1,6 @@
 package echarts
 {
-
     public class XAxis{
-			private var _data:Array = ["shirt","cardign","chiffon shirt","pants","heels","socks"];
-
-			public function get data():Array
-			{
-				return _data;
-			}
-
-			public function set data(value:Array):void
-			{
-				_data = value;
-			}
+		public var data:Array = [];
     }
 }
\ No newline at end of file
diff --git a/examples/royale/ECharts/src/echarts/YAxis.as b/examples/royale/ECharts/src/echarts/YAxis.as
index fe56bef..4b50526 100644
--- a/examples/royale/ECharts/src/echarts/YAxis.as
+++ b/examples/royale/ECharts/src/echarts/YAxis.as
@@ -1,6 +1,5 @@
 package echarts
 {
-
     public class YAxis{
 			
     }

-- 
To stop receiving notification emails like this one, please contact
bigosmallm@apache.org.

Mime
View raw message