From 4f44d839a70cb03549bb271661894992f552b505 Mon Sep 17 00:00:00 2001 From: Alexey Kudravtsev Date: Fri, 25 Mar 2011 10:15:43 +0300 Subject: [PATCH] EA-26335 --- .../refactoring/rename/LocalHidesRenamedLocalUsageInfo.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/java/java-impl/src/com/intellij/refactoring/rename/LocalHidesRenamedLocalUsageInfo.java b/java/java-impl/src/com/intellij/refactoring/rename/LocalHidesRenamedLocalUsageInfo.java index 62ec0ecd036d..f2aa46ad6bd7 100644 --- a/java/java-impl/src/com/intellij/refactoring/rename/LocalHidesRenamedLocalUsageInfo.java +++ b/java/java-impl/src/com/intellij/refactoring/rename/LocalHidesRenamedLocalUsageInfo.java @@ -40,9 +40,11 @@ public class LocalHidesRenamedLocalUsageInfo extends UnresolvableCollisionUsageI public String getDescription() { + PsiElement element = getElement(); + String type = element == null ? "element" : UsageViewUtil.getType(element); final String descr = RefactoringBundle.message("there.is.already.a.0.it.will.conflict.with.the.renamed.1", RefactoringUIUtil.getDescription(myConflictingElement, true), - UsageViewUtil.getType(getElement())); + type); return CommonRefactoringUtil.capitalize(descr); } }