Return-Path: X-Original-To: apmail-flex-commits-archive@www.apache.org Delivered-To: apmail-flex-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 83498EA72 for ; Fri, 1 Feb 2013 22:49:40 +0000 (UTC) Received: (qmail 54018 invoked by uid 500); 1 Feb 2013 22:49:40 -0000 Delivered-To: apmail-flex-commits-archive@flex.apache.org Received: (qmail 53996 invoked by uid 500); 1 Feb 2013 22:49:40 -0000 Mailing-List: contact commits-help@flex.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@flex.apache.org Delivered-To: mailing list commits@flex.apache.org Received: (qmail 53985 invoked by uid 99); 1 Feb 2013 22:49:40 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 01 Feb 2013 22:49:40 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 01 Feb 2013 22:49:35 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 0AB9E23888E7; Fri, 1 Feb 2013 22:49:17 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1441654 [2/2] - in /flex/falcon/trunk/compiler/src/org/apache/flex/compiler: internal/definitions/ internal/parsing/mxml/ internal/scopes/ internal/tree/mxml/ mxml/ problems/ tree/mxml/ Date: Fri, 01 Feb 2013 22:49:13 -0000 To: commits@flex.apache.org From: gordonsmith@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20130201224917.0AB9E23888E7@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Modified: flex/falcon/trunk/compiler/src/org/apache/flex/compiler/internal/tree/mxml/MXMLNodeBase.java URL: http://svn.apache.org/viewvc/flex/falcon/trunk/compiler/src/org/apache/flex/compiler/internal/tree/mxml/MXMLNodeBase.java?rev=1441654&r1=1441653&r2=1441654&view=diff ============================================================================== --- flex/falcon/trunk/compiler/src/org/apache/flex/compiler/internal/tree/mxml/MXMLNodeBase.java (original) +++ flex/falcon/trunk/compiler/src/org/apache/flex/compiler/internal/tree/mxml/MXMLNodeBase.java Fri Feb 1 22:49:11 2013 @@ -50,9 +50,9 @@ import org.apache.flex.compiler.internal import org.apache.flex.compiler.internal.workspaces.Workspace; import org.apache.flex.compiler.mxml.IMXMLTagAttributeData; import org.apache.flex.compiler.mxml.IMXMLTextData.TextType; +import org.apache.flex.compiler.mxml.IMXMLTagData; import org.apache.flex.compiler.mxml.MXMLData; import org.apache.flex.compiler.mxml.MXMLNamespaceAttributeData; -import org.apache.flex.compiler.mxml.MXMLTagData; import org.apache.flex.compiler.mxml.MXMLTextData; import org.apache.flex.compiler.mxml.MXMLUnitData; import org.apache.flex.compiler.parsing.IASToken; @@ -261,7 +261,7 @@ public abstract class MXMLNodeBase exten * MXML tree. * @param tag The MXML tag from which this MXML node is being created. */ - protected void initializeFromTag(MXMLTreeBuilder builder, MXMLTagData tag) + protected void initializeFromTag(MXMLTreeBuilder builder, IMXMLTagData tag) { setLocation(tag); @@ -296,7 +296,7 @@ public abstract class MXMLNodeBase exten * node start and end offset from local to absolute offsets. */ protected void initializationComplete(MXMLTreeBuilder builder, - MXMLTagData tag, + IMXMLTagData tag, MXMLNodeInfo info) { adjustOffsets(builder); @@ -368,11 +368,11 @@ public abstract class MXMLNodeBase exten * * @param builder The {@code MXMLTreeBuilder} object which is building this * MXML tree. - * @param tag An {@code MXMLTagData} object representing the tag. + * @param tag An {@code IMXMLTagData} object representing the tag. * @param attribute An {@code MXMLTagAttributeData} object representing the * attribute. */ - private void processAttribute(MXMLTreeBuilder builder, MXMLTagData tag, + private void processAttribute(MXMLTreeBuilder builder, IMXMLTagData tag, IMXMLTagAttributeData attribute, MXMLNodeInfo info) { @@ -400,7 +400,7 @@ public abstract class MXMLNodeBase exten * @param attribute An {@code MXMLNamespaceAttributeData} object * representing the attribute. */ - private void processNamespaceAttribute(MXMLTreeBuilder builder, MXMLTagData tag, + private void processNamespaceAttribute(MXMLTreeBuilder builder, IMXMLTagData tag, MXMLNamespaceAttributeData attribute) { String attributeURI = attribute.getNamespace(); @@ -464,7 +464,7 @@ public abstract class MXMLNodeBase exten * @param attribute An {@code MXMLAttributeData} object representing the * attribute. */ - private void processPrivateAttribute(MXMLTreeBuilder builder, MXMLTagData tag, + private void processPrivateAttribute(MXMLTreeBuilder builder, IMXMLTagData tag, IMXMLTagAttributeData attribute) { ICompilerProblem problem = new MXMLPrivateAttributeProblem(attribute); @@ -490,7 +490,7 @@ public abstract class MXMLNodeBase exten * @param attribute An {@code MXMLTagAttributeData} object representing the * attribute. */ - protected void processTagSpecificAttribute(MXMLTreeBuilder builder, MXMLTagData tag, + protected void processTagSpecificAttribute(MXMLTreeBuilder builder, IMXMLTagData tag, IMXMLTagAttributeData attribute, MXMLNodeInfo info) { @@ -513,12 +513,12 @@ public abstract class MXMLNodeBase exten * * @param unit An {@code MXMLUnitData} object representing the content unit. */ - private void processContentUnit(MXMLTreeBuilder builder, MXMLTagData tag, + private void processContentUnit(MXMLTreeBuilder builder, IMXMLTagData tag, MXMLUnitData unit, MXMLNodeInfo info) { - if (unit instanceof MXMLTagData) - processChildTag(builder, tag, (MXMLTagData)unit, info); + if (unit instanceof IMXMLTagData) + processChildTag(builder, tag, (IMXMLTagData)unit, info); else if (unit instanceof MXMLTextData) processChildTextUnit(builder, tag, (MXMLTextData)unit, info); @@ -535,8 +535,8 @@ public abstract class MXMLNodeBase exten * Subclasses must override this method in order to allow the child tags * that they recognize. */ - protected void processChildTag(MXMLTreeBuilder builder, MXMLTagData tag, - MXMLTagData childTag, + protected void processChildTag(MXMLTreeBuilder builder, IMXMLTagData tag, + IMXMLTagData childTag, MXMLNodeInfo info) { if (childTag.getURI() == null) @@ -558,7 +558,7 @@ public abstract class MXMLNodeBase exten *

