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

IDEA-80324: do not ignore override preferences in the call place

Browse Source
This commit is contained in:
Anna Kozlova
2012-01-25 19:49:06 +04:00
parent a28d8a5e43
commit 0476c0ff5e
1 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-impl/src/com/intellij/codeInsight/generation/OverrideImplementUtil.java
+9 -3
View File
@@ -222,11 +222,17 @@ public class OverrideImplementUtil {
}
public static boolean isInsertOverride(PsiMethod superMethod, PsiClass targetClass) {
if (!CodeStyleSettingsManager.getSettings(targetClass.getProject()).INSERT_OVERRIDE_ANNOTATION) {
return false;
}
return canInsertOverride(superMethod, targetClass);
}
public static boolean canInsertOverride(PsiMethod superMethod, PsiClass targetClass) {
if (superMethod.isConstructor()) {
return false;
}
if (!CodeStyleSettingsManager.getSettings(targetClass.getProject()).INSERT_OVERRIDE_ANNOTATION
|| !PsiUtil.isLanguageLevel5OrHigher(targetClass)) {
if (!PsiUtil.isLanguageLevel5OrHigher(targetClass)) {
return false;
}
if (PsiUtil.isLanguageLevel6OrHigher(targetClass)) return true;
@@ -329,7 +335,7 @@ public class OverrideImplementUtil {
}
public static void annotateOnOverrideImplement(PsiMethod method, PsiClass targetClass, PsiMethod overridden, boolean insertOverride) {
if (insertOverride && isInsertOverride(overridden, targetClass)) {
if (insertOverride && canInsertOverride(overridden, targetClass)) {
annotate(method, Override.class.getName());
}
final Module module = ModuleUtil.findModuleForPsiElement(targetClass);