Updated Branches:
refs/heads/develop 6c7fb6028 -> 70683e5d2
FLEX-33925 use fully qualified names more often
Project: http://git-wip-us.apache.org/repos/asf/flex-falcon/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-falcon/commit/a9269fb6
Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/a9269fb6
Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/a9269fb6
Branch: refs/heads/develop
Commit: a9269fb6e72d1267dbe202d88269c41e0601c43a
Parents: 6c7fb60
Author: Alex Harui <aharui@apache.org>
Authored: Wed Dec 4 21:21:04 2013 -0800
Committer: Alex Harui <aharui@apache.org>
Committed: Wed Dec 4 21:21:04 2013 -0800
----------------------------------------------------------------------
.../internal/codegen/js/flexjs/JSFlexJSEmitter.java | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/a9269fb6/compiler.jx/src/org/apache/flex/compiler/internal/codegen/js/flexjs/JSFlexJSEmitter.java
----------------------------------------------------------------------
diff --git a/compiler.jx/src/org/apache/flex/compiler/internal/codegen/js/flexjs/JSFlexJSEmitter.java
b/compiler.jx/src/org/apache/flex/compiler/internal/codegen/js/flexjs/JSFlexJSEmitter.java
index 84f1e6b..a65335d 100644
--- a/compiler.jx/src/org/apache/flex/compiler/internal/codegen/js/flexjs/JSFlexJSEmitter.java
+++ b/compiler.jx/src/org/apache/flex/compiler/internal/codegen/js/flexjs/JSFlexJSEmitter.java
@@ -602,10 +602,7 @@ public class JSFlexJSEmitter extends JSGoogEmitter implements IJSFlexJSEmitter
boolean emitName = true;
if (nodeDef != null
- && (nodeDef.isStatic() || (
- (nodeDef instanceof ClassDefinition ||
- nodeDef instanceof InterfaceDefinition) &&
- nodeDef.getParent() != null)))
+ && nodeDef.isStatic())
{
String sname = nodeDef.getParent().getQualifiedName();
if (sname.length() > 0)
@@ -730,7 +727,10 @@ public class JSFlexJSEmitter extends JSGoogEmitter implements IJSFlexJSEmitter
}
else if (emitName)
{
- write(node.getName());
+ if (nodeDef != null)
+ write(nodeDef.getQualifiedName());
+ else
+ write(node.getName());
}
}
|