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

Move inter-type members to classes and aspects

Browse Source
This commit is contained in:
Roman Shevchenko
2011-03-30 20:51:50 +02:00
parent 19b6fcbeba
commit 03da5e3868
3 changed files with 52 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-impl/src/com/intellij/refactoring/move/moveMembers/MoveMembersProcessor.java
+22 -24
View File
@@ -13,11 +13,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
/**
* created at Sep 11, 2001
* @author Jeka
*/
package com.intellij.refactoring.move.moveMembers;
import com.intellij.codeInsight.highlighting.ReadWriteAccessDetector;
@@ -52,6 +47,10 @@ import org.jetbrains.annotations.NotNull;
import java.util.*;
/**
* created at Sep 11, 2001
* @author Jeka
*/
public class MoveMembersProcessor extends BaseRefactoringProcessor {
private static final Logger LOG = Logger.getInstance("#com.intellij.refactoring.move.moveMembers.MoveMembersProcessor");
@@ -60,7 +59,6 @@ public class MoveMembersProcessor extends BaseRefactoringProcessor {
private final MoveCallback myMoveCallback;
private String myNewVisibility; // "null" means "as is"
private String myCommandName = MoveMembersImpl.REFACTORING_NAME;
private boolean myMakeEnumConstant;
private MoveMembersOptions myOptions;
public MoveMembersProcessor(Project project, MoveCallback moveCallback, MoveMembersOptions options) {
@@ -79,17 +77,15 @@ public class MoveMembersProcessor extends BaseRefactoringProcessor {
private void setOptions(MoveMembersOptions dialog) {
myOptions = dialog;
PsiMember[] members = dialog.getSelectedMembers();
myMembersToMove.clear();
ContainerUtil.addAll(myMembersToMove, members);
setCommandName(members);
final PsiManager manager = PsiManager.getInstance(myProject);
myTargetClass =
JavaPsiFacade.getInstance(manager.getProject()).findClass(dialog.getTargetClassName(), GlobalSearchScope.projectScope(myProject));
myTargetClass = JavaPsiFacade.getInstance(myProject).findClass(dialog.getTargetClassName(), GlobalSearchScope.projectScope(myProject));
myNewVisibility = dialog.getMemberVisibility();
myMakeEnumConstant = dialog.makeEnumConstant();
}
private void setCommandName(final PsiMember[] members) {
@@ -108,6 +104,7 @@ public class MoveMembersProcessor extends BaseRefactoringProcessor {
myCommandName = commandName.toString();
}
@NotNull
protected UsageViewDescriptor createUsageViewDescriptor(UsageInfo[] usages) {
return new MoveMemberViewDescriptor(PsiUtilBase.toPsiElementArray(myMembersToMove));
}
@@ -156,8 +153,8 @@ public class MoveMembersProcessor extends BaseRefactoringProcessor {
protected void performRefactoring(final UsageInfo[] usages) {
try {
// correct references to moved members from the outside
PsiClass targetClass = JavaPsiFacade.getInstance(myProject)
.findClass(myOptions.getTargetClassName(), GlobalSearchScope.projectScope(myProject));
PsiClass targetClass = JavaPsiFacade.getInstance(myProject).findClass(myOptions.getTargetClassName(),
GlobalSearchScope.projectScope(myProject));
if (targetClass == null) return;
final Map<PsiMember, PsiElement> anchors = new HashMap<PsiMember, PsiElement>();
for (PsiMember member : myMembersToMove) {
@@ -221,7 +218,7 @@ public class MoveMembersProcessor extends BaseRefactoringProcessor {
private void fixModifierList(PsiMember newMember, final UsageInfo[] usages) throws IncorrectOperationException {
PsiModifierList modifierList = newMember.getModifierList();
if(myTargetClass.isInterface()) {
if (modifierList != null && myTargetClass.isInterface()) {
modifierList.setModifierProperty(PsiModifier.PUBLIC, false);
modifierList.setModifierProperty(PsiModifier.PROTECTED, false);
modifierList.setModifierProperty(PsiModifier.PRIVATE, false);
@@ -231,7 +228,7 @@ public class MoveMembersProcessor extends BaseRefactoringProcessor {
return;
}
if(myNewVisibility == null) return;
if (myNewVisibility == null) return;
VisibilityUtil.fixVisibility(usages, newMember, myNewVisibility);
}
@@ -240,7 +237,7 @@ public class MoveMembersProcessor extends BaseRefactoringProcessor {
final MultiMap<PsiElement, String> conflicts = new MultiMap<PsiElement, String>();
final UsageInfo[] usages = refUsages.get();
try {
addInaccessiblleConflicts(conflicts, usages);
addInaccessibleConflicts(conflicts, usages);
}
catch (IncorrectOperationException e) {
LOG.error(e);
@@ -250,7 +247,7 @@ public class MoveMembersProcessor extends BaseRefactoringProcessor {
return showConflicts(conflicts, usages);
}
private void addInaccessiblleConflicts(final MultiMap<PsiElement, String> conflicts, final UsageInfo[] usages) throws IncorrectOperationException {
private void addInaccessibleConflicts(final MultiMap<PsiElement, String> conflicts, final UsageInfo[] usages) throws IncorrectOperationException {
String newVisibility = myNewVisibility;
if (VisibilityUtil.ESCALATE_VISIBILITY.equals(newVisibility)) { //Still need to check for access object
newVisibility = PsiModifier.PUBLIC;
@@ -259,9 +256,9 @@ public class MoveMembersProcessor extends BaseRefactoringProcessor {
Map<PsiMember, PsiModifierList> modifierListCopies = new HashMap<PsiMember, PsiModifierList>();
for (PsiMember member : myMembersToMove) {
PsiModifierList copy = member.getModifierList();
if (copy!=null) copy= (PsiModifierList)copy.copy();
if (copy != null) copy = (PsiModifierList)copy.copy();
if (newVisibility != null) {
if (copy!=null) VisibilityUtil.setVisibility(copy, newVisibility);
if (copy != null) VisibilityUtil.setVisibility(copy, newVisibility);
}
modifierListCopies.put(member, copy);
}
@@ -336,9 +333,10 @@ public class MoveMembersProcessor extends BaseRefactoringProcessor {
private static boolean hasMethod(PsiClass targetClass, PsiMethod method) {
PsiMethod[] targetClassMethods = targetClass.getMethods();
for (PsiMethod method1 : targetClassMethods) {
if (MethodSignatureUtil.areSignaturesEqual(method.getSignature(PsiSubstitutor.EMPTY),
method1.getSignature(PsiSubstitutor.EMPTY))) {
for (PsiMethod candidate : targetClassMethods) {
if (candidate != method &&
MethodSignatureUtil.areSignaturesEqual(method.getSignature(PsiSubstitutor.EMPTY),
candidate.getSignature(PsiSubstitutor.EMPTY))) {
return true;
}
}
@@ -348,8 +346,9 @@ public class MoveMembersProcessor extends BaseRefactoringProcessor {
private static boolean hasField(PsiClass targetClass, PsiField field) {
String fieldName = field.getName();
PsiField[] targetClassFields = targetClass.getFields();
for (PsiField targetClassField : targetClassFields) {
if (fieldName.equals(targetClassField.getName())) {
for (PsiField candidate : targetClassFields) {
if (candidate != field &&
fieldName.equals(candidate.getName())) {
return true;
}
}
@@ -377,5 +376,4 @@ public class MoveMembersProcessor extends BaseRefactoringProcessor {
reference = element;
}
}
}
java/java-impl/src/com/intellij/refactoring/util/RefactoringConflictsUtil.java
+19 -19
View File
@@ -13,11 +13,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
/*
* User: anna
* Date: 05-Oct-2009
*/
package com.intellij.refactoring.util;
import com.intellij.openapi.module.Module;
@@ -45,11 +40,16 @@ import org.jetbrains.annotations.Nullable;
import java.util.Collection;
import java.util.Set;
/**
* @author anna
* Date: 05-Oct-2009
*/
public class RefactoringConflictsUtil {
private RefactoringConflictsUtil() { }
public static void analyzeAccessibilityConflicts(@NotNull Set<PsiMember> membersToMove,
@NotNull final PsiClass targetClass,
final MultiMap<PsiElement, String> conflicts, String newVisibility) {
@NotNull final PsiClass targetClass,
final MultiMap<PsiElement, String> conflicts, String newVisibility) {
analyzeAccessibilityConflicts(membersToMove, targetClass, conflicts, newVisibility, targetClass, null);
}
@@ -65,11 +65,11 @@ public class RefactoringConflictsUtil {
checkUsedElements(member, member, membersToMove, abstractMethods, targetClass, context, conflicts);
PsiModifierList modifierList = member.getModifierList();
if (modifierList!=null) modifierList= (PsiModifierList)modifierList.copy();
if (modifierList != null) modifierList = (PsiModifierList)modifierList.copy();
if (newVisibility != null) {
try {
if (modifierList!=null) VisibilityUtil.setVisibility(modifierList, newVisibility);
if (modifierList != null) VisibilityUtil.setVisibility(modifierList, newVisibility);
}
catch (IncorrectOperationException ex) {
/* do nothing and hope for the best */
@@ -110,7 +110,7 @@ public class RefactoringConflictsUtil {
if (abstractMethods != null) {
moving.addAll(abstractMethods);
}
if(scope instanceof PsiReferenceExpression) {
if (scope instanceof PsiReferenceExpression) {
PsiReferenceExpression refExpr = (PsiReferenceExpression)scope;
PsiElement refElement = refExpr.resolve();
if (refElement instanceof PsiMember) {
@@ -147,19 +147,17 @@ public class RefactoringConflictsUtil {
}
}
PsiElement[] children = scope.getChildren();
for (PsiElement child : children) {
if (!(child instanceof PsiWhiteSpace)) {
checkUsedElements(member, child, membersToMove, abstractMethods, targetClass, context, conflicts);
}
for (PsiElement child : scope.getChildren()) {
if (child instanceof PsiWhiteSpace || child instanceof PsiComment) continue;
checkUsedElements(member, child, membersToMove, abstractMethods, targetClass, context, conflicts);
}
}
public static void checkAccessibility(PsiMember refMember,
@NotNull PsiElement newContext,
PsiClass accessClass,
PsiMember member,
MultiMap<PsiElement, String> conflicts) {
PsiClass accessClass,
PsiMember member,
MultiMap<PsiElement, String> conflicts) {
if (!PsiUtil.isAccessible(refMember, newContext, accessClass)) {
String message = RefactoringBundle.message("0.is.1.and.will.not.be.accessible.from.2.in.the.target.class",
RefactoringUIUtil.getDescription(refMember, true),
@@ -167,7 +165,8 @@ public class RefactoringConflictsUtil {
RefactoringUIUtil.getDescription(member, false));
message = CommonRefactoringUtil.capitalize(message);
conflicts.putValue(refMember, message);
} else if (newContext instanceof PsiClass && refMember instanceof PsiField && refMember.getContainingClass() == member.getContainingClass()) {
}
else if (newContext instanceof PsiClass && refMember instanceof PsiField && refMember.getContainingClass() == member.getContainingClass()) {
final PsiField fieldInSubClass = ((PsiClass)newContext).findFieldByName(refMember.getName(), false);
if (fieldInSubClass != null) {
conflicts.putValue(refMember, CommonRefactoringUtil.capitalize(RefactoringUIUtil.getDescription(fieldInSubClass, true) +
@@ -253,6 +252,7 @@ public class RefactoringConflictsUtil {
if (module != null) {
final String message;
final PsiElement referencedElement = moveRenameUsageInfo.getReferencedElement();
assert referencedElement != null : moveRenameUsageInfo;
if (module == targetModule && isInTestSources) {
message = RefactoringBundle.message("0.referenced.in.1.will.not.be.accessible.from.production.of.module.2",
CommonRefactoringUtil.capitalize(