Merge "Merge remote-tracking branch 'aosp/upstream-master' into merge"

1 files changed, 2 insertions, 2 deletions

diff --git a/plugins/properties/src/com/intellij/lang/properties/ResourceBundleReference.java b/plugins/properties/src/com/intellij/lang/properties/ResourceBundleReference.java
index 5f708c3eda61..14ac858d9917 100644
--- a/plugins/properties/src/com/intellij/lang/properties/ResourceBundleReference.java
+++ b/plugins/properties/src/com/intellij/lang/properties/ResourceBundleReference.java
@@ -97,14 +97,14 @@ public class ResourceBundleReference extends PsiReferenceBase<PsiElement> implem
     if (!(element instanceof PropertiesFile)) {
       throw new IncorrectOperationException();
     }
-    final String name = PropertiesUtil.getFullName((PropertiesFile)element);
+    final String name = ResourceBundleManager.getInstance(element.getProject()).getFullName((PropertiesFile)element);
     return super.handleElementRename(name);
   }
 
 
   public boolean isReferenceTo(PsiElement element) {
     if (element instanceof PropertiesFile) {
-      final String name = PropertiesUtil.getFullName((PropertiesFile)element);
+      final String name = ResourceBundleManager.getInstance(element.getProject()).getFullName((PropertiesFile)element);
       if (name != null && name.equals(myBundleName)) {
         return true;
       }