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

Cleanup in libraries and tools: use property access syntax.

Browse Source
This commit is contained in:
Ilya Gorbunov
2016-01-13 21:00:36 +03:00
parent 19a4f65fd1
commit 57dcbe0aea
22 changed files with 197 additions and 197 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/examples/annotation-processor-example/src/main/kotlin/example/ExampleAnnotationProcessor.kt
+7 -7
View File
@@ -11,7 +11,7 @@ import javax.tools.Diagnostic
public class ExampleAnnotationProcessor : AbstractProcessor() {
private companion object {
val ANNOTATION_FQ_NAME = ExampleAnnotation::class.java.getCanonicalName()
val ANNOTATION_FQ_NAME = ExampleAnnotation::class.java.canonicalName
val SUFFIX_OPTION = "suffix"
val GENERATE_KOTLIN_CODE_OPTION = "generate.kotlin.code"
val KAPT_KOTLIN_GENERATED_OPTION = "kapt.kotlin.generated"
@@ -20,17 +20,17 @@ public class ExampleAnnotationProcessor : AbstractProcessor() {
override fun process(annotations: MutableSet<out TypeElement>?, roundEnv: RoundEnvironment): Boolean {
val elements = roundEnv.getElementsAnnotatedWith(ExampleAnnotation::class.java)
val elementUtils = processingEnv.getElementUtils()
val filer = processingEnv.getFiler()
val elementUtils = processingEnv.elementUtils
val filer = processingEnv.filer
val options = processingEnv.getOptions()
val options = processingEnv.options
val generatedFileSuffix = options[SUFFIX_OPTION] ?: "Generated"
val generateKotlinCode = "true" == options[GENERATE_KOTLIN_CODE_OPTION]
val kotlinGenerated = options[KAPT_KOTLIN_GENERATED_OPTION]
for (element in elements) {
val packageName = elementUtils.getPackageOf(element).getQualifiedName().toString()
val simpleName = element.getSimpleName()
val packageName = elementUtils.getPackageOf(element).qualifiedName.toString()
val simpleName = element.simpleName
val className = simpleName.toString().capitalize() + generatedFileSuffix
filer.createSourceFile(className).openWriter().use { with(it) {
@@ -38,7 +38,7 @@ public class ExampleAnnotationProcessor : AbstractProcessor() {
appendln("public final class $className {}")
}}
if (generateKotlinCode && kotlinGenerated != null && element.getKind() == ElementKind.CLASS) {
if (generateKotlinCode && kotlinGenerated != null && element.kind == ElementKind.CLASS) {
File(kotlinGenerated, "$simpleName.kt").writer().buffered().use {
it.appendln("package $packageName")
it.appendln("fun $simpleName.customToString() = \"$simpleName: \" + toString()")
libraries/examples/browser-example-with-library/src/test/kotlin/sample/SampleTest.kt
+2 -2
View File
@@ -11,11 +11,11 @@ open class SampleTest {
open val driver: WebDriver = HtmlUnitDriver(true)
@test fun homePage(): Unit {
driver.get("file://" + File("sample.html").getCanonicalPath())
driver.get("file://" + File("sample.html").canonicalPath)
Thread.sleep(1000)
val foo = driver.findElement(By.id("foo"))!!
val text = foo.getText() ?: ""
val text = foo.text ?: ""
println("Found $foo with text '$text'")
assertEquals("x=30 y=200 z=100 u=1000", text.trim())
}
libraries/examples/browser-example/src/test/kotlin/sample/SampleTest.kt
+2 -2
View File
@@ -11,11 +11,11 @@ open class SampleTest {
open val driver: WebDriver = HtmlUnitDriver(true)
@test fun homePage(): Unit {
driver.get("file://" + File("sample.html").getCanonicalPath())
driver.get("file://" + File("sample.html").canonicalPath)
Thread.sleep(1000)
val foo = driver.findElement(By.id("foo"))!!
val text = foo.getText() ?: ""
val text = foo.text ?: ""
println("Found $foo with text '$text'")
assertEquals("Some Dynamically Created Content!!!", text.trim())
}