Merge main into feature/q-mega

aws · Nov 21, 2024 · 2f03d37 · 2f03d37
2 parents 1d4f37f + 33080ef
commit 2f03d37
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 5 deletions.
diff --git a/...-community/src/software/aws/toolkits/jetbrains/services/codemodernizer/ArtifactHandler.kt b/...-community/src/software/aws/toolkits/jetbrains/services/codemodernizer/ArtifactHandler.kt
@@ -76,7 +76,8 @@ val patchDescriptions = mapOf(
         "Jenkins plugins and the Maven Wrapper.",
     "Miscellaneous Processing Documentation upgrade" to "This diff patch covers a diverse set of upgrades spanning ORMs, XML processing, API documentation, " +
         "and more.",
-    "Deprecated API replacement and dependency upgrades" to "This diff patch replaces deprecated APIs and makes additional dependency version upgrades."
+    "Deprecated API replacement, dependency upgrades, and formatting" to "This diff patch replaces deprecated APIs, makes additional dependency version " +
+        "upgrades, and formats code changes."
 )
 
 class ArtifactHandler(

diff --git a/...are/aws/toolkits/jetbrains/services/codemodernizer/constants/CodeModernizerUIConstants.kt b/...are/aws/toolkits/jetbrains/services/codemodernizer/constants/CodeModernizerUIConstants.kt
@@ -163,7 +163,7 @@ class CodeModernizerUIConstants {
         }
 
         fun getGreenThemeFontColor(): Color = if (JBColor.isBright()) JBColor.GREEN.darker() else JBColor.GREEN
-        fun getRedThemeFontColor(): Color = JBColor.RED
+        fun getGrayThemeFontColor(): Color = JBColor.GRAY
         fun getLightYellowThemeBackgroundColor(): Color = JBColor.YELLOW.darker()
         fun getStepIcon() = if (JBColor.isBright()) AwsIcons.CodeTransform.TIMELINE_STEP_LIGHT else AwsIcons.CodeTransform.TIMELINE_STEP_DARK
     }

diff --git a/...re/aws/toolkits/jetbrains/services/codemodernizer/panels/BuildProgressStepDetailsPanel.kt b/...re/aws/toolkits/jetbrains/services/codemodernizer/panels/BuildProgressStepDetailsPanel.kt
@@ -91,8 +91,8 @@ class BuildProgressStepDetailsPanel : JPanel(BorderLayout()) {
                 // We don't show description text until step finished.
                 when (it.status) {
                     BuildStepStatus.DONE -> setForeground(CodeModernizerUIConstants.getGreenThemeFontColor())
-                    BuildStepStatus.ERROR -> setForeground(CodeModernizerUIConstants.getRedThemeFontColor())
-                    BuildStepStatus.WARNING -> setForeground(CodeModernizerUIConstants.getRedThemeFontColor())
+                    BuildStepStatus.ERROR -> setForeground(CodeModernizerUIConstants.getGrayThemeFontColor())
+                    BuildStepStatus.WARNING -> setForeground(CodeModernizerUIConstants.getGrayThemeFontColor())
                     BuildStepStatus.WORKING -> text = null
                 }
             }

diff --git a/plugins/core/resources/resources/software/aws/toolkits/resources/MessagesBundle.properties b/plugins/core/resources/resources/software/aws/toolkits/resources/MessagesBundle.properties
@@ -612,7 +612,7 @@ codemodernizer.chat.message.hil.user_rejected=I'll continue upgrading your modul
 codemodernizer.chat.message.local_build_begin=I'm building your module. This can take up to 10 minutes, depending on the size of your module.
 codemodernizer.chat.message.local_build_failed=Sorry, I couldn't run the Maven clean install command to build your module.
 codemodernizer.chat.message.local_build_success=I was able to build your module and will start uploading your code.
-codemodernizer.chat.message.one_or_multiple_diffs=I can now divide the transformation results into diff patches (if applicable to the app) if you would like to review and accept each diff with fewer changes:\n\n\ - Minimal Compatible Library Upgrade to Java 17: Dependencies to the minimum compatible versions in Java 17, including Springboot, JUnit, and PowerMockito.\n\n\ - Popular Enterprise Specifications Application Frameworks: Popular enterprise and application frameworks like Jakarta EE, Hibernate, and Micronaut 3.\n\n\ - HTTP Client Utilities Web Frameworks: HTTP client libraries, Apache Commons utilities, and Struts frameworks.\n\n\ - Testing Tools Frameworks: Testing tools like ArchUnit, Mockito, and TestContainers and build tools like Jenkins and Maven Wrapper.\n\n\ - Miscellaneous Processing Documentation: Diverse set spanning ORMs, XML processing, and API documentation like Swagger to SpringDoc/OpenAPI.\n\n\ - Deprecated API replacement and dependency upgrades: Replaces deprecated APIs and makes additional dependency version upgrades.
+codemodernizer.chat.message.one_or_multiple_diffs=I can now divide the transformation results into diff patches (if applicable to the app) if you would like to review and accept each diff with fewer changes:\n\n\ - Minimal Compatible Library Upgrade to Java 17: Dependencies to the minimum compatible versions in Java 17, including Springboot, JUnit, and PowerMockito.\n\n\ - Popular Enterprise Specifications Application Frameworks: Popular enterprise and application frameworks like Jakarta EE, Hibernate, and Micronaut 3.\n\n\ - HTTP Client Utilities Web Frameworks: HTTP client libraries, Apache Commons utilities, and Struts frameworks.\n\n\ - Testing Tools Frameworks: Testing tools like ArchUnit, Mockito, and TestContainers and build tools like Jenkins and Maven Wrapper.\n\n\ - Miscellaneous Processing Documentation: Diverse set spanning ORMs, XML processing, and API documentation like Swagger to SpringDoc/OpenAPI.\n\n\ - Deprecated API replacement, dependency upgrades, and formatting: Replaces deprecated APIs, makes additional dependency version upgrades, and formats code changes.
 codemodernizer.chat.message.one_or_multiple_diffs_form.multiple_diffs=Multiple diffs
 codemodernizer.chat.message.one_or_multiple_diffs_form.one_diff=One diff
 codemodernizer.chat.message.one_or_multiple_diffs_form.response=Okay, I will create {0} when providing the proposed changes.