Add nightly channel to the channels dialog

Fix update dialog never returning results on update check

Author: DenWav

readme.md

@@ -6,6 +6,7 @@ Minecraft Development for IntelliJ
 |  Service   |Status|
 |------------|------|
 |**TeamCity**|[![TeamCity Build Status](https://img.shields.io/teamcity/http/ci.demonwav.com/s/MinecraftDev_Build.svg?style=flat-square)](https://ci.demonwav.com/viewType.html?buildTypeId=MinecraftDev_Build)|
+|**Nightly**|[![TeamCity Build Status](https://img.shields.io/teamcity/http/ci.demonwav.com/s/MinecraftDev_Nightly.svg?style=flat-square)](https://ci.demonwav.com/viewType.html?buildTypeId=MinecraftDev_Nightly)|
 |**CircleCI**|[![Travis Build Status](https://img.shields.io/circleci/project/github/minecraft-dev/MinecraftDev/2017.1.svg?style=flat-square)](https://circleci.com/gh/minecraft-dev/MinecraftDev)|
 |**Travis**  |[![CircleCI Build Status](https://img.shields.io/travis/minecraft-dev/MinecraftDev/2017.1.svg?style=flat-square)](https://travis-ci.org/minecraft-dev/MinecraftDev/)|
 

src/main/kotlin/com/demonwav/mcdev/update/Channels.kt

@@ -12,15 +12,10 @@ package com.demonwav.mcdev.update
 
 import com.intellij.openapi.updateSettings.impl.UpdateSettings
 
-enum class Channels(val title: String, val url: String, val index: Int) {
-    ;
+enum class Channels(val title: String, val url: String) {
+    NIGHTLY("Nightly", "https://plugins.jetbrains.com/plugins/Nightly/8327");
 
     fun hasChannel(): Boolean {
         return UpdateSettings.getInstance().pluginHosts.contains(url)
     }
-
-    companion object {
-        fun getChannel(index: Int) = values().firstOrNull { it.index == index }
-        fun orderedList() = listOf<Channels>()
-    }
 }

src/main/kotlin/com/demonwav/mcdev/update/ConfigurePluginUpdatesDialog.kt

@@ -27,7 +27,7 @@ class ConfigurePluginUpdatesDialog : DialogWrapper(true) {
         form.updateCheckInProgressIcon.setPaintPassiveIcon(false)
 
         form.channelBox.addItem("Stable")
-        for (channels in Channels.orderedList()) {
+        for (channels in Channels.values()) {
             form.channelBox.addItem(channels.title)
         }
 
@@ -67,31 +67,29 @@ class ConfigurePluginUpdatesDialog : DialogWrapper(true) {
 
         form.channelBox.addActionListener { resetUpdateStatus() }
 
-        for (channels in Channels.values()) {
-            if (channels.hasChannel()) {
-                initialSelectedChannel = channels.index
-                break
+        Channels.values().forEachIndexed { i, channel ->
+            if (channel.hasChannel()) {
+                initialSelectedChannel = i + 1
+                return@forEachIndexed
             }
         }
 
         form.channelBox.selectedIndex = initialSelectedChannel
         init()
     }
 
-    override fun createCenterPanel(): JComponent? {
-        return form.panel
-    }
+    override fun createCenterPanel() = form.panel
 
-    private fun saveSelectedChannel(channel: Int) {
+    private fun saveSelectedChannel(index: Int) {
         val hosts = UpdateSettings.getInstance().storedPluginHosts
-        for (channels in Channels.values()) {
-            hosts.remove(channels.url)
+        for (channel in Channels.values()) {
+            hosts.remove(channel.url)
         }
 
-        val channels = Channels.getChannel(channel) ?: // This really shouldn't happen
-            return
-
-        hosts.add(channels.url)
+        if (index != 0) {
+            val channel = Channels.values()[index - 1]
+            hosts.add(channel.url)
+        }
     }
 
     private fun saveSettings() {

src/main/kotlin/com/demonwav/mcdev/update/PluginUpdater.kt

@@ -11,7 +11,7 @@
 package com.demonwav.mcdev.update
 
 import com.demonwav.mcdev.util.forEachNotNull
-import com.demonwav.mcdev.util.invokeLater
+import com.demonwav.mcdev.util.invokeLaterAny
 import com.intellij.ide.plugins.IdeaPluginDescriptor
 import com.intellij.ide.plugins.PluginManager
 import com.intellij.ide.plugins.PluginManagerMain
@@ -47,11 +47,10 @@ object PluginUpdater {
                 .forEachNotNull { updateStatus = updateStatus.mergeWith(checkUpdatesInCustomRepo(it)) }
 
             val finalUpdate = updateStatus
-            invokeLater { callback(finalUpdate) }
+            invokeLaterAny { callback(finalUpdate) }
         } catch (e: Exception) {
             PluginUpdateStatus.CheckFailed("Minecraft Development plugin update check failed")
         }
-
     }
 
     private fun checkUpdatesInMainRepo(): PluginUpdateStatus {

src/main/kotlin/com/demonwav/mcdev/util/Util.kt

@@ -59,6 +59,14 @@ inline fun invokeLater(crossinline func: () -> Unit) {
     }
 }
 
+inline fun invokeLaterAny(crossinline func: () -> Unit) {
+    if (ApplicationManager.getApplication().isDispatchThread) {
+        func()
+    } else {
+        ApplicationManager.getApplication().invokeLater({ func() }, ModalityState.any())
+    }
+}
+
 /**
  * Returns an untyped array for the specified [Collection].
  */