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

EA-23537 - NPE: DirectoryChooserUtil.getOrChooseDirectory

Browse Source
This commit is contained in:
Dmitry Jemerov
2010-11-17 16:57:28 +03:00
parent f660d43d87
commit db64db5eb0
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/lang-impl/src/com/intellij/ide/actions/CreateDirectoryOrPackageAction.java
+4 -1
View File
@@ -37,6 +37,9 @@ public class CreateDirectoryOrPackageAction extends AnAction implements DumbAwar
IdeView view = e.getData(LangDataKeys.IDE_VIEW);
Project project = e.getData(PlatformDataKeys.PROJECT);
if (view == null) {
return;
}
PsiDirectory directory = DirectoryChooserUtil.getOrChooseDirectory(view);
if (directory == null) return;
@@ -51,7 +54,7 @@ public class CreateDirectoryOrPackageAction extends AnAction implements DumbAwar
Messages.getQuestionIcon(), "", validator);
final PsiElement result = validator.getCreatedElement();
if (result != null && view != null) {
if (result != null) {
view.selectElement(result);
}
}
platform/lang-impl/src/com/intellij/ide/util/DirectoryChooserUtil.java
+2 -1
View File
@@ -24,6 +24,7 @@ import com.intellij.openapi.roots.ProjectFileIndex;
import com.intellij.openapi.roots.ProjectRootManager;
import com.intellij.psi.PsiDirectory;
import com.intellij.refactoring.RefactoringBundle;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import java.util.ArrayList;
@@ -34,7 +35,7 @@ public class DirectoryChooserUtil {
}
@Nullable
public static PsiDirectory getOrChooseDirectory(IdeView view) {
public static PsiDirectory getOrChooseDirectory(@NotNull IdeView view) {
PsiDirectory[] dirs = view.getDirectories();
if (dirs.length == 0) return null;
if (dirs.length == 1) {