From 8389f3ef1609098fdf54a9d3bee331f9a7e76b5d Mon Sep 17 00:00:00 2001
From: Aleksandr Krasilnikov <aleksandr.krasilnikov@jetbrains.com>
Date: Tue, 27 Aug 2019 16:08:49 +0300
Subject: [PATCH] github: rebuild GithubShareDialog using UI DSL

GitOrigin-RevId: 3ea6a742e868c7f719d61df3ec82add786f63a2a
---
 .../plugins/github/ui/GithubShareDialog.kt    | 46 ++++++++-----------
 1 file changed, 18 insertions(+), 28 deletions(-)

diff --git a/plugins/github/src/org/jetbrains/plugins/github/ui/GithubShareDialog.kt b/plugins/github/src/org/jetbrains/plugins/github/ui/GithubShareDialog.kt
index 11fa82605912..ee3091b9d7ea 100644
--- a/plugins/github/src/org/jetbrains/plugins/github/ui/GithubShareDialog.kt
+++ b/plugins/github/src/org/jetbrains/plugins/github/ui/GithubShareDialog.kt
@@ -4,16 +4,9 @@ import com.intellij.openapi.progress.ProcessCanceledException
 import com.intellij.openapi.project.Project
 import com.intellij.openapi.ui.DialogWrapper
 import com.intellij.openapi.ui.ValidationInfo
-import com.intellij.ui.components.JBBox
 import com.intellij.ui.components.JBCheckBox
-import com.intellij.ui.components.JBScrollPane
 import com.intellij.ui.components.JBTextField
-import com.intellij.util.ui.JBDimension
-import com.intellij.util.ui.JBUI
-import com.intellij.util.ui.UI
-import com.intellij.util.ui.UI.PanelFactory.grid
-import com.intellij.util.ui.UI.PanelFactory.panel
-import com.intellij.util.ui.UIUtil
+import com.intellij.ui.layout.*
 import com.intellij.util.ui.dialog.DialogUtils
 import org.jetbrains.annotations.TestOnly
 import org.jetbrains.plugins.github.authentication.accounts.GithubAccount
@@ -24,7 +17,6 @@ import org.jetbrains.plugins.github.ui.util.DialogValidationUtils.notBlank
 import org.jetbrains.plugins.github.ui.util.Validator
 import java.awt.Component
 import java.util.regex.Pattern
-import javax.swing.JComponent
 import javax.swing.JTextArea
 
 
@@ -76,26 +68,24 @@ class GithubShareDialog(project: Project,
     }
   }
 
-  override fun createCenterPanel(): JComponent? {
-    val descriptionPane = JBScrollPane(descriptionTextArea).apply {
-      minimumSize = JBDimension(150, 50)
-      preferredSize = JBDimension(150, 50)
-    }
-
-    val repository = JBBox.createHorizontalBox()
-    repository.add(repositoryTextField)
-    repository.add(JBBox.createRigidArea(JBUI.size(UIUtil.DEFAULT_HGAP, 0)))
-    repository.add(privateCheckBox)
-    repository.add(JBBox.createRigidArea(JBUI.size(5, 0)))
-
-    return grid().resize()
-      .add(panel(repository).withLabel("Repository name:"))
-      .add(panel(remoteTextField).withLabel("Remote:"))
-      .add(panel(descriptionPane).withLabel("Description:").anchorLabelOn(UI.Anchor.Top).resizeY(true))
-      .apply {
-        if (accountSelector.isEnabled) add(panel(accountSelector).withLabel("Share by:").resizeX(false))
+  override fun createCenterPanel() = panel {
+    row("Repository name:") {
+      cell {
+        repositoryTextField(growX, pushX)
+        privateCheckBox()
       }
-      .createPanel()
+    }
+    row("Remote:") {
+      remoteTextField(growX, pushX)
+    }
+    row("Description:") {
+      scrollPane(descriptionTextArea)
+    }
+    if (accountSelector.isEnabled) {
+      row("Share by:") {
+        accountSelector(growX, pushX)
+      }
+    }
   }
 
   override fun doValidateAll(): List<ValidationInfo> {