MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-17 01:57:50 +07:00
Code Issues Packages Projects Releases Wiki Activity

introduce constant to inner class: do not create package with classname name (IDEA-60736)

Browse Source
This commit is contained in:
anna
2011-04-19 15:46:06 +02:00
parent 28b95948ff
commit bb0b3ffe1e
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-impl/src/com/intellij/refactoring/introduceField/BaseExpressionToFieldHandler.java
+5 -1
View File
@@ -583,6 +583,11 @@ public abstract class BaseExpressionToFieldHandler extends IntroduceHandlerBase
public PsiClass getTargetClass() {
if (myTargetClass != null) return myTargetClass;
final String packageName = StringUtil.getPackageName(myQualifiedName);
final String shortName = StringUtil.getShortName(myQualifiedName);
if (Comparing.strEqual(myParentClass.getQualifiedName(), packageName)) {
myTargetClass = (PsiClass)myParentClass.add(JavaPsiFacade.getElementFactory(myProject).createClass(shortName));
return myTargetClass;
}
PsiPackage psiPackage = JavaPsiFacade.getInstance(myProject).findPackage(packageName);
final PsiDirectory psiDirectory;
if (psiPackage != null) {
@@ -591,7 +596,6 @@ public abstract class BaseExpressionToFieldHandler extends IntroduceHandlerBase
} else {
psiDirectory = PackageUtil.findOrCreateDirectoryForPackage(myProject, packageName, myParentClass.getContainingFile().getContainingDirectory(), false);
}
final String shortName = StringUtil.getShortName(myQualifiedName);
myTargetClass = psiDirectory != null ? JavaDirectoryService.getInstance().createClass(psiDirectory, shortName) : null;
return myTargetClass;
}