From f7e2edc0c0890e8100f93fcdc100aad3c16a8fe1 Mon Sep 17 00:00:00 2001 From: anna Date: Thu, 16 Feb 2012 11:55:44 +0100 Subject: [PATCH] delegate: copy annotations with all args --- .../codeInsight/generation/GenerateDelegateHandler.java | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/java/java-impl/src/com/intellij/codeInsight/generation/GenerateDelegateHandler.java b/java/java-impl/src/com/intellij/codeInsight/generation/GenerateDelegateHandler.java index 2f80d70ef3fd..422e1c300740 100644 --- a/java/java-impl/src/com/intellij/codeInsight/generation/GenerateDelegateHandler.java +++ b/java/java-impl/src/com/intellij/codeInsight/generation/GenerateDelegateHandler.java @@ -164,17 +164,16 @@ public class GenerateDelegateHandler implements LanguageCodeInsightActionHandler stmt = (PsiStatement)CodeStyleManager.getInstance(psiManager.getProject()).reformat(stmt); method.getBody().add(stmt); + for (PsiAnnotation annotation : methodCandidate.getElement().getModifierList().getAnnotations()) { + method.getModifierList().add(annotation.copy()); + } + if (isMethodStatic || modifierList != null && modifierList.hasModifierProperty(PsiModifier.STATIC)) { PsiUtil.setModifierProperty(method, PsiModifier.STATIC, true); } PsiUtil.setModifierProperty(method, PsiModifier.PUBLIC, true); - final Project project = method.getProject(); - for (PsiAnnotation annotation : methodCandidate.getElement().getModifierList().getAnnotations()) { - OverrideImplementUtil.annotate(method, annotation.getQualifiedName()); - } - final PsiClass targetClass = ((PsiMember)target).getContainingClass(); LOG.assertTrue(targetClass != null); PsiMethod overridden = targetClass.findMethodBySignature(method, true);