Rename java -> jvm, jet -> kotlin in module serialization.java

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

idea/idea-analysis/idea-analysis.iml

@@ -16,7 +16,7 @@
     <orderEntry type="library" name="kotlin-runtime" level="project" />
     <orderEntry type="library" scope="PROVIDED" name="gradle-and-groovy-plugin" level="project" />
     <orderEntry type="module" module-name="serialization" />
-    <orderEntry type="module" module-name="serialization.java" />
+    <orderEntry type="module" module-name="serialization.jvm" />
     <orderEntry type="module" module-name="eval4j" />
     <orderEntry type="library" name="intellij-core-analysis" level="project" />
     <orderEntry type="module-library">

idea/idea-analysis/src/org/jetbrains/jet/plugin/decompiler/stubBuilder/KotlinClsStubBuilder.kt

@@ -24,7 +24,7 @@ import com.intellij.openapi.vfs.VirtualFile
 import com.intellij.psi.impl.compiled.ClassFileStubBuilder
 import org.jetbrains.jet.lang.resolve.kotlin.KotlinBinaryClassCache
 import org.jetbrains.jet.lang.resolve.kotlin.header.KotlinClassHeader
-import org.jetbrains.jet.descriptors.serialization.JavaProtoBufUtil
+import org.jetbrains.kotlin.serialization.jvm.JvmProtoBufUtil
 import org.jetbrains.jet.lang.psi.JetFile
 import org.jetbrains.jet.plugin.decompiler.textBuilder.LocalClassFinder
 import org.jetbrains.jet.plugin.decompiler.textBuilder.LocalClassDataFinder
@@ -64,13 +64,13 @@ public class KotlinClsStubBuilder : ClsStubBuilder() {
         }
         return when (header.kind) {
             KotlinClassHeader.Kind.PACKAGE_FACADE -> {
-                val packageData = JavaProtoBufUtil.readPackageDataFrom(annotationData)
+                val packageData = JvmProtoBufUtil.readPackageDataFrom(annotationData)
                 val context = components.createContext(packageData.getNameResolver(), packageFqName)
                 createPackageFacadeFileStub(packageData.getPackageProto(), packageFqName, context)
             }
 
             KotlinClassHeader.Kind.CLASS -> {
-                val classData = JavaProtoBufUtil.readClassDataFrom(annotationData)
+                val classData = JvmProtoBufUtil.readClassDataFrom(annotationData)
                 val context = components.createContext(classData.getNameResolver(), packageFqName)
                 createTopLevelClassStub(classId, classData.getClassProto(), context)
             }
@@ -88,4 +88,4 @@ public class KotlinClsStubBuilder : ClsStubBuilder() {
     class object {
         val LOG = Logger.getInstance(javaClass<KotlinClsStubBuilder>())
     }
-}
+}

idea/idea-analysis/src/org/jetbrains/jet/plugin/decompiler/textBuilder/DeserializerForDecompiler.kt

@@ -17,7 +17,7 @@
 package org.jetbrains.jet.plugin.decompiler.textBuilder
 
 import org.jetbrains.jet.lang.resolve.name.ClassId
-import org.jetbrains.jet.descriptors.serialization.JavaProtoBufUtil
+import org.jetbrains.kotlin.serialization.jvm.JvmProtoBufUtil
 import org.jetbrains.jet.lang.descriptors.*
 import org.jetbrains.jet.lang.descriptors.impl.MutablePackageFragmentDescriptor
 import org.jetbrains.jet.lang.resolve.kotlin.*
@@ -59,7 +59,7 @@ public class DeserializerForDecompiler(val packageDirectory: VirtualFile, val di
             LOG.error("Could not read annotation data for $packageFqName from ${binaryClassForPackageClass?.getClassId()}")
             return Collections.emptyList()
         }
-        val packageData = JavaProtoBufUtil.readPackageDataFrom(annotationData)
+        val packageData = JvmProtoBufUtil.readPackageDataFrom(annotationData)
         val membersScope = DeserializedPackageMemberScope(
                 createDummyPackageFragment(packageFqName),
                 packageData.getPackageProto(),

idea/idea-analysis/src/org/jetbrains/jet/plugin/decompiler/textBuilder/LocalClassFinder.kt

@@ -27,7 +27,7 @@ import com.intellij.openapi.vfs.VirtualFile
 import org.jetbrains.jet.lang.resolve.name.FqName
 import org.jetbrains.jet.descriptors.serialization.ClassDataFinder
 import org.jetbrains.jet.descriptors.serialization.ClassData
-import org.jetbrains.jet.descriptors.serialization.JavaProtoBufUtil
+import org.jetbrains.kotlin.serialization.jvm.JvmProtoBufUtil
 import com.intellij.openapi.diagnostic.Logger
 
 class LocalClassFinder(
@@ -61,7 +61,7 @@ class LocalClassDataFinder(
             log.error("Annotation data missing for ${binaryClass.getClassId()}")
             return null
         }
-        return JavaProtoBufUtil.readClassDataFrom(data)
+        return JvmProtoBufUtil.readClassDataFrom(data)
     }
 }
 
@@ -69,4 +69,4 @@ private val JavaClass.classId: ClassId
     get() {
         val outer = getOuterClass()
         return if (outer == null) ClassId.topLevel(getFqName()!!) else outer.classId.createNestedClassId(getName())
-    }
+    }

idea/idea.iml

@@ -37,7 +37,7 @@
     <orderEntry type="library" name="kotlin-runtime" level="project" />
     <orderEntry type="library" scope="PROVIDED" name="gradle-and-groovy-plugin" level="project" />
     <orderEntry type="module" module-name="serialization" />
-    <orderEntry type="module" module-name="serialization.java" />
+    <orderEntry type="module" module-name="serialization.jvm" />
     <orderEntry type="library" scope="PROVIDED" name="maven" level="project" />
     <orderEntry type="module" module-name="util" />
     <orderEntry type="module" module-name="eval4j" />

idea/src/org/jetbrains/jet/plugin/debugger/PositionManagerLibraryClassFileSearcher.kt

@@ -19,7 +19,7 @@ package org.jetbrains.jet.plugin.debugger
 import com.intellij.psi.search.FilenameIndex
 import org.jetbrains.jet.lang.resolve.kotlin.PackagePartClassUtils
 import org.jetbrains.jet.lang.psi.JetElement
-import org.jetbrains.jet.descriptors.serialization.JavaProtoBuf
+import org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf
 import org.jetbrains.jet.renderer.DescriptorRenderer
 import com.intellij.openapi.diagnostic.Logger
 import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor
@@ -92,8 +92,8 @@ fun findPackagePartInternalNameForLibraryFile(elementAt: JetElement): String? {
     }
 
     val proto = deserializedDescriptor.proto
-    if (proto.hasExtension(JavaProtoBuf.implClassName)) {
-        val name = deserializedDescriptor.nameResolver.getName(proto.getExtension(JavaProtoBuf.implClassName)!!)
+    if (proto.hasExtension(JvmProtoBuf.implClassName)) {
+        val name = deserializedDescriptor.nameResolver.getName(proto.getExtension(JvmProtoBuf.implClassName)!!)
         return JvmClassName.byFqNameWithoutInnerClasses(packageFqName.child(name)).getInternalName()
     }