From c7c2e89f3dde48d6b71e6ca1d9001e0566848348 Mon Sep 17 00:00:00 2001 From: Eugene Vigdorchik Date: Thu, 3 Feb 2005 13:03:27 +0300 Subject: [PATCH] (no message) --- .../moveInstanceMethod/MoveInstanceMethodProcessor.java | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/source/com/intellij/refactoring/move/moveInstanceMethod/MoveInstanceMethodProcessor.java b/source/com/intellij/refactoring/move/moveInstanceMethod/MoveInstanceMethodProcessor.java index f3e32c9b1291..159b265d9fa5 100644 --- a/source/com/intellij/refactoring/move/moveInstanceMethod/MoveInstanceMethodProcessor.java +++ b/source/com/intellij/refactoring/move/moveInstanceMethod/MoveInstanceMethodProcessor.java @@ -281,15 +281,14 @@ public class MoveInstanceMethodProcessor extends BaseRefactoringProcessor{ final PsiExpression qualifier = expression.getQualifierExpression(); if (qualifier == null || qualifier instanceof PsiThisExpression) { final PsiElement resolved = expression.resolve(); - if (resolved instanceof PsiMember && ((PsiMember)resolved).getContainingClass().equals(methodCopy.getContainingClass())) { + if (variableCopy.equals(resolved)) { + PsiThisExpression thisExpression = (PsiThisExpression)factory.createExpressionFromText("this", null); + expression.replace(thisExpression); + } else if (resolved instanceof PsiMember && ((PsiMember)resolved).getContainingClass().equals(methodCopy.getContainingClass())) { PsiReferenceExpression qualified = (PsiReferenceExpression)factory.createExpressionFromText(myOldClassParameterName + ".f", null); qualified.getReferenceNameElement().replace(expression.getReferenceNameElement()); expression.replace(qualified); } - else if (variableCopy.equals(resolved)) { - PsiThisExpression thisExpression = (PsiThisExpression)factory.createExpressionFromText("this", null); - expression.replace(thisExpression); - } } else if (qualifier instanceof PsiReferenceExpression && ((PsiReferenceExpression)qualifier).isReferenceTo(variableCopy)) { qualifier.delete(); } super.visitReferenceExpression(expression);