Repository: flex-asjs Updated Branches: refs/heads/tlf fd677581b -> 9f2195694
Added some interface methods Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/9f219569 Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/9f219569 Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/9f219569 Branch: refs/heads/tlf Commit: 9f2195694c47c256e47416399664161bba082b1a Parents: fd67758 Author: Harbs <[email protected]> Authored: Thu Apr 20 07:00:47 2017 -0400 Committer: Harbs <[email protected]> Committed: Thu Apr 20 07:00:47 2017 -0400 ---------------------------------------------------------------------- .../flex/textLayout/compose/ITextFlowLine.as | 2 +- .../conversion/BaseTextLayoutImporter.as | 3 +- .../flex/textLayout/elements/IFlowElement.as | 2 + .../textLayout/elements/IParagraphElement.as | 1 + .../flex/textLayout/elements/ITableElement.as | 90 +++++++++++++++----- 5 files changed, 75 insertions(+), 23 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/9f219569/frameworks/projects/TLF/src/main/flex/org/apache/flex/textLayout/compose/ITextFlowLine.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/TLF/src/main/flex/org/apache/flex/textLayout/compose/ITextFlowLine.as b/frameworks/projects/TLF/src/main/flex/org/apache/flex/textLayout/compose/ITextFlowLine.as index 6fe88e8..2ef9404 100644 --- a/frameworks/projects/TLF/src/main/flex/org/apache/flex/textLayout/compose/ITextFlowLine.as +++ b/frameworks/projects/TLF/src/main/flex/org/apache/flex/textLayout/compose/ITextFlowLine.as @@ -31,7 +31,7 @@ package org.apache.flex.textLayout.compose public interface ITextFlowLine extends IVerticalJustificationLine { - function get composable():Boolean; + function get composable():Boolean;//TextFlowTableBlocks are not composable function initialize(paragraph:IParagraphElement, outerTargetWidth:Number = 0, lineOffset:Number = 0, absoluteStart:int = 0, numChars:int = 0, textLine:ITextLine = null):void; function get heightTW():int; function get outerTargetWidthTW():int; http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/9f219569/frameworks/projects/TLF/src/main/flex/org/apache/flex/textLayout/conversion/BaseTextLayoutImporter.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/TLF/src/main/flex/org/apache/flex/textLayout/conversion/BaseTextLayoutImporter.as b/frameworks/projects/TLF/src/main/flex/org/apache/flex/textLayout/conversion/BaseTextLayoutImporter.as index 55a3a9b..ee5423c 100644 --- a/frameworks/projects/TLF/src/main/flex/org/apache/flex/textLayout/conversion/BaseTextLayoutImporter.as +++ b/frameworks/projects/TLF/src/main/flex/org/apache/flex/textLayout/conversion/BaseTextLayoutImporter.as @@ -92,7 +92,8 @@ package org.apache.flex.textLayout.conversion } catch (e:Error) { - reportError(e.toString()); +//TODO for some reason toString() is causing a compiler error + // reportError(e.toString()); } PropertyUtil.errorHandler = savedErrorHandler; return rslt; http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/9f219569/frameworks/projects/TLF/src/main/flex/org/apache/flex/textLayout/elements/IFlowElement.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/TLF/src/main/flex/org/apache/flex/textLayout/elements/IFlowElement.as b/frameworks/projects/TLF/src/main/flex/org/apache/flex/textLayout/elements/IFlowElement.as index 6a5e88f..48f465a 100644 --- a/frameworks/projects/TLF/src/main/flex/org/apache/flex/textLayout/elements/IFlowElement.as +++ b/frameworks/projects/TLF/src/main/flex/org/apache/flex/textLayout/elements/IFlowElement.as @@ -105,5 +105,7 @@ package org.apache.flex.textLayout.elements function getEventMirror():IEventDispatcher; function set listMarkerFormat(listMarkerFormat:*):void; function calculateComputedFormat():ITextLayoutFormat; + function set fontSize(value:*):void; + function set columnWidth(columnWidthValue:*):void; } } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/9f219569/frameworks/projects/TLF/src/main/flex/org/apache/flex/textLayout/elements/IParagraphElement.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/TLF/src/main/flex/org/apache/flex/textLayout/elements/IParagraphElement.as b/frameworks/projects/TLF/src/main/flex/org/apache/flex/textLayout/elements/IParagraphElement.as index 98a9e1b..4de8643 100644 --- a/frameworks/projects/TLF/src/main/flex/org/apache/flex/textLayout/elements/IParagraphElement.as +++ b/frameworks/projects/TLF/src/main/flex/org/apache/flex/textLayout/elements/IParagraphElement.as @@ -23,6 +23,7 @@ package org.apache.flex.textLayout.elements public interface IParagraphElement extends IFlowGroupElement { function getTextBlock():ITextBlock; + function getPreviousParagraph():IParagraphElement; function getNextParagraph():IParagraphElement; function getEffectiveDominantBaseline():String; function decInteractiveChildrenCount():void; http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/9f219569/frameworks/projects/TLF/src/main/flex/org/apache/flex/textLayout/elements/ITableElement.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/TLF/src/main/flex/org/apache/flex/textLayout/elements/ITableElement.as b/frameworks/projects/TLF/src/main/flex/org/apache/flex/textLayout/elements/ITableElement.as index a5fe513..10d8649 100644 --- a/frameworks/projects/TLF/src/main/flex/org/apache/flex/textLayout/elements/ITableElement.as +++ b/frameworks/projects/TLF/src/main/flex/org/apache/flex/textLayout/elements/ITableElement.as @@ -19,33 +19,81 @@ package org.apache.flex.textLayout.elements { import org.apache.flex.textLayout.compose.ITextFlowTableBlock; + import org.apache.flex.textLayout.formats.ITextLayoutFormat; public interface ITableElement extends ITableFormattedElement { - function getRowAt(rIdx:int):ITableRowElement; - function addCellToBlock(cell:ITableCellElement, curTableBlock:ITextFlowTableBlock):void; - function composeCells():void; - function getColumnAt(colIndex:int):ITableColElement; - function getNextRow():Vector.<ITableCellElement>; - function getFirstBlock():ITextFlowTableBlock; - function normalizeColumnWidths(width:Number = 600):void; - function getCellsForColumn(column:ITableColElement):Vector.<ITableCellElement>; - function getNextCell(tableCellElement:ITableCellElement):ITableCellElement; - function getPreviousCell(tableCellElement:ITableCellElement):ITableCellElement; - function get hasCellDamage():Boolean; - function set hasCellDamage(hasCellDamage:Boolean):void; - function getTableBlocksInRange(anchorCoords:CellCoordinates, activeCoords:CellCoordinates):Vector.<ITextFlowTableBlock>; function get numRows():int; function get numColumns():int; - function get width():Number; - function getCellsInRange(anchorCoords:CellCoordinates, activeCoords:CellCoordinates, block:ITextFlowTableBlock = null):Vector.<ITableCellElement>; - function findCell(coords:CellCoordinates):ITableCellElement; - function getCellAt(rowIndex:int, colIndex:int):ITableCellElement; + function get numCells():int; + function set numRows(value:int):void; + function set numColumns(value:int):void; + function get defaultRowFormat():ITextLayoutFormat; + function set defaultRowFormat(value:ITextLayoutFormat):void; + function get defaultColumnFormat():ITextLayoutFormat; + function set defaultColumnFormat(value:ITextLayoutFormat):void; + function addRow(format:ITextLayoutFormat=null):void; + function addRowAt(idx:int, format:ITextLayoutFormat=null):void; + function addColumn(format:ITextLayoutFormat=null):void; + function addColumnAt(idx:int, format:ITextLayoutFormat=null):void; + function getColumnAt(columnIndex:int):ITableColElement; + function getRowAt(rowIndex:int):ITableRowElement; + function getRowIndex(row:ITableRowElement):int; + function getCellsForRow(row:ITableRowElement):Vector.<ITableCellElement>; function getCellsForRowArray(row:ITableRowElement):Array; - function getCellsForRowAtArray(index:int):Array; function getCellsForRowAt(index:int):Vector.<ITableCellElement>; - function getCellsForRow(row:ITableRowElement):Vector.<ITableCellElement>; - function set numColumns(numColumns:int):void; + function getCellsForRowAtArray(index:int):Array; + function getCellsForColumn(column:ITableColElement):Vector.<ITableCellElement>; + function getCellsForColumnAt(index:int):Vector.<ITableCellElement>; + function hasMergedCells():Boolean; + function insertColumn(column:TableColElement=null,cells:Array = null):Boolean; + function insertColumnAt(idx:int,column:TableColElement=null,cells:Array = null):Boolean; function insertRow(row:ITableRowElement=null,cells:Array = null):Boolean; - + function insertRowAt(idx:int,row:ITableRowElement=null,cells:Array = null):Boolean; + function removeRow(row:ITableRowElement):ITableRowElement; + function removeRowWithContent(row:ITableRowElement):Array; + function removeRowAt(idx:int):ITableRowElement; + function removeRowWithContentAt(idx:int):Array; + function removeAllRowsWithContent():void; + function removeAllRows():void; + function removeColumn(column:ITableColElement):ITableColElement; + function removeColumnWithContent(column:ITableColElement):Array; + function removeColumnAt(idx:int):ITableColElement; + function removeColumnWithContentAt(idx:int):Array; + function normalizeCells():void; + function setColumnWidth(columnIndex:int, value:*):Boolean; + function setRowHeight(rowIdx:int, value:*):Boolean; + function getColumnWidth(columnIndex:int):*; + function composeCells():void; + function getHeaderRows():Vector.< Vector.<ITableCellElement> >; + function getFooterRows():Vector.< Vector.<ITableCellElement> >; + function getBodyRows():Vector.< Vector.<ITableCellElement> >; + function getNextRow():Vector.<ITableCellElement>; + function getNextCell(tableCell:ITableCellElement):ITableCellElement; + function getPreviousCell(tableCell:ITableCellElement):ITableCellElement; + function getCellAt(rowIndex:int, columnIndex:int):ITableCellElement; + function getHeaderHeight():Number; + function getFooterHeight():Number; + function normalizeColumnWidths(suggestedWidth:Number = 600):void; + function getCells():Vector.<ITableCellElement>; + function getCellsArray():Array; + function get width():Number; + function set width(value:Number):void; + function get hasCellDamage():Boolean; + function set hasCellDamage(value:Boolean):void; + function get headerRowCount():uint; + function set headerRowCount(value:uint):void; + function get footerRowCount():uint; + function set footerRowCount(value:uint):void; + function getFirstBlock():ITextFlowTableBlock; + function getNextBlock():ITextFlowTableBlock; + function getCellsInRange(anchorCoords:CellCoordinates, activeCoords:CellCoordinates, block:ITextFlowTableBlock=null):Vector.<ITableCellElement>; + function findCell(coords:CellCoordinates):ITableCellElement; + function addCellToBlock(cell:ITableCellElement, block:ITextFlowTableBlock):void; + function getCellBlock(cell:ITableCellElement):ITextFlowTableBlock; + function get tableBlocks():Vector.<ITextFlowTableBlock>; + function getTableBlocksInRange(start:CellCoordinates,end:CellCoordinates):Vector.<ITextFlowTableBlock>; + function createRowElement(index:int, defaultRowFormat:ITextLayoutFormat):ITableRowElement; + function createColumnElement(index:int, defaultColumnFormat:ITextLayoutFormat):TableColElement; + } } \ No newline at end of file
