From 115b8ebdfc36780e70a4b185e3a5dbcb44a64eff Mon Sep 17 00:00:00 2001 From: accidia Date: Sat, 23 Dec 2023 14:23:15 +0800 Subject: [PATCH] =?UTF-8?q?bugfix:=20=E6=94=AF=E6=8C=812023.3,=20=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D=E9=83=A8=E5=88=86bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 3 ++- README_CN.md | 4 ++++ build.gradle | 12 +++++++++--- .../com/alibaba/compileflow/idea/CompileFlow.java | 2 +- .../idea/graph/nodeview/component/ActionPanel.java | 2 +- .../idea/graph/nodeview/dialog/ScriptTaskDialog.java | 2 +- .../idea/graph/nodeview/dialog/SubBpmDialog.java | 2 +- .../idea/plugin/action/AddComponentAction.java | 2 +- .../idea/plugin/action/CreateTestAction.java | 10 +++++----- src/main/resources/META-INF/plugin.xml | 2 +- 10 files changed, 26 insertions(+), 15 deletions(-) diff --git a/.gitignore b/.gitignore index 714d370..50c896f 100644 --- a/.gitignore +++ b/.gitignore @@ -49,4 +49,5 @@ gradle-app.setting *.nar *.ear *.tar.gz -*.rar \ No newline at end of file +*.rar +.flowclasses/ \ No newline at end of file diff --git a/README_CN.md b/README_CN.md index 9ec778d..e4ef370 100644 --- a/README_CN.md +++ b/README_CN.md @@ -122,6 +122,10 @@ https://github.com/compileflow/compileflow-designer-upgrade * bugfix：1.0.16 （2023.2.15）by xuan（感谢：chenqiyue分支PR的支持） * 2022.3的idea支持
* 修复一些BUG
+* bugfix：1.0.17 （2023.12.23）by accidia + * 2023.3的idea支持
+ * 修复创建bpm文件错误的bug
+ * 修复创建单元测试类错误的bug
diff --git a/build.gradle b/build.gradle index 62cca7f..08782ec 100644 --- a/build.gradle +++ b/build.gradle @@ -6,7 +6,7 @@ plugins { group 'com.alibaba.compileflow.designer' -version '1.0.16' +version '1.0.17' sourceCompatibility = 1.8 @@ -37,6 +37,7 @@ allprojects { dependencies { implementation fileTree(dir: 'libs', includes: ['*.jar']) + implementation group: 'com.alibaba.compileflow', name: 'compileflow', version: '1.2.0' // compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" // compile name: 'miglayout-core-5.3-SNAPSHOT' // compile name: 'miglayout-swing-5.3-SNAPSHOT' @@ -53,7 +54,7 @@ allprojects { // See https://github.com/JetBrains/gradle-intellij-plugin/ intellij { // version '2018.2' - version = '2022.3' + version = '2023.3' plugins = ['java'] } patchPluginXml { @@ -114,8 +115,13 @@ patchPluginXml { 1. 2022.3的idea支持
2. 修复部分bug
+ 1.0.17 bugfix
+ 1. 2023.3的idea支持
+ 2. 修复创建bpm文件错误的bug
+ 3. 修复创建单元测试类错误的bug
+ """ sinceBuild = '162.*' - untilBuild = '223.*' + untilBuild = '233.*' } \ No newline at end of file diff --git a/src/main/java/com/alibaba/compileflow/idea/CompileFlow.java b/src/main/java/com/alibaba/compileflow/idea/CompileFlow.java index 3a4eea7..b50016a 100644 --- a/src/main/java/com/alibaba/compileflow/idea/CompileFlow.java +++ b/src/main/java/com/alibaba/compileflow/idea/CompileFlow.java @@ -22,7 +22,7 @@ */ public class CompileFlow { - public static final String VERSION = "1.0.16"; + public static final String VERSION = "1.0.17"; public static final String HOME_PAGE = "https://github.com/alibaba/compileflow-idea-designer"; } diff --git a/src/main/java/com/alibaba/compileflow/idea/graph/nodeview/component/ActionPanel.java b/src/main/java/com/alibaba/compileflow/idea/graph/nodeview/component/ActionPanel.java index 48643c0..63736cc 100644 --- a/src/main/java/com/alibaba/compileflow/idea/graph/nodeview/component/ActionPanel.java +++ b/src/main/java/com/alibaba/compileflow/idea/graph/nodeview/component/ActionPanel.java @@ -36,7 +36,7 @@ import com.intellij.ui.components.JBScrollPane; import com.intellij.ui.table.JBTable; import net.miginfocom.swing.MigLayout; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import javax.swing.*; import javax.swing.table.DefaultTableModel; diff --git a/src/main/java/com/alibaba/compileflow/idea/graph/nodeview/dialog/ScriptTaskDialog.java b/src/main/java/com/alibaba/compileflow/idea/graph/nodeview/dialog/ScriptTaskDialog.java index 6dbb465..68df8fd 100644 --- a/src/main/java/com/alibaba/compileflow/idea/graph/nodeview/dialog/ScriptTaskDialog.java +++ b/src/main/java/com/alibaba/compileflow/idea/graph/nodeview/dialog/ScriptTaskDialog.java @@ -28,7 +28,7 @@ import com.intellij.openapi.project.Project; import com.mxgraph.model.mxCell; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.jetbrains.annotations.Nullable; import javax.swing.*; diff --git a/src/main/java/com/alibaba/compileflow/idea/graph/nodeview/dialog/SubBpmDialog.java b/src/main/java/com/alibaba/compileflow/idea/graph/nodeview/dialog/SubBpmDialog.java index 799efa5..5be4364 100644 --- a/src/main/java/com/alibaba/compileflow/idea/graph/nodeview/dialog/SubBpmDialog.java +++ b/src/main/java/com/alibaba/compileflow/idea/graph/nodeview/dialog/SubBpmDialog.java @@ -26,7 +26,7 @@ import com.intellij.openapi.project.Project; import com.mxgraph.model.mxCell; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.jetbrains.annotations.Nullable; import javax.swing.*; diff --git a/src/main/java/com/alibaba/compileflow/idea/plugin/action/AddComponentAction.java b/src/main/java/com/alibaba/compileflow/idea/plugin/action/AddComponentAction.java index bde1d00..57a3c37 100644 --- a/src/main/java/com/alibaba/compileflow/idea/plugin/action/AddComponentAction.java +++ b/src/main/java/com/alibaba/compileflow/idea/plugin/action/AddComponentAction.java @@ -46,7 +46,7 @@ public AddComponentAction() { @Override protected String getActionName(PsiDirectory directory, String newName) { - return null; + return "CompileflowFile"; } protected String getDialogPrompt() { diff --git a/src/main/java/com/alibaba/compileflow/idea/plugin/action/CreateTestAction.java b/src/main/java/com/alibaba/compileflow/idea/plugin/action/CreateTestAction.java index 3ee7b03..da20877 100644 --- a/src/main/java/com/alibaba/compileflow/idea/plugin/action/CreateTestAction.java +++ b/src/main/java/com/alibaba/compileflow/idea/plugin/action/CreateTestAction.java @@ -75,10 +75,10 @@ public void actionPerformed(AnActionEvent anActionEvent) { } //2. tips - VirtualFile moduleFile = module.getModuleFile(); - if (null == moduleFile) { - return; - } +// VirtualFile moduleFile = module.getModuleFile(); +// if (null == moduleFile) { +// return; +// } String moduleFilePath = module.getModuleFilePath(); String localBasePath = null; @@ -89,7 +89,7 @@ public void actionPerformed(AnActionEvent anActionEvent) { localBasePath = moduleFilePath.substring(0, moduleFilePath.indexOf(module.getName()+".iml")); } - String testDirStr = localBasePath + "/src/test/java/" + packagesAndClassName[0]; + String testDirStr = localBasePath + "/src/test/java/compileflow/" + packagesAndClassName[0]; // testFile的文件路径 File testFile = new File(testDirStr + packagesAndClassName[1]); DialogUtil.prompt(LanguageConstants.CREATE_TEST_CLASS_MESSAGE, testFile.getPath(), (url) -> { diff --git a/src/main/resources/META-INF/plugin.xml b/src/main/resources/META-INF/plugin.xml index af6163b..1d03e6a 100644 --- a/src/main/resources/META-INF/plugin.xml +++ b/src/main/resources/META-INF/plugin.xml @@ -1,7 +1,7 @@ com.alibaba.compileflow.designer compileflow idea设计器 - 1.0.16 + 1.0.17 阿里巴巴