From e41bce013d518cdf8cc825c6ccbcbbbaeddfa0e6 Mon Sep 17 00:00:00 2001
From: Nikolay Krasko <nikolay.krasko@jetbrains.com>
Date: Fri, 5 Oct 2012 15:43:08 +0400
Subject: [PATCH] Move common getSignatureAnnotation() to base class

---
 .../jet/lang/resolve/java/wrapper/PsiFieldWrapper.java | 10 ----------
 .../lang/resolve/java/wrapper/PsiMemberWrapper.java    |  9 +++++++++
 .../lang/resolve/java/wrapper/PsiMethodWrapper.java    | 10 ----------
 3 files changed, 9 insertions(+), 20 deletions(-)

diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/wrapper/PsiFieldWrapper.java b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/wrapper/PsiFieldWrapper.java
index 33427fac480..ff1be322e84 100644
--- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/wrapper/PsiFieldWrapper.java
+++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/wrapper/PsiFieldWrapper.java
@@ -20,7 +20,6 @@ import com.intellij.psi.PsiField;
 import com.intellij.psi.PsiMember;
 import com.intellij.psi.PsiType;
 import org.jetbrains.annotations.NotNull;
-import org.jetbrains.jet.lang.resolve.java.kt.KotlinSignatureAnnotation;
 
 /**
  * @author Stepan Koltsov
@@ -42,13 +41,4 @@ public class PsiFieldWrapper extends PsiMemberWrapper {
     public boolean isAbstract() {
         return false;
     }
-
-    private KotlinSignatureAnnotation signatureAnnotation;
-    @NotNull
-    public KotlinSignatureAnnotation getSignatureAnnotation() {
-        if (signatureAnnotation == null) {
-            signatureAnnotation = KotlinSignatureAnnotation.get(getPsiMember());
-        }
-        return signatureAnnotation;
-    }
 }
diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/wrapper/PsiMemberWrapper.java b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/wrapper/PsiMemberWrapper.java
index 0889752312e..207cb6d56e3 100644
--- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/wrapper/PsiMemberWrapper.java
+++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/wrapper/PsiMemberWrapper.java
@@ -19,6 +19,7 @@ package org.jetbrains.jet.lang.resolve.java.wrapper;
 import com.intellij.psi.PsiMember;
 import com.intellij.psi.PsiModifier;
 import org.jetbrains.annotations.NotNull;
+import org.jetbrains.jet.lang.resolve.java.kt.KotlinSignatureAnnotation;
 
 /**
  * @author Stepan Koltsov
@@ -55,4 +56,12 @@ public abstract class PsiMemberWrapper {
         return psiMember.getName();
     }
 
+    private KotlinSignatureAnnotation signatureAnnotation;
+    @NotNull
+    public KotlinSignatureAnnotation getSignatureAnnotation() {
+        if (signatureAnnotation == null) {
+            signatureAnnotation = KotlinSignatureAnnotation.get(getPsiMember());
+        }
+        return signatureAnnotation;
+    }
 }
diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/wrapper/PsiMethodWrapper.java b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/wrapper/PsiMethodWrapper.java
index 6624d335067..dcfd271f212 100644
--- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/wrapper/PsiMethodWrapper.java
+++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/wrapper/PsiMethodWrapper.java
@@ -24,7 +24,6 @@ import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.jetbrains.jet.lang.resolve.java.kt.JetConstructorAnnotation;
 import org.jetbrains.jet.lang.resolve.java.kt.JetMethodAnnotation;
-import org.jetbrains.jet.lang.resolve.java.kt.KotlinSignatureAnnotation;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -74,15 +73,6 @@ public class PsiMethodWrapper extends PsiMemberWrapper {
         return jetConstructor;
     }
 
-    private KotlinSignatureAnnotation signatureAnnotation;
-    @NotNull
-    public KotlinSignatureAnnotation getSignatureAnnotation() {
-        if (signatureAnnotation == null) {
-            signatureAnnotation = KotlinSignatureAnnotation.get(getPsiMethod());
-        }
-        return signatureAnnotation;
-    }
-
     @Override
     public boolean isAbstract() {
         return psiMember.hasModifierProperty(PsiModifier.ABSTRACT);