Use a single AnnotatedCallableKind enum item for property

2015-08-27 18:15:14 +03:00
parent 97e4c097ba
commit e7703df0b6
14 changed files with 130 additions and 118 deletions
@@ -192,8 +192,12 @@ public class DescriptorSerializer {
            hasConstant = !(compileTimeConstant == null || compileTimeConstant instanceof NullValue);
        }

+        boolean hasAnnotations = (descriptor instanceof PropertyDescriptor)
+                                 ? !descriptor.getAnnotations().getAllAnnotations().isEmpty()
+                                 : hasAnnotations(descriptor);
+
        builder.setFlags(Flags.getCallableFlags(
-                hasAnnotations(descriptor),
+                hasAnnotations,
                descriptor.getVisibility(),
                descriptor.getModality(),
                descriptor.getKind(),