From 3a833df9cab4a3630907947ebd9af885e03f6ad5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=96=B9=E6=80=9D=E8=BF=9C?= <1115467883@qq.com> Date: Tue, 8 Dec 2020 17:33:04 +0800 Subject: [PATCH 1/2] support --- src/plugin/doc/generate/parser/MapParser.java | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/src/plugin/doc/generate/parser/MapParser.java b/src/plugin/doc/generate/parser/MapParser.java index f375d2f..c3f0c7c 100644 --- a/src/plugin/doc/generate/parser/MapParser.java +++ b/src/plugin/doc/generate/parser/MapParser.java @@ -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); + } } } } From f4d57c5e1877cfda26fa3adf2abea475daa38be0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=96=B9=E6=80=9D=E8=BF=9C?= <1115467883@qq.com> Date: Wed, 9 Dec 2020 11:25:23 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E5=BC=B9=E7=AA=97=E5=A4=A7=E5=B0=8F?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../generate/ControllerDocumentGenerator.java | 8 ++++---- src/plugin/doc/generate/parser/MapParser.java | 16 ++++++++-------- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/plugin/doc/generate/ControllerDocumentGenerator.java b/src/plugin/doc/generate/ControllerDocumentGenerator.java index 653c7ff..d7a2548 100644 --- a/src/plugin/doc/generate/ControllerDocumentGenerator.java +++ b/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); } diff --git a/src/plugin/doc/generate/parser/MapParser.java b/src/plugin/doc/generate/parser/MapParser.java index c3f0c7c..d0f536c 100644 --- a/src/plugin/doc/generate/parser/MapParser.java +++ b/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 obj = new HashMap<>(); String type = null; @@ -42,7 +42,7 @@ public Map generateMap(){ psiFieldList = this.getAvailablePsiField(genericsClass, genericsClass.getAllFields()); } } else { - if (psiClass!=null) { + if (psiClass != null) { for (PsiField psiField : psiClass.getAllFields()) { if (MyPsiSupport.findPsiMethod(psiClass, Convertor.getFieldGetterName(psiField.getName())) != null) { psiFieldList.add(psiField); @@ -66,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 { @@ -98,7 +98,7 @@ public List 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();