From 760571c2a3c61cd76b74d9830cc2fff966b817a0 Mon Sep 17 00:00:00 2001
From: Zalim Bashorov <Zalim.Bashorov@jetbrains.com>
Date: Tue, 15 Sep 2015 20:02:56 +0300
Subject: [PATCH] Minor: fix warnings in JetObjectDeclaration.kt

---
 .../kotlin/psi/JetObjectDeclaration.kt        | 22 ++++++++-----------
 1 file changed, 9 insertions(+), 13 deletions(-)

diff --git a/compiler/frontend/src/org/jetbrains/kotlin/psi/JetObjectDeclaration.kt b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetObjectDeclaration.kt
index 9e213b54881..860e7f88445 100644
--- a/compiler/frontend/src/org/jetbrains/kotlin/psi/JetObjectDeclaration.kt
+++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetObjectDeclaration.kt
@@ -17,12 +17,8 @@
 package org.jetbrains.kotlin.psi
 
 import com.intellij.lang.ASTNode
-import com.intellij.navigation.ItemPresentation
-import com.intellij.navigation.ItemPresentationProviders
 import com.intellij.psi.PsiElement
-import com.intellij.util.IncorrectOperationException
 import org.jetbrains.annotations.NonNls
-import org.jetbrains.kotlin.lexer.JetModifierKeywordToken
 import org.jetbrains.kotlin.lexer.JetTokens
 import org.jetbrains.kotlin.name.SpecialNames
 import org.jetbrains.kotlin.psi.stubs.KotlinObjectStub
@@ -35,9 +31,9 @@ public class JetObjectDeclaration : JetClassOrObject {
     override fun getStub(): KotlinObjectStub? = super.getStub() as? KotlinObjectStub
 
     override fun getName(): String? {
-        val stub = getStub()
+        val stub = stub
         if (stub != null) {
-            return stub.getName()
+            return stub.name
         }
 
         val nameAsDeclaration = getNameAsDeclaration()
@@ -45,15 +41,15 @@ public class JetObjectDeclaration : JetClassOrObject {
             //NOTE: a hack in PSI that simplifies writing frontend code
             return SpecialNames.DEFAULT_NAME_FOR_COMPANION_OBJECT.toString()
         }
-        return nameAsDeclaration?.getName()
+        return nameAsDeclaration?.name
     }
 
-    override fun getNameIdentifier(): PsiElement? = getNameAsDeclaration()?.getNameIdentifier()
+    override fun getNameIdentifier(): PsiElement? = getNameAsDeclaration()?.nameIdentifier
 
     override fun setName(@NonNls name: String): PsiElement {
         val declarationName = getNameAsDeclaration()
         if (declarationName == null) {
-            val psiFactory = JetPsiFactory(getProject())
+            val psiFactory = JetPsiFactory(project)
             val result = addAfter(psiFactory.createObjectDeclarationName(name), getObjectKeyword())
             addAfter(psiFactory.createWhiteSpace(), getObjectKeyword())
 
@@ -64,16 +60,16 @@ public class JetObjectDeclaration : JetClassOrObject {
         }
     }
 
-    public fun isCompanion(): Boolean = getStub()?.isCompanion() ?: hasModifier(JetTokens.COMPANION_KEYWORD)
+    public fun isCompanion(): Boolean = stub?.isCompanion() ?: hasModifier(JetTokens.COMPANION_KEYWORD)
 
-    override fun getTextOffset(): Int = getNameIdentifier()?.getTextRange()?.getStartOffset()
-                                        ?: getObjectKeyword().getTextRange().getStartOffset()
+    override fun getTextOffset(): Int = nameIdentifier?.textRange?.startOffset
+                                        ?: getObjectKeyword().textRange.startOffset
 
     override fun <R, D> accept(visitor: JetVisitor<R, D>, data: D): R {
         return visitor.visitObjectDeclaration(this, data)
     }
 
-    public fun isObjectLiteral(): Boolean = getStub()?.isObjectLiteral() ?: (getParent() is JetObjectLiteralExpression)
+    public fun isObjectLiteral(): Boolean = stub?.isObjectLiteral() ?: (parent is JetObjectLiteralExpression)
 
     public fun getObjectKeyword(): PsiElement = findChildByType(JetTokens.OBJECT_KEYWORD)!!
 }