From 564207b09b62ca40d631831caf941c8f672d7117 Mon Sep 17 00:00:00 2001 From: anna Date: Mon, 18 Apr 2011 15:06:10 +0200 Subject: [PATCH] Ctrl-Alt-Shift-C for packages in project view (IDEA-68236) --- .../intellij/ide/actions/JavaQualifiedNameProvider.java | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/java/java-impl/src/com/intellij/ide/actions/JavaQualifiedNameProvider.java b/java/java-impl/src/com/intellij/ide/actions/JavaQualifiedNameProvider.java index fed091518791..58d53560c85c 100644 --- a/java/java-impl/src/com/intellij/ide/actions/JavaQualifiedNameProvider.java +++ b/java/java-impl/src/com/intellij/ide/actions/JavaQualifiedNameProvider.java @@ -47,6 +47,10 @@ public class JavaQualifiedNameProvider implements QualifiedNameProvider { @Nullable public PsiElement adjustElementToCopy(final PsiElement element) { if (element instanceof PsiPackage) return element; + if (element instanceof PsiDirectory) { + final PsiPackage psiPackage = JavaDirectoryService.getInstance().getPackage((PsiDirectory)element); + if (psiPackage != null) return psiPackage; + } if (element != null && !(element instanceof PsiMember) && element.getParent() instanceof PsiMember) { return element.getParent(); } @@ -73,6 +77,10 @@ public class JavaQualifiedNameProvider implements QualifiedNameProvider { } public PsiElement qualifiedNameToElement(final String fqn, final Project project) { + final PsiPackage psiPackage = JavaPsiFacade.getInstance(project).findPackage(fqn); + if (psiPackage != null) { + return psiPackage; + } PsiClass aClass = JavaPsiFacade.getInstance(project).findClass(fqn, GlobalSearchScope.allScope(project)); if (aClass != null) { return aClass;