From 1772a5077b8965bbf84e2693bfd41a270c429b9d Mon Sep 17 00:00:00 2001 From: Ramazan Girgin Date: Sat, 23 Sep 2023 01:16:48 +0200 Subject: [PATCH 01/15] Updates supported intellij version --- resources/META-INF/plugin.xml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/resources/META-INF/plugin.xml b/resources/META-INF/plugin.xml index 87c20e4..7f0baa9 100644 --- a/resources/META-INF/plugin.xml +++ b/resources/META-INF/plugin.xml @@ -1,7 +1,7 @@ me.lotabout.codegenerator Code Generator - 1.5.2 + 1.6.0 Jinzhou Zhang +
  • version 1.6.0 Intellij 2023.2 support

  • version 1.5.2 Default loaded include files - to add complex logic to use for className generation
  • version 1.5.1 Sub include parsing
  • version 1.5.0 Intellij 2021.3 support

    • @@ -44,7 +45,7 @@ - + From 97c2bbb87d337047cb1656215f5f15a2ce0d93a0 Mon Sep 17 00:00:00 2001 From: Haixing Hu Date: Wed, 21 Aug 2024 03:47:17 +0800 Subject: [PATCH 02/15] build: migrate to the IntelliJ Platform Gradle Plugin 2.x --- .gitignore | 45 +++- build.gradle.kts | 48 ++++ gradle.properties | 8 + gradle/wrapper/gradle-wrapper.jar | Bin 0 -> 60756 bytes gradle/wrapper/gradle-wrapper.properties | 5 + gradlew | 234 ++++++++++++++++++ gradlew.bat | 89 +++++++ settings.gradle.kts | 8 + .../lotabout/codegenerator/CodeGenerator.java | 0 .../codegenerator/CodeGeneratorSettings.java | 0 .../ConflictResolutionPolicy.java | 0 .../action/CodeGeneratorAction.java | 0 .../action/CodeGeneratorGroup.java | 0 .../config/ClassSelectionConfig.java | 0 .../codegenerator/config/CodeTemplate.java | 0 .../config/CodeTemplateList.java | 0 .../config/MemberSelectionConfig.java | 0 .../codegenerator/config/PipelineStep.java | 0 .../codegenerator/config/include/Include.java | 0 .../config/include/IncludeList.java | 0 .../codegenerator/ui/ClassSelectionPane.form | 0 .../codegenerator/ui/ClassSelectionPane.java | 0 .../codegenerator/ui/CodeGeneratorConfig.form | 0 .../codegenerator/ui/CodeGeneratorConfig.java | 0 .../ui/CodeGeneratorConfigurable.java | 0 .../codegenerator/ui/MainPaneConfig.form | 0 .../codegenerator/ui/MainPaneConfig.java | 0 .../codegenerator/ui/MemberSelectionPane.form | 0 .../codegenerator/ui/MemberSelectionPane.java | 0 .../codegenerator/ui/PipelineStepConfig.java | 0 .../codegenerator/ui/SelectionPane.form | 0 .../codegenerator/ui/SelectionPane.java | 0 .../codegenerator/ui/TemplateEditPane.form | 0 .../codegenerator/ui/TemplateEditPane.java | 0 .../ui/include/IncludeConfig.form | 0 .../ui/include/IncludeConfig.java | 0 .../ui/include/IncludeEditPane.form | 0 .../ui/include/IncludeEditPane.java | 0 .../codegenerator/util/AnnotationEntry.java | 0 .../codegenerator/util/AnnotationUtil.java | 0 .../codegenerator/util/ClassEntry.java | 0 .../codegenerator/util/EntryFactory.java | 0 .../codegenerator/util/EntryUtils.java | 0 .../codegenerator/util/FieldEntry.java | 0 .../codegenerator/util/GenerationUtil.java | 0 .../codegenerator/util/MemberEntry.java | 0 .../codegenerator/util/MethodEntry.java | 0 .../codegenerator/util/PackageUtil.java | 0 .../codegenerator/worker/JavaBodyWorker.java | 0 .../codegenerator/worker/JavaCaretWorker.java | 0 .../codegenerator/worker/JavaClassWorker.java | 0 .../main/resources}/META-INF/plugin.xml | 0 .../resources}/template/HUE-Serialization.xml | 0 .../resources}/template/default-include.vm | 0 .../main/resources}/template/default.vm | 0 .../template/getters-and-setters.xml | 0 .../main/resources}/template/to-string.xml | 0 57 files changed, 435 insertions(+), 2 deletions(-) create mode 100644 build.gradle.kts create mode 100644 gradle.properties create mode 100644 gradle/wrapper/gradle-wrapper.jar create mode 100644 gradle/wrapper/gradle-wrapper.properties create mode 100755 gradlew create mode 100644 gradlew.bat create mode 100644 settings.gradle.kts rename src/{ => main/java}/me/lotabout/codegenerator/CodeGenerator.java (100%) rename src/{ => main/java}/me/lotabout/codegenerator/CodeGeneratorSettings.java (100%) rename src/{ => main/java}/me/lotabout/codegenerator/ConflictResolutionPolicy.java (100%) rename src/{ => main/java}/me/lotabout/codegenerator/action/CodeGeneratorAction.java (100%) rename src/{ => main/java}/me/lotabout/codegenerator/action/CodeGeneratorGroup.java (100%) rename src/{ => main/java}/me/lotabout/codegenerator/config/ClassSelectionConfig.java (100%) rename src/{ => main/java}/me/lotabout/codegenerator/config/CodeTemplate.java (100%) rename src/{ => main/java}/me/lotabout/codegenerator/config/CodeTemplateList.java (100%) rename src/{ => main/java}/me/lotabout/codegenerator/config/MemberSelectionConfig.java (100%) rename src/{ => main/java}/me/lotabout/codegenerator/config/PipelineStep.java (100%) rename src/{ => main/java}/me/lotabout/codegenerator/config/include/Include.java (100%) rename src/{ => main/java}/me/lotabout/codegenerator/config/include/IncludeList.java (100%) rename src/{ => main/java}/me/lotabout/codegenerator/ui/ClassSelectionPane.form (100%) rename src/{ => main/java}/me/lotabout/codegenerator/ui/ClassSelectionPane.java (100%) rename src/{ => main/java}/me/lotabout/codegenerator/ui/CodeGeneratorConfig.form (100%) rename src/{ => main/java}/me/lotabout/codegenerator/ui/CodeGeneratorConfig.java (100%) rename src/{ => main/java}/me/lotabout/codegenerator/ui/CodeGeneratorConfigurable.java (100%) rename src/{ => main/java}/me/lotabout/codegenerator/ui/MainPaneConfig.form (100%) rename src/{ => main/java}/me/lotabout/codegenerator/ui/MainPaneConfig.java (100%) rename src/{ => main/java}/me/lotabout/codegenerator/ui/MemberSelectionPane.form (100%) rename src/{ => main/java}/me/lotabout/codegenerator/ui/MemberSelectionPane.java (100%) rename src/{ => main/java}/me/lotabout/codegenerator/ui/PipelineStepConfig.java (100%) rename src/{ => main/java}/me/lotabout/codegenerator/ui/SelectionPane.form (100%) rename src/{ => main/java}/me/lotabout/codegenerator/ui/SelectionPane.java (100%) rename src/{ => main/java}/me/lotabout/codegenerator/ui/TemplateEditPane.form (100%) rename src/{ => main/java}/me/lotabout/codegenerator/ui/TemplateEditPane.java (100%) rename src/{ => main/java}/me/lotabout/codegenerator/ui/include/IncludeConfig.form (100%) rename src/{ => main/java}/me/lotabout/codegenerator/ui/include/IncludeConfig.java (100%) rename src/{ => main/java}/me/lotabout/codegenerator/ui/include/IncludeEditPane.form (100%) rename src/{ => main/java}/me/lotabout/codegenerator/ui/include/IncludeEditPane.java (100%) rename src/{ => main/java}/me/lotabout/codegenerator/util/AnnotationEntry.java (100%) rename src/{ => main/java}/me/lotabout/codegenerator/util/AnnotationUtil.java (100%) rename src/{ => main/java}/me/lotabout/codegenerator/util/ClassEntry.java (100%) rename src/{ => main/java}/me/lotabout/codegenerator/util/EntryFactory.java (100%) rename src/{ => main/java}/me/lotabout/codegenerator/util/EntryUtils.java (100%) rename src/{ => main/java}/me/lotabout/codegenerator/util/FieldEntry.java (100%) rename src/{ => main/java}/me/lotabout/codegenerator/util/GenerationUtil.java (100%) rename src/{ => main/java}/me/lotabout/codegenerator/util/MemberEntry.java (100%) rename src/{ => main/java}/me/lotabout/codegenerator/util/MethodEntry.java (100%) rename src/{ => main/java}/me/lotabout/codegenerator/util/PackageUtil.java (100%) rename src/{ => main/java}/me/lotabout/codegenerator/worker/JavaBodyWorker.java (100%) rename src/{ => main/java}/me/lotabout/codegenerator/worker/JavaCaretWorker.java (100%) rename src/{ => main/java}/me/lotabout/codegenerator/worker/JavaClassWorker.java (100%) rename {resources => src/main/resources}/META-INF/plugin.xml (100%) rename {resources => src/main/resources}/template/HUE-Serialization.xml (100%) rename {resources => src/main/resources}/template/default-include.vm (100%) rename {resources => src/main/resources}/template/default.vm (100%) rename {resources => src/main/resources}/template/getters-and-setters.xml (100%) rename {resources => src/main/resources}/template/to-string.xml (100%) diff --git a/.gitignore b/.gitignore index 3199f0f..5be79fc 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,44 @@ +.gradle +build/ +!gradle/wrapper/gradle-wrapper.jar +!**/src/main/**/build/ +!**/src/test/**/build/ + +### IntelliJ IDEA ### .idea -out -target +.idea/modules.xml +.idea/jarRepositories.xml +.idea/compiler.xml +.idea/libraries/ +*.iws +*.iml +*.ipr +out/ +!**/src/main/**/out/ +!**/src/test/**/out/ +.intellijPlatform + +### Eclipse ### +.apt_generated +.classpath +.factorypath +.project +.settings +.springBeans +.sts4-cache +bin/ +!**/src/main/**/bin/ +!**/src/test/**/bin/ + +### NetBeans ### +/nbproject/private/ +/nbbuild/ +/dist/ +/nbdist/ +/.nb-gradle/ + +### VS Code ### +.vscode/ + +### Mac OS ### +.DS_Store diff --git a/build.gradle.kts b/build.gradle.kts new file mode 100644 index 0000000..a725808 --- /dev/null +++ b/build.gradle.kts @@ -0,0 +1,48 @@ +plugins { + id("java") + id("org.jetbrains.intellij.platform") version "2.0.1" +} + +group = "me.lotabout" +version = "1.7.0" + +repositories { + mavenCentral() + intellijPlatform { + defaultRepositories() + } +} + +dependencies { + intellijPlatform { + create("IC", "2023.2") + bundledPlugin("com.intellij.java") + pluginVerifier() + zipSigner() + instrumentationTools() + } + implementation("org.apache.commons:commons-lang3:3.12.0") +} + +tasks { + // Set the JVM compatibility versions + withType { + sourceCompatibility = "17" + targetCompatibility = "17" + } + + patchPluginXml { + sinceBuild.set("232") + untilBuild.set("999.*") + } + + signPlugin { + certificateChain.set(System.getenv("CERTIFICATE_CHAIN")) + privateKey.set(System.getenv("PRIVATE_KEY")) + password.set(System.getenv("PRIVATE_KEY_PASSWORD")) + } + + publishPlugin { + token.set(System.getenv("PUBLISH_TOKEN")) + } +} diff --git a/gradle.properties b/gradle.properties new file mode 100644 index 0000000..6c35a1d --- /dev/null +++ b/gradle.properties @@ -0,0 +1,8 @@ +# Opt-out flag for bundling Kotlin standard library -> https://jb.gg/intellij-platform-kotlin-stdlib +kotlin.stdlib.default.dependency = false + +# Enable Gradle Configuration Cache -> https://docs.gradle.org/current/userguide/configuration_cache.html +org.gradle.configuration-cache = true + +# Enable Gradle Build Cache -> https://docs.gradle.org/current/userguide/build_cache.html +org.gradle.caching = true diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000000000000000000000000000000000000..249e5832f090a2944b7473328c07c9755baa3196 GIT binary patch literal 60756 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 '} + case $link in #( + /*) app_path=$link ;; #( + *) app_path=$APP_HOME$link ;; + esac +done + +APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit + +APP_NAME="Gradle" +APP_BASE_NAME=${0##*/} + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD=maximum + +warn () { + echo "$*" +} >&2 + +die () { + echo + echo "$*" + echo + exit 1 +} >&2 + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +nonstop=false +case "$( uname )" in #( + CYGWIN* ) cygwin=true ;; #( + Darwin* ) darwin=true ;; #( + MSYS* | MINGW* ) msys=true ;; #( + NONSTOP* ) nonstop=true ;; +esac + +CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD=$JAVA_HOME/jre/sh/java + else + JAVACMD=$JAVA_HOME/bin/java + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD=java + which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." +fi + +# Increase the maximum file descriptors if we can. +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + ulimit -n "$MAX_FD" || + warn "Could not set maximum file descriptor limit to $MAX_FD" + esac +fi + +# Collect all arguments for the java command, stacking in reverse order: +# * args from the command line +# * the main class name +# * -classpath +# * -D...appname settings +# * --module-path (only if needed) +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. + +# For Cygwin or MSYS, switch paths to Windows format before running java +if "$cygwin" || "$msys" ; then + APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) + CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) + + JAVACMD=$( cygpath --unix "$JAVACMD" ) + + # Now convert the arguments - kludge to limit ourselves to /bin/sh + for arg do + if + case $arg in #( + -*) false ;; # don't mess with options #( + /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath + [ -e "$t" ] ;; #( + *) false ;; + esac + then + arg=$( cygpath --path --ignore --mixed "$arg" ) + fi + # Roll the args list around exactly as many times as the number of + # args, so each arg winds up back in the position where it started, but + # possibly modified. + # + # NB: a `for` loop captures its iteration list before it begins, so + # changing the positional parameters here affects neither the number of + # iterations, nor the values presented in `arg`. + shift # remove old arg + set -- "$@" "$arg" # push replacement arg + done +fi + +# Collect all arguments for the java command; +# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of +# shell script including quotes and variable substitutions, so put them in +# double quotes to make sure that they get re-expanded; and +# * put everything else in single quotes, so that it's not re-expanded. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -classpath "$CLASSPATH" \ + org.gradle.wrapper.GradleWrapperMain \ + "$@" + +# Use "xargs" to parse quoted args. +# +# With -n1 it outputs one arg per line, with the quotes and backslashes removed. +# +# In Bash we could simply go: +# +# readarray ARGS < <( xargs -n1 <<<"$var" ) && +# set -- "${ARGS[@]}" "$@" +# +# but POSIX shell has neither arrays nor command substitution, so instead we +# post-process each arg (as a line of input to sed) to backslash-escape any +# character that might be a shell metacharacter, then use eval to reverse +# that process (while maintaining the separation between arguments), and wrap +# the whole thing up as a single "set" statement. +# +# This will of course break if any of these variables contains a newline or +# an unmatched quote. +# + +eval "set -- $( + printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | + xargs -n1 | + sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | + tr '\n' ' ' + )" '"$@"' + +exec "$JAVACMD" "$@" diff --git a/gradlew.bat b/gradlew.bat new file mode 100644 index 0000000..ac1b06f --- /dev/null +++ b/gradlew.bat @@ -0,0 +1,89 @@ +@rem +@rem Copyright 2015 the original author or authors. +@rem +@rem Licensed under the Apache License, Version 2.0 (the "License"); +@rem you may not use this file except in compliance with the License. +@rem You may obtain a copy of the License at +@rem +@rem https://www.apache.org/licenses/LICENSE-2.0 +@rem +@rem Unless required by applicable law or agreed to in writing, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@rem See the License for the specific language governing permissions and +@rem limitations under the License. +@rem + +@if "%DEBUG%" == "" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%" == "" set DIRNAME=. +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Resolve any "." and ".." in APP_HOME to make it shorter. +for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if "%ERRORLEVEL%" == "0" goto execute + +echo. +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto execute + +echo. +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* + +:end +@rem End local scope for the variables with windows NT shell +if "%ERRORLEVEL%"=="0" goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 +exit /b 1 + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/settings.gradle.kts b/settings.gradle.kts new file mode 100644 index 0000000..5a5e6a4 --- /dev/null +++ b/settings.gradle.kts @@ -0,0 +1,8 @@ +pluginManagement { + repositories { + mavenCentral() + gradlePluginPortal() + } +} + +rootProject.name = "CodeGenerator" diff --git a/src/me/lotabout/codegenerator/CodeGenerator.java b/src/main/java/me/lotabout/codegenerator/CodeGenerator.java similarity index 100% rename from src/me/lotabout/codegenerator/CodeGenerator.java rename to src/main/java/me/lotabout/codegenerator/CodeGenerator.java diff --git a/src/me/lotabout/codegenerator/CodeGeneratorSettings.java b/src/main/java/me/lotabout/codegenerator/CodeGeneratorSettings.java similarity index 100% rename from src/me/lotabout/codegenerator/CodeGeneratorSettings.java rename to src/main/java/me/lotabout/codegenerator/CodeGeneratorSettings.java diff --git a/src/me/lotabout/codegenerator/ConflictResolutionPolicy.java b/src/main/java/me/lotabout/codegenerator/ConflictResolutionPolicy.java similarity index 100% rename from src/me/lotabout/codegenerator/ConflictResolutionPolicy.java rename to src/main/java/me/lotabout/codegenerator/ConflictResolutionPolicy.java diff --git a/src/me/lotabout/codegenerator/action/CodeGeneratorAction.java b/src/main/java/me/lotabout/codegenerator/action/CodeGeneratorAction.java similarity index 100% rename from src/me/lotabout/codegenerator/action/CodeGeneratorAction.java rename to src/main/java/me/lotabout/codegenerator/action/CodeGeneratorAction.java diff --git a/src/me/lotabout/codegenerator/action/CodeGeneratorGroup.java b/src/main/java/me/lotabout/codegenerator/action/CodeGeneratorGroup.java similarity index 100% rename from src/me/lotabout/codegenerator/action/CodeGeneratorGroup.java rename to src/main/java/me/lotabout/codegenerator/action/CodeGeneratorGroup.java diff --git a/src/me/lotabout/codegenerator/config/ClassSelectionConfig.java b/src/main/java/me/lotabout/codegenerator/config/ClassSelectionConfig.java similarity index 100% rename from src/me/lotabout/codegenerator/config/ClassSelectionConfig.java rename to src/main/java/me/lotabout/codegenerator/config/ClassSelectionConfig.java diff --git a/src/me/lotabout/codegenerator/config/CodeTemplate.java b/src/main/java/me/lotabout/codegenerator/config/CodeTemplate.java similarity index 100% rename from src/me/lotabout/codegenerator/config/CodeTemplate.java rename to src/main/java/me/lotabout/codegenerator/config/CodeTemplate.java diff --git a/src/me/lotabout/codegenerator/config/CodeTemplateList.java b/src/main/java/me/lotabout/codegenerator/config/CodeTemplateList.java similarity index 100% rename from src/me/lotabout/codegenerator/config/CodeTemplateList.java rename to src/main/java/me/lotabout/codegenerator/config/CodeTemplateList.java diff --git a/src/me/lotabout/codegenerator/config/MemberSelectionConfig.java b/src/main/java/me/lotabout/codegenerator/config/MemberSelectionConfig.java similarity index 100% rename from src/me/lotabout/codegenerator/config/MemberSelectionConfig.java rename to src/main/java/me/lotabout/codegenerator/config/MemberSelectionConfig.java diff --git a/src/me/lotabout/codegenerator/config/PipelineStep.java b/src/main/java/me/lotabout/codegenerator/config/PipelineStep.java similarity index 100% rename from src/me/lotabout/codegenerator/config/PipelineStep.java rename to src/main/java/me/lotabout/codegenerator/config/PipelineStep.java diff --git a/src/me/lotabout/codegenerator/config/include/Include.java b/src/main/java/me/lotabout/codegenerator/config/include/Include.java similarity index 100% rename from src/me/lotabout/codegenerator/config/include/Include.java rename to src/main/java/me/lotabout/codegenerator/config/include/Include.java diff --git a/src/me/lotabout/codegenerator/config/include/IncludeList.java b/src/main/java/me/lotabout/codegenerator/config/include/IncludeList.java similarity index 100% rename from src/me/lotabout/codegenerator/config/include/IncludeList.java rename to src/main/java/me/lotabout/codegenerator/config/include/IncludeList.java diff --git a/src/me/lotabout/codegenerator/ui/ClassSelectionPane.form b/src/main/java/me/lotabout/codegenerator/ui/ClassSelectionPane.form similarity index 100% rename from src/me/lotabout/codegenerator/ui/ClassSelectionPane.form rename to src/main/java/me/lotabout/codegenerator/ui/ClassSelectionPane.form diff --git a/src/me/lotabout/codegenerator/ui/ClassSelectionPane.java b/src/main/java/me/lotabout/codegenerator/ui/ClassSelectionPane.java similarity index 100% rename from src/me/lotabout/codegenerator/ui/ClassSelectionPane.java rename to src/main/java/me/lotabout/codegenerator/ui/ClassSelectionPane.java diff --git a/src/me/lotabout/codegenerator/ui/CodeGeneratorConfig.form b/src/main/java/me/lotabout/codegenerator/ui/CodeGeneratorConfig.form similarity index 100% rename from src/me/lotabout/codegenerator/ui/CodeGeneratorConfig.form rename to src/main/java/me/lotabout/codegenerator/ui/CodeGeneratorConfig.form diff --git a/src/me/lotabout/codegenerator/ui/CodeGeneratorConfig.java b/src/main/java/me/lotabout/codegenerator/ui/CodeGeneratorConfig.java similarity index 100% rename from src/me/lotabout/codegenerator/ui/CodeGeneratorConfig.java rename to src/main/java/me/lotabout/codegenerator/ui/CodeGeneratorConfig.java diff --git a/src/me/lotabout/codegenerator/ui/CodeGeneratorConfigurable.java b/src/main/java/me/lotabout/codegenerator/ui/CodeGeneratorConfigurable.java similarity index 100% rename from src/me/lotabout/codegenerator/ui/CodeGeneratorConfigurable.java rename to src/main/java/me/lotabout/codegenerator/ui/CodeGeneratorConfigurable.java diff --git a/src/me/lotabout/codegenerator/ui/MainPaneConfig.form b/src/main/java/me/lotabout/codegenerator/ui/MainPaneConfig.form similarity index 100% rename from src/me/lotabout/codegenerator/ui/MainPaneConfig.form rename to src/main/java/me/lotabout/codegenerator/ui/MainPaneConfig.form diff --git a/src/me/lotabout/codegenerator/ui/MainPaneConfig.java b/src/main/java/me/lotabout/codegenerator/ui/MainPaneConfig.java similarity index 100% rename from src/me/lotabout/codegenerator/ui/MainPaneConfig.java rename to src/main/java/me/lotabout/codegenerator/ui/MainPaneConfig.java diff --git a/src/me/lotabout/codegenerator/ui/MemberSelectionPane.form b/src/main/java/me/lotabout/codegenerator/ui/MemberSelectionPane.form similarity index 100% rename from src/me/lotabout/codegenerator/ui/MemberSelectionPane.form rename to src/main/java/me/lotabout/codegenerator/ui/MemberSelectionPane.form diff --git a/src/me/lotabout/codegenerator/ui/MemberSelectionPane.java b/src/main/java/me/lotabout/codegenerator/ui/MemberSelectionPane.java similarity index 100% rename from src/me/lotabout/codegenerator/ui/MemberSelectionPane.java rename to src/main/java/me/lotabout/codegenerator/ui/MemberSelectionPane.java diff --git a/src/me/lotabout/codegenerator/ui/PipelineStepConfig.java b/src/main/java/me/lotabout/codegenerator/ui/PipelineStepConfig.java similarity index 100% rename from src/me/lotabout/codegenerator/ui/PipelineStepConfig.java rename to src/main/java/me/lotabout/codegenerator/ui/PipelineStepConfig.java diff --git a/src/me/lotabout/codegenerator/ui/SelectionPane.form b/src/main/java/me/lotabout/codegenerator/ui/SelectionPane.form similarity index 100% rename from src/me/lotabout/codegenerator/ui/SelectionPane.form rename to src/main/java/me/lotabout/codegenerator/ui/SelectionPane.form diff --git a/src/me/lotabout/codegenerator/ui/SelectionPane.java b/src/main/java/me/lotabout/codegenerator/ui/SelectionPane.java similarity index 100% rename from src/me/lotabout/codegenerator/ui/SelectionPane.java rename to src/main/java/me/lotabout/codegenerator/ui/SelectionPane.java diff --git a/src/me/lotabout/codegenerator/ui/TemplateEditPane.form b/src/main/java/me/lotabout/codegenerator/ui/TemplateEditPane.form similarity index 100% rename from src/me/lotabout/codegenerator/ui/TemplateEditPane.form rename to src/main/java/me/lotabout/codegenerator/ui/TemplateEditPane.form diff --git a/src/me/lotabout/codegenerator/ui/TemplateEditPane.java b/src/main/java/me/lotabout/codegenerator/ui/TemplateEditPane.java similarity index 100% rename from src/me/lotabout/codegenerator/ui/TemplateEditPane.java rename to src/main/java/me/lotabout/codegenerator/ui/TemplateEditPane.java diff --git a/src/me/lotabout/codegenerator/ui/include/IncludeConfig.form b/src/main/java/me/lotabout/codegenerator/ui/include/IncludeConfig.form similarity index 100% rename from src/me/lotabout/codegenerator/ui/include/IncludeConfig.form rename to src/main/java/me/lotabout/codegenerator/ui/include/IncludeConfig.form diff --git a/src/me/lotabout/codegenerator/ui/include/IncludeConfig.java b/src/main/java/me/lotabout/codegenerator/ui/include/IncludeConfig.java similarity index 100% rename from src/me/lotabout/codegenerator/ui/include/IncludeConfig.java rename to src/main/java/me/lotabout/codegenerator/ui/include/IncludeConfig.java diff --git a/src/me/lotabout/codegenerator/ui/include/IncludeEditPane.form b/src/main/java/me/lotabout/codegenerator/ui/include/IncludeEditPane.form similarity index 100% rename from src/me/lotabout/codegenerator/ui/include/IncludeEditPane.form rename to src/main/java/me/lotabout/codegenerator/ui/include/IncludeEditPane.form diff --git a/src/me/lotabout/codegenerator/ui/include/IncludeEditPane.java b/src/main/java/me/lotabout/codegenerator/ui/include/IncludeEditPane.java similarity index 100% rename from src/me/lotabout/codegenerator/ui/include/IncludeEditPane.java rename to src/main/java/me/lotabout/codegenerator/ui/include/IncludeEditPane.java diff --git a/src/me/lotabout/codegenerator/util/AnnotationEntry.java b/src/main/java/me/lotabout/codegenerator/util/AnnotationEntry.java similarity index 100% rename from src/me/lotabout/codegenerator/util/AnnotationEntry.java rename to src/main/java/me/lotabout/codegenerator/util/AnnotationEntry.java diff --git a/src/me/lotabout/codegenerator/util/AnnotationUtil.java b/src/main/java/me/lotabout/codegenerator/util/AnnotationUtil.java similarity index 100% rename from src/me/lotabout/codegenerator/util/AnnotationUtil.java rename to src/main/java/me/lotabout/codegenerator/util/AnnotationUtil.java diff --git a/src/me/lotabout/codegenerator/util/ClassEntry.java b/src/main/java/me/lotabout/codegenerator/util/ClassEntry.java similarity index 100% rename from src/me/lotabout/codegenerator/util/ClassEntry.java rename to src/main/java/me/lotabout/codegenerator/util/ClassEntry.java diff --git a/src/me/lotabout/codegenerator/util/EntryFactory.java b/src/main/java/me/lotabout/codegenerator/util/EntryFactory.java similarity index 100% rename from src/me/lotabout/codegenerator/util/EntryFactory.java rename to src/main/java/me/lotabout/codegenerator/util/EntryFactory.java diff --git a/src/me/lotabout/codegenerator/util/EntryUtils.java b/src/main/java/me/lotabout/codegenerator/util/EntryUtils.java similarity index 100% rename from src/me/lotabout/codegenerator/util/EntryUtils.java rename to src/main/java/me/lotabout/codegenerator/util/EntryUtils.java diff --git a/src/me/lotabout/codegenerator/util/FieldEntry.java b/src/main/java/me/lotabout/codegenerator/util/FieldEntry.java similarity index 100% rename from src/me/lotabout/codegenerator/util/FieldEntry.java rename to src/main/java/me/lotabout/codegenerator/util/FieldEntry.java diff --git a/src/me/lotabout/codegenerator/util/GenerationUtil.java b/src/main/java/me/lotabout/codegenerator/util/GenerationUtil.java similarity index 100% rename from src/me/lotabout/codegenerator/util/GenerationUtil.java rename to src/main/java/me/lotabout/codegenerator/util/GenerationUtil.java diff --git a/src/me/lotabout/codegenerator/util/MemberEntry.java b/src/main/java/me/lotabout/codegenerator/util/MemberEntry.java similarity index 100% rename from src/me/lotabout/codegenerator/util/MemberEntry.java rename to src/main/java/me/lotabout/codegenerator/util/MemberEntry.java diff --git a/src/me/lotabout/codegenerator/util/MethodEntry.java b/src/main/java/me/lotabout/codegenerator/util/MethodEntry.java similarity index 100% rename from src/me/lotabout/codegenerator/util/MethodEntry.java rename to src/main/java/me/lotabout/codegenerator/util/MethodEntry.java diff --git a/src/me/lotabout/codegenerator/util/PackageUtil.java b/src/main/java/me/lotabout/codegenerator/util/PackageUtil.java similarity index 100% rename from src/me/lotabout/codegenerator/util/PackageUtil.java rename to src/main/java/me/lotabout/codegenerator/util/PackageUtil.java diff --git a/src/me/lotabout/codegenerator/worker/JavaBodyWorker.java b/src/main/java/me/lotabout/codegenerator/worker/JavaBodyWorker.java similarity index 100% rename from src/me/lotabout/codegenerator/worker/JavaBodyWorker.java rename to src/main/java/me/lotabout/codegenerator/worker/JavaBodyWorker.java diff --git a/src/me/lotabout/codegenerator/worker/JavaCaretWorker.java b/src/main/java/me/lotabout/codegenerator/worker/JavaCaretWorker.java similarity index 100% rename from src/me/lotabout/codegenerator/worker/JavaCaretWorker.java rename to src/main/java/me/lotabout/codegenerator/worker/JavaCaretWorker.java diff --git a/src/me/lotabout/codegenerator/worker/JavaClassWorker.java b/src/main/java/me/lotabout/codegenerator/worker/JavaClassWorker.java similarity index 100% rename from src/me/lotabout/codegenerator/worker/JavaClassWorker.java rename to src/main/java/me/lotabout/codegenerator/worker/JavaClassWorker.java diff --git a/resources/META-INF/plugin.xml b/src/main/resources/META-INF/plugin.xml similarity index 100% rename from resources/META-INF/plugin.xml rename to src/main/resources/META-INF/plugin.xml diff --git a/resources/template/HUE-Serialization.xml b/src/main/resources/template/HUE-Serialization.xml similarity index 100% rename from resources/template/HUE-Serialization.xml rename to src/main/resources/template/HUE-Serialization.xml diff --git a/resources/template/default-include.vm b/src/main/resources/template/default-include.vm similarity index 100% rename from resources/template/default-include.vm rename to src/main/resources/template/default-include.vm diff --git a/resources/template/default.vm b/src/main/resources/template/default.vm similarity index 100% rename from resources/template/default.vm rename to src/main/resources/template/default.vm diff --git a/resources/template/getters-and-setters.xml b/src/main/resources/template/getters-and-setters.xml similarity index 100% rename from resources/template/getters-and-setters.xml rename to src/main/resources/template/getters-and-setters.xml diff --git a/resources/template/to-string.xml b/src/main/resources/template/to-string.xml similarity index 100% rename from resources/template/to-string.xml rename to src/main/resources/template/to-string.xml From d31da86b66036d0d6038ec19641d1944e697f298 Mon Sep 17 00:00:00 2001 From: Haixing Hu Date: Wed, 21 Aug 2024 03:56:05 +0800 Subject: [PATCH 03/15] refactor: migrate to commons-lang3 --- .../action/CodeGeneratorAction.java | 88 +++++++++---------- .../codegenerator/config/CodeTemplate.java | 14 +-- .../codegenerator/config/include/Include.java | 22 ++--- .../codegenerator/worker/JavaClassWorker.java | 15 ++-- 4 files changed, 69 insertions(+), 70 deletions(-) diff --git a/src/main/java/me/lotabout/codegenerator/action/CodeGeneratorAction.java b/src/main/java/me/lotabout/codegenerator/action/CodeGeneratorAction.java index ff1e503..ee9aecc 100644 --- a/src/main/java/me/lotabout/codegenerator/action/CodeGeneratorAction.java +++ b/src/main/java/me/lotabout/codegenerator/action/CodeGeneratorAction.java @@ -36,7 +36,7 @@ import me.lotabout.codegenerator.worker.JavaBodyWorker; import me.lotabout.codegenerator.worker.JavaCaretWorker; import me.lotabout.codegenerator.worker.JavaClassWorker; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.java.generate.config.Config; @@ -57,7 +57,7 @@ public class CodeGeneratorAction extends AnAction { private final String templateKey; private final CodeGeneratorSettings settings; - public CodeGeneratorAction(String templateKey, String templateName) { + public CodeGeneratorAction(final String templateKey, final String templateName) { getTemplatePresentation().setDescription("description"); getTemplatePresentation().setText(templateName, false); @@ -71,15 +71,15 @@ public boolean startInTransaction() { } @Override - public void update(AnActionEvent e) { + public void update(final AnActionEvent e) { // Code Generation action could run without editor - Presentation presentation = e.getPresentation(); - Project project = e.getProject(); + final Presentation presentation = e.getPresentation(); + final Project project = e.getProject(); if (project == null) { presentation.setEnabled(false); } - PsiFile file = e.getDataContext().getData(DataKeys.PSI_FILE); + final PsiFile file = e.getDataContext().getData(DataKeys.PSI_FILE); if (file == null || !(file instanceof PsiJavaFile)) { presentation.setEnabled(false); } @@ -87,19 +87,19 @@ public void update(AnActionEvent e) { presentation.setEnabled(true); } - @Override public void actionPerformed(AnActionEvent e) { + @Override public void actionPerformed(final AnActionEvent e) { final CodeTemplate codeTemplate = settings.getCodeTemplate(templateKey).orElseThrow(IllegalStateException::new); - Project project = e.getProject(); + final Project project = e.getProject(); assert project != null; - PsiFile file = e.getDataContext().getData(DataKeys.PSI_FILE); + final PsiFile file = e.getDataContext().getData(DataKeys.PSI_FILE); assert file != null && file instanceof PsiJavaFile; - PsiJavaFile javaFile = (PsiJavaFile)file; + final PsiJavaFile javaFile = (PsiJavaFile)file; - Editor editor = e.getDataContext().getData(DataKeys.EDITOR); + final Editor editor = e.getDataContext().getData(DataKeys.EDITOR); - Map contextMap = executePipeline(codeTemplate, javaFile, editor); + final Map contextMap = executePipeline(codeTemplate, javaFile, editor); if (contextMap == null) { // early return from pipeline return; @@ -111,7 +111,7 @@ public void update(AnActionEvent e) { break; case "body": assert editor != null; - PsiClass clazz = getSubjectClass(editor, javaFile); + final PsiClass clazz = getSubjectClass(editor, javaFile); if (clazz == null) { HintManager.getInstance().showErrorHint(editor, "no parent class found for current cursor position"); return; @@ -128,14 +128,14 @@ public void update(AnActionEvent e) { } } - private Map executePipeline(@NotNull CodeTemplate codeTemplate, @NotNull final PsiJavaFile file, final Editor editor) { + private Map executePipeline(@NotNull final CodeTemplate codeTemplate, @NotNull final PsiJavaFile file, final Editor editor) { final Project project = file.getProject(); logger.debug("+++ executePipeline - START +++"); if (logger.isDebugEnabled()) { logger.debug("Current project " + project.getName()); } - Map contextMap = new HashMap<>(); + final Map contextMap = new HashMap<>(); PsiClass clazz = getSubjectClass(editor, file); if (clazz == null) { clazz = buildFakeClassForEmptyFile(file); @@ -143,23 +143,23 @@ private Map executePipeline(@NotNull CodeTemplate codeTemplate, contextMap.put("class0", EntryFactory.of(clazz)); if (editor != null) { - int offset = editor.getCaretModel().getOffset(); - PsiElement context = file.findElementAt(offset); - PsiMethod parentMethod = PsiTreeUtil.getParentOfType(context, PsiMethod.class, false); + final int offset = editor.getCaretModel().getOffset(); + final PsiElement context = file.findElementAt(offset); + final PsiMethod parentMethod = PsiTreeUtil.getParentOfType(context, PsiMethod.class, false); contextMap.put("parentMethod", EntryFactory.of(parentMethod)); } logger.debug("Select member/class through pipeline"); - for (PipelineStep step : codeTemplate.pipeline) { + for (final PipelineStep step : codeTemplate.pipeline) { if (!step.enabled()) continue; switch (step.type()) { case "class-selection": - PsiClass selectedClass = selectClass(file, (ClassSelectionConfig) step, contextMap); + final PsiClass selectedClass = selectClass(file, (ClassSelectionConfig) step, contextMap); if (selectedClass == null) return null; contextMap.put("class" + step.postfix(), EntryFactory.of(selectedClass)); break; case "member-selection": - List selectedMembers = selectMember(file, (MemberSelectionConfig) step, contextMap); + final List selectedMembers = selectMember(file, (MemberSelectionConfig) step, contextMap); if (selectedMembers == null) return null; GenerationUtil.insertMembersToContext(selectedMembers, Collections.emptyList(), @@ -176,11 +176,11 @@ private Map executePipeline(@NotNull CodeTemplate codeTemplate, } @Nullable - private static PsiClass getSubjectClass(Editor editor, @NotNull final PsiJavaFile file) { + private static PsiClass getSubjectClass(final Editor editor, @NotNull final PsiJavaFile file) { PsiClass clazz = null; if (editor != null) { - int offset = editor.getCaretModel().getOffset(); - PsiElement context = file.findElementAt(offset); + final int offset = editor.getCaretModel().getOffset(); + final PsiElement context = file.findElementAt(offset); if (context == null) return null; @@ -192,11 +192,11 @@ private static PsiClass getSubjectClass(Editor editor, @NotNull final PsiJavaFil return clazz; } - private PsiClass selectClass(@NotNull PsiJavaFile file, ClassSelectionConfig config, Map contextMap) { - String initialClassNameTemplate = config.initialClass; - Project project = file.getProject(); + private PsiClass selectClass(@NotNull final PsiJavaFile file, final ClassSelectionConfig config, final Map contextMap) { + final String initialClassNameTemplate = config.initialClass; + final Project project = file.getProject(); try { - String className = GenerationUtil.velocityEvaluate(project, contextMap, contextMap, initialClassNameTemplate, settings.getIncludes()); + final String className = GenerationUtil.velocityEvaluate(project, contextMap, contextMap, initialClassNameTemplate, settings.getIncludes()); if (logger.isDebugEnabled()) logger.debug("Initial class name for class selection is" + className); PsiClass initialClass = null; @@ -209,21 +209,21 @@ private PsiClass selectClass(@NotNull PsiJavaFile file, ClassSelectionConfig con initialClass = file.getClasses().length > 0 ? file.getClasses()[0] : null; } - TreeClassChooser chooser = TreeClassChooserFactory.getInstance(project) - .createProjectScopeChooser("Select a class", initialClass); + final TreeClassChooser chooser = TreeClassChooserFactory.getInstance(project) + .createProjectScopeChooser("Select a class", initialClass); chooser.showDialog(); if (chooser.getSelected() == null) { return null; } return chooser.getSelected(); - } catch (GenerateCodeException e) { + } catch (final GenerateCodeException e) { Messages.showMessageDialog(project, e.getMessage(), "Generate Failed", null); } return null; } - private List selectMember(@NotNull PsiJavaFile file, MemberSelectionConfig config, Map contextMap) { + private List selectMember(@NotNull final PsiJavaFile file, final MemberSelectionConfig config, final Map contextMap) { final String AVAILABLE_MEMBERS = "availableMembers"; final String SELECTED_MEMBERS = "selectedMembers"; final Project project = file.getProject(); @@ -244,8 +244,8 @@ private List selectMember(@NotNull PsiJavaFile file, MemberSelectionC contextMap.remove(SELECTED_MEMBERS); // filter the members by configuration - PsiElementClassMember[] dialogMembers = buildClassMember(filterMembers(availableMembers, config)); - PsiElementClassMember[] membersSelected = buildClassMember(filterMembers(selectedMembers, config)); + final PsiElementClassMember[] dialogMembers = buildClassMember(filterMembers(availableMembers, config)); + final PsiElementClassMember[] membersSelected = buildClassMember(filterMembers(selectedMembers, config)); if (!config.allowEmptySelection && dialogMembers.length <= 0) { Messages.showMessageDialog(project, "No members are provided to select from.\nAnd template doesn't allow empty selection", @@ -273,8 +273,8 @@ protected String getHelpId() { return GenerationUtil.convertClassMembersToPsiMembers(chooser.getSelectedElements()); } - private static List filterMembers(List members, final MemberSelectionConfig config) { - FilterPattern pattern = generatorConfig2Config(config).getFilterPattern(); + private static List filterMembers(final List members, final MemberSelectionConfig config) { + final FilterPattern pattern = generatorConfig2Config(config).getFilterPattern(); return members.stream() .map(member -> { if (member instanceof PsiMember) { @@ -296,10 +296,10 @@ private static List filterMembers(List members, final MemberS }).collect(Collectors.toList()); } - private static PsiElementClassMember[] buildClassMember(List members) { - List ret = members.stream() - .filter(m -> (m instanceof PsiField) || (m instanceof PsiMethod)) - .map(m -> { + private static PsiElementClassMember[] buildClassMember(final List members) { + final List ret = members.stream() + .filter(m -> (m instanceof PsiField) || (m instanceof PsiMethod)) + .map(m -> { if (m instanceof PsiField) { return new PsiFieldMember((PsiField) m); } else if (m instanceof PsiMethod) { @@ -312,8 +312,8 @@ private static PsiElementClassMember[] buildClassMember(List members) return ret.toArray(new PsiElementClassMember[ret.size()]); } - private static Config generatorConfig2Config(MemberSelectionConfig selectionConfig) { - Config config = new Config(); + private static Config generatorConfig2Config(final MemberSelectionConfig selectionConfig) { + final Config config = new Config(); config.useFullyQualifiedName = false; config.filterConstantField = selectionConfig.filterConstantField; config.filterEnumField = selectionConfig.filterEnumField; @@ -328,7 +328,7 @@ private static Config generatorConfig2Config(MemberSelectionConfig selectionConf return config; } - private static PsiClass buildFakeClassForEmptyFile(@NotNull PsiJavaFile file) { + private static PsiClass buildFakeClassForEmptyFile(@NotNull final PsiJavaFile file) { final Project project = file.getProject(); final VirtualFile moduleRoot = ProjectRootManager.getInstance(project).getFileIndex().getSourceRootForFile(file.getVirtualFile()); final String fileName = file.getName(); @@ -344,7 +344,7 @@ private static PsiClass buildFakeClassForEmptyFile(@NotNull PsiJavaFile file) { "package " + packageName + ";\n" + "class " + className + "{}"); return (PsiClass) element.getLastChild(); - } catch (IncorrectOperationException ignore) { + } catch (final IncorrectOperationException ignore) { } return null; } diff --git a/src/main/java/me/lotabout/codegenerator/config/CodeTemplate.java b/src/main/java/me/lotabout/codegenerator/config/CodeTemplate.java index f8161fc..d58ead7 100644 --- a/src/main/java/me/lotabout/codegenerator/config/CodeTemplate.java +++ b/src/main/java/me/lotabout/codegenerator/config/CodeTemplate.java @@ -3,8 +3,8 @@ import com.intellij.openapi.util.io.FileUtil; import com.intellij.util.xmlb.annotations.AbstractCollection; -import org.apache.commons.lang.builder.EqualsBuilder; -import org.apache.commons.lang.builder.HashCodeBuilder; +import org.apache.commons.lang3.builder.EqualsBuilder; +import org.apache.commons.lang3.builder.HashCodeBuilder; import org.jetbrains.java.generate.config.DuplicationPolicy; import org.jetbrains.java.generate.config.InsertWhere; @@ -43,10 +43,10 @@ public class CodeTemplate { public String defaultTargetPackage; public String defaultTargetModule; - public CodeTemplate(UUID id) { + public CodeTemplate(final UUID id) { this.id = id; } - public CodeTemplate(String id) { + public CodeTemplate(final String id) { this.id = UUID.fromString(id); } @@ -74,21 +74,21 @@ public boolean isValid() { String default_template; try { default_template = FileUtil.loadTextAndClose(CodeTemplate.class.getResourceAsStream("/template/default.vm")); - } catch (IOException e) { + } catch (final IOException e) { default_template = ""; e.printStackTrace(); } DEFAULT_TEMPLATE = default_template; } - @Override public boolean equals(Object o) { + @Override public boolean equals(final Object o) { if (this == o) return true; if (o == null || getClass() != o.getClass()) return false; - CodeTemplate template1 = (CodeTemplate)o; + final CodeTemplate template1 = (CodeTemplate)o; return new EqualsBuilder() .append(enabled, template1.enabled) diff --git a/src/main/java/me/lotabout/codegenerator/config/include/Include.java b/src/main/java/me/lotabout/codegenerator/config/include/Include.java index 4c9b47a..076b50c 100644 --- a/src/main/java/me/lotabout/codegenerator/config/include/Include.java +++ b/src/main/java/me/lotabout/codegenerator/config/include/Include.java @@ -1,8 +1,8 @@ package me.lotabout.codegenerator.config.include; import com.intellij.openapi.util.io.FileUtil; -import org.apache.commons.lang.builder.EqualsBuilder; -import org.apache.commons.lang.builder.HashCodeBuilder; +import org.apache.commons.lang3.builder.EqualsBuilder; +import org.apache.commons.lang3.builder.HashCodeBuilder; import javax.xml.bind.annotation.*; import java.io.IOException; @@ -19,11 +19,11 @@ public class Include { public String content = DEFAULT_TEMPLATE; public boolean defaultInclude; - public Include(UUID id) { + public Include(final UUID id) { this.id = id; } - public Include(String id) { + public Include(final String id) { this.id = UUID.fromString(id); } @@ -47,15 +47,15 @@ public String getContent() { return content; } - public void setId(UUID id) { + public void setId(final UUID id) { this.id = id; } - public void setName(String name) { + public void setName(final String name) { this.name = name; } - public void setContent(String content) { + public void setContent(final String content) { this.content = content; } @@ -63,7 +63,7 @@ public boolean isDefaultInclude() { return defaultInclude; } - public void setDefaultInclude(boolean defaultInclude) { + public void setDefaultInclude(final boolean defaultInclude) { this.defaultInclude = defaultInclude; } @@ -73,7 +73,7 @@ public void setDefaultInclude(boolean defaultInclude) { String default_template; try { default_template = FileUtil.loadTextAndClose(Include.class.getResourceAsStream("/template/default-include.vm")); - } catch (IOException e) { + } catch (final IOException e) { default_template = ""; e.printStackTrace(); } @@ -81,12 +81,12 @@ public void setDefaultInclude(boolean defaultInclude) { } @Override - public boolean equals(Object o) { + public boolean equals(final Object o) { if (this == o) return true; if (o == null || getClass() != o.getClass()) return false; - var include1 = (Include) o; + final var include1 = (Include) o; return new EqualsBuilder().append(id, include1.id)// .append(name, include1.name)// diff --git a/src/main/java/me/lotabout/codegenerator/worker/JavaClassWorker.java b/src/main/java/me/lotabout/codegenerator/worker/JavaClassWorker.java index 3a6ed57..1253b57 100644 --- a/src/main/java/me/lotabout/codegenerator/worker/JavaClassWorker.java +++ b/src/main/java/me/lotabout/codegenerator/worker/JavaClassWorker.java @@ -23,7 +23,7 @@ import me.lotabout.codegenerator.config.include.Include; import me.lotabout.codegenerator.util.GenerationUtil; import me.lotabout.codegenerator.util.PackageUtil; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.jetbrains.annotations.NotNull; import java.io.File; @@ -33,8 +33,7 @@ public class JavaClassWorker { private static final Logger logger = Logger.getInstance(JavaClassWorker.class); - public static void execute(@NotNull CodeTemplate codeTemplate, @NotNull List includes, @NotNull PsiJavaFile selectedFile, @NotNull - Map context) { + public static void execute(@NotNull final CodeTemplate codeTemplate, @NotNull final List includes, @NotNull final PsiJavaFile selectedFile, @NotNull final Map context) { try { final Project project = selectedFile.getProject(); @@ -45,7 +44,7 @@ public static void execute(@NotNull CodeTemplate codeTemplate, @NotNull List= 0) { packageName = FQClass.substring(0, index); className = FQClass.substring(index + 1); @@ -92,7 +91,7 @@ public static void execute(@NotNull CodeTemplate codeTemplate, @NotNull List FileEditorManager.getInstance(project).openFile(addedFile.getVirtualFile(), true, true)); - } catch (Exception e) { + } catch (final Exception e) { e.printStackTrace(); GenerationUtil.handleException(project, e); } }); - }catch (Exception e){ + }catch (final Exception e){ e.printStackTrace(); } } From 9da82d366fd18b6a4f38ef5c646158b30f0bef8d Mon Sep 17 00:00:00 2001 From: Haixing Hu Date: Wed, 21 Aug 2024 04:16:51 +0800 Subject: [PATCH 04/15] refactor: migration to newer APIs --- build.gradle.kts | 1 + .../lotabout/codegenerator/CodeGenerator.java | 7 -- .../action/CodeGeneratorAction.java | 17 ++-- .../action/CodeGeneratorGroup.java | 27 +++--- .../ui/CodeGeneratorConfigurable.java | 19 ++-- .../codegenerator/util/GenerationUtil.java | 91 +++++++++--------- .../codegenerator/util/PackageUtil.java | 93 +++++++++---------- 7 files changed, 118 insertions(+), 137 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index a725808..c6d2735 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -29,6 +29,7 @@ tasks { withType { sourceCompatibility = "17" targetCompatibility = "17" + options.compilerArgs.addAll(listOf("-Xlint:deprecation", "-Xlint:unchecked")) } patchPluginXml { diff --git a/src/main/java/me/lotabout/codegenerator/CodeGenerator.java b/src/main/java/me/lotabout/codegenerator/CodeGenerator.java index 89222a9..b52ad90 100644 --- a/src/main/java/me/lotabout/codegenerator/CodeGenerator.java +++ b/src/main/java/me/lotabout/codegenerator/CodeGenerator.java @@ -7,13 +7,6 @@ public class CodeGenerator implements ApplicationComponent { public CodeGenerator() { } - @Override - public void initComponent() {} - - @Override - public void disposeComponent() { - } - @Override @NotNull public String getComponentName() { diff --git a/src/main/java/me/lotabout/codegenerator/action/CodeGeneratorAction.java b/src/main/java/me/lotabout/codegenerator/action/CodeGeneratorAction.java index ee9aecc..c3a9a44 100644 --- a/src/main/java/me/lotabout/codegenerator/action/CodeGeneratorAction.java +++ b/src/main/java/me/lotabout/codegenerator/action/CodeGeneratorAction.java @@ -10,9 +10,9 @@ import com.intellij.ide.util.TreeClassChooserFactory; import com.intellij.openapi.actionSystem.AnAction; import com.intellij.openapi.actionSystem.AnActionEvent; -import com.intellij.openapi.actionSystem.DataKeys; +import com.intellij.openapi.actionSystem.LangDataKeys; import com.intellij.openapi.actionSystem.Presentation; -import com.intellij.openapi.components.ServiceManager; +import com.intellij.openapi.application.ApplicationManager; import com.intellij.openapi.diagnostic.Logger; import com.intellij.openapi.editor.Editor; import com.intellij.openapi.project.Project; @@ -61,15 +61,10 @@ public CodeGeneratorAction(final String templateKey, final String templateName) getTemplatePresentation().setDescription("description"); getTemplatePresentation().setText(templateName, false); - this.settings = ServiceManager.getService(CodeGeneratorSettings.class);; + this.settings = ApplicationManager.getApplication().getService(CodeGeneratorSettings.class);; this.templateKey = templateKey; } - @Override - public boolean startInTransaction() { - return true; - } - @Override public void update(final AnActionEvent e) { // Code Generation action could run without editor @@ -79,7 +74,7 @@ public void update(final AnActionEvent e) { presentation.setEnabled(false); } - final PsiFile file = e.getDataContext().getData(DataKeys.PSI_FILE); + final PsiFile file = e.getDataContext().getData(LangDataKeys.PSI_FILE); if (file == null || !(file instanceof PsiJavaFile)) { presentation.setEnabled(false); } @@ -92,12 +87,12 @@ public void update(final AnActionEvent e) { final Project project = e.getProject(); assert project != null; - final PsiFile file = e.getDataContext().getData(DataKeys.PSI_FILE); + final PsiFile file = e.getDataContext().getData(LangDataKeys.PSI_FILE); assert file != null && file instanceof PsiJavaFile; final PsiJavaFile javaFile = (PsiJavaFile)file; - final Editor editor = e.getDataContext().getData(DataKeys.EDITOR); + final Editor editor = e.getDataContext().getData(LangDataKeys.EDITOR); final Map contextMap = executePipeline(codeTemplate, javaFile, editor); if (contextMap == null) { diff --git a/src/main/java/me/lotabout/codegenerator/action/CodeGeneratorGroup.java b/src/main/java/me/lotabout/codegenerator/action/CodeGeneratorGroup.java index 416dd27..2182304 100644 --- a/src/main/java/me/lotabout/codegenerator/action/CodeGeneratorGroup.java +++ b/src/main/java/me/lotabout/codegenerator/action/CodeGeneratorGroup.java @@ -1,7 +1,7 @@ package me.lotabout.codegenerator.action; import com.intellij.openapi.actionSystem.*; -import com.intellij.openapi.components.ServiceManager; +import com.intellij.openapi.application.ApplicationManager; import com.intellij.openapi.editor.Caret; import com.intellij.openapi.project.DumbAware; import com.intellij.openapi.project.Project; @@ -21,36 +21,31 @@ public class CodeGeneratorGroup extends ActionGroup implements DumbAware { private CodeGeneratorSettings settings; public CodeGeneratorGroup() { - settings = ServiceManager.getService(CodeGeneratorSettings.class); + settings = ApplicationManager.getApplication().getService(CodeGeneratorSettings.class); } - @Override - public boolean hideIfNoVisibleChildren() { - return false; - } - - @NotNull @Override public AnAction[] getChildren(@Nullable AnActionEvent anActionEvent) { + @NotNull @Override public AnAction[] getChildren(@Nullable final AnActionEvent anActionEvent) { if (anActionEvent == null) { return AnAction.EMPTY_ARRAY; } - Project project = PlatformDataKeys.PROJECT.getData(anActionEvent.getDataContext()); + final Project project = PlatformDataKeys.PROJECT.getData(anActionEvent.getDataContext()); if (project == null) { return AnAction.EMPTY_ARRAY; } - PsiFile file = anActionEvent.getDataContext().getData(DataKeys.PSI_FILE); + final PsiFile file = anActionEvent.getDataContext().getData(LangDataKeys.PSI_FILE); if (file == null) { return AnAction.EMPTY_ARRAY; } - Caret caret = anActionEvent.getDataContext().getData(LangDataKeys.CARET); - boolean isProjectView = caret == null; + final Caret caret = anActionEvent.getDataContext().getData(LangDataKeys.CARET); + final boolean isProjectView = caret == null; if (!isProjectView) { // EditorPopup menu - PsiElement element = file.findElementAt(caret.getOffset()); - PsiClass clazz = PsiTreeUtil.getParentOfType(element, PsiClass.class, false); + final PsiElement element = file.findElementAt(caret.getOffset()); + final PsiClass clazz = PsiTreeUtil.getParentOfType(element, PsiClass.class, false); if (clazz == null) { // not inside a class return AnAction.EMPTY_ARRAY; @@ -58,7 +53,7 @@ public boolean hideIfNoVisibleChildren() { } - String fileName = file.getName(); + final String fileName = file.getName(); final List children = settings.getCodeTemplates().stream() .filter(t -> !isProjectView || (t.type.equals("class") && isProjectView)) .filter(t -> t.enabled && fileName.matches(t.fileNamePattern)) @@ -68,7 +63,7 @@ public boolean hideIfNoVisibleChildren() { return children.toArray(new AnAction[children.size()]); } - private static AnAction getOrCreateAction(CodeTemplate template) { + private static AnAction getOrCreateAction(final CodeTemplate template) { final String actionId = "CodeMaker.Menu.Action." + template.getId(); AnAction action = ActionManager.getInstance().getAction(actionId); if (action == null) { diff --git a/src/main/java/me/lotabout/codegenerator/ui/CodeGeneratorConfigurable.java b/src/main/java/me/lotabout/codegenerator/ui/CodeGeneratorConfigurable.java index 3f9d9e1..7cf64da 100644 --- a/src/main/java/me/lotabout/codegenerator/ui/CodeGeneratorConfigurable.java +++ b/src/main/java/me/lotabout/codegenerator/ui/CodeGeneratorConfigurable.java @@ -1,5 +1,6 @@ package me.lotabout.codegenerator.ui; +import com.intellij.openapi.application.ApplicationManager; import com.intellij.openapi.components.ServiceManager; import com.intellij.openapi.options.ConfigurationException; import com.intellij.openapi.options.SearchableConfigurable; @@ -18,7 +19,7 @@ public class CodeGeneratorConfigurable implements SearchableConfigurable { private MainPaneConfig mainPaneConfig; public CodeGeneratorConfigurable() { - this.settings = ServiceManager.getService(CodeGeneratorSettings.class); + this.settings = ApplicationManager.getApplication().getService(CodeGeneratorSettings.class); } @NotNull @@ -67,13 +68,13 @@ private boolean isCodeGeneratorModified() { return false; } - var templates = codeGeneratorConfig.getTabTemplates(); + final var templates = codeGeneratorConfig.getTabTemplates(); if (settings.getCodeTemplates().size() != templates.size()) { return true; } - for (var template : templates) { - var codeTemplate = settings.getCodeTemplate(template.getId()); + for (final var template : templates) { + final var codeTemplate = settings.getCodeTemplate(template.getId()); if (codeTemplate.isEmpty() || !codeTemplate.get().equals(template)) { return true; } @@ -87,13 +88,13 @@ private boolean isIncludeModified() { return false; } - var includes = includeConfig.getIncludes(); + final var includes = includeConfig.getIncludes(); if (settings.getIncludes().size() != includes.size()) { return true; } - for (var include : includes) { - var includesSetting = settings.getInclude(include.getId()); + for (final var include : includes) { + final var includesSetting = settings.getInclude(include.getId()); if (includesSetting.isEmpty() || !includesSetting.get().equals(include)) { return true; } @@ -104,8 +105,8 @@ private boolean isIncludeModified() { @Override public void apply() throws ConfigurationException { - var templates = codeGeneratorConfig.getTabTemplates(); - for (var template : templates) { + final var templates = codeGeneratorConfig.getTabTemplates(); + for (final var template : templates) { if (!template.isValid()) { throw new ConfigurationException( "Not property can be empty and classNumber should be a number"); diff --git a/src/main/java/me/lotabout/codegenerator/util/GenerationUtil.java b/src/main/java/me/lotabout/codegenerator/util/GenerationUtil.java index b74822b..81f717a 100644 --- a/src/main/java/me/lotabout/codegenerator/util/GenerationUtil.java +++ b/src/main/java/me/lotabout/codegenerator/util/GenerationUtil.java @@ -1,5 +1,6 @@ package me.lotabout.codegenerator.util; +import com.intellij.application.options.CodeStyle; import com.intellij.codeInsight.generation.PsiElementClassMember; import com.intellij.codeInsight.generation.PsiFieldMember; import com.intellij.codeInsight.generation.PsiMethodMember; @@ -37,8 +38,8 @@ public class GenerationUtil { * @param filteredMethods methods to be included in the dialog * @return the combined list */ - public static PsiElementClassMember[] combineToClassMemberList(PsiField[] filteredFields, PsiMethod[] filteredMethods) { - var members = new PsiElementClassMember[filteredFields.length + filteredMethods.length]; + public static PsiElementClassMember[] combineToClassMemberList(final PsiField[] filteredFields, final PsiMethod[] filteredMethods) { + final var members = new PsiElementClassMember[filteredFields.length + filteredMethods.length]; // first add fields for (var i = 0; i < filteredFields.length; i++) { @@ -53,20 +54,20 @@ public static PsiElementClassMember[] combineToClassMemberList(PsiField[] filter return members; } - public static List convertClassMembersToPsiMembers(@Nullable List classMemberList) { + public static List convertClassMembersToPsiMembers(@Nullable final List classMemberList) { if (classMemberList == null || classMemberList.isEmpty()) { return Collections.emptyList(); } - List psiMemberList = new ArrayList<>(); + final List psiMemberList = new ArrayList<>(); - for (var classMember : classMemberList) { + for (final var classMember : classMemberList) { psiMemberList.add(classMember.getElement()); } return psiMemberList; } - public static void insertMembersToContext(List members, List notNullMembers, Map context, String postfix, int sortElements) { + public static void insertMembersToContext(final List members, final List notNullMembers, final Map context, final String postfix, final int sortElements) { logger.debug("insertMembersToContext - adding fields"); // field information final List fieldElements = EntryUtils.getOnlyAsFieldEntries(members, notNullMembers, false); @@ -84,7 +85,7 @@ public static void insertMembersToContext(List members, List members, List contextMap, - Map outputContext, + @NotNull final Project project, + @NotNull final Map contextMap, + final Map outputContext, String template, - List includes) throws GenerateCodeException { + final List includes) throws GenerateCodeException { if (template == null) { return null; } - var sw = new StringWriter(); + final var sw = new StringWriter(); try { - var vc = new VelocityContext(); + final var vc = new VelocityContext(); - vc.put("settings", CodeStyleSettingsManager.getSettings(project)); + vc.put("settings", CodeStyle.getSettings(project)); vc.put("project", project); vc.put("helper", GenerationHelper.class); vc.put("StringUtil", StringUtil.class); @@ -117,7 +118,7 @@ public static String velocityEvaluate( vc.put("GlobalSearchScope", GlobalSearchScope.class); vc.put("EntryFactory", EntryFactory.class); - for (var paramName : contextMap.keySet()) { + for (final var paramName : contextMap.keySet()) { vc.put(paramName, contextMap.get(paramName)); } @@ -125,21 +126,21 @@ public static String velocityEvaluate( if (logger.isDebugEnabled()) logger.debug("Velocity Template:\n" + template); // velocity - var velocity = VelocityFactory.getVelocityEngine(); + final var velocity = VelocityFactory.getVelocityEngine(); logger.debug("Executing velocity +++ START +++"); velocity.evaluate(vc, sw, GenerationUtil.class.getName(), template); logger.debug("Executing velocity +++ END +++"); if (outputContext != null) { - for (var key : vc.getKeys()) { + for (final var key : vc.getKeys()) { if (key instanceof String) { outputContext.put((String) key, vc.get((String) key)); } } } - } catch (ProcessCanceledException e) { + } catch (final ProcessCanceledException e) { throw e; - } catch (Exception e) { + } catch (final Exception e) { throw new GenerateCodeException("Error in Velocity code generator", e); } @@ -147,18 +148,18 @@ public static String velocityEvaluate( } @NotNull - private static String updateTemplateWithIncludes(String template, List includes) { - var includeLookups = getParsedIncludeLookupItems(includes); - var defaultImportParseExpression = includeLookups.stream() - .filter(IncludeLookupItem::isDefaultInclude) - .map(i -> String.format("#parse(%s)", i.getName())) - .collect(Collectors.joining(System.getProperty("line.separator"))); - var templateWithDefaultImports = defaultImportParseExpression + System.getProperty("line.separator") + template; + private static String updateTemplateWithIncludes(final String template, final List includes) { + final var includeLookups = getParsedIncludeLookupItems(includes); + final var defaultImportParseExpression = includeLookups.stream() + .filter(IncludeLookupItem::isDefaultInclude) + .map(i -> String.format("#parse(%s)", i.getName())) + .collect(Collectors.joining(System.getProperty("line.separator"))); + final var templateWithDefaultImports = defaultImportParseExpression + System.getProperty("line.separator") + template; return replaceParseExpressions(templateWithDefaultImports, includeLookups); } @NotNull - private static List getParsedIncludeLookupItems(List includes) { + private static List getParsedIncludeLookupItems(final List includes) { final var includeLookups = includes.stream() .map(include -> new IncludeLookupItem(include.getName(), include.getContent(), include.isDefaultInclude())) .collect(Collectors.toList()); @@ -169,22 +170,22 @@ private static List getParsedIncludeLookupItems(List } @NotNull - private static String replaceParseExpressions(@NotNull String template, @NotNull List includeLookupItems) { + private static String replaceParseExpressions(@NotNull String template, @NotNull final List includeLookupItems) { template = template.lines()// .map(line -> replaceParseExpression(line, includeLookupItems))// .collect(Collectors.joining(System.getProperty("line.separator"))); return template; } - private static String replaceParseExpression(String line, List includeLookupItems) { + private static String replaceParseExpression(final String line, final List includeLookupItems) { if (line.trim().startsWith("#parse")) { - var includeName = line.trim().replace("#parse(", "") - .replace(")", "") - .replaceAll("\"", ""); - var includeContent = includeLookupItems.stream() - .filter(m -> m.getName().equals(includeName)) - .map(IncludeLookupItem::getContent) - .findFirst(); + final var includeName = line.trim().replace("#parse(", "") + .replace(")", "") + .replaceAll("\"", ""); + final var includeContent = includeLookupItems.stream() + .filter(m -> m.getName().equals(includeName)) + .map(IncludeLookupItem::getContent) + .findFirst(); if (includeContent.isPresent()) { return includeContent.get(); } @@ -200,7 +201,7 @@ private static String replaceParseExpression(String line, List getFields(PsiClass clazz) { + static List getFields(final PsiClass clazz) { return Arrays.stream(clazz.getFields()) .map(f -> EntryFactory.of(f, false)) .collect(Collectors.toList()); } - static List getAllFields(PsiClass clazz) { + static List getAllFields(final PsiClass clazz) { return Arrays.stream(clazz.getAllFields()) .map(f -> EntryFactory.of(f, false)) .collect(Collectors.toList()); } - static List getMethods(PsiClass clazz) { + static List getMethods(final PsiClass clazz) { return Arrays.stream(clazz.getMethods()) .map(EntryFactory::of) .collect(Collectors.toList()); } - static List getAllMethods(PsiClass clazz) { + static List getAllMethods(final PsiClass clazz) { return Arrays.stream(clazz.getAllMethods()) .map(EntryFactory::of) .collect(Collectors.toList()); } - static List getImportList(PsiJavaFile javaFile) { - var importList = javaFile.getImportList(); + static List getImportList(final PsiJavaFile javaFile) { + final var importList = javaFile.getImportList(); if (importList == null) { return new ArrayList<>(); } @@ -256,7 +257,7 @@ static List getImportList(PsiJavaFile javaFile) { .collect(Collectors.toList()); } - static List getClassTypeParameters(PsiClass psiClass) { + static List getClassTypeParameters(final PsiClass psiClass) { return Arrays.stream(psiClass.getTypeParameters()).map(PsiNamedElement::getName).collect(Collectors.toList()); } @@ -267,7 +268,7 @@ static final class IncludeLookupItem { private final String content; private boolean defaultInclude; - IncludeLookupItem(@NotNull String name, @NotNull String content, boolean defaultInclude) { + IncludeLookupItem(@NotNull final String name, @NotNull final String content, final boolean defaultInclude) { this.name = name; this.content = content; this.defaultInclude = defaultInclude; diff --git a/src/main/java/me/lotabout/codegenerator/util/PackageUtil.java b/src/main/java/me/lotabout/codegenerator/util/PackageUtil.java index 717bfe2..72e2f8a 100644 --- a/src/main/java/me/lotabout/codegenerator/util/PackageUtil.java +++ b/src/main/java/me/lotabout/codegenerator/util/PackageUtil.java @@ -3,6 +3,7 @@ import com.intellij.ide.IdeBundle; import com.intellij.ide.util.DirectoryChooserUtil; import com.intellij.openapi.application.ApplicationManager; +import com.intellij.openapi.application.WriteAction; import com.intellij.openapi.diagnostic.Logger; import com.intellij.openapi.module.Module; import com.intellij.openapi.module.ModuleUtil; @@ -10,6 +11,7 @@ import com.intellij.openapi.projectRoots.impl.ProjectRootUtil; import com.intellij.openapi.roots.ModulePackageIndex; import com.intellij.openapi.ui.Messages; +import com.intellij.openapi.util.ThrowableComputable; import com.intellij.openapi.vfs.VirtualFile; import com.intellij.psi.*; import com.intellij.psi.impl.file.PsiDirectoryFactory; @@ -29,16 +31,16 @@ public class PackageUtil { private static final Logger LOG = Logger.getInstance("me.lotabout.codegenerator.util.PackageUtil"); @Nullable - public static PsiDirectory findOrCreateDirectoryForPackage(@NotNull Project project, - @Nullable Module module, - String packageName, - @Nullable PsiDirectory baseDir, - boolean alwaysPrompt) throws IncorrectOperationException { + public static PsiDirectory findOrCreateDirectoryForPackage(@NotNull final Project project, + @Nullable final Module module, + final String packageName, + @Nullable final PsiDirectory baseDir, + final boolean alwaysPrompt) throws IncorrectOperationException { return findOrCreateDirectoryForPackage(project, module, packageName, baseDir, true, alwaysPrompt); } @Nullable - public static PsiDirectory findSourceDirectoryByModuleName(@NotNull Project project, @Nullable String moduleName) { + public static PsiDirectory findSourceDirectoryByModuleName(@NotNull final Project project, @Nullable final String moduleName) { return Arrays.stream(ProjectRootUtil.getSourceRootDirectories(project)) .filter(psiDirectory -> psiDirectory.getVirtualFile().getPath().contains(moduleName)) .findFirst() @@ -47,34 +49,34 @@ public static PsiDirectory findSourceDirectoryByModuleName(@NotNull Project proj @Nullable - public static PsiDirectory findOrCreateDirectoryForPackage(@NotNull Project project, - @Nullable Module module, + public static PsiDirectory findOrCreateDirectoryForPackage(@NotNull final Project project, + @Nullable final Module module, String packageName, - PsiDirectory baseDir, - boolean askUserToCreate, - boolean alwaysPrompt) throws IncorrectOperationException { + final PsiDirectory baseDir, + final boolean askUserToCreate, + final boolean alwaysPrompt) throws IncorrectOperationException { PsiDirectory psiDirectory = null; if (!alwaysPrompt && !packageName.isEmpty()) { PsiPackage rootPackage = findLongestExistingPackage(module, packageName); rootPackage = rootPackage == null ? findLongestExistingPackage(project, packageName) : rootPackage; if (rootPackage != null) { - int beginIndex = rootPackage.getQualifiedName().length() + 1; + final int beginIndex = rootPackage.getQualifiedName().length() + 1; packageName = beginIndex < packageName.length() ? packageName.substring(beginIndex) : ""; String postfixToShow = packageName.replace('.', File.separatorChar); if (packageName.length() > 0) { postfixToShow = File.separatorChar + postfixToShow; } - PsiDirectory[] moduleDirectories = getPackageDirectoriesInModule(rootPackage, module); - PsiDirectory initDir = findDirectory(moduleDirectories, baseDir); + final PsiDirectory[] moduleDirectories = getPackageDirectoriesInModule(rootPackage, module); + final PsiDirectory initDir = findDirectory(moduleDirectories, baseDir); psiDirectory = DirectoryChooserUtil.selectDirectory(project, moduleDirectories, initDir, postfixToShow); if (psiDirectory == null) return null; } } if (psiDirectory == null) { - PsiDirectory[] sourceDirectories = ProjectRootUtil.getSourceRootDirectories(project); - PsiDirectory initDir = findDirectory(sourceDirectories, baseDir); + final PsiDirectory[] sourceDirectories = ProjectRootUtil.getSourceRootDirectories(project); + final PsiDirectory initDir = findDirectory(sourceDirectories, baseDir); psiDirectory = DirectoryChooserUtil.selectDirectory(project, sourceDirectories, initDir, File.separatorChar + packageName.replace('.', File.separatorChar)); if (psiDirectory == null) return null; @@ -84,11 +86,11 @@ public static PsiDirectory findOrCreateDirectoryForPackage(@NotNull Project proj boolean askedToCreate = false; while (restOfName.length() > 0) { final String name = getLeftPart(restOfName); - PsiDirectory foundExistingDirectory = psiDirectory.findSubdirectory(name); + final PsiDirectory foundExistingDirectory = psiDirectory.findSubdirectory(name); if (foundExistingDirectory == null) { if (!askedToCreate && askUserToCreate) { if (!ApplicationManager.getApplication().isUnitTestMode()) { - int toCreate = Messages.showYesNoDialog(project, + final int toCreate = Messages.showYesNoDialog(project, IdeBundle.message("prompt.create.non.existing.package", packageName), IdeBundle.message("title.package.not.found"), Messages.getQuestionIcon()); @@ -101,16 +103,10 @@ public static PsiDirectory findOrCreateDirectoryForPackage(@NotNull Project proj final PsiDirectory psiDirectory1 = psiDirectory; try { - psiDirectory = ActionRunner.runInsideWriteAction(new ActionRunner.InterruptibleRunnableWithResult() { - public PsiDirectory run() throws Exception { - return psiDirectory1.createSubdirectory(name); - } - }); - } catch (IncorrectOperationException e) { + psiDirectory = WriteAction.compute(() -> psiDirectory1.createSubdirectory(name)); + } catch (final IncorrectOperationException e) { throw e; - } catch (IOException e) { - throw new IncorrectOperationException(e); - } catch (Exception e) { + } catch (final Exception e) { LOG.error(e); } } else { @@ -121,17 +117,17 @@ public PsiDirectory run() throws Exception { return psiDirectory; } - private static PsiDirectory[] getPackageDirectoriesInModule(PsiPackage rootPackage, Module module) { + private static PsiDirectory[] getPackageDirectoriesInModule(final PsiPackage rootPackage, final Module module) { return rootPackage.getDirectories(GlobalSearchScope.moduleScope(module)); } - private static PsiPackage findLongestExistingPackage(Project project, String packageName) { - PsiManager manager = PsiManager.getInstance(project); + private static PsiPackage findLongestExistingPackage(final Project project, final String packageName) { + final PsiManager manager = PsiManager.getInstance(project); String nameToMatch = packageName; while (true) { - PsiPackage aPackage = JavaPsiFacade.getInstance(manager.getProject()).findPackage(nameToMatch); + final PsiPackage aPackage = JavaPsiFacade.getInstance(manager.getProject()).findPackage(nameToMatch); if (aPackage != null && isWritablePackage(aPackage)) return aPackage; - int lastDotIndex = nameToMatch.lastIndexOf('.'); + final int lastDotIndex = nameToMatch.lastIndexOf('.'); if (lastDotIndex >= 0) { nameToMatch = nameToMatch.substring(0, lastDotIndex); } else { @@ -140,9 +136,9 @@ private static PsiPackage findLongestExistingPackage(Project project, String pac } } - private static boolean isWritablePackage(PsiPackage aPackage) { - PsiDirectory[] directories = aPackage.getDirectories(); - for (PsiDirectory directory : directories) { + private static boolean isWritablePackage(final PsiPackage aPackage) { + final PsiDirectory[] directories = aPackage.getDirectories(); + for (final PsiDirectory directory : directories) { if (directory.isValid() && directory.isWritable()) { return true; } @@ -150,10 +146,10 @@ private static boolean isWritablePackage(PsiPackage aPackage) { return false; } - private static PsiDirectory getWritableModuleDirectory(@NotNull Query vFiles, @NotNull Module module, PsiManager manager) { - for (VirtualFile vFile : vFiles) { + private static PsiDirectory getWritableModuleDirectory(@NotNull final Query vFiles, @NotNull final Module module, final PsiManager manager) { + for (final VirtualFile vFile : vFiles) { if (ModuleUtil.findModuleForFile(vFile, module.getProject()) != module) continue; - PsiDirectory directory = manager.findDirectory(vFile); + final PsiDirectory directory = manager.findDirectory(vFile); if (directory != null && directory.isValid() && directory.isWritable()) { return directory; } @@ -161,7 +157,7 @@ private static PsiDirectory getWritableModuleDirectory(@NotNull Query vFiles = ModulePackageIndex.getInstance(module).getDirsByPackageName(nameToMatch, false); - PsiDirectory directory = getWritableModuleDirectory(vFiles, module, manager); + final Query vFiles = ModulePackageIndex.getInstance(module).getDirsByPackageName(nameToMatch, false); + final PsiDirectory directory = getWritableModuleDirectory(vFiles, module, manager); if (directory != null) return JavaDirectoryService.getInstance().getPackage(directory); - int lastDotIndex = nameToMatch.lastIndexOf('.'); + final int lastDotIndex = nameToMatch.lastIndexOf('.'); if (lastDotIndex >= 0) { nameToMatch = nameToMatch.substring(0, lastDotIndex); } else { @@ -183,19 +179,19 @@ private static PsiPackage findLongestExistingPackage(Module module, String packa } } - private static String getLeftPart(String packageName) { - int index = packageName.indexOf('.'); + private static String getLeftPart(final String packageName) { + final int index = packageName.indexOf('.'); return index > -1 ? packageName.substring(0, index) : packageName; } - private static String cutLeftPart(String packageName) { - int index = packageName.indexOf('.'); + private static String cutLeftPart(final String packageName) { + final int index = packageName.indexOf('.'); return index > -1 ? packageName.substring(index + 1) : ""; } - private static PsiDirectory findDirectory(PsiDirectory[] directories, PsiDirectory baseDir) { + private static PsiDirectory findDirectory(final PsiDirectory[] directories, final PsiDirectory baseDir) { final VirtualFile baseFile = baseDir.getVirtualFile(); - for (PsiDirectory directory : directories) { + for (final PsiDirectory directory : directories) { if (directory.getVirtualFile().equals(baseFile)) { return directory; } @@ -203,4 +199,3 @@ private static PsiDirectory findDirectory(PsiDirectory[] directories, PsiDirecto return null; } } - From fbb6e3b384f8c6f67faccc28e72fffc087067210 Mon Sep 17 00:00:00 2001 From: Haixing Hu Date: Wed, 21 Aug 2024 04:18:06 +0800 Subject: [PATCH 05/15] refactor: use @XCollection to replace @AbstractCollection --- .../java/me/lotabout/codegenerator/config/CodeTemplate.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/main/java/me/lotabout/codegenerator/config/CodeTemplate.java b/src/main/java/me/lotabout/codegenerator/config/CodeTemplate.java index d58ead7..a6e66e5 100644 --- a/src/main/java/me/lotabout/codegenerator/config/CodeTemplate.java +++ b/src/main/java/me/lotabout/codegenerator/config/CodeTemplate.java @@ -2,7 +2,8 @@ import com.intellij.openapi.util.io.FileUtil; -import com.intellij.util.xmlb.annotations.AbstractCollection; +import com.intellij.util.xmlb.annotations.XCollection; + import org.apache.commons.lang3.builder.EqualsBuilder; import org.apache.commons.lang3.builder.HashCodeBuilder; import org.jetbrains.java.generate.config.DuplicationPolicy; @@ -32,7 +33,7 @@ public class CodeTemplate { @XmlElement(name="classSelection", type=ClassSelectionConfig.class) }) @XmlElementWrapper - @AbstractCollection(elementTypes = {MemberSelectionConfig.class, ClassSelectionConfig.class}) + @XCollection(elementTypes = {MemberSelectionConfig.class, ClassSelectionConfig.class}) public List pipeline = new ArrayList<>(); public InsertWhere insertNewMethodOption = InsertWhere.AT_CARET; From d1f9f0451de20bfaf1f80695d98af933379bf4b6 Mon Sep 17 00:00:00 2001 From: Haixing Hu Date: Wed, 21 Aug 2024 04:20:08 +0800 Subject: [PATCH 06/15] fix: the incorrect usage of String.replaceAll() has been fixed --- .../me/lotabout/codegenerator/action/CodeGeneratorAction.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/me/lotabout/codegenerator/action/CodeGeneratorAction.java b/src/main/java/me/lotabout/codegenerator/action/CodeGeneratorAction.java index c3a9a44..affd743 100644 --- a/src/main/java/me/lotabout/codegenerator/action/CodeGeneratorAction.java +++ b/src/main/java/me/lotabout/codegenerator/action/CodeGeneratorAction.java @@ -331,7 +331,7 @@ private static PsiClass buildFakeClassForEmptyFile(@NotNull final PsiJavaFile fi final String packageName = file.getVirtualFile().getPath() .substring(moduleRoot.getPath().length() + 1) .replace(File.separator + fileName, "") - .replaceAll(File.separator, "."); + .replace(File.separator, "."); try { final PsiFile element = PsiFileFactory.getInstance(project) From 35f1a6a4f80f94e9d1a5071bc201f3765effd429 Mon Sep 17 00:00:00 2001 From: Haixing Hu Date: Wed, 21 Aug 2024 10:47:45 +0800 Subject: [PATCH 07/15] style: fix coding styles and potential bugs --- .../codegenerator/CodeGeneratorSettings.java | 39 +++-- .../action/CodeGeneratorAction.java | 146 +++++++++++------- .../action/CodeGeneratorGroup.java | 35 +++-- .../config/ClassSelectionConfig.java | 27 +++- .../codegenerator/config/CodeTemplate.java | 27 +++- .../config/CodeTemplateList.java | 34 ++-- .../config/MemberSelectionConfig.java | 8 +- .../codegenerator/config/include/Include.java | 13 +- .../config/include/IncludeList.java | 32 ++-- .../codegenerator/ui/ClassSelectionPane.java | 9 +- .../codegenerator/ui/CodeGeneratorConfig.java | 108 ++++++------- .../ui/CodeGeneratorConfigurable.java | 15 +- .../codegenerator/ui/MainPaneConfig.java | 8 +- .../codegenerator/ui/MemberSelectionPane.java | 24 +-- .../codegenerator/ui/PipelineStepConfig.java | 4 +- .../codegenerator/ui/SelectionPane.java | 20 ++- .../codegenerator/ui/TemplateEditPane.java | 62 ++++---- .../ui/include/IncludeConfig.java | 91 ++++++----- .../ui/include/IncludeEditPane.java | 28 ++-- .../codegenerator/util/AnnotationEntry.java | 5 +- .../codegenerator/util/AnnotationUtil.java | 10 +- .../codegenerator/util/ClassEntry.java | 72 +++++---- .../codegenerator/util/EntryFactory.java | 32 ++-- .../codegenerator/util/EntryUtils.java | 51 +++--- .../codegenerator/util/FieldEntry.java | 35 +++-- .../codegenerator/util/GenerationUtil.java | 66 +++++--- .../codegenerator/util/MethodEntry.java | 51 +++--- .../codegenerator/util/PackageUtil.java | 52 ++++--- .../codegenerator/worker/JavaBodyWorker.java | 103 ++++++------ .../codegenerator/worker/JavaCaretWorker.java | 36 +++-- .../codegenerator/worker/JavaClassWorker.java | 64 +++++--- 31 files changed, 748 insertions(+), 559 deletions(-) diff --git a/src/main/java/me/lotabout/codegenerator/CodeGeneratorSettings.java b/src/main/java/me/lotabout/codegenerator/CodeGeneratorSettings.java index cc11e63..aa57b0d 100644 --- a/src/main/java/me/lotabout/codegenerator/CodeGeneratorSettings.java +++ b/src/main/java/me/lotabout/codegenerator/CodeGeneratorSettings.java @@ -1,20 +1,23 @@ package me.lotabout.codegenerator; +import java.io.IOException; +import java.io.InputStream; +import java.util.ArrayList; +import java.util.List; +import java.util.Optional; + +import org.jetbrains.annotations.Nullable; + import com.intellij.openapi.components.PersistentStateComponent; import com.intellij.openapi.components.State; import com.intellij.openapi.components.Storage; import com.intellij.openapi.diagnostic.Logger; import com.intellij.openapi.util.io.FileUtil; import com.intellij.util.xmlb.XmlSerializerUtil; + import me.lotabout.codegenerator.config.CodeTemplate; import me.lotabout.codegenerator.config.CodeTemplateList; import me.lotabout.codegenerator.config.include.Include; -import org.jetbrains.annotations.Nullable; - -import java.io.IOException; -import java.util.ArrayList; -import java.util.List; -import java.util.Optional; @State(name = "CodeGeneratorSettings", storages = {@Storage("$APP_CONFIG$/CodeGenerator-settings.xml")}) public class CodeGeneratorSettings implements PersistentStateComponent { @@ -34,11 +37,11 @@ public List getIncludes() { return includes; } - public void setIncludes(List includes) { + public void setIncludes(final List includes) { this.includes = includes; } - public CodeGeneratorSettings setCodeTemplates(List codeTemplates) { + public CodeGeneratorSettings setCodeTemplates(final List codeTemplates) { this.codeTemplates = codeTemplates; return this; } @@ -54,7 +57,7 @@ public CodeGeneratorSettings getState() { } @Override - public void loadState(CodeGeneratorSettings codeGeneratorSettings) { + public void loadState(final CodeGeneratorSettings codeGeneratorSettings) { XmlSerializerUtil.copyBean(codeGeneratorSettings, this); } @@ -65,35 +68,39 @@ public List getCodeTemplates() { return codeTemplates; } - public Optional getCodeTemplate(String templateId) { + public Optional getCodeTemplate(final String templateId) { return codeTemplates.stream() .filter(t -> t != null && t.getId().equals(templateId)) .findFirst(); } - public Optional getInclude(String includeId) { + public Optional getInclude(final String includeId) { return includes.stream() .filter(t -> t != null && t.getId().equals(includeId)) .findFirst(); } - public void removeCodeTemplate(String templateId) { + public void removeCodeTemplate(final String templateId) { codeTemplates.removeIf(template -> template.name.equals(templateId)); } private List loadDefaultTemplates() { - List templates = new ArrayList<>(); + final List templates = new ArrayList<>(); try { templates.addAll(loadTemplates("getters-and-setters.xml")); templates.addAll(loadTemplates("to-string.xml")); templates.addAll(loadTemplates("HUE-Serialization.xml")); - } catch (Exception e) { + } catch (final Exception e) { LOGGER.error("loadDefaultTemplates failed", e); } return templates; } - private List loadTemplates(String templateFileName) throws IOException { - return CodeTemplateList.fromXML(FileUtil.loadTextAndClose(CodeGeneratorSettings.class.getResourceAsStream("/template/" + templateFileName))); + private List loadTemplates(final String templateFileName) throws IOException { + final InputStream in = CodeGeneratorSettings.class.getResourceAsStream("/template/" + templateFileName); + if (in == null) { + throw new IOException("Resource not found: " + templateFileName); + } + return CodeTemplateList.fromXML(FileUtil.loadTextAndClose(in)); } } diff --git a/src/main/java/me/lotabout/codegenerator/action/CodeGeneratorAction.java b/src/main/java/me/lotabout/codegenerator/action/CodeGeneratorAction.java index affd743..a815369 100644 --- a/src/main/java/me/lotabout/codegenerator/action/CodeGeneratorAction.java +++ b/src/main/java/me/lotabout/codegenerator/action/CodeGeneratorAction.java @@ -1,5 +1,22 @@ package me.lotabout.codegenerator.action; +import java.awt.BorderLayout; +import java.io.File; +import java.util.Collections; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; + +import javax.swing.JPanel; + +import org.apache.commons.lang3.StringUtils; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; +import org.jetbrains.java.generate.config.Config; +import org.jetbrains.java.generate.config.FilterPattern; +import org.jetbrains.java.generate.exception.GenerateCodeException; + import com.intellij.codeInsight.generation.PsiElementClassMember; import com.intellij.codeInsight.generation.PsiFieldMember; import com.intellij.codeInsight.generation.PsiMethodMember; @@ -20,11 +37,20 @@ import com.intellij.openapi.ui.DialogWrapper; import com.intellij.openapi.ui.Messages; import com.intellij.openapi.vfs.VirtualFile; -import com.intellij.psi.*; +import com.intellij.psi.JavaPsiFacade; +import com.intellij.psi.PsiClass; +import com.intellij.psi.PsiElement; +import com.intellij.psi.PsiField; +import com.intellij.psi.PsiFile; +import com.intellij.psi.PsiFileFactory; +import com.intellij.psi.PsiJavaFile; +import com.intellij.psi.PsiMember; +import com.intellij.psi.PsiMethod; import com.intellij.psi.search.GlobalSearchScope; import com.intellij.psi.util.PsiTreeUtil; import com.intellij.psi.util.PsiUtil; import com.intellij.util.IncorrectOperationException; + import me.lotabout.codegenerator.CodeGeneratorSettings; import me.lotabout.codegenerator.config.ClassSelectionConfig; import me.lotabout.codegenerator.config.CodeTemplate; @@ -36,21 +62,8 @@ import me.lotabout.codegenerator.worker.JavaBodyWorker; import me.lotabout.codegenerator.worker.JavaCaretWorker; import me.lotabout.codegenerator.worker.JavaClassWorker; -import org.apache.commons.lang3.StringUtils; -import org.jetbrains.annotations.NotNull; -import org.jetbrains.annotations.Nullable; -import org.jetbrains.java.generate.config.Config; -import org.jetbrains.java.generate.config.FilterPattern; -import org.jetbrains.java.generate.exception.GenerateCodeException; -import javax.swing.*; -import java.awt.*; -import java.io.File; -import java.util.Collections; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.stream.Collectors; +import static me.lotabout.codegenerator.util.GenerationUtil.velocityEvaluate; public class CodeGeneratorAction extends AnAction { private static final Logger logger = Logger.getInstance(CodeGeneratorAction.class); @@ -75,7 +88,7 @@ public void update(final AnActionEvent e) { } final PsiFile file = e.getDataContext().getData(LangDataKeys.PSI_FILE); - if (file == null || !(file instanceof PsiJavaFile)) { + if (!(file instanceof PsiJavaFile)) { presentation.setEnabled(false); } @@ -83,12 +96,13 @@ public void update(final AnActionEvent e) { } @Override public void actionPerformed(final AnActionEvent e) { - final CodeTemplate codeTemplate = settings.getCodeTemplate(templateKey).orElseThrow(IllegalStateException::new); + final CodeTemplate codeTemplate = settings.getCodeTemplate(templateKey) + .orElseThrow(IllegalStateException::new); final Project project = e.getProject(); assert project != null; final PsiFile file = e.getDataContext().getData(LangDataKeys.PSI_FILE); - assert file != null && file instanceof PsiJavaFile; + assert file instanceof PsiJavaFile; final PsiJavaFile javaFile = (PsiJavaFile)file; @@ -123,7 +137,8 @@ public void update(final AnActionEvent e) { } } - private Map executePipeline(@NotNull final CodeTemplate codeTemplate, @NotNull final PsiJavaFile file, final Editor editor) { + private Map executePipeline(@NotNull final CodeTemplate codeTemplate, + @NotNull final PsiJavaFile file, final Editor editor) { final Project project = file.getProject(); logger.debug("+++ executePipeline - START +++"); if (logger.isDebugEnabled()) { @@ -157,10 +172,10 @@ private Map executePipeline(@NotNull final CodeTemplate codeTemp final List selectedMembers = selectMember(file, (MemberSelectionConfig) step, contextMap); if (selectedMembers == null) return null; GenerationUtil.insertMembersToContext(selectedMembers, - Collections.emptyList(), - contextMap, - step.postfix(), - ((MemberSelectionConfig) step).sortElements); + Collections.emptyList(), + contextMap, + step.postfix(), + ((MemberSelectionConfig) step).sortElements); break; default: throw new IllegalStateException("step type not recognized: " + step.type()); @@ -187,16 +202,19 @@ private static PsiClass getSubjectClass(final Editor editor, @NotNull final PsiJ return clazz; } - private PsiClass selectClass(@NotNull final PsiJavaFile file, final ClassSelectionConfig config, final Map contextMap) { + private PsiClass selectClass(@NotNull final PsiJavaFile file, + final ClassSelectionConfig config, final Map contextMap) { final String initialClassNameTemplate = config.initialClass; final Project project = file.getProject(); try { - final String className = GenerationUtil.velocityEvaluate(project, contextMap, contextMap, initialClassNameTemplate, settings.getIncludes()); - if (logger.isDebugEnabled()) logger.debug("Initial class name for class selection is" + className); - + final String className = velocityEvaluate(project, contextMap, + contextMap, initialClassNameTemplate, settings.getIncludes()); + logger.debug("Initial class name for class selection is ", className); PsiClass initialClass = null; if (!StringUtils.isEmpty(className)) { - initialClass = JavaPsiFacade.getInstance(project).findClass(className, GlobalSearchScope.allScope(project)); + initialClass = JavaPsiFacade + .getInstance(project) + .findClass(className, GlobalSearchScope.allScope(project)); } if (initialClass == null) { @@ -204,8 +222,9 @@ private PsiClass selectClass(@NotNull final PsiJavaFile file, final ClassSelecti initialClass = file.getClasses().length > 0 ? file.getClasses()[0] : null; } - final TreeClassChooser chooser = TreeClassChooserFactory.getInstance(project) - .createProjectScopeChooser("Select a class", initialClass); + final TreeClassChooser chooser = TreeClassChooserFactory + .getInstance(project) + .createProjectScopeChooser("Select a class", initialClass); chooser.showDialog(); if (chooser.getSelected() == null) { @@ -218,13 +237,14 @@ private PsiClass selectClass(@NotNull final PsiJavaFile file, final ClassSelecti return null; } - private List selectMember(@NotNull final PsiJavaFile file, final MemberSelectionConfig config, final Map contextMap) { + private List selectMember(@NotNull final PsiJavaFile file, + final MemberSelectionConfig config, final Map contextMap) { final String AVAILABLE_MEMBERS = "availableMembers"; final String SELECTED_MEMBERS = "selectedMembers"; final Project project = file.getProject(); - if (logger.isDebugEnabled()) logger.debug("start to select members by template: ", config.providerTemplate); - GenerationUtil.velocityEvaluate(project, contextMap, contextMap, config.providerTemplate,settings.getIncludes()); + logger.debug("start to select members by template: ", config.providerTemplate); + velocityEvaluate(project, contextMap, contextMap, config.providerTemplate,settings.getIncludes()); // members should be MemberEntry[] or PsiMember[] List availableMembers = Collections.emptyList(); @@ -243,14 +263,18 @@ private List selectMember(@NotNull final PsiJavaFile file, final Memb final PsiElementClassMember[] membersSelected = buildClassMember(filterMembers(selectedMembers, config)); if (!config.allowEmptySelection && dialogMembers.length <= 0) { - Messages.showMessageDialog(project, "No members are provided to select from.\nAnd template doesn't allow empty selection", - "Warning", Messages.getWarningIcon()); + Messages.showMessageDialog(project, + "No members are provided to select from.\nAnd template doesn't allow empty selection", + "Warning", Messages.getWarningIcon()); return null; } final MemberChooser chooser = - new MemberChooser(dialogMembers, config.allowEmptySelection, config.allowMultiSelection, project, PsiUtil.isLanguageLevel5OrHigher(file), new JPanel(new BorderLayout())) { - @Nullable + new MemberChooser<>(dialogMembers, config.allowEmptySelection, + config.allowMultiSelection, project, + PsiUtil.isLanguageLevel5OrHigher(file), + new JPanel(new BorderLayout())) { + @NotNull @Override protected String getHelpId() { return "editing.altInsert.codegenerator"; @@ -268,7 +292,8 @@ protected String getHelpId() { return GenerationUtil.convertClassMembersToPsiMembers(chooser.getSelectedElements()); } - private static List filterMembers(final List members, final MemberSelectionConfig config) { + private static List filterMembers(final List members, + final MemberSelectionConfig config) { final FilterPattern pattern = generatorConfig2Config(config).getFilterPattern(); return members.stream() .map(member -> { @@ -292,19 +317,17 @@ private static List filterMembers(final List members, final M } private static PsiElementClassMember[] buildClassMember(final List members) { - final List ret = members.stream() - .filter(m -> (m instanceof PsiField) || (m instanceof PsiMethod)) - .map(m -> { - if (m instanceof PsiField) { - return new PsiFieldMember((PsiField) m); - } else if (m instanceof PsiMethod) { - return new PsiMethodMember((PsiMethod) m); - } else { - return null; - } - }).collect(Collectors.toList()); - return ret.toArray(new PsiElementClassMember[ret.size()]); + return members + .stream() + .filter(m -> (m instanceof PsiField) || (m instanceof PsiMethod)) + .map(m -> { + if (m instanceof PsiField) { + return new PsiFieldMember((PsiField) m); + } else { + return new PsiMethodMember((PsiMethod) m); + } + }).toArray(PsiElementClassMember[]::new); } private static Config generatorConfig2Config(final MemberSelectionConfig selectionConfig) { @@ -325,19 +348,24 @@ private static Config generatorConfig2Config(final MemberSelectionConfig selecti private static PsiClass buildFakeClassForEmptyFile(@NotNull final PsiJavaFile file) { final Project project = file.getProject(); - final VirtualFile moduleRoot = ProjectRootManager.getInstance(project).getFileIndex().getSourceRootForFile(file.getVirtualFile()); + final VirtualFile moduleRoot = ProjectRootManager + .getInstance(project) + .getFileIndex() + .getSourceRootForFile(file.getVirtualFile()); final String fileName = file.getName(); final String className = fileName.replace(".java", ""); - final String packageName = file.getVirtualFile().getPath() - .substring(moduleRoot.getPath().length() + 1) - .replace(File.separator + fileName, "") - .replace(File.separator, "."); + final String packageName = file + .getVirtualFile() + .getPath() + .substring(moduleRoot.getPath().length() + 1) + .replace(File.separator + fileName, "") + .replace(File.separator, "."); try { - final PsiFile element = PsiFileFactory.getInstance(project) - .createFileFromText("filename", JavaFileType.INSTANCE, - "package " + packageName + ";\n" + - "class " + className + "{}"); + final PsiFile element = PsiFileFactory + .getInstance(project) + .createFileFromText("filename", JavaFileType.INSTANCE, + "package " + packageName + ";\n" + "class " + className + "{}"); return (PsiClass) element.getLastChild(); } catch (final IncorrectOperationException ignore) { } diff --git a/src/main/java/me/lotabout/codegenerator/action/CodeGeneratorGroup.java b/src/main/java/me/lotabout/codegenerator/action/CodeGeneratorGroup.java index 2182304..03e3195 100644 --- a/src/main/java/me/lotabout/codegenerator/action/CodeGeneratorGroup.java +++ b/src/main/java/me/lotabout/codegenerator/action/CodeGeneratorGroup.java @@ -1,6 +1,16 @@ package me.lotabout.codegenerator.action; -import com.intellij.openapi.actionSystem.*; +import java.util.List; + +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; + +import com.intellij.openapi.actionSystem.ActionGroup; +import com.intellij.openapi.actionSystem.ActionManager; +import com.intellij.openapi.actionSystem.AnAction; +import com.intellij.openapi.actionSystem.AnActionEvent; +import com.intellij.openapi.actionSystem.LangDataKeys; +import com.intellij.openapi.actionSystem.PlatformDataKeys; import com.intellij.openapi.application.ApplicationManager; import com.intellij.openapi.editor.Caret; import com.intellij.openapi.project.DumbAware; @@ -9,16 +19,13 @@ import com.intellij.psi.PsiElement; import com.intellij.psi.PsiFile; import com.intellij.psi.util.PsiTreeUtil; + import me.lotabout.codegenerator.CodeGeneratorSettings; import me.lotabout.codegenerator.config.CodeTemplate; -import org.jetbrains.annotations.NotNull; -import org.jetbrains.annotations.Nullable; - -import java.util.List; -import java.util.stream.Collectors; public class CodeGeneratorGroup extends ActionGroup implements DumbAware { - private CodeGeneratorSettings settings; + + private final CodeGeneratorSettings settings; public CodeGeneratorGroup() { settings = ApplicationManager.getApplication().getService(CodeGeneratorSettings.class); @@ -26,17 +33,17 @@ public CodeGeneratorGroup() { @NotNull @Override public AnAction[] getChildren(@Nullable final AnActionEvent anActionEvent) { if (anActionEvent == null) { - return AnAction.EMPTY_ARRAY; + return EMPTY_ARRAY; } final Project project = PlatformDataKeys.PROJECT.getData(anActionEvent.getDataContext()); if (project == null) { - return AnAction.EMPTY_ARRAY; + return EMPTY_ARRAY; } final PsiFile file = anActionEvent.getDataContext().getData(LangDataKeys.PSI_FILE); if (file == null) { - return AnAction.EMPTY_ARRAY; + return EMPTY_ARRAY; } final Caret caret = anActionEvent.getDataContext().getData(LangDataKeys.CARET); @@ -48,19 +55,17 @@ public CodeGeneratorGroup() { final PsiClass clazz = PsiTreeUtil.getParentOfType(element, PsiClass.class, false); if (clazz == null) { // not inside a class - return AnAction.EMPTY_ARRAY; + return EMPTY_ARRAY; } } - final String fileName = file.getName(); final List children = settings.getCodeTemplates().stream() .filter(t -> !isProjectView || (t.type.equals("class") && isProjectView)) .filter(t -> t.enabled && fileName.matches(t.fileNamePattern)) .map(CodeGeneratorGroup::getOrCreateAction) - .collect(Collectors.toList()); - - return children.toArray(new AnAction[children.size()]); + .toList(); + return children.toArray(new AnAction[0]); } private static AnAction getOrCreateAction(final CodeTemplate template) { diff --git a/src/main/java/me/lotabout/codegenerator/config/ClassSelectionConfig.java b/src/main/java/me/lotabout/codegenerator/config/ClassSelectionConfig.java index 6a174c0..210a263 100644 --- a/src/main/java/me/lotabout/codegenerator/config/ClassSelectionConfig.java +++ b/src/main/java/me/lotabout/codegenerator/config/ClassSelectionConfig.java @@ -1,5 +1,7 @@ package me.lotabout.codegenerator.config; +import java.util.Objects; + import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; import javax.xml.bind.annotation.XmlRootElement; @@ -7,10 +9,15 @@ @XmlRootElement(name = "classSelection") @XmlAccessorType(XmlAccessType.FIELD) public class ClassSelectionConfig implements PipelineStep { + public String initialClass = "$class0.qualifiedName"; + public boolean enabled = true; + public String postfix = ""; - @Override public String type() { + + @Override + public String type() { return "class-selection"; } @@ -20,7 +27,7 @@ public String postfix() { } @Override - public void postfix(String postfix) { + public void postfix(final String postfix) { this.postfix = postfix; } @@ -30,20 +37,24 @@ public boolean enabled() { } @Override - public void enabled(boolean enabled) { + public void enabled(final boolean enabled) { this.enabled = enabled; } @Override - public boolean equals(Object o) { + public boolean equals(final Object o) { if (this == o) return true; if (o == null || getClass() != o.getClass()) return false; - ClassSelectionConfig that = (ClassSelectionConfig) o; + final ClassSelectionConfig that = (ClassSelectionConfig) o; - if (enabled != that.enabled) return false; - if (initialClass != null ? !initialClass.equals(that.initialClass) : that.initialClass != null) return false; - return postfix != null ? postfix.equals(that.postfix) : that.postfix == null; + if (enabled != that.enabled) { + return false; + } + if (!Objects.equals(initialClass, that.initialClass)) { + return false; + } + return (postfix != null) ? postfix.equals(that.postfix) : (that.postfix == null); } @Override diff --git a/src/main/java/me/lotabout/codegenerator/config/CodeTemplate.java b/src/main/java/me/lotabout/codegenerator/config/CodeTemplate.java index a6e66e5..1abcc98 100644 --- a/src/main/java/me/lotabout/codegenerator/config/CodeTemplate.java +++ b/src/main/java/me/lotabout/codegenerator/config/CodeTemplate.java @@ -1,19 +1,26 @@ package me.lotabout.codegenerator.config; -import com.intellij.openapi.util.io.FileUtil; +import java.io.IOException; +import java.io.InputStream; +import java.util.ArrayList; +import java.util.List; +import java.util.UUID; -import com.intellij.util.xmlb.annotations.XCollection; +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlAttribute; +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlElementWrapper; +import javax.xml.bind.annotation.XmlElements; +import javax.xml.bind.annotation.XmlRootElement; import org.apache.commons.lang3.builder.EqualsBuilder; import org.apache.commons.lang3.builder.HashCodeBuilder; import org.jetbrains.java.generate.config.DuplicationPolicy; import org.jetbrains.java.generate.config.InsertWhere; -import javax.xml.bind.annotation.*; -import java.io.IOException; -import java.util.ArrayList; -import java.util.List; -import java.util.UUID; +import com.intellij.openapi.util.io.FileUtil; +import com.intellij.util.xmlb.annotations.XCollection; @XmlRootElement(name = "codeTemplate") @XmlAccessorType(XmlAccessType.FIELD) @@ -74,7 +81,11 @@ public boolean isValid() { static { String default_template; try { - default_template = FileUtil.loadTextAndClose(CodeTemplate.class.getResourceAsStream("/template/default.vm")); + final InputStream in = CodeTemplate.class.getResourceAsStream("/template/default.vm"); + if (in == null) { + throw new IOException("Cannot find default template"); + } + default_template = FileUtil.loadTextAndClose(in); } catch (final IOException e) { default_template = ""; e.printStackTrace(); diff --git a/src/main/java/me/lotabout/codegenerator/config/CodeTemplateList.java b/src/main/java/me/lotabout/codegenerator/config/CodeTemplateList.java index c5039c2..80ba9f8 100644 --- a/src/main/java/me/lotabout/codegenerator/config/CodeTemplateList.java +++ b/src/main/java/me/lotabout/codegenerator/config/CodeTemplateList.java @@ -1,14 +1,15 @@ package me.lotabout.codegenerator.config; +import java.io.StringReader; +import java.io.StringWriter; +import java.util.ArrayList; +import java.util.List; + import javax.xml.bind.JAXB; import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlElementWrapper; -import java.io.StringReader; -import java.io.StringWriter; -import java.util.ArrayList; -import java.util.List; @XmlAccessorType(XmlAccessType.FIELD) public class CodeTemplateList { @@ -17,10 +18,12 @@ public class CodeTemplateList { private List templates = new ArrayList<>(); public CodeTemplateList() {} - public CodeTemplateList(List templates) { + + public CodeTemplateList(final List templates) { this.templates.addAll(templates); } - public CodeTemplateList(CodeTemplate template) { + + public CodeTemplateList(final CodeTemplate template) { this.templates.add(template); } @@ -29,26 +32,25 @@ public List getTemplates() { return templates; } - public void setTemplates(List templates) { + public void setTemplates(final List templates) { this.templates = templates; } - public static List fromXML(String xml) { - CodeTemplateList list = JAXB.unmarshal(new StringReader(xml), CodeTemplateList.class); + public static List fromXML(final String xml) { + final CodeTemplateList list = JAXB.unmarshal(new StringReader(xml), CodeTemplateList.class); return list.getTemplates(); } - public static String toXML(List templates) { - CodeTemplateList templateList = new CodeTemplateList(templates); - StringWriter sw = new StringWriter(); + public static String toXML(final List templates) { + final CodeTemplateList templateList = new CodeTemplateList(templates); + final StringWriter sw = new StringWriter(); JAXB.marshal(templateList, sw); return sw.toString(); } - public static String toXML(CodeTemplate templates) { - CodeTemplateList templateList = new CodeTemplateList(templates); - StringWriter sw = new StringWriter(); + public static String toXML(final CodeTemplate templates) { + final CodeTemplateList templateList = new CodeTemplateList(templates); + final StringWriter sw = new StringWriter(); JAXB.marshal(templateList, sw); return sw.toString(); } } - diff --git a/src/main/java/me/lotabout/codegenerator/config/MemberSelectionConfig.java b/src/main/java/me/lotabout/codegenerator/config/MemberSelectionConfig.java index a48bf84..7b2d7dd 100644 --- a/src/main/java/me/lotabout/codegenerator/config/MemberSelectionConfig.java +++ b/src/main/java/me/lotabout/codegenerator/config/MemberSelectionConfig.java @@ -34,7 +34,7 @@ public String postfix() { } @Override - public void postfix(String postfix) { + public void postfix(final String postfix) { this.postfix = postfix; } @@ -44,16 +44,16 @@ public boolean enabled() { } @Override - public void enabled(boolean enabled) { + public void enabled(final boolean enabled) { this.enabled = enabled; } @Override - public boolean equals(Object o) { + public boolean equals(final Object o) { if (this == o) return true; if (o == null || getClass() != o.getClass()) return false; - MemberSelectionConfig that = (MemberSelectionConfig) o; + final MemberSelectionConfig that = (MemberSelectionConfig) o; if (filterConstantField != that.filterConstantField) return false; if (filterEnumField != that.filterEnumField) return false; diff --git a/src/main/java/me/lotabout/codegenerator/config/include/Include.java b/src/main/java/me/lotabout/codegenerator/config/include/Include.java index 076b50c..89ffade 100644 --- a/src/main/java/me/lotabout/codegenerator/config/include/Include.java +++ b/src/main/java/me/lotabout/codegenerator/config/include/Include.java @@ -1,12 +1,17 @@ package me.lotabout.codegenerator.config.include; -import com.intellij.openapi.util.io.FileUtil; +import java.io.IOException; +import java.util.UUID; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlAttribute; +import javax.xml.bind.annotation.XmlRootElement; + import org.apache.commons.lang3.builder.EqualsBuilder; import org.apache.commons.lang3.builder.HashCodeBuilder; -import javax.xml.bind.annotation.*; -import java.io.IOException; -import java.util.UUID; +import com.intellij.openapi.util.io.FileUtil; @XmlRootElement(name = "include") @XmlAccessorType(XmlAccessType.FIELD) diff --git a/src/main/java/me/lotabout/codegenerator/config/include/IncludeList.java b/src/main/java/me/lotabout/codegenerator/config/include/IncludeList.java index 4414d9b..c7a6160 100644 --- a/src/main/java/me/lotabout/codegenerator/config/include/IncludeList.java +++ b/src/main/java/me/lotabout/codegenerator/config/include/IncludeList.java @@ -1,14 +1,15 @@ package me.lotabout.codegenerator.config.include; +import java.io.StringReader; +import java.io.StringWriter; +import java.util.ArrayList; +import java.util.List; + import javax.xml.bind.JAXB; import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlElementWrapper; -import java.io.StringReader; -import java.io.StringWriter; -import java.util.ArrayList; -import java.util.List; @XmlAccessorType(XmlAccessType.FIELD) public class IncludeList { @@ -19,11 +20,11 @@ public class IncludeList { public IncludeList() { } - public IncludeList(List includes) { + public IncludeList(final List includes) { this.includes.addAll(includes); } - public IncludeList(Include template) { + public IncludeList(final Include template) { this.includes.add(template); } @@ -32,27 +33,26 @@ public List getIncludes() { return includes; } - public void setIncludes(List includes) { + public void setIncludes(final List includes) { this.includes = includes; } - public static List fromXML(String xml) { - var list = JAXB.unmarshal(new StringReader(xml), IncludeList.class); + public static List fromXML(final String xml) { + final var list = JAXB.unmarshal(new StringReader(xml), IncludeList.class); return list.getIncludes(); } - public static String toXML(List templates) { - var templateList = new IncludeList(templates); - var sw = new StringWriter(); + public static String toXML(final List templates) { + final var templateList = new IncludeList(templates); + final var sw = new StringWriter(); JAXB.marshal(templateList, sw); return sw.toString(); } - public static String toXML(Include templates) { - var templateList = new IncludeList(templates); - var sw = new StringWriter(); + public static String toXML(final Include templates) { + final var templateList = new IncludeList(templates); + final var sw = new StringWriter(); JAXB.marshal(templateList, sw); return sw.toString(); } } - diff --git a/src/main/java/me/lotabout/codegenerator/ui/ClassSelectionPane.java b/src/main/java/me/lotabout/codegenerator/ui/ClassSelectionPane.java index 2d705c6..85af453 100644 --- a/src/main/java/me/lotabout/codegenerator/ui/ClassSelectionPane.java +++ b/src/main/java/me/lotabout/codegenerator/ui/ClassSelectionPane.java @@ -1,20 +1,21 @@ package me.lotabout.codegenerator.ui; -import me.lotabout.codegenerator.config.ClassSelectionConfig; +import javax.swing.JPanel; +import javax.swing.JTextField; -import javax.swing.*; +import me.lotabout.codegenerator.config.ClassSelectionConfig; public class ClassSelectionPane implements PipelineStepConfig { private JPanel topPane; private JTextField initialClassText; - public ClassSelectionPane(ClassSelectionConfig config) { + public ClassSelectionPane(final ClassSelectionConfig config) { initialClassText.setText(config.initialClass); } @Override public ClassSelectionConfig getConfig() { - ClassSelectionConfig config = new ClassSelectionConfig(); + final ClassSelectionConfig config = new ClassSelectionConfig(); config.initialClass = initialClassText.getText(); return config; } diff --git a/src/main/java/me/lotabout/codegenerator/ui/CodeGeneratorConfig.java b/src/main/java/me/lotabout/codegenerator/ui/CodeGeneratorConfig.java index 15039f7..f246ca5 100644 --- a/src/main/java/me/lotabout/codegenerator/ui/CodeGeneratorConfig.java +++ b/src/main/java/me/lotabout/codegenerator/ui/CodeGeneratorConfig.java @@ -1,33 +1,36 @@ package me.lotabout.codegenerator.ui; +import java.awt.event.ActionEvent; +import java.io.IOException; +import java.nio.file.Files; +import java.nio.file.Paths; +import java.nio.file.StandardOpenOption; +import java.util.ArrayList; +import java.util.List; +import java.util.concurrent.CompletableFuture; + +import javax.swing.DefaultListModel; +import javax.swing.JButton; +import javax.swing.JList; +import javax.swing.JPanel; +import javax.swing.JScrollPane; +import javax.swing.JSplitPane; + import com.intellij.openapi.fileChooser.FileChooser; -import com.intellij.openapi.fileChooser.FileChooserDescriptor; import com.intellij.openapi.fileChooser.FileChooserDescriptorFactory; import com.intellij.openapi.fileEditor.FileDocumentManager; import com.intellij.openapi.ui.Messages; -import java.util.concurrent.CompletableFuture; - import me.lotabout.codegenerator.CodeGeneratorSettings; import me.lotabout.codegenerator.config.CodeTemplate; import me.lotabout.codegenerator.config.CodeTemplateList; -import javax.swing.*; -import java.awt.event.ActionEvent; -import java.io.IOException; -import java.nio.file.Files; -import java.nio.file.Path; -import java.nio.file.Paths; -import java.nio.file.StandardOpenOption; -import java.util.ArrayList; -import java.util.List; - public class CodeGeneratorConfig { private JPanel mainPane; private JButton addTemplateButton; private JSplitPane splitPane; private JList templateList; - private DefaultListModel templateListModel; + private final DefaultListModel templateListModel; private JButton deleteTemplateButton; private JPanel splitRightPane; private JScrollPane scrollPane; @@ -36,9 +39,9 @@ public class CodeGeneratorConfig { private JButton exportAllButton; private JButton duplicateTemplateButton; - private static String DEFAULT_EXPORT_PATH = "code-generator.xml"; + private static final String DEFAULT_EXPORT_PATH = "code-generator.xml"; - public CodeGeneratorConfig(CodeGeneratorSettings settings) { + public CodeGeneratorConfig(final CodeGeneratorSettings settings) { this.templateListModel = new DefaultListModel<>(); this.templateList.setModel(templateListModel); @@ -47,8 +50,8 @@ public CodeGeneratorConfig(CodeGeneratorSettings settings) { return; } - var length = templateListModel.getSize(); - var index = templateList.getSelectedIndex(); + final var length = templateListModel.getSize(); + final var index = templateList.getSelectedIndex(); if (length < 0 || index < 0 || index >= length) { splitPane.setRightComponent(splitRightPane); deleteTemplateButton.setEnabled(false); @@ -56,28 +59,28 @@ public CodeGeneratorConfig(CodeGeneratorSettings settings) { return; } - var pane = templateListModel.get(templateList.getSelectedIndex()); + final var pane = templateListModel.get(templateList.getSelectedIndex()); deleteTemplateButton.setEnabled(true); duplicateTemplateButton.setEnabled(true); splitPane.setRightComponent(pane.templateEdit()); }); addTemplateButton.addActionListener(e -> { - var template = new CodeTemplate(); + final var template = new CodeTemplate(); template.name = "Untitled"; - var editPane = new TemplateEditPane(template); - var model = (DefaultListModel) templateList.getModel(); + final var editPane = new TemplateEditPane(template); + final var model = (DefaultListModel) templateList.getModel(); model.addElement(editPane); templateList.setSelectedIndex(model.getSize() - 1); }); deleteTemplateButton.addActionListener(e -> { - var index = templateList.getSelectedIndex(); - var size = templateListModel.getSize(); + final var index = templateList.getSelectedIndex(); + final var size = templateListModel.getSize(); if (index >= 0 && index < size) { - var result = Messages.showYesNoDialog("Delete this template?", "Delete", null); + final var result = Messages.showYesNoDialog("Delete this template?", "Delete", null); if (result == Messages.OK) { - var lastIndex = templateList.getAnchorSelectionIndex(); + final var lastIndex = templateList.getAnchorSelectionIndex(); templateListModel.remove(index); var nextIndex = -1; @@ -94,14 +97,14 @@ public CodeGeneratorConfig(CodeGeneratorSettings settings) { }); duplicateTemplateButton.addActionListener(e -> { - var index = templateList.getSelectedIndex(); + final var index = templateList.getSelectedIndex(); if (index < 0) { return; } - var template = templateListModel.get(index); - var xml = CodeTemplateList.toXML(template.getCodeTemplate()); - var currentTemplates = getTabTemplates(); - var templates = CodeTemplateList.fromXML(xml); + final var template = templateListModel.get(index); + final var xml = CodeTemplateList.toXML(template.getCodeTemplate()); + final var currentTemplates = getTabTemplates(); + final var templates = CodeTemplateList.fromXML(xml); if (templates == null || templates.isEmpty()) { return; } @@ -112,33 +115,33 @@ public CodeGeneratorConfig(CodeGeneratorSettings settings) { templateList.setSelectedIndex(templateListModel.getSize() - 1); }); - exportButton.addActionListener((ActionEvent e) -> { - var index = templateList.getSelectedIndex(); - var template = templateListModel.get(index); + exportButton.addActionListener((final ActionEvent e) -> { + final var index = templateList.getSelectedIndex(); + final var template = templateListModel.get(index); - var xml = CodeTemplateList.toXML(template.getCodeTemplate()); + final var xml = CodeTemplateList.toXML(template.getCodeTemplate()); saveToFile(xml); }); - exportAllButton.addActionListener((ActionEvent e) -> { - List templates = new ArrayList<>(); + exportAllButton.addActionListener((final ActionEvent e) -> { + final List templates = new ArrayList<>(); for (var i = 0; i < templateListModel.getSize(); i++) { templates.add(templateListModel.get(i).getCodeTemplate()); } - var xml = CodeTemplateList.toXML(templates); + final var xml = CodeTemplateList.toXML(templates); saveToFile(xml); }); importButton.addActionListener(e -> { readFromFile().thenAccept(xml -> { try { - var templates = CodeTemplateList.fromXML(xml); - var currentTemplates = getTabTemplates(); + final var templates = CodeTemplateList.fromXML(xml); + final var currentTemplates = getTabTemplates(); currentTemplates.addAll(templates); refresh(currentTemplates); Messages.showMessageDialog("Import finished!", "Import", null); - } catch (Exception ex) { + } catch (final Exception ex) { ex.printStackTrace(); Messages.showMessageDialog("Fail to import\n" + ex.getMessage(), "Import Error", null); } @@ -148,26 +151,26 @@ public CodeGeneratorConfig(CodeGeneratorSettings settings) { resetTabPane(settings.getCodeTemplates()); } - public void refresh(List templates) { + public void refresh(final List templates) { templateListModel.removeAllElements(); resetTabPane(templates); } - private void saveToFile(String content) { + private void saveToFile(final String content) { final var descriptor = FileChooserDescriptorFactory.createSingleLocalFileDescriptor(); descriptor.setTitle("Choose Directory to Export"); descriptor.setDescription("save to directory/" + DEFAULT_EXPORT_PATH + " or the file to overwrite"); FileChooser.chooseFile(descriptor, null, mainPane, null, virtualFile -> { - String targetPath; + final String targetPath; if (virtualFile.isDirectory()) { targetPath = virtualFile.getPath() + '/' + DEFAULT_EXPORT_PATH; } else { targetPath = virtualFile.getPath(); } - var path = Paths.get(targetPath); + final var path = Paths.get(targetPath); if (virtualFile.isDirectory() && Files.exists(path)) { - var result = Messages.showYesNoDialog("Overwrite the file?\n" + path, "Overwrite", null); + final var result = Messages.showYesNoDialog("Overwrite the file?\n" + path, "Overwrite", null); if (result != Messages.OK) { return; } @@ -176,7 +179,7 @@ private void saveToFile(String content) { try { Files.write(path, content.getBytes(), StandardOpenOption.TRUNCATE_EXISTING, StandardOpenOption.CREATE); Messages.showMessageDialog("Exported to \n" + path, "Export Successful", null); - } catch (IOException e) { + } catch (final IOException e) { e.printStackTrace(); Messages.showMessageDialog("Error occurred\n" + e.getMessage(), "Export Error", null); } @@ -187,14 +190,15 @@ private CompletableFuture readFromFile() { final var descriptor = FileChooserDescriptorFactory.createSingleFileDescriptor("xml"); descriptor.setTitle("Choose File to Import"); final var result = new CompletableFuture(); - FileChooser.chooseFile(descriptor, null, mainPane, null, virtualFile -> result.complete(FileDocumentManager.getInstance().getDocument(virtualFile).getText())); + FileChooser.chooseFile(descriptor, null, mainPane, null, + virtualFile -> result.complete(FileDocumentManager.getInstance().getDocument(virtualFile).getText())); return result; } - private void resetTabPane(List templates) { + private void resetTabPane(final List templates) { templates.forEach(template -> { if (template == null) return; - var editPane = new TemplateEditPane(template); + final var editPane = new TemplateEditPane(template); templateListModel.addElement(editPane); }); @@ -203,9 +207,9 @@ private void resetTabPane(List templates) { } public List getTabTemplates() { - List ret = new ArrayList<>(); + final List ret = new ArrayList<>(); for (var i = 0; i < templateListModel.getSize(); i++) { - var value = templateListModel.get(i); + final var value = templateListModel.get(i); ret.add(value.getCodeTemplate()); } diff --git a/src/main/java/me/lotabout/codegenerator/ui/CodeGeneratorConfigurable.java b/src/main/java/me/lotabout/codegenerator/ui/CodeGeneratorConfigurable.java index 7cf64da..28518d5 100644 --- a/src/main/java/me/lotabout/codegenerator/ui/CodeGeneratorConfigurable.java +++ b/src/main/java/me/lotabout/codegenerator/ui/CodeGeneratorConfigurable.java @@ -1,19 +1,20 @@ package me.lotabout.codegenerator.ui; +import javax.swing.JComponent; + +import org.jetbrains.annotations.Nls; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; + import com.intellij.openapi.application.ApplicationManager; -import com.intellij.openapi.components.ServiceManager; import com.intellij.openapi.options.ConfigurationException; import com.intellij.openapi.options.SearchableConfigurable; + import me.lotabout.codegenerator.CodeGeneratorSettings; import me.lotabout.codegenerator.ui.include.IncludeConfig; -import org.jetbrains.annotations.Nls; -import org.jetbrains.annotations.NotNull; -import org.jetbrains.annotations.Nullable; - -import javax.swing.*; public class CodeGeneratorConfigurable implements SearchableConfigurable { - private CodeGeneratorSettings settings; + private final CodeGeneratorSettings settings; private CodeGeneratorConfig codeGeneratorConfig; private IncludeConfig includeConfig; private MainPaneConfig mainPaneConfig; diff --git a/src/main/java/me/lotabout/codegenerator/ui/MainPaneConfig.java b/src/main/java/me/lotabout/codegenerator/ui/MainPaneConfig.java index 632ecd4..2b71375 100644 --- a/src/main/java/me/lotabout/codegenerator/ui/MainPaneConfig.java +++ b/src/main/java/me/lotabout/codegenerator/ui/MainPaneConfig.java @@ -1,15 +1,17 @@ package me.lotabout.codegenerator.ui; -import me.lotabout.codegenerator.ui.include.IncludeConfig; +import javax.swing.JPanel; +import javax.swing.JTabbedPane; -import javax.swing.*; +import me.lotabout.codegenerator.ui.include.IncludeConfig; public class MainPaneConfig { private JPanel mainPanel; private JTabbedPane tabbedPane; - public MainPaneConfig(CodeGeneratorConfig codeGeneratorConfig, IncludeConfig includeConfig) { + public MainPaneConfig(final CodeGeneratorConfig codeGeneratorConfig, + final IncludeConfig includeConfig) { tabbedPane.add("Code Templates", codeGeneratorConfig.getMainPane()); tabbedPane.add("Includes", includeConfig.getMainPane()); } diff --git a/src/main/java/me/lotabout/codegenerator/ui/MemberSelectionPane.java b/src/main/java/me/lotabout/codegenerator/ui/MemberSelectionPane.java index 552144b..56424d2 100644 --- a/src/main/java/me/lotabout/codegenerator/ui/MemberSelectionPane.java +++ b/src/main/java/me/lotabout/codegenerator/ui/MemberSelectionPane.java @@ -1,16 +1,22 @@ package me.lotabout.codegenerator.ui; +import java.awt.Dimension; + +import javax.swing.JCheckBox; +import javax.swing.JComboBox; +import javax.swing.JComponent; +import javax.swing.JPanel; +import javax.swing.JTextField; + import com.intellij.openapi.editor.Document; import com.intellij.openapi.editor.Editor; import com.intellij.openapi.editor.EditorFactory; import com.intellij.openapi.fileTypes.FileTypeManager; import com.intellij.uiDesigner.core.GridConstraints; + import me.lotabout.codegenerator.config.MemberSelectionConfig; import me.lotabout.codegenerator.config.PipelineStep; -import javax.swing.*; -import java.awt.*; - public class MemberSelectionPane implements PipelineStepConfig { private JPanel editorPane; private JCheckBox excludeConstantFieldsCheckBox; @@ -30,7 +36,7 @@ public class MemberSelectionPane implements PipelineStepConfig { private JCheckBox allowEmptySelectionCheckBox; private Editor editor; - MemberSelectionPane(MemberSelectionConfig config) { + MemberSelectionPane(final MemberSelectionConfig config) { excludeConstantFieldsCheckBox.setSelected(config.filterConstantField); excludeStaticFieldsCheckBox.setSelected(config.filterStaticModifier); excludeTransientFieldsCheckBox.setSelected(config.filterTransientModifier); @@ -57,12 +63,12 @@ private int sortElements() { return comboBoxSortElements.getSelectedIndex() + 1; } - private void addVmEditor(String template) { - EditorFactory factory = EditorFactory.getInstance(); - Document velocityTemplate = factory.createDocument(template); + private void addVmEditor(final String template) { + final EditorFactory factory = EditorFactory.getInstance(); + final Document velocityTemplate = factory.createDocument(template); editor = factory.createEditor(velocityTemplate, null, FileTypeManager.getInstance() .getFileTypeByExtension("vm"), false); - GridConstraints constraints = new GridConstraints(0, 0, 1, 1, GridConstraints.ANCHOR_WEST, + final GridConstraints constraints = new GridConstraints(0, 0, 1, 1, GridConstraints.ANCHOR_WEST, GridConstraints.FILL_BOTH, GridConstraints.SIZEPOLICY_WANT_GROW, GridConstraints.SIZEPOLICY_FIXED, null, new Dimension(0, 0), null, 0, true); @@ -71,7 +77,7 @@ private void addVmEditor(String template) { @Override public PipelineStep getConfig() { - MemberSelectionConfig config = new MemberSelectionConfig(); + final MemberSelectionConfig config = new MemberSelectionConfig(); config.filterConstantField = excludeConstantFieldsCheckBox.isSelected(); config.filterEnumField = excludeEnumFieldsCheckBox.isSelected(); config.filterTransientModifier = excludeTransientFieldsCheckBox.isSelected(); diff --git a/src/main/java/me/lotabout/codegenerator/ui/PipelineStepConfig.java b/src/main/java/me/lotabout/codegenerator/ui/PipelineStepConfig.java index 9ab9538..dcf73bc 100644 --- a/src/main/java/me/lotabout/codegenerator/ui/PipelineStepConfig.java +++ b/src/main/java/me/lotabout/codegenerator/ui/PipelineStepConfig.java @@ -1,8 +1,8 @@ package me.lotabout.codegenerator.ui; -import me.lotabout.codegenerator.config.PipelineStep; +import javax.swing.JComponent; -import javax.swing.*; +import me.lotabout.codegenerator.config.PipelineStep; public interface PipelineStepConfig { PipelineStep getConfig(); diff --git a/src/main/java/me/lotabout/codegenerator/ui/SelectionPane.java b/src/main/java/me/lotabout/codegenerator/ui/SelectionPane.java index c7c0d0d..f18ba9a 100644 --- a/src/main/java/me/lotabout/codegenerator/ui/SelectionPane.java +++ b/src/main/java/me/lotabout/codegenerator/ui/SelectionPane.java @@ -1,12 +1,18 @@ package me.lotabout.codegenerator.ui; +import javax.swing.JButton; +import javax.swing.JCheckBox; +import javax.swing.JComponent; +import javax.swing.JPanel; +import javax.swing.JScrollPane; +import javax.swing.JTextField; + import com.intellij.openapi.ui.Messages; + import me.lotabout.codegenerator.config.ClassSelectionConfig; import me.lotabout.codegenerator.config.MemberSelectionConfig; import me.lotabout.codegenerator.config.PipelineStep; -import javax.swing.*; - public class SelectionPane implements PipelineStepConfig { private JTextField postfixText; private JCheckBox enableStepCheckBox; @@ -14,14 +20,14 @@ public class SelectionPane implements PipelineStepConfig { private JPanel topPanel; private JScrollPane contentPane; - private Object selectionPane; + private final Object selectionPane; - public SelectionPane(PipelineStep config, TemplateEditPane parent) { + public SelectionPane(final PipelineStep config, final TemplateEditPane parent) { postfixText.setText(config.postfix()); enableStepCheckBox.setSelected(config.enabled()); removeThisStepButton.addActionListener(e -> { - int result = Messages.showYesNoDialog("Really remove this step?", "Delete", null); + final int result = Messages.showYesNoDialog("Really remove this step?", "Delete", null); if (result == Messages.OK) { parent.removePipelineStep(this); } @@ -47,12 +53,12 @@ public boolean enabled() { @Override public PipelineStep getConfig() { if (selectionPane instanceof MemberSelectionPane) { - PipelineStep step = ((MemberSelectionPane)selectionPane).getConfig(); + final PipelineStep step = ((MemberSelectionPane)selectionPane).getConfig(); step.postfix(this.postfix()); step.enabled(this.enabled()); return step; } else if (selectionPane instanceof ClassSelectionPane) { - PipelineStep step = ((ClassSelectionPane)selectionPane).getConfig(); + final PipelineStep step = ((ClassSelectionPane)selectionPane).getConfig(); step.postfix(this.postfix()); step.enabled(this.enabled()); return step; diff --git a/src/main/java/me/lotabout/codegenerator/ui/TemplateEditPane.java b/src/main/java/me/lotabout/codegenerator/ui/TemplateEditPane.java index ac58840..a587fce 100644 --- a/src/main/java/me/lotabout/codegenerator/ui/TemplateEditPane.java +++ b/src/main/java/me/lotabout/codegenerator/ui/TemplateEditPane.java @@ -1,24 +1,34 @@ package me.lotabout.codegenerator.ui; +import java.awt.Dimension; +import java.util.ArrayList; +import java.util.Comparator; +import java.util.List; +import java.util.stream.Collectors; + +import javax.swing.JButton; +import javax.swing.JCheckBox; +import javax.swing.JComboBox; +import javax.swing.JPanel; +import javax.swing.JRadioButton; +import javax.swing.JScrollPane; +import javax.swing.JTabbedPane; +import javax.swing.JTextField; + +import org.jetbrains.java.generate.config.DuplicationPolicy; +import org.jetbrains.java.generate.config.InsertWhere; + import com.intellij.openapi.editor.Document; import com.intellij.openapi.editor.Editor; import com.intellij.openapi.editor.EditorFactory; import com.intellij.openapi.fileTypes.FileTypeManager; import com.intellij.openapi.util.text.StringUtil; import com.intellij.uiDesigner.core.GridConstraints; + import me.lotabout.codegenerator.config.ClassSelectionConfig; import me.lotabout.codegenerator.config.CodeTemplate; import me.lotabout.codegenerator.config.MemberSelectionConfig; import me.lotabout.codegenerator.config.PipelineStep; -import org.jetbrains.java.generate.config.DuplicationPolicy; -import org.jetbrains.java.generate.config.InsertWhere; - -import javax.swing.*; -import java.awt.*; -import java.util.ArrayList; -import java.util.Comparator; -import java.util.List; -import java.util.stream.Collectors; public class TemplateEditPane { private JPanel templateEdit; @@ -43,9 +53,9 @@ public class TemplateEditPane { private JTextField defaultTargetPackageText; private JTextField defaultTargetModuleText; private Editor editor; - private List pipeline = new ArrayList<>(); + private final List pipeline = new ArrayList<>(); - public TemplateEditPane(CodeTemplate codeTemplate) { + public TemplateEditPane(final CodeTemplate codeTemplate) { settingsPanel.getVerticalScrollBar().setUnitIncrement(16); // scroll speed templateIdText.setText(codeTemplate.getId()); @@ -89,14 +99,14 @@ public TemplateEditPane(CodeTemplate codeTemplate) { codeTemplate.pipeline.forEach(this::addMemberSelection); addMemberButton.addActionListener(e -> { - int currentStep = findMaxStepPostfix(pipeline, "member"); - MemberSelectionConfig config = new MemberSelectionConfig(); + final int currentStep = findMaxStepPostfix(pipeline, "member"); + final MemberSelectionConfig config = new MemberSelectionConfig(); config.postfix = String.valueOf(currentStep + 1); addMemberSelection(config); }); addClassButton.addActionListener(e -> { - int currentStep = findMaxStepPostfix(pipeline, "class"); - ClassSelectionConfig config = new ClassSelectionConfig(); + final int currentStep = findMaxStepPostfix(pipeline, "class"); + final ClassSelectionConfig config = new ClassSelectionConfig(); config.postfix = String.valueOf(currentStep + 1); addMemberSelection(config); }); @@ -104,7 +114,7 @@ public TemplateEditPane(CodeTemplate codeTemplate) { addVmEditor(codeTemplate.template); } - private static int findMaxStepPostfix(List pipelinePanes, String type) { + private static int findMaxStepPostfix(final List pipelinePanes, final String type) { return pipelinePanes.stream() .filter(p -> p.type().equals(type)) .map(SelectionPane::postfix) @@ -114,7 +124,7 @@ private static int findMaxStepPostfix(List pipelinePanes, String .orElse(0); } - private void addMemberSelection(PipelineStep step) { + private void addMemberSelection(final PipelineStep step) { if (step == null) { return; } @@ -126,17 +136,17 @@ private void addMemberSelection(PipelineStep step) { title = "Class"; } - SelectionPane pane = new SelectionPane(step, this); + final SelectionPane pane = new SelectionPane(step, this); pipeline.add(pane); templateTabbedPane.addTab(title, pane.getComponent()); } - private void addVmEditor(String template) { - EditorFactory factory = EditorFactory.getInstance(); - Document velocityTemplate = factory.createDocument(template); + private void addVmEditor(final String template) { + final EditorFactory factory = EditorFactory.getInstance(); + final Document velocityTemplate = factory.createDocument(template); editor = factory.createEditor(velocityTemplate, null, FileTypeManager.getInstance() .getFileTypeByExtension("vm"), false); - GridConstraints constraints = new GridConstraints(0, 0, 1, 1, GridConstraints.ANCHOR_WEST, + final GridConstraints constraints = new GridConstraints(0, 0, 1, 1, GridConstraints.ANCHOR_WEST, GridConstraints.FILL_BOTH, GridConstraints.SIZEPOLICY_WANT_GROW, GridConstraints.SIZEPOLICY_FIXED, null, new Dimension(0, 0), null, 0, true); @@ -216,7 +226,7 @@ public String toString() { } public CodeTemplate getCodeTemplate() { - CodeTemplate template = new CodeTemplate(this.id()); + final CodeTemplate template = new CodeTemplate(this.id()); template.name = this.name(); template.type = this.type(); template.enabled = this.enabled(); @@ -234,9 +244,9 @@ public CodeTemplate getCodeTemplate() { return template; } - public void removePipelineStep(PipelineStepConfig stepToRemove) { - int index = this.pipeline.indexOf(stepToRemove); - PipelineStepConfig step = this.pipeline.remove(index); + public void removePipelineStep(final SelectionPane stepToRemove) { + final int index = this.pipeline.indexOf(stepToRemove); + final PipelineStepConfig step = this.pipeline.remove(index); this.templateTabbedPane.remove(step.getComponent()); } } diff --git a/src/main/java/me/lotabout/codegenerator/ui/include/IncludeConfig.java b/src/main/java/me/lotabout/codegenerator/ui/include/IncludeConfig.java index 86c3cba..0e347ba 100644 --- a/src/main/java/me/lotabout/codegenerator/ui/include/IncludeConfig.java +++ b/src/main/java/me/lotabout/codegenerator/ui/include/IncludeConfig.java @@ -1,14 +1,5 @@ package me.lotabout.codegenerator.ui.include; -import com.intellij.openapi.fileChooser.FileChooser; -import com.intellij.openapi.fileChooser.FileChooserDescriptorFactory; -import com.intellij.openapi.fileEditor.FileDocumentManager; -import com.intellij.openapi.ui.Messages; -import me.lotabout.codegenerator.CodeGeneratorSettings; -import me.lotabout.codegenerator.config.include.Include; -import me.lotabout.codegenerator.config.include.IncludeList; - -import javax.swing.*; import java.awt.event.ActionEvent; import java.io.IOException; import java.nio.file.Files; @@ -18,12 +9,28 @@ import java.util.List; import java.util.concurrent.CompletableFuture; +import javax.swing.DefaultListModel; +import javax.swing.JButton; +import javax.swing.JList; +import javax.swing.JPanel; +import javax.swing.JScrollPane; +import javax.swing.JSplitPane; + +import com.intellij.openapi.fileChooser.FileChooser; +import com.intellij.openapi.fileChooser.FileChooserDescriptorFactory; +import com.intellij.openapi.fileEditor.FileDocumentManager; +import com.intellij.openapi.ui.Messages; + +import me.lotabout.codegenerator.CodeGeneratorSettings; +import me.lotabout.codegenerator.config.include.Include; +import me.lotabout.codegenerator.config.include.IncludeList; + public class IncludeConfig { private JPanel mainPane; private JButton addTemplateButton; private JSplitPane splitPane; private JList includeList; - private DefaultListModel includeListModel; + private final DefaultListModel includeListModel; private JButton deleteButton; private JPanel splitRightPane; private JScrollPane scrollPane; @@ -31,9 +38,9 @@ public class IncludeConfig { private JButton exportButton; private JButton exportAllButton; - private static String DEFAULT_EXPORT_PATH = "template.xml"; + private static final String DEFAULT_EXPORT_PATH = "template.xml"; - public IncludeConfig(CodeGeneratorSettings settings) { + public IncludeConfig(final CodeGeneratorSettings settings) { this.includeListModel = new DefaultListModel<>(); this.includeList.setModel(includeListModel); @@ -42,35 +49,35 @@ public IncludeConfig(CodeGeneratorSettings settings) { return; } - var length = includeListModel.getSize(); - var index = includeList.getSelectedIndex(); + final var length = includeListModel.getSize(); + final var index = includeList.getSelectedIndex(); if (length < 0 || index < 0 || index >= length) { splitPane.setRightComponent(splitRightPane); deleteButton.setEnabled(false); return; } - var pane = includeListModel.get(includeList.getSelectedIndex()); + final var pane = includeListModel.get(includeList.getSelectedIndex()); deleteButton.setEnabled(true); splitPane.setRightComponent(pane.templateEdit()); }); addTemplateButton.addActionListener(e -> { - var template = new Include(); + final var template = new Include(); template.name = "Untitled"; - var editPane = new IncludeEditPane(template); - var model = (DefaultListModel) includeList.getModel(); + final var editPane = new IncludeEditPane(template); + final var model = (DefaultListModel) includeList.getModel(); model.addElement(editPane); includeList.setSelectedIndex(model.getSize()-1); }); deleteButton.addActionListener(e -> { - var index = includeList.getSelectedIndex(); - var size = includeListModel.getSize(); + final var index = includeList.getSelectedIndex(); + final var size = includeListModel.getSize(); if (index >= 0 && index < size) { - var result = Messages.showYesNoDialog("Delete this template?", "Delete", null); + final var result = Messages.showYesNoDialog("Delete this template?", "Delete", null); if (result == Messages.OK) { - var lastIndex = includeList.getAnchorSelectionIndex(); + final var lastIndex = includeList.getAnchorSelectionIndex(); includeListModel.remove(index); var nextIndex = -1; @@ -86,31 +93,31 @@ public IncludeConfig(CodeGeneratorSettings settings) { } }); - exportButton.addActionListener((ActionEvent e) -> { - var index = includeList.getSelectedIndex(); - var includeModel = includeListModel.get(index); - var xml = IncludeList.toXML(includeModel.getInclude()); + exportButton.addActionListener((final ActionEvent e) -> { + final var index = includeList.getSelectedIndex(); + final var includeModel = includeListModel.get(index); + final var xml = IncludeList.toXML(includeModel.getInclude()); saveToFile(xml); }); - exportAllButton.addActionListener((ActionEvent e) -> { - List templates = new ArrayList<>(); + exportAllButton.addActionListener((final ActionEvent e) -> { + final List templates = new ArrayList<>(); for (var i = 0; i< includeListModel.getSize(); i++) { templates.add(includeListModel.get(i).getInclude()); } - var xml = IncludeList.toXML(templates); + final var xml = IncludeList.toXML(templates); saveToFile(xml); }); importButton.addActionListener(e -> { readFromFile().thenAccept(xml -> { try { - var templates = IncludeList.fromXML(xml); - var currentTemplates = getIncludes(); + final var templates = IncludeList.fromXML(xml); + final var currentTemplates = getIncludes(); currentTemplates.addAll(templates); refresh(currentTemplates); Messages.showMessageDialog("Import finished!", "Import", null); - } catch (Exception ex) { + } catch (final Exception ex) { ex.printStackTrace(); Messages.showMessageDialog("Fail to import\n"+ex.getMessage(), "Import Error", null); } @@ -120,26 +127,26 @@ public IncludeConfig(CodeGeneratorSettings settings) { resetTabPane(settings.getIncludes()); } - public void refresh(List templates) { + public void refresh(final List templates) { includeListModel.removeAllElements(); resetTabPane(templates); } - private void saveToFile(String content) { + private void saveToFile(final String content) { final var descriptor = FileChooserDescriptorFactory.createSingleLocalFileDescriptor(); descriptor.setTitle("Choose Directory to Export"); descriptor.setDescription("save to directory/"+DEFAULT_EXPORT_PATH + " or the file to overwrite"); FileChooser.chooseFile(descriptor, null, mainPane, null, virtualFile -> { - String targetPath; + final String targetPath; if (virtualFile.isDirectory()) { targetPath = virtualFile.getPath() + '/' + DEFAULT_EXPORT_PATH; } else { targetPath = virtualFile.getPath(); } - var path = Paths.get(targetPath); + final var path = Paths.get(targetPath); if (virtualFile.isDirectory() && Files.exists(path)) { - var result = Messages.showYesNoDialog("Overwrite the file?\n" + path, "Overwrite", null); + final var result = Messages.showYesNoDialog("Overwrite the file?\n" + path, "Overwrite", null); if (result != Messages.OK) { return; } @@ -148,7 +155,7 @@ private void saveToFile(String content) { try { Files.write(path, content.getBytes(), StandardOpenOption.TRUNCATE_EXISTING, StandardOpenOption.CREATE); Messages.showMessageDialog("Exported to \n"+path, "Export Successful", null); - } catch (IOException e) { + } catch (final IOException e) { e.printStackTrace(); Messages.showMessageDialog("Error occurred\n"+e.getMessage(), "Export Error", null); } @@ -163,10 +170,10 @@ private CompletableFuture readFromFile() { return result; } - private void resetTabPane(List includes) { + private void resetTabPane(final List includes) { includes.forEach(include -> { if (include == null) return; - var editPane = new IncludeEditPane(include); + final var editPane = new IncludeEditPane(include); includeListModel.addElement(editPane); }); @@ -175,9 +182,9 @@ private void resetTabPane(List includes) { } public List getIncludes() { - List ret = new ArrayList<>(); + final List ret = new ArrayList<>(); for (var i = 0; i< includeListModel.getSize(); i++) { - var value = includeListModel.get(i); + final var value = includeListModel.get(i); ret.add(value.getInclude()); } diff --git a/src/main/java/me/lotabout/codegenerator/ui/include/IncludeEditPane.java b/src/main/java/me/lotabout/codegenerator/ui/include/IncludeEditPane.java index 5d48d3b..6033b3e 100644 --- a/src/main/java/me/lotabout/codegenerator/ui/include/IncludeEditPane.java +++ b/src/main/java/me/lotabout/codegenerator/ui/include/IncludeEditPane.java @@ -1,13 +1,17 @@ package me.lotabout.codegenerator.ui.include; +import java.awt.Dimension; + +import javax.swing.JCheckBox; +import javax.swing.JPanel; +import javax.swing.JTextField; + import com.intellij.openapi.editor.Editor; import com.intellij.openapi.editor.EditorFactory; import com.intellij.openapi.fileTypes.FileTypeManager; import com.intellij.uiDesigner.core.GridConstraints; -import me.lotabout.codegenerator.config.include.Include; -import javax.swing.*; -import java.awt.*; +import me.lotabout.codegenerator.config.include.Include; public class IncludeEditPane { private JPanel templateEdit; @@ -17,22 +21,22 @@ public class IncludeEditPane { private JCheckBox defaultInclude; private Editor editor; - public IncludeEditPane(Include include) { + public IncludeEditPane(final Include include) { templateIdText.setText(include.getId()); templateNameText.setText(include.getName()); defaultInclude.setSelected(include.isDefaultInclude()); addVmEditor(include.getContent()); } - - private void addVmEditor(String template) { - var factory = EditorFactory.getInstance(); - var velocityTemplate = factory.createDocument(template); + private void addVmEditor(final String template) { + final var factory = EditorFactory.getInstance(); + final var velocityTemplate = factory.createDocument(template); editor = factory.createEditor(velocityTemplate, null, FileTypeManager.getInstance() .getFileTypeByExtension("vm"), false); - var constraints = new GridConstraints(0, 0, 1, 1, GridConstraints.ANCHOR_WEST, - GridConstraints.FILL_BOTH, GridConstraints.SIZEPOLICY_WANT_GROW, - GridConstraints.SIZEPOLICY_FIXED, null, new Dimension(0, 0), null, 0, true); + final var constraints = new GridConstraints(0, 0, 1, 1, + GridConstraints.ANCHOR_WEST, GridConstraints.FILL_BOTH, + GridConstraints.SIZEPOLICY_WANT_GROW, GridConstraints.SIZEPOLICY_FIXED, + null, new Dimension(0, 0), null, 0, true); editorPane.add(editor.getComponent(), constraints); } @@ -59,7 +63,7 @@ public String toString() { } public Include getInclude() { - var include = new Include(this.id()); + final var include = new Include(this.id()); include.setName(this.name()); include.setContent(this.content()); include.setDefaultInclude(defaultInclude.isSelected()); diff --git a/src/main/java/me/lotabout/codegenerator/util/AnnotationEntry.java b/src/main/java/me/lotabout/codegenerator/util/AnnotationEntry.java index 5908f74..ec14a2b 100644 --- a/src/main/java/me/lotabout/codegenerator/util/AnnotationEntry.java +++ b/src/main/java/me/lotabout/codegenerator/util/AnnotationEntry.java @@ -1,13 +1,14 @@ package me.lotabout.codegenerator.util; -import com.intellij.psi.PsiAnnotation; import org.jetbrains.annotations.NotNull; +import com.intellij.psi.PsiAnnotation; + public class AnnotationEntry { private final String qualifiedName; private final PsiAnnotation psiAnnotation; - public AnnotationEntry(@NotNull PsiAnnotation annotation) { + public AnnotationEntry(@NotNull final PsiAnnotation annotation) { this.psiAnnotation = annotation; this.qualifiedName = annotation.getQualifiedName(); } diff --git a/src/main/java/me/lotabout/codegenerator/util/AnnotationUtil.java b/src/main/java/me/lotabout/codegenerator/util/AnnotationUtil.java index 1a02521..1a5c2c3 100644 --- a/src/main/java/me/lotabout/codegenerator/util/AnnotationUtil.java +++ b/src/main/java/me/lotabout/codegenerator/util/AnnotationUtil.java @@ -1,16 +1,18 @@ package me.lotabout.codegenerator.util; -import com.intellij.psi.PsiJvmModifiersOwner; -import org.jetbrains.annotations.NotNull; - import java.util.Arrays; import java.util.Objects; +import org.jetbrains.annotations.NotNull; + +import com.intellij.psi.PsiJvmModifiersOwner; + public class AnnotationUtil { private AnnotationUtil() { } - public static boolean isAnnotatedWith(@NotNull PsiJvmModifiersOwner psiJvmModifiersOwner, @NotNull String qualifiedName) { + public static boolean isAnnotatedWith(@NotNull final PsiJvmModifiersOwner psiJvmModifiersOwner, + @NotNull final String qualifiedName) { return Arrays.stream(psiJvmModifiersOwner.getAnnotations()) .filter(annotation -> Objects.nonNull(annotation.getQualifiedName())) .anyMatch(annotation -> annotation.getQualifiedName().equals(qualifiedName)); diff --git a/src/main/java/me/lotabout/codegenerator/util/ClassEntry.java b/src/main/java/me/lotabout/codegenerator/util/ClassEntry.java index 6a293d3..bd3a91d 100644 --- a/src/main/java/me/lotabout/codegenerator/util/ClassEntry.java +++ b/src/main/java/me/lotabout/codegenerator/util/ClassEntry.java @@ -1,12 +1,16 @@ package me.lotabout.codegenerator.util; -import com.intellij.psi.*; +import java.util.ArrayList; import java.util.Arrays; +import java.util.List; import java.util.stream.Collectors; + import org.jetbrains.java.generate.element.ClassElement; -import java.util.ArrayList; -import java.util.List; +import com.intellij.psi.PsiClass; +import com.intellij.psi.PsiClassOwner; +import com.intellij.psi.PsiFile; +import com.intellij.psi.PsiJavaFile; public class ClassEntry { private PsiClass raw; @@ -22,9 +26,9 @@ public class ClassEntry { private List allMembers = new ArrayList<>(); private List typeParamList; - public static ClassEntry of(PsiClass clazz, ClassElement element) { - PsiFile psiFile = clazz.getContainingFile(); - ClassEntry entry = new ClassEntry(); + public static ClassEntry of(final PsiClass clazz, final ClassElement element) { + final PsiFile psiFile = clazz.getContainingFile(); + final ClassEntry entry = new ClassEntry(); entry.setRaw(clazz); entry.setElement(element); entry.setPackageName(((PsiClassOwner)psiFile).getPackageName()); @@ -41,27 +45,27 @@ public List getFields() { return fields; } - public void setFields(List fields) { + public void setFields(final List fields) { this.fields = fields; } - public void setAllFields(List allFields) { + public void setAllFields(final List allFields) { this.allFields = allFields; } - public void setMethods(List methods) { + public void setMethods(final List methods) { this.methods = methods; } - public void setAllMethods(List allMethods) { + public void setAllMethods(final List allMethods) { this.allMethods = allMethods; } - public void setMembers(List members) { + public void setMembers(final List members) { this.members = members; } - public void setAllMembers(List allMembers) { + public void setAllMembers(final List allMembers) { this.allMembers = allMembers; } @@ -69,7 +73,7 @@ public PsiClass getRaw() { return raw; } - public void setRaw(PsiClass raw) { + public void setRaw(final PsiClass raw) { this.raw = raw; } @@ -77,7 +81,7 @@ public ClassElement getElement() { return element; } - public void setElement(ClassElement element) { + public void setElement(final ClassElement element) { this.element = element; } @@ -85,7 +89,7 @@ public String getPackageName() { return packageName; } - public void setPackageName(String packageName) { + public void setPackageName(final String packageName) { this.packageName = packageName; } @@ -93,11 +97,11 @@ public List getImportList() { return importList; } - public void setImportList(List importList) { + public void setImportList(final List importList) { this.importList = importList; } - public void addFields(List fields) { + public void addFields(final List fields) { this.fields.addAll(fields); this.members.addAll(fields); } @@ -106,7 +110,7 @@ public List getAllFields() { return allFields; } - public void addAllFields(List allFields) { + public void addAllFields(final List allFields) { this.allFields = allFields; this.allMembers.addAll(fields); } @@ -115,7 +119,7 @@ public List getMethods() { return methods; } - public void addMethod(List methods) { + public void addMethod(final List methods) { this.methods.addAll(methods); this.members.addAll(methods); } @@ -124,7 +128,7 @@ public List getAllMethods() { return allMethods; } - public void addAllMethods(List allMethods) { + public void addAllMethods(final List allMethods) { this.allMethods.addAll(allMethods); this.allMembers.addAll(allMethods); } @@ -154,19 +158,19 @@ public List getTypeParamList() { return typeParamList; } - public void setTypeParamList(List typeParamList) { + public void setTypeParamList(final List typeParamList) { this.typeParamList = typeParamList; } - public boolean isImplements(String s) { + public boolean isImplements(final String s) { return element.isImplements(s); } - public boolean isExtends(String s) { + public boolean isExtends(final String s) { return element.isExtends(s); } - public boolean matchName(String s) throws IllegalArgumentException { + public boolean matchName(final String s) throws IllegalArgumentException { return element.matchName(s); } @@ -174,7 +178,7 @@ public String[] getImplementNames() { return element.getImplementNames(); } - public void setImplementNames(String[] strings) { + public void setImplementNames(final String[] strings) { element.setImplementNames(strings); } @@ -182,7 +186,7 @@ public String getSuperQualifiedName() { return element.getSuperQualifiedName(); } - public void setSuperQualifiedName(String s) { + public void setSuperQualifiedName(final String s) { element.setSuperQualifiedName(s); } @@ -190,7 +194,7 @@ public String getSuperName() { return element.getSuperName(); } - public void setSuperName(String s) { + public void setSuperName(final String s) { element.setSuperName(s); } @@ -198,7 +202,7 @@ public String getName() { return element.getName(); } - public void setName(String s) { + public void setName(final String s) { element.setName(s); } @@ -206,7 +210,7 @@ public String getQualifiedName() { return element.getQualifiedName(); } - public void setQualifiedName(String s) { + public void setQualifiedName(final String s) { element.setQualifiedName(s); } @@ -218,7 +222,7 @@ public boolean isDeprecated() { return element.isDeprecated(); } - public void setDeprecated(boolean b) { + public void setDeprecated(final boolean b) { element.setDeprecated(b); } @@ -226,7 +230,7 @@ public boolean isEnum() { return element.isEnum(); } - public void setEnum(boolean b) { + public void setEnum(final boolean b) { element.setEnum(b); } @@ -234,7 +238,7 @@ public boolean isException() { return element.isException(); } - public void setException(boolean b) { + public void setException(final boolean b) { element.setException(b); } @@ -242,11 +246,11 @@ public boolean isAbstract() { return element.isAbstract(); } - public void setAbstract(boolean b) { + public void setAbstract(final boolean b) { element.setAbstract(b); } - public void setTypeParams(int i) { + public void setTypeParams(final int i) { element.setTypeParams(i); } diff --git a/src/main/java/me/lotabout/codegenerator/util/EntryFactory.java b/src/main/java/me/lotabout/codegenerator/util/EntryFactory.java index ba1a758..218c31d 100644 --- a/src/main/java/me/lotabout/codegenerator/util/EntryFactory.java +++ b/src/main/java/me/lotabout/codegenerator/util/EntryFactory.java @@ -1,31 +1,39 @@ package me.lotabout.codegenerator.util; +import org.jetbrains.java.generate.element.ElementFactory; +import org.jetbrains.java.generate.element.FieldElement; + import com.intellij.psi.PsiClass; import com.intellij.psi.PsiField; import com.intellij.psi.PsiMethod; -import org.jetbrains.java.generate.element.ElementFactory; -import org.jetbrains.java.generate.element.FieldElement; public class EntryFactory { - public static FieldEntry of(PsiField field, boolean useAccessor) { - if (field == null) return null; + public static FieldEntry of(final PsiField field, final boolean useAccessor) { + if (field == null) { + return null; + } return new FieldEntry(field, ElementFactory.newFieldElement(field, useAccessor)); } - public static FieldEntry of(PsiClass clazz, FieldElement element) { - if (clazz == null || element == null) return null; - - PsiField field = clazz.findFieldByName(element.getName(), true); + public static FieldEntry of(final PsiClass clazz, final FieldElement element) { + if (clazz == null || element == null) { + return null; + } + final PsiField field = clazz.findFieldByName(element.getName(), true); return new FieldEntry(field, element); } - public static MethodEntry of(PsiMethod method) { - if (method == null) return null; + public static MethodEntry of(final PsiMethod method) { + if (method == null) { + return null; + } return new MethodEntry(method, ElementFactory.newMethodElement(method)); } - public static ClassEntry of(PsiClass clazz) { - if (clazz == null) return null; + public static ClassEntry of(final PsiClass clazz) { + if (clazz == null) { + return null; + } return ClassEntry.of(clazz, ElementFactory.newClassElement(clazz)); } } diff --git a/src/main/java/me/lotabout/codegenerator/util/EntryUtils.java b/src/main/java/me/lotabout/codegenerator/util/EntryUtils.java index 3a1f027..08f42b1 100644 --- a/src/main/java/me/lotabout/codegenerator/util/EntryUtils.java +++ b/src/main/java/me/lotabout/codegenerator/util/EntryUtils.java @@ -1,30 +1,30 @@ package me.lotabout.codegenerator.util; -import com.intellij.psi.PsiField; -import com.intellij.psi.PsiMember; -import com.intellij.psi.PsiMethod; - import java.util.ArrayList; import java.util.Collection; import java.util.List; +import com.intellij.psi.PsiField; +import com.intellij.psi.PsiMember; +import com.intellij.psi.PsiMethod; + public class EntryUtils { - public static List getOnlyAsFieldAndMethodElements(Collection members, - Collection selectedNotNullMembers, - boolean useAccessors) { - List - entryList = new ArrayList<>(); - for (PsiMember member : members) { + public static List getOnlyAsFieldAndMethodElements( + final Collection members, + final Collection selectedNotNullMembers, + final boolean useAccessors) { + final List entryList = new ArrayList<>(); + for (final PsiMember member : members) { MemberEntry entry = null; if (member instanceof PsiField) { - FieldEntry fieldEntry= EntryFactory.of((PsiField) member, useAccessors); + final FieldEntry fieldEntry= EntryFactory.of((PsiField) member, useAccessors); if (selectedNotNullMembers.contains(member)) { fieldEntry.setNotNull(true); } entry = fieldEntry; } else if (member instanceof PsiMethod) { - MethodEntry methodEntry = EntryFactory.of((PsiMethod) member); + final MethodEntry methodEntry = EntryFactory.of((PsiMethod) member); if (selectedNotNullMembers.contains(member)) { methodEntry.setNotNull(true); } @@ -38,15 +38,15 @@ public static List getOnlyAsFieldAndMethodElements(Collection getOnlyAsFieldEntries(Collection members, - Collection selectedNotNullMembers, - boolean useAccessors) { - List fieldEntryList = new ArrayList<>(); + public static List getOnlyAsFieldEntries( + final Collection members, + final Collection selectedNotNullMembers, + final boolean useAccessors) { + final List fieldEntryList = new ArrayList<>(); - for (PsiMember member : members) { - if (member instanceof PsiField) { - PsiField field = (PsiField) member; - FieldEntry fe = EntryFactory.of(field, useAccessors); + for (final PsiMember member : members) { + if (member instanceof final PsiField field) { + final FieldEntry fe = EntryFactory.of(field, useAccessors); if (selectedNotNullMembers.contains(member)) { fe.setNotNull(true); } @@ -57,13 +57,12 @@ public static List getOnlyAsFieldEntries(Collection getOnlyAsMethodEntrys(Collection members) { - List methodEntryList = new ArrayList<>(); + public static List getOnlyAsMethodEntries(final Collection members) { + final List methodEntryList = new ArrayList<>(); - for (PsiMember member : members) { - if (member instanceof PsiMethod) { - PsiMethod method = (PsiMethod) member; - MethodEntry me = EntryFactory.of(method); + for (final PsiMember member : members) { + if (member instanceof final PsiMethod method) { + final MethodEntry me = EntryFactory.of(method); methodEntryList.add(me); } } diff --git a/src/main/java/me/lotabout/codegenerator/util/FieldEntry.java b/src/main/java/me/lotabout/codegenerator/util/FieldEntry.java index d3ef787..6991550 100644 --- a/src/main/java/me/lotabout/codegenerator/util/FieldEntry.java +++ b/src/main/java/me/lotabout/codegenerator/util/FieldEntry.java @@ -16,11 +16,12 @@ public class FieldEntry implements MemberEntry { private final PsiField raw; private final FieldElement element; - public FieldEntry(PsiField field, FieldElement element) { + public FieldEntry(final PsiField field, final FieldElement element) { this.raw = field; this.element = element; } + @Override public PsiField getRaw() { return raw; } @@ -49,15 +50,15 @@ public boolean isEnum() { return element.isEnum(); } - public void setEnum(boolean b) { + public void setEnum(final boolean b) { element.setEnum(b); } - public boolean matchName(String s) throws IllegalArgumentException { + public boolean matchName(final String s) throws IllegalArgumentException { return element.matchName(s); } - public void setAccessor(String s) { + public void setAccessor(final String s) { element.setAccessor(s); } @@ -73,7 +74,7 @@ public boolean isNestedArray() { return element.isNestedArray(); } - public void setNestedArray(boolean b) { + public void setNestedArray(final boolean b) { element.setNestedArray(b); } @@ -137,7 +138,7 @@ public String getTypeQualifiedName() { return element.getTypeQualifiedName(); } - public boolean isAnnotatedWith(@NotNull String qualifiedName) { + public boolean isAnnotatedWith(@NotNull final String qualifiedName) { return AnnotationUtil.isAnnotatedWith(raw, qualifiedName); } @@ -145,7 +146,7 @@ public String getType() { return element.getType(); } - public void setType(String s) { + public void setType(final String s) { element.setType(s); } @@ -157,7 +158,7 @@ public boolean isLong() { return element.isLong(); } - public void setLong(boolean b) { + public void setLong(final boolean b) { element.setLong(b); } @@ -165,7 +166,7 @@ public boolean isFloat() { return element.isFloat(); } - public void setFloat(boolean b) { + public void setFloat(final boolean b) { element.setFloat(b); } @@ -173,7 +174,7 @@ public boolean isDouble() { return element.isDouble(); } - public void setDouble(boolean b) { + public void setDouble(final boolean b) { element.setDouble(b); } @@ -185,11 +186,11 @@ public boolean isNotNull() { return element.isNotNull(); } - public void setNotNull(boolean b) { + public void setNotNull(final boolean b) { element.setNotNull(b); } - public void setVoid(boolean b) { + public void setVoid(final boolean b) { element.setVoid(b); } @@ -197,7 +198,7 @@ public boolean isChar() { return element.isChar(); } - public void setChar(boolean b) { + public void setChar(final boolean b) { element.setChar(b); } @@ -205,7 +206,7 @@ public boolean isByte() { return element.isByte(); } - public void setByte(boolean b) { + public void setByte(final boolean b) { element.setByte(b); } @@ -213,15 +214,15 @@ public boolean isShort() { return element.isShort(); } - public void setShort(boolean b) { + public void setShort(final boolean b) { element.setShort(b); } - public void setBoolean(boolean b) { + public void setBoolean(final boolean b) { element.setBoolean(b); } - public void setName(String s) { + public void setName(final String s) { element.setName(s); } diff --git a/src/main/java/me/lotabout/codegenerator/util/GenerationUtil.java b/src/main/java/me/lotabout/codegenerator/util/GenerationUtil.java index 81f717a..204187a 100644 --- a/src/main/java/me/lotabout/codegenerator/util/GenerationUtil.java +++ b/src/main/java/me/lotabout/codegenerator/util/GenerationUtil.java @@ -1,5 +1,22 @@ package me.lotabout.codegenerator.util; +import java.io.StringWriter; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collections; +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; + +import org.apache.velocity.VelocityContext; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; +import org.jetbrains.java.generate.element.ElementComparator; +import org.jetbrains.java.generate.element.GenerationHelper; +import org.jetbrains.java.generate.exception.GenerateCodeException; +import org.jetbrains.java.generate.exception.PluginException; +import org.jetbrains.java.generate.velocity.VelocityFactory; + import com.intellij.application.options.CodeStyle; import com.intellij.codeInsight.generation.PsiElementClassMember; import com.intellij.codeInsight.generation.PsiFieldMember; @@ -9,27 +26,22 @@ import com.intellij.openapi.project.Project; import com.intellij.openapi.ui.Messages; import com.intellij.openapi.util.text.StringUtil; -import com.intellij.psi.*; -import com.intellij.psi.codeStyle.CodeStyleSettingsManager; +import com.intellij.psi.JavaPsiFacade; +import com.intellij.psi.PsiClass; +import com.intellij.psi.PsiField; +import com.intellij.psi.PsiImportStatement; +import com.intellij.psi.PsiJavaFile; +import com.intellij.psi.PsiMember; +import com.intellij.psi.PsiMethod; +import com.intellij.psi.PsiNamedElement; import com.intellij.psi.codeStyle.NameUtil; import com.intellij.psi.search.GlobalSearchScope; import com.intellij.psi.search.PsiShortNamesCache; -import me.lotabout.codegenerator.config.include.Include; -import org.apache.velocity.VelocityContext; -import org.jetbrains.annotations.NotNull; -import org.jetbrains.annotations.Nullable; -import org.jetbrains.java.generate.element.ElementComparator; -import org.jetbrains.java.generate.element.GenerationHelper; -import org.jetbrains.java.generate.exception.GenerateCodeException; -import org.jetbrains.java.generate.exception.PluginException; -import org.jetbrains.java.generate.velocity.VelocityFactory; -import java.io.StringWriter; -import java.util.*; -import java.util.stream.Collectors; +import me.lotabout.codegenerator.config.include.Include; public class GenerationUtil { - private static final Logger logger = Logger.getInstance("#" + GenerationUtil.class.getName()); + private static final Logger logger = Logger.getInstance(GenerationUtil.class); /** * Combines the two lists into one list of members. @@ -67,7 +79,9 @@ public static List convertClassMembersToPsiMembers(@Nullable final Li return psiMemberList; } - public static void insertMembersToContext(final List members, final List notNullMembers, final Map context, final String postfix, final int sortElements) { + public static void insertMembersToContext(final List members, + final List notNullMembers, final Map context, + final String postfix, final int sortElements) { logger.debug("insertMembersToContext - adding fields"); // field information final List fieldElements = EntryUtils.getOnlyAsFieldEntries(members, notNullMembers, false); @@ -80,8 +94,8 @@ public static void insertMembersToContext(final List members, final L // method information logger.debug("insertMembersToContext - adding members"); - context.put("methods" + postfix, EntryUtils.getOnlyAsMethodEntrys(members)); - context.put("methods", EntryUtils.getOnlyAsMethodEntrys(members)); + context.put("methods" + postfix, EntryUtils.getOnlyAsMethodEntries(members)); + context.put("methods", EntryUtils.getOnlyAsMethodEntries(members)); // element information (both fields and methods) logger.debug("Velocity Context - adding members (fields and methods)"); @@ -207,18 +221,24 @@ public static void handleException(final Project project, final Exception e) thr if (e instanceof GenerateCodeException) { // code generation error - display velocity error in error dialog so user can identify problem quicker Messages.showMessageDialog(project, - "Velocity error generating code - see IDEA log for more details (stacktrace should be in idea.log):\n" + - e.getMessage(), "Warning", Messages.getWarningIcon()); + "Velocity error generating code - see IDEA log for more details (stacktrace should be in idea.log):\n" + + e.getMessage(), "Warning", Messages.getWarningIcon()); } else if (e instanceof PluginException) { // plugin related error - could be recoverable. - Messages.showMessageDialog(project, "A PluginException was thrown while performing the action - see IDEA log for details (stacktrace should be in idea.log):\n" + e.getMessage(), "Warning", Messages.getWarningIcon()); + Messages.showMessageDialog(project, + "A PluginException was thrown while performing the action - see IDEA log for details (stacktrace should be in idea.log):\n" + + e.getMessage(), "Warning", Messages.getWarningIcon()); } else if (e instanceof RuntimeException) { // unknown error (such as NPE) - not recoverable - Messages.showMessageDialog(project, "An unrecoverable exception was thrown while performing the action - see IDEA log for details (stacktrace should be in idea.log):\n" + e.getMessage(), "Error", Messages.getErrorIcon()); + Messages.showMessageDialog(project, + "An unrecoverable exception was thrown while performing the action - see IDEA log for details (stacktrace should be in idea.log):\n" + + e.getMessage(), "Error", Messages.getErrorIcon()); throw (RuntimeException) e; // throw to make IDEA alert user } else { // unknown error (such as NPE) - not recoverable - Messages.showMessageDialog(project, "An unrecoverable exception was thrown while performing the action - see IDEA log for details (stacktrace should be in idea.log):\n" + e.getMessage(), "Error", Messages.getErrorIcon()); + Messages.showMessageDialog(project, + "An unrecoverable exception was thrown while performing the action - see IDEA log for details (stacktrace should be in idea.log):\n" + + e.getMessage(), "Error", Messages.getErrorIcon()); throw new RuntimeException(e); // rethrow as runtime to make IDEA alert user } } diff --git a/src/main/java/me/lotabout/codegenerator/util/MethodEntry.java b/src/main/java/me/lotabout/codegenerator/util/MethodEntry.java index 79f2f73..e5b9d6c 100644 --- a/src/main/java/me/lotabout/codegenerator/util/MethodEntry.java +++ b/src/main/java/me/lotabout/codegenerator/util/MethodEntry.java @@ -1,13 +1,9 @@ package me.lotabout.codegenerator.util; -import com.intellij.psi.PsiMethod; import org.jetbrains.annotations.NotNull; import org.jetbrains.java.generate.element.MethodElement; -import java.util.Arrays; -import java.util.List; -import java.util.Objects; -import java.util.stream.Collectors; +import com.intellij.psi.PsiMethod; /** * Wrapper around MethodElement @@ -16,7 +12,7 @@ public class MethodEntry implements MemberEntry { private final PsiMethod raw; private final MethodElement element; - public MethodEntry(PsiMethod field, MethodElement element) { + public MethodEntry(final PsiMethod field, final MethodElement element) { this.raw = field; this.element = element; } @@ -25,6 +21,7 @@ public MethodElement getElement() { return element; } + @Override public PsiMethod getRaw() { return raw; } @@ -33,7 +30,7 @@ public String getMethodName() { return element.getMethodName(); } - public void setMethodName(String s) { + public void setMethodName(final String s) { element.setMethodName(s); } @@ -41,7 +38,7 @@ public String getFieldName() { return element.getFieldName(); } - public void setFieldName(String s) { + public void setFieldName(final String s) { element.setFieldName(s); } @@ -53,7 +50,7 @@ public boolean isModifierAbstract() { return element.isModifierAbstract(); } - public void setModifierAbstract(boolean b) { + public void setModifierAbstract(final boolean b) { element.setModifierAbstract(b); } @@ -65,7 +62,7 @@ public boolean isModifierSynchronized() { return element.isModifierSynchronized(); } - public void setModifierSynchronized(boolean b) { + public void setModifierSynchronized(final boolean b) { element.setModifierSynchronized(b); } @@ -73,7 +70,7 @@ public boolean isReturnTypeVoid() { return element.isReturnTypeVoid(); } - public void setReturnTypeVoid(boolean b) { + public void setReturnTypeVoid(final boolean b) { element.setReturnTypeVoid(b); } @@ -81,7 +78,7 @@ public boolean isGetter() { return element.isGetter(); } - public void setGetter(boolean b) { + public void setGetter(final boolean b) { element.setGetter(b); } @@ -89,11 +86,11 @@ public boolean isDeprecated() { return element.isDeprecated(); } - public void setDeprecated(boolean b) { + public void setDeprecated(final boolean b) { element.setDeprecated(b); } - public boolean matchName(String s) throws IllegalArgumentException { + public boolean matchName(final String s) throws IllegalArgumentException { return element.matchName(s); } @@ -109,7 +106,7 @@ public boolean isNestedArray() { return element.isNestedArray(); } - public void setNestedArray(boolean b) { + public void setNestedArray(final boolean b) { element.setNestedArray(b); } @@ -173,7 +170,7 @@ public String getTypeQualifiedName() { return element.getTypeQualifiedName(); } - public boolean isAnnotatedWith(@NotNull String qualifiedName) { + public boolean isAnnotatedWith(@NotNull final String qualifiedName) { return AnnotationUtil.isAnnotatedWith(raw, qualifiedName); } @@ -181,7 +178,7 @@ public String getType() { return element.getType(); } - public void setType(String s) { + public void setType(final String s) { element.setType(s); } @@ -193,7 +190,7 @@ public boolean isLong() { return element.isLong(); } - public void setLong(boolean b) { + public void setLong(final boolean b) { element.setLong(b); } @@ -201,7 +198,7 @@ public boolean isFloat() { return element.isFloat(); } - public void setFloat(boolean b) { + public void setFloat(final boolean b) { element.setFloat(b); } @@ -209,7 +206,7 @@ public boolean isDouble() { return element.isDouble(); } - public void setDouble(boolean b) { + public void setDouble(final boolean b) { element.setDouble(b); } @@ -221,11 +218,11 @@ public boolean isNotNull() { return element.isNotNull(); } - public void setNotNull(boolean b) { + public void setNotNull(final boolean b) { element.setNotNull(b); } - public void setVoid(boolean b) { + public void setVoid(final boolean b) { element.setVoid(b); } @@ -233,7 +230,7 @@ public boolean isChar() { return element.isChar(); } - public void setChar(boolean b) { + public void setChar(final boolean b) { element.setChar(b); } @@ -241,7 +238,7 @@ public boolean isByte() { return element.isByte(); } - public void setByte(boolean b) { + public void setByte(final boolean b) { element.setByte(b); } @@ -249,15 +246,15 @@ public boolean isShort() { return element.isShort(); } - public void setShort(boolean b) { + public void setShort(final boolean b) { element.setShort(b); } - public void setBoolean(boolean b) { + public void setBoolean(final boolean b) { element.setBoolean(b); } - public void setName(String s) { + public void setName(final String s) { element.setName(s); } diff --git a/src/main/java/me/lotabout/codegenerator/util/PackageUtil.java b/src/main/java/me/lotabout/codegenerator/util/PackageUtil.java index 72e2f8a..4ecc189 100644 --- a/src/main/java/me/lotabout/codegenerator/util/PackageUtil.java +++ b/src/main/java/me/lotabout/codegenerator/util/PackageUtil.java @@ -1,5 +1,11 @@ package me.lotabout.codegenerator.util; +import java.io.File; +import java.util.Arrays; + +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; + import com.intellij.ide.IdeBundle; import com.intellij.ide.util.DirectoryChooserUtil; import com.intellij.openapi.application.ApplicationManager; @@ -11,36 +17,31 @@ import com.intellij.openapi.projectRoots.impl.ProjectRootUtil; import com.intellij.openapi.roots.ModulePackageIndex; import com.intellij.openapi.ui.Messages; -import com.intellij.openapi.util.ThrowableComputable; import com.intellij.openapi.vfs.VirtualFile; -import com.intellij.psi.*; -import com.intellij.psi.impl.file.PsiDirectoryFactory; +import com.intellij.psi.JavaDirectoryService; +import com.intellij.psi.JavaPsiFacade; +import com.intellij.psi.PsiDirectory; +import com.intellij.psi.PsiManager; +import com.intellij.psi.PsiPackage; import com.intellij.psi.search.GlobalSearchScope; -import com.intellij.util.ActionRunner; import com.intellij.util.IncorrectOperationException; import com.intellij.util.Query; -import org.jetbrains.annotations.NotNull; -import org.jetbrains.annotations.Nullable; - -import java.io.File; -import java.io.IOException; -import java.util.Arrays; // customize my package Util based on Intellij's built-in Package Util public class PackageUtil { - private static final Logger LOG = Logger.getInstance("me.lotabout.codegenerator.util.PackageUtil"); + private static final Logger LOG = Logger.getInstance(PackageUtil.class); @Nullable public static PsiDirectory findOrCreateDirectoryForPackage(@NotNull final Project project, - @Nullable final Module module, - final String packageName, - @Nullable final PsiDirectory baseDir, - final boolean alwaysPrompt) throws IncorrectOperationException { + @Nullable final Module module, final String packageName, + @Nullable final PsiDirectory baseDir, final boolean alwaysPrompt) + throws IncorrectOperationException { return findOrCreateDirectoryForPackage(project, module, packageName, baseDir, true, alwaysPrompt); } @Nullable - public static PsiDirectory findSourceDirectoryByModuleName(@NotNull final Project project, @Nullable final String moduleName) { + public static PsiDirectory findSourceDirectoryByModuleName(@NotNull final Project project, + @Nullable final String moduleName) { return Arrays.stream(ProjectRootUtil.getSourceRootDirectories(project)) .filter(psiDirectory -> psiDirectory.getVirtualFile().getPath().contains(moduleName)) .findFirst() @@ -50,11 +51,9 @@ public static PsiDirectory findSourceDirectoryByModuleName(@NotNull final Projec @Nullable public static PsiDirectory findOrCreateDirectoryForPackage(@NotNull final Project project, - @Nullable final Module module, - String packageName, - final PsiDirectory baseDir, - final boolean askUserToCreate, - final boolean alwaysPrompt) throws IncorrectOperationException { + @Nullable final Module module, String packageName, final PsiDirectory baseDir, + final boolean askUserToCreate, final boolean alwaysPrompt) + throws IncorrectOperationException { PsiDirectory psiDirectory = null; if (!alwaysPrompt && !packageName.isEmpty()) { PsiPackage rootPackage = findLongestExistingPackage(module, packageName); @@ -64,7 +63,7 @@ public static PsiDirectory findOrCreateDirectoryForPackage(@NotNull final Projec final int beginIndex = rootPackage.getQualifiedName().length() + 1; packageName = beginIndex < packageName.length() ? packageName.substring(beginIndex) : ""; String postfixToShow = packageName.replace('.', File.separatorChar); - if (packageName.length() > 0) { + if (!packageName.isEmpty()) { postfixToShow = File.separatorChar + postfixToShow; } final PsiDirectory[] moduleDirectories = getPackageDirectoriesInModule(rootPackage, module); @@ -84,7 +83,7 @@ public static PsiDirectory findOrCreateDirectoryForPackage(@NotNull final Projec String restOfName = packageName; boolean askedToCreate = false; - while (restOfName.length() > 0) { + while (!restOfName.isEmpty()) { final String name = getLeftPart(restOfName); final PsiDirectory foundExistingDirectory = psiDirectory.findSubdirectory(name); if (foundExistingDirectory == null) { @@ -146,7 +145,8 @@ private static boolean isWritablePackage(final PsiPackage aPackage) { return false; } - private static PsiDirectory getWritableModuleDirectory(@NotNull final Query vFiles, @NotNull final Module module, final PsiManager manager) { + private static PsiDirectory getWritableModuleDirectory(@NotNull final Query vFiles, + @NotNull final Module module, final PsiManager manager) { for (final VirtualFile vFile : vFiles) { if (ModuleUtil.findModuleForFile(vFile, module.getProject()) != module) continue; final PsiDirectory directory = manager.findDirectory(vFile); @@ -166,7 +166,9 @@ private static PsiPackage findLongestExistingPackage(final Module module, final String nameToMatch = packageName; while (true) { - final Query vFiles = ModulePackageIndex.getInstance(module).getDirsByPackageName(nameToMatch, false); + final Query vFiles = ModulePackageIndex + .getInstance(module) + .getDirsByPackageName(nameToMatch, false); final PsiDirectory directory = getWritableModuleDirectory(vFiles, module, manager); if (directory != null) return JavaDirectoryService.getInstance().getPackage(directory); diff --git a/src/main/java/me/lotabout/codegenerator/worker/JavaBodyWorker.java b/src/main/java/me/lotabout/codegenerator/worker/JavaBodyWorker.java index 7bd2d5a..45ca2a2 100644 --- a/src/main/java/me/lotabout/codegenerator/worker/JavaBodyWorker.java +++ b/src/main/java/me/lotabout/codegenerator/worker/JavaBodyWorker.java @@ -1,6 +1,13 @@ package me.lotabout.codegenerator.worker; -import com.intellij.codeInsight.generation.GenerateMembersUtil; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; +import java.util.Map; + +import org.jetbrains.annotations.NotNull; +import org.jetbrains.java.generate.config.DuplicationPolicy; + import com.intellij.codeInsight.generation.GenerationInfo; import com.intellij.codeInsight.generation.PsiGenerationInfo; import com.intellij.codeInsight.hint.HintManager; @@ -11,53 +18,59 @@ import com.intellij.openapi.project.Project; import com.intellij.openapi.ui.DialogBuilder; import com.intellij.openapi.ui.Messages; -import com.intellij.psi.*; +import com.intellij.psi.PsiClass; +import com.intellij.psi.PsiElement; +import com.intellij.psi.PsiField; +import com.intellij.psi.PsiFile; +import com.intellij.psi.PsiFileFactory; +import com.intellij.psi.PsiMember; +import com.intellij.psi.PsiMethod; import com.intellij.psi.codeStyle.CodeStyleManager; import com.intellij.psi.codeStyle.JavaCodeStyleManager; import com.intellij.util.IncorrectOperationException; + import me.lotabout.codegenerator.ConflictResolutionPolicy; import me.lotabout.codegenerator.config.CodeTemplate; import me.lotabout.codegenerator.config.include.Include; import me.lotabout.codegenerator.util.GenerationUtil; -import org.jetbrains.annotations.NotNull; -import org.jetbrains.java.generate.config.DuplicationPolicy; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; -import java.util.Map; +import static com.intellij.codeInsight.generation.GenerateMembersUtil.insertMembersAtOffset; + +import static me.lotabout.codegenerator.util.GenerationUtil.velocityEvaluate; public class JavaBodyWorker { private static final Logger logger = Logger.getInstance(JavaBodyWorker.class); - public static void execute(@NotNull CodeTemplate codeTemplate, List includes, @NotNull PsiClass parentClass, - @NotNull Editor editor, @NotNull Map context) { + public static void execute(@NotNull final CodeTemplate codeTemplate, + final List includes, @NotNull final PsiClass parentClass, + @NotNull final Editor editor, @NotNull final Map context) { final Project project = parentClass.getProject(); - String body = GenerationUtil.velocityEvaluate(project, context, null, codeTemplate.template, includes); + final String body = velocityEvaluate(project, context, null, codeTemplate.template, includes); if (logger.isDebugEnabled()) logger.debug("Method body generated from Velocity:\n" + body); final PsiClass fakeClass; try { final PsiFile element = PsiFileFactory - .getInstance(parentClass.getProject()).createFileFromText("filename", JavaFileType.INSTANCE, "class X {" + body + "}"); + .getInstance(parentClass.getProject()) + .createFileFromText("filename", JavaFileType.INSTANCE, "class X {" + body + "}"); fakeClass = (PsiClass) element.getLastChild(); CodeStyleManager.getInstance(parentClass.getProject()).reformat(fakeClass); - } catch (IncorrectOperationException ignore) { + } catch (final IncorrectOperationException ignore) { HintManager.getInstance().showErrorHint(editor, "fail to generate code from template"); return; } - List generationInfoList = new ArrayList<>(); - List membersToDelete = new ArrayList<>(); + final List generationInfoList = new ArrayList<>(); + final List membersToDelete = new ArrayList<>(); - List allMembers = new ArrayList<>(); + final List allMembers = new ArrayList<>(); allMembers.addAll(Arrays.asList(fakeClass.getFields())); allMembers.addAll(Arrays.asList(fakeClass.getMethods())); allMembers.addAll(Arrays.asList(fakeClass.getInnerClasses())); boolean notAskAgain = false; ConflictResolutionPolicy policy = ConflictResolutionPolicy.DUPLICATE; - for (PsiMember member : allMembers) { + for (final PsiMember member : allMembers) { PsiMember existingMember = null; if (member instanceof PsiField) { existingMember = parentClass.findFieldByName(member.getName(), false); @@ -69,7 +82,8 @@ public static void execute(@NotNull CodeTemplate codeTemplate, List inc if (!notAskAgain) { policy = handleExistedMember(codeTemplate, member, existingMember); - notAskAgain = policy == ConflictResolutionPolicy.DUPLICATE_ALL || policy == me.lotabout.codegenerator.ConflictResolutionPolicy.REPLACE_ALL; + notAskAgain = (policy == ConflictResolutionPolicy.DUPLICATE_ALL) + || (policy == ConflictResolutionPolicy.REPLACE_ALL); } switch (policy) { @@ -90,53 +104,46 @@ public static void execute(@NotNull CodeTemplate codeTemplate, List inc // delete all members membersToDelete.forEach(PsiElement::delete); - int offset = 0; - switch (codeTemplate.insertNewMethodOption) { - case AT_CARET: - offset = editor.getCaretModel().getOffset(); - break; - case AT_THE_END_OF_A_CLASS: - offset = parentClass.getTextRange().getEndOffset() - 1; - } - GenerateMembersUtil.insertMembersAtOffset(parentClass.getContainingFile(), offset, generationInfoList); + final int offset = switch (codeTemplate.insertNewMethodOption) { + case AT_CARET -> editor.getCaretModel().getOffset(); + case AT_THE_END_OF_A_CLASS -> parentClass.getTextRange().getEndOffset() - 1; + default -> 0; + }; + insertMembersAtOffset(parentClass.getContainingFile(), offset, generationInfoList); // auto import - JavaCodeStyleManager.getInstance(parentClass.getProject()).shortenClassReferences(parentClass.getContainingFile()); - } catch (Exception e) { - e.printStackTrace(); + JavaCodeStyleManager + .getInstance(parentClass.getProject()) + .shortenClassReferences(parentClass.getContainingFile()); + } catch (final Exception e) { + logger.error(e.getMessage(), e); GenerationUtil.handleException(parentClass.getProject(), e); } }); } - private static ConflictResolutionPolicy handleExistedMember(@NotNull CodeTemplate codeTemplate, PsiMember member, PsiMember existingMember) { + private static ConflictResolutionPolicy handleExistedMember(@NotNull final CodeTemplate codeTemplate, + final PsiMember member, final PsiMember existingMember) { final DuplicationPolicy dupPolicy = codeTemplate.whenDuplicatesOption; if (dupPolicy == DuplicationPolicy.ASK && existingMember != null) { - DialogBuilder builder = new DialogBuilder(); + final DialogBuilder builder = new DialogBuilder(); builder.setTitle("Replace existing member: " + member.getName() + "?"); builder.addOkAction(); builder.addCancelAction(); - - int exit = Messages.showDialog("Replace existing member: " + member.getName() + "?", + final int exit = Messages.showDialog("Replace existing member: " + member.getName() + "?", "Member Already Exists", new String[]{"Yes for All", "Yes", "Cancel", "No", "No for all"}, 1, 3, Messages.getQuestionIcon(), null); - switch (exit) { - case 0: - return ConflictResolutionPolicy.REPLACE_ALL; - case 1: - return ConflictResolutionPolicy.REPLACE; - case 2: - return ConflictResolutionPolicy.CANCEL; - case 3: - return ConflictResolutionPolicy.DUPLICATE; - case 4: - return ConflictResolutionPolicy.DUPLICATE_ALL; - default: - return ConflictResolutionPolicy.DUPLICATE; - } + return switch (exit) { + case 0 -> ConflictResolutionPolicy.REPLACE_ALL; + case 1 -> ConflictResolutionPolicy.REPLACE; + case 2 -> ConflictResolutionPolicy.CANCEL; + case 3 -> ConflictResolutionPolicy.DUPLICATE; + case 4 -> ConflictResolutionPolicy.DUPLICATE_ALL; + default -> ConflictResolutionPolicy.DUPLICATE; + }; } else if (dupPolicy == DuplicationPolicy.REPLACE) { return ConflictResolutionPolicy.REPLACE; } diff --git a/src/main/java/me/lotabout/codegenerator/worker/JavaCaretWorker.java b/src/main/java/me/lotabout/codegenerator/worker/JavaCaretWorker.java index 177dcd7..59a84bd 100644 --- a/src/main/java/me/lotabout/codegenerator/worker/JavaCaretWorker.java +++ b/src/main/java/me/lotabout/codegenerator/worker/JavaCaretWorker.java @@ -1,5 +1,11 @@ package me.lotabout.codegenerator.worker; +import java.util.List; +import java.util.Map; + +import org.jetbrains.annotations.NotNull; + +import com.intellij.codeInsight.hint.HintManager; import com.intellij.openapi.command.WriteCommandAction; import com.intellij.openapi.diagnostic.Logger; import com.intellij.openapi.editor.Document; @@ -12,23 +18,21 @@ import com.intellij.psi.PsiJavaFile; import com.intellij.psi.codeStyle.JavaCodeStyleManager; import com.intellij.psi.util.PsiTreeUtil; + import me.lotabout.codegenerator.config.CodeTemplate; import me.lotabout.codegenerator.config.include.Include; -import me.lotabout.codegenerator.util.GenerationUtil; -import org.jetbrains.annotations.NotNull; -import java.util.List; -import java.util.Map; +import static me.lotabout.codegenerator.util.GenerationUtil.velocityEvaluate; public class JavaCaretWorker { private static final Logger logger = Logger.getInstance(JavaCaretWorker.class); - public static void execute(@NotNull CodeTemplate codeTemplate, List includes, @NotNull PsiJavaFile file, @NotNull Editor editor, @NotNull Map context) { + public static void execute(@NotNull final CodeTemplate codeTemplate, + final List includes, @NotNull final PsiJavaFile file, + @NotNull final Editor editor, @NotNull final Map context) { final Project project = file.getProject(); - String content = GenerationUtil.velocityEvaluate(project, context, null, codeTemplate.template, includes); - if (logger.isDebugEnabled()) - logger.debug("Method body generated from Velocity:\n" + content); - + final String content = velocityEvaluate(project, context, null, codeTemplate.template, includes); + logger.debug("Method body generated from Velocity:\n{}", content); //Access document, caret, and selection final Document document = editor.getDocument(); final SelectionModel selectionModel = editor.getSelectionModel(); @@ -38,9 +42,17 @@ public static void execute(@NotNull CodeTemplate codeTemplate, List inc WriteCommandAction.runWriteCommandAction(project, () -> { document.replaceString(start, end, content); PsiDocumentManager.getInstance(project).commitDocument(document); - PsiElement element = file.findElementAt(editor.getCaretModel().getOffset()); - PsiClass clazz = PsiTreeUtil.getParentOfType(element, PsiClass.class, false); - JavaCodeStyleManager.getInstance(project).shortenClassReferences(clazz.getContainingFile()); + final PsiElement element = file.findElementAt(editor.getCaretModel().getOffset()); + final PsiClass clazz = PsiTreeUtil.getParentOfType(element, PsiClass.class, false); + if (clazz == null) { + logger.error("Cannot find PsiClass from the current caret position"); + HintManager.getInstance().showErrorHint(editor, + "Cannot find PsiClass from the current caret position"); + return; + } + JavaCodeStyleManager + .getInstance(project) + .shortenClassReferences(clazz.getContainingFile()); }); selectionModel.removeSelection(); } diff --git a/src/main/java/me/lotabout/codegenerator/worker/JavaClassWorker.java b/src/main/java/me/lotabout/codegenerator/worker/JavaClassWorker.java index 1253b57..f4d3262 100644 --- a/src/main/java/me/lotabout/codegenerator/worker/JavaClassWorker.java +++ b/src/main/java/me/lotabout/codegenerator/worker/JavaClassWorker.java @@ -1,5 +1,12 @@ package me.lotabout.codegenerator.worker; +import java.io.File; +import java.util.List; +import java.util.Map; + +import org.apache.commons.lang3.StringUtils; +import org.jetbrains.annotations.NotNull; + import com.intellij.ide.highlighter.JavaFileType; import com.intellij.openapi.application.ApplicationManager; import com.intellij.openapi.command.WriteCommandAction; @@ -13,27 +20,30 @@ import com.intellij.openapi.vfs.VfsUtil; import com.intellij.openapi.vfs.VirtualFile; import com.intellij.openapi.vfs.VirtualFileManager; -import com.intellij.psi.*; +import com.intellij.psi.PsiDirectory; +import com.intellij.psi.PsiFile; +import com.intellij.psi.PsiFileFactory; +import com.intellij.psi.PsiJavaFile; import com.intellij.psi.codeStyle.CodeStyleManager; import com.intellij.psi.codeStyle.JavaCodeStyleManager; import com.intellij.psi.impl.PsiManagerImpl; import com.intellij.psi.impl.file.PsiDirectoryFactory; import com.intellij.psi.impl.file.PsiDirectoryImpl; + import me.lotabout.codegenerator.config.CodeTemplate; import me.lotabout.codegenerator.config.include.Include; import me.lotabout.codegenerator.util.GenerationUtil; -import me.lotabout.codegenerator.util.PackageUtil; -import org.apache.commons.lang3.StringUtils; -import org.jetbrains.annotations.NotNull; -import java.io.File; -import java.util.List; -import java.util.Map; +import static me.lotabout.codegenerator.util.PackageUtil.findOrCreateDirectoryForPackage; +import static me.lotabout.codegenerator.util.PackageUtil.findSourceDirectoryByModuleName; public class JavaClassWorker { private static final Logger logger = Logger.getInstance(JavaClassWorker.class); - public static void execute(@NotNull final CodeTemplate codeTemplate, @NotNull final List includes, @NotNull final PsiJavaFile selectedFile, @NotNull final Map context) { + public static void execute(@NotNull final CodeTemplate codeTemplate, + @NotNull final List includes, + @NotNull final PsiJavaFile selectedFile, + @NotNull final Map context) { try { final Project project = selectedFile.getProject(); @@ -41,7 +51,8 @@ public static void execute(@NotNull final CodeTemplate codeTemplate, @NotNull fi final String className; final String packageName; - final String FQClass = GenerationUtil.velocityEvaluate(project, context, context, codeTemplate.classNameVm, includes); + final String FQClass = GenerationUtil.velocityEvaluate(project, + context, context, codeTemplate.classNameVm, includes); if (logger.isDebugEnabled()) logger.debug("FQClass generated\n" + FQClass); final int index = FQClass.lastIndexOf("."); @@ -68,18 +79,25 @@ public static void execute(@NotNull final CodeTemplate codeTemplate, @NotNull fi final Module currentModule = ModuleUtilCore.findModuleForPsiElement(selectedFile); assert currentModule != null; - final VirtualFile moduleRoot = ProjectRootManager.getInstance(project).getFileIndex().getSourceRootForFile(selectedFile.getVirtualFile()); + final VirtualFile moduleRoot = ProjectRootManager + .getInstance(project) + .getFileIndex() + .getSourceRootForFile(selectedFile.getVirtualFile()); assert moduleRoot != null; - final PsiDirectory moduleRootDir = PsiDirectoryFactory.getInstance(project).createDirectory(moduleRoot); + final PsiDirectory moduleRootDir = PsiDirectoryFactory + .getInstance(project) + .createDirectory(moduleRoot); final VirtualFileManager manager = VirtualFileManager.getInstance(); final PsiDirectory targetPackageDir; if (StringUtils.isNotBlank(codeTemplate.defaultTargetModule)) { - targetPackageDir = PackageUtil.findSourceDirectoryByModuleName(project, codeTemplate.defaultTargetModule); + targetPackageDir = findSourceDirectoryByModuleName(project, + codeTemplate.defaultTargetModule); } else { - targetPackageDir = PackageUtil.findOrCreateDirectoryForPackage( - project, currentModule, targetPackageName, moduleRootDir, codeTemplate.alwaysPromptForPackage); + targetPackageDir = findOrCreateDirectoryForPackage(project, + currentModule, targetPackageName, moduleRootDir, + codeTemplate.alwaysPromptForPackage); } if (targetPackageDir == null) { @@ -105,9 +123,15 @@ public static void execute(@NotNull final CodeTemplate codeTemplate, @NotNull fi } final VirtualFile targetDirectoryVf = manager.refreshAndFindFileByUrl(VfsUtil.pathToUrl(targetDirectory)); + if (targetDirectoryVf == null) { + Messages.showErrorDialog("Failed to create directory: " + targetDirectory, "Error"); + return; + } final PsiDirectory targetPsiDirectory = new PsiDirectoryImpl(new PsiManagerImpl(project), targetDirectoryVf); - final PsiFile targetFile = PsiFileFactory.getInstance(project).createFileFromText(className + ".java", JavaFileType.INSTANCE, content); + final PsiFile targetFile = PsiFileFactory + .getInstance(project) + .createFileFromText(className + ".java", JavaFileType.INSTANCE, content); JavaCodeStyleManager.getInstance(project).shortenClassReferences(targetFile); CodeStyleManager.getInstance(project).reformat(targetFile); @@ -123,18 +147,20 @@ public static void execute(@NotNull final CodeTemplate codeTemplate, @NotNull fi // open the file in editor ApplicationManager.getApplication() - .invokeLater(() -> FileEditorManager.getInstance(project).openFile(addedFile.getVirtualFile(), true, true)); + .invokeLater(() -> FileEditorManager + .getInstance(project) + .openFile(addedFile.getVirtualFile(), true, true)); } catch (final Exception e) { - e.printStackTrace(); + logger.error("Failed to create file: {}", e.getMessage()); GenerationUtil.handleException(project, e); } }); - }catch (final Exception e){ + } catch (final Exception e){ e.printStackTrace(); } } private static boolean userConfirmedOverride() { - return Messages.showYesNoDialog("Overwrite?", "File Exists", null) == Messages.OK; + return Messages.showYesNoDialog("Overwrite?", "File Exists", null) == Messages.YES; } } From baa2dfecb6ed708bfeb933a74558d25543eefe65 Mon Sep 17 00:00:00 2001 From: Haixing Hu Date: Wed, 21 Aug 2024 10:51:06 +0800 Subject: [PATCH 08/15] fix: fix potential bugs --- .../lotabout/codegenerator/action/CodeGeneratorAction.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/main/java/me/lotabout/codegenerator/action/CodeGeneratorAction.java b/src/main/java/me/lotabout/codegenerator/action/CodeGeneratorAction.java index a815369..d0f6b11 100644 --- a/src/main/java/me/lotabout/codegenerator/action/CodeGeneratorAction.java +++ b/src/main/java/me/lotabout/codegenerator/action/CodeGeneratorAction.java @@ -300,7 +300,7 @@ private static List filterMembers(final List members, if (member instanceof PsiMember) { return (PsiMember) member; } else if (member instanceof MemberEntry) { - return (((MemberEntry) member).getRaw()); + return (((MemberEntry) member).getRaw()); } else { return null; } @@ -352,6 +352,9 @@ private static PsiClass buildFakeClassForEmptyFile(@NotNull final PsiJavaFile fi .getInstance(project) .getFileIndex() .getSourceRootForFile(file.getVirtualFile()); + if (moduleRoot == null) { + return null; + } final String fileName = file.getName(); final String className = fileName.replace(".java", ""); final String packageName = file From 579ad60461fbb1d0e9d96e2a02f2ef24734e2991 Mon Sep 17 00:00:00 2001 From: Haixing Hu Date: Wed, 21 Aug 2024 11:01:47 +0800 Subject: [PATCH 09/15] style: fix coding style problems --- .../codegenerator/action/CodeGeneratorAction.java | 15 +++++++++++---- .../codegenerator/worker/JavaBodyWorker.java | 10 ++++------ 2 files changed, 15 insertions(+), 10 deletions(-) diff --git a/src/main/java/me/lotabout/codegenerator/action/CodeGeneratorAction.java b/src/main/java/me/lotabout/codegenerator/action/CodeGeneratorAction.java index d0f6b11..8fcc16b 100644 --- a/src/main/java/me/lotabout/codegenerator/action/CodeGeneratorAction.java +++ b/src/main/java/me/lotabout/codegenerator/action/CodeGeneratorAction.java @@ -25,6 +25,7 @@ import com.intellij.ide.util.MemberChooser; import com.intellij.ide.util.TreeClassChooser; import com.intellij.ide.util.TreeClassChooserFactory; +import com.intellij.openapi.actionSystem.ActionUpdateThread; import com.intellij.openapi.actionSystem.AnAction; import com.intellij.openapi.actionSystem.AnActionEvent; import com.intellij.openapi.actionSystem.LangDataKeys; @@ -78,6 +79,11 @@ public CodeGeneratorAction(final String templateKey, final String templateName) this.templateKey = templateKey; } + @Override + public @NotNull ActionUpdateThread getActionUpdateThread() { + return super.getActionUpdateThread(); + } + @Override public void update(final AnActionEvent e) { // Code Generation action could run without editor @@ -95,9 +101,11 @@ public void update(final AnActionEvent e) { presentation.setEnabled(true); } - @Override public void actionPerformed(final AnActionEvent e) { - final CodeTemplate codeTemplate = settings.getCodeTemplate(templateKey) - .orElseThrow(IllegalStateException::new); + @Override + public void actionPerformed(final AnActionEvent e) { + final CodeTemplate codeTemplate = settings + .getCodeTemplate(templateKey) + .orElseThrow(IllegalStateException::new); final Project project = e.getProject(); assert project != null; @@ -125,7 +133,6 @@ public void update(final AnActionEvent e) { HintManager.getInstance().showErrorHint(editor, "no parent class found for current cursor position"); return; } - JavaBodyWorker.execute(codeTemplate, settings.getIncludes(), clazz, editor, contextMap); break; case "caret": diff --git a/src/main/java/me/lotabout/codegenerator/worker/JavaBodyWorker.java b/src/main/java/me/lotabout/codegenerator/worker/JavaBodyWorker.java index 45ca2a2..772959c 100644 --- a/src/main/java/me/lotabout/codegenerator/worker/JavaBodyWorker.java +++ b/src/main/java/me/lotabout/codegenerator/worker/JavaBodyWorker.java @@ -68,7 +68,7 @@ public static void execute(@NotNull final CodeTemplate codeTemplate, allMembers.addAll(Arrays.asList(fakeClass.getMethods())); allMembers.addAll(Arrays.asList(fakeClass.getInnerClasses())); - boolean notAskAgain = false; + boolean askAgain = true; ConflictResolutionPolicy policy = ConflictResolutionPolicy.DUPLICATE; for (final PsiMember member : allMembers) { PsiMember existingMember = null; @@ -79,13 +79,11 @@ public static void execute(@NotNull final CodeTemplate codeTemplate, } else if (member instanceof PsiClass) { existingMember = parentClass.findInnerClassByName(member.getName(), false); } - - if (!notAskAgain) { + if (askAgain) { policy = handleExistedMember(codeTemplate, member, existingMember); - notAskAgain = (policy == ConflictResolutionPolicy.DUPLICATE_ALL) - || (policy == ConflictResolutionPolicy.REPLACE_ALL); + askAgain = (policy != ConflictResolutionPolicy.DUPLICATE_ALL) + && (policy != ConflictResolutionPolicy.REPLACE_ALL); } - switch (policy) { case CANCEL: return; From 72b857c088aad72324ea675b2e36b65f702d77a2 Mon Sep 17 00:00:00 2001 From: Haixing Hu Date: Wed, 21 Aug 2024 11:07:40 +0800 Subject: [PATCH 10/15] fix: fix unchecked generic type warnings --- .../action/CodeGeneratorAction.java | 25 +++++++++---------- .../codegenerator/util/GenerationUtil.java | 4 +-- 2 files changed, 13 insertions(+), 16 deletions(-) diff --git a/src/main/java/me/lotabout/codegenerator/action/CodeGeneratorAction.java b/src/main/java/me/lotabout/codegenerator/action/CodeGeneratorAction.java index 8fcc16b..89a2db1 100644 --- a/src/main/java/me/lotabout/codegenerator/action/CodeGeneratorAction.java +++ b/src/main/java/me/lotabout/codegenerator/action/CodeGeneratorAction.java @@ -64,6 +64,7 @@ import me.lotabout.codegenerator.worker.JavaCaretWorker; import me.lotabout.codegenerator.worker.JavaClassWorker; +import static me.lotabout.codegenerator.util.GenerationUtil.convertClassMembersToPsiMembers; import static me.lotabout.codegenerator.util.GenerationUtil.velocityEvaluate; public class CodeGeneratorAction extends AnAction { @@ -254,20 +255,20 @@ private List selectMember(@NotNull final PsiJavaFile file, velocityEvaluate(project, contextMap, contextMap, config.providerTemplate,settings.getIncludes()); // members should be MemberEntry[] or PsiMember[] - List availableMembers = Collections.emptyList(); - List selectedMembers = Collections.emptyList(); + List availableMembers = Collections.emptyList(); + List selectedMembers = Collections.emptyList(); if (contextMap.containsKey(AVAILABLE_MEMBERS)) { - availableMembers = (List) contextMap.get(AVAILABLE_MEMBERS); - selectedMembers = (List) contextMap.get(SELECTED_MEMBERS); - selectedMembers = selectedMembers == null ? availableMembers : selectedMembers; + availableMembers = (List) contextMap.get(AVAILABLE_MEMBERS); + selectedMembers = (List) contextMap.get(SELECTED_MEMBERS); + selectedMembers = (selectedMembers == null ? availableMembers : selectedMembers); } contextMap.remove(AVAILABLE_MEMBERS); contextMap.remove(SELECTED_MEMBERS); // filter the members by configuration - final PsiElementClassMember[] dialogMembers = buildClassMember(filterMembers(availableMembers, config)); - final PsiElementClassMember[] membersSelected = buildClassMember(filterMembers(selectedMembers, config)); + final PsiElementClassMember[] dialogMembers = buildClassMember(filterMembers(availableMembers, config)); + final PsiElementClassMember[] membersSelected = buildClassMember(filterMembers(selectedMembers, config)); if (!config.allowEmptySelection && dialogMembers.length <= 0) { Messages.showMessageDialog(project, @@ -276,7 +277,7 @@ private List selectMember(@NotNull final PsiJavaFile file, return null; } - final MemberChooser chooser = + final MemberChooser> chooser = new MemberChooser<>(dialogMembers, config.allowEmptySelection, config.allowMultiSelection, project, PsiUtil.isLanguageLevel5OrHigher(file), @@ -295,11 +296,10 @@ protected String getHelpId() { if (DialogWrapper.OK_EXIT_CODE != chooser.getExitCode()) { return null; // indicate exit } - - return GenerationUtil.convertClassMembersToPsiMembers(chooser.getSelectedElements()); + return convertClassMembersToPsiMembers(chooser.getSelectedElements()); } - private static List filterMembers(final List members, + private static List filterMembers(final List members, final MemberSelectionConfig config) { final FilterPattern pattern = generatorConfig2Config(config).getFilterPattern(); return members.stream() @@ -323,8 +323,7 @@ private static List filterMembers(final List members, }).collect(Collectors.toList()); } - private static PsiElementClassMember[] buildClassMember(final List members) { - + private static PsiElementClassMember[] buildClassMember(final List members) { return members .stream() .filter(m -> (m instanceof PsiField) || (m instanceof PsiMethod)) diff --git a/src/main/java/me/lotabout/codegenerator/util/GenerationUtil.java b/src/main/java/me/lotabout/codegenerator/util/GenerationUtil.java index 204187a..2941dc0 100644 --- a/src/main/java/me/lotabout/codegenerator/util/GenerationUtil.java +++ b/src/main/java/me/lotabout/codegenerator/util/GenerationUtil.java @@ -66,16 +66,14 @@ public static PsiElementClassMember[] combineToClassMemberList(final PsiField[] return members; } - public static List convertClassMembersToPsiMembers(@Nullable final List classMemberList) { + public static List convertClassMembersToPsiMembers(@Nullable final List> classMemberList) { if (classMemberList == null || classMemberList.isEmpty()) { return Collections.emptyList(); } final List psiMemberList = new ArrayList<>(); - for (final var classMember : classMemberList) { psiMemberList.add(classMember.getElement()); } - return psiMemberList; } From 098a9c764d9edfb6f163d4f72f31c594353d3a1b Mon Sep 17 00:00:00 2001 From: Haixing Hu Date: Wed, 21 Aug 2024 11:08:41 +0800 Subject: [PATCH 11/15] style: fix magic string --- src/main/java/me/lotabout/codegenerator/CodeGenerator.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/main/java/me/lotabout/codegenerator/CodeGenerator.java b/src/main/java/me/lotabout/codegenerator/CodeGenerator.java index b52ad90..02f418c 100644 --- a/src/main/java/me/lotabout/codegenerator/CodeGenerator.java +++ b/src/main/java/me/lotabout/codegenerator/CodeGenerator.java @@ -1,8 +1,9 @@ package me.lotabout.codegenerator; -import com.intellij.openapi.components.ApplicationComponent; import org.jetbrains.annotations.NotNull; +import com.intellij.openapi.components.ApplicationComponent; + public class CodeGenerator implements ApplicationComponent { public CodeGenerator() { } @@ -10,6 +11,6 @@ public CodeGenerator() { @Override @NotNull public String getComponentName() { - return "me.lotabout.codegenerator.CodeGenerator"; + return CodeGenerator.class.getCanonicalName(); } } From 45212eaba753009fc3f5de1208b9a91484efe660 Mon Sep 17 00:00:00 2001 From: Haixing Hu Date: Wed, 21 Aug 2024 12:00:55 +0800 Subject: [PATCH 12/15] style: fix coding styles --- .../codegenerator/util/GenerationUtil.java | 32 +++++++++---------- .../codegenerator/worker/JavaBodyWorker.java | 2 +- 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/src/main/java/me/lotabout/codegenerator/util/GenerationUtil.java b/src/main/java/me/lotabout/codegenerator/util/GenerationUtil.java index 2941dc0..8803669 100644 --- a/src/main/java/me/lotabout/codegenerator/util/GenerationUtil.java +++ b/src/main/java/me/lotabout/codegenerator/util/GenerationUtil.java @@ -50,19 +50,18 @@ public class GenerationUtil { * @param filteredMethods methods to be included in the dialog * @return the combined list */ - public static PsiElementClassMember[] combineToClassMemberList(final PsiField[] filteredFields, final PsiMethod[] filteredMethods) { - final var members = new PsiElementClassMember[filteredFields.length + filteredMethods.length]; - + public static PsiElementClassMember[] combineToClassMemberList(final PsiField[] filteredFields, + final PsiMethod[] filteredMethods) { + final PsiElementClassMember[] members = + new PsiElementClassMember[filteredFields.length + filteredMethods.length]; // first add fields for (var i = 0; i < filteredFields.length; i++) { members[i] = new PsiFieldMember(filteredFields[i]); } - // then add methods for (var i = 0; i < filteredMethods.length; i++) { members[filteredFields.length + i] = new PsiMethodMember(filteredMethods[i]); } - return members; } @@ -82,7 +81,7 @@ public static void insertMembersToContext(final List members, final String postfix, final int sortElements) { logger.debug("insertMembersToContext - adding fields"); // field information - final List fieldElements = EntryUtils.getOnlyAsFieldEntries(members, notNullMembers, false); + final List fieldElements = EntryUtils.getOnlyAsFieldEntries(members, notNullMembers, false); context.put("fields" + postfix, fieldElements); context.put("fields", fieldElements); if (fieldElements.size() == 1) { @@ -135,7 +134,7 @@ public static String velocityEvaluate( } template = updateTemplateWithIncludes(template, includes); - if (logger.isDebugEnabled()) logger.debug("Velocity Template:\n" + template); + logger.debug("Velocity Template:\n", template); // velocity final var velocity = VelocityFactory.getVelocityEngine(); @@ -145,8 +144,8 @@ public static String velocityEvaluate( if (outputContext != null) { for (final var key : vc.getKeys()) { - if (key instanceof String) { - outputContext.put((String) key, vc.get((String) key)); + if (key != null) { + outputContext.put(key, vc.get(key)); } } } @@ -162,11 +161,12 @@ public static String velocityEvaluate( @NotNull private static String updateTemplateWithIncludes(final String template, final List includes) { final var includeLookups = getParsedIncludeLookupItems(includes); - final var defaultImportParseExpression = includeLookups.stream() - .filter(IncludeLookupItem::isDefaultInclude) - .map(i -> String.format("#parse(%s)", i.getName())) - .collect(Collectors.joining(System.getProperty("line.separator"))); - final var templateWithDefaultImports = defaultImportParseExpression + System.getProperty("line.separator") + template; + final var defaultImportParseExpression = includeLookups + .stream() + .filter(IncludeLookupItem::isDefaultInclude) + .map(i -> String.format("#parse(%s)", i.getName())) + .collect(Collectors.joining(System.lineSeparator())); + final var templateWithDefaultImports = defaultImportParseExpression + System.lineSeparator() + template; return replaceParseExpressions(templateWithDefaultImports, includeLookups); } @@ -185,7 +185,7 @@ private static List getParsedIncludeLookupItems(final List includeLookupItems) { template = template.lines()// .map(line -> replaceParseExpression(line, includeLookupItems))// - .collect(Collectors.joining(System.getProperty("line.separator"))); + .collect(Collectors.joining(System.lineSeparator())); return template; } @@ -284,7 +284,7 @@ static final class IncludeLookupItem { private final String name; @NotNull private final String content; - private boolean defaultInclude; + private final boolean defaultInclude; IncludeLookupItem(@NotNull final String name, @NotNull final String content, final boolean defaultInclude) { this.name = name; diff --git a/src/main/java/me/lotabout/codegenerator/worker/JavaBodyWorker.java b/src/main/java/me/lotabout/codegenerator/worker/JavaBodyWorker.java index 772959c..cdbeebf 100644 --- a/src/main/java/me/lotabout/codegenerator/worker/JavaBodyWorker.java +++ b/src/main/java/me/lotabout/codegenerator/worker/JavaBodyWorker.java @@ -46,7 +46,7 @@ public static void execute(@NotNull final CodeTemplate codeTemplate, @NotNull final Editor editor, @NotNull final Map context) { final Project project = parentClass.getProject(); final String body = velocityEvaluate(project, context, null, codeTemplate.template, includes); - if (logger.isDebugEnabled()) logger.debug("Method body generated from Velocity:\n" + body); + logger.debug("Method body generated from Velocity:\n", body); final PsiClass fakeClass; try { From 2a5b2c0893db46d2d0105f16d9424ad231f3c913 Mon Sep 17 00:00:00 2001 From: Haixing Hu Date: Wed, 21 Aug 2024 12:05:08 +0800 Subject: [PATCH 13/15] fix: set the untilBuild to "242.*" --- build.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle.kts b/build.gradle.kts index c6d2735..999b0f6 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -34,7 +34,7 @@ tasks { patchPluginXml { sinceBuild.set("232") - untilBuild.set("999.*") + untilBuild.set("242.*") } signPlugin { From 7f7c70222e5e9eac3f5d3ba12986d470709a5e27 Mon Sep 17 00:00:00 2001 From: Haixing Hu Date: Sat, 24 Aug 2024 18:51:16 +0800 Subject: [PATCH 14/15] feat: add support of velocity-tools v3.1 --- build.gradle.kts | 12 +++- .../codegenerator/util/GenerationUtil.java | 61 +++++++++++-------- src/main/resources/velocity-tools.xml | 55 +++++++++++++++++ src/test/java/GenerationUtilTest.java | 47 ++++++++++++++ 4 files changed, 149 insertions(+), 26 deletions(-) create mode 100644 src/main/resources/velocity-tools.xml create mode 100644 src/test/java/GenerationUtilTest.java diff --git a/build.gradle.kts b/build.gradle.kts index 999b0f6..141c8c6 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -4,7 +4,7 @@ plugins { } group = "me.lotabout" -version = "1.7.0" +version = "1.7.1" repositories { mavenCentral() @@ -22,6 +22,12 @@ dependencies { instrumentationTools() } implementation("org.apache.commons:commons-lang3:3.12.0") + implementation("org.apache.velocity.tools:velocity-tools-generic:3.1") { + exclude(group = "org.apache.velocity", module = "velocity-engine-core") + exclude(group = "org.slf4j", module = "slf4j-api") + } + testImplementation("org.junit.jupiter:junit-jupiter-api:5.7.0") + testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:5.7.0") } tasks { @@ -46,4 +52,8 @@ tasks { publishPlugin { token.set(System.getenv("PUBLISH_TOKEN")) } + + test { + useJUnitPlatform() + } } diff --git a/src/main/java/me/lotabout/codegenerator/util/GenerationUtil.java b/src/main/java/me/lotabout/codegenerator/util/GenerationUtil.java index 8803669..c130c4e 100644 --- a/src/main/java/me/lotabout/codegenerator/util/GenerationUtil.java +++ b/src/main/java/me/lotabout/codegenerator/util/GenerationUtil.java @@ -8,7 +8,9 @@ import java.util.Map; import java.util.stream.Collectors; -import org.apache.velocity.VelocityContext; +import org.apache.velocity.app.VelocityEngine; +import org.apache.velocity.context.Context; +import org.apache.velocity.tools.ToolManager; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.java.generate.element.ElementComparator; @@ -41,6 +43,9 @@ import me.lotabout.codegenerator.config.include.Include; public class GenerationUtil { + + public static final String VELOCITY_TOOLS_CONFIG = "/velocity-tools.xml"; + private static final Logger logger = Logger.getInstance(GenerationUtil.class); /** @@ -108,42 +113,47 @@ public static void insertMembersToContext(final List members, public static String velocityEvaluate( @NotNull final Project project, @NotNull final Map contextMap, - final Map outputContext, - String template, - final List includes) throws GenerateCodeException { + @Nullable final Map outputContext, + @Nullable final String template, + @NotNull final List includes) throws GenerateCodeException { + contextMap.put("settings", CodeStyle.getSettings(project)); + contextMap.put("project", project); + contextMap.put("helper", GenerationHelper.class); + contextMap.put("StringUtil", StringUtil.class); + contextMap.put("NameUtil", NameUtil.class); + contextMap.put("PsiShortNamesCache", PsiShortNamesCache.class); + contextMap.put("JavaPsiFacade", JavaPsiFacade.class); + contextMap.put("GlobalSearchScope", GlobalSearchScope.class); + contextMap.put("EntryFactory", EntryFactory.class); + return velocityEvaluate(contextMap, outputContext, template, includes); + } + + // split this method to make unit testing easier + public static String velocityEvaluate( + @NotNull final Map contextMap, + @Nullable final Map outputContext, + @Nullable String template, + @NotNull final List includes) throws GenerateCodeException { if (template == null) { return null; } - - final var sw = new StringWriter(); + final StringWriter sw = new StringWriter(); try { - final var vc = new VelocityContext(); - - vc.put("settings", CodeStyle.getSettings(project)); - vc.put("project", project); - vc.put("helper", GenerationHelper.class); - vc.put("StringUtil", StringUtil.class); - vc.put("NameUtil", NameUtil.class); - vc.put("PsiShortNamesCache", PsiShortNamesCache.class); - vc.put("JavaPsiFacade", JavaPsiFacade.class); - vc.put("GlobalSearchScope", GlobalSearchScope.class); - vc.put("EntryFactory", EntryFactory.class); - + final ToolManager toolManager = new ToolManager(false, true); + toolManager.configure(VELOCITY_TOOLS_CONFIG); + final Context vc = toolManager.createContext(); for (final var paramName : contextMap.keySet()) { vc.put(paramName, contextMap.get(paramName)); } - template = updateTemplateWithIncludes(template, includes); logger.debug("Velocity Template:\n", template); - // velocity - final var velocity = VelocityFactory.getVelocityEngine(); + final VelocityEngine velocity = VelocityFactory.getVelocityEngine(); logger.debug("Executing velocity +++ START +++"); velocity.evaluate(vc, sw, GenerationUtil.class.getName(), template); logger.debug("Executing velocity +++ END +++"); - if (outputContext != null) { - for (final var key : vc.getKeys()) { + for (final String key : vc.getKeys()) { if (key != null) { outputContext.put(key, vc.get(key)); } @@ -154,8 +164,9 @@ public static String velocityEvaluate( } catch (final Exception e) { throw new GenerateCodeException("Error in Velocity code generator", e); } - - return StringUtil.convertLineSeparators(sw.getBuffer().toString()); + final String result = StringUtil.convertLineSeparators(sw.toString()); + logger.debug("Velocity Result:\n", result); + return result; } @NotNull diff --git a/src/main/resources/velocity-tools.xml b/src/main/resources/velocity-tools.xml new file mode 100644 index 0000000..ddbb9bd --- /dev/null +++ b/src/main/resources/velocity-tools.xml @@ -0,0 +1,55 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/test/java/GenerationUtilTest.java b/src/test/java/GenerationUtilTest.java new file mode 100644 index 0000000..0905804 --- /dev/null +++ b/src/test/java/GenerationUtilTest.java @@ -0,0 +1,47 @@ +import java.io.StringWriter; +import java.util.Arrays; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +import org.apache.velocity.app.VelocityEngine; +import org.apache.velocity.context.Context; +import org.apache.velocity.tools.ToolManager; +import org.jetbrains.java.generate.velocity.VelocityFactory; +import org.junit.jupiter.api.Test; + +import me.lotabout.codegenerator.util.GenerationUtil; + +import static java.util.Collections.emptyList; + +import static org.junit.jupiter.api.Assertions.assertEquals; + +public class GenerationUtilTest { + + @Test + public void testVelocityTools() { + final ToolManager toolManager = new ToolManager(false, true); + toolManager.configure(GenerationUtil.VELOCITY_TOOLS_CONFIG); + final Context context = toolManager.createContext(); + final List names = Arrays.asList("John", "Sarah", "Mark", "Bill"); + context.put("names", names); + final String template = "#foreach($name in $sorter.sort($names))$name #end"; + final VelocityEngine engine = VelocityFactory.getVelocityEngine(); + final StringWriter sw = new StringWriter(); + engine.evaluate(context, sw, this.getClass().getName(), template); + System.out.println(sw); + assertEquals("Bill John Mark Sarah ", sw.toString()); + } + + @Test + public void testVelocityEvaluate() { + final Map contextMap = new HashMap<>(); + final String template = """ + #set($names = ["John", "Sarah", "Mark", "Bill"]) + #foreach($name in $sorter.sort($names))$name #end + """; + final String result = GenerationUtil.velocityEvaluate(contextMap, null, template, emptyList()); + System.out.println(result); + assertEquals("\nBill John Mark Sarah ", result); + } +} From 94ca666260fca9507fca2b39846018ecb89cbb30 Mon Sep 17 00:00:00 2001 From: Haixing Hu Date: Fri, 22 Nov 2024 14:31:34 +0800 Subject: [PATCH 15/15] feat: support IDEA Intellij 2024.3 --- build.gradle.kts | 4 +-- src/main/resources/META-INF/plugin.xml | 34 ++++++++++++++------------ 2 files changed, 20 insertions(+), 18 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index 141c8c6..018dd35 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -4,7 +4,7 @@ plugins { } group = "me.lotabout" -version = "1.7.1" +version = "1.7.2" repositories { mavenCentral() @@ -40,7 +40,7 @@ tasks { patchPluginXml { sinceBuild.set("232") - untilBuild.set("242.*") + untilBuild.set("243.*") } signPlugin { diff --git a/src/main/resources/META-INF/plugin.xml b/src/main/resources/META-INF/plugin.xml index 7f0baa9..5a468d1 100644 --- a/src/main/resources/META-INF/plugin.xml +++ b/src/main/resources/META-INF/plugin.xml @@ -1,7 +1,7 @@ me.lotabout.codegenerator Code Generator - 1.6.0 + 1.7.2 Jinzhou Zhang -
  • version 1.6.0 Intellij 2023.2 support

    • +
  • version 1.7.2 Intellij 2024.3 support
    • +
  • version 1.7.0 Refactor
    • +
  • version 1.6.0 Intellij 2023.2 support
  • version 1.5.2 Default loaded include files - to add complex logic to use for className generation
  • version 1.5.1 Sub include parsing
    • -
  • version 1.5.0 Intellij 2021.3 support

    • -
  • version 1.5.0 Adds isAnnotatedWith method for field and method entities

    • -
  • version 1.5.0 Adds default target module path and default target package name for class generation

    • -
  • version 1.5.0 Macro support - Adds include support to define common shared macros

    • -
  • version 1.5.0 Adds copy template functionality

    • -
  • version 1.4.1

    Fix "Replace existing" policy when no existing member is found

    • -
  • version 1.4.0

    compatible with 2020.1

    • -
  • version 1.3.3

    fix: pipeline settings could not be saved.

    • -
  • version 1.3.2

    support idea 2016.3 and after

    • -
  • version 1.3.1

    move Code Generator Menu to Generate menu

    • -
  • version 1.3

    support insert at caret. Fix bugs

    • -
  • version 1.2

    Able to import/export settings

    • -
  • version 1.1

    Able to define workflows for selecting members/classes

    • -
  • version 1.0

    First release

    • +
  • version 1.5.0 Intellij 2021.3 support
    • +
  • version 1.5.0 Adds isAnnotatedWith method for field and method entities
    • +
  • version 1.5.0 Adds default target module path and default target package name for class generation
    • +
  • version 1.5.0 Macro support - Adds include support to define common shared macros
    • +
  • version 1.5.0 Adds copy template functionality
    • +
  • version 1.4.1 Fix "Replace existing" policy when no existing member is found
    • +
  • version 1.4.0 compatible with 2020.1
    • +
  • version 1.3.3 fix: pipeline settings could not be saved.
    • +
  • version 1.3.2 support idea 2016.3 and after
    • +
  • version 1.3.1 move Code Generator Menu to Generate menu
    • +
  • version 1.3 Support insert at caret. Fix bugs
    • +
  • version 1.2 Able to import/export settings
    • +
  • version 1.1 Able to define workflows for selecting members/classes
    • +
  • version 1.0 First release
    • ]]>