diff --git a/plugins/javaFX/src/org/jetbrains/plugins/javaFX/fxml/JavaFxCommonClassNames.java b/plugins/javaFX/src/org/jetbrains/plugins/javaFX/fxml/JavaFxCommonClassNames.java index 80d73846fbf1..db043d8ea2f7 100644 --- a/plugins/javaFX/src/org/jetbrains/plugins/javaFX/fxml/JavaFxCommonClassNames.java +++ b/plugins/javaFX/src/org/jetbrains/plugins/javaFX/fxml/JavaFxCommonClassNames.java @@ -32,5 +32,6 @@ public class JavaFxCommonClassNames { @NonNls public static final String JAVAFX_SCENE_NODE = "javafx.scene.Node"; @NonNls public static final String JAVAFX_SCENE_PAINT = "javafx.scene.paint.Paint"; @NonNls public static final String JAVAFX_FXML_BUILDER = "javafx.util.Builder"; - public static final String VALUE_OF = "valueOf"; + @NonNls public static final String JAVAFX_BEANS_OBSERVABLE = "javafx.beans.Observable"; + @NonNls public static final String VALUE_OF = "valueOf"; } 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 f619e1504280..cc363b5f19d8 100644 --- a/plugins/javaFX/src/org/jetbrains/plugins/javaFX/fxml/JavaFxPsiUtil.java +++ b/plugins/javaFX/src/org/jetbrains/plugins/javaFX/fxml/JavaFxPsiUtil.java @@ -37,6 +37,7 @@ import java.util.List; * User: anna */ public class JavaFxPsiUtil { + public static XmlProcessingInstruction createSingleImportInstruction(String qualifiedName, Project project) { final String importText = ""; final PsiElement child = @@ -278,7 +279,8 @@ public class JavaFxPsiUtil { final PsiField psiField = psiClass.findFieldByName(attributeName, true); if (psiField != null) { if (findPropertySetter(attributeName, (PsiClass)declaration) == null && - findPropertySetter(attributeName, tag) == null) { + findPropertySetter(attributeName, tag) == null && + !InheritanceUtil.isInheritor(psiField.getType(), "javafx.collections.ObservableList")) { //todo read only condition? final PsiMethod[] constructors = psiClass.getConstructors(); for (PsiMethod constructor : constructors) { diff --git a/plugins/javaFX/testData/highlighting/readOnly.fxml b/plugins/javaFX/testData/highlighting/readOnly.fxml index ca8d4658121a..cb3413474368 100644 --- a/plugins/javaFX/testData/highlighting/readOnly.fxml +++ b/plugins/javaFX/testData/highlighting/readOnly.fxml @@ -1,5 +1,8 @@ - - - - backgroundFills=""/> - \ No newline at end of file + + +backgroundFills=""> + + + + +