From bea740b478f357facff4656d58983a75543b9fa3 Mon Sep 17 00:00:00 2001 From: Alexander Udalov Date: Tue, 22 Jul 2014 00:35:36 +0400 Subject: [PATCH] Use javaClass instead of getClass() --- .../src/org/jetbrains/jet/lang/psi/DebugTextUtil.kt | 2 +- .../src/org/jetbrains/jet/lang/psi/psiUtil/jetPsiUtil.kt | 4 ++-- .../jetbrains/jet/lang/psi/stubs/impl/JetStubBaseImpl.kt | 2 +- .../src/org/jetbrains/jet/storage/ExceptionTracker.kt | 2 +- .../jetbrains/jet/plugin/formatter/SynteticKotlinBlock.kt | 2 +- .../jet/plugin/libraries/DecompiledTextFactory.kt | 4 ++-- .../MoveKotlinTopLevelDeclarationsProcessor.kt | 4 ++-- .../jet/plugin/libraries/AbstractDecompiledTextTest.kt | 2 +- .../jet/plugin/libraries/InternalCompiledClassesTest.kt | 4 ++-- .../org/jetbrains/k2js/translate/context/UsageTracker.kt | 4 ++-- .../org/jetbrains/kotlin/gradle/plugin/KotlinPlugin.kt | 2 +- .../kotlin/org/jetbrains/kotlin/gradle/tasks/Tasks.kt | 8 ++++---- .../jetbrains/kotlin/gradle/plugin/KotlinPluginWrapper.kt | 6 +++--- 13 files changed, 23 insertions(+), 23 deletions(-) diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/DebugTextUtil.kt b/compiler/frontend/src/org/jetbrains/jet/lang/psi/DebugTextUtil.kt index bdc9bce6946..c261f456ea5 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/DebugTextUtil.kt +++ b/compiler/frontend/src/org/jetbrains/jet/lang/psi/DebugTextUtil.kt @@ -85,7 +85,7 @@ private object DebugTextBuildingVisitor : JetVisitor() { override fun visitJetElement(element: JetElement, data: Unit?): String? { if (element is JetElementImplStub<*>) { - LOG.error("getDebugText() is not defined for ${element.getClass()}") + LOG.error("getDebugText() is not defined for ${element.javaClass}") } return element.getText() } diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/psiUtil/jetPsiUtil.kt b/compiler/frontend/src/org/jetbrains/jet/lang/psi/psiUtil/jetPsiUtil.kt index 7e6e013dddf..cd397741d6a 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/psiUtil/jetPsiUtil.kt +++ b/compiler/frontend/src/org/jetbrains/jet/lang/psi/psiUtil/jetPsiUtil.kt @@ -203,7 +203,7 @@ public fun PsiElement.deleteElementAndCleanParent() { JetPsiUtil.deleteElementWithDelimiters(this) [suppress("UNCHECKED_CAST")] - JetPsiUtil.deleteChildlessElement(parent, this.getClass() as Class) + JetPsiUtil.deleteChildlessElement(parent, this.javaClass as Class) } public fun PsiElement.parameterIndex(): Int { @@ -329,4 +329,4 @@ public fun JetElement.getCalleeExpressionIfAny(): JetExpression? { } } -public fun JetElement.getTextWithLocation(): String = "'${this.getText()}' at ${DiagnosticUtils.atLocation(this)}" \ No newline at end of file +public fun JetElement.getTextWithLocation(): String = "'${this.getText()}' at ${DiagnosticUtils.atLocation(this)}" diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/stubs/impl/JetStubBaseImpl.kt b/compiler/frontend/src/org/jetbrains/jet/lang/psi/stubs/impl/JetStubBaseImpl.kt index cb475769ee3..c9563707f03 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/stubs/impl/JetStubBaseImpl.kt +++ b/compiler/frontend/src/org/jetbrains/jet/lang/psi/stubs/impl/JetStubBaseImpl.kt @@ -30,7 +30,7 @@ import java.util.ArrayList public open class JetStubBaseImpl>(parent: StubElement<*>?, elementType: IStubElementType<*, *>) : StubBase(parent, elementType) { override fun toString(): String { - val stubInterface = this.getClass().getInterfaces().first() + val stubInterface = this.javaClass.getInterfaces().first() val propertiesValues = renderPropertyValues(stubInterface) if (propertiesValues.isEmpty()) { return "" diff --git a/compiler/frontend/src/org/jetbrains/jet/storage/ExceptionTracker.kt b/compiler/frontend/src/org/jetbrains/jet/storage/ExceptionTracker.kt index 0d294e8d21f..9a5e1625c4a 100644 --- a/compiler/frontend/src/org/jetbrains/jet/storage/ExceptionTracker.kt +++ b/compiler/frontend/src/org/jetbrains/jet/storage/ExceptionTracker.kt @@ -37,6 +37,6 @@ public class ExceptionTracker : ModificationTracker, LockBasedStorageManager.Exc } override fun toString(): String { - return getClass().getName() + ": " + getModificationCount() + return javaClass.getName() + ": " + getModificationCount() } } diff --git a/idea/src/org/jetbrains/jet/plugin/formatter/SynteticKotlinBlock.kt b/idea/src/org/jetbrains/jet/plugin/formatter/SynteticKotlinBlock.kt index c4aab565905..ec3b7e78481 100644 --- a/idea/src/org/jetbrains/jet/plugin/formatter/SynteticKotlinBlock.kt +++ b/idea/src/org/jetbrains/jet/plugin/formatter/SynteticKotlinBlock.kt @@ -77,6 +77,6 @@ public class SyntheticKotlinBlock( } } - return getClass().getName() + ": " + textRange + return javaClass.getName() + ": " + textRange } } diff --git a/idea/src/org/jetbrains/jet/plugin/libraries/DecompiledTextFactory.kt b/idea/src/org/jetbrains/jet/plugin/libraries/DecompiledTextFactory.kt index 8fcd2bd06ed..06fc59968e9 100644 --- a/idea/src/org/jetbrains/jet/plugin/libraries/DecompiledTextFactory.kt +++ b/idea/src/org/jetbrains/jet/plugin/libraries/DecompiledTextFactory.kt @@ -88,7 +88,7 @@ private fun buildDecompiledText(packageFqName: FqName, descriptors: List?) { fun moveDeclaration(declaration: JetNamedDeclaration, moveTarget: KotlinMoveTarget): JetNamedDeclaration? { val file = declaration.getContainingFile() as? JetFile - assert (file != null, "${declaration.getClass()}: ${declaration.getText()}") + assert (file != null, "${declaration.javaClass}: ${declaration.getText()}") val targetPsi = moveTarget.getOrCreateTargetPsi(declaration) val targetFile = @@ -238,7 +238,7 @@ public class MoveKotlinTopLevelDeclarationsProcessor(project: Project, val optio } else targetPsi - assert(targetFile is JetFile, "Couldn't create Koltin file for: ${declaration.getClass()}: ${declaration.getText()}") + assert(targetFile is JetFile, "Couldn't create Koltin file for: ${declaration.javaClass}: ${declaration.getText()}") val newPackageFqName = (targetFile as JetFile).getPackageFqName() diff --git a/idea/tests/org/jetbrains/jet/plugin/libraries/AbstractDecompiledTextTest.kt b/idea/tests/org/jetbrains/jet/plugin/libraries/AbstractDecompiledTextTest.kt index 90337f75581..4f032c548eb 100644 --- a/idea/tests/org/jetbrains/jet/plugin/libraries/AbstractDecompiledTextTest.kt +++ b/idea/tests/org/jetbrains/jet/plugin/libraries/AbstractDecompiledTextTest.kt @@ -35,7 +35,7 @@ public abstract class AbstractDecompiledTextTest() : JetLightCodeInsightFixtureT val classFile = NavigateToDecompiledLibraryTest.getClassFile("test", getTestName(false), myModule!!) val clsFileForClassFile = PsiManager.getInstance(getProject()!!).findFile(classFile) assertNotNull(clsFileForClassFile) - assertTrue("Expecting java class file, was: " + clsFileForClassFile!!.getClass(), clsFileForClassFile is ClsFileImpl) + assertTrue("Expecting java class file, was: " + clsFileForClassFile.javaClass, clsFileForClassFile is ClsFileImpl) val decompiledPsiFile = (clsFileForClassFile as ClsFileImpl).getDecompiledPsiFile() assertNotNull(decompiledPsiFile) assertSameLinesWithFile(path.substring(0, path.length - 1) + ".expected.kt", decompiledPsiFile!!.getText()) diff --git a/idea/tests/org/jetbrains/jet/plugin/libraries/InternalCompiledClassesTest.kt b/idea/tests/org/jetbrains/jet/plugin/libraries/InternalCompiledClassesTest.kt index c914c3d90dd..b8655a5ae77 100644 --- a/idea/tests/org/jetbrains/jet/plugin/libraries/InternalCompiledClassesTest.kt +++ b/idea/tests/org/jetbrains/jet/plugin/libraries/InternalCompiledClassesTest.kt @@ -62,11 +62,11 @@ public class InternalCompiledClassesTest : JetLightCodeInsightFixtureTestCase() val psiFile = PsiManager.getInstance(project).findFile(this) Assert.assertTrue("Should not be kotlin file", psiFile !is JetClsFile) - Assert.assertTrue("Should be java file, was ${psiFile!!.getClass().getSimpleName()}", + Assert.assertTrue("Should be java file, was ${psiFile.javaClass.getSimpleName()}", psiFile is ClsFileImpl) val decompiledPsiFile = (psiFile as PsiCompiledFile).getDecompiledPsiFile()!! - Assert.assertTrue("Should be java decompiled file, was ${decompiledPsiFile.getClass().getSimpleName()}", + Assert.assertTrue("Should be java decompiled file, was ${decompiledPsiFile.javaClass.getSimpleName()}", decompiledPsiFile is PsiJavaFile) val classes = (decompiledPsiFile as PsiJavaFile).getClasses() Assert.assertTrue("Should have some decompiled text", diff --git a/js/js.translator/src/org/jetbrains/k2js/translate/context/UsageTracker.kt b/js/js.translator/src/org/jetbrains/k2js/translate/context/UsageTracker.kt index c52fedadadb..fd2e285f126 100644 --- a/js/js.translator/src/org/jetbrains/k2js/translate/context/UsageTracker.kt +++ b/js/js.translator/src/org/jetbrains/k2js/translate/context/UsageTracker.kt @@ -93,7 +93,7 @@ private fun ReceiverParameterDescriptor.getNameForCapturedReceiver(): String { val containingDeclaration = this.getContainingDeclaration() assert(containingDeclaration is MemberDescriptor) { - "Unsupported descriptor type: ${containingDeclaration.getClass()}, " + + "Unsupported descriptor type: ${containingDeclaration.javaClass}, " + "receiverDescriptor = $this, " +"containingDeclaration = $containingDeclaration" } @@ -102,4 +102,4 @@ private fun ReceiverParameterDescriptor.getNameForCapturedReceiver(): String { } return containingDeclaration.getNameForCapturedDescriptor() -} \ No newline at end of file +} diff --git a/libraries/tools/kotlin-gradle-plugin-core/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinPlugin.kt b/libraries/tools/kotlin-gradle-plugin-core/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinPlugin.kt index 7101162b4fb..52fe5c5b0d4 100644 --- a/libraries/tools/kotlin-gradle-plugin-core/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinPlugin.kt +++ b/libraries/tools/kotlin-gradle-plugin-core/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinPlugin.kt @@ -125,7 +125,7 @@ open class KotlinPlugin [Inject] (val scriptHandler: ScriptHandler): Plugin { - val log = Logging.getLogger(getClass()) + val log = Logging.getLogger(this.javaClass) public override fun apply(p0: Project) { diff --git a/libraries/tools/kotlin-gradle-plugin-core/src/main/kotlin/org/jetbrains/kotlin/gradle/tasks/Tasks.kt b/libraries/tools/kotlin-gradle-plugin-core/src/main/kotlin/org/jetbrains/kotlin/gradle/tasks/Tasks.kt index 1ae70b40405..82ec91fc94d 100644 --- a/libraries/tools/kotlin-gradle-plugin-core/src/main/kotlin/org/jetbrains/kotlin/gradle/tasks/Tasks.kt +++ b/libraries/tools/kotlin-gradle-plugin-core/src/main/kotlin/org/jetbrains/kotlin/gradle/tasks/Tasks.kt @@ -35,8 +35,8 @@ public open class KotlinCompile(): AbstractCompile() { val srcDirsRoots = HashSet() val compiler = K2JVMCompiler() - private val _logger = Logging.getLogger(getClass()) - override fun getLogger() = _logger + private val logger = Logging.getLogger(this.javaClass) + override fun getLogger() = logger public var kotlinOptions: K2JVMCompilerArguments = K2JVMCompilerArguments(); @@ -148,8 +148,8 @@ public open class KotlinCompile(): AbstractCompile() { public open class KDoc(): SourceTask() { - private val _logger = Logging.getLogger(getClass()) - override fun getLogger() = _logger + private val logger = Logging.getLogger(this.javaClass) + override fun getLogger() = logger public var kdocArgs: KDocArguments = KDocArguments() diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinPluginWrapper.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinPluginWrapper.kt index a9050a7ca04..a4a07abba03 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinPluginWrapper.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinPluginWrapper.kt @@ -15,7 +15,7 @@ import org.gradle.api.initialization.dsl.ScriptHandler abstract class KotlinBasePluginWrapper: Plugin { - val log = Logging.getLogger(getClass()) + val log = Logging.getLogger(this.javaClass) public override fun apply(project: Project) { val sourceBuildScript = findSourceBuildScript(project); @@ -30,7 +30,7 @@ abstract class KotlinBasePluginWrapper: Plugin { log.debug("Loading version information") val props = Properties() val propFileName = "project.properties" - val inputStream = getClass().getClassLoader()!!.getResourceAsStream(propFileName) + val inputStream = this.javaClass.getClassLoader()!!.getResourceAsStream(propFileName) if (inputStream == null) { throw FileNotFoundException("property file '" + propFileName + "' not found in the classpath") @@ -51,7 +51,7 @@ abstract class KotlinBasePluginWrapper: Plugin { val kotlinPluginDependencies : List = configuration.getResolvedConfiguration().getFiles(KSpec({ dep -> true }))!!.map({(f: File):URL -> f.toURI().toURL() }) log.debug("Resolved files: [" + kotlinPluginDependencies.toString() + "]") log.debug("Load plugin in parent-last URL classloader") - val kotlinPluginClassloader = ParentLastURLClassLoader(kotlinPluginDependencies, getClass().getClassLoader()) + val kotlinPluginClassloader = ParentLastURLClassLoader(kotlinPluginDependencies, this.javaClass.getClassLoader()) log.debug("Class loader created") val cls = Class.forName(getPluginClassName(), true, kotlinPluginClassloader) log.debug("Plugin class loaded")