MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

JavaFX: Follow up after review on creating FXML file (IDEA-187363)

Browse Source
This commit is contained in:
Pavel Dolgov
2018-03-13 16:43:21 +03:00
parent a89e549640
commit d015020a80
1 changed files with 3 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/javaFX/src/org/jetbrains/plugins/javaFX/actions/CreateFxmlFileAction.java
+3 -15
View File
@@ -34,7 +34,6 @@ import org.jetbrains.annotations.NonNls;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.jps.model.java.JavaModuleSourceRootTypes;
import org.jetbrains.jps.model.module.JpsModuleSourceRootType;
import org.jetbrains.plugins.javaFX.fxml.JavaFxFileTypeFactory;
import java.util.*;
@@ -44,14 +43,6 @@ import java.util.*;
*/
public class CreateFxmlFileAction extends CreateFromTemplateActionBase {
private static final String INTERNAL_TEMPLATE_NAME = "FxmlFile.fxml";
private static final Set<JpsModuleSourceRootType<?>> JAVA_ROOT_TYPES;
static {
Set<JpsModuleSourceRootType<?>> types = new HashSet<>();
types.addAll(JavaModuleSourceRootTypes.SOURCES);
types.addAll(JavaModuleSourceRootTypes.RESOURCES);
JAVA_ROOT_TYPES = Collections.unmodifiableSet(types);
}
public CreateFxmlFileAction() {
super("FXML File", "Create New FXML File", AllIcons.FileTypes.Xml);
@@ -120,13 +111,10 @@ public class CreateFxmlFileAction extends CreateFromTemplateActionBase {
final DataContext dataContext = e.getDataContext();
final Presentation presentation = e.getPresentation();
final boolean enabled = isAvailable(dataContext);
presentation.setVisible(enabled);
presentation.setEnabled(enabled);
presentation.setEnabledAndVisible(isAvailable(dataContext));
}
public static boolean isAvailable(DataContext dataContext) {
private static boolean isAvailable(DataContext dataContext) {
final Project project = CommonDataKeys.PROJECT.getData(dataContext);
final IdeView view = LangDataKeys.IDE_VIEW.getData(dataContext);
if (project == null || view == null) {
@@ -140,6 +128,6 @@ public class CreateFxmlFileAction extends CreateFromTemplateActionBase {
final ProjectFileIndex index = ProjectRootManager.getInstance(project).getFileIndex();
return Arrays.stream(directories)
.map(PsiDirectory::getVirtualFile)
.anyMatch(virtualFile -> index.isUnderSourceRootOfType(virtualFile, JAVA_ROOT_TYPES));
.anyMatch(virtualFile -> index.isUnderSourceRootOfType(virtualFile, JavaModuleSourceRootTypes.PRODUCTION));
}
}