Repository: flex-sdk Updated Branches: refs/heads/develop 7720f4304 -> 5eaa1d00e
FLEX-33058 Minor refactoring while reading the code: -removing unused variables -improving comments and asdocs -terminating statements Project: http://git-wip-us.apache.org/repos/asf/flex-sdk/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-sdk/commit/7780535f Tree: http://git-wip-us.apache.org/repos/asf/flex-sdk/tree/7780535f Diff: http://git-wip-us.apache.org/repos/asf/flex-sdk/diff/7780535f Branch: refs/heads/develop Commit: 7780535f0a3e53d4a0cb0aeb1f1601681729414f Parents: 7720f43 Author: Mihai Chira <[email protected]> Authored: Mon Feb 15 14:10:04 2016 +0100 Committer: Mihai Chira <[email protected]> Committed: Mon Feb 15 14:10:04 2016 +0100 ---------------------------------------------------------------------- .../src/mx/controls/AdvancedDataGridBaseEx.as | 24 ++++++++------------ .../AdvancedDataGridBase.as | 22 ++++-------------- .../mx/controls/listClasses/AdvancedListBase.as | 9 ++------ 3 files changed, 16 insertions(+), 39 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/7780535f/frameworks/projects/advancedgrids/src/mx/controls/AdvancedDataGridBaseEx.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/advancedgrids/src/mx/controls/AdvancedDataGridBaseEx.as b/frameworks/projects/advancedgrids/src/mx/controls/AdvancedDataGridBaseEx.as index b0a1f67..f0e6efb 100644 --- a/frameworks/projects/advancedgrids/src/mx/controls/AdvancedDataGridBaseEx.as +++ b/frameworks/projects/advancedgrids/src/mx/controls/AdvancedDataGridBaseEx.as @@ -2866,7 +2866,7 @@ public class AdvancedDataGridBaseEx extends AdvancedDataGridBase implements IIME var n:int = headerInfos ? headerInfos.length : 0; var i:int; - var k:int= 0;; + var k:int= 0; for ( i = 0; i < n; i++) { @@ -2902,18 +2902,17 @@ public class AdvancedDataGridBaseEx extends AdvancedDataGridBase implements IIME /** * @private * - * Note columns may not of been committed at this point. + * Note columns may not have been committed at this point. */ protected function initializeHeaderInfo(columns:Array):Array { - var newArray:Array = []; + var result:Array = []; var n:int = columns.length; for(var i:int = 0; i < n; i++) { - var headerInfo:AdvancedDataGridHeaderInfo = new AdvancedDataGridHeaderInfo(columns[i],null,i, 0) ; - newArray.push(headerInfo); + result.push(new AdvancedDataGridHeaderInfo(columns[i], null, i, 0)); } - return newArray; + return result; } /** @@ -5015,8 +5014,6 @@ public class AdvancedDataGridBaseEx extends AdvancedDataGridBase implements IIME actualRowIndex = rowIndex; } - var bm:EdgeMetrics = borderMetrics; - var len:uint = /*(headerItems && headerItems[0]) ? headerItems[0].length :*/ visibleColumns.length; var lastColIndex:int = horizontalScrollPosition + len - 1; @@ -5072,7 +5069,7 @@ public class AdvancedDataGridBaseEx extends AdvancedDataGridBase implements IIME { var evt:ListEvent = new ListEvent(ListEvent.CHANGE); evt.columnIndex = coord.columnIndex; - evt.rowIndex = coord.rowIndex;; + evt.rowIndex = coord.rowIndex; evt.itemRenderer = item; dispatchEvent(evt); } @@ -6891,13 +6888,13 @@ public class AdvancedDataGridBaseEx extends AdvancedDataGridBase implements IIME */ override protected function collectionChangeHandler(event:Event):void { - //if the iterator is null that indicates we havent been validated yet so we'll bail. + //if the iterator is null that indicates we haven't been validated yet so we'll bail. if (iterator == null) return; if (event is CollectionEvent) { - var ceEvent:CollectionEvent = CollectionEvent(event) + var ceEvent:CollectionEvent = CollectionEvent(event); if (ceEvent.kind == CollectionEventKind.mx_internal::EXPAND) { //we ignore expand in list/tree @@ -6908,7 +6905,7 @@ public class AdvancedDataGridBaseEx extends AdvancedDataGridBase implements IIME //this prevents listbase from invalidating the displaylist too early. event.stopPropagation(); //we only want to update the displaylist if an updated item was visible - //but dont have a sufficient test for that yet + //but don't have a sufficient test for that yet itemsSizeChanged = true; invalidateDisplayList(); } @@ -7291,7 +7288,6 @@ public class AdvancedDataGridBaseEx extends AdvancedDataGridBase implements IIME var advancedDataGridEvent:AdvancedDataGridEvent; var r:IListItemRenderer; - var s:Sprite; var n:int; var i:int; var pos:Point; @@ -8145,8 +8141,6 @@ public class AdvancedDataGridBaseEx extends AdvancedDataGridBase implements IIME { var columnName:String = event.dataField; var columnNumber:int = event.columnIndex; - var sortFields:Array; - var sort:ISort; if (!sortableColumns || !_columns[columnNumber].sortable) return; http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/7780535f/frameworks/projects/advancedgrids/src/mx/controls/advancedDataGridClasses/AdvancedDataGridBase.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/advancedgrids/src/mx/controls/advancedDataGridClasses/AdvancedDataGridBase.as b/frameworks/projects/advancedgrids/src/mx/controls/advancedDataGridClasses/AdvancedDataGridBase.as index 4a1b6d2..b662967 100644 --- a/frameworks/projects/advancedgrids/src/mx/controls/advancedDataGridClasses/AdvancedDataGridBase.as +++ b/frameworks/projects/advancedgrids/src/mx/controls/advancedDataGridClasses/AdvancedDataGridBase.as @@ -1351,15 +1351,9 @@ public class AdvancedDataGridBase extends AdvancedListBase implements IFontConte * @return The newly selected item or <code>null</code> if the selection * has not changed. */ - override protected function moveSelectionVertically( - code:uint, shiftKey:Boolean, - ctrlKey:Boolean):void + override protected function moveSelectionVertically(code:uint, shiftKey:Boolean, ctrlKey:Boolean):void { var newVerticalScrollPosition:Number; - var listItem:IListItemRenderer; - var uid:String; - var len:int; - showCaret = true; var rowCount:int = listItems.length; @@ -1825,18 +1819,15 @@ public class AdvancedDataGridBase extends AdvancedListBase implements IFontConte /** * @private */ - private function createRow(left:Number,top:Number,right:Number,bottom:Number,more:Boolean):void + private function createRow(left:Number, top:Number, right:Number, bottom:Number, more:Boolean):void { var xx:Number; - var ww:Number; var hh:Number; var i:int; var n:int; - var c:AdvancedDataGridColumn; var item:IListItemRenderer; - var rowData:AdvancedDataGridListData; var extraItem:IListItemRenderer; var bSelected:Boolean = false; @@ -1877,7 +1868,7 @@ public class AdvancedDataGridBase extends AdvancedListBase implements IFontConte } else { - // if we've run out of data, we dont make renderers + // if we've run out of data, we don't make renderers // and we inherit the previous row's height or rowHeight // if it is the first row. hh = currentRowNum > 1 ? rowInfo[currentRowNum - 1].height : rowHeight; @@ -1965,9 +1956,8 @@ public class AdvancedDataGridBase extends AdvancedListBase implements IFontConte } catch (e:ItemPendingError) { - lastSeekPending = new ListBaseSeekPending(CursorBookmark.CURRENT, 0) - e.addResponder(new ItemResponder(seekPendingResultHandler, seekPendingFailureHandler, - lastSeekPending)); + lastSeekPending = new ListBaseSeekPending(CursorBookmark.CURRENT, 0); + e.addResponder(new ItemResponder(seekPendingResultHandler, seekPendingFailureHandler, lastSeekPending)); more = false; iteratorValid = false; } @@ -2059,8 +2049,6 @@ public class AdvancedDataGridBase extends AdvancedListBase implements IFontConte * * @param c The column of the control. * - * @param The header item renderer. - * * @return The header item renderer. * * http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/7780535f/frameworks/projects/advancedgrids/src/mx/controls/listClasses/AdvancedListBase.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/advancedgrids/src/mx/controls/listClasses/AdvancedListBase.as b/frameworks/projects/advancedgrids/src/mx/controls/listClasses/AdvancedListBase.as index d3e150f..8482454 100644 --- a/frameworks/projects/advancedgrids/src/mx/controls/listClasses/AdvancedListBase.as +++ b/frameworks/projects/advancedgrids/src/mx/controls/listClasses/AdvancedListBase.as @@ -3986,12 +3986,7 @@ public class AdvancedListBase extends ScrollControlBase private function makeRowsAndColumnsWithExtraRows(unscaledWidth:Number,unscaledHeight:Number):void { - var lastPrefixRow:ListRowInfo; - var lastOnscreenRow:ListRowInfo; - var lastOffscreenRow:ListRowInfo; - var onscreenRowIndex:int; var pt:Point; - var desiredExtraRowsTop:int = offscreenExtraRows / 2; var desiredExtraRowsBottom:int = offscreenExtraRows / 2; @@ -5058,7 +5053,7 @@ public class AdvancedListBase extends ScrollControlBase clearIndicators(); - visibleData = {} + visibleData = {}; makeRowsAndColumns(0, 0, listContent.width, listContent.height, 0, 0); @@ -6001,7 +5996,7 @@ public class AdvancedListBase extends ScrollControlBase } index = indices[0]; - indices.shift() + indices.shift(); var data:Object = collectionIterator.current; if (firstTime)
