From b73d80eee707248c24679519daae702ddf9252e0 Mon Sep 17 00:00:00 2001 From: Dmitry Avdeev Date: Wed, 11 Feb 2015 18:36:34 +0300 Subject: [PATCH] IDEA-136336 Cannot compile project after changing JDK version --- .../projectWizard/ProjectWizardTestCase.java | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/java/testFramework/src/com/intellij/ide/projectWizard/ProjectWizardTestCase.java b/java/testFramework/src/com/intellij/ide/projectWizard/ProjectWizardTestCase.java index b3bca3199ed5..94e47f8c1684 100644 --- a/java/testFramework/src/com/intellij/ide/projectWizard/ProjectWizardTestCase.java +++ b/java/testFramework/src/com/intellij/ide/projectWizard/ProjectWizardTestCase.java @@ -173,25 +173,26 @@ public abstract class ProjectWizardTestCase ext ApplicationManager.getApplication().runWriteAction(new Runnable() { @Override public void run() { - ProjectJdkTable jdkTable = ProjectJdkTable.getInstance(); - Sdk defaultJdk = new SimpleJavaSdkType().createJdk(DEFAULT_SDK, SystemProperties.getJavaHome()); - Sdk otherJdk = new SimpleJavaSdkType().createJdk("_other", SystemProperties.getJavaHome()); - jdkTable.addJdk(otherJdk); - jdkTable.addJdk(defaultJdk); - mySdks.add(defaultJdk); - mySdks.add(otherJdk); + addSdk(new SimpleJavaSdkType().createJdk(DEFAULT_SDK, SystemProperties.getJavaHome())); + addSdk(new SimpleJavaSdkType().createJdk("_other", SystemProperties.getJavaHome())); //noinspection UseOfSystemOutOrSystemErr - System.out.println(Arrays.asList(jdkTable.getAllJdks())); + System.out.println(Arrays.asList(ProjectJdkTable.getInstance().getAllJdks())); if (getName().contains("DefaultSdk")) { Project defaultProject = ProjectManager.getInstance().getDefaultProject(); - ProjectRootManager.getInstance(defaultProject).setProjectSdk(defaultJdk); + ProjectRootManager.getInstance(defaultProject).setProjectSdk( + new SimpleJavaSdkType().createJdk(DEFAULT_SDK, SystemProperties.getJavaHome())); } } }); } + protected void addSdk(Sdk sdk) { + ProjectJdkTable.getInstance().addJdk(sdk); + mySdks.add(sdk); + } + @Override public void tearDown() throws Exception { if (myWizard != null) {