From 99bf0fd03f7826f2d06ab5b1d0e7250c94121950 Mon Sep 17 00:00:00 2001
From: Alexander Udalov <Alexander.Udalov@jetbrains.com>
Date: Wed, 16 Sep 2015 16:21:43 +0300
Subject: [PATCH] Delete deprecated Type.Constructor message, advance ABI
 version

Original commit: e749bc262d55d55a827275776a0ccf427bb07d2b
---
 .../jps/incremental/ProtoCompareGenerated.kt  | 20 +++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/ProtoCompareGenerated.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/ProtoCompareGenerated.kt
index 5de59380920..cfe371184a4 100644
--- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/ProtoCompareGenerated.kt
+++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/ProtoCompareGenerated.kt
@@ -232,14 +232,14 @@ open class ProtoCompareGenerated(public val oldNameResolver: NameResolver, publi
             if (!checkEquals(old.flexibleUpperBound, new.flexibleUpperBound)) return false
         }
 
-        if (old.hasConstructorClassName() != new.hasConstructorClassName()) return false
-        if (old.hasConstructorClassName()) {
-            if (!checkClassIdEquals(old.constructorClassName, new.constructorClassName)) return false
+        if (old.hasClassName() != new.hasClassName()) return false
+        if (old.hasClassName()) {
+            if (!checkClassIdEquals(old.className, new.className)) return false
         }
 
-        if (old.hasConstructorTypeParameter() != new.hasConstructorTypeParameter()) return false
-        if (old.hasConstructorTypeParameter()) {
-            if (old.constructorTypeParameter != new.constructorTypeParameter) return false
+        if (old.hasTypeParameter() != new.hasTypeParameter()) return false
+        if (old.hasTypeParameter()) {
+            if (old.typeParameter != new.typeParameter) return false
         }
 
         if (old.getExtensionCount(JvmProtoBuf.typeAnnotation) != new.getExtensionCount(JvmProtoBuf.typeAnnotation)) return false
@@ -746,12 +746,12 @@ public fun ProtoBuf.Type.hashCode(stringIndexes: (Int) -> Int, fqNameIndexes: (I
         hashCode = 31 * hashCode + flexibleUpperBound.hashCode(stringIndexes, fqNameIndexes)
     }
 
-    if (hasConstructorClassName()) {
-        hashCode = 31 * hashCode + fqNameIndexes(constructorClassName)
+    if (hasClassName()) {
+        hashCode = 31 * hashCode + fqNameIndexes(className)
     }
 
-    if (hasConstructorTypeParameter()) {
-        hashCode = 31 * hashCode + constructorTypeParameter
+    if (hasTypeParameter()) {
+        hashCode = 31 * hashCode + typeParameter
     }
 
     for(i in 0..getExtensionCount(JvmProtoBuf.typeAnnotation) - 1) {