From dd4bd46bd8a70b27888c5ebcec1c78bbc60503de Mon Sep 17 00:00:00 2001
From: anna <Anna.Kozlova@jetbrains.com>
Date: Wed, 20 Mar 2013 11:34:09 +0100
Subject: [PATCH] javafx: accept any root tag type (e.g. to be included in
 another page, @see DataAppClient) (cherry picked from commit
 55c9a8ad8675f841b23485f4ea139d87702e05de)

---
 .../plugins/javaFX/fxml/JavaFXHighlightingTest.java      | 4 ++++
 .../org/jetbrains/plugins/javaFX/fxml/JavaFxPsiUtil.java | 9 +++------
 .../testData/highlighting/rootTagCoercedUnchecked.fxml   | 3 +++
 3 files changed, 10 insertions(+), 6 deletions(-)
 create mode 100644 plugins/javaFX/testData/highlighting/rootTagCoercedUnchecked.fxml

diff --git a/plugins/javaFX/javaFX-CE/testSrc/org/jetbrains/plugins/javaFX/fxml/JavaFXHighlightingTest.java b/plugins/javaFX/javaFX-CE/testSrc/org/jetbrains/plugins/javaFX/fxml/JavaFXHighlightingTest.java
index f2d8fd0487f2..2b57e22e7295 100644
--- a/plugins/javaFX/javaFX-CE/testSrc/org/jetbrains/plugins/javaFX/fxml/JavaFXHighlightingTest.java
+++ b/plugins/javaFX/javaFX-CE/testSrc/org/jetbrains/plugins/javaFX/fxml/JavaFXHighlightingTest.java
@@ -65,6 +65,10 @@ public class JavaFXHighlightingTest extends LightCodeInsightFixtureTestCase {
     doTest();
   }
 
+  public void testRootTagCoercedUnchecked() throws Exception {
+    doTest();
+  }
+
   public void testStaticProperties() throws Exception {
     doTest();
   }
diff --git a/plugins/javaFX/src/org/jetbrains/plugins/javaFX/fxml/JavaFxPsiUtil.java b/plugins/javaFX/src/org/jetbrains/plugins/javaFX/fxml/JavaFxPsiUtil.java
index b8d119251c44..3231be970f90 100644
--- a/plugins/javaFX/src/org/jetbrains/plugins/javaFX/fxml/JavaFxPsiUtil.java
+++ b/plugins/javaFX/src/org/jetbrains/plugins/javaFX/fxml/JavaFxPsiUtil.java
@@ -436,13 +436,10 @@ public class JavaFxPsiUtil {
   }
 
   public static String isClassAcceptable(@Nullable XmlTag parentTag, final PsiClass aClass) {
+    if (parentTag == null) {
+      return null;
+    }
     if (aClass != null && aClass.isValid()) {
-      if (parentTag == null) {
-        if (!InheritanceUtil.isInheritor(aClass, false, JavaFxCommonClassNames.JAVAFX_SCENE_NODE)) {
-          return unableToCoerceMessage(aClass, JavaFxCommonClassNames.JAVAFX_SCENE_NODE);
-        }
-        return null;
-      }
       final XmlElementDescriptor descriptor = parentTag.getDescriptor();
       if (descriptor instanceof JavaFxPropertyElementDescriptor) {
         final PsiElement declaration = descriptor.getDeclaration();
diff --git a/plugins/javaFX/testData/highlighting/rootTagCoercedUnchecked.fxml b/plugins/javaFX/testData/highlighting/rootTagCoercedUnchecked.fxml
new file mode 100644
index 000000000000..03a9f9383a7b
--- /dev/null
+++ b/plugins/javaFX/testData/highlighting/rootTagCoercedUnchecked.fxml
@@ -0,0 +1,3 @@
+<?import javafx.scene.control.*?>
+
+<Tab text="Tab Title" xmlns:fx="http://javafx.com/fxml"/>