azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove InlineRegistering interface

Browse Source
This commit is contained in:
Alexey Tsvetkov
2015-09-07 20:53:19 +03:00
parent a22e15449d
commit 12181d274b
7 changed files with 13 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/rmi/kotlinr/src/org/jetbrains/kotlin/rmi/kotlinr/RemoteIncrementalCacheServer.kt
+3 -2
View File
@@ -17,7 +17,6 @@
package org.jetbrains.kotlin.rmi.kotlinr
import org.jetbrains.kotlin.load.kotlin.incremental.components.IncrementalCache
import org.jetbrains.kotlin.load.kotlin.incremental.components.InlineRegistering
import org.jetbrains.kotlin.rmi.CompileService
import java.rmi.server.UnicastRemoteObject
@@ -34,7 +33,9 @@ public class RemoteIncrementalCacheServer(val cache: IncrementalCache) : Compile
override fun getModuleMappingData(): ByteArray? = cache.getModuleMappingData()
override fun getInlineRegistering(): InlineRegistering = cache.getInlineRegistering()
override fun registerInline(fromPath: String, jvmSignature: String, toPath: String) {
cache.registerInline(fromPath, jvmSignature, toPath)
}
override fun getClassFilePath(internalClassName: String): String = cache.getClassFilePath(internalClassName)
compiler/rmi/rmi-interface/src/org/jetbrains/kotlin/rmi/CompileService.kt
+1 -2
View File
@@ -16,7 +16,6 @@
package org.jetbrains.kotlin.rmi
import org.jetbrains.kotlin.load.kotlin.incremental.components.InlineRegistering
import org.jetbrains.kotlin.modules.TargetId
import java.rmi.Remote
import java.rmi.RemoteException
@@ -39,7 +38,7 @@ public interface CompileService : Remote {
public fun getModuleMappingData(): ByteArray?
throws(RemoteException::class)
public fun getInlineRegistering(): InlineRegistering
public fun registerInline(fromPath: String, jvmSignature: String, toPath: String)
throws(RemoteException::class)
fun getClassFilePath(internalClassName: String): String
compiler/rmi/rmi-server/src/org/jetbrains/kotlin/rmi/service/RemoteIncrementalCacheClient.kt
+4 -3
View File
@@ -17,18 +17,19 @@
package org.jetbrains.kotlin.rmi.service
import org.jetbrains.kotlin.load.kotlin.incremental.components.IncrementalCache
import org.jetbrains.kotlin.load.kotlin.incremental.components.InlineRegistering
import org.jetbrains.kotlin.rmi.CompileService
public class RemoteIncrementalCacheClient(val cache: CompileService.RemoteIncrementalCache): IncrementalCache {
override fun getInlineRegistering(): InlineRegistering = cache.getInlineRegistering()
override fun getObsoletePackageParts(): Collection<String> = cache.getObsoletePackageParts()
override fun getPackagePartData(fqName: String): ByteArray? = cache.getPackagePartData(fqName)
override fun getModuleMappingData(): ByteArray? = cache.getModuleMappingData()
override fun registerInline(fromPath: String, jvmSignature: String, toPath: String) {
cache.registerInline(fromPath, jvmSignature, toPath)
}
override fun getClassFilePath(internalClassName: String): String = cache.getClassFilePath(internalClassName)
override fun close(): Unit = cache.close()