From 0aa18c74ba00a8f24571589d375ed0ea024696e2 Mon Sep 17 00:00:00 2001
From: JanUlrich <andi@michlaustderaffe.de>
Date: Thu, 29 Jun 2017 01:19:13 +0200
Subject: [PATCH] ASTPrinter verbessern

---
 .../syntaxtree/visual/ASTPrinter.java         | 31 +++++++++++++++----
 1 file changed, 25 insertions(+), 6 deletions(-)

diff --git a/src/de/dhbwstuttgart/syntaxtree/visual/ASTPrinter.java b/src/de/dhbwstuttgart/syntaxtree/visual/ASTPrinter.java
index 22413346..9e7b6519 100644
--- a/src/de/dhbwstuttgart/syntaxtree/visual/ASTPrinter.java
+++ b/src/de/dhbwstuttgart/syntaxtree/visual/ASTPrinter.java
@@ -19,13 +19,22 @@ public class ASTPrinter {
     }
 
     private static class OutputGenerator implements ASTVisitor{
-
+        private static final String TAB = "  ";
+        String tabs = "";
         private final StringBuilder out;
 
         OutputGenerator(StringBuilder out){
             this.out = out;
         }
 
+        public void tab() {
+            tabs += TAB;
+        }
+
+        public void untab() {
+            tabs = tabs.substring(0,tabs.length()-TAB.length());
+        }
+
         @Override
         public void visit(SourceFile sourceFile) {
             for(ClassOrInterface cl : sourceFile.getClasses()){
@@ -46,7 +55,7 @@ public class ASTPrinter {
 
         @Override
         public void visit(GenericTypeVar genericTypeVar) {
-            out.append(genericTypeVar.getName());
+            out.append(genericTypeVar.getName().toString());
         }
 
         @Override
@@ -83,6 +92,7 @@ public class ASTPrinter {
             out.append(" " + method.getName());
             method.getParameterList().accept(this);
             method.block.accept(this);
+            out.append("\n");
         }
 
         @Override
@@ -105,22 +115,27 @@ public class ASTPrinter {
             }else{
                 out.append("class ");
             }
-            out.append(classOrInterface.getClassName());
+            out.append(classOrInterface.getClassName().toString());
             classOrInterface.getGenerics().accept(this);
-            out.append(" {\n");
+            out.append(" {\n\n");
+            tab();
             for(Field f : classOrInterface.getFieldDecl()){
+                out.append(tabs);
                 f.accept(this);
                 out.append("\n");
             }
             for(Method m : classOrInterface.getMethods()){
+                out.append(tabs);
                 m.accept(this);
                 out.append("\n");
             }
+            untab();
+            out.append("}");
         }
 
         @Override
         public void visit(RefType refType) {
-            out.append(refType.getName());
+            out.append(refType.getName().toString());
             Iterator<RefTypeOrTPHOrWildcardOrGeneric> genericIterator = refType.getParaList().iterator();
             if(genericIterator.hasNext()){
                 out.append("<");
@@ -151,7 +166,7 @@ public class ASTPrinter {
 
         @Override
         public void visit(GenericRefType genericRefType) {
-            out.append(genericRefType.getName());
+            out.append(genericRefType.getName().toString());
         }
 
         @Override
@@ -175,11 +190,15 @@ public class ASTPrinter {
 
         @Override
         public void visit(Block block) {
+            tab();
             out.append("{\n");
             for(Statement stmt : block.getStatements()){
+                out.append(tabs);
                 stmt.accept(this);
                 out.append(";\n");
             }
+            untab();
+            out.append(tabs);
             out.append("}");
         }