respect code style setting by default
authorAnna Kozlova <anna.kozlova@jetbrains.com>
Thu, 26 Jan 2012 08:47:56 +0000 (12:47 +0400)
committerAnna Kozlova <anna.kozlova@jetbrains.com>
Thu, 26 Jan 2012 08:47:56 +0000 (12:47 +0400)
java/java-impl/src/com/intellij/codeInsight/generation/OverrideImplementUtil.java

index c0d2cb5b607550e222ae30789dd4e99ef64909d4..4497f059865b9b0ce70b3014230dabe6d4ba0e9a 100644 (file)
@@ -218,7 +218,7 @@ public class OverrideImplementUtil {
     PsiSubstitutor substitutor = aClass.isInheritor(containingClass, true)
                                  ? TypeConversionUtil.getSuperClassSubstitutor(containingClass, aClass, PsiSubstitutor.EMPTY)
                                  : PsiSubstitutor.EMPTY;
-    return overrideOrImplementMethod(aClass, method, substitutor, toCopyJavaDoc, true);
+    return overrideOrImplementMethod(aClass, method, substitutor, toCopyJavaDoc, CodeStyleSettingsManager.getSettings(aClass.getProject()).INSERT_OVERRIDE_ANNOTATION);
   }
 
   public static boolean isInsertOverride(PsiMethod superMethod, PsiClass targetClass) {