From fe51f7bd73a06929c27f0ed83abb05282541e191 Mon Sep 17 00:00:00 2001 From: anna Date: Tue, 7 Jun 2011 14:12:25 +0400 Subject: [PATCH] cleanup --- .../impl/AddSingleMemberStaticImportAction.java | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/java/java-impl/src/com/intellij/codeInsight/intention/impl/AddSingleMemberStaticImportAction.java b/java/java-impl/src/com/intellij/codeInsight/intention/impl/AddSingleMemberStaticImportAction.java index a76233a34c64..6d78682b2afc 100644 --- a/java/java-impl/src/com/intellij/codeInsight/intention/impl/AddSingleMemberStaticImportAction.java +++ b/java/java-impl/src/com/intellij/codeInsight/intention/impl/AddSingleMemberStaticImportAction.java @@ -118,6 +118,7 @@ public class AddSingleMemberStaticImportAction extends PsiElementBaseIntentionAc expression.getParameterList().getFirstChild() != null) return; if (refExpr.getReferenceName().equals(expression.getReferenceName())) { + final PsiExpression qualifierExpression = expression.getQualifierExpression(); if (!expression.isQualified()) { PsiElement referent = expression.getUserData(TEMP_REFERENT_USER_DATA); @@ -126,7 +127,7 @@ public class AddSingleMemberStaticImportAction extends PsiElementBaseIntentionAc try { PsiReferenceExpression copy = (PsiReferenceExpression)factory.createExpressionFromText("A." + expression.getReferenceName(), null); expression = (PsiReferenceExpression)expression.replace(copy); - ((PsiReferenceExpression)expression.getQualifierExpression()).bindToElement(((PsiMember)referent).getContainingClass()); + ((PsiReferenceExpression)qualifierExpression).bindToElement(((PsiMember)referent).getContainingClass()); } catch (IncorrectOperationException e) { LOG.error (e); @@ -134,11 +135,11 @@ public class AddSingleMemberStaticImportAction extends PsiElementBaseIntentionAc } expression.putUserData(TEMP_REFERENT_USER_DATA, null); } else { - if (expression.getQualifierExpression() instanceof PsiReferenceExpression) { - PsiElement aClass = ((PsiReferenceExpression)expression.getQualifierExpression()).resolve(); + if (qualifierExpression instanceof PsiReferenceExpression) { + PsiElement aClass = ((PsiReferenceExpression)qualifierExpression).resolve(); if (aClass == ((PsiMember)resolved).getContainingClass()) { try { - expression.getQualifierExpression().delete(); + qualifierExpression.delete(); } catch (IncorrectOperationException e) { LOG.error(e);