flex-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From aha...@apache.org
Subject [42/42] git commit: [flex-falcon] [refs/heads/develop] - handle simple cases with no superclass
Date Thu, 04 Jun 2015 06:06:48 GMT
handle simple cases with no superclass


Project: http://git-wip-us.apache.org/repos/asf/flex-falcon/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-falcon/commit/06a2533b
Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/06a2533b
Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/06a2533b

Branch: refs/heads/develop
Commit: 06a2533bbe9f124a06e71b953bfc1ef3cfb49d6a
Parents: 66d489b
Author: Alex Harui <aharui@apache.org>
Authored: Wed Jun 3 23:05:54 2015 -0700
Committer: Alex Harui <aharui@apache.org>
Committed: Wed Jun 3 23:05:54 2015 -0700

----------------------------------------------------------------------
 .../compiler/internal/codegen/js/flexjs/JSFlexJSDocEmitter.java    | 2 +-
 .../flex/compiler/internal/codegen/js/vf2js/JSVF2JSDocEmitter.java | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/06a2533b/compiler.jx/src/org/apache/flex/compiler/internal/codegen/js/flexjs/JSFlexJSDocEmitter.java
----------------------------------------------------------------------
diff --git a/compiler.jx/src/org/apache/flex/compiler/internal/codegen/js/flexjs/JSFlexJSDocEmitter.java
b/compiler.jx/src/org/apache/flex/compiler/internal/codegen/js/flexjs/JSFlexJSDocEmitter.java
index b7ba9bd..99b355b 100644
--- a/compiler.jx/src/org/apache/flex/compiler/internal/codegen/js/flexjs/JSFlexJSDocEmitter.java
+++ b/compiler.jx/src/org/apache/flex/compiler/internal/codegen/js/flexjs/JSFlexJSDocEmitter.java
@@ -117,7 +117,7 @@ public class JSFlexJSDocEmitter extends JSGoogDocEmitter
                 IClassDefinition parent = (IClassDefinition) node
                         .getDefinition().getParent();
                 IClassDefinition superClass = parent.resolveBaseClass(project);
-                String qname = superClass.getQualifiedName();
+                String qname = (superClass != null) ? superClass.getQualifiedName() : null;
 
                 if (superClass != null
                         && !qname.equals(IASLanguageConstants.Object))

http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/06a2533b/compiler.jx/src/org/apache/flex/compiler/internal/codegen/js/vf2js/JSVF2JSDocEmitter.java
----------------------------------------------------------------------
diff --git a/compiler.jx/src/org/apache/flex/compiler/internal/codegen/js/vf2js/JSVF2JSDocEmitter.java
b/compiler.jx/src/org/apache/flex/compiler/internal/codegen/js/vf2js/JSVF2JSDocEmitter.java
index c0a1241..3bea2e9 100644
--- a/compiler.jx/src/org/apache/flex/compiler/internal/codegen/js/vf2js/JSVF2JSDocEmitter.java
+++ b/compiler.jx/src/org/apache/flex/compiler/internal/codegen/js/vf2js/JSVF2JSDocEmitter.java
@@ -75,7 +75,7 @@ public class JSVF2JSDocEmitter extends JSGoogDocEmitter
                 IClassDefinition parent = (IClassDefinition) node
                         .getDefinition().getParent();
                 IClassDefinition superClass = parent.resolveBaseClass(project);
-                String qname = superClass.getQualifiedName();
+                String qname = (superClass != null) ? superClass.getQualifiedName() : null;
 
                 if (superClass != null
                         && !qname.equals(IASLanguageConstants.Object))


Mime
View raw message