From 2f1bc8b1b4f145ca6682d80e8772043382c5872a Mon Sep 17 00:00:00 2001 From: Eugene Kudelevsky Date: Wed, 25 Jul 2012 14:54:55 +0400 Subject: [PATCH] check if the new name looks like file (contains point in name), todo --- .../android/dom/converters/AndroidResourceReference.java | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/plugins/android/src/org/jetbrains/android/dom/converters/AndroidResourceReference.java b/plugins/android/src/org/jetbrains/android/dom/converters/AndroidResourceReference.java index 42bf53f9169f..69099c57db4f 100644 --- a/plugins/android/src/org/jetbrains/android/dom/converters/AndroidResourceReference.java +++ b/plugins/android/src/org/jetbrains/android/dom/converters/AndroidResourceReference.java @@ -85,9 +85,14 @@ public class AndroidResourceReference extends PsiReferenceBase.Poly ResourceValue value = myValue.getValue(); assert value != null; String resType = value.getResourceType(); + if (resType != null && newElementName != null) { - myValue.setValue(ResourceValue.referenceTo(value.getPrefix(), value.getPackage(), resType, - AndroidCommonUtils.getResourceName(resType, newElementName))); + // todo: do not allow new value resource name to contain dot, because it is impossible to check if it file or value otherwise + + final String newResName = newElementName.contains(".") // it is file + ? AndroidCommonUtils.getResourceName(resType, newElementName) + : newElementName; + myValue.setValue(ResourceValue.referenceTo(value.getPrefix(), value.getPackage(), resType, newResName)); } return myValue.getXmlTag(); }