azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update EAP channel names in plugin update check dialog

Browse Source
This commit is contained in:
Dmitry Jemerov
2017-12-14 16:34:10 +01:00
parent 3e2003e60d
commit d0a8dd7dc8
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/kotlin/idea/actions/ConfigurePluginUpdatesAction.kt
+6 -6
View File
@@ -24,8 +24,8 @@ import com.intellij.openapi.updateSettings.impl.UpdateSettings
import org.jetbrains.kotlin.idea.KotlinPluginUpdater import org.jetbrains.kotlin.idea.KotlinPluginUpdater
import org.jetbrains.kotlin.idea.KotlinPluginUtil import org.jetbrains.kotlin.idea.KotlinPluginUtil
import org.jetbrains.kotlin.idea.PluginUpdateStatus 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_2
import org.jetbrains.kotlin.idea.actions.ConfigurePluginUpdatesDialog.EAPChannels.EAP_1_3
import javax.swing.JComponent import javax.swing.JComponent
class ConfigurePluginUpdatesAction : DumbAwareAction() { class ConfigurePluginUpdatesAction : DumbAwareAction() {
@@ -82,8 +82,8 @@ class ConfigurePluginUpdatesDialog(project: Project) : DialogWrapper(project, fa
} }
fun EAPChannels.indexIfAvailable() = if (hasChannel) uiIndex else null fun EAPChannels.indexIfAvailable() = if (hasChannel) uiIndex else null
initialSelectedChannel = EAP_1_2.indexIfAvailable() ?: initialSelectedChannel = EAP_1_3.indexIfAvailable() ?:
EAP_1_1.indexIfAvailable() ?: 0 EAP_1_2.indexIfAvailable() ?: 0
form.channelCombo.selectedIndex = initialSelectedChannel form.channelCombo.selectedIndex = initialSelectedChannel
init() init()
@@ -104,7 +104,7 @@ class ConfigurePluginUpdatesDialog(project: Project) : DialogWrapper(project, fa
val hosts = UpdateSettings.getInstance().storedPluginHosts val hosts = UpdateSettings.getInstance().storedPluginHosts
hosts.removeIf { it.startsWith("https://plugins.jetbrains.com/plugins/") && it.endsWith("/6954") } hosts.removeIf { it.startsWith("https://plugins.jetbrains.com/plugins/") && it.endsWith("/6954") }
when (channel) { 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) 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) { 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", 1),
EAP_1_2("https://plugins.jetbrains.com/plugins/eap-1.2/6954", 2); EAP_1_3("https://plugins.jetbrains.com/plugins/eap-next/6954", 2);
val hasChannel: Boolean get() = url in UpdateSettings.getInstance().pluginHosts val hasChannel: Boolean get() = url in UpdateSettings.getInstance().pluginHosts
} }
idea/src/org/jetbrains/kotlin/idea/actions/ConfigurePluginUpdatesForm.form
+2 -2
View File
@@ -28,8 +28,8 @@
<properties> <properties>
<model> <model>
<item value="Stable"/> <item value="Stable"/>
<item value="Early Access Preview 1.1.x"/> <item value="Early Access Preview 1.2.x"/>
<item value="Early Access Preview 1.2"/> <item value="Early Access Preview 1.3"/>
</model> </model>
</properties> </properties>
</component> </component>