From 4038efbe2147237e2f00f81ee3629c9ca853dc01 Mon Sep 17 00:00:00 2001
From: Alexander Udalov <Alexander.Udalov@jetbrains.com>
Date: Fri, 9 Jan 2015 14:06:45 +0300
Subject: [PATCH] Rename java -> jvm, jet -> kotlin in module
 serialization.java

org.jetbrains.jet.descriptors.serialization ->
org.jetbrains.kotlin.serialization.jvm

Original commit: 00878cc31af33c721a48a113d6ea0bbca379554e
---
 jps/jps-plugin/jps-plugin.iml                               | 5 ++---
 .../kotlin/jps/incremental/IncrementalCacheImpl.kt          | 2 +-
 .../org/jetbrains/kotlin/jps/build/classFilesComparison.kt  | 6 +++---
 3 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/jps/jps-plugin/jps-plugin.iml b/jps/jps-plugin/jps-plugin.iml
index d96c403f498..a4e8a5a1756 100644
--- a/jps/jps-plugin/jps-plugin.iml
+++ b/jps/jps-plugin/jps-plugin.iml
@@ -17,10 +17,9 @@
     <orderEntry type="module" module-name="backend" scope="TEST" />
     <orderEntry type="module" module-name="descriptors" />
     <orderEntry type="module" module-name="frontend.java" />
-    <orderEntry type="module" module-name="serialization.java" />
+    <orderEntry type="module" module-name="serialization.jvm" />
     <orderEntry type="module" module-name="serialization" />
     <orderEntry type="module" module-name="compiler-tests" scope="TEST" />
     <orderEntry type="library" name="asm" level="project" />
   </component>
-</module>
-
+</module>
\ No newline at end of file
diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt
index 05cc268cc43..50440dc36e5 100644
--- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt
+++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt
@@ -24,7 +24,7 @@ import com.intellij.util.io.IOUtil
 import java.io.DataInput
 import org.jetbrains.jet.lang.resolve.name.FqName
 import com.intellij.util.io.DataExternalizer
-import org.jetbrains.jet.descriptors.serialization.BitEncoding
+import org.jetbrains.kotlin.serialization.jvm.BitEncoding
 import java.util.Arrays
 import org.jetbrains.org.objectweb.asm.*
 import com.intellij.util.io.EnumeratorStringDescriptor
diff --git a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/classFilesComparison.kt b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/classFilesComparison.kt
index f5cbc3d3be1..215ee7895d4 100644
--- a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/classFilesComparison.kt
+++ b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/classFilesComparison.kt
@@ -28,8 +28,8 @@ import com.google.common.hash.Hashing
 import com.intellij.openapi.util.io.FileUtil
 import com.google.common.collect.Sets
 import java.util.HashSet
-import org.jetbrains.jet.descriptors.serialization.BitEncoding
-import org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf
+import org.jetbrains.kotlin.serialization.jvm.BitEncoding
+import org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf
 import com.google.protobuf.ExtensionRegistry
 import java.io.ByteArrayInputStream
 import org.jetbrains.jet.descriptors.serialization.DebugProtoBuf
@@ -158,7 +158,7 @@ fun classFileToString(classFile: File): String {
 
 fun getExtensionRegistry(): ExtensionRegistry {
     val registry = ExtensionRegistry.newInstance()!!
-    DebugJavaProtoBuf.registerAllExtensions(registry)
+    DebugJvmProtoBuf.registerAllExtensions(registry)
     return registry
 }