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

ProjectSettingsService introduced

Browse Source
This commit is contained in:
Dmitry Jemerov
2009-08-31 20:21:09 +04:00
parent cffbc30812
commit f4ae38317f
4 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/SetupJDKFix.java
+2 -2
View File
@@ -10,7 +10,6 @@ package com.intellij.codeInsight.daemon.impl.quickfix;
import com.intellij.codeInsight.daemon.QuickFixBundle;
import com.intellij.codeInsight.intention.IntentionAction;
import com.intellij.ide.util.projectWizard.JdkChooserPanel;
import com.intellij.openapi.application.ApplicationManager;
import com.intellij.openapi.editor.Editor;
import com.intellij.openapi.module.Module;
@@ -19,6 +18,7 @@ import com.intellij.openapi.project.Project;
import com.intellij.openapi.projectRoots.Sdk;
import com.intellij.openapi.roots.ModifiableRootModel;
import com.intellij.openapi.roots.ModuleRootManager;
import com.intellij.openapi.ui.ProjectSettingsService;
import com.intellij.psi.JavaPsiFacade;
import com.intellij.psi.PsiFile;
import org.jetbrains.annotations.NotNull;
@@ -47,7 +47,7 @@ public class SetupJDKFix implements IntentionAction {
}
public void invoke(@NotNull Project project, Editor editor, final PsiFile file) {
Sdk projectJdk = JdkChooserPanel.chooseAndSetJDK(project);
Sdk projectJdk = ProjectSettingsService.getInstance(project).chooseAndSetSdk();
if (projectJdk == null) return;
ApplicationManager.getApplication().runWriteAction(new Runnable() {
public void run() {
java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/ShowModulePropertiesFix.java
+2 -2
View File
@@ -8,7 +8,7 @@ import com.intellij.openapi.editor.Editor;
import com.intellij.openapi.module.Module;
import com.intellij.openapi.module.ModuleUtil;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.roots.ui.configuration.ModulesConfigurator;
import com.intellij.openapi.ui.ProjectSettingsService;
import com.intellij.psi.PsiElement;
import com.intellij.psi.PsiFile;
import com.intellij.util.IncorrectOperationException;
@@ -42,7 +42,7 @@ public class ShowModulePropertiesFix implements IntentionAction {
}
public void invoke(@NotNull final Project project, final Editor editor, final PsiFile file) throws IncorrectOperationException {
ModulesConfigurator.showDialog(project, myModuleName, null, false);
ProjectSettingsService.getInstance(project).showModuleConfigurationDialog(myModuleName, null, false);
}
public boolean startInWriteAction() {
java/java-impl/src/com/intellij/codeInspection/ex/GlobalJavaInspectionContextImpl.java
+2 -2
View File
@@ -12,7 +12,6 @@ import com.intellij.codeInspection.InspectionProfileEntry;
import com.intellij.codeInspection.InspectionsBundle;
import com.intellij.codeInspection.deadCode.DeadCodeInspection;
import com.intellij.codeInspection.reference.*;
import com.intellij.ide.util.projectWizard.JdkChooserPanel;
import com.intellij.lang.StdLanguages;
import com.intellij.openapi.application.ApplicationManager;
import com.intellij.openapi.diagnostic.Logger;
@@ -24,6 +23,7 @@ import com.intellij.openapi.projectRoots.Sdk;
import com.intellij.openapi.roots.*;
import com.intellij.openapi.roots.libraries.Library;
import com.intellij.openapi.ui.Messages;
import com.intellij.openapi.ui.ProjectSettingsService;
import com.intellij.openapi.util.Computable;
import com.intellij.openapi.vfs.VirtualFile;
import com.intellij.psi.*;
@@ -93,7 +93,7 @@ public class GlobalJavaInspectionContextImpl extends GlobalJavaInspectionContext
while (isBadSdk(project, modules)) {
Messages.showMessageDialog(project, InspectionsBundle.message("inspection.no.jdk.error.message"),
CommonBundle.message("title.error"), Messages.getErrorIcon());
final Sdk projectJdk = JdkChooserPanel.chooseAndSetJDK(project);
final Sdk projectJdk = ProjectSettingsService.getInstance(project).chooseAndSetSdk();
if (projectJdk == null) return false;
}
}
java/java-impl/src/com/intellij/ide/util/PackageUtil.java
+2 -2
View File
@@ -12,8 +12,8 @@ import com.intellij.openapi.roots.ModulePackageIndex;
import com.intellij.openapi.roots.ModuleRootManager;
import com.intellij.openapi.roots.OrderRootType;
import com.intellij.openapi.roots.ui.configuration.CommonContentEntriesEditor;
import com.intellij.openapi.roots.ui.configuration.ModulesConfigurator;
import com.intellij.openapi.ui.Messages;
import com.intellij.openapi.ui.ProjectSettingsService;
import com.intellij.openapi.util.Computable;
import com.intellij.openapi.vfs.VirtualFile;
import com.intellij.psi.*;
@@ -313,7 +313,7 @@ public class PackageUtil {
ProjectBundle.message("module.source.roots.not.configured.title")
);
ModulesConfigurator.showDialog(module.getProject(), module.getName(), CommonContentEntriesEditor.NAME, false);
ProjectSettingsService.getInstance(module.getProject()).showModuleConfigurationDialog(module.getName(), CommonContentEntriesEditor.NAME, false);
sourceRoots = ModuleRootManager.getInstance(module).getSourceRoots();
if (sourceRoots.length == 0) {