You are viewing a plain text version of this content. The canonical link for it is here.
Posted to issues@royale.apache.org by GitBox <gi...@apache.org> on 2018/08/29 07:19:13 UTC
[GitHub] alinakazi closed pull request #276: Changes in 9 files
alinakazi closed pull request #276: Changes in 9 files
URL: https://github.com/apache/royale-asjs/pull/276
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git a/frameworks/projects/MXRoyale/src/main/royale/mx/charts/AreaChart.as b/frameworks/projects/MXRoyale/src/main/royale/mx/charts/AreaChart.as
index 74a70838b..87836fef7 100644
--- a/frameworks/projects/MXRoyale/src/main/royale/mx/charts/AreaChart.as
+++ b/frameworks/projects/MXRoyale/src/main/royale/mx/charts/AreaChart.as
@@ -147,13 +147,13 @@ public class AreaChart extends ChartBase
/**
* @private
*/
- /*override*/ public function set horizontalAxis(value:IAxis):void
+ /*override*/ /* public function set horizontalAxis(value:IAxis):void
{
//if (value is CategoryAxis)
// CategoryAxis(value).padding = 0;
//super.horizontalAxis = value;
- }
+ } */
//--------------------------------------------------------------------------
//
@@ -229,7 +229,7 @@ public class AreaChart extends ChartBase
* @playerversion AIR 1.1
* @productversion Royale 0.9.3
*/
- public function setStyle(styleProp:String, newValue:*):void
+ override public function setStyle(styleProp:String, newValue:*):void
{
if (GOOG::DEBUG)
trace("setStyle not implemented");
diff --git a/frameworks/projects/MXRoyale/src/main/royale/mx/charts/PlotChart.as b/frameworks/projects/MXRoyale/src/main/royale/mx/charts/PlotChart.as
index e3e033b82..48835847d 100644
--- a/frameworks/projects/MXRoyale/src/main/royale/mx/charts/PlotChart.as
+++ b/frameworks/projects/MXRoyale/src/main/royale/mx/charts/PlotChart.as
@@ -118,7 +118,7 @@ public class PlotChart extends ChartBase//extends CartesianChart
* @private
* Storage for the horizontalAxis property.
*/
- private var _horizontalAxis:IAxis;
+ //private var _horizontalAxis:IAxis;
/**
* Defines the labels, tick marks, and data position
@@ -133,19 +133,19 @@ public class PlotChart extends ChartBase//extends CartesianChart
* @productversion Royale 0.9.3
*/
- public function get horizontalAxis():IAxis
+ /* public function get horizontalAxis():IAxis
{
return _horizontalAxis;
- }
+ } */
/**
* @private
*/
- public function set horizontalAxis(value:IAxis):void
+ /* public function set horizontalAxis(value:IAxis):void
{
_horizontalAxis = value;
- }
+ } */
}
diff --git a/frameworks/projects/MXRoyale/src/main/royale/mx/charts/chartClasses/ChartBase.as b/frameworks/projects/MXRoyale/src/main/royale/mx/charts/chartClasses/ChartBase.as
index 571a2b10c..6aad83522 100644
--- a/frameworks/projects/MXRoyale/src/main/royale/mx/charts/chartClasses/ChartBase.as
+++ b/frameworks/projects/MXRoyale/src/main/royale/mx/charts/chartClasses/ChartBase.as
@@ -19,6 +19,7 @@
package mx.charts.chartClasses
{
import org.apache.royale.charts.core.ChartBase;
+ import mx.core.UIComponent;
/**
* The ChartBase class contains all of the properties common to most
* charts. Some charts may not make any or full use of the properties
@@ -36,7 +37,7 @@ package mx.charts.chartClasses
* @playerversion AIR 2.6
* @productversion Royale 0.0
*/
- public class ChartBase extends org.apache.royale.charts.core.ChartBase
+ public class ChartBase extends UIComponent //org.apache.royale.charts.core.ChartBase
{
/**
* @private
@@ -146,6 +147,25 @@ package mx.charts.chartClasses
public function set paddingBottom(value:Number):void
{
}
+
+ public function get series():Array
+ {
+ return null;
+ }
+ public function set series(value:Array):void
+ {
+
+ }
+
+ public function get dataProvider():Object
+ {
+ return null;
+ }
+ public function set dataProvider(value:Object):void
+ {
+
+ }
+
}
}
diff --git a/frameworks/projects/MXRoyale/src/main/royale/mx/charts/chartClasses/Series.as b/frameworks/projects/MXRoyale/src/main/royale/mx/charts/chartClasses/Series.as
index 088335d66..c54a94082 100644
--- a/frameworks/projects/MXRoyale/src/main/royale/mx/charts/chartClasses/Series.as
+++ b/frameworks/projects/MXRoyale/src/main/royale/mx/charts/chartClasses/Series.as
@@ -337,10 +337,10 @@ public class Series extends UIComponent
* @private
* Storage for the displayName property.
*/
- /* private var _displayName:String;
+ private var _displayName:String;
- [Inspectable(category="Display")]
- */
+ //[Inspectable(category="Display")]
+
/**
* The name of the series, for display to the user.
* This property is used to represent the series in user-visible labels,
@@ -351,22 +351,35 @@ public class Series extends UIComponent
* @playerversion AIR 1.1
* @productversion Royale 0.9.3
*/
- /* public function get displayName():String
+ public function get displayName():String
{
return _displayName;
- } */
+ }
/**
* @private
*/
- /* public function set displayName(value:String):void
+ public function set displayName(value:String):void
{
_displayName = value;
- var c:ChartBase = chart;
- if (c)
- c.legendDataChanged();
- } */
+ // var c:ChartBase = chart;
+ // if (c)
+ // c.legendDataChanged();
+ }
+
+ //----------------------------------
+ // DataProvider
+ //----------------------------------
+ private var _dataProvider:Object;
+ public function get dataProvider():Object
+ {
+ return _dataProvider;
+ }
+ public function set dataProvider(value:Object):void
+ {
+ }
+
//----------------------------------
// filterDataValues
diff --git a/frameworks/projects/MXRoyale/src/main/royale/mx/charts/series/BarSeries.as b/frameworks/projects/MXRoyale/src/main/royale/mx/charts/series/BarSeries.as
index 05947e840..50c7f2b1d 100644
--- a/frameworks/projects/MXRoyale/src/main/royale/mx/charts/series/BarSeries.as
+++ b/frameworks/projects/MXRoyale/src/main/royale/mx/charts/series/BarSeries.as
@@ -104,7 +104,47 @@ public class BarSeries extends org.apache.royale.charts.supportClasses.BarSeries
}
+ private var _displayName:String;
+
+ /**
+ * The name of the series, for display to the user.
+ * This property is used to represent the series in user-visible labels,
+ * such as data tips.
+ *
+ * @langversion 3.0
+ * @playerversion Flash 9
+ * @playerversion AIR 1.1
+ * @productversion Royale 0.9.3
+ */
+ public function get displayName():String
+ {
+ return _displayName;
+ }
+
+ /**
+ * @private
+ */
+ public function set displayName(value:String):void
+ {
+ _displayName = value;
+ }
+ Override public function get xField():String
+ {
+ return null;
+ }
+ Override public function set xField(value:String):void
+ {
+ }
+
+ Override public function get yField():String
+ {
+ return null;
+ }
+ Override public function set yField(value:String):void
+ {
+ }
+
diff --git a/frameworks/projects/MXRoyale/src/main/royale/mx/charts/series/ColumnSeries.as b/frameworks/projects/MXRoyale/src/main/royale/mx/charts/series/ColumnSeries.as
index d938c835d..9d702f309 100644
--- a/frameworks/projects/MXRoyale/src/main/royale/mx/charts/series/ColumnSeries.as
+++ b/frameworks/projects/MXRoyale/src/main/royale/mx/charts/series/ColumnSeries.as
@@ -114,7 +114,46 @@ public class ColumnSeries extends org.apache.royale.charts.supportClasses.Column
}
+ private var _displayName:String;
+
+ /**
+ * The name of the series, for display to the user.
+ * This property is used to represent the series in user-visible labels,
+ * such as data tips.
+ *
+ * @langversion 3.0
+ * @playerversion Flash 9
+ * @playerversion AIR 1.1
+ * @productversion Royale 0.9.3
+ */
+ public function get displayName():String
+ {
+ return _displayName;
+ }
+ /**
+ * @private
+ */
+ public function set displayName(value:String):void
+ {
+ _displayName = value;
+ }
+ Override public function get xField():String
+ {
+ return null;
+ }
+ Override public function set xField(value:String):void
+ {
+ }
+
+ Override public function get yField():String
+ {
+ return null;
+ }
+ Override public function set yField(value:String):void
+ {
+ }
+
}
diff --git a/frameworks/projects/MXRoyale/src/main/royale/mx/charts/series/PieSeries.as b/frameworks/projects/MXRoyale/src/main/royale/mx/charts/series/PieSeries.as
index 9818fc76e..68a64ac70 100644
--- a/frameworks/projects/MXRoyale/src/main/royale/mx/charts/series/PieSeries.as
+++ b/frameworks/projects/MXRoyale/src/main/royale/mx/charts/series/PieSeries.as
@@ -645,7 +645,7 @@ public class PieSeries extends Series
* @private
* Storage for the displayName property.
*/
- private var _displayName:String;
+ //private var _displayName:String;
/**
* The name of the series, for display to the user.
@@ -657,18 +657,18 @@ public class PieSeries extends Series
* @playerversion AIR 1.1
* @productversion Royale 0.9.3
*/
- public function get displayName():String
+ /* public function get displayName():String
{
return _displayName;
- }
+ } */
/**
* @private
*/
- public function set displayName(value:String):void
+ /* public function set displayName(value:String):void
{
_displayName = value;
- }
+ } */
}
diff --git a/frameworks/projects/MXRoyale/src/main/royale/mx/core/Container.as b/frameworks/projects/MXRoyale/src/main/royale/mx/core/Container.as
index e9f3ea66f..237c45af4 100644
--- a/frameworks/projects/MXRoyale/src/main/royale/mx/core/Container.as
+++ b/frameworks/projects/MXRoyale/src/main/royale/mx/core/Container.as
@@ -426,6 +426,15 @@ public class Container extends UIComponent
* @playerversion AIR 1.1
* @productversion Royale 0.9.3
*/
+
+ public function get borderVisible():Boolean
+ {
+ return true;
+ }
+ public function set borderVisible(value:Boolean):void
+ {
+ }
+
public function get paddingBottom():Object
{
if (GOOG::DEBUG)
diff --git a/frameworks/projects/MXRoyale/src/main/royale/mx/core/UIComponent.as b/frameworks/projects/MXRoyale/src/main/royale/mx/core/UIComponent.as
index 76d07e1f1..03b159d55 100644
--- a/frameworks/projects/MXRoyale/src/main/royale/mx/core/UIComponent.as
+++ b/frameworks/projects/MXRoyale/src/main/royale/mx/core/UIComponent.as
@@ -54,6 +54,7 @@ import mx.managers.IFocusManagerContainer;
import mx.managers.ISystemManager;
import mx.styles.IStyleManager2;
import mx.styles.StyleManager;
+import mx.charts.chartClasses.IAxis;
import org.apache.royale.core.CallLaterBead;
import org.apache.royale.core.IStatesImpl;
@@ -487,6 +488,8 @@ public class UIComponent extends UIBase
* @private
* Storage for the initialized property.
*/
+
+
private var _initialized:Boolean = false;
[Inspectable(environment="none")]
@@ -517,6 +520,26 @@ public class UIComponent extends UIBase
dispatchEvent(new FlexEvent(FlexEvent.CREATION_COMPLETE));
}
}
+
+ private var _VerticalAxis:IAxis;
+ public function get verticalAxis():IAxis
+ {
+ return _VerticalAxis;
+ }
+ public function set verticalAxis(value:IAxis):void
+ {
+ _VerticalAxis = value;
+ }
+ private var _horizontalAxis:IAxis;
+ public function get horizontalAxis():IAxis
+ {
+ return _horizontalAxis;
+ }
+ public function set horizontalAxis(value:IAxis):void
+ {
+ _horizontalAxis = value;
+ }
+
//----------------------------------
// graphics copied from Sprite
//----------------------------------
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
With regards,
Apache Git Services