8007627: Support @Getter annotation on constructor
authorhannesw
Thu, 07 Feb 2013 14:58:41 +0100
changeset 16222 3e057d4357e0
parent 16221 38ac51eba133
child 16223 dff592a332a4
8007627: Support @Getter annotation on constructor Reviewed-by: attila, lagergren
nashorn/buildtools/nasgen/src/jdk/nashorn/internal/tools/nasgen/ConstructorGenerator.java
nashorn/buildtools/nasgen/src/jdk/nashorn/internal/tools/nasgen/PrototypeGenerator.java
--- a/nashorn/buildtools/nasgen/src/jdk/nashorn/internal/tools/nasgen/ConstructorGenerator.java	Thu Feb 07 17:17:29 2013 +0530
+++ b/nashorn/buildtools/nasgen/src/jdk/nashorn/internal/tools/nasgen/ConstructorGenerator.java	Thu Feb 07 14:58:41 2013 +0100
@@ -135,7 +135,7 @@
                 linkerAddGetterSetter(mi, className, memInfo);
             } else if (memInfo.isConstructorGetter()) {
                 final MemberInfo setter = scriptClassInfo.findSetter(memInfo);
-                linkerAddGetterSetter(mi, className, memInfo, setter);
+                linkerAddGetterSetter(mi, scriptClassInfo.getJavaName(), memInfo, setter);
             }
         }
         emitStaticInitSuffix(mi, className);
--- a/nashorn/buildtools/nasgen/src/jdk/nashorn/internal/tools/nasgen/PrototypeGenerator.java	Thu Feb 07 17:17:29 2013 +0530
+++ b/nashorn/buildtools/nasgen/src/jdk/nashorn/internal/tools/nasgen/PrototypeGenerator.java	Thu Feb 07 14:58:41 2013 +0100
@@ -112,7 +112,7 @@
                 linkerAddGetterSetter(mi, className, memInfo);
             } else if (memInfo.isPrototypeGetter()) {
                 final MemberInfo setter = scriptClassInfo.findSetter(memInfo);
-                linkerAddGetterSetter(mi, className, memInfo, setter);
+                linkerAddGetterSetter(mi, scriptClassInfo.getJavaName(), memInfo, setter);
             }
         }
         emitStaticInitSuffix(mi, className);