Kotlin String cleaups

Signed-off-by: Jadon Fowler <[email protected]>
phase · Jul 3, 2018 · f4b3b2a · f4b3b2a
1 parent 171929d
commit f4b3b2a
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 165 deletions.
diff --git a/src/main/kotlin/io/jadon/sbhs/PaletteManager.kt b/src/main/kotlin/io/jadon/sbhs/PaletteManager.kt
@@ -99,7 +99,7 @@ object PaletteManager {
         }
         val upload = JButton("  Upload Palette")
         upload.addActionListener {
-            println("Uploading palette " + name)
+            println("Uploading palette $name")
             val fc = JFileChooser()
             if (fc.showOpenDialog(SBHS.frame) == JFileChooser.APPROVE_OPTION) {
                 try {
@@ -137,7 +137,7 @@ object PaletteManager {
         jp.add(upload)
         val save = JButton("  Save Palette")
         save.addActionListener {
-            println("Saving palette " + name)
+            println("Saving palette $name")
             //Create Image
             val img = BufferedImage(16, 1, BufferedImage.TYPE_INT_RGB)
             for (x in 0..15) {

diff --git a/src/main/kotlin/io/jadon/sbhs/SBHS.kt b/src/main/kotlin/io/jadon/sbhs/SBHS.kt
@@ -21,7 +21,7 @@ object SBHS {
     val WIDTH = 1280
     val HEIGHT = 840
 
-    var frame: JFrame = JFrame("Sonic Battle Hack Suite ${VERSION} - By Phase")
+    var frame: JFrame = JFrame("Sonic Battle Hack Suite $VERSION - By Phase")
     lateinit var spriteTabs: JTabbedPane
 
     fun getImage(name: String): Image = ImageIcon(SBHS::class.java.getResource("/$name")
@@ -140,9 +140,9 @@ object SBHS {
             splash.message = "About Page"
             // About Page
             val t = JTextPane()
-            t.text = "Sonic Battle Hack Suite ${VERSION} was made by Phase.\n" +
+            t.text = "Sonic Battle Hack Suite $VERSION was made by Phase.\n" +
                     "You can find the source at https://github.com/phase/sbhs\n" +
-                    "Current ROM open: ${gameLocation}\n\n" +
+                    "Current ROM open: $gameLocation\n\n" +
                     "Build Info:\n" +
                     "JVM: ${BuildInfo.JVM_INFO}\n" +
                     "Gradle: ${BuildInfo.GRADLE_INFO}\n"

diff --git a/src/main/kotlin/io/jadon/sbhs/test/Grid.java b/src/main/kotlin/io/jadon/sbhs/test/Grid.java
diff --git a/src/main/kotlin/io/jadon/sbhs/test/ScrollImageTest.java b/src/main/kotlin/io/jadon/sbhs/test/ScrollImageTest.java