From 73e121ce346672a6133c9bd2f624a7172373e2aa Mon Sep 17 00:00:00 2001 From: Dmitry Trofimov Date: Thu, 21 Oct 2010 18:06:18 +0400 Subject: [PATCH] jdk->sdk rename refactoring --- .../compiler/ant/BuildPropertiesImpl.java | 2 +- .../execution/util/JreVersionDetector.java | 2 +- .../com/intellij/ide/impl/NewProjectUtil.java | 2 +- .../newProjectWizard/AddModuleWizard.java | 2 +- .../util/projectWizard/JdkChooserPanel.java | 4 +- .../ProjectJdkForModuleStep.java | 2 +- .../configuration/ProjectJdkConfigurable.java | 8 ++-- .../UIRootConfigurationAccessor.java | 2 +- .../projectRoot/JdkListConfigurable.java | 2 +- .../ProjectOpenProcessorBase.java | 2 +- .../analysis/IncreaseLanguageLevelFix.java | 2 +- .../ex/GlobalJavaInspectionContextImpl.java | 4 +- .../com/intellij/roots/InheritedJdkTest.java | 6 +-- .../com/intellij/roots/RootsChangedTest.java | 4 +- .../ide/util/projectWizard/WizardContext.java | 2 +- .../openapi/roots/ModuleRootModel.java | 4 +- .../openapi/roots/ProjectRootManager.java | 8 ++-- .../util/OrderEntryCellAppearanceUtils.java | 4 +- .../openapi/projectRoots/ex/PathUtilEx.java | 2 +- .../impl/SdkConfigurationUtil.java | 6 +-- .../impl/InheritedJdkOrderEntryImpl.java | 2 +- .../roots/impl/ProjectRootManagerImpl.java | 48 +++++++++---------- .../roots/impl/RootConfigurationAccessor.java | 4 +- .../projectRoot/ProjectSdksModel.java | 2 +- .../lang/ant/config/execution/PathUtilEx.java | 2 +- .../ant/config/impl/AntConfigurationImpl.java | 2 +- .../intellij/lang/ant/dom/AntDomProject.java | 2 +- .../lang/ant/psi/impl/AntFileImpl.java | 4 +- .../intellij/execution/junit/TestObject.java | 2 +- .../configuration/TestNGRunnableState.java | 2 +- .../xpath/xslt/run/XsltRunConfiguration.java | 2 +- 31 files changed, 71 insertions(+), 71 deletions(-) diff --git a/java/compiler/impl/src/com/intellij/compiler/ant/BuildPropertiesImpl.java b/java/compiler/impl/src/com/intellij/compiler/ant/BuildPropertiesImpl.java index 80dae42cb5e6..c7e1a8d20a50 100644 --- a/java/compiler/impl/src/com/intellij/compiler/ant/BuildPropertiesImpl.java +++ b/java/compiler/impl/src/com/intellij/compiler/ant/BuildPropertiesImpl.java @@ -180,7 +180,7 @@ public class BuildPropertiesImpl extends BuildProperties { } } - final Sdk projectJdk = ProjectRootManager.getInstance(project).getProjectJdk(); + final Sdk projectJdk = ProjectRootManager.getInstance(project).getProjectSdk(); add(new Property(PROPERTY_PROJECT_JDK_HOME, projectJdk != null ? propertyRef(getJdkHomeProperty(projectJdk.getName())) : ""), 1); add(new Property(PROPERTY_PROJECT_JDK_BIN, projectJdk != null ? propertyRef(getJdkBinProperty(projectJdk.getName())) : "")); add(new Property(PROPERTY_PROJECT_JDK_CLASSPATH, projectJdk != null ? getJdkPathId(projectJdk.getName()) : "")); diff --git a/java/execution/impl/src/com/intellij/execution/util/JreVersionDetector.java b/java/execution/impl/src/com/intellij/execution/util/JreVersionDetector.java index 102cb438a332..feaa6a69c22c 100644 --- a/java/execution/impl/src/com/intellij/execution/util/JreVersionDetector.java +++ b/java/execution/impl/src/com/intellij/execution/util/JreVersionDetector.java @@ -49,7 +49,7 @@ public class JreVersionDetector { return isJre50(jdk); } - final Sdk projectJdk = ProjectRootManager.getInstance(configuration.getProject()).getProjectJdk(); + final Sdk projectJdk = ProjectRootManager.getInstance(configuration.getProject()).getProjectSdk(); return isJre50(projectJdk); } } diff --git a/java/idea-ui/src/com/intellij/ide/impl/NewProjectUtil.java b/java/idea-ui/src/com/intellij/ide/impl/NewProjectUtil.java index 3a55f74021bd..1288d2af9c68 100644 --- a/java/idea-ui/src/com/intellij/ide/impl/NewProjectUtil.java +++ b/java/idea-ui/src/com/intellij/ide/impl/NewProjectUtil.java @@ -177,7 +177,7 @@ public class NewProjectUtil { if (versionString == null) return; ProjectRootManagerEx rootManager = ProjectRootManagerEx.getInstanceEx(project); - rootManager.setProjectJdk(jdk); + rootManager.setProjectSdk(jdk); LanguageLevel level = LanguageLevelUtil.getDefaultLanguageLevel(versionString); LanguageLevelProjectExtension ext = LanguageLevelProjectExtension.getInstance(project); if (level.compareTo(ext.getLanguageLevel()) < 0) { diff --git a/java/idea-ui/src/com/intellij/ide/util/newProjectWizard/AddModuleWizard.java b/java/idea-ui/src/com/intellij/ide/util/newProjectWizard/AddModuleWizard.java index e0be57f7cafa..de335bac90a7 100644 --- a/java/idea-ui/src/com/intellij/ide/util/newProjectWizard/AddModuleWizard.java +++ b/java/idea-ui/src/com/intellij/ide/util/newProjectWizard/AddModuleWizard.java @@ -301,7 +301,7 @@ public class AddModuleWizard extends AbstractWizard { return context.getProjectJdk(); } final Project project = context.getProject() == null ? ProjectManager.getInstance().getDefaultProject() : context.getProject(); - final Sdk projectJdk = ProjectRootManager.getInstance(project).getProjectJdk(); + final Sdk projectJdk = ProjectRootManager.getInstance(project).getProjectSdk(); if (projectJdk != null) { return projectJdk; } diff --git a/java/idea-ui/src/com/intellij/ide/util/projectWizard/JdkChooserPanel.java b/java/idea-ui/src/com/intellij/ide/util/projectWizard/JdkChooserPanel.java index 3fd85200e823..adcef1334736 100644 --- a/java/idea-ui/src/com/intellij/ide/util/projectWizard/JdkChooserPanel.java +++ b/java/idea-ui/src/com/intellij/ide/util/projectWizard/JdkChooserPanel.java @@ -223,14 +223,14 @@ public class JdkChooserPanel extends JPanel { } public static Sdk chooseAndSetJDK(final Project project) { - final Sdk projectJdk = ProjectRootManager.getInstance(project).getProjectJdk(); + final Sdk projectJdk = ProjectRootManager.getInstance(project).getProjectSdk(); final Sdk jdk = showDialog(project, ProjectBundle.message("module.libraries.target.jdk.select.title"), WindowManagerEx.getInstanceEx().getFrame(project), projectJdk); if (jdk == null) { return null; } ApplicationManager.getApplication().runWriteAction(new Runnable() { public void run() { - ProjectRootManager.getInstance(project).setProjectJdk(jdk); + ProjectRootManager.getInstance(project).setProjectSdk(jdk); } }); return jdk; diff --git a/java/idea-ui/src/com/intellij/ide/util/projectWizard/ProjectJdkForModuleStep.java b/java/idea-ui/src/com/intellij/ide/util/projectWizard/ProjectJdkForModuleStep.java index 4681a04b372f..0b562dff41a0 100644 --- a/java/idea-ui/src/com/intellij/ide/util/projectWizard/ProjectJdkForModuleStep.java +++ b/java/idea-ui/src/com/intellij/ide/util/projectWizard/ProjectJdkForModuleStep.java @@ -149,7 +149,7 @@ public class ProjectJdkForModuleStep extends ModuleWizardStep { @Nullable private static Sdk getDefaultJdk() { Project defaultProject = ProjectManagerEx.getInstanceEx().getDefaultProject(); - return ProjectRootManagerEx.getInstanceEx(defaultProject).getProjectJdk(); + return ProjectRootManagerEx.getInstanceEx(defaultProject).getProjectSdk(); } diff --git a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/ProjectJdkConfigurable.java b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/ProjectJdkConfigurable.java index 5567ef30be8d..f03f13b0b953 100644 --- a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/ProjectJdkConfigurable.java +++ b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/ProjectJdkConfigurable.java @@ -86,7 +86,7 @@ public class ProjectJdkConfigurable implements UnnamedConfigurable { myFreeze = true; final Sdk projectJdk = myJdksModel.getProjectSdk(); myCbProjectJdk.reloadModel(new JdkComboBox.NoneJdkComboBoxItem(), myProject); - final String sdkName = projectJdk == null ? ProjectRootManager.getInstance(myProject).getProjectJdkName() : projectJdk.getName(); + final String sdkName = projectJdk == null ? ProjectRootManager.getInstance(myProject).getProjectSdkName() : projectJdk.getName(); if (sdkName != null) { final Sdk jdk = myJdksModel.findSdk(sdkName); if (jdk != null) { @@ -135,18 +135,18 @@ public class ProjectJdkConfigurable implements UnnamedConfigurable { } public boolean isModified() { - final Sdk projectJdk = ProjectRootManager.getInstance(myProject).getProjectJdk(); + final Sdk projectJdk = ProjectRootManager.getInstance(myProject).getProjectSdk(); return !Comparing.equal(projectJdk, getSelectedProjectJdk()); } public void apply() throws ConfigurationException { - ProjectRootManager.getInstance(myProject).setProjectJdk(getSelectedProjectJdk()); + ProjectRootManager.getInstance(myProject).setProjectSdk(getSelectedProjectJdk()); } public void reset() { reloadModel(); - final String sdkName = ProjectRootManager.getInstance(myProject).getProjectJdkName(); + final String sdkName = ProjectRootManager.getInstance(myProject).getProjectSdkName(); if (sdkName != null) { final Sdk jdk = myJdksModel.findSdk(sdkName); if (jdk != null) { diff --git a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/UIRootConfigurationAccessor.java b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/UIRootConfigurationAccessor.java index 54ea7528ab27..859119b9cf22 100644 --- a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/UIRootConfigurationAccessor.java +++ b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/UIRootConfigurationAccessor.java @@ -72,7 +72,7 @@ public class UIRootConfigurationAccessor extends RootConfigurationAccessor { @Nullable public String getProjectSdkName(final Project project) { - final String projectJdkName = ProjectRootManager.getInstance(project).getProjectJdkName(); + final String projectJdkName = ProjectRootManager.getInstance(project).getProjectSdkName(); final Sdk projectJdk = getProjectSdk(project); if (projectJdk != null) { return projectJdk.getName(); diff --git a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/projectRoot/JdkListConfigurable.java b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/projectRoot/JdkListConfigurable.java index 86b664d45b3d..ab2fc0aaca2d 100644 --- a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/projectRoot/JdkListConfigurable.java +++ b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/projectRoot/JdkListConfigurable.java @@ -168,7 +168,7 @@ public class JdkListConfigurable extends BaseStructureConfigurable { } if (myJdksTreeModel.isModified() || modifiedJdks) myJdksTreeModel.apply(this); - myJdksTreeModel.setProjectSdk(ProjectRootManager.getInstance(myProject).getProjectJdk()); + myJdksTreeModel.setProjectSdk(ProjectRootManager.getInstance(myProject).getProjectSdk()); } public boolean isModified() { diff --git a/java/idea-ui/src/com/intellij/projectImport/ProjectOpenProcessorBase.java b/java/idea-ui/src/com/intellij/projectImport/ProjectOpenProcessorBase.java index 0959dab65992..78dcfe8985fa 100644 --- a/java/idea-ui/src/com/intellij/projectImport/ProjectOpenProcessorBase.java +++ b/java/idea-ui/src/com/intellij/projectImport/ProjectOpenProcessorBase.java @@ -124,7 +124,7 @@ public abstract class ProjectOpenProcessorBase extends ProjectOpenProcessor { wizardContext.setProjectFileDirectory(virtualFile.getParent().getPath()); Project defaultProject = ProjectManager.getInstance().getDefaultProject(); - Sdk jdk = ProjectRootManager.getInstance(defaultProject).getProjectJdk(); + Sdk jdk = ProjectRootManager.getInstance(defaultProject).getProjectSdk(); if (jdk == null) { jdk = ProjectJdkTable.getInstance().findMostRecentSdkOfType(JavaSdk.getInstance()); } diff --git a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/analysis/IncreaseLanguageLevelFix.java b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/analysis/IncreaseLanguageLevelFix.java index 66553f60c997..9cf11d9e68c3 100644 --- a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/analysis/IncreaseLanguageLevelFix.java +++ b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/analysis/IncreaseLanguageLevelFix.java @@ -110,7 +110,7 @@ public class IncreaseLanguageLevelFix implements IntentionAction { @Nullable private static Sdk getRelevantJdk(final Project project, @Nullable Module module) { - Sdk projectJdk = ProjectRootManager.getInstance(project).getProjectJdk(); + Sdk projectJdk = ProjectRootManager.getInstance(project).getProjectSdk(); Sdk moduleJdk = module == null ? null : ModuleRootManager.getInstance(module).getSdk(); return moduleJdk == null ? projectJdk : moduleJdk; } diff --git a/java/java-impl/src/com/intellij/codeInspection/ex/GlobalJavaInspectionContextImpl.java b/java/java-impl/src/com/intellij/codeInspection/ex/GlobalJavaInspectionContextImpl.java index d48f6da93786..c739d62cbf07 100644 --- a/java/java-impl/src/com/intellij/codeInspection/ex/GlobalJavaInspectionContextImpl.java +++ b/java/java-impl/src/com/intellij/codeInspection/ex/GlobalJavaInspectionContextImpl.java @@ -120,7 +120,7 @@ public class GlobalJavaInspectionContextImpl extends GlobalJavaInspectionContext if (isBadSdk(project, modules)) { System.err.println(InspectionsBundle.message("inspection.no.jdk.error.message")); System.err.println( - InspectionsBundle.message("offline.inspections.jdk.not.found", ProjectRootManager.getInstance(project).getProjectJdkName())); + InspectionsBundle.message("offline.inspections.jdk.not.found", ProjectRootManager.getInstance(project).getProjectSdkName())); return false; } for (Module module : modules) { @@ -152,7 +152,7 @@ public class GlobalJavaInspectionContextImpl extends GlobalJavaInspectionContext private static boolean isBadSdk(final Project project, final Module[] modules) { boolean anyModuleAcceptsSdk = false; boolean anyModuleUsesProjectSdk = false; - Sdk projectSdk = ProjectRootManager.getInstance(project).getProjectJdk(); + Sdk projectSdk = ProjectRootManager.getInstance(project).getProjectSdk(); for (Module module : modules) { if (ModuleRootManager.getInstance(module).isSdkInherited()) { anyModuleUsesProjectSdk = true; diff --git a/java/java-tests/testSrc/com/intellij/roots/InheritedJdkTest.java b/java/java-tests/testSrc/com/intellij/roots/InheritedJdkTest.java index 9f5b1ec53efc..06b4794a65ac 100644 --- a/java/java-tests/testSrc/com/intellij/roots/InheritedJdkTest.java +++ b/java/java-tests/testSrc/com/intellij/roots/InheritedJdkTest.java @@ -34,7 +34,7 @@ public class InheritedJdkTest extends ModuleTestCase { @Override public void run() { final ProjectRootManagerEx rootManagerEx = ProjectRootManagerEx.getInstanceEx(myProject); - rootManagerEx.setProjectJdkName(jdk.getName()); + rootManagerEx.setProjectSdkName(jdk.getName()); final ModifiableRootModel rootModel = rootManager.getModifiableModel(); rootModel.inheritSdk(); rootModel.commit(); @@ -102,7 +102,7 @@ public class InheritedJdkTest extends ModuleTestCase { ApplicationManager.getApplication().runWriteAction(new Runnable() { @Override public void run() { - projectRootManager.setProjectJdk(mockJdk); + projectRootManager.setProjectSdk(mockJdk); } }); @@ -112,7 +112,7 @@ public class InheritedJdkTest extends ModuleTestCase { ApplicationManager.getApplication().runWriteAction(new Runnable() { @Override public void run() { - projectRootManager.setProjectJdkName("jdk1"); + projectRootManager.setProjectSdkName("jdk1"); } }); diff --git a/java/java-tests/testSrc/com/intellij/roots/RootsChangedTest.java b/java/java-tests/testSrc/com/intellij/roots/RootsChangedTest.java index 2fe2009ee2f8..51b728df3e6c 100644 --- a/java/java-tests/testSrc/com/intellij/roots/RootsChangedTest.java +++ b/java/java-tests/testSrc/com/intellij/roots/RootsChangedTest.java @@ -99,7 +99,7 @@ public class RootsChangedTest extends ModuleTestCase { ProjectJdkTable.getInstance().addJdk(jdk); assertEventsCount(0); - ProjectRootManager.getInstance(myProject).setProjectJdk(jdkBBB); + ProjectRootManager.getInstance(myProject).setProjectSdk(jdkBBB); assertEventsCount(0); final ModifiableRootModel rootModelA = ModuleRootManager.getInstance(moduleA).getModifiableModel(); @@ -109,7 +109,7 @@ public class RootsChangedTest extends ModuleTestCase { ProjectRootManager.getInstance(myProject).multiCommit(new ModifiableRootModel[]{rootModelA, rootModelB}); assertEventsCount(1); - ProjectRootManager.getInstance(myProject).setProjectJdk(jdk); + ProjectRootManager.getInstance(myProject).setProjectSdk(jdk); assertEventsCount(1); final SdkModificator sdkModificator = jdk.getSdkModificator(); diff --git a/platform/lang-api/src/com/intellij/ide/util/projectWizard/WizardContext.java b/platform/lang-api/src/com/intellij/ide/util/projectWizard/WizardContext.java index 84061770853a..e5daad1340c0 100644 --- a/platform/lang-api/src/com/intellij/ide/util/projectWizard/WizardContext.java +++ b/platform/lang-api/src/com/intellij/ide/util/projectWizard/WizardContext.java @@ -56,7 +56,7 @@ public class WizardContext { public WizardContext(Project project) { myProject = project; if (myProject != null){ - myProjectJdk = ProjectRootManager.getInstance(myProject).getProjectJdk(); + myProjectJdk = ProjectRootManager.getInstance(myProject).getProjectSdk(); } } diff --git a/platform/lang-api/src/com/intellij/openapi/roots/ModuleRootModel.java b/platform/lang-api/src/com/intellij/openapi/roots/ModuleRootModel.java index 956330b4a056..ba8b609dacad 100644 --- a/platform/lang-api/src/com/intellij/openapi/roots/ModuleRootModel.java +++ b/platform/lang-api/src/com/intellij/openapi/roots/ModuleRootModel.java @@ -65,8 +65,8 @@ public interface ModuleRootModel { * Returns true if JDK for this module is inherited from a project. * * @return true if the JDK is inherited, false otherwise - * @see ProjectRootManager#getProjectJdk() - * @see ProjectRootManager#setProjectJdk(com.intellij.openapi.projectRoots.Sdk) + * @see ProjectRootManager#getProjectSdk() + * @see ProjectRootManager#setProjectSdk(com.intellij.openapi.projectRoots.Sdk) */ boolean isSdkInherited(); diff --git a/platform/lang-api/src/com/intellij/openapi/roots/ProjectRootManager.java b/platform/lang-api/src/com/intellij/openapi/roots/ProjectRootManager.java index 61349d15b38f..4021f63a481b 100644 --- a/platform/lang-api/src/com/intellij/openapi/roots/ProjectRootManager.java +++ b/platform/lang-api/src/com/intellij/openapi/roots/ProjectRootManager.java @@ -124,28 +124,28 @@ public abstract class ProjectRootManager implements ModificationTracker { * to any existing JDK instance. */ @Nullable - public abstract Sdk getProjectJdk(); + public abstract Sdk getProjectSdk(); /** * Returns the name of the JDK selected for the project. * * @return the JDK name. */ - public abstract String getProjectJdkName(); + public abstract String getProjectSdkName(); /** * Sets the JDK to be used for the project. * * @param jdk the JDK instance. */ - public abstract void setProjectJdk(@Nullable Sdk jdk); + public abstract void setProjectSdk(@Nullable Sdk jdk); /** * Sets the name of the JDK to be used for the project. * * @param name the name of the JDK. */ - public abstract void setProjectJdkName(String name); + public abstract void setProjectSdkName(String name); /** * Commits the change to the lists of roots for the specified modules. diff --git a/platform/lang-api/src/com/intellij/openapi/roots/ui/util/OrderEntryCellAppearanceUtils.java b/platform/lang-api/src/com/intellij/openapi/roots/ui/util/OrderEntryCellAppearanceUtils.java index a59c95fe9b36..37d4766a6c2a 100644 --- a/platform/lang-api/src/com/intellij/openapi/roots/ui/util/OrderEntryCellAppearanceUtils.java +++ b/platform/lang-api/src/com/intellij/openapi/roots/ui/util/OrderEntryCellAppearanceUtils.java @@ -177,14 +177,14 @@ public class OrderEntryCellAppearanceUtils { public static CellAppearance forProjectJdk(final Project project) { final ProjectRootManager projectRootManager = ProjectRootManager.getInstance(project); - final Sdk projectJdk = projectRootManager.getProjectJdk(); + final Sdk projectJdk = projectRootManager.getProjectSdk(); final CellAppearance appearance; if (projectJdk != null) { appearance = forJdk(projectJdk, false, false); } else { // probably invalid JDK - final String projectJdkName = projectRootManager.getProjectJdkName(); + final String projectJdkName = projectRootManager.getProjectSdkName(); if (projectJdkName != null) { appearance = SimpleTextCellAppearance.invalid(ProjectBundle.message("jdk.combo.box.invalid.item", projectJdkName), CellAppearanceUtils.INVALID_ICON); diff --git a/platform/lang-impl/src/com/intellij/openapi/projectRoots/ex/PathUtilEx.java b/platform/lang-impl/src/com/intellij/openapi/projectRoots/ex/PathUtilEx.java index 3d6a84fc9589..c883b5ddfd87 100644 --- a/platform/lang-impl/src/com/intellij/openapi/projectRoots/ex/PathUtilEx.java +++ b/platform/lang-impl/src/com/intellij/openapi/projectRoots/ex/PathUtilEx.java @@ -55,7 +55,7 @@ public class PathUtilEx { } public static Sdk chooseJdk(Project project, Collection modules) { - Sdk projectJdk = ProjectRootManager.getInstance(project).getProjectJdk(); + Sdk projectJdk = ProjectRootManager.getInstance(project).getProjectSdk(); if (projectJdk != null) { return projectJdk; } diff --git a/platform/lang-impl/src/com/intellij/openapi/projectRoots/impl/SdkConfigurationUtil.java b/platform/lang-impl/src/com/intellij/openapi/projectRoots/impl/SdkConfigurationUtil.java index 3a4b490bc5c4..a775bf1399e2 100644 --- a/platform/lang-impl/src/com/intellij/openapi/projectRoots/impl/SdkConfigurationUtil.java +++ b/platform/lang-impl/src/com/intellij/openapi/projectRoots/impl/SdkConfigurationUtil.java @@ -159,7 +159,7 @@ public class SdkConfigurationUtil { public static void setDirectoryProjectSdk(final Project project, final Sdk sdk) { ApplicationManager.getApplication().runWriteAction(new Runnable() { public void run() { - ProjectRootManager.getInstance(project).setProjectJdk(sdk); + ProjectRootManager.getInstance(project).setProjectSdk(sdk); final Module[] modules = ModuleManager.getInstance(project).getModules(); if (modules.length > 0) { final ModifiableRootModel model = ModuleRootManager.getInstance(modules[0]).getModifiableModel(); @@ -171,7 +171,7 @@ public class SdkConfigurationUtil { } public static void configureDirectoryProjectSdk(final Project project, final SdkType... sdkTypes) { - Sdk existingSdk = ProjectRootManager.getInstance(project).getProjectJdk(); + Sdk existingSdk = ProjectRootManager.getInstance(project).getProjectSdk(); if (existingSdk != null && ArrayUtil.contains(existingSdk.getSdkType(), sdkTypes)) { return; } @@ -185,7 +185,7 @@ public class SdkConfigurationUtil { @Nullable public static Sdk findOrCreateSdk(final SdkType... sdkTypes) { final Project defaultProject = ProjectManager.getInstance().getDefaultProject(); - final Sdk sdk = ProjectRootManager.getInstance(defaultProject).getProjectJdk(); + final Sdk sdk = ProjectRootManager.getInstance(defaultProject).getProjectSdk(); if (sdk != null) { for (SdkType type : sdkTypes) { if (sdk.getSdkType() == type) { diff --git a/platform/lang-impl/src/com/intellij/openapi/roots/impl/InheritedJdkOrderEntryImpl.java b/platform/lang-impl/src/com/intellij/openapi/roots/impl/InheritedJdkOrderEntryImpl.java index be03ff5ca38b..05f8becf83ca 100644 --- a/platform/lang-impl/src/com/intellij/openapi/roots/impl/InheritedJdkOrderEntryImpl.java +++ b/platform/lang-impl/src/com/intellij/openapi/roots/impl/InheritedJdkOrderEntryImpl.java @@ -89,7 +89,7 @@ public class InheritedJdkOrderEntryImpl extends LibraryOrderEntryBaseImpl implem } protected RootProvider getRootProvider() { - final Sdk projectJdk = myProjectRootManagerImpl.getProjectJdk(); + final Sdk projectJdk = myProjectRootManagerImpl.getProjectSdk(); return projectJdk == null ? null : projectJdk.getRootProvider(); } diff --git a/platform/lang-impl/src/com/intellij/openapi/roots/impl/ProjectRootManagerImpl.java b/platform/lang-impl/src/com/intellij/openapi/roots/impl/ProjectRootManagerImpl.java index 091e451f5dd1..67425f598591 100644 --- a/platform/lang-impl/src/com/intellij/openapi/roots/impl/ProjectRootManagerImpl.java +++ b/platform/lang-impl/src/com/intellij/openapi/roots/impl/ProjectRootManagerImpl.java @@ -82,8 +82,8 @@ public class ProjectRootManagerImpl extends ProjectRootManagerEx implements Proj private AppListener myApplicationListener; - private String myProjectJdkName; - private String myProjectJdkType; + private String myProjectSdkName; + private String myProjectSdkType; private final List myRootsChangeUpdaters = new ArrayList(); private final List myRefreshCacheUpdaters = new ArrayList(); @@ -327,28 +327,28 @@ public class ProjectRootManagerImpl extends ProjectRootManagerEx implements Proj return VfsUtil.toVirtualFileArray(result); } - public Sdk getProjectJdk() { - if (myProjectJdkName != null) { - return ProjectJdkTable.getInstance().findJdk(myProjectJdkName, myProjectJdkType); + public Sdk getProjectSdk() { + if (myProjectSdkName != null) { + return ProjectJdkTable.getInstance().findJdk(myProjectSdkName, myProjectSdkType); } else { return null; } } - public String getProjectJdkName() { - return myProjectJdkName; + public String getProjectSdkName() { + return myProjectSdkName; } - public void setProjectJdk(Sdk projectJdk) { + public void setProjectSdk(Sdk projectSdk) { ApplicationManager.getApplication().assertWriteAccessAllowed(); - if (projectJdk != null) { - myProjectJdkName = projectJdk.getName(); - myProjectJdkType = projectJdk.getSdkType().getName(); + if (projectSdk != null) { + myProjectSdkName = projectSdk.getName(); + myProjectSdkType = projectSdk.getSdkType().getName(); } else { - myProjectJdkName = null; - myProjectJdkType = null; + myProjectSdkName = null; + myProjectSdkType = null; } mergeRootsChangesDuring(new Runnable() { public void run() { @@ -357,9 +357,9 @@ public class ProjectRootManagerImpl extends ProjectRootManagerEx implements Proj }); } - public void setProjectJdkName(String name) { + public void setProjectSdkName(String name) { ApplicationManager.getApplication().assertWriteAccessAllowed(); - myProjectJdkName = name; + myProjectSdkName = name; mergeRootsChangesDuring(new Runnable() { public void run() { @@ -409,8 +409,8 @@ public class ProjectRootManagerImpl extends ProjectRootManagerEx implements Proj for (ProjectExtension extension : Extensions.getExtensions(ProjectExtension.EP_NAME, myProject)) { extension.readExternal(element); } - myProjectJdkName = element.getAttributeValue(PROJECT_JDK_NAME_ATTR); - myProjectJdkType = element.getAttributeValue(PROJECT_JDK_TYPE_ATTR); + myProjectSdkName = element.getAttributeValue(PROJECT_JDK_NAME_ATTR); + myProjectSdkType = element.getAttributeValue(PROJECT_JDK_TYPE_ATTR); } public void writeExternal(Element element) throws WriteExternalException { @@ -418,11 +418,11 @@ public class ProjectRootManagerImpl extends ProjectRootManagerEx implements Proj for (ProjectExtension extension : Extensions.getExtensions(ProjectExtension.EP_NAME, myProject)) { extension.writeExternal(element); } - if (myProjectJdkName != null) { - element.setAttribute(PROJECT_JDK_NAME_ATTR, myProjectJdkName); + if (myProjectSdkName != null) { + element.setAttribute(PROJECT_JDK_NAME_ATTR, myProjectSdkName); } - if (myProjectJdkType != null) { - element.setAttribute(PROJECT_JDK_TYPE_ATTR, myProjectJdkType); + if (myProjectSdkType != null) { + element.setAttribute(PROJECT_JDK_TYPE_ATTR, myProjectSdkType); } } @@ -946,11 +946,11 @@ public class ProjectRootManagerImpl extends ProjectRootManagerEx implements Proj myDispatcher.getMulticaster().jdkNameChanged(jdk, previousName); } }); - String currentName = getProjectJdkName(); + String currentName = getProjectSdkName(); if (previousName != null && previousName.equals(currentName)) { // if already had jdk name and that name was the name of the jdk just changed - myProjectJdkName = jdk.getName(); - myProjectJdkType = jdk.getSdkType().getName(); + myProjectSdkName = jdk.getName(); + myProjectSdkType = jdk.getSdkType().getName(); } } diff --git a/platform/lang-impl/src/com/intellij/openapi/roots/impl/RootConfigurationAccessor.java b/platform/lang-impl/src/com/intellij/openapi/roots/impl/RootConfigurationAccessor.java index ab33bd5434a8..3800dc91a028 100644 --- a/platform/lang-impl/src/com/intellij/openapi/roots/impl/RootConfigurationAccessor.java +++ b/platform/lang-impl/src/com/intellij/openapi/roots/impl/RootConfigurationAccessor.java @@ -42,11 +42,11 @@ public class RootConfigurationAccessor { } public Sdk getProjectSdk(Project project) { - return ProjectRootManager.getInstance(project).getProjectJdk(); + return ProjectRootManager.getInstance(project).getProjectSdk(); } @Nullable public String getProjectSdkName(final Project project) { - return ProjectRootManager.getInstance(project).getProjectJdkName(); + return ProjectRootManager.getInstance(project).getProjectSdkName(); } } \ No newline at end of file diff --git a/platform/lang-impl/src/com/intellij/openapi/roots/ui/configuration/projectRoot/ProjectSdksModel.java b/platform/lang-impl/src/com/intellij/openapi/roots/ui/configuration/projectRoot/ProjectSdksModel.java index 4171a12890e4..d128170b3db3 100644 --- a/platform/lang-impl/src/com/intellij/openapi/roots/ui/configuration/projectRoot/ProjectSdksModel.java +++ b/platform/lang-impl/src/com/intellij/openapi/roots/ui/configuration/projectRoot/ProjectSdksModel.java @@ -91,7 +91,7 @@ public class ProjectSdksModel implements SdkModel { //can't be } } - myProjectSdk = findSdk(ProjectRootManager.getInstance(project).getProjectJdkName()); + myProjectSdk = findSdk(ProjectRootManager.getInstance(project).getProjectSdkName()); myModified = false; myInitialized = true; } diff --git a/plugins/ant/src/com/intellij/lang/ant/config/execution/PathUtilEx.java b/plugins/ant/src/com/intellij/lang/ant/config/execution/PathUtilEx.java index 163d9bd59488..6b901a54371b 100644 --- a/plugins/ant/src/com/intellij/lang/ant/config/execution/PathUtilEx.java +++ b/plugins/ant/src/com/intellij/lang/ant/config/execution/PathUtilEx.java @@ -75,7 +75,7 @@ public class PathUtilEx { } public static Sdk chooseJdk(Project project, Collection modules) { - Sdk projectJdk = ProjectRootManager.getInstance(project).getProjectJdk(); + Sdk projectJdk = ProjectRootManager.getInstance(project).getProjectSdk(); if (projectJdk != null) { return projectJdk; } diff --git a/plugins/ant/src/com/intellij/lang/ant/config/impl/AntConfigurationImpl.java b/plugins/ant/src/com/intellij/lang/ant/config/impl/AntConfigurationImpl.java index 40be821385cf..789e548f7743 100644 --- a/plugins/ant/src/com/intellij/lang/ant/config/impl/AntConfigurationImpl.java +++ b/plugins/ant/src/com/intellij/lang/ant/config/impl/AntConfigurationImpl.java @@ -94,7 +94,7 @@ public class AntConfigurationImpl extends AntConfigurationBase implements Persis public String get(final AbstractPropertyContainer container) { if (!container.hasProperty(this)) return null; AntConfiguration antConfiguration = AntConfigurationImpl.INSTANCE.get(container); - return ProjectRootManager.getInstance(antConfiguration.getProject()).getProjectJdkName(); + return ProjectRootManager.getInstance(antConfiguration.getProject()).getProjectSdkName(); } public String copy(final String jdkName) { diff --git a/plugins/ant/src/com/intellij/lang/ant/dom/AntDomProject.java b/plugins/ant/src/com/intellij/lang/ant/dom/AntDomProject.java index e2cf4a1f6e3f..0939e404de2f 100644 --- a/plugins/ant/src/com/intellij/lang/ant/dom/AntDomProject.java +++ b/plugins/ant/src/com/intellij/lang/ant/dom/AntDomProject.java @@ -168,7 +168,7 @@ public abstract class AntDomProject extends AntDomNamedElement implements Proper return ProjectJdkTable.getInstance().findJdk(jdkName); } } - return ProjectRootManager.getInstance(tag.getProject()).getProjectJdk(); + return ProjectRootManager.getInstance(tag.getProject()).getProjectSdk(); } @NotNull diff --git a/plugins/ant/src/com/intellij/lang/ant/psi/impl/AntFileImpl.java b/plugins/ant/src/com/intellij/lang/ant/psi/impl/AntFileImpl.java index f0d1f9e7df88..c0ccc59e54b0 100644 --- a/plugins/ant/src/com/intellij/lang/ant/psi/impl/AntFileImpl.java +++ b/plugins/ant/src/com/intellij/lang/ant/psi/impl/AntFileImpl.java @@ -346,7 +346,7 @@ public class AntFileImpl extends LightPsiFileBase implements AntFile { public Sdk getTargetJdk() { final AntBuildFileImpl buildFile = (AntBuildFileImpl)getSourceElement().getCopyableUserData(AntBuildFile.ANT_BUILD_FILE_KEY); if (buildFile == null) { - return ProjectRootManager.getInstance(getProject()).getProjectJdk(); + return ProjectRootManager.getInstance(getProject()).getProjectSdk(); } String jdkName = AntBuildFileImpl.CUSTOM_JDK_NAME.get(buildFile.getAllOptions()); @@ -356,7 +356,7 @@ public class AntFileImpl extends LightPsiFileBase implements AntFile { if (jdkName != null && jdkName.length() > 0) { return ProjectJdkTable.getInstance().findJdk(jdkName); } - return ProjectRootManager.getInstance(getProject()).getProjectJdk(); + return ProjectRootManager.getInstance(getProject()).getProjectSdk(); } @Nullable diff --git a/plugins/junit/src/com/intellij/execution/junit/TestObject.java b/plugins/junit/src/com/intellij/execution/junit/TestObject.java index 870794475474..6b0782e07539 100644 --- a/plugins/junit/src/com/intellij/execution/junit/TestObject.java +++ b/plugins/junit/src/com/intellij/execution/junit/TestObject.java @@ -199,7 +199,7 @@ public abstract class TestObject implements JavaCommandLine { if (myJavaParameters.getJdk() == null){ myJavaParameters.setJdk(module != null ? ModuleRootManager.getInstance(module).getSdk() - : ProjectRootManager.getInstance(myProject).getProjectJdk()); + : ProjectRootManager.getInstance(myProject).getProjectSdk()); } myJavaParameters.getClassPath().add(JavaSdkUtil.getIdeaRtJarPath()); diff --git a/plugins/testng/src/com/theoryinpractice/testng/configuration/TestNGRunnableState.java b/plugins/testng/src/com/theoryinpractice/testng/configuration/TestNGRunnableState.java index 999752289ea8..270004471a0d 100644 --- a/plugins/testng/src/com/theoryinpractice/testng/configuration/TestNGRunnableState.java +++ b/plugins/testng/src/com/theoryinpractice/testng/configuration/TestNGRunnableState.java @@ -237,7 +237,7 @@ public class TestNGRunnableState extends JavaCommandLineState { .getPath());//todo !do not hard code lib name! // Configure rest of jars JavaParametersUtil.configureConfiguration(javaParameters, config); - Sdk jdk = module == null ? ProjectRootManager.getInstance(project).getProjectJdk() : ModuleRootManager.getInstance(module).getSdk(); + Sdk jdk = module == null ? ProjectRootManager.getInstance(project).getProjectSdk() : ModuleRootManager.getInstance(module).getSdk(); javaParameters.setJdk(jdk); final Object[] patchers = Extensions.getExtensions(ExtensionPoints.JUNIT_PATCHER); for (Object patcher : patchers) { diff --git a/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/xslt/run/XsltRunConfiguration.java b/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/xslt/run/XsltRunConfiguration.java index cf418924b5cd..528be4a3c2c9 100644 --- a/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/xslt/run/XsltRunConfiguration.java +++ b/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/xslt/run/XsltRunConfiguration.java @@ -470,7 +470,7 @@ public final class XsltRunConfiguration extends RunConfigurationBase implements jdk = ModuleRootManager.getInstance(module).getSdk(); } if (jdk == null) { - jdk = ProjectRootManager.getInstance(getProject()).getProjectJdk(); + jdk = ProjectRootManager.getInstance(getProject()).getProjectSdk(); } return jdk; }