1 files changed, 8 insertions, 1 deletions
diff --git a/java/java-impl/src/com/intellij/codeInsight/generation/GenerateSetterHandler.java b/java/java-impl/src/com/intellij/codeInsight/generation/GenerateSetterHandler.java
index 0e6b2389121e..e33f1b8bb004 100644
--- a/java/java-impl/src/com/intellij/codeInsight/generation/GenerateSetterHandler.java
+++ b/java/java-impl/src/com/intellij/codeInsight/generation/GenerateSetterHandler.java
@@ -27,7 +27,14 @@ public class GenerateSetterHandler extends GenerateGetterSetterHandlerBase {
 
   @Override
   protected GenerationInfo[] generateMemberPrototypes(PsiClass aClass, ClassMember original) throws IncorrectOperationException {
-    if (original instanceof EncapsulatableClassMember) {
+    if (original instanceof PropertyClassMember) {
+      final PropertyClassMember propertyClassMember = (PropertyClassMember)original;
+      final GenerationInfo[] getters = propertyClassMember.generateSetters();
+      if (getters != null) {
+        return getters;
+      }
+    }
+    else if (original instanceof EncapsulatableClassMember) {
       final EncapsulatableClassMember encapsulatableClassMember = (EncapsulatableClassMember)original;
       final GenerationInfo setter = encapsulatableClassMember.generateSetter();
       if (setter != null) {