Merge pull request #3 from GkingF/master

support <?>

Author: magictext

src/plugin/doc/generate/ControllerDocumentGenerator.java

@@ -56,13 +56,13 @@ public void actionPerformed(AnActionEvent anActionEvent) {
      */
     protected void openDialog(String result) {
         Dimension screensize = Toolkit.getDefaultToolkit().getScreenSize();
-        int w = (int) (screensize.width * 0.3);
-        int h = (int) (screensize.height * 0.3);
+        double width = screensize.width;
+        double height = screensize.height;
 
         DocumentExportDialog dialog = new DocumentExportDialog(result);
-        dialog.setSize(w, h);
         dialog.pack();
-        dialog.setLocation((int) (screensize.width * 0.5) - (int) (w * 0.5), (int) (screensize.height * 0.5) - (int) (h * 0.5));
+        dialog.setSize((int)(width*0.25),(int)(height*0.5));
+        dialog.setLocation((int)(width*0.33),(int)(height*0.2));
         dialog.setVisible(true);
 
     }

src/plugin/doc/generate/parser/MapParser.java

@@ -16,16 +16,16 @@
 public class MapParser {
 
     private PsiClass psiClass;
-    private  Integer layer;
-    private  PsiType psiType;
+    private Integer layer;
+    private PsiType psiType;
 
-    public MapParser(PsiType psiType,Integer layer) {
+    public MapParser(PsiType psiType, Integer layer) {
         this.psiType = psiType;
         this.psiClass = MyPsiSupport.getPsiClass(psiType);
         this.layer = layer;
     }
 
-    public Map generateMap(){
+    public Map generateMap() {
         if (layer >= 3) return null;
         HashMap<String, Object> obj = new HashMap<>();
         String type = null;
@@ -42,12 +42,14 @@ public Map generateMap(){
                 psiFieldList = this.getAvailablePsiField(genericsClass, genericsClass.getAllFields());
             }
         } else {
-            for (PsiField psiField : psiClass.getAllFields()) {
-                if (MyPsiSupport.findPsiMethod(psiClass, Convertor.getFieldGetterName(psiField.getName())) != null) {
-                    psiFieldList.add(psiField);
-                }
-                if (MyPsiSupport.findPsiMethod(psiClass, Convertor.getFieldBoolGetterName(psiField.getName())) != null) {
-                    psiFieldList.add(psiField);
+            if (psiClass != null) {
+                for (PsiField psiField : psiClass.getAllFields()) {
+                    if (MyPsiSupport.findPsiMethod(psiClass, Convertor.getFieldGetterName(psiField.getName())) != null) {
+                        psiFieldList.add(psiField);
+                    }
+                    if (MyPsiSupport.findPsiMethod(psiClass, Convertor.getFieldBoolGetterName(psiField.getName())) != null) {
+                        psiFieldList.add(psiField);
+                    }
                 }
             }
         }
@@ -64,9 +66,9 @@ public Map generateMap(){
                 flag = TypeTranslator.docTypeTranslate(fieldClass.getQualifiedName());
             }
             if ("Object".equals(flag)) {
-                MapParser mapParser = new MapParser(fieldType, layer+1);
+                MapParser mapParser = new MapParser(fieldType, layer + 1);
                 Map map = mapParser.generateMap();
-                obj.put(psiField.getName(),map);
+                obj.put(psiField.getName(), map);
             } else if ("List".equals(flag)) {
 
             } else {
@@ -96,7 +98,7 @@ public List<PsiField> getAvailablePsiField(PsiClass psiClass, PsiField[] psiFiel
         return psiFieldList;
     }
 
-    public PsiType getRealType(PsiType psiType, PsiField psiField){
+    public PsiType getRealType(PsiType psiType, PsiField psiField) {
         PsiType fieldType = MyPsiSupport.getGenericsType(psiType, psiField);
         if (fieldType == null) {
             fieldType = psiField.getType();