AccessorEmitter: temporarily restore exporting all static getters/setters until separate issue can be fixed (closes #157)
Currently, all static getter/setters must be exported. This seems to be caused by them being referenced with strings in IdentifierEmitter instead of being referenced directly. Once that is fixed, we can limit exporting per namespace again.
diff --git a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/jx/AccessorEmitter.java b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/jx/AccessorEmitter.java
index 00006dc..97b34bf 100644
--- a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/jx/AccessorEmitter.java
+++ b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/jx/AccessorEmitter.java
@@ -611,8 +611,8 @@
ISetterNode setterNode = p.setter;
String baseName = p.name;
writeNewline("/**");
- if (p.resolvedExport && !p.suppressExport)
- writeNewline(" * @export");
+ if (emitExports && !p.suppressExport)
+ writeNewline(" * @export");
if (p.type != null)
writeNewline(" * @type {" + JSGoogDocEmitter.convertASTypeToJSType(p.type.getBaseName(), p.type.getPackageName()) + "} */");
else
@@ -735,15 +735,15 @@
}
if(uri != null || def.isPublic())
{
- p.resolvedExport = emitExports;
+ p.resolvedExport = p.resolvedExport || emitExports;
}
else if(def.isInternal())
{
- p.resolvedExport = exportInternal;
+ p.resolvedExport = p.resolvedExport || exportInternal;
}
else if(def.isProtected())
{
- p.resolvedExport = exportProtected;
+ p.resolvedExport = p.resolvedExport || exportProtected;
}
p.getter = node;
if (!p.suppressExport) p.suppressExport = suppress;
@@ -803,15 +803,15 @@
}
if(uri != null || def.isPublic())
{
- p.resolvedExport = emitExports;
+ p.resolvedExport = p.resolvedExport || emitExports;
}
else if(def.isInternal())
{
- p.resolvedExport = exportInternal;
+ p.resolvedExport = p.resolvedExport || exportInternal;
}
else if(def.isProtected())
{
- p.resolvedExport = exportProtected;
+ p.resolvedExport = p.resolvedExport || exportProtected;
}
p.setter = node;
if (!p.suppressExport) p.suppressExport = suppress;
