From 268f7b715c4153f8b2ee53e15aaa4e87b67451fd Mon Sep 17 00:00:00 2001
From: Dmitry Jemerov <yole@jetbrains.com>
Date: Mon, 6 Mar 2017 10:28:33 +0100
Subject: [PATCH] "Configure Kotlin plugin updates" shows 1.2 and doesn't show
 1.0.x

---
 .../idea/actions/ConfigurePluginUpdatesAction.kt   | 14 +++++++-------
 .../idea/actions/ConfigurePluginUpdatesForm.form   |  4 ++--
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/idea/src/org/jetbrains/kotlin/idea/actions/ConfigurePluginUpdatesAction.kt b/idea/src/org/jetbrains/kotlin/idea/actions/ConfigurePluginUpdatesAction.kt
index a7ae96e7d8a..21509883345 100644
--- a/idea/src/org/jetbrains/kotlin/idea/actions/ConfigurePluginUpdatesAction.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/actions/ConfigurePluginUpdatesAction.kt
@@ -24,8 +24,8 @@ import com.intellij.openapi.updateSettings.impl.UpdateSettings
 import org.jetbrains.kotlin.idea.KotlinPluginUpdater
 import org.jetbrains.kotlin.idea.KotlinPluginUtil
 import org.jetbrains.kotlin.idea.PluginUpdateStatus
-import org.jetbrains.kotlin.idea.actions.ConfigurePluginUpdatesDialog.EAPChannels.EAP_1_0
 import org.jetbrains.kotlin.idea.actions.ConfigurePluginUpdatesDialog.EAPChannels.EAP_1_1
+import org.jetbrains.kotlin.idea.actions.ConfigurePluginUpdatesDialog.EAPChannels.EAP_1_2
 import javax.swing.JComponent
 
 class ConfigurePluginUpdatesAction : DumbAwareAction() {
@@ -82,8 +82,8 @@ class ConfigurePluginUpdatesDialog(project: Project) : DialogWrapper(project, fa
         }
 
         fun EAPChannels.indexIfAvailable() = if (hasChannel) uiIndex else null
-        initialSelectedChannel = EAP_1_1.indexIfAvailable() ?:
-                                 EAP_1_0.indexIfAvailable() ?: 0
+        initialSelectedChannel = EAP_1_2.indexIfAvailable() ?:
+                                 EAP_1_1.indexIfAvailable() ?: 0
 
         form.channelCombo.selectedIndex = initialSelectedChannel
         init()
@@ -102,10 +102,10 @@ class ConfigurePluginUpdatesDialog(project: Project) : DialogWrapper(project, fa
 
     private fun saveSelectedChannel(channel: Int) {
         val hosts = UpdateSettings.getInstance().storedPluginHosts
-        EAPChannels.values().forEach { hosts.remove(it.url) }
+        hosts.removeIf { it.startsWith("https://plugins.jetbrains.com/plugins/") && it.endsWith("/6954") }
         when (channel) {
-            EAP_1_0.uiIndex -> hosts.add(EAP_1_0.url)
             EAP_1_1.uiIndex -> hosts.add(EAP_1_1.url)
+            EAP_1_2.uiIndex -> hosts.add(EAP_1_2.url)
         }
     }
 
@@ -120,8 +120,8 @@ class ConfigurePluginUpdatesDialog(project: Project) : DialogWrapper(project, fa
     }
 
     enum class EAPChannels(val url: String, val uiIndex: Int) {
-        EAP_1_0("https://plugins.jetbrains.com/plugins/eap/6954", 1),
-        EAP_1_1("https://plugins.jetbrains.com/plugins/eap-1.1/6954", 2);
+        EAP_1_1("https://plugins.jetbrains.com/plugins/eap-1.1/6954", 1),
+        EAP_1_2("https://plugins.jetbrains.com/plugins/eap-1.2/6954", 2);
 
         val hasChannel: Boolean get() = url in UpdateSettings.getInstance().pluginHosts
     }
diff --git a/idea/src/org/jetbrains/kotlin/idea/actions/ConfigurePluginUpdatesForm.form b/idea/src/org/jetbrains/kotlin/idea/actions/ConfigurePluginUpdatesForm.form
index a6d41c5bdac..878f5f4d762 100644
--- a/idea/src/org/jetbrains/kotlin/idea/actions/ConfigurePluginUpdatesForm.form
+++ b/idea/src/org/jetbrains/kotlin/idea/actions/ConfigurePluginUpdatesForm.form
@@ -28,8 +28,8 @@
         <properties>
           <model>
             <item value="Stable"/>
-            <item value="Early Access Preview 1.0.x"/>
-            <item value="Early Access Preview 1.1"/>
+            <item value="Early Access Preview 1.1.x"/>
+            <item value="Early Access Preview 1.2"/>
           </model>
         </properties>
       </component>