Updated Branches: refs/heads/develop 9c23eb3a1 -> 90f745132
Fixes for asdoc. Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/90f74513 Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/90f74513 Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/90f74513 Branch: refs/heads/develop Commit: 90f745132572b3297aa04bd91bba6e1e9a985a82 Parents: 9c23eb3 Author: Peter Ent <[email protected]> Authored: Thu Feb 6 10:16:49 2014 -0500 Committer: Peter Ent <[email protected]> Committed: Thu Feb 6 10:16:49 2014 -0500 ---------------------------------------------------------------------- .../src/org/apache/flex/charts/BarChart.as | 3 +- .../charts/beads/ChartItemRendererFactory.as | 3 +- .../org/apache/flex/charts/beads/XAxisBead.as | 6 ++- .../charts/supportClasses/BarChartSeries.as | 12 +++-- .../charts/supportClasses/BoxItemRenderer.as | 14 ++++-- .../html/staticControls/beads/BoxGridView.as | 48 -------------------- .../staticControls/beads/DataGridColumnView.as | 9 ++-- .../html/staticControls/beads/DataGridView.as | 3 +- .../DataItemRendererFactoryForColumnData.as | 10 +++- .../beads/models/DataGridPresentationModel.as | 17 +++++-- .../supportClasses/DataGridColumn.as | 12 +++-- 11 files changed, 64 insertions(+), 73 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/90f74513/frameworks/as/projects/FlexJSJX/src/org/apache/flex/charts/BarChart.as ---------------------------------------------------------------------- diff --git a/frameworks/as/projects/FlexJSJX/src/org/apache/flex/charts/BarChart.as b/frameworks/as/projects/FlexJSJX/src/org/apache/flex/charts/BarChart.as index 78e413e..4151634 100644 --- a/frameworks/as/projects/FlexJSJX/src/org/apache/flex/charts/BarChart.as +++ b/frameworks/as/projects/FlexJSJX/src/org/apache/flex/charts/BarChart.as @@ -47,6 +47,8 @@ package org.apache.flex.charts super(); } + private var _series:Array; + /** * The collection of series for the chart. Each element of the * series array should be of type BarChartSeries. @@ -56,7 +58,6 @@ package org.apache.flex.charts * @playerversion AIR 2.6 * @productversion FlexJS 0.0 */ - private var _series:Array; public function get series():Array { return _series; http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/90f74513/frameworks/as/projects/FlexJSJX/src/org/apache/flex/charts/beads/ChartItemRendererFactory.as ---------------------------------------------------------------------- diff --git a/frameworks/as/projects/FlexJSJX/src/org/apache/flex/charts/beads/ChartItemRendererFactory.as b/frameworks/as/projects/FlexJSJX/src/org/apache/flex/charts/beads/ChartItemRendererFactory.as index e842fa9..c124c39 100644 --- a/frameworks/as/projects/FlexJSJX/src/org/apache/flex/charts/beads/ChartItemRendererFactory.as +++ b/frameworks/as/projects/FlexJSJX/src/org/apache/flex/charts/beads/ChartItemRendererFactory.as @@ -52,6 +52,8 @@ package org.apache.flex.charts.beads private var selectionModel:ISelectionModel; protected var dataGroup:IItemRendererParent; + private var _seriesRenderers:Array; + /** * The array of renderers created for each series. * @@ -60,7 +62,6 @@ package org.apache.flex.charts.beads * @playerversion AIR 2.6 * @productversion FlexJS 0.0 */ - private var _seriesRenderers:Array; public function get seriesRenderers():Array { return _seriesRenderers; http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/90f74513/frameworks/as/projects/FlexJSJX/src/org/apache/flex/charts/beads/XAxisBead.as ---------------------------------------------------------------------- diff --git a/frameworks/as/projects/FlexJSJX/src/org/apache/flex/charts/beads/XAxisBead.as b/frameworks/as/projects/FlexJSJX/src/org/apache/flex/charts/beads/XAxisBead.as index 15e9c73..837dc17 100644 --- a/frameworks/as/projects/FlexJSJX/src/org/apache/flex/charts/beads/XAxisBead.as +++ b/frameworks/as/projects/FlexJSJX/src/org/apache/flex/charts/beads/XAxisBead.as @@ -47,6 +47,8 @@ package org.apache.flex.charts.beads { } + private var _labelField:String; + /** * The name of field witin the chart data to use to label each of the * axis data points. @@ -56,7 +58,6 @@ package org.apache.flex.charts.beads * @playerversion AIR 2.6 * @productversion FlexJS 0.0 */ - private var _labelField:String; public function get labelField():String { return _labelField; @@ -66,10 +67,11 @@ package org.apache.flex.charts.beads _labelField = value; } + private var _strand:IStrand; + /** * @private */ - private var _strand:IStrand; public function set strand(value:IStrand):void { _strand = value; http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/90f74513/frameworks/as/projects/FlexJSJX/src/org/apache/flex/charts/supportClasses/BarChartSeries.as ---------------------------------------------------------------------- diff --git a/frameworks/as/projects/FlexJSJX/src/org/apache/flex/charts/supportClasses/BarChartSeries.as b/frameworks/as/projects/FlexJSJX/src/org/apache/flex/charts/supportClasses/BarChartSeries.as index 0d47237..c46d65f 100644 --- a/frameworks/as/projects/FlexJSJX/src/org/apache/flex/charts/supportClasses/BarChartSeries.as +++ b/frameworks/as/projects/FlexJSJX/src/org/apache/flex/charts/supportClasses/BarChartSeries.as @@ -45,6 +45,8 @@ package org.apache.flex.charts.supportClasses { } + private var _xField:String = "x"; + /** * The name of the field corresponding to the X or horizontal value * for an item in the chart. @@ -54,7 +56,6 @@ package org.apache.flex.charts.supportClasses * @playerversion AIR 2.6 * @productversion FlexJS 0.0 */ - private var _xField:String = "x"; public function get xField():String { return _xField; @@ -64,6 +65,8 @@ package org.apache.flex.charts.supportClasses _xField = value; } + private var _yField:String; + /** * The name of the field that provides the Y or vertical value for an * item in the chart. @@ -73,7 +76,6 @@ package org.apache.flex.charts.supportClasses * @playerversion AIR 2.6 * @productversion FlexJS 0.0 */ - private var _yField:String; public function get yField():String { return _yField; @@ -83,6 +85,8 @@ package org.apache.flex.charts.supportClasses _yField = value; } + private var _fillColor:uint; + /** * The color to use for all bars in the series. * @@ -91,7 +95,6 @@ package org.apache.flex.charts.supportClasses * @playerversion AIR 2.6 * @productversion FlexJS 0.0 */ - private var _fillColor:uint; public function get fillColor():uint { return _fillColor; @@ -101,6 +104,8 @@ package org.apache.flex.charts.supportClasses _fillColor = value; } + private var _itemRenderer:IFactory; + /** * The class or class factory to use as the itemRenderer for each X/Y pair. The * itemRenderer class must implement the IChartItemRenderer interface. @@ -110,7 +115,6 @@ package org.apache.flex.charts.supportClasses * @playerversion AIR 2.6 * @productversion FlexJS 0.0 */ - private var _itemRenderer:IFactory; public function get itemRenderer():IFactory { return _itemRenderer; http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/90f74513/frameworks/as/projects/FlexJSJX/src/org/apache/flex/charts/supportClasses/BoxItemRenderer.as ---------------------------------------------------------------------- diff --git a/frameworks/as/projects/FlexJSJX/src/org/apache/flex/charts/supportClasses/BoxItemRenderer.as b/frameworks/as/projects/FlexJSJX/src/org/apache/flex/charts/supportClasses/BoxItemRenderer.as index 05bbdd0..8565d0e 100644 --- a/frameworks/as/projects/FlexJSJX/src/org/apache/flex/charts/supportClasses/BoxItemRenderer.as +++ b/frameworks/as/projects/FlexJSJX/src/org/apache/flex/charts/supportClasses/BoxItemRenderer.as @@ -46,7 +46,9 @@ package org.apache.flex.charts.supportClasses { super(); } - + + private var _itemRendererParent:Object; + /** * The parent component of the itemRenderer instance. This is the container that houses * all of the itemRenderers for the series. @@ -56,7 +58,6 @@ package org.apache.flex.charts.supportClasses * @playerversion AIR 2.6 * @productversion FlexJS 0.0 */ - private var _itemRendererParent:Object; public function get itemRendererParent():Object { return _itemRendererParent; @@ -68,6 +69,8 @@ package org.apache.flex.charts.supportClasses private var filledRect:FilledRectangle; + private var _yField:String = "y"; + /** * The name of the field containing the value for the Y axis. * @@ -76,7 +79,6 @@ package org.apache.flex.charts.supportClasses * @playerversion AIR 2.6 * @productversion FlexJS 0.0 */ - private var _yField:String = "y"; public function get yField():String { return _yField; @@ -86,6 +88,8 @@ package org.apache.flex.charts.supportClasses _yField = value; } + private var _xField:String = "x"; + /** * The name of the field containing the value for the X axis. * @@ -94,7 +98,6 @@ package org.apache.flex.charts.supportClasses * @playerversion AIR 2.6 * @productversion FlexJS 0.0 */ - private var _xField:String = "x"; public function get xField():String { return _xField; @@ -104,6 +107,8 @@ package org.apache.flex.charts.supportClasses _xField = value; } + private var _fillColor:uint; + /** * The color used to fill the interior of the box. * @@ -112,7 +117,6 @@ package org.apache.flex.charts.supportClasses * @playerversion AIR 2.6 * @productversion FlexJS 0.0 */ - private var _fillColor:uint; public function get fillColor():uint { return _fillColor; http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/90f74513/frameworks/as/projects/FlexJSJX/src/org/apache/flex/html/staticControls/beads/BoxGridView.as ---------------------------------------------------------------------- diff --git a/frameworks/as/projects/FlexJSJX/src/org/apache/flex/html/staticControls/beads/BoxGridView.as b/frameworks/as/projects/FlexJSJX/src/org/apache/flex/html/staticControls/beads/BoxGridView.as deleted file mode 100644 index e716abb..0000000 --- a/frameworks/as/projects/FlexJSJX/src/org/apache/flex/html/staticControls/beads/BoxGridView.as +++ /dev/null @@ -1,48 +0,0 @@ -//////////////////////////////////////////////////////////////////////////////// -// -// Licensed to the Apache Software Foundation (ASF) under one or more -// contributor license agreements. See the NOTICE file distributed with -// this work for additional information regarding copyright ownership. -// The ASF licenses this file to You under the Apache License, Version 2.0 -// (the "License"); you may not use this file except in compliance with -// the License. You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. -// -//////////////////////////////////////////////////////////////////////////////// -package org.apache.flex.html.staticControls.beads -{ - import org.apache.flex.core.IBeadView; - import org.apache.flex.core.IStrand; - import org.apache.flex.core.UIBase; - import org.apache.flex.html.staticControls.Label; - - public class BoxGridView implements IBeadView - { - public function BoxGridView() - { - } - - private var label:Label; - - private var _strand:IStrand; - public function set strand(value:IStrand):void - { - _strand = value; - - label = new Label(); - label.text = "BoxGrid"; - label.x = 0; - label.y = 0; - label.width = 100; - label.height = 25; - UIBase(_strand).addElement(label); - } - } -} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/90f74513/frameworks/as/projects/FlexJSJX/src/org/apache/flex/html/staticControls/beads/DataGridColumnView.as ---------------------------------------------------------------------- diff --git a/frameworks/as/projects/FlexJSJX/src/org/apache/flex/html/staticControls/beads/DataGridColumnView.as b/frameworks/as/projects/FlexJSJX/src/org/apache/flex/html/staticControls/beads/DataGridColumnView.as index e666d80..ab67918 100644 --- a/frameworks/as/projects/FlexJSJX/src/org/apache/flex/html/staticControls/beads/DataGridColumnView.as +++ b/frameworks/as/projects/FlexJSJX/src/org/apache/flex/html/staticControls/beads/DataGridColumnView.as @@ -44,16 +44,19 @@ package org.apache.flex.html.staticControls.beads { } + private var _strand:IStrand; + /** * @private */ - private var _strand:IStrand; override public function set strand(value:IStrand):void { super.strand = value; _strand = value; } + private var _columnIndex:uint; + /** * The zero-based index for the column. * @@ -62,7 +65,6 @@ package org.apache.flex.html.staticControls.beads * @playerversion AIR 2.6 * @productversion FlexJS 0.0 */ - private var _columnIndex:uint; public function get columnIndex():uint { return _columnIndex; @@ -72,6 +74,8 @@ package org.apache.flex.html.staticControls.beads _columnIndex = value; } + private var _column:DataGridColumn; + /** * The DataGridColumn containing information used to present the List as * a column in the DataGrid. @@ -81,7 +85,6 @@ package org.apache.flex.html.staticControls.beads * @playerversion AIR 2.6 * @productversion FlexJS 0.0 */ - private var _column:DataGridColumn; public function get column():DataGridColumn { return _column; http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/90f74513/frameworks/as/projects/FlexJSJX/src/org/apache/flex/html/staticControls/beads/DataGridView.as ---------------------------------------------------------------------- diff --git a/frameworks/as/projects/FlexJSJX/src/org/apache/flex/html/staticControls/beads/DataGridView.as b/frameworks/as/projects/FlexJSJX/src/org/apache/flex/html/staticControls/beads/DataGridView.as index e2a959e..5956108 100644 --- a/frameworks/as/projects/FlexJSJX/src/org/apache/flex/html/staticControls/beads/DataGridView.as +++ b/frameworks/as/projects/FlexJSJX/src/org/apache/flex/html/staticControls/beads/DataGridView.as @@ -77,10 +77,11 @@ package org.apache.flex.html.staticControls.beads return columns; } + private var _strand:IStrand; + /** * @private */ - private var _strand:IStrand; public function set strand(value:IStrand):void { _strand = value; http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/90f74513/frameworks/as/projects/FlexJSJX/src/org/apache/flex/html/staticControls/beads/DataItemRendererFactoryForColumnData.as ---------------------------------------------------------------------- diff --git a/frameworks/as/projects/FlexJSJX/src/org/apache/flex/html/staticControls/beads/DataItemRendererFactoryForColumnData.as b/frameworks/as/projects/FlexJSJX/src/org/apache/flex/html/staticControls/beads/DataItemRendererFactoryForColumnData.as index 86f8bdf..a757aba 100644 --- a/frameworks/as/projects/FlexJSJX/src/org/apache/flex/html/staticControls/beads/DataItemRendererFactoryForColumnData.as +++ b/frameworks/as/projects/FlexJSJX/src/org/apache/flex/html/staticControls/beads/DataItemRendererFactoryForColumnData.as @@ -77,7 +77,7 @@ package org.apache.flex.html.staticControls.beads dataProviderChangeHandler(null); } - public var _itemRendererFactory:IItemRendererClassFactory; + private var _itemRendererFactory:IItemRendererClassFactory; /** * The factory used to create the itemRenderers. @@ -96,6 +96,14 @@ package org.apache.flex.html.staticControls.beads _itemRendererFactory = value; } + /** + * The dataGroup that is the pareent for the itemRenderers + * + * @langversion 3.0 + * @playerversion Flash 10.2 + * @playerversion AIR 2.6 + * @productversion FlexJS 0.0 + */ protected var dataGroup:IItemRendererParent; /** http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/90f74513/frameworks/as/projects/FlexJSJX/src/org/apache/flex/html/staticControls/beads/models/DataGridPresentationModel.as ---------------------------------------------------------------------- diff --git a/frameworks/as/projects/FlexJSJX/src/org/apache/flex/html/staticControls/beads/models/DataGridPresentationModel.as b/frameworks/as/projects/FlexJSJX/src/org/apache/flex/html/staticControls/beads/models/DataGridPresentationModel.as index 155e662..f93ce10 100644 --- a/frameworks/as/projects/FlexJSJX/src/org/apache/flex/html/staticControls/beads/models/DataGridPresentationModel.as +++ b/frameworks/as/projects/FlexJSJX/src/org/apache/flex/html/staticControls/beads/models/DataGridPresentationModel.as @@ -34,11 +34,21 @@ package org.apache.flex.html.staticControls.beads.models */ public class DataGridPresentationModel extends EventDispatcher implements IDataGridPresentationModel { + /** + * constructor. + * + * @langversion 3.0 + * @playerversion Flash 10.2 + * @playerversion AIR 2.6 + * @productversion FlexJS 0.0 + */ public function DataGridPresentationModel() { super(); } + private var _columnLabels:Array; + /** * The labels for each column. * @@ -47,7 +57,6 @@ package org.apache.flex.html.staticControls.beads.models * @playerversion AIR 2.6 * @productversion FlexJS 0.0 */ - private var _columnLabels:Array; public function get columnLabels():Array { return _columnLabels; @@ -60,6 +69,8 @@ package org.apache.flex.html.staticControls.beads.models } } + private var _rowHeight:Number = 30; + /** * The height of the rows (default is 30 pixels). * @@ -68,7 +79,6 @@ package org.apache.flex.html.staticControls.beads.models * @playerversion AIR 2.6 * @productversion FlexJS 0.0 */ - private var _rowHeight:Number = 30; public function get rowHeight():Number { return _rowHeight; @@ -81,10 +91,11 @@ package org.apache.flex.html.staticControls.beads.models } } + private var _strand:IStrand; + /** * @private */ - private var _strand:IStrand; public function set strand(value:IStrand):void { _strand = value; http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/90f74513/frameworks/as/projects/FlexJSJX/src/org/apache/flex/html/staticControls/supportClasses/DataGridColumn.as ---------------------------------------------------------------------- diff --git a/frameworks/as/projects/FlexJSJX/src/org/apache/flex/html/staticControls/supportClasses/DataGridColumn.as b/frameworks/as/projects/FlexJSJX/src/org/apache/flex/html/staticControls/supportClasses/DataGridColumn.as index 33b236c..deadeeb 100644 --- a/frameworks/as/projects/FlexJSJX/src/org/apache/flex/html/staticControls/supportClasses/DataGridColumn.as +++ b/frameworks/as/projects/FlexJSJX/src/org/apache/flex/html/staticControls/supportClasses/DataGridColumn.as @@ -45,6 +45,8 @@ package org.apache.flex.html.staticControls.supportClasses { } + private var _itemRenderer:IFactory; + /** * The itemRenderer class or factory to use to make instances of itemRenderers for * display of data. @@ -54,7 +56,6 @@ package org.apache.flex.html.staticControls.supportClasses * @playerversion AIR 2.6 * @productversion FlexJS 0.0 */ - private var _itemRenderer:IFactory; public function get itemRenderer():IFactory { return _itemRenderer; @@ -64,6 +65,8 @@ package org.apache.flex.html.staticControls.supportClasses _itemRenderer = value; } + private var _columnWidth:Number = 100; + /** * The width of the column (default is 100 pixels). * @@ -72,7 +75,6 @@ package org.apache.flex.html.staticControls.supportClasses * @playerversion AIR 2.6 * @productversion FlexJS 0.0 */ - private var _columnWidth:Number = 100; public function get columnWidth():Number { return _columnWidth; @@ -82,6 +84,8 @@ package org.apache.flex.html.staticControls.supportClasses _columnWidth = value; } + private var _label:String; + /** * The label for the column (appears in the header area). * @@ -90,7 +94,6 @@ package org.apache.flex.html.staticControls.supportClasses * @playerversion AIR 2.6 * @productversion FlexJS 0.0 */ - private var _label:String; public function get label():String { return _label; @@ -100,6 +103,8 @@ package org.apache.flex.html.staticControls.supportClasses _label = value; } + private var _dataField:String; + /** * The name of the field containing the data value presented by the column. This value is used * by the itemRenderer is select the property from the data. @@ -109,7 +114,6 @@ package org.apache.flex.html.staticControls.supportClasses * @playerversion AIR 2.6 * @productversion FlexJS 0.0 */ - private var _dataField:String; public function get dataField():String { return _dataField;
