From 23f1e4c5d1feb2310ba0d577d74b7dc7c3e83d49 Mon Sep 17 00:00:00 2001 From: Maxim Medvedev Date: Fri, 26 Aug 2011 14:15:05 +0400 Subject: [PATCH] decodeInformation() should return null if it doesn't change anything --- .../psi/impl/source/tree/JavaChangeUtilSupport.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/java/java-impl/src/com/intellij/psi/impl/source/tree/JavaChangeUtilSupport.java b/java/java-impl/src/com/intellij/psi/impl/source/tree/JavaChangeUtilSupport.java index 0c0019c2023c..475cee96ea5d 100644 --- a/java/java-impl/src/com/intellij/psi/impl/source/tree/JavaChangeUtilSupport.java +++ b/java/java-impl/src/com/intellij/psi/impl/source/tree/JavaChangeUtilSupport.java @@ -255,7 +255,7 @@ public class JavaChangeUtilSupport implements TreeGenerator, TreeCopyHandler { // shorten references to the same package and to inner classes that can be accessed by short name ref = (PsiJavaCodeReferenceElement)codeStyleManager.shortenClassReferences(ref, JavaCodeStyleManager.DO_NOT_ADD_IMPORTS); } - element = (TreeElement)SourceTreeToPsiMap.psiElementToTree(ref); + return (TreeElement)SourceTreeToPsiMap.psiElementToTree(ref); } catch (IncorrectOperationException e) { ((PsiImportHolder) ref.getContainingFile()).importClass(refClass); @@ -274,7 +274,7 @@ public class JavaChangeUtilSupport implements TreeGenerator, TreeCopyHandler { catch (IncorrectOperationException e) { // TODO[yole] ignore? } - element = (TreeElement)SourceTreeToPsiMap.psiElementToTree(ref); + return (TreeElement)SourceTreeToPsiMap.psiElementToTree(ref); } } } @@ -313,7 +313,7 @@ public class JavaChangeUtilSupport implements TreeGenerator, TreeCopyHandler { } } - return element; + return null; } private static final Key ALREADY_ESCAPED = new Key("ALREADY_ESCAPED");