add createVisit to PPC

javaparser · Dec 21, 2016 · 7dfb348 · 7dfb348
1 parent fe63c28
commit 7dfb348
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 26 deletions.
diff --git a/javaparser-core/src/main/java/com/github/javaparser/printer/PrettyPrinter.java b/javaparser-core/src/main/java/com/github/javaparser/printer/PrettyPrinter.java
@@ -23,8 +23,6 @@
 
 import com.github.javaparser.ast.Node;
 
-import java.lang.reflect.Constructor;
-
 /**
  * Pretty printer for AST nodes.
  */
@@ -40,26 +38,8 @@ public PrettyPrinter(PrettyPrinterConfiguration configuration) {
     }
 
     public String print(Node node) {
-
-        final PrettyPrintVisitor visitor = getNewInstance(configuration);
+        final PrettyPrintVisitor visitor = configuration.createVisitor();
         node.accept(visitor, null);
         return visitor.getSource();
     }
-
-    private PrettyPrintVisitor getNewInstance(PrettyPrinterConfiguration configuration){
-        try {
-            Class<? extends PrettyPrintVisitor> clazz = configuration.getVisitorClass();
-            if (clazz == null){
-                return new PrettyPrintVisitor(configuration);
-            }else{
-                Constructor<? extends PrettyPrintVisitor> constructor =
-                        clazz.getConstructor(configuration.getClass());
-                return constructor.newInstance(configuration);
-            }
-        } catch (Exception e) {
-            assert false;
-            return null;
-        }
-    }
-
 }
diff --git a/javaparser-core/src/main/java/com/github/javaparser/printer/PrettyPrinterConfiguration.java b/javaparser-core/src/main/java/com/github/javaparser/printer/PrettyPrinterConfiguration.java
@@ -21,10 +21,12 @@
 
 package com.github.javaparser.printer;
 
+import java.lang.reflect.Constructor;
+
 public class PrettyPrinterConfiguration {
     private boolean printComments = true;
     private String indent = "    ";
-    private Class<? extends PrettyPrintVisitor> visitorClass;
+    private Class<? extends PrettyPrintVisitor> visitorClass = PrettyPrintVisitor.class;
 
     public String getIndent() {
         return indent;
@@ -44,12 +46,19 @@ public PrettyPrinterConfiguration setPrintComments(boolean printComments) {
         return this;
     }
 
-    public Class<? extends PrettyPrintVisitor> getVisitorClass() {
-        return visitorClass;
-    }
-
     public PrettyPrinterConfiguration setVisitorClass(Class<? extends PrettyPrintVisitor> visitorClass) {
         this.visitorClass = visitorClass;
         return this;
     }
+
+    public PrettyPrintVisitor createVisitor() {
+        try {
+            Constructor<? extends PrettyPrintVisitor> constructor =
+                    visitorClass.getConstructor(this.getClass());
+            return constructor.newInstance(this);
+        } catch (Exception e) {
+            assert false;
+            return null;
+        }
+    }
 }