From f4b3f6ca4d9c2b874da3d27f5a9d6131b19013ed Mon Sep 17 00:00:00 2001
From: anna <Anna.Kozlova@jetbrains.com>
Date: Thu, 28 Mar 2013 11:51:03 +0100
Subject: [PATCH] javafx: accept resources/charset in fx:include attributes

---
 .../plugins/javaFX/fxml/JavaFXHighlightingTest.java         | 6 ++++++
 .../org/jetbrains/plugins/javaFX/fxml/FxmlConstants.java    | 6 ++++--
 plugins/javaFX/testData/highlighting/charsetInInclude.fxml  | 3 +++
 3 files changed, 13 insertions(+), 2 deletions(-)
 create mode 100644 plugins/javaFX/testData/highlighting/charsetInInclude.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 306a9c3b8b33..b856c506ef2b 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
@@ -307,6 +307,12 @@ public class JavaFXHighlightingTest extends AbstractJavaFXTestCase {
     doTest();
   }
 
+  public void testCharsetInInclude() throws Exception {
+    myFixture.addFileToProject("sample.fxml", "<?import javafx.scene.layout.GridPane?>\n" +
+                                                 "<fx:root type=\"javafx.scene.layout.GridPane\" xmlns:fx=\"http://javafx.com/fxml\"/>\n");
+    myFixture.testHighlighting(true, false, false, getTestName(true) + ".fxml");
+  }
+
   public void testIncludedForm() throws Exception {
     myFixture.addFileToProject("sample.fxml", "<?import javafx.scene.layout.GridPane?>\n" +
                                               "<fx:root type=\"javafx.scene.layout.GridPane\" xmlns:fx=\"http://javafx.com/fxml\"/>\n");
diff --git a/plugins/javaFX/src/org/jetbrains/plugins/javaFX/fxml/FxmlConstants.java b/plugins/javaFX/src/org/jetbrains/plugins/javaFX/fxml/FxmlConstants.java
index da2d4fb8ad52..ef826f409714 100644
--- a/plugins/javaFX/src/org/jetbrains/plugins/javaFX/fxml/FxmlConstants.java
+++ b/plugins/javaFX/src/org/jetbrains/plugins/javaFX/fxml/FxmlConstants.java
@@ -41,7 +41,9 @@ public class FxmlConstants {
   @NonNls public static final String FX_INCLUDE = "fx:include";
   @NonNls public static final String FX_ROOT = "fx:root";
   @NonNls public static final String TYPE = "type";
-  
+  @NonNls public static final String RESOURCES = "resources";
+  @NonNls public static final String CHARSET = "charset";
+
   @NonNls public static final String STYLE_CLASS = "styleClass";
   @NonNls public static final String STYLESHEETS = "stylesheets";
 
@@ -52,7 +54,7 @@ public class FxmlConstants {
 
   public static final Map<String, List<String>> FX_ELEMENT_ATTRIBUTES = new HashMap<String, List<String>>();
   static {
-    FX_ELEMENT_ATTRIBUTES.put(FX_INCLUDE, Arrays.asList(FX_ELEMENT_SOURCE, FX_ID));
+    FX_ELEMENT_ATTRIBUTES.put(FX_INCLUDE, Arrays.asList(FX_ELEMENT_SOURCE, FX_ID, RESOURCES, CHARSET));
     FX_ELEMENT_ATTRIBUTES.put(FX_REFERENCE, Arrays.asList(FX_ELEMENT_SOURCE));
     FX_ELEMENT_ATTRIBUTES.put(FX_SCRIPT, Arrays.asList(FX_ELEMENT_SOURCE));
     FX_ELEMENT_ATTRIBUTES.put(FX_ROOT, Arrays.asList(TYPE));
diff --git a/plugins/javaFX/testData/highlighting/charsetInInclude.fxml b/plugins/javaFX/testData/highlighting/charsetInInclude.fxml
new file mode 100644
index 000000000000..9a8ae0edb713
--- /dev/null
+++ b/plugins/javaFX/testData/highlighting/charsetInInclude.fxml
@@ -0,0 +1,3 @@
+<fx:root type="javafx.scene.layout.GridPane" xmlns:fx="http://javafx.com/fxml">
+   <fx:include source="sample.fxml" charset="UTF-8"/>
+</fx:root>
\ No newline at end of file