Small changes required to get asdoc build to complete without errors. Removed unused class and interface.
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/c4848e67 Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/c4848e67 Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/c4848e67 Branch: refs/heads/master Commit: c4848e67de68d1cf1c53de3733f89cc3c8cc6b7a Parents: ae3e647 Author: Peter Ent <[email protected]> Authored: Wed Sep 30 16:13:30 2015 -0400 Committer: Peter Ent <[email protected]> Committed: Wed Sep 30 16:13:30 2015 -0400 ---------------------------------------------------------------------- .../org/apache/flex/charts/beads/ChartView.as | 1 - frameworks/projects/Flat/flat-manifest.xml | 1 - .../apache/flex/core/IScrollingLayoutParent.as | 71 ----- .../org/apache/flex/html/beads/ButtonBarView.as | 4 +- .../org/apache/flex/html/beads/ContainerView.as | 1 - .../src/org/apache/flex/html/beads/ListView.as | 4 +- .../flex/html/beads/ListViewNoSelectionState.as | 270 ------------------- frameworks/projects/HTML/basic-manifest.xml | 1 - 8 files changed, 2 insertions(+), 351 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/c4848e67/frameworks/projects/Charts/asjs/src/org/apache/flex/charts/beads/ChartView.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/Charts/asjs/src/org/apache/flex/charts/beads/ChartView.as b/frameworks/projects/Charts/asjs/src/org/apache/flex/charts/beads/ChartView.as index 6f5c446..393f3b0 100644 --- a/frameworks/projects/Charts/asjs/src/org/apache/flex/charts/beads/ChartView.as +++ b/frameworks/projects/Charts/asjs/src/org/apache/flex/charts/beads/ChartView.as @@ -46,7 +46,6 @@ package org.apache.flex.charts.beads super(); } - private var _strand:IStrand; private var _horizontalAxisGroup:IAxisGroup; private var _verticalAxisGroup:IAxisGroup; http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/c4848e67/frameworks/projects/Flat/flat-manifest.xml ---------------------------------------------------------------------- diff --git a/frameworks/projects/Flat/flat-manifest.xml b/frameworks/projects/Flat/flat-manifest.xml index b289d9a..355a76a 100644 --- a/frameworks/projects/Flat/flat-manifest.xml +++ b/frameworks/projects/Flat/flat-manifest.xml @@ -54,7 +54,6 @@ <component id="HorizontalLayout" class="org.apache.flex.html.beads.layouts.HorizontalLayout" lookupOnly="true" /> <component id="TileLayout" class="org.apache.flex.html.beads.layouts.TileLayout" lookupOnly="true" /> <component id="ListView" class="org.apache.flex.html.beads.ListView" lookupOnly="true" /> - <!--component id="ListViewNoSelectionState" class="org.apache.flex.html.beads.ListViewNoSelectionState" lookupOnly="true" /--> <component id="MultilineTextFieldView" class="org.apache.flex.html.beads.MultilineTextFieldView" lookupOnly="true" /> <component id="SimpleAlert" class="org.apache.flex.html.SimpleAlert" lookupOnly="true" /> http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/c4848e67/frameworks/projects/HTML/as/src/org/apache/flex/core/IScrollingLayoutParent.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/HTML/as/src/org/apache/flex/core/IScrollingLayoutParent.as b/frameworks/projects/HTML/as/src/org/apache/flex/core/IScrollingLayoutParent.as deleted file mode 100644 index ed89265..0000000 --- a/frameworks/projects/HTML/as/src/org/apache/flex/core/IScrollingLayoutParent.as +++ /dev/null @@ -1,71 +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.core -{ - import flash.display.DisplayObject; - import flash.display.DisplayObjectContainer; - - import org.apache.flex.html.supportClasses.Border; - import org.apache.flex.html.supportClasses.ScrollBar; - - /** - * The IScrollingLayoutParent interface is an ILayoutParent - * that has traditional scrollbars. The layout implementation - * often needs to know certain things about other objects in - * the component. - * - * @langversion 3.0 - * @playerversion Flash 10.2 - * @playerversion AIR 2.6 - * @productversion FlexJS 0.0 - */ - public interface IScrollingLayoutParent extends ILayoutParent - { - /** - * The border. - * - * @langversion 3.0 - * @playerversion Flash 10.2 - * @playerversion AIR 2.6 - * @productversion FlexJS 0.0 - */ - function get border():Border; - - /** - * The vertical ScrollBar. - * - * @langversion 3.0 - * @playerversion Flash 10.2 - * @playerversion AIR 2.6 - * @productversion FlexJS 0.0 - */ - function get vScrollBar():ScrollBar; - - /** - * The horizontal ScrollBar. - * - * @langversion 3.0 - * @playerversion Flash 10.2 - * @playerversion AIR 2.6 - * @productversion FlexJS 0.0 - */ - function get hScrollBar():ScrollBar; - - } -} http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/c4848e67/frameworks/projects/HTML/as/src/org/apache/flex/html/beads/ButtonBarView.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/HTML/as/src/org/apache/flex/html/beads/ButtonBarView.as b/frameworks/projects/HTML/as/src/org/apache/flex/html/beads/ButtonBarView.as index 7add594..e51040c 100644 --- a/frameworks/projects/HTML/as/src/org/apache/flex/html/beads/ButtonBarView.as +++ b/frameworks/projects/HTML/as/src/org/apache/flex/html/beads/ButtonBarView.as @@ -54,9 +54,7 @@ package org.apache.flex.html.beads { super(); } - - private var _strand:IStrand; - + /** * @copy org.apache.flex.core.IBead#strand * http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/c4848e67/frameworks/projects/HTML/as/src/org/apache/flex/html/beads/ContainerView.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/HTML/as/src/org/apache/flex/html/beads/ContainerView.as b/frameworks/projects/HTML/as/src/org/apache/flex/html/beads/ContainerView.as index 69f0a05..96f182b 100644 --- a/frameworks/projects/HTML/as/src/org/apache/flex/html/beads/ContainerView.as +++ b/frameworks/projects/HTML/as/src/org/apache/flex/html/beads/ContainerView.as @@ -140,7 +140,6 @@ package org.apache.flex.html.beads private var _viewportModel:IViewportModel; private var _viewport:IViewport; - private var _strand:IStrand; private var layoutRunning:Boolean; /** http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/c4848e67/frameworks/projects/HTML/as/src/org/apache/flex/html/beads/ListView.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/HTML/as/src/org/apache/flex/html/beads/ListView.as b/frameworks/projects/HTML/as/src/org/apache/flex/html/beads/ListView.as index 9deec3e..a9192f4 100644 --- a/frameworks/projects/HTML/as/src/org/apache/flex/html/beads/ListView.as +++ b/frameworks/projects/HTML/as/src/org/apache/flex/html/beads/ListView.as @@ -106,9 +106,7 @@ package org.apache.flex.html.beads { return _strand as IUIBase; } - - private var _strand:IStrand; - + /** * @copy org.apache.flex.core.IBead#strand * http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/c4848e67/frameworks/projects/HTML/as/src/org/apache/flex/html/beads/ListViewNoSelectionState.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/HTML/as/src/org/apache/flex/html/beads/ListViewNoSelectionState.as b/frameworks/projects/HTML/as/src/org/apache/flex/html/beads/ListViewNoSelectionState.as deleted file mode 100644 index 4e93375..0000000 --- a/frameworks/projects/HTML/as/src/org/apache/flex/html/beads/ListViewNoSelectionState.as +++ /dev/null @@ -1,270 +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.beads -{ - import org.apache.flex.core.BeadViewBase; - import org.apache.flex.core.IBead; - import org.apache.flex.core.IBeadLayout; - import org.apache.flex.core.IBeadModel; - import org.apache.flex.core.IBeadView; - import org.apache.flex.core.ISelectableItemRenderer; - import org.apache.flex.core.IItemRendererParent; - import org.apache.flex.core.IScrollingLayoutParent; - import org.apache.flex.core.IParent; - import org.apache.flex.core.IParentIUIBase; - import org.apache.flex.core.IRollOverModel; - import org.apache.flex.core.ISelectionModel; - import org.apache.flex.core.IStrand; - import org.apache.flex.core.IUIBase; - import org.apache.flex.core.Strand; - import org.apache.flex.core.UIBase; - import org.apache.flex.core.ValuesManager; - import org.apache.flex.events.Event; - import org.apache.flex.events.IEventDispatcher; - import org.apache.flex.html.beads.models.ArraySelectionModel; - import org.apache.flex.html.beads.models.ScrollBarModel; - import org.apache.flex.html.beads.models.SingleLineBorderModel; - import org.apache.flex.html.supportClasses.Border; - import org.apache.flex.html.supportClasses.DataGroup; - import org.apache.flex.html.supportClasses.ScrollBar; - - /** - * The ListViewNoSelectionState class is a version of ListView that - * does not set states on the renderers to show selection. Thus - * the renderers can be simpler and not implemetn ISelectableItemRenderer - * - * @langversion 3.0 - * @playerversion Flash 10.2 - * @playerversion AIR 2.6 - * @productversion FlexJS 0.0 - */ - public class ListViewNoSelectionState extends Strand implements IBeadView, IStrand, IListView, IScrollingLayoutParent - { - public function ListViewNoSelectionState() - { - } - - private var listModel:ISelectionModel; - - private var _border:Border; - - /** - * The border surrounding the org.apache.flex.html.List. - * - * @langversion 3.0 - * @playerversion Flash 10.2 - * @playerversion AIR 2.6 - * @productversion FlexJS 0.0 - */ - public function get border():Border - { - return _border; - } - - private var _dataGroup:IItemRendererParent; - - /** - * The area holding the itemRenderers. - * - * @langversion 3.0 - * @playerversion Flash 10.2 - * @playerversion AIR 2.6 - * @productversion FlexJS 0.0 - */ - public function get dataGroup():IItemRendererParent - { - return _dataGroup; - } - public function set dataGroup(value:IItemRendererParent):void - { - _dataGroup = value; - } - - private var _vScrollBar:ScrollBar; - - /** - * The vertical org.apache.flex.html.ScrollBar, if needed. - * - * @langversion 3.0 - * @playerversion Flash 10.2 - * @playerversion AIR 2.6 - * @productversion FlexJS 0.0 - */ - public function get vScrollBar():ScrollBar - { - if (!_vScrollBar) - _vScrollBar = createScrollBar(); - return _vScrollBar; - } - - /** - * The horizontal org.apache.flex.html.ScrollBar, currently null. - * - * @langversion 3.0 - * @playerversion Flash 10.2 - * @playerversion AIR 2.6 - * @productversion FlexJS 0.0 - */ - public function get hScrollBar():ScrollBar - { - return null; - } - - /** - * The contentArea includes the dataGroup and scrollBars. - * - * @langversion 3.0 - * @playerversion Flash 10.2 - * @playerversion AIR 2.6 - * @productversion FlexJS 0.0 - */ - public function get contentView():IParentIUIBase - { - return _dataGroup as IParentIUIBase; - } - - /** - * @private - */ - public function get resizableView():IUIBase - { - return _strand as IUIBase; - } - - /** - * @private - */ - public function get host():IUIBase - { - return _strand as IUIBase; - } - - private var _strand:IStrand; - - /** - * @copy org.apache.flex.core.IBead#strand - * - * @langversion 3.0 - * @playerversion Flash 10.2 - * @playerversion AIR 2.6 - * @productversion FlexJS 0.0 - */ - public function set strand(value:IStrand):void - { - _strand = value; - - for each (var bead:IBead in beads) - addBead(bead); - - dispatchEvent(new org.apache.flex.events.Event("beadsAdded")); - IEventDispatcher(_strand).addEventListener("widthChanged", handleSizeChange); - IEventDispatcher(_strand).addEventListener("heightChanged",handleSizeChange); - - listModel = value.getBeadByType(ISelectionModel) as ISelectionModel; - listModel.addEventListener("dataProviderChanged", dataProviderChangeHandler); - - _border = new Border(); - _border.model = new (ValuesManager.valuesImpl.getValue(value, "iBorderModel")) as IBeadModel; - _border.addBead(new (ValuesManager.valuesImpl.getValue(value, "iBorderBead")) as IBead); - IParent(_strand).addElement(_border); - - if (_dataGroup == null) { - _dataGroup = new (ValuesManager.valuesImpl.getValue(value, "iDataGroup")) as IItemRendererParent; - } - IParent(_strand).addElement(_dataGroup); - - if (_strand.getBeadByType(IBeadLayout) == null) - { - var mapper:IBeadLayout = new (ValuesManager.valuesImpl.getValue(_strand, "iBeadLayout")) as IBeadLayout; - _strand.addBead(mapper); - } - - handleSizeChange(null); - } - - /** - * @private - */ - protected function dataProviderChangeHandler(event:Event):void - { - // override if needed - } - - - /** - * @private - */ - private function createScrollBar():ScrollBar - { - var vsb:ScrollBar; - vsb = new ScrollBar(); - var vsbm:ScrollBarModel = new ScrollBarModel(); - vsbm.maximum = 100; - vsbm.minimum = 0; - vsbm.pageSize = 10; - vsbm.pageStepSize = 10; - vsbm.snapInterval = 1; - vsbm.stepSize = 1; - vsbm.value = 0; - vsb.model = vsbm; - vsb.width = 16; - IParent(_strand).addElement(vsb); - return vsb; - } - - /** - * @private - */ - private function handleSizeChange(event:Event):void - { - UIBase(_dataGroup).x = 0; - UIBase(_dataGroup).y = 0; - UIBase(_dataGroup).width = UIBase(_strand).width; - UIBase(_dataGroup).height = UIBase(_strand).height; - } - - /** - * @copy org.apache.flex.core.IBeadView#viewHeight - * - * @langversion 3.0 - * @playerversion Flash 10.2 - * @playerversion AIR 2.6 - * @productversion FlexJS 0.0 - */ - public function get viewHeight():Number - { - // don't want to put $height in an interface - return _strand["$height"]; - } - - /** - * @copy org.apache.flex.core.IBeadView#viewWidth - * - * @langversion 3.0 - * @playerversion Flash 10.2 - * @playerversion AIR 2.6 - * @productversion FlexJS 0.0 - */ - public function get viewWidth():Number - { - // don't want to put $width in an interface - return _strand["$width"]; - } - } -} http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/c4848e67/frameworks/projects/HTML/basic-manifest.xml ---------------------------------------------------------------------- diff --git a/frameworks/projects/HTML/basic-manifest.xml b/frameworks/projects/HTML/basic-manifest.xml index b2f6a19..5ddd403 100644 --- a/frameworks/projects/HTML/basic-manifest.xml +++ b/frameworks/projects/HTML/basic-manifest.xml @@ -54,7 +54,6 @@ <component id="HorizontalLayout" class="org.apache.flex.html.beads.layouts.HorizontalLayout"/> <component id="TileLayout" class="org.apache.flex.html.beads.layouts.TileLayout"/> <component id="ListView" class="org.apache.flex.html.beads.ListView"/> - <!-- component id="ListViewNoSelectionState" class="org.apache.flex.html.beads.ListViewNoSelectionState"/ --> <component id="MultilineTextFieldView" class="org.apache.flex.html.beads.MultilineTextFieldView"/> <component id="SimpleAlert" class="org.apache.flex.html.SimpleAlert"/>
