Tidy-up

Author: Kevin Ludwig

src/main/kotlin/com/valaphee/blit/CertificateView.kt

@@ -59,15 +59,17 @@ class CertificateView(
 
             chain.forEach {
                 tab(X500Name(it.subjectX500Principal.name).getRDNs(BCStyle.CN)[0].first.value.toString()) {
-                    tableview(listOf<Pair<String, Any>>(
-                        "Version" to it.version,
-                        "Serial number" to it.serialNumber.toString(16),
-                        "Signature algorithm" to it.sigAlgName,
-                        "Issuer" to it.issuerX500Principal,
-                        "Valid from" to it.notBefore,
-                        "Valid to" to it.notAfter,
-                        "Subject" to it.subjectX500Principal
-                    ).toObservable()) {
+                    tableview(
+                        listOf<Pair<String, Any>>(
+                            "Version" to it.version,
+                            "Serial number" to it.serialNumber.toString(16),
+                            "Signature algorithm" to it.sigAlgName,
+                            "Issuer" to it.issuerX500Principal,
+                            "Valid from" to it.notBefore,
+                            "Valid to" to it.notAfter,
+                            "Subject" to it.subjectX500Principal
+                        ).toObservable()
+                    ) {
                         readonlyColumn("Field", Pair<String, Any>::first) { isReorderable = false }
                         readonlyColumn("Value", Pair<String, Any>::second) { isReorderable = false }
 

src/main/kotlin/com/valaphee/blit/Main.kt

@@ -20,8 +20,8 @@ import com.google.inject.AbstractModule
 import com.google.inject.Guice
 import com.google.inject.Provides
 import com.google.inject.Singleton
-import com.valaphee.blit.data.DataModule
 import com.valaphee.blit.config.Config
+import com.valaphee.blit.data.DataModule
 import com.valaphee.blit.locale.Locale
 import de.codecentric.centerdevice.javafxsvg.SvgImageLoaderFactory
 import javafx.scene.image.Image

src/main/kotlin/com/valaphee/blit/MainView.kt

@@ -374,7 +374,8 @@ class MainView : View("Blit") {
                         val file = File(_config.temporaryPath, entry.name).apply { FileOutputStream(this).use { entry.transferTo(it) } }
                         try {
                             Desktop.getDesktop().open(file)
-                        } catch (_: IOException) {}
+                        } catch (_: IOException) {
+                        }
                     }
                 }
             }

src/main/kotlin/com/valaphee/blit/source/dav/DavSourceConfig.kt

@@ -17,8 +17,8 @@
 package com.valaphee.blit.source.dav
 
 import com.fasterxml.jackson.annotation.JsonTypeName
-import com.valaphee.blit.util.LongStringConverter
 import com.valaphee.blit.source.SourceConfig
+import com.valaphee.blit.util.LongStringConverter
 import javafx.beans.property.SimpleBooleanProperty
 import javafx.beans.property.SimpleLongProperty
 import javafx.beans.property.SimpleStringProperty

src/main/kotlin/com/valaphee/blit/source/ftp/FtpSource.kt

@@ -52,14 +52,15 @@ class FtpSource(
         }
     }
 
-    override val home: String get() = runBlocking {
-        semaphore.withPermit {
-            pool.useInstance {
-                it.pwd()
-                it.replyString
+    override val home: String
+        get() = runBlocking {
+            semaphore.withPermit {
+                pool.useInstance {
+                    it.pwd()
+                    it.replyString
+                }
             }
         }
-    }
 
     override suspend fun get(path: String) = semaphore.withPermit { pool.useInstance { FtpEntry(this, path, FTPFile()) } }
 

src/main/kotlin/com/valaphee/blit/source/ftp/FtpSourceConfig.kt

@@ -17,8 +17,8 @@
 package com.valaphee.blit.source.ftp
 
 import com.fasterxml.jackson.annotation.JsonTypeName
-import com.valaphee.blit.util.IntStringConverter
 import com.valaphee.blit.source.SourceConfig
+import com.valaphee.blit.util.IntStringConverter
 import javafx.beans.property.SimpleIntegerProperty
 import javafx.beans.property.SimpleStringProperty
 import javafx.event.EventTarget

src/main/kotlin/com/valaphee/blit/source/sftp/SftpSourceConfig.kt

@@ -17,8 +17,8 @@
 package com.valaphee.blit.source.sftp
 
 import com.fasterxml.jackson.annotation.JsonTypeName
-import com.valaphee.blit.util.IntStringConverter
 import com.valaphee.blit.source.SourceConfig
+import com.valaphee.blit.util.IntStringConverter
 import javafx.beans.property.SimpleIntegerProperty
 import javafx.beans.property.SimpleStringProperty
 import javafx.event.EventTarget

src/main/kotlin/com/valaphee/blit/util/IntStringConverter.kt

@@ -24,5 +24,5 @@ import javafx.util.StringConverter
 object IntStringConverter : StringConverter<Number>() {
     override fun toString(`object`: Number?) = `object`?.toString() ?: ""
 
-    override fun fromString(string: String?) =  string?.toIntOrNull()
+    override fun fromString(string: String?) = string?.toIntOrNull()
 }

src/main/kotlin/com/valaphee/blit/util/LongStringConverter.kt

@@ -24,5 +24,5 @@ import javafx.util.StringConverter
 object LongStringConverter : StringConverter<Number>() {
     override fun toString(`object`: Number?) = `object`?.toString() ?: ""
 
-    override fun fromString(string: String?) =  string?.toLongOrNull()
+    override fun fromString(string: String?) = string?.toLongOrNull()
 }