plugins: cleanup 'public', property access syntax

plugins/annotation-collector/src/org/jetbrains/kotlin/annotation/AnnotationCollectorExtension.kt

@@ -34,7 +34,7 @@ import java.util.regex.Pattern
 import java.util.regex.PatternSyntaxException
 import kotlin.properties.Delegates
 
-public abstract class AnnotationCollectorExtensionBase(val supportInheritedAnnotations: Boolean) : ClassBuilderInterceptorExtension {
+abstract class AnnotationCollectorExtensionBase(val supportInheritedAnnotations: Boolean) : ClassBuilderInterceptorExtension {
 
     private object RecordTypes {
         val ANNOTATED_CLASS = "c"
@@ -180,7 +180,7 @@ public abstract class AnnotationCollectorExtensionBase(val supportInheritedAnnot
         }
 
         private fun recordAnnotation(name: String?, type: String, annotationDesc: String) {
-            val annotationFqName = Type.getType(annotationDesc).getClassName()
+            val annotationFqName = Type.getType(annotationDesc).className
             if (!isAnnotationHandled(annotationFqName)) return
 
             try {
@@ -231,7 +231,7 @@ public abstract class AnnotationCollectorExtensionBase(val supportInheritedAnnot
     }
 }
 
-public class AnnotationCollectorExtension(
+class AnnotationCollectorExtension(
         override val annotationFilterList: List<String>? = null,
         val outputFilename: String? = null,
         supportInheritedAnnotations: Boolean
@@ -246,7 +246,7 @@ public class AnnotationCollectorExtension(
     override fun getWriter(diagnostic: DiagnosticSink): Writer {
         return writerInternal ?: try {
             with (File(outputFilename)) {
-                val parent = getParentFile()
+                val parent = parentFile
                 if (!parent.exists()) parent.mkdirs()
                 writerInternal = bufferedWriter()
                 writerInternal!!

plugins/annotation-collector/src/org/jetbrains/kotlin/annotation/AnnotationCollectorPlugin.kt

@@ -44,31 +44,31 @@ import java.io.Writer
 import java.util.regex.Pattern
 import java.util.regex.PatternSyntaxException
 
-public object AnnotationCollectorConfigurationKeys {
-    public val ANNOTATION_FILTER_LIST: CompilerConfigurationKey<List<String>> =
+object AnnotationCollectorConfigurationKeys {
+    val ANNOTATION_FILTER_LIST: CompilerConfigurationKey<List<String>> =
             CompilerConfigurationKey.create<List<String>>("annotation filter regular expressions")
-    public val OUTPUT_FILENAME: CompilerConfigurationKey<String> =
+    val OUTPUT_FILENAME: CompilerConfigurationKey<String> =
             CompilerConfigurationKey.create<String>("annotation file name")
-    public val STUBS_PATH: CompilerConfigurationKey<String> =
+    val STUBS_PATH: CompilerConfigurationKey<String> =
             CompilerConfigurationKey.create<String>("stubs output directory")
-    public val INHERITED: CompilerConfigurationKey<String> =
+    val INHERITED: CompilerConfigurationKey<String> =
             CompilerConfigurationKey.create<String>("support inherited annotations")
 }
 
-public class AnnotationCollectorCommandLineProcessor : CommandLineProcessor {
+class AnnotationCollectorCommandLineProcessor : CommandLineProcessor {
     companion object {
-        public val ANNOTATION_COLLECTOR_COMPILER_PLUGIN_ID: String = "org.jetbrains.kotlin.kapt"
+        val ANNOTATION_COLLECTOR_COMPILER_PLUGIN_ID: String = "org.jetbrains.kotlin.kapt"
 
-        public val ANNOTATION_FILTER_LIST_OPTION: CliOption =
+        val ANNOTATION_FILTER_LIST_OPTION: CliOption =
                 CliOption("annotations", "<path>", "Annotation filter regular expressions, separated by commas", required = false)
 
-        public val OUTPUT_FILENAME_OPTION: CliOption =
+        val OUTPUT_FILENAME_OPTION: CliOption =
                 CliOption("output", "<path>", "File in which annotated declarations will be placed", required = false)
 
-        public val STUBS_PATH_OPTION: CliOption =
+        val STUBS_PATH_OPTION: CliOption =
                 CliOption("stubs", "<path>", "Output path for stubs", required = false)
 
-        public val INHERITED_ANNOTATIONS_OPTION: CliOption =
+        val INHERITED_ANNOTATIONS_OPTION: CliOption =
                 CliOption("inherited", "<true/false>",
                           "True if collecting Kotlin class names for inherited annotations is needed", required = false)
     }
@@ -92,8 +92,8 @@ public class AnnotationCollectorCommandLineProcessor : CommandLineProcessor {
     }
 }
 
-public class AnnotationCollectorComponentRegistrar : ComponentRegistrar {
-    public override fun registerProjectComponents(project: MockProject, configuration: CompilerConfiguration) {
+class AnnotationCollectorComponentRegistrar : ComponentRegistrar {
+    override fun registerProjectComponents(project: MockProject, configuration: CompilerConfiguration) {
         val supportInheritedAnnotations = "true" == (configuration.get(AnnotationCollectorConfigurationKeys.INHERITED) ?: "true")
 
         val annotationFilterList = configuration.get(AnnotationCollectorConfigurationKeys.ANNOTATION_FILTER_LIST)

plugins/annotation-collector/src/org/jetbrains/kotlin/annotation/StubProducerExtension.kt

@@ -30,7 +30,7 @@ import org.jetbrains.kotlin.resolve.jvm.extensions.AnalysisCompletedHandlerExten
 import org.jetbrains.org.objectweb.asm.ClassWriter
 import java.io.File
 
-public class StubProducerExtension(val stubsOutputDir: File) : AnalysisCompletedHandlerExtension {
+class StubProducerExtension(val stubsOutputDir: File) : AnalysisCompletedHandlerExtension {
 
     override fun analysisCompleted(
             project: Project,
@@ -67,7 +67,7 @@ private class StubClassBuilderFactory : ClassBuilderFactory {
     override fun asText(builder: ClassBuilder) = throw UnsupportedOperationException("BINARIES generator asked for text")
 
     override fun asBytes(builder: ClassBuilder): ByteArray {
-        val visitor = builder.getVisitor() as ClassWriter
+        val visitor = builder.visitor as ClassWriter
         return visitor.toByteArray()
     }
 

plugins/annotation-collector/test/org/jetbrains/kotlin/annotation/AbstractAnnotationProcessorBoxTest.kt

@@ -32,9 +32,9 @@ import java.io.StringWriter
 import java.io.Writer
 import org.junit.Assert.*
 
-public abstract class AbstractAnnotationProcessorBoxTest : CodegenTestCase() {
+abstract class AbstractAnnotationProcessorBoxTest : CodegenTestCase() {
 
-    public fun doTest(path: String) {
+    fun doTest(path: String) {
         val testName = getTestName(true)
         val fileName = path + testName + ".kt"
         val supportInheritedAnnotations = testName.startsWith("inherited")
@@ -55,7 +55,7 @@ public abstract class AbstractAnnotationProcessorBoxTest : CodegenTestCase() {
 
     private fun createTestEnvironment(supportInheritedAnnotations: Boolean): AnnotationCollectorExtensionForTests {
         val configuration = KotlinTestUtils.compilerConfigurationForTests(ConfigurationKind.ALL, TestJdkKind.MOCK_JDK)
-        val environment = KotlinCoreEnvironment.createForTests(getTestRootDisposable()!!, configuration, EnvironmentConfigFiles.JVM_CONFIG_FILES)
+        val environment = KotlinCoreEnvironment.createForTests(testRootDisposable!!, configuration, EnvironmentConfigFiles.JVM_CONFIG_FILES)
         val project = environment.project
 
         val collectorExtension = AnnotationCollectorExtensionForTests(supportInheritedAnnotations)