You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flex.apache.org by ha...@apache.org on 2017/03/16 16:23:44 UTC
[3/6] git commit: [flex-asjs] [refs/heads/tlf] - Cleaned up imports
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/19b26fe5/frameworks/projects/TLF/src/main/flex/org/apache/flex/textLayout/elements/BreakElement.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/TLF/src/main/flex/org/apache/flex/textLayout/elements/BreakElement.as b/frameworks/projects/TLF/src/main/flex/org/apache/flex/textLayout/elements/BreakElement.as
index cce9d03..ae9825b 100644
--- a/frameworks/projects/TLF/src/main/flex/org/apache/flex/textLayout/elements/BreakElement.as
+++ b/frameworks/projects/TLF/src/main/flex/org/apache/flex/textLayout/elements/BreakElement.as
@@ -1,21 +1,21 @@
-// //////////////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////////////
//
-// 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
+// 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
+// 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.
+// 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.textLayout.elements {
/**
* The BreakElement class defines a line break, which provides for creating a line break in the text without
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/19b26fe5/frameworks/projects/TLF/src/main/flex/org/apache/flex/textLayout/elements/FlowElement.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/TLF/src/main/flex/org/apache/flex/textLayout/elements/FlowElement.as b/frameworks/projects/TLF/src/main/flex/org/apache/flex/textLayout/elements/FlowElement.as
index 5bafe7e..0eae11f 100644
--- a/frameworks/projects/TLF/src/main/flex/org/apache/flex/textLayout/elements/FlowElement.as
+++ b/frameworks/projects/TLF/src/main/flex/org/apache/flex/textLayout/elements/FlowElement.as
@@ -1,21 +1,21 @@
-// //////////////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////////////
//
-// 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
+// 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
+// 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.
+// 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.textLayout.elements
{
import org.apache.flex.events.IEventDispatcher;
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/19b26fe5/frameworks/projects/TLF/src/main/flex/org/apache/flex/textLayout/elements/FlowGroupElement.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/TLF/src/main/flex/org/apache/flex/textLayout/elements/FlowGroupElement.as b/frameworks/projects/TLF/src/main/flex/org/apache/flex/textLayout/elements/FlowGroupElement.as
index 671876a..4dc126d 100644
--- a/frameworks/projects/TLF/src/main/flex/org/apache/flex/textLayout/elements/FlowGroupElement.as
+++ b/frameworks/projects/TLF/src/main/flex/org/apache/flex/textLayout/elements/FlowGroupElement.as
@@ -1,21 +1,21 @@
-// //////////////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////////////
//
-// 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
+// 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
+// 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.
+// 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.textLayout.elements
{
import org.apache.flex.text.engine.ContentElement;
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/19b26fe5/frameworks/projects/TLF/src/main/flex/org/apache/flex/textLayout/elements/FlowLeafElement.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/TLF/src/main/flex/org/apache/flex/textLayout/elements/FlowLeafElement.as b/frameworks/projects/TLF/src/main/flex/org/apache/flex/textLayout/elements/FlowLeafElement.as
index 891ee35..cee6fac 100644
--- a/frameworks/projects/TLF/src/main/flex/org/apache/flex/textLayout/elements/FlowLeafElement.as
+++ b/frameworks/projects/TLF/src/main/flex/org/apache/flex/textLayout/elements/FlowLeafElement.as
@@ -16,69 +16,48 @@
// limitations under the License.
//
////////////////////////////////////////////////////////////////////////////////
-package org.apache.flex.textLayout.elements {
- import org.apache.flex.textLayout.elements.utils.GeometricElementUtils;
- import org.apache.flex.graphics.PathBuilder;
- import org.apache.flex.graphics.SolidColorStroke;
- import org.apache.flex.graphics.SolidColor;
- import org.apache.flex.graphics.ICompoundGraphic;
+package org.apache.flex.textLayout.elements
+{
import org.apache.flex.events.IEventDispatcher;
import org.apache.flex.geom.Rectangle;
import org.apache.flex.text.engine.ContentElement;
import org.apache.flex.text.engine.ElementFormat;
- import org.apache.flex.text.engine.FontDescription;
import org.apache.flex.text.engine.FontMetrics;
import org.apache.flex.text.engine.ITextLine;
- import org.apache.flex.text.engine.TextBaseline;
import org.apache.flex.text.engine.TextElement;
- import org.apache.flex.text.engine.TextRotation;
- import org.apache.flex.text.engine.TypographicCase;
import org.apache.flex.textLayout.compose.ISWFContext;
import org.apache.flex.textLayout.debug.Debugging;
import org.apache.flex.textLayout.debug.assert;
+ import org.apache.flex.textLayout.elements.utils.GeometricElementUtils;
import org.apache.flex.textLayout.events.FlowElementEventDispatcher;
import org.apache.flex.textLayout.events.ModelChange;
- import org.apache.flex.textLayout.formats.BackgroundColor;
- import org.apache.flex.textLayout.formats.BaselineShift;
import org.apache.flex.textLayout.formats.BlockProgression;
- import org.apache.flex.textLayout.formats.ColorName;
- import org.apache.flex.textLayout.formats.FormatValue;
- import org.apache.flex.textLayout.formats.IMEStatus;
import org.apache.flex.textLayout.formats.ITextLayoutFormat;
- import org.apache.flex.textLayout.formats.TLFTypographicCase;
- import org.apache.flex.textLayout.formats.TextDecoration;
import org.apache.flex.textLayout.formats.TextLayoutFormat;
- import org.apache.flex.textLayout.utils.CharacterUtil;
- import org.apache.flex.textLayout.utils.LocaleUtil;
-
-
-
-
/** Base class for FlowElements that appear at the lowest level of the flow hierarchy. FlowLeafElement objects have
- * no children and include InlineGraphicElement objects and SpanElement objects.
- *
- * @playerversion Flash 10
- * @playerversion AIR 1.5
- * @langversion 3.0
- *
- * @see InlineGraphicElement
- * @see SpanElement
- */
- public class FlowLeafElement extends FlowElement implements IFlowLeafElement {
+ * no children and include InlineGraphicElement objects and SpanElement objects.
+ *
+ * @playerversion Flash 10
+ * @playerversion AIR 1.5
+ * @langversion 3.0
+ *
+ * @see InlineGraphicElement
+ * @see SpanElement
+ */
+ public class FlowLeafElement extends FlowElement implements IFlowLeafElement
+ {
/** Holds the content of the leaf @private */
protected var _blockElement:ContentElement;
-
/** @private
* Holds the text for the leaf element - unless there's a valid blockElement,
* in which case the text is in the rawText field of the blockElement.
*/
protected var _text:String; // holds the text property if the blockElement is null
private var _hasAttachedListeners:Boolean; // true if FTE eventMirror may be in use
-
/** @private The event dispatcher that acts as an event mirror */
public var _eventMirror:FlowElementEventDispatcher = null;
-
+
/**
* Base class - invoking new FlowLeafElement() throws an error exception.
*
@@ -92,48 +71,54 @@ package org.apache.flex.textLayout.elements {
_hasAttachedListeners = false;
super();
}
+
override public function get className():String
{
return "FlowLeafElement";
}
- //TODO this should not be here!
- public function set text(value:String):void{
- // do nothing
+ // TODO this should not be here!
+ public function set text(value:String):void
+ {
+ // do nothing
}
-
+
/** @private */
override public function createContentElement():void
{
- CONFIG::debug { assert(_blockElement != null, "_blockElement not allocated in derived class"); }
+ CONFIG::debug
+ {
+ assert(_blockElement != null, "_blockElement not allocated in derived class"); }
if (_computedFormat)
{
_blockElement.elementFormat = computeElementFormat();
- CONFIG::debug { Debugging.traceFTEAssign(_blockElement,"elementFormat",_blockElement.elementFormat); }
+ CONFIG::debug
+ {
+ Debugging.traceFTEAssign(_blockElement, "elementFormat", _blockElement.elementFormat); }
}
if (parent)
- parent.insertBlockElement(this,_blockElement);
+ parent.insertBlockElement(this, _blockElement);
}
+
/** @private */
override public function releaseContentElement():void
{
_blockElement = null;
_computedFormat = null;
}
-
-// private function blockElementExists():Boolean
-// {
-// return _blockElement != null;
-// }
+ // private function blockElementExists():Boolean
+ // {
+ // return _blockElement != null;
+ // }
/** @private */
public function getBlockElement():ContentElement
- {
+ {
if (!_blockElement)
createContentElement();
- return _blockElement;
+ return _blockElement;
}
-
+
/** @private
* Gets the EventDispatcher associated with this FlowElement. Use the functions
* of EventDispatcher such as <code>setEventHandler()</code> and <code>removeEventHandler()</code>
@@ -156,7 +141,7 @@ package org.apache.flex.textLayout.elements {
_eventMirror = new FlowElementEventDispatcher(this);
return _eventMirror;
}
-
+
/** @private
* Checks whether an event dispatcher is attached, and if so, if the event dispatcher
* has any active listeners.
@@ -165,10 +150,10 @@ package org.apache.flex.textLayout.elements {
{
return _eventMirror && (_eventMirror._listenerCount != 0);
}
-
+
/** @private This is done so that the TextContainerManager can discover EventMirrors in a TextFlow. */
- public override function appendElementsForDelayedUpdate(tf:ITextFlow,changeType:String):void
- {
+ public override function appendElementsForDelayedUpdate(tf:ITextFlow, changeType:String):void
+ {
if (changeType == ModelChange.ELEMENT_ADDED)
{
if (this.hasActiveEventMirror())
@@ -185,9 +170,9 @@ package org.apache.flex.textLayout.elements {
getParagraph().decInteractiveChildrenCount() ;
}
}
- super.appendElementsForDelayedUpdate(tf,changeType);
+ super.appendElementsForDelayedUpdate(tf, changeType);
}
-
+
/**
* The text associated with the FlowLeafElement:
* <p><ul>
@@ -199,39 +184,39 @@ package org.apache.flex.textLayout.elements {
*
* @playerversion Flash 10
* @playerversion AIR 1.5
- * @langversion 3.0
- *
- * @see org.apache.flex.textLayout.elements.SpanElement#replaceText()
+ * @langversion 3.0
+ *
+ * @see org.apache.flex.textLayout.elements.SpanElement#replaceText()
*/
public function get text():String
{
return _text;
}
-
+
/** @private */
public function getElementFormat():ElementFormat
- {
+ {
if (!_blockElement)
createContentElement();
- return _blockElement.elementFormat;
- }
-
+ return _blockElement.elementFormat;
+ }
+
/** @private */
- public override function setParentAndRelativeStart(newParent:IFlowGroupElement,newStart:int):void
+ public override function setParentAndRelativeStart(newParent:IFlowGroupElement, newStart:int):void
{
if (newParent == parent)
return;
-
+
var hasBlock:Boolean = _blockElement != null;
-
+
if (_blockElement && parent && parent.hasBlockElement()) // remove textElement from the parent content
- parent.removeBlockElement(this,_blockElement);
+ parent.removeBlockElement(this, _blockElement);
if (newParent && !newParent.hasBlockElement() && _blockElement)
newParent.createContentElement();
-
- super.setParentAndRelativeStart(newParent,newStart);
-
- // Update the FTE ContentElement structure. If the parent has FTE elements, then create FTE elements for the leaf node
+
+ super.setParentAndRelativeStart(newParent, newStart);
+
+ // Update the FTE ContentElement structure. If the parent has FTE elements, then create FTE elements for the leaf node
// if it doesn't already have them, and add them in. If the parent does not have FTE elements, release the leaf's FTE
// elements also so they match.
if (parent)
@@ -241,15 +226,15 @@ package org.apache.flex.textLayout.elements {
if (!_blockElement)
createContentElement();
else if (hasBlock) // don't do this if the _blockElement was constructed as side-effect of setParentAndRelativeStart; in that case, it's already attached
- parent.insertBlockElement(this,_blockElement);
+ parent.insertBlockElement(this, _blockElement);
}
else if (_blockElement)
releaseContentElement();
}
}
-
+
/** @private Only used by SpanElement.splitAtPosition */
- public function quickInitializeForSplit(sibling:FlowLeafElement,newSpanLength:int,newSpanTextElement:TextElement):void
+ public function quickInitializeForSplit(sibling:FlowLeafElement, newSpanLength:int, newSpanTextElement:TextElement):void
{
setTextLength(newSpanLength);
_blockElement = newSpanTextElement;
@@ -264,7 +249,7 @@ package org.apache.flex.textLayout.elements {
_blockElement.elementFormat = sibling.getElementFormat();
}
}
-
+
/**
* Returns the next FlowLeafElement object.
*
@@ -275,17 +260,16 @@ package org.apache.flex.textLayout.elements {
*
* @playerversion Flash 10
* @playerversion AIR 1.5
- * @langversion 3.0
- *
+ * @langversion 3.0
+ *
*/
-
- public function getNextLeaf(limitElement:IFlowGroupElement=null):IFlowLeafElement
+ public function getNextLeaf(limitElement:IFlowGroupElement = null):IFlowLeafElement
{
if (!parent)
return null;
- return parent.getNextLeafHelper(limitElement,this);
+ return parent.getNextLeafHelper(limitElement, this);
}
-
+
/**
* Returns the previous FlowLeafElement object.
*
@@ -295,39 +279,38 @@ package org.apache.flex.textLayout.elements {
*
* @playerversion Flash 10
* @playerversion AIR 1.5
- * @langversion 3.0
- *
+ * @langversion 3.0
+ *
*/
-
- public function getPreviousLeaf(limitElement:IFlowGroupElement=null):IFlowLeafElement
+ public function getPreviousLeaf(limitElement:IFlowGroupElement = null):IFlowLeafElement
{
if (!parent)
return null;
- return parent.getPreviousLeafHelper(limitElement,this);
+ return parent.getPreviousLeafHelper(limitElement, this);
}
-
+
/** @private */
public override function getCharAtPosition(relativePosition:int):String
{
- return _text ? _text.charAt(relativePosition) : "";
- }
-
+ return _text ? _text.charAt(relativePosition) : "";
+ }
+
/** @private */
- public override function normalizeRange(normalizeStart:uint,normalizeEnd:uint):void
+ public override function normalizeRange(normalizeStart:uint, normalizeEnd:uint):void
{
// this does the cascade - potential optimization to skip it if the _blockElement isn't attached
if (_blockElement)
calculateComputedFormat();
}
-
+
/** Returns the FontMetrics object for the span. The properties of the FontMetrics object describe the
* emBox, strikethrough position, strikethrough thickness, underline position,
* and underline thickness for the specified font.
*
- * @playerversion Flash 10
+ * @playerversion Flash 10
* @playerversion AIR 1.5
- * @langversion 3.0
- *
+ * @langversion 3.0
+ *
* @see org.apache.flex.text.engine.FontMetrics
* @see org.apache.flex.text.engine.ElementFormat#getFontMetrics()
*
@@ -337,41 +320,41 @@ package org.apache.flex.textLayout.elements {
{
if (!_blockElement)
createContentElement();
- if(!_blockElement)
+ if (!_blockElement)
return null;
var ef:ElementFormat = _blockElement.elementFormat;
if (!ef)
return null;
-
+
var tf:ITextFlow = getTextFlow();
if (tf && tf.flowComposer && tf.flowComposer.swfContext)
- return tf.flowComposer.swfContext.callInContext(ef.getFontMetrics,ef,null,true);
+ return tf.flowComposer.swfContext.callInContext(ef.getFontMetrics, ef, null, true);
return ef.getFontMetrics();
}
-
/** @private */
public function computeElementFormat():ElementFormat
{
- CONFIG::debug { assert(_computedFormat != null,"bad call to computeElementFormat"); }
+ CONFIG::debug
+ {
+ assert(_computedFormat != null, "bad call to computeElementFormat"); }
var tf:ITextFlow = getTextFlow();
- return GeometricElementUtils.computeElementFormatHelper (_computedFormat, getParagraph(), tf && tf.flowComposer ? tf.flowComposer.swfContext : null);
+ return GeometricElementUtils.computeElementFormatHelper(_computedFormat, getParagraph(), tf && tf.flowComposer ? tf.flowComposer.swfContext : null);
}
-
-
+
/**
* The computed text format attributes that are in effect for this element.
* Takes into account the inheritance of attributes.
*
* @playerversion Flash 10
* @playerversion AIR 1.5
- * @langversion 3.0
- *
+ * @langversion 3.0
+ *
* @see org.apache.flex.textLayout.formats.ITextLayoutFormat
*/
public override function get computedFormat():ITextLayoutFormat
- {
+ {
if (!_computedFormat)
{
_computedFormat = doComputeTextLayoutFormat();
@@ -379,23 +362,26 @@ package org.apache.flex.textLayout.elements {
if (_blockElement)
{
_blockElement.elementFormat = computeElementFormat();
- CONFIG::debug { Debugging.traceFTEAssign(_blockElement,"elementFormat",_blockElement.elementFormat); }
+ CONFIG::debug
+ {
+ Debugging.traceFTEAssign(_blockElement, "elementFormat", _blockElement.elementFormat); }
}
-
}
return _computedFormat;
}
-
+
/** Returns the calculated lineHeight from this element's properties. @private */
public function getEffectiveLineHeight(blockProgression:String):Number
{
- //ignore the leading on a TCY Block. If the element is in a TCYBlock, it has no leading
+ // ignore the leading on a TCY Block. If the element is in a TCYBlock, it has no leading
if (blockProgression == BlockProgression.RL && (parent.className == "TCYElement"))
return 0;
- CONFIG::debug { assert(_computedFormat != null,"Missing _computedFormat in FlowLeafElement.getEffectiveLineHeight"); }
+ CONFIG::debug
+ {
+ assert(_computedFormat != null, "Missing _computedFormat in FlowLeafElement.getEffectiveLineHeight"); }
return TextLayoutFormat.lineHeightProperty.computeActualPropertyValue(computedFormat.lineHeight, getEffectiveFontSize());
}
-
+
/** @private
* Get the "inline box" for the element as defined by the CSS visual formatting model (http://www.w3.org/TR/CSS2/visuren.html)
* @param blockProgression Block progression
@@ -407,35 +393,35 @@ package org.apache.flex.textLayout.elements {
* @return Null if the element is not "inline"
* Otherwise, a rectangle representing the inline box. Top and Bottom are relative to the line's Roman baseline. Left and Right are ignored.
*/
- public function getCSSInlineBox(blockProgression:String, textLine:ITextLine, para:IParagraphElement=null, swfContext:ISWFContext=null):Rectangle
+ public function getCSSInlineBox(blockProgression:String, textLine:ITextLine, para:IParagraphElement = null, swfContext:ISWFContext = null):Rectangle
{
- // TODO-9/27/10: TCYs typically don't affect leading, but this may not be appropriate for LeadingModel.BOX
+ // TODO-9/27/10: TCYs typically don't affect leading, but this may not be appropriate for LeadingModel.BOX
if (blockProgression == BlockProgression.RL && (parent.className == "TCYElement"))
return null;
-
- return GeometricElementUtils.getCSSInlineBoxHelper (computedFormat, getComputedFontMetrics(), textLine, para);
+
+ return GeometricElementUtils.getCSSInlineBoxHelper(computedFormat, getComputedFontMetrics(), textLine, para);
}
-
+
/** Returns the fontSize from this element's properties. @private */
public function getEffectiveFontSize():Number
{
return Number(computedFormat.fontSize);
}
-
/** @private */
- CONFIG::debug public override function debugCheckFlowElement(depth:int = 0, extraData:String = ""):int
+ CONFIG::debug
+ public override function debugCheckFlowElement(depth:int = 0, extraData:String = ""):int
{
// debugging function that asserts if the flow element tree is in an invalid state
-
- var rslt:int = super.debugCheckFlowElement(depth," fte:"+getDebugIdentity(_blockElement)+" "+extraData);
-
+
+ var rslt:int = super.debugCheckFlowElement(depth, " fte:" + getDebugIdentity(_blockElement) + " " + extraData);
+
// TODO: eventually these tests will be valid for InlineGraphicElement elements as well
if (!(IFlowLeafElement is InlineGraphicElement))
{
- rslt += assert(textLength != 0 || bindableElement || (parent is ISubParagraphGroupElementBase && parent.numChildren == 1), "FlowLeafElement with zero textLength must be deleted");
+ rslt += assert(textLength != 0 || bindableElement || (parent is ISubParagraphGroupElementBase && parent.numChildren == 1), "FlowLeafElement with zero textLength must be deleted");
rslt += assert(parent is IParagraphElement || parent is ISubParagraphGroupElementBase, "FlowLeafElement must have a ParagraphElement or SubParagraphGroupElementBase parent");
}
return rslt;
}
}
-}
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/19b26fe5/frameworks/projects/TLF/src/main/flex/org/apache/flex/textLayout/elements/ITCYElement.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/TLF/src/main/flex/org/apache/flex/textLayout/elements/ITCYElement.as b/frameworks/projects/TLF/src/main/flex/org/apache/flex/textLayout/elements/ITCYElement.as
index 2d6fae5..2203b68 100644
--- a/frameworks/projects/TLF/src/main/flex/org/apache/flex/textLayout/elements/ITCYElement.as
+++ b/frameworks/projects/TLF/src/main/flex/org/apache/flex/textLayout/elements/ITCYElement.as
@@ -18,9 +18,6 @@
////////////////////////////////////////////////////////////////////////////////
package org.apache.flex.textLayout.elements
{
- import org.apache.flex.geom.Rectangle;
- import org.apache.flex.text.engine.ITextLine;
-
public interface ITCYElement extends ISubParagraphGroupElementBase
{
}
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/19b26fe5/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 2efdc9c..a5fe513 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,7 +19,6 @@
package org.apache.flex.textLayout.elements
{
import org.apache.flex.textLayout.compose.ITextFlowTableBlock;
- import org.apache.flex.textLayout.compose.TextFlowTableBlock;
public interface ITableElement extends ITableFormattedElement
{
function getRowAt(rIdx:int):ITableRowElement;