Skip to content

Commit 4bb79d4

Browse files
committed
rm deprecated
1 parent 1dade8e commit 4bb79d4

File tree

3 files changed

+10
-41
lines changed

3 files changed

+10
-41
lines changed

plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/core/execution/AwsConnectionExtension.kt

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,7 @@ import software.aws.toolkits.jetbrains.core.execution.AwsCredentialInjectionOpti
2424
import software.aws.toolkits.jetbrains.core.region.AwsRegionProvider
2525
import software.aws.toolkits.resources.message
2626
import software.aws.toolkits.telemetry.AwsTelemetry
27-
import software.aws.toolkits.telemetry.Result.Failed
28-
import software.aws.toolkits.telemetry.Result.Succeeded
27+
import software.aws.toolkits.telemetry.MetricResult
2928

3029
class AwsConnectionRunConfigurationExtension<T : RunConfigurationBase<*>> {
3130
fun addToTargetEnvironment(configuration: T, environment: MutableMap<String, TargetEnvironmentFunction<String>>, runtimeString: () -> String? = { null }) {
@@ -60,9 +59,9 @@ class AwsConnectionRunConfigurationExtension<T : RunConfigurationBase<*>> {
6059

6160
val connection = getConnection(configuration, credentialConfiguration)
6261
environmentMutator(connection)
63-
AwsTelemetry.injectCredentials(configuration.project, result = Succeeded, runtimeString = tryOrNull { runtimeString() })
62+
AwsTelemetry.injectCredentials(configuration.project, result = MetricResult.Succeeded, runtimeString = tryOrNull { runtimeString() })
6463
} catch (e: Exception) {
65-
AwsTelemetry.injectCredentials(configuration.project, result = Failed, runtimeString = tryOrNull { runtimeString() })
64+
AwsTelemetry.injectCredentials(configuration.project, result = MetricResult.Failed, runtimeString = tryOrNull { runtimeString() })
6665
LOG.error(e) { message("run_configuration_extension.inject_aws_connection_exception") }
6766
}
6867
}

plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/lambda/sam/sync/SyncServerlessApplicationDialog.kt

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,13 @@ import com.intellij.openapi.vfs.VirtualFile
1313
import com.intellij.ui.MutableCollectionComboBoxModel
1414
import com.intellij.ui.SimpleListCellRenderer
1515
import com.intellij.ui.components.JBTextField
16+
import com.intellij.ui.dsl.builder.AlignX
1617
import com.intellij.ui.dsl.builder.actionListener
1718
import com.intellij.ui.dsl.builder.bind
1819
import com.intellij.ui.dsl.builder.bindSelected
1920
import com.intellij.ui.dsl.builder.bindText
2021
import com.intellij.ui.dsl.builder.panel
2122
import com.intellij.ui.dsl.builder.toMutableProperty
22-
import com.intellij.ui.dsl.gridLayout.HorizontalAlign
2323
import com.intellij.ui.layout.selected
2424
import com.intellij.util.text.nullize
2525
import org.jetbrains.annotations.TestOnly
@@ -182,7 +182,7 @@ class SyncServerlessApplicationDialog(
182182
}
183183
}
184184
cell(stackNameField)
185-
.horizontalAlign(HorizontalAlign.FILL)
185+
.align(AlignX.FILL)
186186
.enabledIf(createStackButton.component.selected)
187187
.bindText(::newStackName)
188188
.validationOnApply { field ->
@@ -215,7 +215,7 @@ class SyncServerlessApplicationDialog(
215215
}
216216
stackSelector.reload(forceFetch = true)
217217
cell(stackSelector)
218-
.horizontalAlign(HorizontalAlign.FILL)
218+
.align(AlignX.FILL)
219219
.enabledIf(updateStackButton.component.selected)
220220
.errorOnApply(message("serverless.application.sync.validation.stack.missing")) {
221221
it.isEnabled && (it.isLoading || it.selected() == null)
@@ -228,19 +228,19 @@ class SyncServerlessApplicationDialog(
228228
.withBinding(::templateParameters.toMutableProperty())
229229
.validationOnApply {
230230
validateParameters(it, templateFileParameters)
231-
}.horizontalAlign(HorizontalAlign.FILL)
231+
}.align(AlignX.FILL)
232232
.component.toolTipText = message("serverless.application.sync.tooltip.template.parameters")
233233
}
234234
val tagsString = message("tags.title")
235235
row(tagsString) {
236236
cell(tagsField)
237-
.horizontalAlign(HorizontalAlign.FILL)
237+
.align(AlignX.FILL)
238238
.withBinding(::tags.toMutableProperty())
239239
}
240240

241241
row(message("serverless.application.sync.label.bucket")) {
242242
cell(s3BucketSelector)
243-
.horizontalAlign(HorizontalAlign.FILL)
243+
.align(AlignX.FILL)
244244
.errorOnApply(message("serverless.application.sync.validation.s3.bucket.empty")) { it.isLoading || it.selected() == null }
245245
.component.toolTipText = message("serverless.application.sync.tooltip.s3Bucket")
246246

@@ -262,7 +262,7 @@ class SyncServerlessApplicationDialog(
262262

263263
row(message("serverless.application.sync.label.repo")) {
264264
cell(ecrRepoSelector)
265-
.horizontalAlign(HorizontalAlign.FILL)
265+
.align(AlignX.FILL)
266266
.errorOnApply(message("serverless.application.sync.validation.ecr.repo.empty")) {
267267
it.isVisible && (it.isLoading || it.selected() == null)
268268
}.component.toolTipText = message("serverless.application.sync.tooltip.ecrRepo")

plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/lambda/upload/UploadFunctionContinueDialog.kt

Lines changed: 0 additions & 30 deletions
This file was deleted.

0 commit comments

Comments
 (0)