Rebrand DumpVisitor as PrettyPrinter (#529)

* Rebrand DumpVisitor as PrettyPrintVisitor
javaparser · Nov 2, 2016 · 6c7162f · 6c7162f
1 parent 97a11ba
commit 6c7162f
Show file tree

Hide file tree

Showing 15 changed files with 1,799 additions and 1,763 deletions.
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/Node.java b/javaparser-core/src/main/java/com/github/javaparser/ast/Node.java
@@ -21,25 +21,22 @@
 
 package com.github.javaparser.ast;
 
-import java.lang.reflect.Field;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.IdentityHashMap;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Optional;
-
 import com.github.javaparser.HasParentNode;
 import com.github.javaparser.Position;
 import com.github.javaparser.Range;
 import com.github.javaparser.ast.comments.BlockComment;
 import com.github.javaparser.ast.comments.Comment;
 import com.github.javaparser.ast.comments.LineComment;
-import com.github.javaparser.ast.visitor.*;
+import com.github.javaparser.ast.visitor.CloneVisitor;
+import com.github.javaparser.ast.visitor.EqualsVisitor;
+import com.github.javaparser.ast.visitor.Visitable;
+import com.github.javaparser.printer.PrettyPrinter;
+import com.github.javaparser.printer.PrettyPrinterConfiguration;
 
+import java.lang.reflect.Field;
 import java.util.*;
 
-import static java.util.Collections.*;
+import static java.util.Collections.unmodifiableList;
 
 /**
  * Abstract class for all nodes of the AST.
@@ -57,6 +54,9 @@ public abstract class Node implements Cloneable, HasParentNode<Node>, Visitable
      */
     public static Comparator<Node> NODE_BY_BEGIN_POSITION = (a, b) -> a.getBegin().compareTo(b.getBegin());
 
+    private static final PrettyPrinter toStringPrinter = new PrettyPrinter(new PrettyPrinterConfiguration());
+    protected static final PrettyPrinterConfiguration prettyPrinterNoCommentsConfiguration = new PrettyPrinterConfiguration().setPrintComments(false);
+
     private Range range;
 
     private Node parentNode;
@@ -170,15 +170,11 @@ public final Node setBlockComment(String comment) {
      */
     @Override
     public final String toString() {
-        final DumpVisitor visitor = new DumpVisitor();
+        return toStringPrinter.print(this);
-        accept(visitor, null);
-        return visitor.getSource();
     }
 
-    public final String toStringWithoutComments() {
+    public final String toString(PrettyPrinterConfiguration prettyPrinterConfiguration) {
-        final DumpVisitor visitor = new DumpVisitor(false);
+        return new PrettyPrinter(prettyPrinterConfiguration).print(this);
-        accept(visitor, null);
-        return visitor.getSource();
     }
 
     @Override

diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/body/ConstructorDeclaration.java b/javaparser-core/src/main/java/com/github/javaparser/ast/body/ConstructorDeclaration.java
@@ -220,9 +220,9 @@ public String getDeclarationAsString(boolean includingModifiers, boolean includi
                 sb.append(", ");
             }
             if (includingParameterName) {
-                sb.append(param.toStringWithoutComments());
+                sb.append(param.toString(prettyPrinterNoCommentsConfiguration));
             } else {
-                sb.append(param.getElementType().toStringWithoutComments());
+                sb.append(param.getElementType().toString(prettyPrinterNoCommentsConfiguration));
             }
         }
         sb.append(")");
@@ -235,7 +235,7 @@ public String getDeclarationAsString(boolean includingModifiers, boolean includi
                 } else {
                     sb.append(", ");
                 }
-                sb.append(thr.toStringWithoutComments());
+                sb.append(thr.toString(prettyPrinterNoCommentsConfiguration));
             }
         }
         return sb.toString();

diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/body/MethodDeclaration.java b/javaparser-core/src/main/java/com/github/javaparser/ast/body/MethodDeclaration.java
@@ -44,6 +44,7 @@
 import com.github.javaparser.ast.type.Type;
 import com.github.javaparser.ast.visitor.GenericVisitor;
 import com.github.javaparser.ast.visitor.VoidVisitor;
+import com.github.javaparser.printer.PrettyPrinterConfiguration;
 import com.github.javaparser.utils.Pair;
 
 /**
@@ -355,7 +356,7 @@ public String getDeclarationAsString(boolean includingModifiers, boolean includi
             }
         }
         // TODO verify it does not print comments connected to the type
-        sb.append(getElementType().toStringWithoutComments());
+        sb.append(getElementType().toString(prettyPrinterNoCommentsConfiguration));
         sb.append(" ");
         sb.append(getName());
         sb.append("(");
@@ -367,9 +368,9 @@ public String getDeclarationAsString(boolean includingModifiers, boolean includi
                 sb.append(", ");
             }
             if (includingParameterName) {
-                sb.append(param.toStringWithoutComments());
+                sb.append(param.toString(prettyPrinterNoCommentsConfiguration));
             } else {
-                sb.append(param.getElementType().toStringWithoutComments());
+                sb.append(param.getElementType().toString(prettyPrinterNoCommentsConfiguration));
                 if (param.isVarArgs()) {
                     sb.append("...");
                 }
@@ -385,7 +386,7 @@ public String getDeclarationAsString(boolean includingModifiers, boolean includi
                 } else {
                     sb.append(", ");
                 }
-                sb.append(thr.toStringWithoutComments());
+                sb.append(thr.toString(prettyPrinterNoCommentsConfiguration));
             }
         }
         return sb.toString();