From ec4f506f8f6c31e543af69f1f34a5bc60df0cb95 Mon Sep 17 00:00:00 2001
From: "Pavel V. Talanov" <talanov.pavel@gmail.com>
Date: Wed, 17 Dec 2014 16:39:05 +0300
Subject: [PATCH] Minor: move some code to super class in Kotlin light classes

---
 .../KotlinLightClassForExplicitDeclaration.java     |  7 +------
 .../jet/asJava/KotlinLightClassForPackage.java      |  7 +------
 .../jet/asJava/KotlinWrappingLightClass.java        | 13 ++++++++++---
 3 files changed, 12 insertions(+), 15 deletions(-)

diff --git a/compiler/jet.as.java.psi/src/org/jetbrains/jet/asJava/KotlinLightClassForExplicitDeclaration.java b/compiler/jet.as.java.psi/src/org/jetbrains/jet/asJava/KotlinLightClassForExplicitDeclaration.java
index f25f871854e..69546cb5880 100644
--- a/compiler/jet.as.java.psi/src/org/jetbrains/jet/asJava/KotlinLightClassForExplicitDeclaration.java
+++ b/compiler/jet.as.java.psi/src/org/jetbrains/jet/asJava/KotlinLightClassForExplicitDeclaration.java
@@ -195,7 +195,7 @@ public class KotlinLightClassForExplicitDeclaration extends KotlinWrappingLightC
             @NotNull FqName name,
             @NotNull JetClassOrObject classOrObject
     ) {
-        super(manager, JetLanguage.INSTANCE);
+        super(manager);
         this.classFqName = name;
         this.classOrObject = classOrObject;
     }
@@ -340,11 +340,6 @@ public class KotlinLightClassForExplicitDeclaration extends KotlinWrappingLightC
         return another instanceof PsiClass && Comparing.equal(((PsiClass) another).getQualifiedName(), getQualifiedName());
     }
 
-    @Override
-    public ItemPresentation getPresentation() {
-        return ItemPresentationProviders.getItemPresentation(this);
-    }
-
     @Override
     public Icon getElementIcon(int flags) {
         throw new UnsupportedOperationException("This should be done byt JetIconProvider");
diff --git a/compiler/jet.as.java.psi/src/org/jetbrains/jet/asJava/KotlinLightClassForPackage.java b/compiler/jet.as.java.psi/src/org/jetbrains/jet/asJava/KotlinLightClassForPackage.java
index 4cb39425e4d..9696fbe8446 100644
--- a/compiler/jet.as.java.psi/src/org/jetbrains/jet/asJava/KotlinLightClassForPackage.java
+++ b/compiler/jet.as.java.psi/src/org/jetbrains/jet/asJava/KotlinLightClassForPackage.java
@@ -147,7 +147,7 @@ public class KotlinLightClassForPackage extends KotlinWrappingLightClass impleme
             @NotNull GlobalSearchScope searchScope,
             @NotNull Collection<JetFile> files
     ) {
-        super(manager, JetLanguage.INSTANCE);
+        super(manager);
         this.modifierList = new LightModifierList(manager, JetLanguage.INSTANCE, PsiModifier.PUBLIC, PsiModifier.FINAL);
         this.implementsList = new LightEmptyImplementsList(manager);
         this.packageFqName = packageFqName;
@@ -377,11 +377,6 @@ public class KotlinLightClassForPackage extends KotlinWrappingLightClass impleme
         return another instanceof PsiClass && Comparing.equal(((PsiClass) another).getQualifiedName(), getQualifiedName());
     }
 
-    @Override
-    public ItemPresentation getPresentation() {
-        return ItemPresentationProviders.getItemPresentation(this);
-    }
-
     @Override
     public Icon getElementIcon(int flags) {
         throw new UnsupportedOperationException("This should be done byt JetIconProvider");
diff --git a/compiler/jet.as.java.psi/src/org/jetbrains/jet/asJava/KotlinWrappingLightClass.java b/compiler/jet.as.java.psi/src/org/jetbrains/jet/asJava/KotlinWrappingLightClass.java
index c49c964640f..0a2affce14f 100644
--- a/compiler/jet.as.java.psi/src/org/jetbrains/jet/asJava/KotlinWrappingLightClass.java
+++ b/compiler/jet.as.java.psi/src/org/jetbrains/jet/asJava/KotlinWrappingLightClass.java
@@ -17,6 +17,8 @@
 package org.jetbrains.jet.asJava;
 
 import com.intellij.lang.Language;
+import com.intellij.navigation.ItemPresentation;
+import com.intellij.navigation.ItemPresentationProviders;
 import com.intellij.psi.*;
 import com.intellij.psi.impl.PsiClassImplUtil;
 import com.intellij.psi.impl.light.AbstractLightClass;
@@ -24,8 +26,8 @@ import com.intellij.psi.impl.light.LightField;
 import com.intellij.psi.impl.light.LightMethod;
 import com.intellij.psi.impl.source.ClassInnerStuffCache;
 import com.intellij.psi.impl.source.PsiExtensibleClass;
-import com.intellij.psi.util.PsiTreeUtil;
 import com.intellij.psi.scope.PsiScopeProcessor;
+import com.intellij.psi.util.PsiTreeUtil;
 import com.intellij.util.Function;
 import com.intellij.util.containers.ContainerUtil;
 import kotlin.Function1;
@@ -40,8 +42,8 @@ import java.util.List;
 public abstract class KotlinWrappingLightClass extends AbstractLightClass implements KotlinLightClass, PsiExtensibleClass {
     private final ClassInnerStuffCache myInnersCache = new ClassInnerStuffCache(this);
 
-    protected KotlinWrappingLightClass(PsiManager manager, Language language) {
-        super(manager, language);
+    protected KotlinWrappingLightClass(PsiManager manager) {
+        super(manager, JetLanguage.INSTANCE);
     }
 
     @NotNull
@@ -191,4 +193,9 @@ public abstract class KotlinWrappingLightClass extends AbstractLightClass implem
         // Method was generated from declaration in some other trait
         return (parentOfMethodOrigin != null && thisClassDeclaration != parentOfMethodOrigin && JetPsiUtil.isTrait(parentOfMethodOrigin));
     }
+
+    @Override
+    public ItemPresentation getPresentation() {
+        return ItemPresentationProviders.getItemPresentation(this);
+    }
 }