You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flex.apache.org by go...@apache.org on 2013/02/01 23:49:13 UTC
svn commit: r1441654 [1/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/
Author: gordonsmith
Date: Fri Feb 1 22:49:11 2013
New Revision: 1441654
URL: http://svn.apache.org/viewvc?rev=1441654&view=rev
Log:
Falcon: Introduced IMXMLTagData to represent MXML tags more abstractly. Clients using IMXMLData now access tags through this interface rather than using the MXMLTagData class.
Added:
flex/falcon/trunk/compiler/src/org/apache/flex/compiler/mxml/IMXMLTagData.java (with props)
Modified:
flex/falcon/trunk/compiler/src/org/apache/flex/compiler/internal/definitions/DefinitionBase.java
flex/falcon/trunk/compiler/src/org/apache/flex/compiler/internal/parsing/mxml/MXMLScopeBuilder.java
flex/falcon/trunk/compiler/src/org/apache/flex/compiler/internal/scopes/MXMLFileScope.java
flex/falcon/trunk/compiler/src/org/apache/flex/compiler/internal/tree/mxml/MXMLApplicationNode.java
flex/falcon/trunk/compiler/src/org/apache/flex/compiler/internal/tree/mxml/MXMLArrayNode.java
flex/falcon/trunk/compiler/src/org/apache/flex/compiler/internal/tree/mxml/MXMLBindingNode.java
flex/falcon/trunk/compiler/src/org/apache/flex/compiler/internal/tree/mxml/MXMLBooleanNode.java
flex/falcon/trunk/compiler/src/org/apache/flex/compiler/internal/tree/mxml/MXMLClassDefinitionNode.java
flex/falcon/trunk/compiler/src/org/apache/flex/compiler/internal/tree/mxml/MXMLClassNode.java
flex/falcon/trunk/compiler/src/org/apache/flex/compiler/internal/tree/mxml/MXMLClassReferenceNodeBase.java
flex/falcon/trunk/compiler/src/org/apache/flex/compiler/internal/tree/mxml/MXMLComponentNode.java
flex/falcon/trunk/compiler/src/org/apache/flex/compiler/internal/tree/mxml/MXMLDeclarationsNode.java
flex/falcon/trunk/compiler/src/org/apache/flex/compiler/internal/tree/mxml/MXMLDeferredInstanceNode.java
flex/falcon/trunk/compiler/src/org/apache/flex/compiler/internal/tree/mxml/MXMLDefinitionNode.java
flex/falcon/trunk/compiler/src/org/apache/flex/compiler/internal/tree/mxml/MXMLDocumentNode.java
flex/falcon/trunk/compiler/src/org/apache/flex/compiler/internal/tree/mxml/MXMLEventSpecifierNode.java
flex/falcon/trunk/compiler/src/org/apache/flex/compiler/internal/tree/mxml/MXMLExpressionNodeBase.java
flex/falcon/trunk/compiler/src/org/apache/flex/compiler/internal/tree/mxml/MXMLFactoryNode.java
flex/falcon/trunk/compiler/src/org/apache/flex/compiler/internal/tree/mxml/MXMLFileNode.java
flex/falcon/trunk/compiler/src/org/apache/flex/compiler/internal/tree/mxml/MXMLFunctionNode.java
flex/falcon/trunk/compiler/src/org/apache/flex/compiler/internal/tree/mxml/MXMLHTTPServiceRequestPropertyNode.java
flex/falcon/trunk/compiler/src/org/apache/flex/compiler/internal/tree/mxml/MXMLInstanceNode.java
flex/falcon/trunk/compiler/src/org/apache/flex/compiler/internal/tree/mxml/MXMLIntNode.java
flex/falcon/trunk/compiler/src/org/apache/flex/compiler/internal/tree/mxml/MXMLLibraryNode.java
flex/falcon/trunk/compiler/src/org/apache/flex/compiler/internal/tree/mxml/MXMLMetadataNode.java
flex/falcon/trunk/compiler/src/org/apache/flex/compiler/internal/tree/mxml/MXMLModelNode.java
flex/falcon/trunk/compiler/src/org/apache/flex/compiler/internal/tree/mxml/MXMLModelPropertyContainerNodeBase.java
flex/falcon/trunk/compiler/src/org/apache/flex/compiler/internal/tree/mxml/MXMLModelPropertyNode.java
flex/falcon/trunk/compiler/src/org/apache/flex/compiler/internal/tree/mxml/MXMLModelRootNode.java
flex/falcon/trunk/compiler/src/org/apache/flex/compiler/internal/tree/mxml/MXMLNodeBase.java
flex/falcon/trunk/compiler/src/org/apache/flex/compiler/internal/tree/mxml/MXMLNumberNode.java
flex/falcon/trunk/compiler/src/org/apache/flex/compiler/internal/tree/mxml/MXMLPrivateNode.java
flex/falcon/trunk/compiler/src/org/apache/flex/compiler/internal/tree/mxml/MXMLPropertySpecifierNode.java
flex/falcon/trunk/compiler/src/org/apache/flex/compiler/internal/tree/mxml/MXMLRegExpNode.java
flex/falcon/trunk/compiler/src/org/apache/flex/compiler/internal/tree/mxml/MXMLRemoteObjectMethodNode.java
flex/falcon/trunk/compiler/src/org/apache/flex/compiler/internal/tree/mxml/MXMLRemoteObjectNode.java
flex/falcon/trunk/compiler/src/org/apache/flex/compiler/internal/tree/mxml/MXMLReparentNode.java
flex/falcon/trunk/compiler/src/org/apache/flex/compiler/internal/tree/mxml/MXMLResourceNode.java
flex/falcon/trunk/compiler/src/org/apache/flex/compiler/internal/tree/mxml/MXMLScriptNode.java
flex/falcon/trunk/compiler/src/org/apache/flex/compiler/internal/tree/mxml/MXMLStateNode.java
flex/falcon/trunk/compiler/src/org/apache/flex/compiler/internal/tree/mxml/MXMLStringNode.java
flex/falcon/trunk/compiler/src/org/apache/flex/compiler/internal/tree/mxml/MXMLStyleNode.java
flex/falcon/trunk/compiler/src/org/apache/flex/compiler/internal/tree/mxml/MXMLStyleSpecifierNode.java
flex/falcon/trunk/compiler/src/org/apache/flex/compiler/internal/tree/mxml/MXMLUintNode.java
flex/falcon/trunk/compiler/src/org/apache/flex/compiler/internal/tree/mxml/MXMLVectorNode.java
flex/falcon/trunk/compiler/src/org/apache/flex/compiler/internal/tree/mxml/MXMLWebServiceNode.java
flex/falcon/trunk/compiler/src/org/apache/flex/compiler/internal/tree/mxml/MXMLWebServiceOperationNode.java
flex/falcon/trunk/compiler/src/org/apache/flex/compiler/internal/tree/mxml/MXMLXMLListNode.java
flex/falcon/trunk/compiler/src/org/apache/flex/compiler/internal/tree/mxml/MXMLXMLNode.java
flex/falcon/trunk/compiler/src/org/apache/flex/compiler/internal/tree/mxml/XMLBuilder.java
flex/falcon/trunk/compiler/src/org/apache/flex/compiler/mxml/IMXMLData.java
flex/falcon/trunk/compiler/src/org/apache/flex/compiler/mxml/IXMLNameResolver.java
flex/falcon/trunk/compiler/src/org/apache/flex/compiler/mxml/MXMLTagData.java
flex/falcon/trunk/compiler/src/org/apache/flex/compiler/problems/MXMLClassNodeProblem.java
flex/falcon/trunk/compiler/src/org/apache/flex/compiler/problems/MXMLDualContentProblem.java
flex/falcon/trunk/compiler/src/org/apache/flex/compiler/problems/MXMLDuplicateChildTagProblem.java
flex/falcon/trunk/compiler/src/org/apache/flex/compiler/problems/MXMLFinalClassProblem.java
flex/falcon/trunk/compiler/src/org/apache/flex/compiler/problems/MXMLIncludeInAndExcludeFromProblem.java
flex/falcon/trunk/compiler/src/org/apache/flex/compiler/problems/MXMLIncompatibleArrayElementProblem.java
flex/falcon/trunk/compiler/src/org/apache/flex/compiler/problems/MXMLIncompatibleVectorElementProblem.java
flex/falcon/trunk/compiler/src/org/apache/flex/compiler/problems/MXMLLibraryTagNotTheFirstChildProblem.java
flex/falcon/trunk/compiler/src/org/apache/flex/compiler/problems/MXMLMissingVectorTypeAttributeProblem.java
flex/falcon/trunk/compiler/src/org/apache/flex/compiler/problems/MXMLNotAClassProblem.java
flex/falcon/trunk/compiler/src/org/apache/flex/compiler/problems/MXMLPrivateTagLocationProblem.java
flex/falcon/trunk/compiler/src/org/apache/flex/compiler/problems/MXMLRequiredAttributeProblem.java
flex/falcon/trunk/compiler/src/org/apache/flex/compiler/problems/MXMLSameBindingSourceAndDestinationProblem.java
flex/falcon/trunk/compiler/src/org/apache/flex/compiler/problems/MXMLSemanticProblem.java
flex/falcon/trunk/compiler/src/org/apache/flex/compiler/problems/MXMLSyntaxProblem.java
flex/falcon/trunk/compiler/src/org/apache/flex/compiler/problems/MXMLUnexpectedTagProblem.java
flex/falcon/trunk/compiler/src/org/apache/flex/compiler/problems/MXMLUnknownNamespaceProblem.java
flex/falcon/trunk/compiler/src/org/apache/flex/compiler/problems/MXMLUnresolvedTagProblem.java
flex/falcon/trunk/compiler/src/org/apache/flex/compiler/problems/MXMLXMLListMixedContentProblem.java
flex/falcon/trunk/compiler/src/org/apache/flex/compiler/problems/MXMLXMLOnlyOneRootTagProblem.java
flex/falcon/trunk/compiler/src/org/apache/flex/compiler/tree/mxml/IMXMLXMLListNode.java
flex/falcon/trunk/compiler/src/org/apache/flex/compiler/tree/mxml/IMXMLXMLNode.java
Modified: flex/falcon/trunk/compiler/src/org/apache/flex/compiler/internal/definitions/DefinitionBase.java
URL: http://svn.apache.org/viewvc/flex/falcon/trunk/compiler/src/org/apache/flex/compiler/internal/definitions/DefinitionBase.java?rev=1441654&r1=1441653&r2=1441654&view=diff
==============================================================================
--- flex/falcon/trunk/compiler/src/org/apache/flex/compiler/internal/definitions/DefinitionBase.java (original)
+++ flex/falcon/trunk/compiler/src/org/apache/flex/compiler/internal/definitions/DefinitionBase.java Fri Feb 1 22:49:11 2013
@@ -63,7 +63,7 @@ import org.apache.flex.compiler.internal
import org.apache.flex.compiler.internal.scopes.ASScope;
import org.apache.flex.compiler.internal.scopes.ASScopeBase;
import org.apache.flex.compiler.internal.scopes.SWCFileScopeProvider.SWCFileScope;
-import org.apache.flex.compiler.mxml.MXMLTagData;
+import org.apache.flex.compiler.mxml.IMXMLTagData;
import org.apache.flex.compiler.projects.ICompilerProject;
import org.apache.flex.compiler.scopes.IASScope;
import org.apache.flex.compiler.scopes.IDefinitionSet;
@@ -175,7 +175,7 @@ public abstract class DefinitionBase imp
*
* @param tag The {@code MXMLTagData} that is producing this definition.
*/
- public void setLocation(MXMLTagData tag)
+ public void setLocation(IMXMLTagData tag)
{
nodeRef = new NodeReference(tag.getSource(), tag.getAbsoluteStart());
}
Modified: flex/falcon/trunk/compiler/src/org/apache/flex/compiler/internal/parsing/mxml/MXMLScopeBuilder.java
URL: http://svn.apache.org/viewvc/flex/falcon/trunk/compiler/src/org/apache/flex/compiler/internal/parsing/mxml/MXMLScopeBuilder.java?rev=1441654&r1=1441653&r2=1441654&view=diff
==============================================================================
--- flex/falcon/trunk/compiler/src/org/apache/flex/compiler/internal/parsing/mxml/MXMLScopeBuilder.java (original)
+++ flex/falcon/trunk/compiler/src/org/apache/flex/compiler/internal/parsing/mxml/MXMLScopeBuilder.java Fri Feb 1 22:49:11 2013
@@ -58,10 +58,10 @@ import org.apache.flex.compiler.mxml.IMX
import org.apache.flex.compiler.mxml.IMXMLTagAttributeData;
import org.apache.flex.compiler.mxml.IMXMLTextData.TextType;
import org.apache.flex.compiler.mxml.IMXMLLanguageConstants;
+import org.apache.flex.compiler.mxml.IMXMLTagData;
import org.apache.flex.compiler.mxml.IMXMLTypeConstants;
import org.apache.flex.compiler.mxml.MXMLNamespaceAttributeData;
import org.apache.flex.compiler.mxml.MXMLTagAttributeValue;
-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.problems.ICompilerProblem;
@@ -159,7 +159,7 @@ public class MXMLScopeBuilder
{
includeHandler.enterFile(mxmlData.getPath());
- MXMLTagData rootTag = mxmlData.getRootTag();
+ IMXMLTagData rootTag = mxmlData.getRootTag();
if (rootTag == null)
return fileScope;
@@ -174,7 +174,7 @@ public class MXMLScopeBuilder
return fileScope;
}
- private void processRootTag(MXMLTagData rootTag)
+ private void processRootTag(IMXMLTagData rootTag)
{
IReference baseClass = fileScope.resolveTagToReference(rootTag);
@@ -209,7 +209,7 @@ public class MXMLScopeBuilder
currentClassDefinition.setupThisAndSuper();
// An <fx:Library> tag can only be the first child tag of the root tag.
- MXMLTagData child = rootTag.getFirstChild(true);
+ IMXMLTagData child = rootTag.getFirstChild(true);
if (child != null && fileScope.isLibraryTag(child))
{
processLibraryTag(child);
@@ -232,11 +232,11 @@ public class MXMLScopeBuilder
* found in the specified <:fx:Library> tag.
* @param libraryTagData
*/
- private void processLibraryTag(MXMLTagData libraryTag)
+ private void processLibraryTag(IMXMLTagData libraryTag)
{
assert fileScope.isLibraryTag(libraryTag);
- for (MXMLTagData child = libraryTag.getFirstChild(true);
+ for (IMXMLTagData child = libraryTag.getFirstChild(true);
child != null;
child = child.getNextSibling(true))
{
@@ -252,7 +252,7 @@ public class MXMLScopeBuilder
* Builds a {@link ClassDefinition} for the specified <fx:Definition> tag.
* @param definitionTag
*/
- private void processDefinitionTag(MXMLTagData definitionTag)
+ private void processDefinitionTag(IMXMLTagData definitionTag)
{
assert fileScope.isDefinitionTag(definitionTag);
@@ -286,12 +286,12 @@ public class MXMLScopeBuilder
}
// We expect one child tag inside <fx:Definition>.
- MXMLTagData firstChild = definitionTag.getFirstChild(true);
+ IMXMLTagData firstChild = definitionTag.getFirstChild(true);
if (firstChild != null)
{
// TODO create problem if there is more than one child tag
// in a definition.
- MXMLTagData secondChild = firstChild.getNextSibling(true);
+ IMXMLTagData secondChild = firstChild.getNextSibling(true);
if (secondChild != null)
return;
@@ -322,9 +322,9 @@ public class MXMLScopeBuilder
currentClassScope = oldClassScope;
}
- private void processTag(MXMLTagData tag)
+ private void processTag(IMXMLTagData tag)
{
- includeHandler.onNextMXMLUnitData(tag);
+ includeHandler.onNextMXMLUnitData((MXMLUnitData)tag);
boolean recurse = true;
@@ -414,7 +414,7 @@ public class MXMLScopeBuilder
if (recurse)
{
- for (MXMLTagData child = tag.getFirstChild(true);
+ for (IMXMLTagData child = tag.getFirstChild(true);
child != null;
child = child.getNextSibling(true))
{
@@ -429,7 +429,7 @@ public class MXMLScopeBuilder
* @param scriptTag script tag
* @see {@link MXMLScriptNode} for AST building.
*/
- private void processScriptTag(MXMLTagData scriptTag)
+ private void processScriptTag(IMXMLTagData scriptTag)
{
assert fileScope.isScriptTag(scriptTag);
@@ -515,14 +515,14 @@ public class MXMLScopeBuilder
}
}
- private void processStyleTag(MXMLTagData styleTag)
+ private void processStyleTag(IMXMLTagData styleTag)
{
assert fileScope.isStyleTag(styleTag);
processSourceAttribute(styleTag);
}
- private void processMetadataTag(MXMLTagData metadataTag)
+ private void processMetadataTag(IMXMLTagData metadataTag)
{
assert fileScope.isMetadataTag(metadataTag);
@@ -567,7 +567,7 @@ public class MXMLScopeBuilder
}
}
- private void processComponentTag(MXMLTagData componentTag)
+ private void processComponentTag(IMXMLTagData componentTag)
{
assert fileScope.isComponentTag(componentTag);
@@ -601,12 +601,12 @@ public class MXMLScopeBuilder
}
// We expect one child tag inside <fx:Component>.
- MXMLTagData firstChild = componentTag.getFirstChild(true);
+ IMXMLTagData firstChild = componentTag.getFirstChild(true);
if (firstChild != null)
{
// TODO create problem if there is more than one child tag
// in a definition.
- MXMLTagData secondChild = firstChild.getNextSibling(true);
+ IMXMLTagData secondChild = firstChild.getNextSibling(true);
if (secondChild != null)
return;
@@ -639,7 +639,7 @@ public class MXMLScopeBuilder
currentClassScope = oldClassScope;
}
- private void processState(MXMLTagData tag, String qname)
+ private void processState(IMXMLTagData tag, String qname)
{
if (!qname.equals(IMXMLTypeConstants.State) || tag.getMXMLDialect() == MXMLDialect.MXML_2006)
return;
@@ -655,21 +655,21 @@ public class MXMLScopeBuilder
currentClassDefinition.addStateName(stateName);
}
- private void processXMLTag(MXMLTagData xmlTag)
+ private void processXMLTag(IMXMLTagData xmlTag)
{
assert fileScope.isXMLTag(xmlTag);
processSourceAttribute(xmlTag);
}
- private void processModelTag(MXMLTagData modelTag)
+ private void processModelTag(IMXMLTagData modelTag)
{
assert fileScope.isModelTag(modelTag);
processSourceAttribute(modelTag);
}
- private void processStringTag(MXMLTagData stringTag)
+ private void processStringTag(IMXMLTagData stringTag)
{
assert fileScope.isStringTag(stringTag);
@@ -684,7 +684,7 @@ public class MXMLScopeBuilder
* If not, call <code>addUnfoundReferenceSourceFileDependency()</code>
* on the <code>FlexProject</code>.
*/
- private void processSourceAttribute(MXMLTagData tag)
+ private void processSourceAttribute(IMXMLTagData tag)
{
IMXMLTagAttributeData sourceAttribute = tag.getTagAttributeData(IMXMLLanguageConstants.ATTRIBUTE_SOURCE);
if (sourceAttribute != null)
@@ -722,7 +722,7 @@ public class MXMLScopeBuilder
}
}
- private void processID(MXMLTagData tag, IMXMLTagAttributeData idAttribute)
+ private void processID(IMXMLTagData tag, IMXMLTagAttributeData idAttribute)
{
String id = idAttribute.getRawValue();
IReference typeRef = fileScope.resolveTagToReference(tag);
Modified: flex/falcon/trunk/compiler/src/org/apache/flex/compiler/internal/scopes/MXMLFileScope.java
URL: http://svn.apache.org/viewvc/flex/falcon/trunk/compiler/src/org/apache/flex/compiler/internal/scopes/MXMLFileScope.java?rev=1441654&r1=1441653&r2=1441654&view=diff
==============================================================================
--- flex/falcon/trunk/compiler/src/org/apache/flex/compiler/internal/scopes/MXMLFileScope.java (original)
+++ flex/falcon/trunk/compiler/src/org/apache/flex/compiler/internal/scopes/MXMLFileScope.java Fri Feb 1 22:49:11 2013
@@ -36,8 +36,8 @@ import org.apache.flex.compiler.internal
import org.apache.flex.compiler.internal.projects.FlexProject;
import org.apache.flex.compiler.internal.units.MXMLCompilationUnit;
import org.apache.flex.compiler.mxml.IMXMLData;
+import org.apache.flex.compiler.mxml.IMXMLTagData;
import org.apache.flex.compiler.mxml.IXMLNameResolver;
-import org.apache.flex.compiler.mxml.MXMLTagData;
import org.apache.flex.compiler.mxml.MXMLUnitData;
import com.google.common.collect.ImmutableSet;
@@ -274,7 +274,7 @@ public class MXMLFileScope extends ASFil
* @return The {@code ClassDefinition} associated with the
* <code><fx:Component></code> tag.
*/
- public ClassDefinition getClassDefinitionForComponentTag(MXMLTagData componentTag)
+ public ClassDefinition getClassDefinitionForComponentTag(IMXMLTagData componentTag)
{
return fxComponentsOffsetMap != null ?
fxComponentsOffsetMap.get(componentTag.getAbsoluteStart()) :
@@ -296,7 +296,7 @@ public class MXMLFileScope extends ASFil
* @return The newly-added {@code ClassDefinition} for the definition class.
*/
public ClassDefinition addFXDefinition(String mainClassQName,
- MXMLTagData definitionTag,
+ IMXMLTagData definitionTag,
String definitionName,
String definitionBaseClassQName)
{
@@ -368,7 +368,7 @@ public class MXMLFileScope extends ASFil
* name via manifest or <fx:Definition> tags.
* @return Fully qualified AS3 class name the specified tag refers to.
*/
- public String resolveTagToQualifiedName(MXMLTagData tag)
+ public String resolveTagToQualifiedName(IMXMLTagData tag)
{
XMLName tagName = tag.getXMLName();
return resolveXMLNameToQualifiedName(tagName, tag.getParent().getMXMLDialect());
@@ -391,7 +391,7 @@ public class MXMLFileScope extends ASFil
* name via manifest or <fx:Definition> tags.
* @return IReference to the specified tag refers to.
*/
- public IReference resolveTagToReference(MXMLTagData tag)
+ public IReference resolveTagToReference(IMXMLTagData tag)
{
String qname = resolveTagToQualifiedName(tag);
if (qname != null)
@@ -413,7 +413,7 @@ public class MXMLFileScope extends ASFil
* the tag has a manifest namespace and isn't found in the
* MXMLManifestManager.
*/
- public IDefinition resolveTagToDefinition(MXMLTagData tag)
+ public IDefinition resolveTagToDefinition(IMXMLTagData tag)
{
XMLName tagName = tag.getXMLName();
return resolveXMLNameToDefinition(tagName, tag.getParent().getMXMLDialect());
@@ -474,7 +474,7 @@ public class MXMLFileScope extends ASFil
* @return The {@code ClassDefinition} associated with the
* <code><fx:Definition></code> tag.
*/
- public ClassDefinition getClassDefinitionForDefinitionTag(MXMLTagData definitionTag)
+ public ClassDefinition getClassDefinitionForDefinitionTag(IMXMLTagData definitionTag)
{
return fxDefinitionsOffsetMap != null ?
fxDefinitionsOffsetMap.get(definitionTag.getAbsoluteStart()) :
@@ -524,63 +524,63 @@ public class MXMLFileScope extends ASFil
new XMLName[0];
}
- public boolean isBindingTag(MXMLTagData tag)
+ public boolean isBindingTag(IMXMLTagData tag)
{
XMLName tagName = tag.getXMLName();
XMLName bindingTagName = mxmlDialect.resolveBinding();
return tagName.equals(bindingTagName);
}
- public boolean isComponentTag(MXMLTagData tag)
+ public boolean isComponentTag(IMXMLTagData tag)
{
XMLName tagName = tag.getXMLName();
XMLName componentTagName = mxmlDialect.resolveComponent();
return tagName.equals(componentTagName);
}
- public boolean isDeclarationsTag(MXMLTagData tag)
+ public boolean isDeclarationsTag(IMXMLTagData tag)
{
XMLName tagName = tag.getXMLName();
XMLName declarationsTagName = mxmlDialect.resolveDeclarations();
return tagName.equals(declarationsTagName);
}
- public boolean isDefinitionTag(MXMLTagData tag)
+ public boolean isDefinitionTag(IMXMLTagData tag)
{
XMLName tagName = tag.getXMLName();
XMLName definitionTagName = mxmlDialect.resolveDefinition();
return tagName.equals(definitionTagName);
}
- public boolean isLibraryTag(MXMLTagData tag)
+ public boolean isLibraryTag(IMXMLTagData tag)
{
XMLName tagName = tag.getXMLName();
XMLName libraryTagName = mxmlDialect.resolveLibrary();
return tagName.equals(libraryTagName);
}
- public boolean isMetadataTag(MXMLTagData tag)
+ public boolean isMetadataTag(IMXMLTagData tag)
{
XMLName tagName = tag.getXMLName();
XMLName metadataTagName = mxmlDialect.resolveMetadata();
return tagName.equals(metadataTagName);
}
- public boolean isModelTag(MXMLTagData tag)
+ public boolean isModelTag(IMXMLTagData tag)
{
XMLName tagName = tag.getXMLName();
XMLName modelTagName = mxmlDialect.resolveModel();
return tagName.equals(modelTagName);
}
- public boolean isPrivateTag(MXMLTagData tag)
+ public boolean isPrivateTag(IMXMLTagData tag)
{
XMLName tagName = tag.getXMLName();
XMLName privateTagName = mxmlDialect.resolvePrivate();
return tagName.equals(privateTagName);
}
- public boolean isReparentTag(MXMLTagData tag)
+ public boolean isReparentTag(IMXMLTagData tag)
{
XMLName tagName = tag.getXMLName();
XMLName reparentTagName = mxmlDialect.resolveReparent();
@@ -589,40 +589,40 @@ public class MXMLFileScope extends ASFil
public boolean isScriptTag(MXMLUnitData unitData)
{
- if (unitData instanceof MXMLTagData)
- return isScriptTag((MXMLTagData)unitData);
+ if (unitData instanceof IMXMLTagData)
+ return isScriptTag((IMXMLTagData)unitData);
return false;
}
- public boolean isScriptTag(MXMLTagData tag)
+ public boolean isScriptTag(IMXMLTagData tag)
{
XMLName tagName = tag.getXMLName();
XMLName scriptTagName = mxmlDialect.resolveScript();
return tagName.equals(scriptTagName);
}
- public boolean isStringTag(MXMLTagData tag)
+ public boolean isStringTag(IMXMLTagData tag)
{
XMLName tagName = tag.getXMLName();
XMLName stringTagName = mxmlDialect.resolveString();
return tagName.equals(stringTagName);
}
- public boolean isStyleTag(MXMLTagData tag)
+ public boolean isStyleTag(IMXMLTagData tag)
{
XMLName tagName = tag.getXMLName();
XMLName styleTagName = mxmlDialect.resolveStyle();
return tagName.equals(styleTagName);
}
- public boolean isXMLTag(MXMLTagData tag)
+ public boolean isXMLTag(IMXMLTagData tag)
{
XMLName tagName = tag.getXMLName();
XMLName xmlTagName = mxmlDialect.resolveXML();
return tagName.equals(xmlTagName);
}
- public boolean isXMLListTag(MXMLTagData tag)
+ public boolean isXMLListTag(IMXMLTagData tag)
{
XMLName tagName = tag.getXMLName();
XMLName xmlListTagName = mxmlDialect.resolveXMLList();
Modified: flex/falcon/trunk/compiler/src/org/apache/flex/compiler/internal/tree/mxml/MXMLApplicationNode.java
URL: http://svn.apache.org/viewvc/flex/falcon/trunk/compiler/src/org/apache/flex/compiler/internal/tree/mxml/MXMLApplicationNode.java?rev=1441654&r1=1441653&r2=1441654&view=diff
==============================================================================
--- flex/falcon/trunk/compiler/src/org/apache/flex/compiler/internal/tree/mxml/MXMLApplicationNode.java (original)
+++ flex/falcon/trunk/compiler/src/org/apache/flex/compiler/internal/tree/mxml/MXMLApplicationNode.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.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.IMXMLApplicationNode;
@@ -52,7 +52,7 @@ class MXMLApplicationNode extends MXMLDo
private int scriptTimeLimit;
@Override
- protected void processTagSpecificAttribute(MXMLTreeBuilder builder, MXMLTagData tag,
+ protected void processTagSpecificAttribute(MXMLTreeBuilder builder, IMXMLTagData tag,
IMXMLTagAttributeData attribute,
MXMLNodeInfo info)
{
Modified: flex/falcon/trunk/compiler/src/org/apache/flex/compiler/internal/tree/mxml/MXMLArrayNode.java
URL: http://svn.apache.org/viewvc/flex/falcon/trunk/compiler/src/org/apache/flex/compiler/internal/tree/mxml/MXMLArrayNode.java?rev=1441654&r1=1441653&r2=1441654&view=diff
==============================================================================
--- flex/falcon/trunk/compiler/src/org/apache/flex/compiler/internal/tree/mxml/MXMLArrayNode.java (original)
+++ flex/falcon/trunk/compiler/src/org/apache/flex/compiler/internal/tree/mxml/MXMLArrayNode.java Fri Feb 1 22:49:11 2013
@@ -36,7 +36,7 @@ import org.apache.flex.compiler.internal
import org.apache.flex.compiler.internal.parsing.SourceFragmentsReader;
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.mxml.MXMLTextData;
import org.apache.flex.compiler.mxml.MXMLUnitData;
import org.apache.flex.compiler.problems.ICompilerProblem;
@@ -94,7 +94,7 @@ class MXMLArrayNode extends MXMLInstance
@Override
protected final void initializeFromTag(MXMLTreeBuilder builder,
- MXMLTagData tag)
+ IMXMLTagData tag)
{
// If this array node is the value of a property node,
// cache the propertName and type specified by [ArrayElementType]
@@ -117,8 +117,8 @@ class MXMLArrayNode extends MXMLInstance
}
@Override
- protected void processChildTag(MXMLTreeBuilder builder, MXMLTagData tag,
- MXMLTagData childTag,
+ protected void processChildTag(MXMLTreeBuilder builder, IMXMLTagData tag,
+ IMXMLTagData childTag,
MXMLNodeInfo info)
{
// Process fragments gathered since the last child tag.
@@ -166,7 +166,7 @@ class MXMLArrayNode extends MXMLInstance
}
@Override
- protected void processChildWhitespaceUnit(MXMLTreeBuilder builder, MXMLTagData tag,
+ protected void processChildWhitespaceUnit(MXMLTreeBuilder builder, IMXMLTagData tag,
MXMLTextData text,
MXMLNodeInfo info)
{
@@ -174,7 +174,7 @@ class MXMLArrayNode extends MXMLInstance
}
@Override
- protected void processChildNonWhitespaceUnit(MXMLTreeBuilder builder, MXMLTagData tag,
+ protected void processChildNonWhitespaceUnit(MXMLTreeBuilder builder, IMXMLTagData tag,
MXMLTextData text,
MXMLNodeInfo info)
{
@@ -182,7 +182,7 @@ class MXMLArrayNode extends MXMLInstance
}
@Override
- protected void initializationComplete(MXMLTreeBuilder builder, MXMLTagData tag,
+ protected void initializationComplete(MXMLTreeBuilder builder, IMXMLTagData tag,
MXMLNodeInfo info)
{
// Process fragments gathered since the last child tag.
@@ -224,9 +224,9 @@ class MXMLArrayNode extends MXMLInstance
List<IMXMLNode> children = new ArrayList<IMXMLNode>();
for (MXMLUnitData unit : contentUnits)
{
- if (unit instanceof MXMLTagData)
+ if (unit instanceof IMXMLTagData)
{
- MXMLTagData tag = (MXMLTagData)unit;
+ IMXMLTagData tag = (IMXMLTagData)unit;
// While it is normally illegal to put
// script tags in an array, a default property
// tag sequence can contain script nodes which need
Modified: flex/falcon/trunk/compiler/src/org/apache/flex/compiler/internal/tree/mxml/MXMLBindingNode.java
URL: http://svn.apache.org/viewvc/flex/falcon/trunk/compiler/src/org/apache/flex/compiler/internal/tree/mxml/MXMLBindingNode.java?rev=1441654&r1=1441653&r2=1441654&view=diff
==============================================================================
--- flex/falcon/trunk/compiler/src/org/apache/flex/compiler/internal/tree/mxml/MXMLBindingNode.java (original)
+++ flex/falcon/trunk/compiler/src/org/apache/flex/compiler/internal/tree/mxml/MXMLBindingNode.java Fri Feb 1 22:49:11 2013
@@ -24,7 +24,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.MXMLRequiredAttributeProblem;
@@ -91,7 +91,7 @@ class MXMLBindingNode extends MXMLNodeBa
}
@Override
- protected void processTagSpecificAttribute(MXMLTreeBuilder builder, MXMLTagData tag,
+ protected void processTagSpecificAttribute(MXMLTreeBuilder builder, IMXMLTagData tag,
IMXMLTagAttributeData attribute,
MXMLNodeInfo info)
{
@@ -126,7 +126,7 @@ class MXMLBindingNode extends MXMLNodeBa
}
@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/MXMLBooleanNode.java
URL: http://svn.apache.org/viewvc/flex/falcon/trunk/compiler/src/org/apache/flex/compiler/internal/tree/mxml/MXMLBooleanNode.java?rev=1441654&r1=1441653&r2=1441654&view=diff
==============================================================================
--- flex/falcon/trunk/compiler/src/org/apache/flex/compiler/internal/tree/mxml/MXMLBooleanNode.java (original)
+++ flex/falcon/trunk/compiler/src/org/apache/flex/compiler/internal/tree/mxml/MXMLBooleanNode.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.IMXMLBooleanNode;
@@ -69,7 +69,7 @@ class MXMLBooleanNode extends MXMLExpres
}
@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/MXMLClassDefinitionNode.java
URL: http://svn.apache.org/viewvc/flex/falcon/trunk/compiler/src/org/apache/flex/compiler/internal/tree/mxml/MXMLClassDefinitionNode.java?rev=1441654&r1=1441653&r2=1441654&view=diff
==============================================================================
--- flex/falcon/trunk/compiler/src/org/apache/flex/compiler/internal/tree/mxml/MXMLClassDefinitionNode.java (original)
+++ flex/falcon/trunk/compiler/src/org/apache/flex/compiler/internal/tree/mxml/MXMLClassDefinitionNode.java Fri Feb 1 22:49:11 2013
@@ -43,9 +43,9 @@ import org.apache.flex.compiler.internal
import org.apache.flex.compiler.internal.tree.as.ImportNode;
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.IStateGroupDefinition;
-import org.apache.flex.compiler.mxml.MXMLTagData;
import org.apache.flex.compiler.mxml.StateDefinition;
import org.apache.flex.compiler.mxml.StateGroupDefinition;
import org.apache.flex.compiler.projects.ICompilerProject;
@@ -209,7 +209,7 @@ public class MXMLClassDefinitionNode ext
private IASDocComment asDocComment;
@Override
- protected void initializationComplete(MXMLTreeBuilder builder, MXMLTagData tag,
+ protected void initializationComplete(MXMLTreeBuilder builder, IMXMLTagData tag,
MXMLNodeInfo info)
{
super.initializationComplete(builder, tag, info);
@@ -233,7 +233,7 @@ public class MXMLClassDefinitionNode ext
}
@Override
- protected void processTagSpecificAttribute(MXMLTreeBuilder builder, MXMLTagData tag,
+ protected void processTagSpecificAttribute(MXMLTreeBuilder builder, IMXMLTagData tag,
IMXMLTagAttributeData attribute,
MXMLNodeInfo info)
{
@@ -262,8 +262,8 @@ public class MXMLClassDefinitionNode ext
}
@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();
Modified: flex/falcon/trunk/compiler/src/org/apache/flex/compiler/internal/tree/mxml/MXMLClassNode.java
URL: http://svn.apache.org/viewvc/flex/falcon/trunk/compiler/src/org/apache/flex/compiler/internal/tree/mxml/MXMLClassNode.java?rev=1441654&r1=1441653&r2=1441654&view=diff
==============================================================================
--- flex/falcon/trunk/compiler/src/org/apache/flex/compiler/internal/tree/mxml/MXMLClassNode.java (original)
+++ flex/falcon/trunk/compiler/src/org/apache/flex/compiler/internal/tree/mxml/MXMLClassNode.java Fri Feb 1 22:49:11 2013
@@ -27,7 +27,7 @@ import org.apache.flex.compiler.internal
import org.apache.flex.compiler.internal.projects.FlexProject;
import org.apache.flex.compiler.internal.tree.as.MemberAccessExpressionNode;
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.projects.ICompilerProject;
import org.apache.flex.compiler.tree.ASTNodeID;
import org.apache.flex.compiler.tree.as.IExpressionNode;
@@ -91,7 +91,7 @@ class MXMLClassNode extends MXMLExpressi
}
@Override
- protected void initializationComplete(MXMLTreeBuilder builder, MXMLTagData tag,
+ protected void initializationComplete(MXMLTreeBuilder builder, IMXMLTagData tag,
MXMLNodeInfo info)
{
NodeBase expressionNode = parseExpressionNodeFromFragments(builder, tag, info, DEFAULT);
Modified: flex/falcon/trunk/compiler/src/org/apache/flex/compiler/internal/tree/mxml/MXMLClassReferenceNodeBase.java
URL: http://svn.apache.org/viewvc/flex/falcon/trunk/compiler/src/org/apache/flex/compiler/internal/tree/mxml/MXMLClassReferenceNodeBase.java?rev=1441654&r1=1441653&r2=1441654&view=diff
==============================================================================
--- flex/falcon/trunk/compiler/src/org/apache/flex/compiler/internal/tree/mxml/MXMLClassReferenceNodeBase.java (original)
+++ flex/falcon/trunk/compiler/src/org/apache/flex/compiler/internal/tree/mxml/MXMLClassReferenceNodeBase.java Fri Feb 1 22:49:11 2013
@@ -38,7 +38,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.mxml.MXMLTextData;
import org.apache.flex.compiler.mxml.MXMLUnitData;
import org.apache.flex.compiler.problems.ICompilerProblem;
@@ -364,7 +364,7 @@ abstract class MXMLClassReferenceNodeBas
}
@Override
- protected void processTagSpecificAttribute(MXMLTreeBuilder builder, MXMLTagData tag,
+ protected void processTagSpecificAttribute(MXMLTreeBuilder builder, IMXMLTagData tag,
IMXMLTagAttributeData attribute,
MXMLNodeInfo info)
{
@@ -384,8 +384,8 @@ abstract class MXMLClassReferenceNodeBas
}
@Override
- protected void processChildTag(MXMLTreeBuilder builder, MXMLTagData tag,
- MXMLTagData childTag,
+ protected void processChildTag(MXMLTreeBuilder builder, IMXMLTagData tag,
+ IMXMLTagData childTag,
MXMLNodeInfo info)
{
if (info.hasSpecifierWithName(childTag.getShortName(), childTag.getStateName()))
@@ -503,7 +503,7 @@ abstract class MXMLClassReferenceNodeBas
* Called on each content unit that is part of the default value.
*/
private void processDefaultPropertyContentUnit(MXMLTreeBuilder builder,
- MXMLTagData childTag,
+ IMXMLTagData childTag,
MXMLNodeInfo info)
{
// If this gets called and we're not already processing the default property,
@@ -524,7 +524,7 @@ abstract class MXMLClassReferenceNodeBas
defaultPropertyContentUnits = new ArrayList<MXMLUnitData>(1);
}
- defaultPropertyContentUnits.add(childTag);
+ defaultPropertyContentUnits.add((MXMLUnitData)childTag);
}
/**
@@ -576,14 +576,14 @@ abstract class MXMLClassReferenceNodeBas
{
assert builder.getFileScope().isScriptTag(scriptTagData);
MXMLScriptNode scriptNode = new MXMLScriptNode(this);
- scriptNode.initializeFromTag(builder, (MXMLTagData)scriptTagData);
+ scriptNode.initializeFromTag(builder, (IMXMLTagData)scriptTagData);
info.addChildNode(scriptNode);
}
}
}
@Override
- protected void processChildNonWhitespaceUnit(MXMLTreeBuilder builder, MXMLTagData tag,
+ protected void processChildNonWhitespaceUnit(MXMLTreeBuilder builder, IMXMLTagData tag,
MXMLTextData text,
MXMLNodeInfo info)
{
@@ -655,7 +655,7 @@ abstract class MXMLClassReferenceNodeBas
}
@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/MXMLComponentNode.java
URL: http://svn.apache.org/viewvc/flex/falcon/trunk/compiler/src/org/apache/flex/compiler/internal/tree/mxml/MXMLComponentNode.java?rev=1441654&r1=1441653&r2=1441654&view=diff
==============================================================================
--- flex/falcon/trunk/compiler/src/org/apache/flex/compiler/internal/tree/mxml/MXMLComponentNode.java (original)
+++ flex/falcon/trunk/compiler/src/org/apache/flex/compiler/internal/tree/mxml/MXMLComponentNode.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.TypeScope;
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.MXMLSemanticProblem;
import org.apache.flex.compiler.tree.ASTNodeID;
@@ -90,7 +90,7 @@ class MXMLComponentNode extends MXMLFact
}
@Override
- protected void processTagSpecificAttribute(MXMLTreeBuilder builder, MXMLTagData tag,
+ protected void processTagSpecificAttribute(MXMLTreeBuilder builder, IMXMLTagData tag,
IMXMLTagAttributeData attribute,
MXMLNodeInfo info)
{
@@ -112,8 +112,8 @@ class MXMLComponentNode extends MXMLFact
}
@Override
- protected void processChildTag(MXMLTreeBuilder builder, MXMLTagData tag,
- MXMLTagData childTag,
+ protected void processChildTag(MXMLTreeBuilder builder, IMXMLTagData tag,
+ IMXMLTagData childTag,
MXMLNodeInfo info)
{
boolean handled = false;
Modified: flex/falcon/trunk/compiler/src/org/apache/flex/compiler/internal/tree/mxml/MXMLDeclarationsNode.java
URL: http://svn.apache.org/viewvc/flex/falcon/trunk/compiler/src/org/apache/flex/compiler/internal/tree/mxml/MXMLDeclarationsNode.java?rev=1441654&r1=1441653&r2=1441654&view=diff
==============================================================================
--- flex/falcon/trunk/compiler/src/org/apache/flex/compiler/internal/tree/mxml/MXMLDeclarationsNode.java (original)
+++ flex/falcon/trunk/compiler/src/org/apache/flex/compiler/internal/tree/mxml/MXMLDeclarationsNode.java Fri Feb 1 22:49:11 2013
@@ -26,7 +26,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.IMXMLLanguageConstants;
-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.as.IASNode;
import org.apache.flex.compiler.tree.mxml.IMXMLDeclarationsNode;
@@ -57,8 +57,8 @@ class MXMLDeclarationsNode extends MXMLN
}
@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();
@@ -95,7 +95,7 @@ class MXMLDeclarationsNode extends MXMLN
}
@Override
- protected void initializationComplete(MXMLTreeBuilder builder, MXMLTagData tag,
+ protected void initializationComplete(MXMLTreeBuilder builder, IMXMLTagData tag,
MXMLNodeInfo info)
{
declarationInstances = info.getChildNodeList().toArray(new MXMLInstanceNode[0]);
Modified: flex/falcon/trunk/compiler/src/org/apache/flex/compiler/internal/tree/mxml/MXMLDeferredInstanceNode.java
URL: http://svn.apache.org/viewvc/flex/falcon/trunk/compiler/src/org/apache/flex/compiler/internal/tree/mxml/MXMLDeferredInstanceNode.java?rev=1441654&r1=1441653&r2=1441654&view=diff
==============================================================================
--- flex/falcon/trunk/compiler/src/org/apache/flex/compiler/internal/tree/mxml/MXMLDeferredInstanceNode.java (original)
+++ flex/falcon/trunk/compiler/src/org/apache/flex/compiler/internal/tree/mxml/MXMLDeferredInstanceNode.java Fri Feb 1 22:49:11 2013
@@ -22,7 +22,6 @@ package org.apache.flex.compiler.interna
import java.util.List;
import org.apache.flex.compiler.common.ISourceLocation;
-import org.apache.flex.compiler.common.SourceLocation;
import org.apache.flex.compiler.constants.IASLanguageConstants;
import org.apache.flex.compiler.definitions.IClassDefinition;
import org.apache.flex.compiler.definitions.IDefinition;
@@ -31,7 +30,7 @@ import org.apache.flex.compiler.internal
import org.apache.flex.compiler.internal.parsing.ISourceFragment;
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.mxml.MXMLUnitData;
import org.apache.flex.compiler.tree.ASTNodeID;
import org.apache.flex.compiler.tree.as.IASNode;
@@ -85,8 +84,8 @@ class MXMLDeferredInstanceNode extends M
}
@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();
@@ -127,9 +126,9 @@ class MXMLDeferredInstanceNode extends M
// Determine whether the the default property is being set to a single Array tag.
boolean isSingleArrayTag = false;
int n = contentUnits.size();
- if (n == 1 && contentUnits.get(0) instanceof MXMLTagData)
+ if (n == 1 && contentUnits.get(0) instanceof IMXMLTagData)
{
- MXMLTagData tag = (MXMLTagData)contentUnits.get(0);
+ IMXMLTagData tag = (IMXMLTagData)contentUnits.get(0);
IDefinition definition = builder.getFileScope().resolveTagToDefinition(tag);
isSingleArrayTag = definition.getQualifiedName().equals(IASLanguageConstants.Array);
}
@@ -144,7 +143,7 @@ class MXMLDeferredInstanceNode extends M
}
else if ((n == 1) && (!isSingleArrayTag))
{
- MXMLTagData tag = (MXMLTagData)contentUnits.get(0);
+ IMXMLTagData tag = (IMXMLTagData)contentUnits.get(0);
IDefinition type = builder.getFileScope().resolveTagToDefinition(tag);
if (type instanceof ClassDefinition)
{
@@ -158,12 +157,12 @@ class MXMLDeferredInstanceNode extends M
}
@Override
- protected void initializationComplete(MXMLTreeBuilder builder, MXMLTagData tag,
+ protected void initializationComplete(MXMLTreeBuilder builder, IMXMLTagData tag,
MXMLNodeInfo info)
{
if (childNode == null)
{
- SourceLocation location = info.getSourceLocation();
+ ISourceLocation location = info.getSourceLocation();
if (location == null)
location = tag.getLocationOfChildUnits();
Modified: flex/falcon/trunk/compiler/src/org/apache/flex/compiler/internal/tree/mxml/MXMLDefinitionNode.java
URL: http://svn.apache.org/viewvc/flex/falcon/trunk/compiler/src/org/apache/flex/compiler/internal/tree/mxml/MXMLDefinitionNode.java?rev=1441654&r1=1441653&r2=1441654&view=diff
==============================================================================
--- flex/falcon/trunk/compiler/src/org/apache/flex/compiler/internal/tree/mxml/MXMLDefinitionNode.java (original)
+++ flex/falcon/trunk/compiler/src/org/apache/flex/compiler/internal/tree/mxml/MXMLDefinitionNode.java Fri Feb 1 22:49:11 2013
@@ -27,7 +27,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.MXMLInvalidDefinitionNameProblem;
@@ -82,7 +82,7 @@ class MXMLDefinitionNode extends MXMLNod
}
@Override
- protected void processTagSpecificAttribute(MXMLTreeBuilder builder, MXMLTagData tag,
+ protected void processTagSpecificAttribute(MXMLTreeBuilder builder, IMXMLTagData tag,
IMXMLTagAttributeData attribute,
MXMLNodeInfo info)
{
@@ -105,8 +105,8 @@ class MXMLDefinitionNode extends MXMLNod
}
@Override
- protected void processChildTag(MXMLTreeBuilder builder, MXMLTagData tag,
- MXMLTagData childTag,
+ protected void processChildTag(MXMLTreeBuilder builder, IMXMLTagData tag,
+ IMXMLTagData childTag,
MXMLNodeInfo info)
{
boolean handled = false;
@@ -171,7 +171,7 @@ class MXMLDefinitionNode extends MXMLNod
}
@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/MXMLDocumentNode.java
URL: http://svn.apache.org/viewvc/flex/falcon/trunk/compiler/src/org/apache/flex/compiler/internal/tree/mxml/MXMLDocumentNode.java?rev=1441654&r1=1441653&r2=1441654&view=diff
==============================================================================
--- flex/falcon/trunk/compiler/src/org/apache/flex/compiler/internal/tree/mxml/MXMLDocumentNode.java (original)
+++ flex/falcon/trunk/compiler/src/org/apache/flex/compiler/internal/tree/mxml/MXMLDocumentNode.java Fri Feb 1 22:49:11 2013
@@ -25,7 +25,7 @@ import java.util.Map;
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.problems.ICompilerProblem;
import org.apache.flex.compiler.problems.MXMLPrivateTagLocationProblem;
import org.apache.flex.compiler.tree.ASTNodeID;
@@ -64,8 +64,8 @@ public class MXMLDocumentNode extends MX
}
@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();
@@ -136,7 +136,7 @@ public class MXMLDocumentNode extends MX
* attributes on the root tag.
*/
@Override
- protected void processTagSpecificAttribute(MXMLTreeBuilder builder, MXMLTagData tag, IMXMLTagAttributeData attribute, MXMLNodeInfo info)
+ protected void processTagSpecificAttribute(MXMLTreeBuilder builder, IMXMLTagData tag, IMXMLTagAttributeData attribute, MXMLNodeInfo info)
{
final String name = attribute.getName();
rootAttributes.put(name, attribute.getRawValue());
Modified: flex/falcon/trunk/compiler/src/org/apache/flex/compiler/internal/tree/mxml/MXMLEventSpecifierNode.java
URL: http://svn.apache.org/viewvc/flex/falcon/trunk/compiler/src/org/apache/flex/compiler/internal/tree/mxml/MXMLEventSpecifierNode.java?rev=1441654&r1=1441653&r2=1441654&view=diff
==============================================================================
--- flex/falcon/trunk/compiler/src/org/apache/flex/compiler/internal/tree/mxml/MXMLEventSpecifierNode.java (original)
+++ flex/falcon/trunk/compiler/src/org/apache/flex/compiler/internal/tree/mxml/MXMLEventSpecifierNode.java Fri Feb 1 22:49:11 2013
@@ -39,7 +39,7 @@ import org.apache.flex.compiler.internal
import org.apache.flex.compiler.internal.tree.as.ScopedBlockNode;
import org.apache.flex.compiler.internal.workspaces.Workspace;
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.MXMLEmptyEventHandlerProblem;
@@ -187,7 +187,7 @@ class MXMLEventSpecifierNode extends MXM
* initializationComplete().
*/
@Override
- protected void processChildNonWhitespaceUnit(MXMLTreeBuilder builder, MXMLTagData tag,
+ protected void processChildNonWhitespaceUnit(MXMLTreeBuilder builder, IMXMLTagData tag,
MXMLTextData text,
MXMLNodeInfo info)
{
@@ -200,7 +200,7 @@ class MXMLEventSpecifierNode extends MXM
* "doThis(); doThat();" and compiles that as the event handler.
*/
@Override
- protected void initializationComplete(MXMLTreeBuilder builder, MXMLTagData tag,
+ protected void initializationComplete(MXMLTreeBuilder builder, IMXMLTagData tag,
MXMLNodeInfo info)
{
String path = builder.getPath();
Modified: flex/falcon/trunk/compiler/src/org/apache/flex/compiler/internal/tree/mxml/MXMLExpressionNodeBase.java
URL: http://svn.apache.org/viewvc/flex/falcon/trunk/compiler/src/org/apache/flex/compiler/internal/tree/mxml/MXMLExpressionNodeBase.java?rev=1441654&r1=1441653&r2=1441654&view=diff
==============================================================================
--- flex/falcon/trunk/compiler/src/org/apache/flex/compiler/internal/tree/mxml/MXMLExpressionNodeBase.java (original)
+++ flex/falcon/trunk/compiler/src/org/apache/flex/compiler/internal/tree/mxml/MXMLExpressionNodeBase.java Fri Feb 1 22:49:11 2013
@@ -22,14 +22,13 @@ package org.apache.flex.compiler.interna
import java.util.EnumSet;
import org.apache.flex.compiler.common.ISourceLocation;
-import org.apache.flex.compiler.common.SourceLocation;
import org.apache.flex.compiler.definitions.IDefinition;
import org.apache.flex.compiler.definitions.ITypeDefinition;
import org.apache.flex.compiler.internal.mxml.MXMLDialect.TextParsingFlags;
import org.apache.flex.compiler.internal.parsing.ISourceFragment;
import org.apache.flex.compiler.internal.semantics.SemanticUtils;
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.ICompilerProblem;
import org.apache.flex.compiler.problems.ImplicitCoercionToUnrelatedTypeProblem;
@@ -113,14 +112,14 @@ abstract class MXMLExpressionNodeBase ex
}
@Override
- protected void processChildWhitespaceUnit(MXMLTreeBuilder builder, MXMLTagData tag,
+ protected void processChildWhitespaceUnit(MXMLTreeBuilder builder, IMXMLTagData tag,
MXMLTextData text, MXMLNodeInfo info)
{
accumulateTextFragments(builder, text, info);
}
@Override
- protected void processChildNonWhitespaceUnit(MXMLTreeBuilder builder, MXMLTagData tag,
+ protected void processChildNonWhitespaceUnit(MXMLTreeBuilder builder, IMXMLTagData tag,
MXMLTextData text, MXMLNodeInfo info)
{
info.hasDualContent = true;
@@ -139,7 +138,7 @@ abstract class MXMLExpressionNodeBase ex
* compiler directive node, or a literal node of the tag's type.
*/
protected NodeBase createExpressionNodeFromFragments(MXMLTreeBuilder builder,
- MXMLTagData tag,
+ IMXMLTagData tag,
MXMLNodeInfo info,
Object defaultValue)
{
@@ -147,7 +146,7 @@ abstract class MXMLExpressionNodeBase ex
ISourceFragment[] fragments = info.getSourceFragments();
- SourceLocation location = info.getSourceLocation();
+ ISourceLocation location = info.getSourceLocation();
if (location == null)
location = tag.getLocationOfChildUnits();
@@ -168,7 +167,7 @@ abstract class MXMLExpressionNodeBase ex
* databindings and compiler directives.
*/
protected NodeBase parseExpressionNodeFromFragments(MXMLTreeBuilder builder,
- MXMLTagData tag,
+ IMXMLTagData tag,
MXMLNodeInfo info,
Object defaultValue)
{
@@ -176,7 +175,7 @@ abstract class MXMLExpressionNodeBase ex
ISourceFragment[] fragments = info.getSourceFragments();
- SourceLocation location = info.getSourceLocation();
+ ISourceLocation location = info.getSourceLocation();
if (location == null)
location = tag.getLocationOfChildUnits();
Modified: flex/falcon/trunk/compiler/src/org/apache/flex/compiler/internal/tree/mxml/MXMLFactoryNode.java
URL: http://svn.apache.org/viewvc/flex/falcon/trunk/compiler/src/org/apache/flex/compiler/internal/tree/mxml/MXMLFactoryNode.java?rev=1441654&r1=1441653&r2=1441654&view=diff
==============================================================================
--- flex/falcon/trunk/compiler/src/org/apache/flex/compiler/internal/tree/mxml/MXMLFactoryNode.java (original)
+++ flex/falcon/trunk/compiler/src/org/apache/flex/compiler/internal/tree/mxml/MXMLFactoryNode.java Fri Feb 1 22:49:11 2013
@@ -23,7 +23,7 @@ import org.apache.flex.compiler.common.I
import org.apache.flex.compiler.internal.parsing.ISourceFragment;
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.as.IASNode;
import org.apache.flex.compiler.tree.mxml.IMXMLClassNode;
@@ -73,7 +73,7 @@ class MXMLFactoryNode extends MXMLInstan
}
@Override
- protected void initializeFromTag(MXMLTreeBuilder builder, MXMLTagData tag)
+ protected void initializeFromTag(MXMLTreeBuilder builder, IMXMLTagData tag)
{
initialize(builder);
Modified: flex/falcon/trunk/compiler/src/org/apache/flex/compiler/internal/tree/mxml/MXMLFileNode.java
URL: http://svn.apache.org/viewvc/flex/falcon/trunk/compiler/src/org/apache/flex/compiler/internal/tree/mxml/MXMLFileNode.java?rev=1441654&r1=1441653&r2=1441654&view=diff
==============================================================================
--- flex/falcon/trunk/compiler/src/org/apache/flex/compiler/internal/tree/mxml/MXMLFileNode.java (original)
+++ flex/falcon/trunk/compiler/src/org/apache/flex/compiler/internal/tree/mxml/MXMLFileNode.java Fri Feb 1 22:49:11 2013
@@ -45,9 +45,9 @@ import org.apache.flex.compiler.internal
import org.apache.flex.compiler.internal.tree.as.ImportNode;
import org.apache.flex.compiler.internal.units.MXMLCompilationUnit;
import org.apache.flex.compiler.mxml.IMXMLData;
+import org.apache.flex.compiler.mxml.IMXMLTagData;
import org.apache.flex.compiler.mxml.IMXMLTextData;
import org.apache.flex.compiler.mxml.MXMLInstructionData;
-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.problems.ICompilerProblem;
@@ -182,12 +182,12 @@ public class MXMLFileNode extends MXMLNo
builder.addProblem(problem);
}
}
- else if (unit instanceof MXMLTagData)
+ else if (unit instanceof IMXMLTagData)
{
if (!foundRootTag)
{
foundRootTag = true;
- processRootTag(builder, (MXMLTagData)unit, asDoc);
+ processRootTag(builder, (IMXMLTagData)unit, asDoc);
}
else
{
@@ -223,7 +223,7 @@ public class MXMLFileNode extends MXMLNo
}
}
- private void processRootTag(MXMLTreeBuilder builder, MXMLTagData rootTag, MXMLTextData asDoc)
+ private void processRootTag(MXMLTreeBuilder builder, IMXMLTagData rootTag, MXMLTextData asDoc)
{
ClassDefinition fileDef = fileScope.getMainClassDefinition();
assert fileDef != null;
Modified: flex/falcon/trunk/compiler/src/org/apache/flex/compiler/internal/tree/mxml/MXMLFunctionNode.java
URL: http://svn.apache.org/viewvc/flex/falcon/trunk/compiler/src/org/apache/flex/compiler/internal/tree/mxml/MXMLFunctionNode.java?rev=1441654&r1=1441653&r2=1441654&view=diff
==============================================================================
--- flex/falcon/trunk/compiler/src/org/apache/flex/compiler/internal/tree/mxml/MXMLFunctionNode.java (original)
+++ flex/falcon/trunk/compiler/src/org/apache/flex/compiler/internal/tree/mxml/MXMLFunctionNode.java Fri Feb 1 22:49:11 2013
@@ -24,7 +24,7 @@ import org.apache.flex.compiler.definiti
import org.apache.flex.compiler.definitions.IFunctionDefinition;
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.projects.ICompilerProject;
import org.apache.flex.compiler.tree.ASTNodeID;
import org.apache.flex.compiler.tree.as.IExpressionNode;
@@ -85,7 +85,7 @@ class MXMLFunctionNode extends MXMLExpre
@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/MXMLHTTPServiceRequestPropertyNode.java
URL: http://svn.apache.org/viewvc/flex/falcon/trunk/compiler/src/org/apache/flex/compiler/internal/tree/mxml/MXMLHTTPServiceRequestPropertyNode.java?rev=1441654&r1=1441653&r2=1441654&view=diff
==============================================================================
--- flex/falcon/trunk/compiler/src/org/apache/flex/compiler/internal/tree/mxml/MXMLHTTPServiceRequestPropertyNode.java (original)
+++ flex/falcon/trunk/compiler/src/org/apache/flex/compiler/internal/tree/mxml/MXMLHTTPServiceRequestPropertyNode.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.projects.FlexProject;
-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.as.IASNode;
import org.apache.flex.compiler.tree.mxml.IMXMLHTTPServiceRequestPropertyNode;
@@ -76,7 +76,7 @@ class MXMLHTTPServiceRequestPropertyNode
* Add child tags as dynamic properties to the "object" node.
*/
@Override
- protected void processChildTag(MXMLTreeBuilder builder, MXMLTagData tag, MXMLTagData childTag, MXMLNodeInfo info)
+ protected void processChildTag(MXMLTreeBuilder builder, IMXMLTagData tag, IMXMLTagData childTag, MXMLNodeInfo info)
{
final MXMLPropertySpecifierNode specifierNode = new MXMLPropertySpecifierNode(this);
specifierNode.setDynamicName(childTag.getShortName());
@@ -90,7 +90,7 @@ class MXMLHTTPServiceRequestPropertyNode
* fields.
*/
@Override
- protected void initializationComplete(MXMLTreeBuilder builder, MXMLTagData tag, MXMLNodeInfo info)
+ protected void initializationComplete(MXMLTreeBuilder builder, IMXMLTagData tag, MXMLNodeInfo info)
{
initializeObjectNode(builder, tag, info);
setInstanceNode(objectNode);
@@ -101,7 +101,7 @@ class MXMLHTTPServiceRequestPropertyNode
* Span "object" node's offset to the parent "request" node. Make the
* dynamic request properties children of the "object" node.
*/
- private void initializeObjectNode(MXMLTreeBuilder builder, MXMLTagData tag, MXMLNodeInfo info)
+ private void initializeObjectNode(MXMLTreeBuilder builder, IMXMLTagData tag, MXMLNodeInfo info)
{
final FlexProject project = builder.getProject();
objectNode.setClassReference(project, IASLanguageConstants.Object);
Modified: flex/falcon/trunk/compiler/src/org/apache/flex/compiler/internal/tree/mxml/MXMLInstanceNode.java
URL: http://svn.apache.org/viewvc/flex/falcon/trunk/compiler/src/org/apache/flex/compiler/internal/tree/mxml/MXMLInstanceNode.java?rev=1441654&r1=1441653&r2=1441654&view=diff
==============================================================================
--- flex/falcon/trunk/compiler/src/org/apache/flex/compiler/internal/tree/mxml/MXMLInstanceNode.java (original)
+++ flex/falcon/trunk/compiler/src/org/apache/flex/compiler/internal/tree/mxml/MXMLInstanceNode.java Fri Feb 1 22:49:11 2013
@@ -29,8 +29,8 @@ import org.apache.flex.compiler.internal
import org.apache.flex.compiler.internal.scopes.ASScope;
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.IMXMLTypeConstants;
-import org.apache.flex.compiler.mxml.MXMLTagData;
import org.apache.flex.compiler.problems.ICompilerProblem;
import org.apache.flex.compiler.problems.MXMLAttributeVersionProblem;
import org.apache.flex.compiler.problems.MXMLDuplicateIDProblem;
@@ -166,7 +166,7 @@ class MXMLInstanceNode extends MXMLClass
private String itemDestructionPolicy;
@Override
- protected void processTagSpecificAttribute(MXMLTreeBuilder builder, MXMLTagData tag,
+ protected void processTagSpecificAttribute(MXMLTreeBuilder builder, IMXMLTagData tag,
IMXMLTagAttributeData attribute,
MXMLNodeInfo info)
{
@@ -277,7 +277,7 @@ class MXMLInstanceNode extends MXMLClass
}
@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/MXMLIntNode.java
URL: http://svn.apache.org/viewvc/flex/falcon/trunk/compiler/src/org/apache/flex/compiler/internal/tree/mxml/MXMLIntNode.java?rev=1441654&r1=1441653&r2=1441654&view=diff
==============================================================================
--- flex/falcon/trunk/compiler/src/org/apache/flex/compiler/internal/tree/mxml/MXMLIntNode.java (original)
+++ flex/falcon/trunk/compiler/src/org/apache/flex/compiler/internal/tree/mxml/MXMLIntNode.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.IMXMLIntNode;
@@ -69,7 +69,7 @@ class MXMLIntNode extends MXMLExpression
}
@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/MXMLLibraryNode.java
URL: http://svn.apache.org/viewvc/flex/falcon/trunk/compiler/src/org/apache/flex/compiler/internal/tree/mxml/MXMLLibraryNode.java?rev=1441654&r1=1441653&r2=1441654&view=diff
==============================================================================
--- flex/falcon/trunk/compiler/src/org/apache/flex/compiler/internal/tree/mxml/MXMLLibraryNode.java (original)
+++ flex/falcon/trunk/compiler/src/org/apache/flex/compiler/internal/tree/mxml/MXMLLibraryNode.java Fri Feb 1 22:49:11 2013
@@ -22,7 +22,7 @@ package org.apache.flex.compiler.interna
import org.apache.flex.compiler.internal.scopes.MXMLFileScope;
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.tree.ASTNodeID;
import org.apache.flex.compiler.tree.as.IASNode;
import org.apache.flex.compiler.tree.mxml.IMXMLDefinitionNode;
@@ -77,8 +77,8 @@ class MXMLLibraryNode extends MXMLNodeBa
}
@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();
@@ -98,7 +98,7 @@ class MXMLLibraryNode extends MXMLNodeBa
}
@Override
- protected void initializationComplete(MXMLTreeBuilder builder, MXMLTagData tag,
+ protected void initializationComplete(MXMLTreeBuilder builder, IMXMLTagData tag,
MXMLNodeInfo info)
{
definitionNodes = info.getChildNodeList().toArray(new IMXMLDefinitionNode[0]);
Modified: flex/falcon/trunk/compiler/src/org/apache/flex/compiler/internal/tree/mxml/MXMLMetadataNode.java
URL: http://svn.apache.org/viewvc/flex/falcon/trunk/compiler/src/org/apache/flex/compiler/internal/tree/mxml/MXMLMetadataNode.java?rev=1441654&r1=1441653&r2=1441654&view=diff
==============================================================================
--- flex/falcon/trunk/compiler/src/org/apache/flex/compiler/internal/tree/mxml/MXMLMetadataNode.java (original)
+++ flex/falcon/trunk/compiler/src/org/apache/flex/compiler/internal/tree/mxml/MXMLMetadataNode.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.internal.tree.as.metadata.MetaTagsNode;
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.mxml.MXMLUnitData;
import org.apache.flex.compiler.mxml.IMXMLTextData.TextType;
@@ -78,7 +78,7 @@ class MXMLMetadataNode extends MXMLNodeB
}
@Override
- protected void processChildNonWhitespaceUnit(MXMLTreeBuilder builder, MXMLTagData tag,
+ protected void processChildNonWhitespaceUnit(MXMLTreeBuilder builder, IMXMLTagData tag,
MXMLTextData text,
MXMLNodeInfo info)
{
@@ -86,7 +86,7 @@ class MXMLMetadataNode extends MXMLNodeB
}
@Override
- protected void initializationComplete(MXMLTreeBuilder builder, MXMLTagData tag,
+ protected void initializationComplete(MXMLTreeBuilder builder, IMXMLTagData tag,
MXMLNodeInfo info)
{
// Parse the event handling code.
Modified: flex/falcon/trunk/compiler/src/org/apache/flex/compiler/internal/tree/mxml/MXMLModelNode.java
URL: http://svn.apache.org/viewvc/flex/falcon/trunk/compiler/src/org/apache/flex/compiler/internal/tree/mxml/MXMLModelNode.java?rev=1441654&r1=1441653&r2=1441654&view=diff
==============================================================================
--- flex/falcon/trunk/compiler/src/org/apache/flex/compiler/internal/tree/mxml/MXMLModelNode.java (original)
+++ flex/falcon/trunk/compiler/src/org/apache/flex/compiler/internal/tree/mxml/MXMLModelNode.java Fri Feb 1 22:49:11 2013
@@ -24,7 +24,7 @@ import org.apache.flex.compiler.internal
import org.apache.flex.compiler.mxml.IMXMLData;
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.MXMLDualContentProblem;
import org.apache.flex.compiler.tree.ASTNodeID;
@@ -86,7 +86,7 @@ class MXMLModelNode extends MXMLInstance
}
@Override
- protected void initializeFromTag(MXMLTreeBuilder builder, MXMLTagData tag)
+ protected void initializeFromTag(MXMLTreeBuilder builder, IMXMLTagData tag)
{
FlexProject project = builder.getProject();
String qname = project.getModelClass();
@@ -96,7 +96,7 @@ class MXMLModelNode extends MXMLInstance
}
@Override
- protected void processTagSpecificAttribute(MXMLTreeBuilder builder, MXMLTagData tag,
+ protected void processTagSpecificAttribute(MXMLTreeBuilder builder, IMXMLTagData tag,
IMXMLTagAttributeData attribute,
MXMLNodeInfo info)
{
@@ -110,7 +110,7 @@ class MXMLModelNode extends MXMLInstance
IMXMLData mxmlData = builder.getExternalMXMLData(attribute, sourcePath);
if (mxmlData != null)
{
- MXMLTagData rootTag = mxmlData.getRootTag();
+ IMXMLTagData rootTag = mxmlData.getRootTag();
rootNode = new MXMLModelRootNode(this);
rootNode.initializeFromTag(builder, rootTag);
@@ -124,8 +124,8 @@ class MXMLModelNode extends MXMLInstance
}
@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;
@@ -141,7 +141,7 @@ class MXMLModelNode 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/MXMLModelPropertyContainerNodeBase.java
URL: http://svn.apache.org/viewvc/flex/falcon/trunk/compiler/src/org/apache/flex/compiler/internal/tree/mxml/MXMLModelPropertyContainerNodeBase.java?rev=1441654&r1=1441653&r2=1441654&view=diff
==============================================================================
--- flex/falcon/trunk/compiler/src/org/apache/flex/compiler/internal/tree/mxml/MXMLModelPropertyContainerNodeBase.java (original)
+++ flex/falcon/trunk/compiler/src/org/apache/flex/compiler/internal/tree/mxml/MXMLModelPropertyContainerNodeBase.java Fri Feb 1 22:49:11 2013
@@ -24,7 +24,7 @@ import java.util.List;
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.as.IASNode;
import org.apache.flex.compiler.tree.mxml.IMXMLModelPropertyContainerNode;
import org.apache.flex.compiler.tree.mxml.IMXMLModelPropertyNode;
@@ -149,14 +149,14 @@ abstract class MXMLModelPropertyContaine
}
@Override
- protected void initializeFromTag(MXMLTreeBuilder builder, MXMLTagData tag)
+ protected void initializeFromTag(MXMLTreeBuilder builder, IMXMLTagData tag)
{
name = tag.getShortName(); // see note in initializeFromAttribute about namespaces.
super.initializeFromTag(builder, tag);
}
@Override
- protected void processTagSpecificAttribute(MXMLTreeBuilder builder, MXMLTagData tag,
+ protected void processTagSpecificAttribute(MXMLTreeBuilder builder, IMXMLTagData tag,
IMXMLTagAttributeData attribute,
MXMLNodeInfo info)
{
@@ -171,8 +171,8 @@ abstract class MXMLModelPropertyContaine
}
@Override
- protected void processChildTag(MXMLTreeBuilder builder, MXMLTagData tag,
- MXMLTagData childTag,
+ protected void processChildTag(MXMLTreeBuilder builder, IMXMLTagData tag,
+ IMXMLTagData childTag,
MXMLNodeInfo info)
{
if (childTag.getPrefix() != null)
Modified: flex/falcon/trunk/compiler/src/org/apache/flex/compiler/internal/tree/mxml/MXMLModelPropertyNode.java
URL: http://svn.apache.org/viewvc/flex/falcon/trunk/compiler/src/org/apache/flex/compiler/internal/tree/mxml/MXMLModelPropertyNode.java?rev=1441654&r1=1441653&r2=1441654&view=diff
==============================================================================
--- flex/falcon/trunk/compiler/src/org/apache/flex/compiler/internal/tree/mxml/MXMLModelPropertyNode.java (original)
+++ flex/falcon/trunk/compiler/src/org/apache/flex/compiler/internal/tree/mxml/MXMLModelPropertyNode.java Fri Feb 1 22:49:11 2013
@@ -30,7 +30,7 @@ import org.apache.flex.compiler.internal
import org.apache.flex.compiler.internal.parsing.ISourceFragment;
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.problems.ICompilerProblem;
import org.apache.flex.compiler.tree.ASTNodeID;
@@ -109,7 +109,7 @@ class MXMLModelPropertyNode extends MXML
}
@Override
- protected void processTagSpecificAttribute(MXMLTreeBuilder builder, MXMLTagData tag,
+ protected void processTagSpecificAttribute(MXMLTreeBuilder builder, IMXMLTagData tag,
IMXMLTagAttributeData attribute,
MXMLNodeInfo info)
{
@@ -119,7 +119,7 @@ class MXMLModelPropertyNode extends MXML
}
@Override
- protected void processChildNonWhitespaceUnit(MXMLTreeBuilder builder, MXMLTagData tag,
+ protected void processChildNonWhitespaceUnit(MXMLTreeBuilder builder, IMXMLTagData tag,
MXMLTextData text,
MXMLNodeInfo info)
{
@@ -131,7 +131,7 @@ class MXMLModelPropertyNode extends MXML
@Override
protected void initializationComplete(MXMLTreeBuilder builder,
- MXMLTagData tag,
+ IMXMLTagData tag,
MXMLNodeInfo info)
{
List<IMXMLNode> childNodeList = info.getChildNodeList();
Modified: flex/falcon/trunk/compiler/src/org/apache/flex/compiler/internal/tree/mxml/MXMLModelRootNode.java
URL: http://svn.apache.org/viewvc/flex/falcon/trunk/compiler/src/org/apache/flex/compiler/internal/tree/mxml/MXMLModelRootNode.java?rev=1441654&r1=1441653&r2=1441654&view=diff
==============================================================================
--- flex/falcon/trunk/compiler/src/org/apache/flex/compiler/internal/tree/mxml/MXMLModelRootNode.java (original)
+++ flex/falcon/trunk/compiler/src/org/apache/flex/compiler/internal/tree/mxml/MXMLModelRootNode.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.tree.ASTNodeID;
import org.apache.flex.compiler.tree.mxml.IMXMLModelPropertyNode;
import org.apache.flex.compiler.tree.mxml.IMXMLModelRootNode;
@@ -49,7 +49,7 @@ class MXMLModelRootNode extends MXMLMode
@Override
protected void initializationComplete(MXMLTreeBuilder builder,
- MXMLTagData tag,
+ IMXMLTagData tag,
MXMLNodeInfo info)
{
setPropertyNodes(info.getChildNodeList().toArray(new IMXMLModelPropertyNode[0]));