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

Get rid of 'class object' usages in code and builtins

Browse Source 
Replace some comments and library usages as well
This commit is contained in:
Pavel V. Talanov
2015-03-25 15:09:18 +03:00
parent 67f84c0f76
commit ed218c473a
157 changed files with 187 additions and 187 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/android-compiler-plugin/src/AndroidComponentRegistrar.kt
+1 -1
View File
@@ -41,7 +41,7 @@ public object AndroidConfigurationKeys {
}
public class AndroidCommandLineProcessor : CommandLineProcessor {
class object {
companion object {
public val ANDROID_COMPILER_PLUGIN_ID: String = "org.jetbrains.kotlin.android"
public val RESOURCE_PATH_OPTION: CliOption = CliOption("androidRes", "<path>", "Android resources path")
plugins/android-compiler-plugin/src/AndroidExpressionCodegenExtension.kt
+1 -1
View File
@@ -51,7 +51,7 @@ private enum class AndroidClassType(val internalClassName: String, val supportsC
}
public class AndroidExpressionCodegenExtension : ExpressionCodegenExtension {
class object {
companion object {
private val PROPERTY_NAME = "_\$_findViewCache"
private val CACHED_FIND_VIEW_BY_ID_METHOD_NAME = "_\$_findCachedViewById"
private val CLEAR_CACHE_METHOD_NAME = "_\$_clearFindViewByIdCache"
plugins/android-compiler-plugin/src/org/jetbrains/kotlin/lang/resolve/android/AndroidResourceManager.kt
+1 -1
View File
@@ -70,7 +70,7 @@ public abstract class AndroidResourceManager(val project: Project) {
return VirtualFileManager.getInstance().findFileByUrl("file://" + info.mainResDirectory)
}
class object {
companion object {
public fun getInstance(module: Module): AndroidResourceManager {
val service = ModuleServiceManager.getService<AndroidResourceManager>(module, javaClass<AndroidResourceManager>())
return service ?: module.getComponent<AndroidResourceManager>(javaClass<AndroidResourceManager>())
plugins/android-compiler-plugin/src/org/jetbrains/kotlin/lang/resolve/android/AndroidUIXmlProcessor.kt
+1 -1
View File
@@ -149,7 +149,7 @@ public abstract class AndroidUIXmlProcessor(protected val project: Project) {
return CachedValuesManager.getManager(project).createCachedValue(result, false)
}
class object {
companion object {
private val EXPLICIT_FLEXIBLE_PACKAGE = Flexibility.FLEXIBLE_TYPE_CLASSIFIER.getPackageFqName().asString()
private val EXPLICIT_FLEXIBLE_CLASS_NAME = Flexibility.FLEXIBLE_TYPE_CLASSIFIER.getRelativeClassName().asString()