修正：

动态新增类的时候会报Write access is allowed inside write-action only
zzz40500 · Nov 8, 2016 · d5a16b4 · d5a16b4
1 parent dbde81d
commit d5a16b4
Show file tree

Hide file tree

Showing 4 changed files with 76 additions and 98 deletions.
diff --git a/src/main/java/org/gsonformat/intellij/ConvertBridge.java b/src/main/java/org/gsonformat/intellij/ConvertBridge.java
@@ -1,10 +1,10 @@
 package org.gsonformat.intellij;
 
+import com.intellij.openapi.command.WriteCommandAction;
 import com.intellij.openapi.project.Project;
 import com.intellij.psi.*;
 import com.intellij.psi.impl.source.PsiClassReferenceType;
 import org.apache.http.util.TextUtils;
-import org.gsonformat.intellij.action.ClassProvider;
 import org.gsonformat.intellij.action.DataWriter;
 import org.gsonformat.intellij.common.StringUtils;
 import org.gsonformat.intellij.common.Utils;
@@ -410,26 +410,31 @@ private void handleVirgoMode(JSONObject json, List<String> fieldList) {
     }
 
     private void handleNormal(JSONObject json, List<String> generateFiled) {
-        if (targetClass == null) {
-            try {
-                targetClass = (PsiClass) new ClassProvider(project, file).execute(generateClassName).getResultObject();
-            } catch (Throwable throwable) {
-                handlePathError(throwable);
-            }
-        }
-        if (targetClass != null) {
-            generateClassEntity.setPsiClass(targetClass);
-            try {
-                generateClassEntity.addAllFields(createFields(json, generateFiled, generateClassEntity));
-                operator.setVisible(false);
-                DataWriter dataWriter = new DataWriter(file, project, targetClass);
-                dataWriter.execute(generateClassEntity);
-                Config.getInstant().saveCurrentPackPath(packageName);
-                operator.dispose();
-            } catch (Exception e) {
-                throw e;
+        WriteCommandAction.runWriteCommandAction(project, new Runnable() {
+            @Override
+            public void run() {
+                if (targetClass == null) {
+                    try {
+                        targetClass = PsiClassUtil.getPsiClass(file, project, generateClassName);
+                    } catch (Throwable throwable) {
+                        handlePathError(throwable);
+                    }
+                }
+                if (targetClass != null) {
+                    generateClassEntity.setPsiClass(targetClass);
+                    try {
+                        generateClassEntity.addAllFields(createFields(json, generateFiled, generateClassEntity));
+                        operator.setVisible(false);
+                        DataWriter dataWriter = new DataWriter(file, project, targetClass);
+                        dataWriter.execute(generateClassEntity);
+                        Config.getInstant().saveCurrentPackPath(packageName);
+                        operator.dispose();
+                    } catch (Exception e) {
+                        throw e;
+                    }
+                }
             }
-        }
+        });
     }
 
     private List<String> collectGenerateFiled(JSONObject json) {
@@ -661,8 +666,8 @@ private FieldEntity handleJSONArray(ClassEntity parentClass, JSONArray jsonArray
         FieldEntity fieldEntity;
         if (jsonArray.length() > 0) {
             Object item = jsonArray.get(0);
-            if(item instanceof JSONObject){
-                item=getJsonObject(jsonArray);
+            if (item instanceof JSONObject) {
+                item = getJsonObject(jsonArray);
             }
             fieldEntity = listTypeByValue(parentClass, key, item, deep);
         } else {

diff --git a/src/main/java/org/gsonformat/intellij/action/ClassProvider.java b/src/main/java/org/gsonformat/intellij/action/ClassProvider.java
diff --git a/src/main/java/org/gsonformat/intellij/common/PsiClassUtil.java b/src/main/java/org/gsonformat/intellij/common/PsiClassUtil.java
@@ -1,6 +1,7 @@
 package org.gsonformat.intellij.common;
 
 import com.intellij.ide.util.DirectoryUtil;
+import com.intellij.openapi.command.WriteCommandAction;
 import com.intellij.openapi.fileEditor.FileEditorManager;
 import com.intellij.openapi.project.Project;
 import com.intellij.psi.*;
@@ -128,8 +129,8 @@ public static PsiClass getPsiClass(PsiFile psiFile, Project project, String gene
                     }
                 }
             }
-            psiClass = JavaDirectoryService.getInstance().createClass(psiDirectory, className);
 
+            psiClass = JavaDirectoryService.getInstance().createClass(psiDirectory, className);
             FileEditorManager manager = FileEditorManager.getInstance(project);
             manager.openFile(psiClass.getContainingFile().getVirtualFile(), true, true);
         }

diff --git a/src/main/java/org/gsonformat/intellij/ui/FieldsDialog.java b/src/main/java/org/gsonformat/intellij/ui/FieldsDialog.java
@@ -1,5 +1,6 @@
 package org.gsonformat.intellij.ui;
 
+import com.intellij.openapi.command.WriteCommandAction;
 import com.intellij.openapi.project.Project;
 import com.intellij.psi.PsiClass;
 import com.intellij.psi.PsiElementFactory;
@@ -113,46 +114,53 @@ public void actionPerformed(ActionEvent e) {
     private void onOK() {
 
         this.setAlwaysOnTop(false);
-        if (psiClass == null) {
-            try {
-                psiClass = PsiClassUtil.getPsiClass(file, project, generateClassStr);
-            } catch (Throwable throwable) {
-                throwable.printStackTrace();
-                operator.showError(ConvertBridge.Error.DATA_ERROR);
-                Writer writer = new StringWriter();
-                PrintWriter printWriter = new PrintWriter(writer);
-                throwable.printStackTrace(printWriter);
-                printWriter.close();
-                operator.setErrorInfo(writer.toString());
-                operator.setVisible(true);
-                operator.showError(ConvertBridge.Error.PATH_ERROR);
-            }
-        }
-        if (psiClass != null) {
-            String[] arg = generateClassStr.split("\\.");
-            if (arg.length > 1) {
-                Config.getInstant().setEntityPackName(generateClassStr.substring(0, generateClassStr.length() - arg[arg.length - 1].length()));
-                Config.getInstant().save();
-            }
-            try {
-                setVisible(false);
-                DataWriter dataWriter = new DataWriter(file, project, psiClass);
-                dataWriter.execute(classEntity);
-                Config.getInstant().saveCurrentPackPath(StringUtils.getPackage(generateClassStr));
-                operator.dispose();
-                dispose();
-            } catch (Exception e) {
-                e.printStackTrace();
-                operator.showError(ConvertBridge.Error.PARSE_ERROR);
-                Writer writer = new StringWriter();
-                PrintWriter printWriter = new PrintWriter(writer);
-                e.printStackTrace(printWriter);
-                printWriter.close();
-                operator.setErrorInfo(writer.toString());
-                operator.setVisible(true);
-                dispose();
+        WriteCommandAction.runWriteCommandAction(project, new Runnable() {
+
+            @Override
+            public void run() {
+                if (psiClass == null) {
+                    try {
+                        psiClass = PsiClassUtil.getPsiClass(file, project, generateClassStr);
+                    } catch (Throwable throwable) {
+                        throwable.printStackTrace();
+                        operator.showError(ConvertBridge.Error.DATA_ERROR);
+                        Writer writer = new StringWriter();
+                        PrintWriter printWriter = new PrintWriter(writer);
+                        throwable.printStackTrace(printWriter);
+                        printWriter.close();
+                        operator.setErrorInfo(writer.toString());
+                        operator.setVisible(true);
+                        operator.showError(ConvertBridge.Error.PATH_ERROR);
+                    }
+                }
+
+                if (psiClass != null) {
+                    String[] arg = generateClassStr.split("\\.");
+                    if (arg.length > 1) {
+                        Config.getInstant().setEntityPackName(generateClassStr.substring(0, generateClassStr.length() - arg[arg.length - 1].length()));
+                        Config.getInstant().save();
+                    }
+                    try {
+                        setVisible(false);
+                        DataWriter dataWriter = new DataWriter(file, project, psiClass);
+                        dataWriter.execute(classEntity);
+                        Config.getInstant().saveCurrentPackPath(StringUtils.getPackage(generateClassStr));
+                        operator.dispose();
+                        dispose();
+                    } catch (Exception e) {
+                        e.printStackTrace();
+                        operator.showError(ConvertBridge.Error.PARSE_ERROR);
+                        Writer writer = new StringWriter();
+                        PrintWriter printWriter = new PrintWriter(writer);
+                        e.printStackTrace(printWriter);
+                        printWriter.close();
+                        operator.setErrorInfo(writer.toString());
+                        operator.setVisible(true);
+                        dispose();
+                    }
+                }
             }
-        }
+        });
     }
 
     private void onCancel() {