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

Rename: DescriptorDeserializersStorage -> DescriptorLoadersStorage

Browse Source
This commit is contained in:
Pavel V. Talanov
2014-06-20 17:42:50 +04:00
parent b08cda8dd6
commit b2c3a7d501
9 changed files with 38 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/jet/plugin/libraries/DeserializerForDecompiler.kt
+6 -6
View File
@@ -36,7 +36,7 @@ import org.jetbrains.jet.lang.resolve.java.PackageClassUtils
import com.intellij.openapi.diagnostic.Logger
import org.jetbrains.jet.lang.resolve.kotlin.KotlinClassFinder
import org.jetbrains.jet.lang.resolve.name.FqNameUnsafe
import org.jetbrains.jet.lang.resolve.kotlin.DescriptorDeserializersStorage
import org.jetbrains.jet.lang.resolve.kotlin.DescriptorLoadersStorage
import org.jetbrains.jet.lang.resolve.kotlin.ConstantDescriptorLoader
import org.jetbrains.jet.lang.resolve.java.structure.JavaClass
import org.jetbrains.jet.descriptors.serialization.context.DeserializationGlobalContext
@@ -95,10 +95,10 @@ public class DeserializerForDecompiler(val packageDirectory: VirtualFile, val di
}
private val storageManager = LockBasedStorageManager.NO_LOCKS
private val deserializerStorage = DescriptorDeserializersStorage(storageManager);
private val loadersStorage = DescriptorLoadersStorage(storageManager);
{
deserializerStorage.setModule(moduleDescriptor)
deserializerStorage.setErrorReporter(LOGGING_REPORTER)
loadersStorage.setModule(moduleDescriptor)
loadersStorage.setErrorReporter(LOGGING_REPORTER)
}
private val annotationLoader = AnnotationDescriptorLoader();
@@ -106,14 +106,14 @@ public class DeserializerForDecompiler(val packageDirectory: VirtualFile, val di
annotationLoader.setModule(moduleDescriptor)
annotationLoader.setKotlinClassFinder(localClassFinder)
annotationLoader.setErrorReporter(LOGGING_REPORTER)
annotationLoader.setStorage(deserializerStorage)
annotationLoader.setStorage(loadersStorage)
}
private val constantLoader = ConstantDescriptorLoader();
{
constantLoader.setKotlinClassFinder(localClassFinder)
constantLoader.setErrorReporter(LOGGING_REPORTER)
constantLoader.setStorage(deserializerStorage)
constantLoader.setStorage(loadersStorage)
}
private val classDataFinder = object : ClassDataFinder {