flex-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From joshtynj...@apache.org
Subject [02/50] git commit: [flex-falcon] [refs/heads/master] - fix externc jsroot output
Date Tue, 21 Mar 2017 23:10:39 GMT
fix externc jsroot output


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

Branch: refs/heads/master
Commit: d67fe9cad053fc8226c462fe22b598b2a18ca733
Parents: fb881d1
Author: Alex Harui <aharui@apache.org>
Authored: Wed Dec 28 08:47:02 2016 -0800
Committer: Alex Harui <aharui@apache.org>
Committed: Wed Dec 28 08:47:13 2016 -0800

----------------------------------------------------------------------
 .../codegen/externals/pass/ReferenceCompiler.java       |  5 +++++
 .../codegen/externals/reference/ClassReference.java     | 12 +++++++++---
 2 files changed, 14 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/d67fe9ca/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/externals/pass/ReferenceCompiler.java
----------------------------------------------------------------------
diff --git a/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/externals/pass/ReferenceCompiler.java
b/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/externals/pass/ReferenceCompiler.java
index 4de8a88..7a17d84 100644
--- a/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/externals/pass/ReferenceCompiler.java
+++ b/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/externals/pass/ReferenceCompiler.java
@@ -141,6 +141,11 @@ public class ReferenceCompiler
         {
             return FilenameUtils.getBaseName(getFile().getAbsolutePath());
         }
+        
+        public String toString()
+        {
+        	return getFile().getName();
+        }
     }
     
     public static class ReferenceErrorManager implements ErrorManager

http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/d67fe9ca/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/externals/reference/ClassReference.java
----------------------------------------------------------------------
diff --git a/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/externals/reference/ClassReference.java
b/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/externals/reference/ClassReference.java
index f93eb55..75f927b 100644
--- a/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/externals/reference/ClassReference.java
+++ b/compiler-jx/src/main/java/org/apache/flex/compiler/internal/codegen/externals/reference/ClassReference.java
@@ -788,7 +788,8 @@ public class ClassReference extends BaseReference
         }
         if (!isInterface())
         {
-        	sb.append(" * @");
+        	if (!outputJS)
+        		sb.append(" * @");
             emitImplements(sb);
             sb.append("\n");
             List<JSTypeExpression> implementedInterfaces = getComment().getImplementedInterfaces();
@@ -883,7 +884,7 @@ public class ClassReference extends BaseReference
     {
         if (outputJS)
         {
-            sb.append(" * @extends ");
+            sb.append("extends ");
             String value = JSTypeUtils.toClassTypeString(this);
             sb.append(value);
             sb.append("\n");
@@ -914,7 +915,12 @@ public class ClassReference extends BaseReference
 
             sb.append(value);
             if (outputJS)
-                sb.append("\n");
+            {
+            	if (i < len - 1)
+            		sb.append("\n * @implements ");
+            	else
+            		sb.append("\n");
+            }
             else
             {
                 if (i < len - 1)


Mime
View raw message