This is an automated email from the ASF dual-hosted git repository. joshtynjala pushed a commit to branch develop in repository https://gitbox.apache.org/repos/asf/royale-compiler.git
commit bbeed1399413308a56112ed490f6f930464d4114 Author: Josh Tynjala <[email protected]> AuthorDate: Tue May 19 09:35:16 2026 -0700 Fix up some more metadata checks to use constants --- .../royale/compiler/internal/codegen/js/jx/LiteralEmitter.java | 3 ++- .../internal/codegen/js/royale/JSRoyaleASDocDITAEmitter.java | 3 ++- .../compiler/internal/codegen/mxml/royale/MXMLRoyalePublisher.java | 5 +++-- .../apache/royale/compiler/constants/IMetaAttributeConstants.java | 3 +++ compiler/src/main/java/org/apache/royale/utils/JSXUtil.java | 3 ++- 5 files changed, 12 insertions(+), 5 deletions(-) diff --git a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/jx/LiteralEmitter.java b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/jx/LiteralEmitter.java index f97d2c978..5433a6ce8 100644 --- a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/jx/LiteralEmitter.java +++ b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/jx/LiteralEmitter.java @@ -27,6 +27,7 @@ import org.apache.commons.lang3.StringEscapeUtils; import org.apache.royale.compiler.codegen.ISubEmitter; import org.apache.royale.compiler.codegen.js.IJSEmitter; import org.apache.royale.compiler.common.IMetaInfo; +import org.apache.royale.compiler.constants.IMetaAttributeConstants; import org.apache.royale.compiler.internal.codegen.as.ASEmitterTokens; import org.apache.royale.compiler.internal.codegen.js.JSSubEmitter; import org.apache.royale.compiler.internal.codegen.js.royale.JSRoyaleEmitterTokens; @@ -71,7 +72,7 @@ public class LiteralEmitter extends JSSubEmitter implements IMetaInfo[] metaInfos = functionNode.getMetaInfos(); for (IMetaInfo metaInfo : metaInfos) { - if (metaInfo.getTagName().equals(JSRoyaleEmitterTokens.JSX.getToken())) + if (metaInfo.getTagName().equals(IMetaAttributeConstants.ATTRIBUTE_JSX)) { jsx = true; break; diff --git a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/royale/JSRoyaleASDocDITAEmitter.java b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/royale/JSRoyaleASDocDITAEmitter.java index cd13ba1e5..04d034074 100644 --- a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/royale/JSRoyaleASDocDITAEmitter.java +++ b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/js/royale/JSRoyaleASDocDITAEmitter.java @@ -35,6 +35,7 @@ import org.apache.royale.compiler.asdoc.royale.ASDocComment; import org.apache.royale.compiler.codegen.js.royale.IJSRoyaleASDocEmitter; import org.apache.royale.compiler.codegen.js.royale.IJSRoyaleEmitter; import org.apache.royale.compiler.constants.IASLanguageConstants; +import org.apache.royale.compiler.constants.IMetaAttributeConstants; import org.apache.royale.compiler.definitions.IAccessorDefinition; import org.apache.royale.compiler.definitions.IClassDefinition; import org.apache.royale.compiler.definitions.IDefinition; @@ -996,7 +997,7 @@ public class JSRoyaleASDocDITAEmitter extends JSRoyaleEmitter implements IJSRoya public void writeAPIProperties(IDefinition def) { - IMetaTag propTag = def.getMetaTagByName("Bindable"); + IMetaTag propTag = def.getMetaTagByName(IMetaAttributeConstants.ATTRIBUTE_BINDABLE); if (propTag == null) { write("<apiProperty/>"); diff --git a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/mxml/royale/MXMLRoyalePublisher.java b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/mxml/royale/MXMLRoyalePublisher.java index b11561d6f..dc07a796b 100644 --- a/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/mxml/royale/MXMLRoyalePublisher.java +++ b/compiler-jx/src/main/java/org/apache/royale/compiler/internal/codegen/mxml/royale/MXMLRoyalePublisher.java @@ -33,6 +33,7 @@ import org.apache.royale.compiler.codegen.js.royale.IJSRoyalePublisher; import org.apache.royale.compiler.common.ISourceLocation; import org.apache.royale.compiler.config.Configuration; import org.apache.royale.compiler.constants.IJSMetaAttributeConstants; +import org.apache.royale.compiler.constants.IMetaAttributeConstants; import org.apache.royale.compiler.css.ICSSPropertyValue; import org.apache.royale.compiler.definitions.IClassDefinition; import org.apache.royale.compiler.definitions.IDefinition; @@ -267,8 +268,8 @@ public class MXMLRoyalePublisher extends JSPublisher implements IJSRoyalePublish while (classIterator.hasNext()) { baseDef = classIterator.next(); - if (baseDef.hasMetaTagByName("Frame")) { - factoryClassName = getFactoryClass(baseDef.getMetaTagByName("Frame")); + if (baseDef.hasMetaTagByName(IMetaAttributeConstants.ATTRIBUTE_FRAME)) { + factoryClassName = getFactoryClass(baseDef.getMetaTagByName(IMetaAttributeConstants.ATTRIBUTE_FRAME)); break; } } diff --git a/compiler/src/main/java/org/apache/royale/compiler/constants/IMetaAttributeConstants.java b/compiler/src/main/java/org/apache/royale/compiler/constants/IMetaAttributeConstants.java index c0b4c04f3..0de8041d7 100644 --- a/compiler/src/main/java/org/apache/royale/compiler/constants/IMetaAttributeConstants.java +++ b/compiler/src/main/java/org/apache/royale/compiler/constants/IMetaAttributeConstants.java @@ -143,6 +143,9 @@ public interface IMetaAttributeConstants // [InstanceType] static final String ATTRIBUTE_INSTANCETYPE = "InstanceType"; + // [JSX] + static final String ATTRIBUTE_JSX = "JSX"; + // [Mixin] static final String ATTRIBUTE_MIXIN = "Mixin"; diff --git a/compiler/src/main/java/org/apache/royale/utils/JSXUtil.java b/compiler/src/main/java/org/apache/royale/utils/JSXUtil.java index 1e15d8f57..abdb10f80 100644 --- a/compiler/src/main/java/org/apache/royale/utils/JSXUtil.java +++ b/compiler/src/main/java/org/apache/royale/utils/JSXUtil.java @@ -23,6 +23,7 @@ import java.util.List; import org.apache.royale.compiler.common.DependencyType; import org.apache.royale.compiler.common.IMetaInfo; +import org.apache.royale.compiler.constants.IMetaAttributeConstants; import org.apache.royale.compiler.definitions.IDefinition; import org.apache.royale.compiler.internal.scopes.ASScope; import org.apache.royale.compiler.internal.tree.as.XMLLiteralNode; @@ -42,7 +43,7 @@ public class JSXUtil { for (IMetaInfo metaInfo : node.getMetaInfos()) { - if (metaInfo.getTagName().equals("JSX")) + if (metaInfo.getTagName().equals(IMetaAttributeConstants.ATTRIBUTE_JSX)) { return true; }
