You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@royale.apache.org by jo...@apache.org on 2019/12/02 15:53:23 UTC
[royale-compiler] branch develop updated (929982c -> b4c054d)
This is an automated email from the ASF dual-hosted git repository.
joshtynjala pushed a change to branch develop
in repository https://gitbox.apache.org/repos/asf/royale-compiler.git.
from 929982c remove generated files so we can ad to .gitignore
new 0eab0f7 Revert "Revert "MXMLClassReferenceNodeBase: fixed issue where an MXML child element could be incorrectly resolved as a property/style/event, even if it had a different XML namespace prefix from its parent (closes #101)""
new b4c054d MXMLClassReferenceNodeBase: fixed null reference exception when child tag does not have a namespace URI (references #102)
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../internal/tree/mxml/MXMLClassReferenceNodeBase.java | 12 +++++++++---
1 file changed, 9 insertions(+), 3 deletions(-)
[royale-compiler] 01/02: Revert "Revert
"MXMLClassReferenceNodeBase: fixed issue where an MXML child element could
be incorrectly resolved as a property/style/event,
even if it had a different XML namespace prefix from its parent (closes
#101)""
Posted by jo...@apache.org.
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 0eab0f74e6fad70e548599e67f83121404fab693
Author: Josh Tynjala <jo...@apache.org>
AuthorDate: Mon Dec 2 07:46:39 2019 -0800
Revert "Revert "MXMLClassReferenceNodeBase: fixed issue where an MXML child element could be incorrectly resolved as a property/style/event, even if it had a different XML namespace prefix from its parent (closes #101)""
This reverts commit d807f89ed363faf98e56197540811a87906795e8.
---
.../compiler/internal/tree/mxml/MXMLClassReferenceNodeBase.java | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/compiler/src/main/java/org/apache/royale/compiler/internal/tree/mxml/MXMLClassReferenceNodeBase.java b/compiler/src/main/java/org/apache/royale/compiler/internal/tree/mxml/MXMLClassReferenceNodeBase.java
index 4c66aa4..bc5d7bd 100644
--- a/compiler/src/main/java/org/apache/royale/compiler/internal/tree/mxml/MXMLClassReferenceNodeBase.java
+++ b/compiler/src/main/java/org/apache/royale/compiler/internal/tree/mxml/MXMLClassReferenceNodeBase.java
@@ -436,7 +436,13 @@ abstract class MXMLClassReferenceNodeBase extends MXMLNodeBase implements IMXMLC
RoyaleProject project = builder.getProject();
// Handle child tags that are property/style/event specifiers.
- MXMLSpecifierNodeBase childNode = createSpecifierNode(builder, childTag.getShortName());
+ MXMLSpecifierNodeBase childNode = null;
+ // ...but only if the child has the same prefix as the parent -JT
+ // apache/royale-compiler#101
+ if(tag.getPrefix().equals(childTag.getPrefix()))
+ {
+ childNode = createSpecifierNode(builder, childTag.getShortName());
+ }
if (childNode != null)
{
// This tag is not part of the default property value.
[royale-compiler] 02/02: MXMLClassReferenceNodeBase: fixed null
reference exception when child tag does not have a namespace URI
(references #102)
Posted by jo...@apache.org.
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 b4c054dca217b158d28b085322151066a1276f10
Author: Josh Tynjala <jo...@apache.org>
AuthorDate: Mon Dec 2 07:53:22 2019 -0800
MXMLClassReferenceNodeBase: fixed null reference exception when child tag does not have a namespace URI (references #102)
---
.../compiler/internal/tree/mxml/MXMLClassReferenceNodeBase.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/compiler/src/main/java/org/apache/royale/compiler/internal/tree/mxml/MXMLClassReferenceNodeBase.java b/compiler/src/main/java/org/apache/royale/compiler/internal/tree/mxml/MXMLClassReferenceNodeBase.java
index bc5d7bd..567383d 100644
--- a/compiler/src/main/java/org/apache/royale/compiler/internal/tree/mxml/MXMLClassReferenceNodeBase.java
+++ b/compiler/src/main/java/org/apache/royale/compiler/internal/tree/mxml/MXMLClassReferenceNodeBase.java
@@ -525,7 +525,7 @@ abstract class MXMLClassReferenceNodeBase extends MXMLNodeBase implements IMXMLC
if (defaultPropertyDefinition != null && !processedDefaultProperty && defaultPropertyDefinition.getBaseName().equals("text"))
{
String uri = childTag.getURI();
- if (uri.equals("http://www.w3.org/1999/xhtml"))
+ if (uri != null && uri.equals("http://www.w3.org/1999/xhtml"))
{
IVariableDefinition htmlDef = (IVariableDefinition)project.resolveSpecifier(classReference, "html");
if (htmlDef != null)
@@ -542,7 +542,7 @@ abstract class MXMLClassReferenceNodeBase extends MXMLNodeBase implements IMXMLC
else if (altDefaultPropertyDefinition != null && !processedDefaultProperty && altDefaultPropertyDefinition.getBaseName().equals("innerHTML"))
{
String uri = childTag.getURI();
- if (uri.equals("library://ns.apache.org/royale/html"))
+ if (uri != null && uri.equals("library://ns.apache.org/royale/html"))
{
IVariableDefinition textDef = (IVariableDefinition)project.resolveSpecifier(classReference, "innerHTML");
if (textDef != null)