properly read final field from java code

compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JavaDescriptorResolver.java

@@ -1039,7 +1039,7 @@ public class JavaDescriptorResolver {
             
             boolean isVar;
             if (members.getter == null && members.setter == null) {
-                isVar = true;
+                isVar = !members.field.isFinal();
             } else {
                 isVar = members.setter != null;
             }

compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/PsiMemberWrapper.java

@@ -23,7 +23,11 @@ public class PsiMemberWrapper {
     public boolean isPrivate() {
         return psiMember.hasModifierProperty(PsiModifier.PRIVATE);
     }
-    
+
+    public boolean isFinal() {
+        return psiMember.hasModifierProperty(PsiModifier.FINAL);
+    }
+
     public String getName() {
         return psiMember.getName();
     }

compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/PsiMethodWrapper.java

@@ -37,10 +37,6 @@ public class PsiMethodWrapper extends PsiMemberWrapper {
         return getParameters().get(i);
     }
 
-    public boolean isFinal() {
-        return psiMember.hasModifierProperty(PsiModifier.FINAL);
-    }
-
     private JetMethodAnnotation jetMethod;
     @NotNull
     public JetMethodAnnotation getJetMethod() {

compiler/testData/readJavaBinaryClass/FinalFieldAsVal.java

@@ -0,0 +1,5 @@
+package test;
+
+final class FinalFieldAsVal {
+    public final int f = 1;
+}

compiler/testData/readJavaBinaryClass/FinalFieldAsVal.kt

@@ -0,0 +1,5 @@
+package test
+
+class FinalFieldAsVal() {
+    val f: Int = 1
+}