azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix null-related warnings in AndroidRenameProcessor

Browse Source
This commit is contained in:
Yan Zhulanow
2015-03-23 15:23:12 +03:00
parent 638ec2ae92
commit b930f04ff4
1 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/android-idea-plugin/src/org/jetbrains/kotlin/plugin/android/AndroidRenameProcessor.kt
+7 -8
View File
@@ -79,10 +79,10 @@ public class AndroidRenameProcessor : RenamePsiElementProcessor() {
renameSyntheticProperty(element.namedUnwrappedElement as JetProperty, newName, allRenames) renameSyntheticProperty(element.namedUnwrappedElement as JetProperty, newName, allRenames)
} }
else if (element is XmlAttributeValue) { else if (element is XmlAttributeValue) {
renameAttributeValue(element, newName, allRenames, scope) renameAttributeValue(element, newName, allRenames)
} }
else if (element is LightElement) { else if (element is LightElement) {
renameLightClassField(element, newName, allRenames, scope) renameLightClassField(element, newName, allRenames)
} }
} }
@@ -97,8 +97,9 @@ public class AndroidRenameProcessor : RenamePsiElementProcessor() {
val processor = ModuleServiceManager.getService(module, javaClass<AndroidUIXmlProcessor>()) val processor = ModuleServiceManager.getService(module, javaClass<AndroidUIXmlProcessor>())
val resourceManager = processor.resourceManager val resourceManager = processor.resourceManager
val attr = resourceManager.propertyToXmlAttribute(jetProperty) as XmlAttribute val attr = resourceManager.propertyToXmlAttribute(jetProperty) as XmlAttribute
allRenames[XmlAttributeValueWrapper(attr.getValueElement())] = nameToIdDeclaration(newName) val attributeValue = attr.getValueElement() ?: return
val name = AndroidResourceUtil.getResourceNameByReferenceText(newName) allRenames[XmlAttributeValueWrapper(attributeValue)] = nameToIdDeclaration(newName)
val name = AndroidResourceUtil.getResourceNameByReferenceText(newName) ?: return
for (resField in AndroidResourceUtil.findIdFields(attr)) { for (resField in AndroidResourceUtil.findIdFields(attr)) {
allRenames.put(resField, AndroidResourceUtil.getFieldNameByResourceName(name)) allRenames.put(resField, AndroidResourceUtil.getFieldNameByResourceName(name))
} }
@@ -107,8 +108,7 @@ public class AndroidRenameProcessor : RenamePsiElementProcessor() {
private fun renameAttributeValue( private fun renameAttributeValue(
attribute: XmlAttributeValue, attribute: XmlAttributeValue,
newName: String, newName: String,
allRenames: MutableMap<PsiElement, String>, allRenames: MutableMap<PsiElement, String>
scope: SearchScope
) { ) {
val element = LazyValueResourceElementWrapper.computeLazyElement(attribute) val element = LazyValueResourceElementWrapper.computeLazyElement(attribute)
val module = attribute.getModule() ?: ModuleUtilCore.findModuleForFile( val module = attribute.getModule() ?: ModuleUtilCore.findModuleForFile(
@@ -140,8 +140,7 @@ public class AndroidRenameProcessor : RenamePsiElementProcessor() {
private fun renameLightClassField( private fun renameLightClassField(
field: LightElement, field: LightElement,
newName: String, newName: String,
allRenames: MutableMap<PsiElement, String>, allRenames: MutableMap<PsiElement, String>
scope: SearchScope
) { ) {
val oldName = field.getName() val oldName = field.getName()
val processor = ServiceManager.getService(field.getProject(), javaClass<AndroidUIXmlProcessor>()) val processor = ServiceManager.getService(field.getProject(), javaClass<AndroidUIXmlProcessor>())