Minor cleanup everywhere (#303)

- Fixed wrong package declaration
- Replaced some long if-else chains with when
- Removed explicit String.trim() predicate (probably from Java->Kotlin conv.)
- Moved some assignments / return statements outside of if/try blocks
- Other minor cleanup to use more Kotlin features

Author: stephan-gh

src/main/kotlin/com/demonwav/mcdev/buildsystem/BuildSystem.kt

@@ -57,8 +57,8 @@ abstract class BuildSystem {
      * ProjectConfiguration are provided here as well.
 
      * @param project The project
-     * *
-     * @param configurations The configuration objects for the project
+     * @param configuration The configuration object for the project
+     * @param indicator The progress indicator
      */
     abstract fun create(project: Project, configuration: ProjectConfiguration, indicator: ProgressIndicator)
 
@@ -71,9 +71,9 @@ abstract class BuildSystem {
      * It is legal for this method to have different default setups for each platform type, so the PlatformType and
      * ProjectConfiguration are provided here as well.
 
-     * @param module the module
-     * *
+     * @param rootModule the root module
      * @param configurations The configuration object for the project
+     * @param indicator The progress indicator
      */
     abstract fun finishSetup(rootModule: Module, configurations: Collection<ProjectConfiguration>, indicator: ProgressIndicator)
 

src/main/kotlin/com/demonwav/mcdev/buildsystem/maven/MavenBuildSystem.kt

@@ -80,7 +80,7 @@ class MavenBuildSystem : BuildSystem() {
                         root.addAfter(url, properties)
                     }
 
-                    if (!configuration.description.isNullOrEmpty()) {
+                    if (configuration.description.isNotEmpty()) {
                         val description = root.createChildTag("description", null, configuration.description, false)
                         root.addBefore(description, properties)
                     }

src/main/kotlin/com/demonwav/mcdev/creator/BuildSystemWizardStep.kt

@@ -72,10 +72,10 @@ class BuildSystemWizardStep(private val creator: MinecraftProjectCreator) : Modu
     }
 
     private fun createBuildSystem(): BuildSystem {
-        if (buildSystemBox.selectedIndex == 0) {
-            return MavenBuildSystem()
+        return if (buildSystemBox.selectedIndex == 0) {
+            MavenBuildSystem()
         } else {
-            return GradleBuildSystem()
+            GradleBuildSystem()
         }
     }
 
@@ -89,7 +89,7 @@ class BuildSystemWizardStep(private val creator: MinecraftProjectCreator) : Modu
                 throw EmptyFieldSetupException(artifactIdField)
             }
 
-            if (versionField.text.trim { it <= ' ' }.isEmpty()) {
+            if (versionField.text.isBlank()) {
                 throw EmptyFieldSetupException(versionField)
             }
 

src/main/kotlin/com/demonwav/mcdev/creator/ForgeProjectSettingsWizard.kt

@@ -154,10 +154,10 @@ class ForgeProjectSettingsWizard(private val creator: MinecraftProjectCreator) :
 
     private val version: String?
         get() {
-            if (isSpongeForge == true || (isSpongeForge == null && settings is SpongeForgeProjectConfiguration)) {
-                return spongeVersion?.let { it.versions[minecraftVersionBox.selectedItem as? String] }
+            return if (isSpongeForge == true || (isSpongeForge == null && settings is SpongeForgeProjectConfiguration)) {
+                spongeVersion?.let { it.versions[minecraftVersionBox.selectedItem as? String] }
             } else {
-                return minecraftVersionBox.selectedItem as? String
+                minecraftVersionBox.selectedItem as? String
             }
         }
 

src/main/kotlin/com/demonwav/mcdev/creator/LiteLoaderProjectSettingsWizard.kt

@@ -152,15 +152,15 @@ class LiteLoaderProjectSettingsWizard(private val creator: MinecraftProjectCreat
 
     override fun validate(): Boolean {
         try {
-            if (modNameField.text.trim { it <= ' ' }.isEmpty()) {
+            if (modNameField.text.isBlank()) {
                 throw EmptyInputSetupException(modNameField)
             }
 
-            if (modVersionField.text.trim { it <= ' ' }.isEmpty()) {
+            if (modVersionField.text.isBlank()) {
                 throw EmptyInputSetupException(modVersionField)
             }
 
-            if (mainClassField.text.trim { it <= ' ' }.isEmpty()) {
+            if (mainClassField.text.isBlank()) {
                 throw EmptyInputSetupException(mainClassField)
             }
         } catch (e: SetupException) {

src/main/kotlin/com/demonwav/mcdev/creator/MinecraftModuleWizardStep.kt

@@ -30,16 +30,16 @@ abstract class MinecraftModuleWizardStep : ModuleWizardStep() {
                            dependField: JTextField,
                            pattern: Regex): Boolean {
         try {
-            if (pluginNameField.text.trim { it <= ' ' }.isEmpty()) {
+            if (pluginNameField.text.isBlank()) {
                 throw EmptyInputSetupException(pluginNameField)
             }
 
-            if (pluginVersionField.text.trim { it <= ' ' }.isEmpty()) {
+            if (pluginVersionField.text.isBlank()) {
                 throw EmptyInputSetupException(pluginVersionField)
             }
 
             // empty
-            if (mainClassField.text.trim { it <= ' ' }.isEmpty()) {
+            if (mainClassField.text.isBlank()) {
                 throw EmptyInputSetupException(mainClassField)
             }
             // default package

src/main/kotlin/com/demonwav/mcdev/error/AnonymousFeedback.kt

@@ -159,7 +159,7 @@ object AnonymousFeedback {
 
             data = connection.inputStream.reader().use(InputStreamReader::readCharSequence).toString()
 
-            response = gson.fromJson<List<Map<*, *>>>(data)
+            response = gson.fromJson(data)
             list.addAll(response)
 
             link = connection.getHeaderField("Link")

src/main/kotlin/com/demonwav/mcdev/facet/MinecraftFacet.kt

@@ -140,7 +140,7 @@ class MinecraftFacet(module: Module, name: String, configuration: MinecraftFacet
     fun isEventClassValid(eventClass: PsiClass, method: PsiMethod): Boolean {
         return doIfGood(method) {
             it.isEventClassValid(eventClass, method)
-        } ?: false
+        } == true
     }
 
     @Contract(pure = true)
@@ -154,14 +154,14 @@ class MinecraftFacet(module: Module, name: String, configuration: MinecraftFacet
     fun isStaticListenerSupported(method: PsiMethod): Boolean {
         return doIfGood(method) {
             it.isStaticListenerSupported(method)
-        } ?: false
+        } == true
     }
 
     @Contract(pure = true)
     fun suppressStaticListener(method: PsiMethod): Boolean {
         return doIfGood(method) {
             !it.isStaticListenerSupported(method)
-        } ?: false
+        } == true
     }
 
     private inline fun <T> doIfGood(method: PsiMethod, action: (AbstractModule) -> T): T? {

src/main/kotlin/com/demonwav/mcdev/facet/MinecraftFacetConfiguration.kt

@@ -10,7 +10,6 @@
 
 package com.demonwav.mcdev.facet
 
-import com.demonwav.mcdev.platform.MinecraftFacetEditorTab
 import com.demonwav.mcdev.platform.PlatformType
 import com.intellij.facet.FacetConfiguration
 import com.intellij.facet.ui.FacetEditorContext

src/main/kotlin/com/demonwav/mcdev/facet/MinecraftFacetEditorTab.form

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<form xmlns="http://www.intellij.com/uidesigner/form/" version="1" bind-to-class="com.demonwav.mcdev.platform.MinecraftFacetEditorTab">
+<form xmlns="http://www.intellij.com/uidesigner/form/" version="1" bind-to-class="com.demonwav.mcdev.facet.MinecraftFacetEditorTab">
   <grid id="27dc6" binding="panel" layout-manager="GridLayoutManager" row-count="14" column-count="5" same-size-horizontally="false" same-size-vertically="false" hgap="10" vgap="10">
     <margin top="10" left="10" bottom="10" right="10"/>
     <constraints>