bugfix: 支持2023.3, 修复部分bug

alibaba · Dec 26, 2023 · 115b8eb · 115b8eb
1 parent deba326
commit 115b8eb
Show file tree

Hide file tree

Showing 10 changed files with 26 additions and 15 deletions.
diff --git a/.gitignore b/.gitignore
@@ -49,4 +49,5 @@ gradle-app.setting
 *.nar
 *.ear
 *.tar.gz
-*.rar
+*.rar
+.flowclasses/
diff --git 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支持  <br>
     * 修复一些BUG  <br>
+* bugfix：1.0.17 （2023.12.23）by accidia
+    * 2023.3的idea支持  <br>
+    * 修复创建bpm文件错误的bug  <br>
+    * 修复创建单元测试类错误的bug  <br>
 
       
       

diff --git 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支持  <br>
       2. 修复部分bug  <br>
       
+      <em>1.0.17 bugfix </em><br>
+      1. 2023.3的idea支持  <br>
+      2. 修复创建bpm文件错误的bug  <br>
+      3. 修复创建单元测试类错误的bug  <br>
+      
       """
 
     sinceBuild = '162.*'
-    untilBuild = '223.*'
+    untilBuild = '233.*'
 }
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -1,7 +1,7 @@
 <idea-plugin>
     <id>com.alibaba.compileflow.designer</id>
     <name>compileflow idea设计器</name>
-    <version>1.0.16</version>
+    <version>1.0.17</version>
     <vendor email="xuan.xa@alibaba-inc.com" url="https://github.com/alibaba/compileflow-idea-designer">阿里巴巴</vendor>
 
     <description><![CDATA[
-Original file line number
+Diff line change
@@ Expand Up / @@ -49,4 +49,5 @@ gradle-app.setting @@
     *.nar
     *.ear
     *.tar.gz
-    *.rar
+    *.rar
+    .flowclasses/