From bcb983d35ba31bde01f13a33c3f1d565a3537cc6 Mon Sep 17 00:00:00 2001 From: anna Date: Tue, 23 Apr 2013 10:03:46 +0200 Subject: [PATCH] check that .fxml is not mapped to the associated editor EA-44316 - FCIIDE: FileContentImpl.getContentAsText --- .../plugins/javaFX/fxml/JavaFxFileTypeFactory.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/plugins/javaFX/src/org/jetbrains/plugins/javaFX/fxml/JavaFxFileTypeFactory.java b/plugins/javaFX/src/org/jetbrains/plugins/javaFX/fxml/JavaFxFileTypeFactory.java index 285c9efbc281..27e0093fb04b 100644 --- a/plugins/javaFX/src/org/jetbrains/plugins/javaFX/fxml/JavaFxFileTypeFactory.java +++ b/plugins/javaFX/src/org/jetbrains/plugins/javaFX/fxml/JavaFxFileTypeFactory.java @@ -21,8 +21,11 @@ public class JavaFxFileTypeFactory extends FileTypeFactory { } public static boolean isFxml(@NotNull VirtualFile virtualFile) { - return FXML_EXTENSION.equals(virtualFile.getExtension()) && - virtualFile.getFileType() == FileTypeManager.getInstance().getFileTypeByExtension(FXML_EXTENSION); + if (FXML_EXTENSION.equals(virtualFile.getExtension())) { + final FileType fileType = virtualFile.getFileType(); + if (fileType == FileTypeManager.getInstance().getFileTypeByExtension(FXML_EXTENSION) && !fileType.isBinary()) return true; + } + return false; } @Override