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

Fix warnings

Browse Source
This commit is contained in:
Alexey Sedunov
2014-01-21 16:17:29 +04:00
parent fffae7b6a4
commit b9ddf3a992
1 changed files with 20 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/jet/plugin/refactoring/safeDelete/KotlinSafeDeleteProcessor.java
+20 -6
View File
@@ -176,19 +176,33 @@ public class KotlinSafeDeleteProcessor extends JavaSafeDeleteProcessor {
for (UsageInfo usageInfo : javaUsages) { for (UsageInfo usageInfo : javaUsages) {
if (usageInfo instanceof SafeDeleteOverridingMethodUsageInfo) { if (usageInfo instanceof SafeDeleteOverridingMethodUsageInfo) {
SafeDeleteOverridingMethodUsageInfo overrideUsageInfo = (SafeDeleteOverridingMethodUsageInfo) usageInfo; SafeDeleteOverridingMethodUsageInfo overrideUsageInfo = (SafeDeleteOverridingMethodUsageInfo) usageInfo;
usageInfo = new KotlinSafeDeleteOverridingUsageInfo(
overrideUsageInfo.getSmartPointer().getElement(), overrideUsageInfo.getReferencedElement() PsiElement usageElement = overrideUsageInfo.getSmartPointer().getElement();
); usageInfo = (usageElement != null)
? new KotlinSafeDeleteOverridingUsageInfo(usageElement, overrideUsageInfo.getReferencedElement())
: null;
} }
else if (usageInfo instanceof SafeDeleteOverrideAnnotation) { else if (usageInfo instanceof SafeDeleteOverrideAnnotation) {
SafeDeleteOverrideAnnotation overrideAnnotationUsageInfo = (SafeDeleteOverrideAnnotation) usageInfo; SafeDeleteOverrideAnnotation overrideAnnotationUsageInfo = (SafeDeleteOverrideAnnotation) usageInfo;
PsiElement targetElement = overrideAnnotationUsageInfo.getSmartPointer().getElement(); PsiElement targetElement = overrideAnnotationUsageInfo.getSmartPointer().getElement();
if (AsJavaPackage.getRepresentativeLightMethod(targetElement).findSuperMethods().length > 0) { if (targetElement != null) {
usageInfo = null; boolean noSuperMethods = ContainerUtil.and(
AsJavaPackage.toLightMethods(targetElement),
new Condition<PsiMethod>() {
@Override
public boolean value(PsiMethod method) {
return method.findSuperMethods().length == 0;
}
}
);
usageInfo = noSuperMethods
? new KotlinSafeDeleteOverrideAnnotation(targetElement, overrideAnnotationUsageInfo.getReferencedElement())
: null;
} }
else { else {
usageInfo = new KotlinSafeDeleteOverrideAnnotation(targetElement, overrideAnnotationUsageInfo.getReferencedElement()); usageInfo = null;
} }
} }
else if (usageInfo instanceof SafeDeleteReferenceJavaDeleteUsageInfo) { else if (usageInfo instanceof SafeDeleteReferenceJavaDeleteUsageInfo) {