From e0e6eee8f85e7fa66eb3ba0b8126ce2bebfdf088 Mon Sep 17 00:00:00 2001
From: Michael Yan <rain@rainboyan.com>
Date: Wed, 10 May 2023 19:07:30 +0800
Subject: [PATCH] Grails Console: Rename GrailsSwingConsole to GrailsConsole

---
 ...sSwingConsole.groovy => GrailsConsole.groovy} | 16 ++++++++--------
 .../gradle/plugin/core/GrailsGradlePlugin.groovy |  2 +-
 2 files changed, 9 insertions(+), 9 deletions(-)
 rename grails-console/src/main/groovy/grails/ui/console/{GrailsSwingConsole.groovy => GrailsConsole.groovy} (95%)

diff --git a/grails-console/src/main/groovy/grails/ui/console/GrailsSwingConsole.groovy b/grails-console/src/main/groovy/grails/ui/console/GrailsConsole.groovy
similarity index 95%
rename from grails-console/src/main/groovy/grails/ui/console/GrailsSwingConsole.groovy
rename to grails-console/src/main/groovy/grails/ui/console/GrailsConsole.groovy
index cb0ce91b90..45bb3f4b7c 100644
--- a/grails-console/src/main/groovy/grails/ui/console/GrailsSwingConsole.groovy
+++ b/grails-console/src/main/groovy/grails/ui/console/GrailsConsole.groovy
@@ -41,18 +41,18 @@ import grails.util.GrailsVersion
  * @since 3.0
  */
 @CompileStatic
-class GrailsSwingConsole extends Grails {
+class GrailsConsole extends Grails {
 
     static {
         System.setProperty('java.awt.headless', 'false')
     }
 
-    GrailsSwingConsole(Class<?>... sources) {
+    GrailsConsole(Class<?>... sources) {
         super(sources)
         configureApplicationContextClass()
     }
 
-    GrailsSwingConsole(ResourceLoader resourceLoader, Class<?>... sources) {
+    GrailsConsole(ResourceLoader resourceLoader, Class<?>... sources) {
         super(resourceLoader, sources)
         configureApplicationContextClass()
     }
@@ -95,8 +95,8 @@ class GrailsSwingConsole extends Grails {
         ClassLoader classLoader = Thread.currentThread().getContextClassLoader()
         groovy.console.ui.Console groovyConsole = new groovy.console.ui.Console(classLoader, binding, baseConfig) {
 
-            static final TITLE = 'GrailsSwingConsole'
-            static prefs = Preferences.userNodeForPackage(GrailsSwingConsole)
+            static final TITLE = 'GrailsConsole'
+            static prefs = Preferences.userNodeForPackage(GrailsConsole)
 
             @Override
             def askToInterruptScript() {
@@ -162,7 +162,7 @@ class GrailsSwingConsole extends Grails {
                 def osVersion = String.format('%s %s %s', System.getProperty('os.name'), System.getProperty('os.version'), System.getProperty('os.arch'))
                 def groovyVersion = GroovySystem.getVersion()
                 def pane = super.swing.optionPane()
-                pane.setMessage('Welcome to the Grails Swing Console for evaluating Groovy scripts' +
+                pane.setMessage('Welcome to the Grails Console for evaluating Groovy scripts' +
                         "\nGrails: $grailsVersion" +
                         "\nGroovy: $groovyVersion" +
                         "\nJVM: $javaVersion" +
@@ -207,7 +207,7 @@ class GrailsSwingConsole extends Grails {
      * @return the running {@link org.springframework.context.ApplicationContext}
      */
     static ConfigurableApplicationContext run(Class<?>[] sources, String[] args) {
-        new GrailsSwingConsole(sources).run(args)
+        new GrailsConsole(sources).run(args)
     }
 
     /**
@@ -218,7 +218,7 @@ class GrailsSwingConsole extends Grails {
     static void main(String[] args) {
         if (args) {
             Class<?> applicationClass = Thread.currentThread().contextClassLoader.loadClass(args[0])
-            new GrailsSwingConsole(applicationClass).run(args)
+            new GrailsConsole(applicationClass).run(args)
         }
         else {
             System.err.println('Missing application class name argument')
diff --git a/grails-gradle-plugin/src/main/groovy/org/grails/gradle/plugin/core/GrailsGradlePlugin.groovy b/grails-gradle-plugin/src/main/groovy/org/grails/gradle/plugin/core/GrailsGradlePlugin.groovy
index 3e4e95cade..786ff1af81 100644
--- a/grails-gradle-plugin/src/main/groovy/org/grails/gradle/plugin/core/GrailsGradlePlugin.groovy
+++ b/grails-gradle-plugin/src/main/groovy/org/grails/gradle/plugin/core/GrailsGradlePlugin.groovy
@@ -506,7 +506,7 @@ class GrailsGradlePlugin extends GroovyPlugin {
     protected JavaExec createConsoleTask(Project project, TaskContainer tasks, Configuration configuration) {
         tasks.create('console', JavaExec) {
             classpath = project.sourceSets.main.runtimeClasspath + configuration
-            mainClass.set('grails.ui.console.GrailsSwingConsole')
+            mainClass.set('grails.ui.console.GrailsConsole')
         }
     }