From 4debf0cc45c81b9ece2e446d4f3c886d64c9ec0e Mon Sep 17 00:00:00 2001
From: Alexey Sedunov <alexey.sedunov@jetbrains.com>
Date: Tue, 1 Mar 2016 16:31:56 +0300
Subject: [PATCH] Java To Kotlin: KtLightModifierList

---
 .../KtLightClassForExplicitDeclaration.kt     |  5 +-
 .../kotlin/asJava/KtLightModifierList.kt      | 51 ++++++-------------
 2 files changed, 18 insertions(+), 38 deletions(-)

diff --git a/compiler/light-classes/src/org/jetbrains/kotlin/asJava/KtLightClassForExplicitDeclaration.kt b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/KtLightClassForExplicitDeclaration.kt
index a669cbb422b..74695d937db 100644
--- a/compiler/light-classes/src/org/jetbrains/kotlin/asJava/KtLightClassForExplicitDeclaration.kt
+++ b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/KtLightClassForExplicitDeclaration.kt
@@ -263,9 +263,8 @@ open class KtLightClassForExplicitDeclaration(
 
     private val _modifierList : PsiModifierList by lazy {
         object : KtLightModifierList(this.manager, computeModifiers()) {
-            override fun getDelegate(): PsiModifierList {
-                return this@KtLightClassForExplicitDeclaration.getDelegate().modifierList!!
-            }
+            override val delegate: PsiAnnotationOwner
+                get() = this@KtLightClassForExplicitDeclaration.getDelegate().modifierList!!
         }
     }
 
diff --git a/compiler/light-classes/src/org/jetbrains/kotlin/asJava/KtLightModifierList.kt b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/KtLightModifierList.kt
index fe527702972..9476247b867 100644
--- a/compiler/light-classes/src/org/jetbrains/kotlin/asJava/KtLightModifierList.kt
+++ b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/KtLightModifierList.kt
@@ -14,45 +14,26 @@
  * limitations under the License.
  */
 
-package org.jetbrains.kotlin.asJava;
+package org.jetbrains.kotlin.asJava
 
-import com.intellij.psi.PsiAnnotation;
-import com.intellij.psi.PsiAnnotationOwner;
-import com.intellij.psi.PsiManager;
-import com.intellij.psi.impl.light.LightModifierList;
-import org.jetbrains.annotations.NonNls;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
-import org.jetbrains.kotlin.idea.KotlinLanguage;
+import com.intellij.psi.PsiAnnotation
+import com.intellij.psi.PsiAnnotationOwner
+import com.intellij.psi.PsiManager
+import com.intellij.psi.impl.light.LightModifierList
+import org.jetbrains.annotations.NonNls
+import org.jetbrains.kotlin.idea.KotlinLanguage
 
-public abstract class KtLightModifierList extends LightModifierList {
-    public KtLightModifierList(PsiManager psiManager, @NotNull String[] modifiers) {
-        super(psiManager, KotlinLanguage.INSTANCE, modifiers);
-    }
+abstract class KtLightModifierList(
+        psiManager: PsiManager,
+        modifiers: Array<String>
+) : LightModifierList(psiManager, KotlinLanguage.INSTANCE, *modifiers) {
+    abstract val delegate: PsiAnnotationOwner
 
-    public abstract PsiAnnotationOwner getDelegate();
+    override fun getAnnotations() = delegate.annotations
 
-    @Override
-    @NotNull
-    public PsiAnnotation[] getAnnotations() {
-        return getDelegate().getAnnotations();
-    }
+    override fun getApplicableAnnotations() = delegate.applicableAnnotations
 
-    @Override
-    @NotNull
-    public PsiAnnotation[] getApplicableAnnotations() {
-        return getDelegate().getApplicableAnnotations();
-    }
+    override fun findAnnotation(@NonNls qualifiedName: String) = delegate.findAnnotation(qualifiedName)
 
-    @Override
-    @Nullable
-    public PsiAnnotation findAnnotation(@NotNull @NonNls String qualifiedName) {
-        return getDelegate().findAnnotation(qualifiedName);
-    }
-
-    @Override
-    @NotNull
-    public PsiAnnotation addAnnotation(@NotNull @NonNls String qualifiedName) {
-        return getDelegate().addAnnotation(qualifiedName);
-    }
+    override fun addAnnotation(@NonNls qualifiedName: String) = delegate.addAnnotation(qualifiedName)
 }