From 437fe1b6b4cf827217943798f61f35741899792e Mon Sep 17 00:00:00 2001
From: Sergey Ignatov <sergey.ignatov@jetbrains.com>
Date: Tue, 15 Nov 2011 15:58:17 +0400
Subject: [PATCH] getAllFields() replaced by getFields()

---
 src/org/jetbrains/jet/j2k/Converter.java          |  2 +-
 testData/ast/field/file/classChildExtendsBase.jav |  7 +++++++
 testData/ast/field/file/classChildExtendsBase.kt  | 12 ++++++++++++
 3 files changed, 20 insertions(+), 1 deletion(-)
 create mode 100644 testData/ast/field/file/classChildExtendsBase.jav
 create mode 100644 testData/ast/field/file/classChildExtendsBase.kt

diff --git a/src/org/jetbrains/jet/j2k/Converter.java b/src/org/jetbrains/jet/j2k/Converter.java
index 46af108bdfa..410c926dd51 100644
--- a/src/org/jetbrains/jet/j2k/Converter.java
+++ b/src/org/jetbrains/jet/j2k/Converter.java
@@ -77,7 +77,7 @@ public class Converter {
     final Set<String> modifiers = modifiersListToModifiersSet(psiClass.getModifierList());
     final List<Class> innerClasses = classesToClassList(psiClass.getAllInnerClasses());
     final List<Function> methods = methodsToFunctionList(psiClass.getMethods(), true);
-    final List<Field> fields = fieldsToFieldList(psiClass.getAllFields());
+    final List<Field> fields = fieldsToFieldList(psiClass.getFields());
     final List<Element> typeParameters = elementsToElementList(psiClass.getTypeParameters());
     final List<Type> implementsTypes = typesToNotNullableTypeList(psiClass.getImplementsListTypes());
     final List<Type> extendsTypes = typesToNotNullableTypeList(psiClass.getExtendsListTypes());
diff --git a/testData/ast/field/file/classChildExtendsBase.jav b/testData/ast/field/file/classChildExtendsBase.jav
new file mode 100644
index 00000000000..94d40fbfea4
--- /dev/null
+++ b/testData/ast/field/file/classChildExtendsBase.jav
@@ -0,0 +1,7 @@
+class Base {
+  private String myFirst;
+}
+
+class Child extends Base {
+  private String mySecond;
+}
\ No newline at end of file
diff --git a/testData/ast/field/file/classChildExtendsBase.kt b/testData/ast/field/file/classChildExtendsBase.kt
new file mode 100644
index 00000000000..bbfb7fb7fb8
--- /dev/null
+++ b/testData/ast/field/file/classChildExtendsBase.kt
@@ -0,0 +1,12 @@
+open class Base(myFirst : String?) {
+private var myFirst : String?
+{
+$myFirst = myFirst
+}
+}
+open class Child(mySecond : String?) : Base() {
+private var mySecond : String?
+{
+$mySecond = mySecond
+}
+}
\ No newline at end of file