From b0a382dbfa4bf282dca24797eaeb62eeb7afbcc9 Mon Sep 17 00:00:00 2001 From: anna Date: Mon, 8 Feb 2010 10:39:23 +0300 Subject: [PATCH] move to inner: move to interface --- .../move/moveClassesOrPackages/MoveClassToInnerProcessor.java | 7 ++++++- .../locallyUsedPackageLocalToPublicInterface/after/pack2/A.java | 2 +- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/java/java-impl/src/com/intellij/refactoring/move/moveClassesOrPackages/MoveClassToInnerProcessor.java b/java/java-impl/src/com/intellij/refactoring/move/moveClassesOrPackages/MoveClassToInnerProcessor.java index 8664d0de02..d6728cb222 100644 --- a/java/java-impl/src/com/intellij/refactoring/move/moveClassesOrPackages/MoveClassToInnerProcessor.java +++ b/java/java-impl/src/com/intellij/refactoring/move/moveClassesOrPackages/MoveClassToInnerProcessor.java @@ -143,7 +143,12 @@ public class MoveClassToInnerProcessor extends BaseRefactoringProcessor { for (PsiClass classToMove : myClassesToMove) { ChangeContextUtil.encodeContextInfo(classToMove, true); PsiClass newClass = (PsiClass)myTargetClass.addBefore(classToMove, myTargetClass.getRBrace()); - PsiUtil.setModifierProperty(newClass, PsiModifier.STATIC, true); + if (myTargetClass.isInterface()) { + PsiUtil.setModifierProperty(newClass, PsiModifier.PACKAGE_LOCAL, true); + } + else { + PsiUtil.setModifierProperty(newClass, PsiModifier.STATIC, true); + } newClass = (PsiClass)ChangeContextUtil.decodeContextInfo(newClass, null, null); oldToNewElementsMapping.put(classToMove, newClass); } diff --git a/java/java-tests/testData/refactoring/moveClassToInner/locallyUsedPackageLocalToPublicInterface/after/pack2/A.java b/java/java-tests/testData/refactoring/moveClassToInner/locallyUsedPackageLocalToPublicInterface/after/pack2/A.java index 2c95486986..afe5618467 100644 --- a/java/java-tests/testData/refactoring/moveClassToInner/locallyUsedPackageLocalToPublicInterface/after/pack2/A.java +++ b/java/java-tests/testData/refactoring/moveClassToInner/locallyUsedPackageLocalToPublicInterface/after/pack2/A.java @@ -1,6 +1,6 @@ package pack2; public interface A { - static class Class1 { + class Class1 { } } -- 2.11.4.GIT