Lint: Review changes

plugins/uast-java/src/org/jetbrains/uast/java/declarations/JavaUClass.kt

@@ -193,7 +193,7 @@ private class JavaUAnonymousClassConstructorParameter(
     override val initializer by lz { JavaConverter.convert(psi.expressions[index], this) }
 
     override val initializerKind: UastVariableInitialierKind
-        get() = UastVariableInitialierKind.SIMPLE
+        get() = UastVariableInitialierKind.EXPRESSION
 
     override val kind: UastVariableKind
         get() = UastVariableKind.VALUE_PARAMETER

plugins/uast-java/src/org/jetbrains/uast/java/declarations/JavaUVariable.kt

@@ -21,7 +21,7 @@ import com.intellij.psi.PsiVariable
 import org.jetbrains.uast.*
 import org.jetbrains.uast.kinds.UastVariableInitialierKind
 import org.jetbrains.uast.kinds.UastVariableInitialierKind.Companion.NO_INITIALIZER
-import org.jetbrains.uast.kinds.UastVariableInitialierKind.Companion.SIMPLE
+import org.jetbrains.uast.kinds.UastVariableInitialierKind.Companion.EXPRESSION
 import org.jetbrains.uast.psi.PsiElementBacked
 
 class JavaUVariable(
@@ -37,7 +37,7 @@ class JavaUVariable(
     override val initializer by lz { JavaConverter.convertOrEmpty(psi.initializer, this) }
 
     override val initializerKind: UastVariableInitialierKind
-        get() = if (psi.initializer != null) SIMPLE else NO_INITIALIZER
+        get() = if (psi.initializer != null) EXPRESSION else NO_INITIALIZER
 
     override val kind = when (psi) {
         is PsiField -> UastVariableKind.MEMBER

plugins/uast-java/src/org/jetbrains/uast/java/internal/javaInternalUastUtils.kt

@@ -27,7 +27,7 @@ private val MODIFIER_MAP = mapOf(
 )
 
 internal fun PsiModifierListOwner.hasModifier(modifier: UastModifier): Boolean {
-    if (modifier == UastModifier.FIELD && this is PsiField) {
+    if (modifier == UastModifier.JVM_FIELD && this is PsiField) {
         return true;
     }
     if (modifier == UastModifier.OVERRIDE && this is PsiAnnotationOwner) {