Skip to content

Commit a476217

Browse files
fioan89fioan89
committed
chore: remove all deprecated align usages
1 parent edd7d5f commit a476217

File tree

4 files changed

+20
-19
lines changed

4 files changed

+20
-19
lines changed

‎src/main/kotlin/com/coder/gateway/views/CoderGatewayConnectorWizardView.kt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@ import com.coder.gateway.views.steps.CoderWorkspacesStepView
66
import com.coder.gateway.views.steps.CoderWorkspacesWizardStep
77
import com.intellij.openapi.Disposable
88
import com.intellij.openapi.wm.impl.welcomeScreen.WelcomeScreenUIManager
9+
import com.intellij.ui.dsl.builder.AlignX
910
import com.intellij.ui.dsl.builder.RightGap
1011
import com.intellij.ui.dsl.builder.panel
11-
import com.intellij.ui.dsl.gridLayout.HorizontalAlign
1212
import com.intellij.util.ui.components.BorderLayoutPanel
1313
import com.jetbrains.gateway.api.GatewayUI
1414
import java.awt.Component
@@ -109,9 +109,9 @@ class CoderGatewayConnectorWizardView : BorderLayoutPanel(), Disposable {
109109
indent {
110110
row {
111111

112-
label("").resizableColumn().horizontalAlign(HorizontalAlign.FILL).gap(RightGap.SMALL)
113-
previousButton = button("") { previous() }.horizontalAlign(HorizontalAlign.RIGHT).gap(RightGap.SMALL).applyToComponent { background = WelcomeScreenUIManager.getMainAssociatedComponentBackground() }.component
114-
nextButton = button("") { next() }.horizontalAlign(HorizontalAlign.RIGHT).gap(RightGap.SMALL).applyToComponent { background = WelcomeScreenUIManager.getMainAssociatedComponentBackground() }.component
112+
label("").resizableColumn().align(AlignX.FILL).gap(RightGap.SMALL)
113+
previousButton = button("") { previous() }.align(AlignX.RIGHT).gap(RightGap.SMALL).applyToComponent { background = WelcomeScreenUIManager.getMainAssociatedComponentBackground() }.component
114+
nextButton = button("") { next() }.align(AlignX.RIGHT).gap(RightGap.SMALL).applyToComponent { background = WelcomeScreenUIManager.getMainAssociatedComponentBackground() }.component
115115
}
116116
}.apply {
117117
background = WelcomeScreenUIManager.getMainAssociatedComponentBackground()

‎src/main/kotlin/com/coder/gateway/views/CoderGatewayRecentWorkspaceConnectionsView.kt

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,12 @@ import com.intellij.ui.DocumentAdapter
2020
import com.intellij.ui.SearchTextField
2121
import com.intellij.ui.components.ActionLink
2222
import com.intellij.ui.components.JBScrollPane
23+
import com.intellij.ui.dsl.builder.AlignX
24+
import com.intellij.ui.dsl.builder.AlignY
2325
import com.intellij.ui.dsl.builder.BottomGap
2426
import com.intellij.ui.dsl.builder.RightGap
2527
import com.intellij.ui.dsl.builder.TopGap
2628
import com.intellij.ui.dsl.builder.panel
27-
import com.intellij.ui.dsl.gridLayout.HorizontalAlign
28-
import com.intellij.ui.dsl.gridLayout.VerticalAlign
2929
import com.intellij.util.ui.JBFont
3030
import com.intellij.util.ui.JBUI
3131
import com.jetbrains.gateway.api.GatewayRecentConnections
@@ -38,7 +38,7 @@ import kotlinx.coroutines.cancel
3838
import kotlinx.coroutines.launch
3939
import java.awt.Component
4040
import java.awt.Dimension
41-
import java.util.Locale
41+
import java.util.*
4242
import javax.swing.JComponent
4343
import javax.swing.JLabel
4444
import javax.swing.event.DocumentEvent
@@ -65,14 +65,15 @@ class CoderGatewayRecentWorkspaceConnectionsView(private val setContentCallback:
6565
panel {
6666
indent {
6767
row {
68-
cell(JLabel()).resizableColumn().horizontalAlign(HorizontalAlign.FILL)
69-
searchBar = cell(SearchTextField(false)).resizableColumn().horizontalAlign(HorizontalAlign.FILL).applyToComponent {
68+
cell(JLabel()).resizableColumn().align(AlignX.FILL)
69+
searchBar = cell(SearchTextField(false)).resizableColumn().align(AlignX.FILL).applyToComponent {
7070
minimumSize = Dimension(350, -1)
7171
textEditor.border = JBUI.Borders.empty(2, 5, 2, 0)
7272
addDocumentListener(object : DocumentAdapter() {
7373
override fun textChanged(e: DocumentEvent) {
7474
val toSearchFor = this@applyToComponent.text
75-
val filteredConnections = recentConnectionsService.getAllRecentConnections().filter { it.coderWorkspaceHostname?.lowercase(Locale.getDefault())?.contains(toSearchFor) ?: false || it.projectPath?.lowercase(Locale.getDefault())?.contains(toSearchFor) ?: false }
75+
val filteredConnections = recentConnectionsService.getAllRecentConnections()
76+
.filter { it.coderWorkspaceHostname?.lowercase(Locale.getDefault())?.contains(toSearchFor) ?: false || it.projectPath?.lowercase(Locale.getDefault())?.contains(toSearchFor) ?: false }
7677
updateContentView(filteredConnections.groupBy { it.coderWorkspaceHostname })
7778
}
7879
})
@@ -92,7 +93,7 @@ class CoderGatewayRecentWorkspaceConnectionsView(private val setContentCallback:
9293
separator(background = WelcomeScreenUIManager.getSeparatorColor())
9394
row {
9495
resizableRow()
95-
cell(recentWorkspacesContentPanel).resizableColumn().horizontalAlign(HorizontalAlign.FILL).verticalAlign(VerticalAlign.FILL).component
96+
cell(recentWorkspacesContentPanel).resizableColumn().align(AlignX.FILL).align(AlignY.FILL).component
9697
}
9798
}
9899
}.apply {
@@ -114,7 +115,7 @@ class CoderGatewayRecentWorkspaceConnectionsView(private val setContentCallback:
114115
if (hostname != null) {
115116
label(hostname).applyToComponent {
116117
font = JBFont.h3().asBold()
117-
}.horizontalAlign(HorizontalAlign.LEFT).gap(RightGap.SMALL)
118+
}.align(AlignX.LEFT).gap(RightGap.SMALL)
118119
actionButton(object : DumbAwareAction(CoderGatewayBundle.message("gateway.connector.recentconnections.terminal.button.tooltip"), "", CoderIcons.OPEN_TERMINAL) {
119120
override fun actionPerformed(e: AnActionEvent) {
120121
BrowserUtil.browse(recentConnections[0].webTerminalLink ?: "")
@@ -132,7 +133,7 @@ class CoderGatewayRecentWorkspaceConnectionsView(private val setContentCallback:
132133
GatewayUI.getInstance().connect(connectionDetails.toWorkspaceParams())
133134
}
134135
})
135-
label("").resizableColumn().horizontalAlign(HorizontalAlign.FILL)
136+
label("").resizableColumn().align(AlignX.FILL)
136137
label("Last opened: ${connectionDetails.lastOpened}").applyToComponent {
137138
foreground = JBUI.CurrentTheme.ContextHelp.FOREGROUND
138139
font = ComponentPanelBuilder.getCommentFont(font)

‎src/main/kotlin/com/coder/gateway/views/steps/CoderWorkspacesStepView.kt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -46,13 +46,13 @@ import com.intellij.ui.RelativeFont
4646
import com.intellij.ui.ToolbarDecorator
4747
import com.intellij.ui.components.JBTextField
4848
import com.intellij.ui.components.dialog
49+
import com.intellij.ui.dsl.builder.AlignX
50+
import com.intellij.ui.dsl.builder.AlignY
4951
import com.intellij.ui.dsl.builder.BottomGap
5052
import com.intellij.ui.dsl.builder.RightGap
5153
import com.intellij.ui.dsl.builder.TopGap
5254
import com.intellij.ui.dsl.builder.bindText
5355
import com.intellij.ui.dsl.builder.panel
54-
import com.intellij.ui.dsl.gridLayout.HorizontalAlign
55-
import com.intellij.ui.dsl.gridLayout.VerticalAlign
5656
import com.intellij.ui.table.TableView
5757
import com.intellij.util.ui.ColumnInfo
5858
import com.intellij.util.ui.JBFont
@@ -208,7 +208,7 @@ class CoderWorkspacesStepView(val enableNextButtonCallback: (Boolean) -> Unit) :
208208
browserLink(CoderGatewayBundle.message("gateway.connector.view.login.documentation.action"), "https://coder.com/docs/coder-oss/latest/workspaces")
209209
}.bottomGap(BottomGap.MEDIUM)
210210
row(CoderGatewayBundle.message("gateway.connector.view.login.url.label")) {
211-
tfUrl = textField().resizableColumn().horizontalAlign(HorizontalAlign.FILL).gap(RightGap.SMALL).bindText(localWizardModel::coderURL).applyToComponent {
211+
tfUrl = textField().resizableColumn().align(AlignX.FILL).gap(RightGap.SMALL).bindText(localWizardModel::coderURL).applyToComponent {
212212
addActionListener {
213213
poller?.cancel()
214214
askTokenAndOpenSession()
@@ -225,7 +225,7 @@ class CoderWorkspacesStepView(val enableNextButtonCallback: (Boolean) -> Unit) :
225225
row {
226226
scrollCell(toolbar.createPanel().apply {
227227
add(notificationBanner.component.apply { isVisible = false }, "South")
228-
}).resizableColumn().horizontalAlign(HorizontalAlign.FILL).verticalAlign(VerticalAlign.FILL)
228+
}).resizableColumn().align(AlignX.FILL).align(AlignY.FILL)
229229
cell()
230230
}.topGap(TopGap.NONE).bottomGap(BottomGap.NONE).resizableRow()
231231
}

‎src/main/kotlin/com/coder/gateway/views/steps/NotificationBanner.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ package com.coder.gateway.views.steps
22

33
import com.intellij.icons.AllIcons
44
import com.intellij.openapi.ui.DialogPanel
5+
import com.intellij.ui.dsl.builder.AlignX
56
import com.intellij.ui.dsl.builder.panel
6-
import com.intellij.ui.dsl.gridLayout.HorizontalAlign
77
import com.intellij.util.ui.JBUI
88
import javax.swing.JEditorPane
99
import javax.swing.JLabel
@@ -19,7 +19,7 @@ class NotificationBanner {
1919
icon = icon(AllIcons.General.Warning).applyToComponent {
2020
border = JBUI.Borders.empty(0, 5)
2121
}.component
22-
txt = text("").resizableColumn().horizontalAlign(HorizontalAlign.FILL).applyToComponent { foreground = JBUI.CurrentTheme.NotificationWarning.foregroundColor() }.component
22+
txt = text("").resizableColumn().align(AlignX.FILL).applyToComponent { foreground = JBUI.CurrentTheme.NotificationWarning.foregroundColor() }.component
2323
}
2424
}.apply {
2525
background = JBUI.CurrentTheme.NotificationWarning.backgroundColor()

0 commit comments

Comments
 (0)