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

invoke getFieldNameByResourceName when renaming R field

Browse Source
This commit is contained in:
Eugene Kudelevsky
2012-07-26 12:52:32 +04:00
parent be4ec708ac
commit 11bbb7a4f9
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/android/src/org/jetbrains/android/AndroidRenameResourceProcessor.java
+6 -4
View File
@@ -125,8 +125,10 @@ public class AndroidRenameResourceProcessor extends RenamePsiElementProcessor {
}
}
String name = AndroidResourceUtil.getResourceNameByReferenceText(newName);
for (PsiField resField : AndroidResourceUtil.findIdFields(value)) {
allRenames.put(resField, name);
if (name != null) {
for (PsiField resField : AndroidResourceUtil.findIdFields(value)) {
allRenames.put(resField, AndroidResourceUtil.getFieldNameByResourceName(name));
}
}
}
@@ -186,7 +188,7 @@ public class AndroidRenameResourceProcessor extends RenamePsiElementProcessor {
}
PsiField[] resFields = AndroidResourceUtil.findResourceFieldsForValueResource(tag, false);
for (PsiField resField : resFields) {
allRenames.put(resField, newName);
allRenames.put(resField, AndroidResourceUtil.getFieldNameByResourceName(newName));
}
}
@@ -226,7 +228,7 @@ public class AndroidRenameResourceProcessor extends RenamePsiElementProcessor {
PsiField[] resFields = AndroidResourceUtil.findResourceFieldsForFileResource(file, false);
for (PsiField resField : resFields) {
String newFieldName = AndroidCommonUtils.getResourceName(type, newName);
allRenames.put(resField, newFieldName);
allRenames.put(resField, AndroidResourceUtil.getFieldNameByResourceName(newFieldName));
}
}