From 37beb9e50fa80fceaf4a2633b2957c5f514fcae4 Mon Sep 17 00:00:00 2001
From: Alexander Udalov <Alexander.Udalov@jetbrains.com>
Date: Mon, 19 Aug 2013 14:34:52 +0400
Subject: [PATCH] Extract interface out of JavaField

---
 ...JavaElementCollectionFromPsiArrayUtil.java |  2 +-
 .../resolve/java/structure/JavaField.java     | 19 ++------
 .../resolve/java/structure/JavaFieldImpl.java | 44 +++++++++++++++++++
 .../JavaReferenceAnnotationArgument.java      |  2 +-
 4 files changed, 50 insertions(+), 17 deletions(-)
 create mode 100644 compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/JavaFieldImpl.java

diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/JavaElementCollectionFromPsiArrayUtil.java b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/JavaElementCollectionFromPsiArrayUtil.java
index f7685f55003..1b11478fbe2 100644
--- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/JavaElementCollectionFromPsiArrayUtil.java
+++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/JavaElementCollectionFromPsiArrayUtil.java
@@ -64,7 +64,7 @@ public class JavaElementCollectionFromPsiArrayUtil {
         if (fields.length == 0) return Collections.emptyList();
         List<JavaField> result = new ArrayList<JavaField>(fields.length);
         for (PsiField psiField : fields) {
-            result.add(new JavaField(psiField));
+            result.add(new JavaFieldImpl(psiField));
         }
         return result;
     }
diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/JavaField.java b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/JavaField.java
index bdea076189d..cdf9c603026 100644
--- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/JavaField.java
+++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/JavaField.java
@@ -16,27 +16,16 @@
 
 package org.jetbrains.jet.lang.resolve.java.structure;
 
-import com.intellij.psi.PsiEnumConstant;
 import com.intellij.psi.PsiField;
 import org.jetbrains.annotations.NotNull;
 
-public class JavaField extends JavaMemberImpl {
-    public JavaField(@NotNull PsiField psiField) {
-        super(psiField);
-    }
-
+public interface JavaField extends JavaMember {
     @NotNull
     @Override
-    public PsiField getPsi() {
-        return (PsiField) super.getPsi();
-    }
+    PsiField getPsi();
 
-    public boolean isEnumEntry() {
-        return getPsi() instanceof PsiEnumConstant;
-    }
+    boolean isEnumEntry();
 
     @NotNull
-    public JavaType getType() {
-        return JavaType.create(getPsi().getType());
-    }
+    JavaType getType();
 }
diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/JavaFieldImpl.java b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/JavaFieldImpl.java
new file mode 100644
index 00000000000..170abb7d1c7
--- /dev/null
+++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/JavaFieldImpl.java
@@ -0,0 +1,44 @@
+/*
+ * Copyright 2010-2013 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.jetbrains.jet.lang.resolve.java.structure;
+
+import com.intellij.psi.PsiEnumConstant;
+import com.intellij.psi.PsiField;
+import org.jetbrains.annotations.NotNull;
+
+public class JavaFieldImpl extends JavaMemberImpl implements JavaField {
+    public JavaFieldImpl(@NotNull PsiField psiField) {
+        super(psiField);
+    }
+
+    @NotNull
+    @Override
+    public PsiField getPsi() {
+        return (PsiField) super.getPsi();
+    }
+
+    @Override
+    public boolean isEnumEntry() {
+        return getPsi() instanceof PsiEnumConstant;
+    }
+
+    @Override
+    @NotNull
+    public JavaType getType() {
+        return JavaType.create(getPsi().getType());
+    }
+}
diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/JavaReferenceAnnotationArgument.java b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/JavaReferenceAnnotationArgument.java
index e61c9191eac..233887df104 100644
--- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/JavaReferenceAnnotationArgument.java
+++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/JavaReferenceAnnotationArgument.java
@@ -40,7 +40,7 @@ public class JavaReferenceAnnotationArgument extends JavaAnnotationArgument {
         PsiReferenceExpression expression = getPsi();
         PsiElement element = expression.resolve();
         if (element instanceof PsiEnumConstant) {
-            return new JavaField((PsiField) element);
+            return new JavaFieldImpl((PsiField) element);
         }
         // TODO: other types of references
         return null;