From 45346071a3f078f3b9d8049eedd3212a56dbd654 Mon Sep 17 00:00:00 2001
From: Alexander Udalov <Alexander.Udalov@jetbrains.com>
Date: Tue, 6 Aug 2013 18:18:18 +0400
Subject: [PATCH] Minor, encapsulate logic

---
 .../resolve/java/resolver/JavaConstructorResolver.java    | 2 +-
 .../jet/lang/resolve/java/structure/JavaMethod.java       | 8 ++------
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaConstructorResolver.java b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaConstructorResolver.java
index 3705b349000..26b37b8e2f0 100644
--- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaConstructorResolver.java
+++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaConstructorResolver.java
@@ -162,7 +162,7 @@ public final class JavaConstructorResolver {
                     Collections.<AnnotationDescriptor>emptyList(),
                     method.getName(),
                     typeTransformer.transformToType(returnType, typeVariableResolver),
-                    method.getAnnotationParameterDefaultValue() != null,
+                    method.hasAnnotationParameterDefaultValue(),
                     varargElementType));
 
             index++;
diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/JavaMethod.java b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/JavaMethod.java
index ca695bf71e1..2f4959063c3 100644
--- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/JavaMethod.java
+++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/JavaMethod.java
@@ -56,13 +56,9 @@ public class JavaMethod extends JavaMemberImpl implements JavaTypeParameterListO
         return valueParameters(getPsi().getParameterList().getParameters());
     }
 
-    @Nullable
-    public Object getAnnotationParameterDefaultValue() {
+    public boolean hasAnnotationParameterDefaultValue() {
         PsiMethod psiMethod = getPsi();
-        if (psiMethod instanceof PsiAnnotationMethod) {
-            return ((PsiAnnotationMethod) psiMethod).getDefaultValue();
-        }
-        return null;
+        return psiMethod instanceof PsiAnnotationMethod && ((PsiAnnotationMethod) psiMethod).getDefaultValue() != null;
     }
 
     @Nullable