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

Get rid of deprecated annotations and modifiers in project code

Browse Source
This commit is contained in:
Denis Zharkov
2015-09-14 16:26:59 +03:00
parent 02aafe4262
commit 9c4564a5a6
204 changed files with 485 additions and 439 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/cli/cli-common/src/org/jetbrains/kotlin/cli/common/messages/CompilerMessageLocation.kt
+4 -4
View File
@@ -16,8 +16,6 @@
package org.jetbrains.kotlin.cli.common.messages
import kotlin.platform.platformStatic
public data class CompilerMessageLocation private constructor(
public val path: String?,
public val line: Int,
@@ -28,9 +26,11 @@ public data class CompilerMessageLocation private constructor(
path + (if (line != -1 || column != -1) " (" + line + ":" + column + ")" else "")
companion object {
public platformStatic val NO_LOCATION: CompilerMessageLocation = CompilerMessageLocation(null, -1, -1, null)
@JvmStatic
public val NO_LOCATION: CompilerMessageLocation = CompilerMessageLocation(null, -1, -1, null)
public platformStatic fun create(
@JvmStatic
public fun create(
path: String?,
line: Int,
column: Int,
compiler/cli/cli-runner/src/org/jetbrains/kotlin/runner/Main.kt
+1 -1
View File
@@ -99,7 +99,7 @@ public object Main {
runner.run(classpath, arguments)
}
@jvmStatic
@JvmStatic
public fun main(args: Array<String>) {
try {
run(args)
compiler/cli/src/org/jetbrains/kotlin/cli/jvm/K2JVMCompiler.kt
+2 -3
View File
@@ -49,9 +49,7 @@ import org.jetbrains.kotlin.utils.PathUtil
import java.io.File
import java.lang.management.ManagementFactory
import java.util.concurrent.TimeUnit
import kotlin.platform.platformStatic
SuppressWarnings("UseOfSystemOutOrSystemErr")
public open class K2JVMCompiler : CLICompiler<K2JVMCompilerArguments>() {
override fun doExecute(arguments: K2JVMCompilerArguments, services: Services, messageCollector: MessageCollector, rootDisposable: Disposable): ExitCode {
@@ -244,7 +242,8 @@ public open class K2JVMCompiler : CLICompiler<K2JVMCompilerArguments>() {
}
}
platformStatic public fun main(args: Array<String>) {
@JvmStatic
public fun main(args: Array<String>) {
CLICompiler.doMain(K2JVMCompiler(), args)
}
compiler/cli/src/org/jetbrains/kotlin/cli/jvm/PluginCliParser.kt
+3 -2
View File
@@ -35,7 +35,7 @@ import org.jetbrains.kotlin.compiler.plugin.*
public object PluginCliParser {
@platformStatic
@JvmStatic
fun loadPlugins(arguments: CommonCompilerArguments, configuration: CompilerConfiguration) {
val classLoader = PluginURLClassLoader(
arguments.pluginClasspaths
@@ -103,7 +103,8 @@ public object PluginCliParser {
private class PluginURLClassLoader(urls: Array<URL>, parent: ClassLoader) : ClassLoader(Thread.currentThread().getContextClassLoader()) {
private val childClassLoader: SelfThenParentURLClassLoader = SelfThenParentURLClassLoader(urls, parent)
override synchronized fun loadClass(name: String, resolve: Boolean): Class<*> {
@Synchronized
override fun loadClass(name: String, resolve: Boolean): Class<*> {
return try {
childClassLoader.findClass(name)
}
compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/CliLightClassGenerationSupport.kt
+1 -1
View File
@@ -193,7 +193,7 @@ public class CliLightClassGenerationSupport(project: Project) : LightClassGenera
}
}
public open class CliBindingTrace TestOnly constructor() : BindingTraceContext() {
public open class CliBindingTrace @TestOnly constructor() : BindingTraceContext() {
private var kotlinCodeAnalyzer: KotlinCodeAnalyzer? = null
override fun toString(): String {
compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/KotlinCoreEnvironment.kt
+9 -5
View File
@@ -87,7 +87,6 @@ import org.jetbrains.kotlin.utils.PathUtil
import java.io.File
import java.util.ArrayList
import java.util.Comparator
import kotlin.platform.platformStatic
public class KotlinCoreEnvironment private constructor(
parentDisposable: Disposable,
@@ -250,7 +249,8 @@ public class KotlinCoreEnvironment private constructor(
private var ourApplicationEnvironment: JavaCoreApplicationEnvironment? = null
private var ourProjectCount = 0
platformStatic public fun createForProduction(
@JvmStatic
public fun createForProduction(
parentDisposable: Disposable, configuration: CompilerConfiguration, configFilePaths: List<String>
): KotlinCoreEnvironment {
// JPS may run many instances of the compiler in parallel (there's an option for compiling independent modules in parallel in IntelliJ)
@@ -272,7 +272,9 @@ public class KotlinCoreEnvironment private constructor(
return environment
}
TestOnly platformStatic public fun createForTests(
@TestOnly
@JvmStatic
public fun createForTests(
parentDisposable: Disposable, configuration: CompilerConfiguration, extensionConfigs: List<String>
): KotlinCoreEnvironment {
// Tests are supposed to create a single project and dispose it right after use
@@ -358,7 +360,8 @@ public class KotlinCoreEnvironment private constructor(
}
// made public for Upsource
platformStatic public fun registerApplicationServices(applicationEnvironment: JavaCoreApplicationEnvironment) {
@JvmStatic
public fun registerApplicationServices(applicationEnvironment: JavaCoreApplicationEnvironment) {
with(applicationEnvironment) {
registerFileType(JetFileType.INSTANCE, "kt")
registerFileType(JetFileType.INSTANCE, JetParserDefinition.STD_SCRIPT_SUFFIX)
@@ -374,7 +377,8 @@ public class KotlinCoreEnvironment private constructor(
}
// made public for Upsource
platformStatic public fun registerProjectServices(projectEnvironment: JavaCoreProjectEnvironment) {
@JvmStatic
public fun registerProjectServices(projectEnvironment: JavaCoreProjectEnvironment) {
with (projectEnvironment.getProject()) {
registerService(javaClass<JetScriptDefinitionProvider>(), JetScriptDefinitionProvider())
registerService(javaClass<KotlinJavaPsiFacade>(), KotlinJavaPsiFacade(this))