Skip to content

Commit ea7a7cc

Browse files
authored
Merge pull request #32 from matozoid/update_printer_syntax
Update printer syntax
2 parents 2b4a1f4 + 63ad0c6 commit ea7a7cc

File tree

2 files changed

+14
-11
lines changed

2 files changed

+14
-11
lines changed

src/main/java/org/javaparser/examples/chapter4/PrettyPrintComplete.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,8 @@
33
import com.github.javaparser.ast.body.ClassOrInterfaceDeclaration;
44
import com.github.javaparser.ast.comments.LineComment;
55
import com.github.javaparser.printer.PrettyPrinter;
6-
import com.github.javaparser.printer.PrettyPrinterConfiguration;
6+
import com.github.javaparser.printer.configuration.Indentation;
7+
import com.github.javaparser.printer.configuration.PrettyPrinterConfiguration;
78

89
public class PrettyPrintComplete {
910

@@ -15,7 +16,7 @@ public static void main(String[] args) {
1516

1617
PrettyPrinterConfiguration conf = new PrettyPrinterConfiguration();
1718
conf.setIndentSize(1);
18-
conf.setIndentType(PrettyPrinterConfiguration.IndentType.SPACES);
19+
conf.setIndentType(Indentation.IndentType.SPACES);
1920
conf.setPrintComments(false);
2021
PrettyPrinter prettyPrinter = new PrettyPrinter(conf);
2122
System.out.println(prettyPrinter.print(myClass));

src/main/java/org/javaparser/examples/chapter4/PrettyPrintVisitorComplete.java

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,13 @@
55
import com.github.javaparser.ast.expr.MarkerAnnotationExpr;
66
import com.github.javaparser.ast.expr.NormalAnnotationExpr;
77
import com.github.javaparser.ast.expr.SingleMemberAnnotationExpr;
8-
import com.github.javaparser.printer.PrettyPrintVisitor;
9-
import com.github.javaparser.printer.PrettyPrinter;
10-
import com.github.javaparser.printer.PrettyPrinterConfiguration;
8+
import com.github.javaparser.ast.visitor.VoidVisitor;
9+
import com.github.javaparser.printer.*;
10+
import com.github.javaparser.printer.configuration.Indentation;
11+
import com.github.javaparser.printer.configuration.PrettyPrinterConfiguration;
12+
import com.github.javaparser.printer.configuration.PrinterConfiguration;
13+
14+
import java.util.function.Function;
1115

1216
public class PrettyPrintVisitorComplete {
1317

@@ -20,10 +24,9 @@ public static void main(String[] args) {
2024

2125
PrettyPrinterConfiguration conf = new PrettyPrinterConfiguration();
2226
conf.setIndentSize(2);
23-
conf.setIndentType(PrettyPrinterConfiguration.IndentType.SPACES);
27+
conf.setIndentType(Indentation.IndentType.SPACES);
2428
conf.setPrintComments(false);
25-
conf.setVisitorFactory(prettyPrinterConfiguration -> new PrettyPrintVisitor(conf) {
26-
29+
Function<PrinterConfiguration, VoidVisitor<Void>> prettyPrinterFactory = (configuration) -> new DefaultPrettyPrinterVisitor(conf) {
2730
@Override
2831
public void visit(MarkerAnnotationExpr n, Void arg) {
2932
// ignore
@@ -38,9 +41,8 @@ public void visit(SingleMemberAnnotationExpr n, Void arg) {
3841
public void visit(NormalAnnotationExpr n, Void arg) {
3942
// ignore
4043
}
41-
42-
});
43-
PrettyPrinter prettyPrinter = new PrettyPrinter(conf);
44+
};
45+
Printer prettyPrinter = new DefaultPrettyPrinter(prettyPrinterFactory, conf);
4446
System.out.println(prettyPrinter.print(myClass));
4547
}
4648

0 commit comments

Comments
 (0)