From d0a8dd7dc8653dcfccb862aa2bf5d692a6f323b3 Mon Sep 17 00:00:00 2001
From: Dmitry Jemerov <yole@jetbrains.com>
Date: Thu, 14 Dec 2017 16:34:10 +0100
Subject: [PATCH] Update EAP channel names in plugin update check dialog

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

diff --git a/idea/src/org/jetbrains/kotlin/idea/actions/ConfigurePluginUpdatesAction.kt b/idea/src/org/jetbrains/kotlin/idea/actions/ConfigurePluginUpdatesAction.kt
index 21509883345..71dfebfc9a6 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_1
 import org.jetbrains.kotlin.idea.actions.ConfigurePluginUpdatesDialog.EAPChannels.EAP_1_2
+import org.jetbrains.kotlin.idea.actions.ConfigurePluginUpdatesDialog.EAPChannels.EAP_1_3
 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_2.indexIfAvailable() ?:
-                                 EAP_1_1.indexIfAvailable() ?: 0
+        initialSelectedChannel = EAP_1_3.indexIfAvailable() ?:
+                                 EAP_1_2.indexIfAvailable() ?: 0
 
         form.channelCombo.selectedIndex = initialSelectedChannel
         init()
@@ -104,7 +104,7 @@ class ConfigurePluginUpdatesDialog(project: Project) : DialogWrapper(project, fa
         val hosts = UpdateSettings.getInstance().storedPluginHosts
         hosts.removeIf { it.startsWith("https://plugins.jetbrains.com/plugins/") && it.endsWith("/6954") }
         when (channel) {
-            EAP_1_1.uiIndex -> hosts.add(EAP_1_1.url)
+            EAP_1_3.uiIndex -> hosts.add(EAP_1_3.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_1("https://plugins.jetbrains.com/plugins/eap-1.1/6954", 1),
-        EAP_1_2("https://plugins.jetbrains.com/plugins/eap-1.2/6954", 2);
+        EAP_1_2("https://plugins.jetbrains.com/plugins/eap-1.2/6954", 1),
+        EAP_1_3("https://plugins.jetbrains.com/plugins/eap-next/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 878f5f4d762..d0316e0783e 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.1.x"/>
-            <item value="Early Access Preview 1.2"/>
+            <item value="Early Access Preview 1.2.x"/>
+            <item value="Early Access Preview 1.3"/>
           </model>
         </properties>
       </component>