From 8f39d2719433f41f2a5f7d2218e198be8a6ed4c1 Mon Sep 17 00:00:00 2001 From: Dmitry Jemerov Date: Tue, 3 Apr 2012 19:18:03 +0200 Subject: [PATCH] allow creating new Python packages at top level (PY-2085) --- .../python/actions/CreatePackageAction.java | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/python/src/com/jetbrains/python/actions/CreatePackageAction.java b/python/src/com/jetbrains/python/actions/CreatePackageAction.java index 1474750b3a1c..bd044bd9c7ce 100644 --- a/python/src/com/jetbrains/python/actions/CreatePackageAction.java +++ b/python/src/com/jetbrains/python/actions/CreatePackageAction.java @@ -28,6 +28,9 @@ public class CreatePackageAction extends DumbAwareAction { @Override public void actionPerformed(AnActionEvent e) { final IdeView view = e.getData(LangDataKeys.IDE_VIEW); + if (view == null) { + return; + } final Project project = e.getData(PlatformDataKeys.PROJECT); final PsiDirectory directory = DirectoryChooserUtil.getOrChooseDirectory(view); @@ -43,7 +46,7 @@ public class CreatePackageAction extends DumbAwareAction { IdeBundle.message("title.new.package"), Messages.getQuestionIcon(), "", validator); final PsiDirectory result = validator.getCreatedElement(); - if (result != null && view != null) { + if (result != null) { view.selectElement(result); } } @@ -92,11 +95,6 @@ public class CreatePackageAction extends DumbAwareAction { if (directories.length == 0) { return false; } - for (PsiDirectory directory : directories) { - if (directory.findFile(PyNames.INIT_DOT_PY) != null) { - return true; - } - } - return false; + return true; } }