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

cleanup

Browse Source
This commit is contained in:
anna
2011-06-07 15:03:48 +04:00
parent 861db01273
commit fe51f7bd73
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-impl/src/com/intellij/codeInsight/intention/impl/AddSingleMemberStaticImportAction.java
+5 -4
View File
@@ -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);