Fix some deprecations (#2554)

Author: abrooksv

jetbrains-core/src/software/aws/toolkits/jetbrains/core/explorer/AwsExplorerFactory.kt

@@ -28,9 +28,11 @@ class AwsExplorerFactory : ToolWindowFactory, DumbAware {
         if (toolWindow is ToolWindowEx) {
             val actionManager = ActionManager.getInstance()
             toolWindow.setTitleActions(
-                actionManager.getAction("aws.settings.refresh"),
-                Separator.create(),
-                FeedbackDialog.getAction(project)
+                listOf(
+                    actionManager.getAction("aws.settings.refresh"),
+                    Separator.create(),
+                    FeedbackDialog.getAction(project)
+                )
             )
             toolWindow.setAdditionalGearActions(
                 DefaultActionGroup().apply {

jetbrains-core/src/software/aws/toolkits/jetbrains/services/clouddebug/actions/PseCliAction.kt

@@ -3,6 +3,7 @@
 
 package software.aws.toolkits.jetbrains.services.clouddebug.actions
 
+import com.intellij.build.BuildContentManager
 import com.intellij.build.BuildViewManager
 import com.intellij.build.DefaultBuildDescriptor
 import com.intellij.build.events.impl.FailureResultImpl
@@ -23,8 +24,6 @@ import com.intellij.openapi.progress.ProgressManager
 import com.intellij.openapi.progress.Task
 import com.intellij.openapi.project.Project
 import com.intellij.openapi.util.Key
-import com.intellij.openapi.wm.ToolWindowId
-import com.intellij.openapi.wm.ToolWindowManager
 import org.slf4j.event.Level
 import software.aws.toolkits.core.utils.debug
 import software.aws.toolkits.core.utils.error
@@ -79,11 +78,9 @@ abstract class PseCliAction(val project: Project, val actionName: String, privat
                     val messageEmitter = DefaultMessageEmitter.createRoot(buildViewManager, actionName)
                     buildViewManager.onEvent(actionName, StartBuildEventImpl(descriptor, ""))
 
-                    val toolWindowManager = ToolWindowManager.getInstance(project)
-
                     runInEdt {
-                        // Safe access because it is possible to close the window before this completes
-                        toolWindowManager.getToolWindow(ToolWindowId.BUILD)?.show(null)
+                        @Suppress("UsePropertyAccessSyntax")
+                        BuildContentManager.getInstance(project).getOrCreateToolWindow().show(null)
                     }
                     // validate CLI
                     CloudDebugResolver.validateOrUpdateCloudDebug(project, messageEmitter, null)
@@ -126,7 +123,6 @@ abstract class PseCliAction(val project: Project, val actionName: String, privat
                                     cliOutput.set(event.text)
                                 } else {
                                     val (text, level) = event.text.asLogEvent()
-                                    @Suppress("DEPRECATION")
                                     messageEmitter.emitMessage(text, level == Level.ERROR)
                                     indicator.text2 = text
                                     // output to the log for diagnostic and integrations tests

jetbrains-core/src/software/aws/toolkits/jetbrains/services/s3/editor/S3TreeNode.kt

@@ -103,7 +103,7 @@ class S3TreeDirectoryNode(bucket: S3VirtualBucket, parent: S3TreeDirectoryNode?,
                 .contents()
                 ?.filterNotNull()
                 ?.filterNot { it.key() == key }
-                ?.map { S3TreeObjectNode(this, it.key(), it.size(), it.lastModified()) as S3TreeNode }
+                ?.map { S3TreeObjectNode(this, it.key(), it.size(), it.lastModified()) }
                 ?: emptyList()
 
             return (folders + s3Objects).sortedBy { it.key } + continuation

jetbrains-core/src/software/aws/toolkits/jetbrains/services/sqs/actions/PurgeQueueAction.kt

@@ -49,8 +49,8 @@ class PurgeQueueAction(
                             project,
                             message("sqs.purge_queue.confirm", queue.queueName, numMessages),
                             message("sqs.purge_queue.confirm.title"),
-                            Messages.YES_BUTTON,
-                            Messages.NO_BUTTON,
+                            Messages.getYesButton(),
+                            Messages.getNoButton(),
                             Messages.getWarningIcon()
                         )
                     }

jetbrains-core/src/software/aws/toolkits/jetbrains/settings/AwsSettingsConfigurable.kt

@@ -13,9 +13,9 @@ import com.intellij.openapi.ui.ComboBox
 import com.intellij.openapi.ui.TextFieldWithBrowseButton
 import com.intellij.openapi.util.text.StringUtil
 import com.intellij.ui.IdeBorderFactory
+import com.intellij.ui.components.ActionLink
 import com.intellij.ui.components.JBCheckBox
 import com.intellij.ui.components.JBTextField
-import com.intellij.ui.components.labels.LinkLabel
 import com.intellij.util.ui.SwingHelper
 import software.aws.toolkits.jetbrains.core.executables.ExecutableInstance
 import software.aws.toolkits.jetbrains.core.executables.ExecutableInstance.BadExecutable
@@ -35,8 +35,8 @@ import javax.swing.JPanel
 
 class AwsSettingsConfigurable(private val project: Project) : SearchableConfigurable {
     private lateinit var panel: JPanel
-    private lateinit var samHelp: LinkLabel<*>
-    private lateinit var cloudDebugHelp: LinkLabel<*>
+    private lateinit var samHelp: JComponent
+    private lateinit var cloudDebugHelp: JComponent
     private lateinit var showAllHandlerGutterIcons: JBCheckBox
     private lateinit var serverlessSettings: JPanel
     private lateinit var remoteDebugSettings: JPanel
@@ -122,7 +122,7 @@ class AwsSettingsConfigurable(private val project: Project) : SearchableConfigur
         profilesNotification.selectedItem = awsSettings.profilesNotification
     }
 
-    private fun createHelpLink(helpId: HelpIds): LinkLabel<*> = LinkLabel.create(message("aws.settings.learn_more")) { BrowserUtil.browse(helpId.url) }
+    private fun createHelpLink(helpId: HelpIds): JComponent = ActionLink(message("aws.settings.learn_more")) { BrowserUtil.browse(helpId.url) }
 
     private fun createCliConfigurationElement(executableType: ExecutableType<*>, cliName: String): TextFieldWithBrowseButton {
         val autoDetectPath = getSavedExecutablePath(executableType, true)

jetbrains-ultimate/src/software/aws/toolkits/jetbrains/ui/AwsAuthWidget.kt

@@ -72,13 +72,7 @@ abstract class AwsAuthWidget(private val userFieldEnabled: Boolean = true) : Dat
         super.reset(dataSource, resetCredentials)
 
         val regionProvider = AwsRegionProvider.getInstance()
-        val allRegions = serviceId.let {
-            if (it != null) {
-                regionProvider.allRegionsForService(it)
-            } else {
-                regionProvider.allRegions()
-            }
-        }
+        val allRegions = regionProvider.allRegionsForService(serviceId)
         regionSelector.setRegions(allRegions.values.toMutableList())
         val regionId = dataSource.additionalJdbcProperties[REGION_ID_PROPERTY]?.nullize()
         regionId?.let {