Skip to content

Commit 69f1229

Browse files
authored
Fix IllegalCallableAccessException in UI DSL (#3233)
1 parent abc3d3b commit 69f1229

File tree

7 files changed

+25
-20
lines changed

7 files changed

+25
-20
lines changed
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
{
2+
"type" : "bugfix",
3+
"description" : "Fix IllegalCallableAccessException thrown in several UI panels (#3228)"
4+
}

jetbrains-core/src/software/aws/toolkits/jetbrains/services/ecr/actions/PushToRepositoryAction.kt

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -125,12 +125,12 @@ internal class PushToEcrDialog(
125125
) : DialogWrapper(project, null, false, IdeModalityType.PROJECT) {
126126
private val coroutineScope = projectCoroutineScope(project)
127127
private val defaultTag = "latest"
128-
private var type = BuildType.LocalImage
129-
private var remoteTag = ""
130128
private val localImageRepoTags = CollectionComboBoxModel<LocalImage>()
131129

132-
private var localImage: LocalImage? = null
133-
private var runConfiguration: DockerRunConfiguration? = null
130+
var type = BuildType.LocalImage
131+
var remoteTag = ""
132+
var localImage: LocalImage? = null
133+
var runConfiguration: DockerRunConfiguration? = null
134134

135135
private val remoteRepos = ResourceSelector.builder()
136136
.resource(EcrResources.LIST_REPOS)
@@ -337,7 +337,7 @@ internal class PushToEcrDialog(
337337
}
338338
}
339339

340-
private enum class BuildType {
340+
enum class BuildType {
341341
LocalImage, Dockerfile
342342
}
343343
}

jetbrains-core/src/software/aws/toolkits/jetbrains/services/ecs/exec/EnableDisableExecuteCommandWarning.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ import javax.swing.JComponent
1717

1818
class EnableDisableExecuteCommandWarning(private val project: Project, private val enable: Boolean, private val serviceName: String) : DialogWrapper(project) {
1919
private val warningIcon = JBLabel(Messages.getWarningIcon())
20-
private var dontDisplayWarning = false
21-
private var confirmNonProduction = false
20+
var dontDisplayWarning = false
21+
var confirmNonProduction = false
2222
private val settings = EcsExecCommandSettings.getInstance()
2323
private val component by lazy {
2424
panel {

jetbrains-core/src/software/aws/toolkits/jetbrains/services/ecs/exec/OpenShellInContainerDialog.kt

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,10 +39,11 @@ class OpenShellInContainerDialog(
3939
private val connectionSettings: ConnectionSettings
4040
) : DialogWrapper(project) {
4141
private val coroutineScope = projectCoroutineScope(project)
42-
private var task: String? = null
4342
private val shellList = listOf("/bin/bash", "/bin/sh", "/bin/zsh")
4443
private val shellOption = CollectionComboBoxModel(shellList)
45-
private var shell: String = ""
44+
45+
var task: String? = null
46+
var shell: String = ""
4647

4748
init {
4849
super.init()

jetbrains-core/src/software/aws/toolkits/jetbrains/services/ecs/exec/RunCommandDialog.kt

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,9 @@ class RunCommandDialog(private val project: Project, private val container: Cont
3434
DialogWrapper(project) {
3535
private val coroutineScope = projectCoroutineScope(project)
3636
private val commandList = CollectionComboBoxModel(commandsEnteredPreviously.toMutableList())
37-
private var command = ""
38-
private var task: String? = null
37+
38+
var command = ""
39+
var task: String? = null
3940

4041
init {
4142
super.init()

jetbrains-core/src/software/aws/toolkits/jetbrains/services/iam/CreateIamRoleDialog.kt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@ class CreateIamRoleDialog(
3232
private val view = CreateRolePanel(project)
3333

3434
var iamRole: Role? = null
35-
private set
3635

3736
init {
3837
title = message("iam.create.role.title")

jetbrains-core/src/software/aws/toolkits/jetbrains/services/lambda/deploy/DeployServerlessApplicationDialog.kt

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -70,13 +70,13 @@ class DeployServerlessApplicationDialog(
7070
private val templateFile: VirtualFile,
7171
private val loadResourcesOnCreate: Boolean = true
7272
) : DialogWrapper(project) {
73-
private var useContainer: Boolean = false
74-
private var newStackName: String = ""
75-
private var requireReview: Boolean = false
76-
private var deployType: DeployType = DeployType.CREATE
77-
private var templateParameters: Map<String, String> = emptyMap()
78-
private var tags: Map<String, String> = emptyMap()
79-
private var showImageOptions: Boolean = false
73+
var useContainer: Boolean = false
74+
var newStackName: String = ""
75+
var requireReview: Boolean = false
76+
var deployType: DeployType = DeployType.CREATE
77+
var templateParameters: Map<String, String> = emptyMap()
78+
var tags: Map<String, String> = emptyMap()
79+
var showImageOptions: Boolean = false
8080

8181
// non-dsl components
8282
private val stackSelector = ResourceSelector.builder()
@@ -534,7 +534,7 @@ class DeployServerlessApplicationDialog(
534534
}
535535
}
536536

537-
private enum class DeployType {
537+
enum class DeployType {
538538
CREATE,
539539
UPDATE
540540
}

0 commit comments

Comments
 (0)