Skip to content

support <?> #3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
magictext merged 2 commits into from
Dec 9, 2020
Merged

support <?> #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3a833df
support <?>
Dec 8, 2020
f4d57c5
弹窗大小修改
Dec 9, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions src/plugin/doc/generate/ControllerDocumentGenerator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);

}
Expand Down
28 changes: 15 additions & 13 deletions src/plugin/doc/generate/parser/MapParser.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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);
}
}
}
}
Expand All @@ -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 {
Expand Down Expand Up @@ -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();
Expand Down