You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flex.apache.org by ah...@apache.org on 2014/10/02 05:47:21 UTC
git commit: [flex-falcon] [refs/heads/develop] - fix HPE for simple
tags
Repository: flex-falcon
Updated Branches:
refs/heads/develop 6a00ac83f -> b51119845
fix HPE for simple tags
Project: http://git-wip-us.apache.org/repos/asf/flex-falcon/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-falcon/commit/b5111984
Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/b5111984
Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/b5111984
Branch: refs/heads/develop
Commit: b5111984595e1b3654ff76bf2af49d88d827c1f1
Parents: 6a00ac8
Author: Alex Harui <ah...@apache.org>
Authored: Wed Oct 1 20:47:21 2014 -0700
Committer: Alex Harui <ah...@apache.org>
Committed: Wed Oct 1 20:47:21 2014 -0700
----------------------------------------------------------------------
.../internal/tree/mxml/MXMLArrayNode.java | 22 ++++++++++++--------
.../tree/mxml/MXMLDeclarationsNode.java | 22 ++++++++++++--------
.../tree/mxml/MXMLPropertySpecifierNode.java | 22 ++++++++++++--------
3 files changed, 39 insertions(+), 27 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/b5111984/compiler/src/org/apache/flex/compiler/internal/tree/mxml/MXMLArrayNode.java
----------------------------------------------------------------------
diff --git a/compiler/src/org/apache/flex/compiler/internal/tree/mxml/MXMLArrayNode.java b/compiler/src/org/apache/flex/compiler/internal/tree/mxml/MXMLArrayNode.java
index b0e630d..54732fc 100644
--- a/compiler/src/org/apache/flex/compiler/internal/tree/mxml/MXMLArrayNode.java
+++ b/compiler/src/org/apache/flex/compiler/internal/tree/mxml/MXMLArrayNode.java
@@ -158,17 +158,21 @@ class MXMLArrayNode extends MXMLInstanceNode implements IMXMLArrayNode
}
}
}
- else if (childTag.getURI().equals(IMXMLLanguageConstants.NAMESPACE_MXML_2009))
- {
- MXMLInstanceNode instanceNode = MXMLInstanceNode.createInstanceNode(
- builder, childTag.getShortName(), this);
- instanceNode.setClassReference(project, childTag.getShortName());
- instanceNode.initializeFromTag(builder, childTag);
- }
else
{
- builder.addProblem(new MXMLUnresolvedTagProblem(childTag));
- return;
+ String uri = childTag.getURI();
+ if (uri != null && uri.equals(IMXMLLanguageConstants.NAMESPACE_MXML_2009))
+ {
+ MXMLInstanceNode instanceNode = MXMLInstanceNode.createInstanceNode(
+ builder, childTag.getShortName(), this);
+ instanceNode.setClassReference(project, childTag.getShortName());
+ instanceNode.initializeFromTag(builder, childTag);
+ }
+ else
+ {
+ builder.addProblem(new MXMLUnresolvedTagProblem(childTag));
+ return;
+ }
}
}
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/b5111984/compiler/src/org/apache/flex/compiler/internal/tree/mxml/MXMLDeclarationsNode.java
----------------------------------------------------------------------
diff --git a/compiler/src/org/apache/flex/compiler/internal/tree/mxml/MXMLDeclarationsNode.java b/compiler/src/org/apache/flex/compiler/internal/tree/mxml/MXMLDeclarationsNode.java
index 9397caf..764d20f 100644
--- a/compiler/src/org/apache/flex/compiler/internal/tree/mxml/MXMLDeclarationsNode.java
+++ b/compiler/src/org/apache/flex/compiler/internal/tree/mxml/MXMLDeclarationsNode.java
@@ -87,16 +87,20 @@ class MXMLDeclarationsNode extends MXMLNodeBase implements IMXMLDeclarationsNode
instanceNode.initializeFromTag(builder, childTag);
info.addChildNode(instanceNode);
}
- else if (childTag.getURI().equals(IMXMLLanguageConstants.NAMESPACE_MXML_2009))
+ else
{
- MXMLInstanceNode instanceNode = MXMLInstanceNode.createInstanceNode(
- builder, childTag.getShortName(), this);
- instanceNode.setClassReference(project, childTag.getShortName());
- instanceNode.initializeFromTag(builder, childTag);
- }
- else
- {
- super.processChildTag(builder, tag, childTag, info);
+ String uri = childTag.getURI();
+ if (uri != null && uri.equals(IMXMLLanguageConstants.NAMESPACE_MXML_2009))
+ {
+ MXMLInstanceNode instanceNode = MXMLInstanceNode.createInstanceNode(
+ builder, childTag.getShortName(), this);
+ instanceNode.setClassReference(project, childTag.getShortName());
+ instanceNode.initializeFromTag(builder, childTag);
+ }
+ else
+ {
+ super.processChildTag(builder, tag, childTag, info);
+ }
}
}
}
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/b5111984/compiler/src/org/apache/flex/compiler/internal/tree/mxml/MXMLPropertySpecifierNode.java
----------------------------------------------------------------------
diff --git a/compiler/src/org/apache/flex/compiler/internal/tree/mxml/MXMLPropertySpecifierNode.java b/compiler/src/org/apache/flex/compiler/internal/tree/mxml/MXMLPropertySpecifierNode.java
index d58cc4f..d3a8bd9 100644
--- a/compiler/src/org/apache/flex/compiler/internal/tree/mxml/MXMLPropertySpecifierNode.java
+++ b/compiler/src/org/apache/flex/compiler/internal/tree/mxml/MXMLPropertySpecifierNode.java
@@ -452,17 +452,21 @@ class MXMLPropertySpecifierNode extends MXMLSpecifierNodeBase implements IMXMLPr
instanceNode.setClassReference(project, (ClassDefinition)definition); // TODO Move this logic to initializeFromTag().
instanceNode.initializeFromTag(builder, childTag);
}
- else if (childTag.getURI().equals(IMXMLLanguageConstants.NAMESPACE_MXML_2009))
- {
- instanceNode = MXMLInstanceNode.createInstanceNode(
- builder, childTag.getShortName(), this);
- instanceNode.setClassReference(project, childTag.getShortName());
- instanceNode.initializeFromTag(builder, childTag);
- }
else
{
- ICompilerProblem problem = new MXMLUnresolvedTagProblem(childTag);
- builder.addProblem(problem);
+ String uri = childTag.getURI();
+ if (uri != null && uri.equals(IMXMLLanguageConstants.NAMESPACE_MXML_2009))
+ {
+ instanceNode = MXMLInstanceNode.createInstanceNode(
+ builder, childTag.getShortName(), this);
+ instanceNode.setClassReference(project, childTag.getShortName());
+ instanceNode.initializeFromTag(builder, childTag);
+ }
+ else
+ {
+ ICompilerProblem problem = new MXMLUnresolvedTagProblem(childTag);
+ builder.addProblem(problem);
+ }
}
}
}