From 26c6d6157fc70ab37261b47d4cfef69141eb054f Mon Sep 17 00:00:00 2001
From: Vladimir Krivosheev <vladimir.krivosheev@jetbrains.com>
Date: Thu, 2 Jul 2015 13:51:16 +0200
Subject: [PATCH] cleanup

---
 .../protocol-model-generator/src/Generator.kt         |  8 ++++----
 .../protocol/protocol-model-generator/src/NamePath.kt |  2 +-
 .../protocol/protocol-model-generator/src/TypeMap.kt  | 11 ++++-------
 3 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/platform/script-debugger/protocol/protocol-model-generator/src/Generator.kt b/platform/script-debugger/protocol/protocol-model-generator/src/Generator.kt
index a120d1267904..121d0428151d 100644
--- a/platform/script-debugger/protocol/protocol-model-generator/src/Generator.kt
+++ b/platform/script-debugger/protocol/protocol-model-generator/src/Generator.kt
@@ -88,7 +88,7 @@ class Generator(outputDir: String, rootPackage: String, requestClassName: String
   }
 
   fun resolveType(typedObject: ItemDescriptor, scope: ResolveAndGenerateScope): TypeDescriptor {
-    val optional = typedObject is ItemDescriptor.Named && (typedObject : ItemDescriptor.Named).optional()
+    val optional = typedObject is ItemDescriptor.Named && typedObject.optional()
     return switchByType(typedObject, object : TypeVisitor<TypeDescriptor> {
       override fun visitRef(refName: String): TypeDescriptor {
         return TypeDescriptor(resolveRefType(scope.getDomainName(), refName, scope.getTypeDirection()), optional)
@@ -120,7 +120,7 @@ class Generator(outputDir: String, rootPackage: String, requestClassName: String
       }
 
       override fun visitArray(items: ProtocolMetaModel.ArrayItemType): TypeDescriptor {
-        val type = scope.resolveType<ProtocolMetaModel.ArrayItemType>(items).type
+        val type = scope.resolveType(items).type
         return TypeDescriptor(ListType(type), optional, false, type == BoxableType.ANY_STRING)
       }
 
@@ -244,7 +244,7 @@ fun capitalizeFirstChar(s: String): String {
 }
 
 fun <R> switchByType(typedObject: ItemDescriptor, visitor: TypeVisitor<R>): R {
-  val refName = if (typedObject is ItemDescriptor.Referenceable) (typedObject : ItemDescriptor.Referenceable).ref() else null
+  val refName = if (typedObject is ItemDescriptor.Referenceable) typedObject.ref() else null
   if (refName != null) {
     return visitor.visitRef(refName)
   }
@@ -265,7 +265,7 @@ fun <R> switchByType(typedObject: ItemDescriptor, visitor: TypeVisitor<R>): R {
         return visitor.visitObject(null)
       }
 
-      val properties = (typedObject : ItemDescriptor.Type).properties()
+      val properties = typedObject.properties()
       if (properties == null || properties.isEmpty()) {
         return visitor.visitMap()
       }
diff --git a/platform/script-debugger/protocol/protocol-model-generator/src/NamePath.kt b/platform/script-debugger/protocol/protocol-model-generator/src/NamePath.kt
index 92760b3cf22f..aab52a4fa349 100644
--- a/platform/script-debugger/protocol/protocol-model-generator/src/NamePath.kt
+++ b/platform/script-debugger/protocol/protocol-model-generator/src/NamePath.kt
@@ -7,7 +7,7 @@ data class NamePath(val lastComponent: String, val parent: NamePath? = null) {
       var current: NamePath? = this
       while (current != null) {
         res++
-        current = current!!.parent
+        current = current.parent
       }
     }
     return res
diff --git a/platform/script-debugger/protocol/protocol-model-generator/src/TypeMap.kt b/platform/script-debugger/protocol/protocol-model-generator/src/TypeMap.kt
index 26bd05474c9d..7fb40a76594d 100644
--- a/platform/script-debugger/protocol/protocol-model-generator/src/TypeMap.kt
+++ b/platform/script-debugger/protocol/protocol-model-generator/src/TypeMap.kt
@@ -15,10 +15,7 @@ class TypeMap {
   private val typesToGenerate = ArrayList<StandaloneTypeBinding>()
 
   fun resolve(domainName: String, typeName: String, direction: TypeData.Direction): BoxableType? {
-    val domainGenerator = domainGeneratorMap!!.get(domainName)
-    if (domainGenerator == null) {
-      throw RuntimeException("Failed to find domain generator: " + domainName)
-    }
+    val domainGenerator = domainGeneratorMap!!.get(domainName) ?: throw RuntimeException("Failed to find domain generator: " + domainName)
     return direction.get(getTypeData(domainName, typeName)).resolve(this, domainGenerator)
   }
 
@@ -28,7 +25,7 @@ class TypeMap {
 
   fun generateRequestedTypes() {
     // size may grow during iteration
-    var list = typesToGenerate.copyToArray()
+    var list = typesToGenerate.toTypedArray()
     typesToGenerate.clear()
     while (true) {
       for (binding in list) {
@@ -39,7 +36,7 @@ class TypeMap {
         break
       }
       else {
-        list = typesToGenerate.copyToArray()
+        list = typesToGenerate.toTypedArray()
         typesToGenerate.clear()
       }
     }
@@ -52,6 +49,6 @@ class TypeMap {
       result = TypeData(typeName)
       map.put(key, result)
     }
-    return result!!
+    return result
   }
 }