* Subclasses do not need to override this method so it is private. */ - private void processChildTextUnit(MXMLTreeBuilder builder, MXMLTagData tag, + private void processChildTextUnit(MXMLTreeBuilder builder, IMXMLTagData tag, MXMLTextData text, MXMLNodeInfo info) { @@ -605,7 +605,7 @@ public abstract class MXMLNodeBase exten * @param text An {@code MXMLTextData} object representing the child text * unit. */ - protected void processChildWhitespaceUnit(MXMLTreeBuilder builder, MXMLTagData tag, + protected void processChildWhitespaceUnit(MXMLTreeBuilder builder, IMXMLTagData tag, MXMLTextData text, MXMLNodeInfo info) { @@ -623,7 +623,7 @@ public abstract class MXMLNodeBase exten * @param text An {@code MXMLTextData} object representing the child text * unit. */ - protected void processChildNonWhitespaceUnit(MXMLTreeBuilder builder, MXMLTagData tag, + protected void processChildNonWhitespaceUnit(MXMLTreeBuilder builder, IMXMLTagData tag, MXMLTextData text, MXMLNodeInfo info) { @@ -632,20 +632,20 @@ public abstract class MXMLNodeBase exten } /** - * Processes all the children of the given {@link MXMLTagData} unit that are + * Processes all the children of the given {@link IMXMLTagData} unit that are * {@link MXMLTextData} nodes. Each node will be processes separately, in * the order in which the appear in the document. *

* This method is only used by MXML AST building. To parse an ActionScript * block for scope building, see {@link MXMLScopeBuilder#processScriptTag}. * - * @param tag the {@link MXMLTagData} to process + * @param tag the {@link IMXMLTagData} to process * @return a {@link List} of {@link ScopedBlockNode}s for each * {@link MXMLTextData} we encountered. */ public static List processUnitAsAS( MXMLTreeBuilder builder, - MXMLTagData tag, + IMXMLTagData tag, String sourcePath, ASScope containingScope, PostProcessStep buildOrReconnect, @@ -733,10 +733,10 @@ public abstract class MXMLNodeBase exten String sourcePath = unit.getSourcePath(); int start = unit.getAbsoluteStart(); int end; - if (unit instanceof MXMLTagData) + if (unit instanceof IMXMLTagData) { - MXMLTagData startTag = (MXMLTagData)unit; - MXMLTagData endTag = startTag.findMatchingEndTag(); + IMXMLTagData startTag = (IMXMLTagData)unit; + IMXMLTagData endTag = startTag.findMatchingEndTag(); end = endTag != null ? endTag.getAbsoluteEnd() : startTag.getAbsoluteEnd(); } else @@ -781,9 +781,9 @@ public abstract class MXMLNodeBase exten // we only store the open tags in the units // and the end offset should be the end of the last close tag // check this here and fetch the end tag if the last tag is an open and non-empty tag - if (lastUnit instanceof MXMLTagData && lastUnit.isOpenAndNotEmptyTag()) + if (lastUnit instanceof IMXMLTagData && lastUnit.isOpenAndNotEmptyTag()) { - MXMLUnitData endTag = ((MXMLTagData)lastUnit).findMatchingEndTag(); + MXMLUnitData endTag = (MXMLUnitData)((IMXMLTagData)lastUnit).findMatchingEndTag(); if (endTag != null) lastUnit = endTag; } Modified: flex/falcon/trunk/compiler/src/org/apache/flex/compiler/internal/tree/mxml/MXMLNumberNode.java URL: http://svn.apache.org/viewvc/flex/falcon/trunk/compiler/src/org/apache/flex/compiler/internal/tree/mxml/MXMLNumberNode.java?rev=1441654&r1=1441653&r2=1441654&view=diff ============================================================================== --- flex/falcon/trunk/compiler/src/org/apache/flex/compiler/internal/tree/mxml/MXMLNumberNode.java (original) +++ flex/falcon/trunk/compiler/src/org/apache/flex/compiler/internal/tree/mxml/MXMLNumberNode.java Fri Feb 1 22:49:11 2013 @@ -21,7 +21,7 @@ package org.apache.flex.compiler.interna import org.apache.flex.compiler.constants.IASLanguageConstants; import org.apache.flex.compiler.internal.tree.as.NodeBase; -import org.apache.flex.compiler.mxml.MXMLTagData; +import org.apache.flex.compiler.mxml.IMXMLTagData; import org.apache.flex.compiler.tree.ASTNodeID; import org.apache.flex.compiler.tree.mxml.IMXMLNumberNode; @@ -73,7 +73,7 @@ class MXMLNumberNode extends MXMLExpress } @Override - protected void initializationComplete(MXMLTreeBuilder builder, MXMLTagData tag, + protected void initializationComplete(MXMLTreeBuilder builder, IMXMLTagData tag, MXMLNodeInfo info) { NodeBase expressionNode = createExpressionNodeFromFragments(builder, tag, info, DEFAULT); Modified: flex/falcon/trunk/compiler/src/org/apache/flex/compiler/internal/tree/mxml/MXMLPrivateNode.java URL: http://svn.apache.org/viewvc/flex/falcon/trunk/compiler/src/org/apache/flex/compiler/internal/tree/mxml/MXMLPrivateNode.java?rev=1441654&r1=1441653&r2=1441654&view=diff ============================================================================== --- flex/falcon/trunk/compiler/src/org/apache/flex/compiler/internal/tree/mxml/MXMLPrivateNode.java (original) +++ flex/falcon/trunk/compiler/src/org/apache/flex/compiler/internal/tree/mxml/MXMLPrivateNode.java Fri Feb 1 22:49:11 2013 @@ -21,7 +21,7 @@ package org.apache.flex.compiler.interna import org.apache.flex.compiler.internal.tree.as.NodeBase; import org.apache.flex.compiler.mxml.IMXMLLanguageConstants; -import org.apache.flex.compiler.mxml.MXMLTagData; +import org.apache.flex.compiler.mxml.IMXMLTagData; import org.apache.flex.compiler.mxml.MXMLTextData; import org.apache.flex.compiler.tree.ASTNodeID; import org.apache.flex.compiler.tree.mxml.IMXMLPrivateNode; @@ -55,14 +55,14 @@ class MXMLPrivateNode extends MXMLNodeBa } @Override - protected void processChildTag(MXMLTreeBuilder builder, MXMLTagData tag, - MXMLTagData childTag, MXMLNodeInfo info) + protected void processChildTag(MXMLTreeBuilder builder, IMXMLTagData tag, + IMXMLTagData childTag, MXMLNodeInfo info) { // Allow any child tag, but ignore it. } @Override - protected void processChildNonWhitespaceUnit(MXMLTreeBuilder builder, MXMLTagData tag, + protected void processChildNonWhitespaceUnit(MXMLTreeBuilder builder, IMXMLTagData tag, MXMLTextData text, MXMLNodeInfo info) { // Allow child text, but ignore it. Modified: flex/falcon/trunk/compiler/src/org/apache/flex/compiler/internal/tree/mxml/MXMLPropertySpecifierNode.java URL: http://svn.apache.org/viewvc/flex/falcon/trunk/compiler/src/org/apache/flex/compiler/internal/tree/mxml/MXMLPropertySpecifierNode.java?rev=1441654&r1=1441653&r2=1441654&view=diff ============================================================================== --- flex/falcon/trunk/compiler/src/org/apache/flex/compiler/internal/tree/mxml/MXMLPropertySpecifierNode.java (original) +++ flex/falcon/trunk/compiler/src/org/apache/flex/compiler/internal/tree/mxml/MXMLPropertySpecifierNode.java Fri Feb 1 22:49:11 2013 @@ -37,7 +37,7 @@ import org.apache.flex.compiler.internal import org.apache.flex.compiler.internal.scopes.MXMLFileScope; import org.apache.flex.compiler.internal.tree.as.NodeBase; import org.apache.flex.compiler.mxml.IMXMLTagAttributeData; -import org.apache.flex.compiler.mxml.MXMLTagData; +import org.apache.flex.compiler.mxml.IMXMLTagData; import org.apache.flex.compiler.mxml.MXMLTextData; import org.apache.flex.compiler.mxml.MXMLUnitData; import org.apache.flex.compiler.problems.ICompilerProblem; @@ -305,9 +305,9 @@ class MXMLPropertySpecifierNode extends ((MXMLArrayNode)instanceNode).initializeDefaultProperty( builder, defaultPropertyDefinition, contentUnits); } - else if (contentUnits.size() == 1 && contentUnits.get(0) instanceof MXMLTagData) + else if (contentUnits.size() == 1 && contentUnits.get(0) instanceof IMXMLTagData) { - MXMLTagData tag = (MXMLTagData)contentUnits.get(0); + IMXMLTagData tag = (IMXMLTagData)contentUnits.get(0); IDefinition definition = builder.getFileScope().resolveTagToDefinition(tag); if (definition instanceof ClassDefinition) { @@ -324,8 +324,8 @@ class MXMLPropertySpecifierNode extends * . */ @Override - protected void processChildTag(MXMLTreeBuilder builder, MXMLTagData tag, - MXMLTagData childTag, + protected void processChildTag(MXMLTreeBuilder builder, IMXMLTagData tag, + IMXMLTagData childTag, MXMLNodeInfo info) { MXMLFileScope fileScope = builder.getFileScope(); @@ -378,7 +378,7 @@ class MXMLPropertySpecifierNode extends * will be processed later in initializationComplete(). */ @Override - protected void processChildNonWhitespaceUnit(MXMLTreeBuilder builder, MXMLTagData tag, + protected void processChildNonWhitespaceUnit(MXMLTreeBuilder builder, IMXMLTagData tag, MXMLTextData text, MXMLNodeInfo info) { @@ -391,7 +391,7 @@ class MXMLPropertySpecifierNode extends * that to specify the property value. */ @Override - protected void initializationComplete(MXMLTreeBuilder builder, MXMLTagData tag, + protected void initializationComplete(MXMLTreeBuilder builder, IMXMLTagData tag, MXMLNodeInfo info) { super.initializationComplete(builder, tag, info); Modified: flex/falcon/trunk/compiler/src/org/apache/flex/compiler/internal/tree/mxml/MXMLRegExpNode.java URL: http://svn.apache.org/viewvc/flex/falcon/trunk/compiler/src/org/apache/flex/compiler/internal/tree/mxml/MXMLRegExpNode.java?rev=1441654&r1=1441653&r2=1441654&view=diff ============================================================================== --- flex/falcon/trunk/compiler/src/org/apache/flex/compiler/internal/tree/mxml/MXMLRegExpNode.java (original) +++ flex/falcon/trunk/compiler/src/org/apache/flex/compiler/internal/tree/mxml/MXMLRegExpNode.java Fri Feb 1 22:49:11 2013 @@ -22,7 +22,7 @@ package org.apache.flex.compiler.interna import org.apache.flex.compiler.constants.IASLanguageConstants; import org.apache.flex.compiler.definitions.ITypeDefinition; import org.apache.flex.compiler.internal.tree.as.NodeBase; -import org.apache.flex.compiler.mxml.MXMLTagData; +import org.apache.flex.compiler.mxml.IMXMLTagData; import org.apache.flex.compiler.tree.ASTNodeID; import org.apache.flex.compiler.tree.mxml.IMXMLRegExpNode; @@ -64,7 +64,7 @@ class MXMLRegExpNode extends MXMLExpress @Override protected void initializationComplete(MXMLTreeBuilder builder, - MXMLTagData tag, + IMXMLTagData tag, MXMLNodeInfo info) { NodeBase expressionNode = parseExpressionNodeFromFragments(builder, tag, info, DEFAULT); Modified: flex/falcon/trunk/compiler/src/org/apache/flex/compiler/internal/tree/mxml/MXMLRemoteObjectMethodNode.java URL: http://svn.apache.org/viewvc/flex/falcon/trunk/compiler/src/org/apache/flex/compiler/internal/tree/mxml/MXMLRemoteObjectMethodNode.java?rev=1441654&r1=1441653&r2=1441654&view=diff ============================================================================== --- flex/falcon/trunk/compiler/src/org/apache/flex/compiler/internal/tree/mxml/MXMLRemoteObjectMethodNode.java (original) +++ flex/falcon/trunk/compiler/src/org/apache/flex/compiler/internal/tree/mxml/MXMLRemoteObjectMethodNode.java Fri Feb 1 22:49:11 2013 @@ -20,7 +20,7 @@ package org.apache.flex.compiler.internal.tree.mxml; import org.apache.flex.compiler.internal.tree.as.NodeBase; -import org.apache.flex.compiler.mxml.MXMLTagData; +import org.apache.flex.compiler.mxml.IMXMLTagData; import org.apache.flex.compiler.problems.ICompilerProblem; import org.apache.flex.compiler.problems.MXMLEmptyAttributeProblem; import org.apache.flex.compiler.problems.MXMLRequiredAttributeProblem; @@ -72,7 +72,7 @@ class MXMLRemoteObjectMethodNode extends * Check for required {@code name} property. */ @Override - protected void initializationComplete(MXMLTreeBuilder builder, MXMLTagData tag, MXMLNodeInfo info) + protected void initializationComplete(MXMLTreeBuilder builder, IMXMLTagData tag, MXMLNodeInfo info) { super.initializationComplete(builder, tag, info); Modified: flex/falcon/trunk/compiler/src/org/apache/flex/compiler/internal/tree/mxml/MXMLRemoteObjectNode.java URL: http://svn.apache.org/viewvc/flex/falcon/trunk/compiler/src/org/apache/flex/compiler/internal/tree/mxml/MXMLRemoteObjectNode.java?rev=1441654&r1=1441653&r2=1441654&view=diff ============================================================================== --- flex/falcon/trunk/compiler/src/org/apache/flex/compiler/internal/tree/mxml/MXMLRemoteObjectNode.java (original) +++ flex/falcon/trunk/compiler/src/org/apache/flex/compiler/internal/tree/mxml/MXMLRemoteObjectNode.java Fri Feb 1 22:49:11 2013 @@ -22,7 +22,7 @@ package org.apache.flex.compiler.interna import org.apache.flex.compiler.common.XMLName; import org.apache.flex.compiler.internal.projects.FlexProject; import org.apache.flex.compiler.internal.tree.as.NodeBase; -import org.apache.flex.compiler.mxml.MXMLTagData; +import org.apache.flex.compiler.mxml.IMXMLTagData; import org.apache.flex.compiler.tree.ASTNodeID; import org.apache.flex.compiler.tree.mxml.IMXMLRemoteObjectNode; @@ -60,7 +60,7 @@ class MXMLRemoteObjectNode extends MXMLI } @Override - protected void processChildTag(MXMLTreeBuilder builder, MXMLTagData tag, MXMLTagData childTag, MXMLNodeInfo info) + protected void processChildTag(MXMLTreeBuilder builder, IMXMLTagData tag, IMXMLTagData childTag, MXMLNodeInfo info) { // Create MXMLRemoteObjectMethodNode for a {@code } child tag. if (childTag.getShortName().equals(TAG_METHOD)) Modified: flex/falcon/trunk/compiler/src/org/apache/flex/compiler/internal/tree/mxml/MXMLReparentNode.java URL: http://svn.apache.org/viewvc/flex/falcon/trunk/compiler/src/org/apache/flex/compiler/internal/tree/mxml/MXMLReparentNode.java?rev=1441654&r1=1441653&r2=1441654&view=diff ============================================================================== --- flex/falcon/trunk/compiler/src/org/apache/flex/compiler/internal/tree/mxml/MXMLReparentNode.java (original) +++ flex/falcon/trunk/compiler/src/org/apache/flex/compiler/internal/tree/mxml/MXMLReparentNode.java Fri Feb 1 22:49:11 2013 @@ -23,7 +23,7 @@ import org.apache.flex.compiler.internal import org.apache.flex.compiler.internal.tree.as.NodeBase; import org.apache.flex.compiler.mxml.IMXMLLanguageConstants; import org.apache.flex.compiler.mxml.IMXMLTagAttributeData; -import org.apache.flex.compiler.mxml.MXMLTagData; +import org.apache.flex.compiler.mxml.IMXMLTagData; import org.apache.flex.compiler.problems.ICompilerProblem; import org.apache.flex.compiler.problems.MXMLEmptyAttributeProblem; import org.apache.flex.compiler.problems.MXMLIncludeInAndExcludeFromProblem; @@ -86,7 +86,7 @@ class MXMLReparentNode extends MXMLNodeB } @Override - protected void processTagSpecificAttribute(MXMLTreeBuilder builder, MXMLTagData tag, + protected void processTagSpecificAttribute(MXMLTreeBuilder builder, IMXMLTagData tag, IMXMLTagAttributeData attribute, MXMLNodeInfo info) { @@ -117,7 +117,7 @@ class MXMLReparentNode extends MXMLNodeB @Override protected void initializationComplete(MXMLTreeBuilder builder, - MXMLTagData tag, + IMXMLTagData tag, MXMLNodeInfo info) { if (target == null) Modified: flex/falcon/trunk/compiler/src/org/apache/flex/compiler/internal/tree/mxml/MXMLResourceNode.java URL: http://svn.apache.org/viewvc/flex/falcon/trunk/compiler/src/org/apache/flex/compiler/internal/tree/mxml/MXMLResourceNode.java?rev=1441654&r1=1441653&r2=1441654&view=diff ============================================================================== --- flex/falcon/trunk/compiler/src/org/apache/flex/compiler/internal/tree/mxml/MXMLResourceNode.java (original) +++ flex/falcon/trunk/compiler/src/org/apache/flex/compiler/internal/tree/mxml/MXMLResourceNode.java Fri Feb 1 22:49:11 2013 @@ -25,7 +25,7 @@ import org.apache.flex.compiler.definiti import org.apache.flex.compiler.definitions.metadata.IMetaTagAttribute; import org.apache.flex.compiler.internal.resourcebundles.ResourceBundleUtils; import org.apache.flex.compiler.internal.tree.as.NodeBase; -import org.apache.flex.compiler.mxml.MXMLTagData; +import org.apache.flex.compiler.mxml.IMXMLTagData; import org.apache.flex.compiler.problems.ICompilerProblem; import org.apache.flex.compiler.problems.ResourceBundleNoBundleParameterProblem; import org.apache.flex.compiler.problems.ResourceBundleNoKeyParameterProblem; @@ -135,7 +135,7 @@ class MXMLResourceNode extends MXMLCompi } @Override - protected void initializationComplete(MXMLTreeBuilder builder, MXMLTagData tag, + protected void initializationComplete(MXMLTreeBuilder builder, IMXMLTagData tag, MXMLNodeInfo info) { super.initializationComplete(builder, tag, info); Modified: flex/falcon/trunk/compiler/src/org/apache/flex/compiler/internal/tree/mxml/MXMLScriptNode.java URL: http://svn.apache.org/viewvc/flex/falcon/trunk/compiler/src/org/apache/flex/compiler/internal/tree/mxml/MXMLScriptNode.java?rev=1441654&r1=1441653&r2=1441654&view=diff ============================================================================== --- flex/falcon/trunk/compiler/src/org/apache/flex/compiler/internal/tree/mxml/MXMLScriptNode.java (original) +++ flex/falcon/trunk/compiler/src/org/apache/flex/compiler/internal/tree/mxml/MXMLScriptNode.java Fri Feb 1 22:49:11 2013 @@ -42,7 +42,7 @@ import org.apache.flex.compiler.internal import org.apache.flex.compiler.internal.workspaces.Workspace; import org.apache.flex.compiler.mxml.IMXMLLanguageConstants; import org.apache.flex.compiler.mxml.IMXMLTagAttributeData; -import org.apache.flex.compiler.mxml.MXMLTagData; +import org.apache.flex.compiler.mxml.IMXMLTagData; import org.apache.flex.compiler.mxml.MXMLTextData; import org.apache.flex.compiler.mxml.MXMLUnitData; import org.apache.flex.compiler.tree.ASTNodeID; @@ -108,7 +108,7 @@ class MXMLScriptNode extends MXMLNodeBas } @Override - protected void processTagSpecificAttribute(MXMLTreeBuilder builder, MXMLTagData tag, + protected void processTagSpecificAttribute(MXMLTreeBuilder builder, IMXMLTagData tag, IMXMLTagAttributeData attribute, MXMLNodeInfo info) { @@ -174,7 +174,7 @@ class MXMLScriptNode extends MXMLNodeBas } @Override - protected void processChildNonWhitespaceUnit(MXMLTreeBuilder builder, MXMLTagData tag, + protected void processChildNonWhitespaceUnit(MXMLTreeBuilder builder, IMXMLTagData tag, MXMLTextData text, MXMLNodeInfo info) { @@ -189,7 +189,7 @@ class MXMLScriptNode extends MXMLNodeBas } @Override - protected void initializationComplete(MXMLTreeBuilder builder, MXMLTagData tag, + protected void initializationComplete(MXMLTreeBuilder builder, IMXMLTagData tag, MXMLNodeInfo info) { super.initializationComplete(builder, tag, info); Modified: flex/falcon/trunk/compiler/src/org/apache/flex/compiler/internal/tree/mxml/MXMLStateNode.java URL: http://svn.apache.org/viewvc/flex/falcon/trunk/compiler/src/org/apache/flex/compiler/internal/tree/mxml/MXMLStateNode.java?rev=1441654&r1=1441653&r2=1441654&view=diff ============================================================================== --- flex/falcon/trunk/compiler/src/org/apache/flex/compiler/internal/tree/mxml/MXMLStateNode.java (original) +++ flex/falcon/trunk/compiler/src/org/apache/flex/compiler/internal/tree/mxml/MXMLStateNode.java Fri Feb 1 22:49:11 2013 @@ -25,8 +25,8 @@ import org.apache.flex.compiler.constant import org.apache.flex.compiler.definitions.IDefinition; import org.apache.flex.compiler.internal.tree.as.NodeBase; import org.apache.flex.compiler.mxml.IMXMLTagAttributeData; +import org.apache.flex.compiler.mxml.IMXMLTagData; import org.apache.flex.compiler.mxml.IStateDefinition; -import org.apache.flex.compiler.mxml.MXMLTagData; import org.apache.flex.compiler.mxml.StateDefinition; import org.apache.flex.compiler.problems.ICompilerProblem; import org.apache.flex.compiler.problems.MXMLSemanticProblem; @@ -165,7 +165,7 @@ class MXMLStateNode extends MXMLInstance } @Override - protected void processTagSpecificAttribute(MXMLTreeBuilder builder, MXMLTagData tag, + protected void processTagSpecificAttribute(MXMLTreeBuilder builder, IMXMLTagData tag, IMXMLTagAttributeData attribute, MXMLNodeInfo info) { @@ -218,7 +218,7 @@ class MXMLStateNode extends MXMLInstance } @Override - protected void initializationComplete(MXMLTreeBuilder builder, MXMLTagData tag, + protected void initializationComplete(MXMLTreeBuilder builder, IMXMLTagData tag, MXMLNodeInfo info) { super.initializationComplete(builder, tag, info); Modified: flex/falcon/trunk/compiler/src/org/apache/flex/compiler/internal/tree/mxml/MXMLStringNode.java URL: http://svn.apache.org/viewvc/flex/falcon/trunk/compiler/src/org/apache/flex/compiler/internal/tree/mxml/MXMLStringNode.java?rev=1441654&r1=1441653&r2=1441654&view=diff ============================================================================== --- flex/falcon/trunk/compiler/src/org/apache/flex/compiler/internal/tree/mxml/MXMLStringNode.java (original) +++ flex/falcon/trunk/compiler/src/org/apache/flex/compiler/internal/tree/mxml/MXMLStringNode.java Fri Feb 1 22:49:11 2013 @@ -24,7 +24,7 @@ import org.apache.flex.compiler.constant import org.apache.flex.compiler.internal.parsing.SourceFragment; import org.apache.flex.compiler.internal.tree.as.NodeBase; import org.apache.flex.compiler.mxml.IMXMLTagAttributeData; -import org.apache.flex.compiler.mxml.MXMLTagData; +import org.apache.flex.compiler.mxml.IMXMLTagData; import org.apache.flex.compiler.problems.ICompilerProblem; import org.apache.flex.compiler.problems.MXMLDualContentProblem; import org.apache.flex.compiler.tree.ASTNodeID; @@ -75,7 +75,7 @@ class MXMLStringNode extends MXMLExpress } @Override - protected void processTagSpecificAttribute(MXMLTreeBuilder builder, MXMLTagData tag, + protected void processTagSpecificAttribute(MXMLTreeBuilder builder, IMXMLTagData tag, IMXMLTagAttributeData attribute, MXMLNodeInfo info) { @@ -104,7 +104,7 @@ class MXMLStringNode extends MXMLExpress } @Override - protected void initializationComplete(MXMLTreeBuilder builder, MXMLTagData tag, + protected void initializationComplete(MXMLTreeBuilder builder, IMXMLTagData tag, MXMLNodeInfo info) { super.initializationComplete(builder, tag, info); Modified: flex/falcon/trunk/compiler/src/org/apache/flex/compiler/internal/tree/mxml/MXMLStyleNode.java URL: http://svn.apache.org/viewvc/flex/falcon/trunk/compiler/src/org/apache/flex/compiler/internal/tree/mxml/MXMLStyleNode.java?rev=1441654&r1=1441653&r2=1441654&view=diff ============================================================================== --- flex/falcon/trunk/compiler/src/org/apache/flex/compiler/internal/tree/mxml/MXMLStyleNode.java (original) +++ flex/falcon/trunk/compiler/src/org/apache/flex/compiler/internal/tree/mxml/MXMLStyleNode.java Fri Feb 1 22:49:11 2013 @@ -29,7 +29,7 @@ import org.apache.flex.compiler.internal import org.apache.flex.compiler.internal.tree.as.NodeBase; import org.apache.flex.compiler.mxml.IMXMLLanguageConstants; import org.apache.flex.compiler.mxml.IMXMLTagAttributeData; -import org.apache.flex.compiler.mxml.MXMLTagData; +import org.apache.flex.compiler.mxml.IMXMLTagData; import org.apache.flex.compiler.mxml.MXMLTextData; import org.apache.flex.compiler.problems.ICompilerProblem; import org.apache.flex.compiler.problems.MXMLDualContentProblem; @@ -104,7 +104,7 @@ class MXMLStyleNode extends MXMLNodeBase } @Override - protected void processTagSpecificAttribute(MXMLTreeBuilder builder, MXMLTagData tag, + protected void processTagSpecificAttribute(MXMLTreeBuilder builder, IMXMLTagData tag, IMXMLTagAttributeData attribute, MXMLNodeInfo info) { @@ -123,7 +123,7 @@ class MXMLStyleNode extends MXMLNodeBase } @Override - protected void processChildNonWhitespaceUnit(MXMLTreeBuilder builder, MXMLTagData tag, + protected void processChildNonWhitespaceUnit(MXMLTreeBuilder builder, IMXMLTagData tag, MXMLTextData text, MXMLNodeInfo info) { @@ -131,7 +131,7 @@ class MXMLStyleNode extends MXMLNodeBase } @Override - protected void initializationComplete(MXMLTreeBuilder builder, MXMLTagData tag, + protected void initializationComplete(MXMLTreeBuilder builder, IMXMLTagData tag, MXMLNodeInfo info) { super.initializationComplete(builder, tag, info); Modified: flex/falcon/trunk/compiler/src/org/apache/flex/compiler/internal/tree/mxml/MXMLStyleSpecifierNode.java URL: http://svn.apache.org/viewvc/flex/falcon/trunk/compiler/src/org/apache/flex/compiler/internal/tree/mxml/MXMLStyleSpecifierNode.java?rev=1441654&r1=1441653&r2=1441654&view=diff ============================================================================== --- flex/falcon/trunk/compiler/src/org/apache/flex/compiler/internal/tree/mxml/MXMLStyleSpecifierNode.java (original) +++ flex/falcon/trunk/compiler/src/org/apache/flex/compiler/internal/tree/mxml/MXMLStyleSpecifierNode.java Fri Feb 1 22:49:11 2013 @@ -26,7 +26,7 @@ import org.apache.flex.compiler.definiti import org.apache.flex.compiler.definitions.IStyleDefinition; import org.apache.flex.compiler.internal.tree.as.NodeBase; import org.apache.flex.compiler.mxml.IMXMLTagAttributeData; -import org.apache.flex.compiler.mxml.MXMLTagData; +import org.apache.flex.compiler.mxml.IMXMLTagData; import org.apache.flex.compiler.problems.MXMLInvalidStyleProblem; import org.apache.flex.compiler.tree.ASTNodeID; import org.apache.flex.compiler.tree.mxml.IMXMLClassReferenceNode; @@ -68,7 +68,7 @@ class MXMLStyleSpecifierNode extends MXM } @Override - protected void initializationComplete(MXMLTreeBuilder builder, MXMLTagData tag, MXMLNodeInfo info) + protected void initializationComplete(MXMLTreeBuilder builder, IMXMLTagData tag, MXMLNodeInfo info) { super.initializationComplete(builder, tag, info); validateStyle(builder, tag); Modified: flex/falcon/trunk/compiler/src/org/apache/flex/compiler/internal/tree/mxml/MXMLUintNode.java URL: http://svn.apache.org/viewvc/flex/falcon/trunk/compiler/src/org/apache/flex/compiler/internal/tree/mxml/MXMLUintNode.java?rev=1441654&r1=1441653&r2=1441654&view=diff ============================================================================== --- flex/falcon/trunk/compiler/src/org/apache/flex/compiler/internal/tree/mxml/MXMLUintNode.java (original) +++ flex/falcon/trunk/compiler/src/org/apache/flex/compiler/internal/tree/mxml/MXMLUintNode.java Fri Feb 1 22:49:11 2013 @@ -21,7 +21,7 @@ package org.apache.flex.compiler.interna import org.apache.flex.compiler.constants.IASLanguageConstants; import org.apache.flex.compiler.internal.tree.as.NodeBase; -import org.apache.flex.compiler.mxml.MXMLTagData; +import org.apache.flex.compiler.mxml.IMXMLTagData; import org.apache.flex.compiler.tree.ASTNodeID; import org.apache.flex.compiler.tree.mxml.IMXMLUintNode; @@ -71,7 +71,7 @@ class MXMLUintNode extends MXMLExpressio } @Override - protected void initializationComplete(MXMLTreeBuilder builder, MXMLTagData tag, + protected void initializationComplete(MXMLTreeBuilder builder, IMXMLTagData tag, MXMLNodeInfo info) { NodeBase expressionNode = createExpressionNodeFromFragments(builder, tag, info, DEFAULT); Modified: flex/falcon/trunk/compiler/src/org/apache/flex/compiler/internal/tree/mxml/MXMLVectorNode.java URL: http://svn.apache.org/viewvc/flex/falcon/trunk/compiler/src/org/apache/flex/compiler/internal/tree/mxml/MXMLVectorNode.java?rev=1441654&r1=1441653&r2=1441654&view=diff ============================================================================== --- flex/falcon/trunk/compiler/src/org/apache/flex/compiler/internal/tree/mxml/MXMLVectorNode.java (original) +++ flex/falcon/trunk/compiler/src/org/apache/flex/compiler/internal/tree/mxml/MXMLVectorNode.java Fri Feb 1 22:49:11 2013 @@ -37,7 +37,7 @@ import org.apache.flex.compiler.internal import org.apache.flex.compiler.internal.scopes.ASProjectScope; import org.apache.flex.compiler.internal.tree.as.NodeBase; import org.apache.flex.compiler.mxml.IMXMLTagAttributeData; -import org.apache.flex.compiler.mxml.MXMLTagData; +import org.apache.flex.compiler.mxml.IMXMLTagData; import org.apache.flex.compiler.tree.ASTNodeID; import org.apache.flex.compiler.tree.mxml.IMXMLVectorNode; @@ -93,7 +93,7 @@ class MXMLVectorNode extends MXMLInstanc } @Override - protected void processTagSpecificAttribute(MXMLTreeBuilder builder, MXMLTagData tag, + protected void processTagSpecificAttribute(MXMLTreeBuilder builder, IMXMLTagData tag, IMXMLTagAttributeData attribute, MXMLNodeInfo info) { @@ -189,8 +189,8 @@ class MXMLVectorNode extends MXMLInstanc } @Override - protected void processChildTag(MXMLTreeBuilder builder, MXMLTagData tag, - MXMLTagData childTag, + protected void processChildTag(MXMLTreeBuilder builder, IMXMLTagData tag, + IMXMLTagData childTag, MXMLNodeInfo info) { FlexProject project = builder.getProject(); @@ -219,7 +219,7 @@ class MXMLVectorNode extends MXMLInstanc } @Override - protected void initializationComplete(MXMLTreeBuilder builder, MXMLTagData tag, + protected void initializationComplete(MXMLTreeBuilder builder, IMXMLTagData tag, MXMLNodeInfo info) { setChildren(info.getChildNodeList().toArray(new MXMLInstanceNode[0])); Modified: flex/falcon/trunk/compiler/src/org/apache/flex/compiler/internal/tree/mxml/MXMLWebServiceNode.java URL: http://svn.apache.org/viewvc/flex/falcon/trunk/compiler/src/org/apache/flex/compiler/internal/tree/mxml/MXMLWebServiceNode.java?rev=1441654&r1=1441653&r2=1441654&view=diff ============================================================================== --- flex/falcon/trunk/compiler/src/org/apache/flex/compiler/internal/tree/mxml/MXMLWebServiceNode.java (original) +++ flex/falcon/trunk/compiler/src/org/apache/flex/compiler/internal/tree/mxml/MXMLWebServiceNode.java Fri Feb 1 22:49:11 2013 @@ -22,7 +22,7 @@ package org.apache.flex.compiler.interna import org.apache.flex.compiler.common.XMLName; import org.apache.flex.compiler.internal.projects.FlexProject; import org.apache.flex.compiler.internal.tree.as.NodeBase; -import org.apache.flex.compiler.mxml.MXMLTagData; +import org.apache.flex.compiler.mxml.IMXMLTagData; import org.apache.flex.compiler.tree.ASTNodeID; import org.apache.flex.compiler.tree.mxml.IMXMLWebServiceNode; @@ -60,7 +60,7 @@ class MXMLWebServiceNode extends MXMLIns } @Override - protected void processChildTag(MXMLTreeBuilder builder, MXMLTagData tag, MXMLTagData childTag, MXMLNodeInfo info) + protected void processChildTag(MXMLTreeBuilder builder, IMXMLTagData tag, IMXMLTagData childTag, MXMLNodeInfo info) { // Create MXMLWebServiceOperationNode for an {@code } child tag. if (childTag.getShortName().equals(TAG_OPERATION)) Modified: flex/falcon/trunk/compiler/src/org/apache/flex/compiler/internal/tree/mxml/MXMLWebServiceOperationNode.java URL: http://svn.apache.org/viewvc/flex/falcon/trunk/compiler/src/org/apache/flex/compiler/internal/tree/mxml/MXMLWebServiceOperationNode.java?rev=1441654&r1=1441653&r2=1441654&view=diff ============================================================================== --- flex/falcon/trunk/compiler/src/org/apache/flex/compiler/internal/tree/mxml/MXMLWebServiceOperationNode.java (original) +++ flex/falcon/trunk/compiler/src/org/apache/flex/compiler/internal/tree/mxml/MXMLWebServiceOperationNode.java Fri Feb 1 22:49:11 2013 @@ -20,7 +20,7 @@ package org.apache.flex.compiler.internal.tree.mxml; import org.apache.flex.compiler.internal.tree.as.NodeBase; -import org.apache.flex.compiler.mxml.MXMLTagData; +import org.apache.flex.compiler.mxml.IMXMLTagData; import org.apache.flex.compiler.problems.ICompilerProblem; import org.apache.flex.compiler.problems.MXMLEmptyAttributeProblem; import org.apache.flex.compiler.problems.MXMLRequiredAttributeProblem; @@ -72,7 +72,7 @@ class MXMLWebServiceOperationNode extend * Check for required {@code name} property. */ @Override - protected void initializationComplete(MXMLTreeBuilder builder, MXMLTagData tag, MXMLNodeInfo info) + protected void initializationComplete(MXMLTreeBuilder builder, IMXMLTagData tag, MXMLNodeInfo info) { super.initializationComplete(builder, tag, info); Modified: flex/falcon/trunk/compiler/src/org/apache/flex/compiler/internal/tree/mxml/MXMLXMLListNode.java URL: http://svn.apache.org/viewvc/flex/falcon/trunk/compiler/src/org/apache/flex/compiler/internal/tree/mxml/MXMLXMLListNode.java?rev=1441654&r1=1441653&r2=1441654&view=diff ============================================================================== --- flex/falcon/trunk/compiler/src/org/apache/flex/compiler/internal/tree/mxml/MXMLXMLListNode.java (original) +++ flex/falcon/trunk/compiler/src/org/apache/flex/compiler/internal/tree/mxml/MXMLXMLListNode.java Fri Feb 1 22:49:11 2013 @@ -21,7 +21,7 @@ package org.apache.flex.compiler.interna import org.apache.flex.compiler.constants.IASLanguageConstants; import org.apache.flex.compiler.internal.tree.as.NodeBase; -import org.apache.flex.compiler.mxml.MXMLTagData; +import org.apache.flex.compiler.mxml.IMXMLTagData; import org.apache.flex.compiler.mxml.MXMLTextData; import org.apache.flex.compiler.problems.MXMLXMLListMixedContentProblem; import org.apache.flex.compiler.tree.ASTNodeID; @@ -51,7 +51,7 @@ class MXMLXMLListNode extends MXMLInstan * initializationComplete, we null out this collection so we don't pin the * MXMLTagData's in memory. */ - private ArrayList childTags = new ArrayList(); + private ArrayList childTags = new ArrayList(); private String xmlString; @@ -74,15 +74,15 @@ class MXMLXMLListNode extends MXMLInstan } @Override - protected void processChildTag(MXMLTreeBuilder builder, MXMLTagData tag, - MXMLTagData childTag, + protected void processChildTag(MXMLTreeBuilder builder, IMXMLTagData tag, + IMXMLTagData childTag, MXMLNodeInfo info) { childTags.add(childTag); } @Override - protected void processChildNonWhitespaceUnit(MXMLTreeBuilder builder, MXMLTagData tag, + protected void processChildNonWhitespaceUnit(MXMLTreeBuilder builder, IMXMLTagData tag, MXMLTextData text, MXMLNodeInfo info) { @@ -98,7 +98,7 @@ class MXMLXMLListNode extends MXMLInstan */ @Override protected void initializationComplete(MXMLTreeBuilder builder, - MXMLTagData tag, + IMXMLTagData tag, MXMLNodeInfo info) { @@ -113,7 +113,7 @@ class MXMLXMLListNode extends MXMLInstan private void analyzeXML(MXMLTreeBuilder builder) { StringWriter sw = new StringWriter(); - for (MXMLTagData tag : childTags) + for (IMXMLTagData tag : childTags) { new XMLBuilder(this, tag, tag.getCompositePrefixMap(), builder).processNode(tag, sw); } Modified: flex/falcon/trunk/compiler/src/org/apache/flex/compiler/internal/tree/mxml/MXMLXMLNode.java URL: http://svn.apache.org/viewvc/flex/falcon/trunk/compiler/src/org/apache/flex/compiler/internal/tree/mxml/MXMLXMLNode.java?rev=1441654&r1=1441653&r2=1441654&view=diff ============================================================================== --- flex/falcon/trunk/compiler/src/org/apache/flex/compiler/internal/tree/mxml/MXMLXMLNode.java (original) +++ flex/falcon/trunk/compiler/src/org/apache/flex/compiler/internal/tree/mxml/MXMLXMLNode.java Fri Feb 1 22:49:11 2013 @@ -27,7 +27,7 @@ import org.apache.flex.compiler.internal import org.apache.flex.compiler.internal.scopes.ASProjectScope; import org.apache.flex.compiler.internal.tree.as.NodeBase; import org.apache.flex.compiler.mxml.IMXMLTagAttributeData; -import org.apache.flex.compiler.mxml.MXMLTagData; +import org.apache.flex.compiler.mxml.IMXMLTagData; import org.apache.flex.compiler.problems.ICompilerProblem; import org.apache.flex.compiler.problems.MXMLDualContentProblem; import org.apache.flex.compiler.problems.MXMLUnknownXMLFormatProblem; @@ -55,7 +55,7 @@ class MXMLXMLNode extends MXMLInstanceNo super(parent); } - private MXMLTagData rootTag; + private IMXMLTagData rootTag; private XML_TYPE xmlType = XML_TYPE.E4X; @@ -86,7 +86,7 @@ class MXMLXMLNode extends MXMLInstanceNo } @Override - protected void processTagSpecificAttribute(MXMLTreeBuilder builder, MXMLTagData tag, + protected void processTagSpecificAttribute(MXMLTreeBuilder builder, IMXMLTagData tag, IMXMLTagAttributeData attribute, MXMLNodeInfo info) { @@ -129,8 +129,8 @@ class MXMLXMLNode extends MXMLInstanceNo } @Override - protected void processChildTag(MXMLTreeBuilder builder, MXMLTagData tag, - MXMLTagData childTag, MXMLNodeInfo info) + protected void processChildTag(MXMLTreeBuilder builder, IMXMLTagData tag, + IMXMLTagData childTag, MXMLNodeInfo info) { info.hasDualContent = true; @@ -161,7 +161,7 @@ class MXMLXMLNode extends MXMLInstanceNo */ @Override protected void initializationComplete(MXMLTreeBuilder builder, - MXMLTagData tag, + IMXMLTagData tag, MXMLNodeInfo info) { super.initializationComplete(builder, tag, info); Modified: flex/falcon/trunk/compiler/src/org/apache/flex/compiler/internal/tree/mxml/XMLBuilder.java URL: http://svn.apache.org/viewvc/flex/falcon/trunk/compiler/src/org/apache/flex/compiler/internal/tree/mxml/XMLBuilder.java?rev=1441654&r1=1441653&r2=1441654&view=diff ============================================================================== --- flex/falcon/trunk/compiler/src/org/apache/flex/compiler/internal/tree/mxml/XMLBuilder.java (original) +++ flex/falcon/trunk/compiler/src/org/apache/flex/compiler/internal/tree/mxml/XMLBuilder.java Fri Feb 1 22:49:11 2013 @@ -27,8 +27,8 @@ import org.apache.flex.abc.semantics.Nss import org.apache.flex.compiler.common.PrefixMap; import org.apache.flex.compiler.internal.as.codegen.InstructionListNode; import org.apache.flex.compiler.mxml.IMXMLTagAttributeData; +import org.apache.flex.compiler.mxml.IMXMLTagData; import org.apache.flex.compiler.mxml.IMXMLTextData; -import org.apache.flex.compiler.mxml.MXMLTagData; import org.apache.flex.compiler.mxml.MXMLTextData; import org.apache.flex.compiler.mxml.MXMLUnitData; import org.apache.flex.compiler.tree.mxml.IMXMLSingleDataBindingNode; @@ -48,7 +48,7 @@ import java.util.Stack; */ class XMLBuilder { - public XMLBuilder(MXMLInstanceNode parent, MXMLTagData rootTag, PrefixMap externalPrefixes, MXMLTreeBuilder builder) + public XMLBuilder(MXMLInstanceNode parent, IMXMLTagData rootTag, PrefixMap externalPrefixes, MXMLTreeBuilder builder) { this.parent = parent; this.rootTag = rootTag; @@ -60,7 +60,7 @@ class XMLBuilder private MXMLInstanceNode parent; private MXMLTreeBuilder builder; - private MXMLTagData rootTag; + private IMXMLTagData rootTag; /** * PrefixMap of the prefix'es defined outside of the contents of the XML @@ -84,7 +84,7 @@ class XMLBuilder * TODO: target expressions for those are (these are the expressions to set * the value in the XML object when the TODO: PropertyChange event fires). */ - void processNode(MXMLTagData tag, + void processNode(IMXMLTagData tag, StringWriter sw) { sw.write('<'); @@ -149,7 +149,7 @@ class XMLBuilder } sw.write(childrenSW.toString()); - MXMLTagData endTag = tag.findMatchingEndTag(); + IMXMLTagData endTag = tag.findMatchingEndTag(); if (endTag != null) { processNode(endTag, sw); @@ -165,7 +165,7 @@ class XMLBuilder * @param prefix the prefix to look for * @param tag the tag to start looking in */ - void lookupPrefix(String prefix, MXMLTagData tag) + void lookupPrefix(String prefix, IMXMLTagData tag) { while (tag != null) { @@ -390,25 +390,25 @@ class XMLBuilder while (parentStack.size() > 1) { MXMLUnitData unitData = parentStack.pop(); - if (unitData instanceof MXMLTagData) + if (unitData instanceof IMXMLTagData) { - generateGetInstructions(il, (MXMLTagData)unitData); + generateGetInstructions(il, (IMXMLTagData)unitData); } } - if (target instanceof MXMLTagData) + if (target instanceof IMXMLTagData) { // Targeting a Tag if (attr == null) { // Just setting the tag value - generateSetInstructions(il, (MXMLTagData)target); + generateSetInstructions(il, (IMXMLTagData)target); } else { // We have an attr, do a get for the tag, and a set // for the attr - generateGetInstructions(il, (MXMLTagData)target); + generateGetInstructions(il, (IMXMLTagData)target); generateSetInstructions(il, attr); } } @@ -428,7 +428,7 @@ class XMLBuilder * the instructions to place b on the stack were already generated - this * method will only compute the instructions to get c from b */ - private void generateGetInstructions(InstructionList il, MXMLTagData tag) + private void generateGetInstructions(InstructionList il, IMXMLTagData tag) { if (tag == rootTag) { @@ -452,7 +452,7 @@ class XMLBuilder * has 1 argument, which is the new value, so we know it's passed in as the * first local. */ - private void generateSetInstructions(InstructionList il, MXMLTagData tag) + private void generateSetInstructions(InstructionList il, IMXMLTagData tag) { if (tag == rootTag) { @@ -508,12 +508,12 @@ class XMLBuilder * Get the index of a tag. Grabs the parent tag, and iterates it's children * to find out what the index of the tag passed in should be */ - private int getIndexOfTag(MXMLTagData tag) + private int getIndexOfTag(IMXMLTagData tag) { - MXMLTagData parent = tag.getParentTag(); + IMXMLTagData parent = tag.getParentTag(); int index = 0; - for (MXMLTagData d = parent.getFirstChild(true); d != null; d = d.getNextSibling(true)) + for (IMXMLTagData d = parent.getFirstChild(true); d != null; d = d.getNextSibling(true)) { if (d == tag) break; @@ -532,7 +532,7 @@ class XMLBuilder { MXMLUnitData parent = text.getParentUnitData(); - MXMLTagData parentTag = parent instanceof MXMLTagData ? (MXMLTagData)parent : null; + IMXMLTagData parentTag = parent instanceof IMXMLTagData ? (IMXMLTagData)parent : null; int index = 0; if (parentTag != null) @@ -558,7 +558,7 @@ class XMLBuilder if (child instanceof MXMLTextData && ((MXMLTextData)child).getTextType() == IMXMLTextData.TextType.TEXT) { MXMLUnitData p = child.getParentUnitData(); - MXMLTagData parent = p instanceof MXMLTagData ? (MXMLTagData)p : null; + IMXMLTagData parent = p instanceof IMXMLTagData ? (IMXMLTagData)p : null; if (parent != null) { return parent.getFirstChildUnit() == child && child.getNextSiblingUnit() == null; @@ -570,7 +570,7 @@ class XMLBuilder /** * Generate an AET Name that corresponds to the tag passed in */ - private Name getNameForTag(MXMLTagData tag) + private Name getNameForTag(IMXMLTagData tag) { if (tag == rootTag) { @@ -659,7 +659,7 @@ class XMLBuilder * @param tag The * @return */ - List getAttributes(MXMLTagData tag) + List getAttributes(IMXMLTagData tag) { IMXMLTagAttributeData[] rawAttrs = tag.getAttributeDatas(); if (rawAttrs != null) @@ -690,8 +690,8 @@ class XMLBuilder void processNode(MXMLUnitData node, StringWriter sw) { - if (node instanceof MXMLTagData) - processNode((MXMLTagData)node, sw); + if (node instanceof IMXMLTagData) + processNode((IMXMLTagData)node, sw); else if (node instanceof MXMLTextData) processNode((MXMLTextData)node, sw); } Modified: flex/falcon/trunk/compiler/src/org/apache/flex/compiler/mxml/IMXMLData.java URL: http://svn.apache.org/viewvc/flex/falcon/trunk/compiler/src/org/apache/flex/compiler/mxml/IMXMLData.java?rev=1441654&r1=1441653&r2=1441654&view=diff ============================================================================== --- flex/falcon/trunk/compiler/src/org/apache/flex/compiler/mxml/IMXMLData.java (original) +++ flex/falcon/trunk/compiler/src/org/apache/flex/compiler/mxml/IMXMLData.java Fri Feb 1 22:49:11 2013 @@ -21,6 +21,7 @@ package org.apache.flex.compiler.mxml; import java.util.Collection; +import org.apache.flex.compiler.filespecs.IFileSpecification; import org.apache.flex.compiler.internal.mxml.MXMLDialect; import org.apache.flex.compiler.problems.ICompilerProblem; @@ -31,6 +32,13 @@ import org.apache.flex.compiler.problems public interface IMXMLData { /** + * Gets the file on disk that created this {@link MXMLData}. + * + * @return The file as an {@code IFileSpecification}. + */ + IFileSpecification getFileSpecification(); + + /** * Gets the path to the file on disk that created this {@link MXMLData}. * * @return The path as a {@code String}. @@ -79,5 +87,5 @@ public interface IMXMLData * * @return An {@code MXMLTagData} for the root tag. */ - MXMLTagData getRootTag(); + IMXMLTagData getRootTag(); } Added: flex/falcon/trunk/compiler/src/org/apache/flex/compiler/mxml/IMXMLTagData.java URL: http://svn.apache.org/viewvc/flex/falcon/trunk/compiler/src/org/apache/flex/compiler/mxml/IMXMLTagData.java?rev=1441654&view=auto ============================================================================== --- flex/falcon/trunk/compiler/src/org/apache/flex/compiler/mxml/IMXMLTagData.java (added) +++ flex/falcon/trunk/compiler/src/org/apache/flex/compiler/mxml/IMXMLTagData.java Fri Feb 1 22:49:11 2013 @@ -0,0 +1,78 @@ +/* + * + * 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.compiler.mxml; + +import org.apache.flex.compiler.common.ISourceLocation; +import org.apache.flex.compiler.common.PrefixMap; +import org.apache.flex.compiler.common.XMLName; +import org.apache.flex.compiler.filespecs.IFileSpecification; +import org.apache.flex.compiler.internal.mxml.MXMLDialect; + +/** + * Encapsulation of an open tag, a close tag, or an empty tag in MXML. + */ +public interface IMXMLTagData extends ISourceLocation +{ + IFileSpecification getSource(); + + MXMLDialect getMXMLDialect(); + + IMXMLData getParent(); + + IMXMLTagData getParentTag(); + + boolean isEmptyTag(); + + boolean isCloseTag(); + + String getPrefix(); + + PrefixMap getPrefixMap(); + + PrefixMap getCompositePrefixMap(); + + String getURI(); + + String getName(); + + String getShortName(); + + XMLName getXMLName(); + + String getStateName(); + + IMXMLTagAttributeData[] getAttributeDatas(); + + IMXMLTagAttributeData getTagAttributeData(String attributeName); + + String getRawAttributeValue(String attributeName); + + ISourceLocation getLocationOfChildUnits(); + + MXMLUnitData getFirstChildUnit(); + + IMXMLTagData getFirstChild(boolean includeEmptyTags); + + IMXMLTagData getNextSibling(boolean includeEmptyTags); + + IMXMLTagData findMatchingEndTag(); + + String getCompilableText(); +} Propchange: flex/falcon/trunk/compiler/src/org/apache/flex/compiler/mxml/IMXMLTagData.java ------------------------------------------------------------------------------ svn:eol-style = native Modified: flex/falcon/trunk/compiler/src/org/apache/flex/compiler/mxml/IXMLNameResolver.java URL: http://svn.apache.org/viewvc/flex/falcon/trunk/compiler/src/org/apache/flex/compiler/mxml/IXMLNameResolver.java?rev=1441654&r1=1441653&r2=1441654&view=diff ============================================================================== --- flex/falcon/trunk/compiler/src/org/apache/flex/compiler/mxml/IXMLNameResolver.java (original) +++ flex/falcon/trunk/compiler/src/org/apache/flex/compiler/mxml/IXMLNameResolver.java Fri Feb 1 22:49:11 2013 @@ -40,7 +40,7 @@ public interface IXMLNameResolver * example) and package namespaces such as . Note: This method should only be * called when resolving a tag outside the context of an MXML file. Normally - * {@link org.apache.flex.compiler.internal.scopes.MXMLFileScope#resolveTagToQualifiedName(MXMLTagData)} should be used instead. + * {@link org.apache.flex.compiler.internal.scopes.MXMLFileScope#resolveTagToQualifiedName(IMXMLTagData)} should be used instead. * * @param tagXMLName An {@link XMLName} to resolve to a fully-qualified * ActionScript class name. Modified: flex/falcon/trunk/compiler/src/org/apache/flex/compiler/mxml/MXMLTagData.java URL: http://svn.apache.org/viewvc/flex/falcon/trunk/compiler/src/org/apache/flex/compiler/mxml/MXMLTagData.java?rev=1441654&r1=1441653&r2=1441654&view=diff ============================================================================== --- flex/falcon/trunk/compiler/src/org/apache/flex/compiler/mxml/MXMLTagData.java (original) +++ flex/falcon/trunk/compiler/src/org/apache/flex/compiler/mxml/MXMLTagData.java Fri Feb 1 22:49:11 2013 @@ -45,7 +45,7 @@ import org.apache.flex.utils.FastStack; /** * Encapsulation of an open tag, a close tag, or an empty tag in MXML. */ -public class MXMLTagData extends MXMLUnitData +public class MXMLTagData extends MXMLUnitData implements IMXMLTagData { private static final MXMLTagAttributeData[] NO_ATTRIBUTES = new MXMLTagAttributeData[0]; Modified: flex/falcon/trunk/compiler/src/org/apache/flex/compiler/problems/MXMLClassNodeProblem.java URL: http://svn.apache.org/viewvc/flex/falcon/trunk/compiler/src/org/apache/flex/compiler/problems/MXMLClassNodeProblem.java?rev=1441654&r1=1441653&r2=1441654&view=diff ============================================================================== --- flex/falcon/trunk/compiler/src/org/apache/flex/compiler/problems/MXMLClassNodeProblem.java (original) +++ flex/falcon/trunk/compiler/src/org/apache/flex/compiler/problems/MXMLClassNodeProblem.java Fri Feb 1 22:49:11 2013 @@ -19,7 +19,7 @@ package org.apache.flex.compiler.problems; -import org.apache.flex.compiler.mxml.MXMLTagData; +import org.apache.flex.compiler.mxml.IMXMLTagData; /** * Problem generated when a qname from MXML doesn't specify a class or interface. @@ -31,7 +31,7 @@ public final class MXMLClassNodeProblem public static final int errorCode = 1406; - public MXMLClassNodeProblem(MXMLTagData site, String qname) + public MXMLClassNodeProblem(IMXMLTagData site, String qname) { super(site); this.qname = qname; Modified: flex/falcon/trunk/compiler/src/org/apache/flex/compiler/problems/MXMLDualContentProblem.java URL: http://svn.apache.org/viewvc/flex/falcon/trunk/compiler/src/org/apache/flex/compiler/problems/MXMLDualContentProblem.java?rev=1441654&r1=1441653&r2=1441654&view=diff ============================================================================== --- flex/falcon/trunk/compiler/src/org/apache/flex/compiler/problems/MXMLDualContentProblem.java (original) +++ flex/falcon/trunk/compiler/src/org/apache/flex/compiler/problems/MXMLDualContentProblem.java Fri Feb 1 22:49:11 2013 @@ -19,7 +19,7 @@ package org.apache.flex.compiler.problems; -import org.apache.flex.compiler.mxml.MXMLTagData; +import org.apache.flex.compiler.mxml.IMXMLTagData; /** * Problem generated when a tag with a source attribute @@ -31,7 +31,7 @@ public final class MXMLDualContentProble "The <${tagName}> tag must be empty if the '${SOURCE}' attribute is specified. The internal content will be ignored."; public static final int errorCode = 1540; - public MXMLDualContentProblem(MXMLTagData site, String tagName) + public MXMLDualContentProblem(IMXMLTagData site, String tagName) { super(site); this.tagName = tagName; Modified: flex/falcon/trunk/compiler/src/org/apache/flex/compiler/problems/MXMLDuplicateChildTagProblem.java URL: http://svn.apache.org/viewvc/flex/falcon/trunk/compiler/src/org/apache/flex/compiler/problems/MXMLDuplicateChildTagProblem.java?rev=1441654&r1=1441653&r2=1441654&view=diff ============================================================================== --- flex/falcon/trunk/compiler/src/org/apache/flex/compiler/problems/MXMLDuplicateChildTagProblem.java (original) +++ flex/falcon/trunk/compiler/src/org/apache/flex/compiler/problems/MXMLDuplicateChildTagProblem.java Fri Feb 1 22:49:11 2013 @@ -19,7 +19,7 @@ package org.apache.flex.compiler.problems; -import org.apache.flex.compiler.mxml.MXMLTagData; +import org.apache.flex.compiler.mxml.IMXMLTagData; /** * Problem generated for a duplicate child tag on an MXML tag. @@ -30,7 +30,7 @@ public final class MXMLDuplicateChildTag "Child tag '${childTag}' bound to namespace '${childNamespace}' is already specified for element '${element}'. It will be ignored."; public static final int errorCode = 1409; - public MXMLDuplicateChildTagProblem(MXMLTagData tag) + public MXMLDuplicateChildTagProblem(IMXMLTagData tag) { super(tag); childTag = tag.getShortName(); Modified: flex/falcon/trunk/compiler/src/org/apache/flex/compiler/problems/MXMLFinalClassProblem.java URL: http://svn.apache.org/viewvc/flex/falcon/trunk/compiler/src/org/apache/flex/compiler/problems/MXMLFinalClassProblem.java?rev=1441654&r1=1441653&r2=1441654&view=diff ============================================================================== --- flex/falcon/trunk/compiler/src/org/apache/flex/compiler/problems/MXMLFinalClassProblem.java (original) +++ flex/falcon/trunk/compiler/src/org/apache/flex/compiler/problems/MXMLFinalClassProblem.java Fri Feb 1 22:49:11 2013 @@ -19,7 +19,7 @@ package org.apache.flex.compiler.problems; -import org.apache.flex.compiler.mxml.MXMLTagData; +import org.apache.flex.compiler.mxml.IMXMLTagData; /** * Problem generated when the root tag in an MXML file @@ -32,7 +32,7 @@ public final class MXMLFinalClassProblem public static final int errorCode = 1412; - public MXMLFinalClassProblem(MXMLTagData site, String qname) + public MXMLFinalClassProblem(IMXMLTagData site, String qname) { super(site); this.qname = qname; Modified: flex/falcon/trunk/compiler/src/org/apache/flex/compiler/problems/MXMLIncludeInAndExcludeFromProblem.java URL: http://svn.apache.org/viewvc/flex/falcon/trunk/compiler/src/org/apache/flex/compiler/problems/MXMLIncludeInAndExcludeFromProblem.java?rev=1441654&r1=1441653&r2=1441654&view=diff ============================================================================== --- flex/falcon/trunk/compiler/src/org/apache/flex/compiler/problems/MXMLIncludeInAndExcludeFromProblem.java (original) +++ flex/falcon/trunk/compiler/src/org/apache/flex/compiler/problems/MXMLIncludeInAndExcludeFromProblem.java Fri Feb 1 22:49:11 2013 @@ -19,7 +19,7 @@ package org.apache.flex.compiler.problems; -import org.apache.flex.compiler.mxml.MXMLTagData; +import org.apache.flex.compiler.mxml.IMXMLTagData; /** * Problem generated when includeIn and excludeFrom @@ -31,7 +31,7 @@ public final class MXMLIncludeInAndExclu "The '${INCLUDE_IN}' and '${EXCLUDE_FROM}' attributes cannot be specified on this same tag. Both will be ignored."; public static final int errorCode = 1413; - public MXMLIncludeInAndExcludeFromProblem(MXMLTagData site) + public MXMLIncludeInAndExcludeFromProblem(IMXMLTagData site) { super(site); } Modified: flex/falcon/trunk/compiler/src/org/apache/flex/compiler/problems/MXMLIncompatibleArrayElementProblem.java URL: http://svn.apache.org/viewvc/flex/falcon/trunk/compiler/src/org/apache/flex/compiler/problems/MXMLIncompatibleArrayElementProblem.java?rev=1441654&r1=1441653&r2=1441654&view=diff ============================================================================== --- flex/falcon/trunk/compiler/src/org/apache/flex/compiler/problems/MXMLIncompatibleArrayElementProblem.java (original) +++ flex/falcon/trunk/compiler/src/org/apache/flex/compiler/problems/MXMLIncompatibleArrayElementProblem.java Fri Feb 1 22:49:11 2013 @@ -19,7 +19,7 @@ package org.apache.flex.compiler.problems; -import org.apache.flex.compiler.mxml.MXMLTagData; +import org.apache.flex.compiler.mxml.IMXMLTagData; /** * Problem generated when an element of a property value of type Array @@ -31,7 +31,7 @@ public final class MXMLIncompatibleArray "An array element of type '${actualType}' is incompatible with the expected [${ARRAY_ELEMENT_TYPE}] of '${expectedType}' for the '${propertyName}' property."; public static final int errorCode = 1414; - public MXMLIncompatibleArrayElementProblem(MXMLTagData site, String propertyName, String expectedType, String actualType) + public MXMLIncompatibleArrayElementProblem(IMXMLTagData site, String propertyName, String expectedType, String actualType) { super(site); this.propertyName = propertyName; Modified: flex/falcon/trunk/compiler/src/org/apache/flex/compiler/problems/MXMLIncompatibleVectorElementProblem.java URL: http://svn.apache.org/viewvc/flex/falcon/trunk/compiler/src/org/apache/flex/compiler/problems/MXMLIncompatibleVectorElementProblem.java?rev=1441654&r1=1441653&r2=1441654&view=diff ============================================================================== --- flex/falcon/trunk/compiler/src/org/apache/flex/compiler/problems/MXMLIncompatibleVectorElementProblem.java (original) +++ flex/falcon/trunk/compiler/src/org/apache/flex/compiler/problems/MXMLIncompatibleVectorElementProblem.java Fri Feb 1 22:49:11 2013 @@ -19,7 +19,7 @@ package org.apache.flex.compiler.problems; -import org.apache.flex.compiler.mxml.MXMLTagData; +import org.apache.flex.compiler.mxml.IMXMLTagData; /** * Problem generated for an incompatible vector element. @@ -30,7 +30,7 @@ public final class MXMLIncompatibleVecto "This element is incompatible with the ${VECTOR} type. It will be ignored."; public static final int errorCode = 1415; - public MXMLIncompatibleVectorElementProblem(MXMLTagData site) + public MXMLIncompatibleVectorElementProblem(IMXMLTagData site) { super(site); } Modified: flex/falcon/trunk/compiler/src/org/apache/flex/compiler/problems/MXMLLibraryTagNotTheFirstChildProblem.java URL: http://svn.apache.org/viewvc/flex/falcon/trunk/compiler/src/org/apache/flex/compiler/problems/MXMLLibraryTagNotTheFirstChildProblem.java?rev=1441654&r1=1441653&r2=1441654&view=diff ============================================================================== --- flex/falcon/trunk/compiler/src/org/apache/flex/compiler/problems/MXMLLibraryTagNotTheFirstChildProblem.java (original) +++ flex/falcon/trunk/compiler/src/org/apache/flex/compiler/problems/MXMLLibraryTagNotTheFirstChildProblem.java Fri Feb 1 22:49:11 2013 @@ -19,7 +19,7 @@ package org.apache.flex.compiler.problems; -import org.apache.flex.compiler.mxml.MXMLTagData; +import org.apache.flex.compiler.mxml.IMXMLTagData; /** * Problem generated when Library tag is not the first child inside a tag that defines a class. @@ -31,7 +31,7 @@ public final class MXMLLibraryTagNotTheF public static final int errorCode = 1428; - public MXMLLibraryTagNotTheFirstChildProblem(MXMLTagData tag) + public MXMLLibraryTagNotTheFirstChildProblem(IMXMLTagData tag) { super(tag); } Modified: flex/falcon/trunk/compiler/src/org/apache/flex/compiler/problems/MXMLMissingVectorTypeAttributeProblem.java URL: http://svn.apache.org/viewvc/flex/falcon/trunk/compiler/src/org/apache/flex/compiler/problems/MXMLMissingVectorTypeAttributeProblem.java?rev=1441654&r1=1441653&r2=1441654&view=diff ============================================================================== --- flex/falcon/trunk/compiler/src/org/apache/flex/compiler/problems/MXMLMissingVectorTypeAttributeProblem.java (original) +++ flex/falcon/trunk/compiler/src/org/apache/flex/compiler/problems/MXMLMissingVectorTypeAttributeProblem.java Fri Feb 1 22:49:11 2013 @@ -19,7 +19,7 @@ package org.apache.flex.compiler.problems; -import org.apache.flex.compiler.mxml.MXMLTagData; +import org.apache.flex.compiler.mxml.IMXMLTagData; /** * Problem generated when a {@code } tag does not have a type attribute. @@ -31,7 +31,7 @@ public final class MXMLMissingVectorType public static final int errorCode = 1430; - public MXMLMissingVectorTypeAttributeProblem(MXMLTagData site) + public MXMLMissingVectorTypeAttributeProblem(IMXMLTagData site) { super(site); } Modified: flex/falcon/trunk/compiler/src/org/apache/flex/compiler/problems/MXMLNotAClassProblem.java URL: http://svn.apache.org/viewvc/flex/falcon/trunk/compiler/src/org/apache/flex/compiler/problems/MXMLNotAClassProblem.java?rev=1441654&r1=1441653&r2=1441654&view=diff ============================================================================== --- flex/falcon/trunk/compiler/src/org/apache/flex/compiler/problems/MXMLNotAClassProblem.java (original) +++ flex/falcon/trunk/compiler/src/org/apache/flex/compiler/problems/MXMLNotAClassProblem.java Fri Feb 1 22:49:11 2013 @@ -19,7 +19,7 @@ package org.apache.flex.compiler.problems; -import org.apache.flex.compiler.mxml.MXMLTagData; +import org.apache.flex.compiler.mxml.IMXMLTagData; /** * Problem generated when an MXML tag that should resolve to a class @@ -32,7 +32,7 @@ public final class MXMLNotAClassProblem public static final int errorCode = 1433; - public MXMLNotAClassProblem(MXMLTagData site, String qname) + public MXMLNotAClassProblem(IMXMLTagData site, String qname) { super(site); this.qname = qname; Modified: flex/falcon/trunk/compiler/src/org/apache/flex/compiler/problems/MXMLPrivateTagLocationProblem.java URL: http://svn.apache.org/viewvc/flex/falcon/trunk/compiler/src/org/apache/flex/compiler/problems/MXMLPrivateTagLocationProblem.java?rev=1441654&r1=1441653&r2=1441654&view=diff ============================================================================== --- flex/falcon/trunk/compiler/src/org/apache/flex/compiler/problems/MXMLPrivateTagLocationProblem.java (original) +++ flex/falcon/trunk/compiler/src/org/apache/flex/compiler/problems/MXMLPrivateTagLocationProblem.java Fri Feb 1 22:49:11 2013 @@ -19,7 +19,7 @@ package org.apache.flex.compiler.problems; -import org.apache.flex.compiler.mxml.MXMLTagData; +import org.apache.flex.compiler.mxml.IMXMLTagData; /** * Problem generated when a {@code } tag is found in the wrong location. @@ -31,7 +31,7 @@ public final class MXMLPrivateTagLocatio public static final int errorCode = 1438; - public MXMLPrivateTagLocationProblem(MXMLTagData site) + public MXMLPrivateTagLocationProblem(IMXMLTagData site) { super(site); } Modified: flex/falcon/trunk/compiler/src/org/apache/flex/compiler/problems/MXMLRequiredAttributeProblem.java URL: http://svn.apache.org/viewvc/flex/falcon/trunk/compiler/src/org/apache/flex/compiler/problems/MXMLRequiredAttributeProblem.java?rev=1441654&r1=1441653&r2=1441654&view=diff ============================================================================== --- flex/falcon/trunk/compiler/src/org/apache/flex/compiler/problems/MXMLRequiredAttributeProblem.java (original) +++ flex/falcon/trunk/compiler/src/org/apache/flex/compiler/problems/MXMLRequiredAttributeProblem.java Fri Feb 1 22:49:11 2013 @@ -19,7 +19,7 @@ package org.apache.flex.compiler.problems; -import org.apache.flex.compiler.mxml.MXMLTagData; +import org.apache.flex.compiler.mxml.IMXMLTagData; /** * Problem generated when an MXML tag lacks a required attribute. @@ -31,7 +31,7 @@ public final class MXMLRequiredAttribute public static final int errorCode = 1439; - public MXMLRequiredAttributeProblem(MXMLTagData tag, String attributeName) + public MXMLRequiredAttributeProblem(IMXMLTagData tag, String attributeName) { super(tag); this.tagName = tag.getShortName(); Modified: flex/falcon/trunk/compiler/src/org/apache/flex/compiler/problems/MXMLSameBindingSourceAndDestinationProblem.java URL: http://svn.apache.org/viewvc/flex/falcon/trunk/compiler/src/org/apache/flex/compiler/problems/MXMLSameBindingSourceAndDestinationProblem.java?rev=1441654&r1=1441653&r2=1441654&view=diff ============================================================================== --- flex/falcon/trunk/compiler/src/org/apache/flex/compiler/problems/MXMLSameBindingSourceAndDestinationProblem.java (original) +++ flex/falcon/trunk/compiler/src/org/apache/flex/compiler/problems/MXMLSameBindingSourceAndDestinationProblem.java Fri Feb 1 22:49:11 2013 @@ -19,7 +19,7 @@ package org.apache.flex.compiler.problems; -import org.apache.flex.compiler.mxml.MXMLTagData; +import org.apache.flex.compiler.mxml.IMXMLTagData; /** * Problem generated when the source and destination @@ -31,7 +31,7 @@ public final class MXMLSameBindingSource "Binding source and destination cannot be the same. This tag will be ignored."; public static final int errorCode = 1440; - public MXMLSameBindingSourceAndDestinationProblem(MXMLTagData site) + public MXMLSameBindingSourceAndDestinationProblem(IMXMLTagData site) { super(site); } Modified: flex/falcon/trunk/compiler/src/org/apache/flex/compiler/problems/MXMLSemanticProblem.java URL: http://svn.apache.org/viewvc/flex/falcon/trunk/compiler/src/org/apache/flex/compiler/problems/MXMLSemanticProblem.java?rev=1441654&r1=1441653&r2=1441654&view=diff ============================================================================== --- flex/falcon/trunk/compiler/src/org/apache/flex/compiler/problems/MXMLSemanticProblem.java (original) +++ flex/falcon/trunk/compiler/src/org/apache/flex/compiler/problems/MXMLSemanticProblem.java Fri Feb 1 22:49:11 2013 @@ -25,7 +25,7 @@ import org.apache.flex.compiler.common.I * This is the base class for semantic problems in MXML documents. *

* Note that its constructors allow you to pass MXML DOM objects - * such as {@link org.apache.flex.compiler.mxml.MXMLTagData} and {@link org.apache.flex.compiler.mxml.IMXMLTagAttributeData}, + * such as {@link org.apache.flex.compiler.mxml.IMXMLTagData} and {@link org.apache.flex.compiler.mxml.IMXMLTagAttributeData}, * from which the problem location is derived. */ public class MXMLSemanticProblem extends SemanticProblem Modified: flex/falcon/trunk/compiler/src/org/apache/flex/compiler/problems/MXMLSyntaxProblem.java URL: http://svn.apache.org/viewvc/flex/falcon/trunk/compiler/src/org/apache/flex/compiler/problems/MXMLSyntaxProblem.java?rev=1441654&r1=1441653&r2=1441654&view=diff ============================================================================== --- flex/falcon/trunk/compiler/src/org/apache/flex/compiler/problems/MXMLSyntaxProblem.java (original) +++ flex/falcon/trunk/compiler/src/org/apache/flex/compiler/problems/MXMLSyntaxProblem.java Fri Feb 1 22:49:11 2013 @@ -25,7 +25,7 @@ import org.apache.flex.compiler.common.I * This is the base class for syntax problems in MXML documents. *

* Note that its constructors allow you to pass MXML DOM objects - * such as {@link org.apache.flex.compiler.mxml.MXMLTagData} and {@link org.apache.flex.compiler.mxml.IMXMLTagAttributeData}, + * such as {@link org.apache.flex.compiler.mxml.IMXMLTagData} and {@link org.apache.flex.compiler.mxml.IMXMLTagAttributeData}, * from which the problem location is derived. */ public abstract class MXMLSyntaxProblem extends CompilerProblem Modified: flex/falcon/trunk/compiler/src/org/apache/flex/compiler/problems/MXMLUnexpectedTagProblem.java URL: http://svn.apache.org/viewvc/flex/falcon/trunk/compiler/src/org/apache/flex/compiler/problems/MXMLUnexpectedTagProblem.java?rev=1441654&r1=1441653&r2=1441654&view=diff ============================================================================== --- flex/falcon/trunk/compiler/src/org/apache/flex/compiler/problems/MXMLUnexpectedTagProblem.java (original) +++ flex/falcon/trunk/compiler/src/org/apache/flex/compiler/problems/MXMLUnexpectedTagProblem.java Fri Feb 1 22:49:11 2013 @@ -19,7 +19,7 @@ package org.apache.flex.compiler.problems; -import org.apache.flex.compiler.mxml.MXMLTagData; +import org.apache.flex.compiler.mxml.IMXMLTagData; /** * Problem generated for an unexpected MXML tag. @@ -31,7 +31,7 @@ public final class MXMLUnexpectedTagProb public static final int errorCode = 1443; - public MXMLUnexpectedTagProblem(MXMLTagData site) + public MXMLUnexpectedTagProblem(IMXMLTagData site) { super(site); } Modified: flex/falcon/trunk/compiler/src/org/apache/flex/compiler/problems/MXMLUnknownNamespaceProblem.java URL: http://svn.apache.org/viewvc/flex/falcon/trunk/compiler/src/org/apache/flex/compiler/problems/MXMLUnknownNamespaceProblem.java?rev=1441654&r1=1441653&r2=1441654&view=diff ============================================================================== --- flex/falcon/trunk/compiler/src/org/apache/flex/compiler/problems/MXMLUnknownNamespaceProblem.java (original) +++ flex/falcon/trunk/compiler/src/org/apache/flex/compiler/problems/MXMLUnknownNamespaceProblem.java Fri Feb 1 22:49:11 2013 @@ -19,7 +19,7 @@ package org.apache.flex.compiler.problems; -import org.apache.flex.compiler.mxml.MXMLTagData; +import org.apache.flex.compiler.mxml.IMXMLTagData; /** * Diagnostic emitted when a namespace cannot be resolved. @@ -31,7 +31,7 @@ public class MXMLUnknownNamespaceProblem public static final int errorCode = 1446; - public MXMLUnknownNamespaceProblem(MXMLTagData site, String namespaceName) + public MXMLUnknownNamespaceProblem(IMXMLTagData site, String namespaceName) { super(site); this.namespaceName = namespaceName; Modified: flex/falcon/trunk/compiler/src/org/apache/flex/compiler/problems/MXMLUnresolvedTagProblem.java URL: http://svn.apache.org/viewvc/flex/falcon/trunk/compiler/src/org/apache/flex/compiler/problems/MXMLUnresolvedTagProblem.java?rev=1441654&r1=1441653&r2=1441654&view=diff ============================================================================== --- flex/falcon/trunk/compiler/src/org/apache/flex/compiler/problems/MXMLUnresolvedTagProblem.java (original) +++ flex/falcon/trunk/compiler/src/org/apache/flex/compiler/problems/MXMLUnresolvedTagProblem.java Fri Feb 1 22:49:11 2013 @@ -19,7 +19,7 @@ package org.apache.flex.compiler.problems; -import org.apache.flex.compiler.mxml.MXMLTagData; +import org.apache.flex.compiler.mxml.IMXMLTagData; /** * Problem generated when an MXML tag that should resolve @@ -32,7 +32,7 @@ public final class MXMLUnresolvedTagProb public static final int errorCode = 1450; - public MXMLUnresolvedTagProblem(MXMLTagData site) + public MXMLUnresolvedTagProblem(IMXMLTagData site) { super(site); } Modified: flex/falcon/trunk/compiler/src/org/apache/flex/compiler/problems/MXMLXMLListMixedContentProblem.java URL: http://svn.apache.org/viewvc/flex/falcon/trunk/compiler/src/org/apache/flex/compiler/problems/MXMLXMLListMixedContentProblem.java?rev=1441654&r1=1441653&r2=1441654&view=diff ============================================================================== --- flex/falcon/trunk/compiler/src/org/apache/flex/compiler/problems/MXMLXMLListMixedContentProblem.java (original) +++ flex/falcon/trunk/compiler/src/org/apache/flex/compiler/problems/MXMLXMLListMixedContentProblem.java Fri Feb 1 22:49:11 2013 @@ -19,7 +19,7 @@ package org.apache.flex.compiler.problems; -import org.apache.flex.compiler.mxml.MXMLUnitData; +import org.apache.flex.compiler.common.ISourceLocation; /** * Problem generated when an {@code } tag contains mixed content. @@ -31,7 +31,7 @@ public final class MXMLXMLListMixedConte public static final int errorCode = 1452; - public MXMLXMLListMixedContentProblem(MXMLUnitData site) + public MXMLXMLListMixedContentProblem(ISourceLocation site) { super(site); } Modified: flex/falcon/trunk/compiler/src/org/apache/flex/compiler/problems/MXMLXMLOnlyOneRootTagProblem.java URL: http://svn.apache.org/viewvc/flex/falcon/trunk/compiler/src/org/apache/flex/compiler/problems/MXMLXMLOnlyOneRootTagProblem.java?rev=1441654&r1=1441653&r2=1441654&view=diff ============================================================================== --- flex/falcon/trunk/compiler/src/org/apache/flex/compiler/problems/MXMLXMLOnlyOneRootTagProblem.java (original) +++ flex/falcon/trunk/compiler/src/org/apache/flex/compiler/problems/MXMLXMLOnlyOneRootTagProblem.java Fri Feb 1 22:49:11 2013 @@ -19,7 +19,7 @@ package org.apache.flex.compiler.problems; -import org.apache.flex.compiler.mxml.MXMLUnitData; +import org.apache.flex.compiler.common.ISourceLocation; /** * Problem generated when an {@code } tag has more than one root tag. @@ -32,7 +32,7 @@ public final class MXMLXMLOnlyOneRootTag public static final int errorCode = 1455; - public MXMLXMLOnlyOneRootTagProblem(MXMLUnitData site) + public MXMLXMLOnlyOneRootTagProblem(ISourceLocation site) { super(site); } Modified: flex/falcon/trunk/compiler/src/org/apache/flex/compiler/tree/mxml/IMXMLXMLListNode.java URL: http://svn.apache.org/viewvc/flex/falcon/trunk/compiler/src/org/apache/flex/compiler/tree/mxml/IMXMLXMLListNode.java?rev=1441654&r1=1441653&r2=1441654&view=diff ============================================================================== --- flex/falcon/trunk/compiler/src/org/apache/flex/compiler/tree/mxml/IMXMLXMLListNode.java (original) +++ flex/falcon/trunk/compiler/src/org/apache/flex/compiler/tree/mxml/IMXMLXMLListNode.java Fri Feb 1 22:49:11 2013 @@ -19,13 +19,13 @@ package org.apache.flex.compiler.tree.mxml; -import org.apache.flex.compiler.mxml.MXMLTagData; +import org.apache.flex.compiler.mxml.IMXMLTagData; /** * This AST node represents an MXML <XMLList> tag. *

* An {@link IMXMLXMLListNode} has no child nodes, but it stores references to - * zero or more {@link MXMLTagData} objects, which represent the XML tags inside + * zero or more {@link IMXMLTagData} objects, which represent the XML tags inside * the <XMLList> tag. */ public interface IMXMLXMLListNode extends IMXMLInstanceNode Modified: flex/falcon/trunk/compiler/src/org/apache/flex/compiler/tree/mxml/IMXMLXMLNode.java URL: http://svn.apache.org/viewvc/flex/falcon/trunk/compiler/src/org/apache/flex/compiler/tree/mxml/IMXMLXMLNode.java?rev=1441654&r1=1441653&r2=1441654&view=diff ============================================================================== --- flex/falcon/trunk/compiler/src/org/apache/flex/compiler/tree/mxml/IMXMLXMLNode.java (original) +++ flex/falcon/trunk/compiler/src/org/apache/flex/compiler/tree/mxml/IMXMLXMLNode.java Fri Feb 1 22:49:11 2013 @@ -19,13 +19,13 @@ package org.apache.flex.compiler.tree.mxml; -import org.apache.flex.compiler.mxml.MXMLTagData; +import org.apache.flex.compiler.mxml.IMXMLTagData; /** * This AST node represents an MXML <XML> tag. *

* An {@link IMXMLXMLNode} has no child nodes, but it stores a reference to an - * {@link MXMLTagData} object which represents the single XML tag inside the + * {@link IMXMLTagData} object which represents the single XML tag inside the * <XML> tag. */ public interface IMXMLXMLNode extends IMXMLNode