From 124200ead78f58d6bf15c3fae9afec9ebab3e6a7 Mon Sep 17 00:00:00 2001 From: Anna Kozlova Date: Mon, 24 Mar 2014 11:40:15 +0100 Subject: [PATCH] IDEA-122710 JavaFX sources should be added when SDK is created --- .../openapi/projectRoots/impl/JavaSdkImpl.java | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/java/java-impl/src/com/intellij/openapi/projectRoots/impl/JavaSdkImpl.java b/java/java-impl/src/com/intellij/openapi/projectRoots/impl/JavaSdkImpl.java index eb3ea75c8024..e334754923da 100644 --- a/java/java-impl/src/com/intellij/openapi/projectRoots/impl/JavaSdkImpl.java +++ b/java/java-impl/src/com/intellij/openapi/projectRoots/impl/JavaSdkImpl.java @@ -333,6 +333,10 @@ public class JavaSdkImpl extends JavaSdk { if(sources != null){ sdkModificator.addRoot(sources, OrderRootType.SOURCES); } + final VirtualFile javaFxSources = findSources(jdkHome, "javafx-src"); + if (javaFxSources != null) { + sdkModificator.addRoot(javaFxSources, OrderRootType.SOURCES); + } if(docs != null){ sdkModificator.addRoot(docs, JavadocOrderRootType.getInstance()); } @@ -493,10 +497,16 @@ public class JavaSdkImpl extends JavaSdk { @Nullable @SuppressWarnings({"HardCodedStringLiteral"}) public static VirtualFile findSources(File file) { + return findSources(file, "src"); + } + + @Nullable + @SuppressWarnings({"HardCodedStringLiteral"}) + public static VirtualFile findSources(File file, final String srcName) { File srcDir = new File(file, "src"); - File jarFile = new File(file, "src.jar"); + File jarFile = new File(file, srcName + ".jar"); if (!jarFile.exists()) { - jarFile = new File(file, "src.zip"); + jarFile = new File(file, srcName + ".zip"); } if (jarFile.exists()) {