Make property name more consistent

javaparser · Oct 19, 2017 · 4d327fb · 4d327fb
1 parent 8b36245
commit 4d327fb
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 9 deletions.
diff --git a/javaparser-core/src/main/java/com/github/javaparser/printer/PrettyPrintVisitor.java b/javaparser-core/src/main/java/com/github/javaparser/printer/PrettyPrintVisitor.java
@@ -306,7 +306,7 @@ public void visit(final ClassOrInterfaceDeclaration n, final Void arg) {
     public void visit(final JavadocComment n, final Void arg) {
         printer.print("/**");
         String commentContent = n.getContent();
-        if (configuration.isNormalizeEolInComments()) {
+        if (configuration.isNormalizeEolInComment()) {
             commentContent = Utils.normalizeEolInTextBlock(commentContent, configuration.getEndOfLineCharacter());
         }
         printer.print(commentContent);

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
@@ -27,7 +27,7 @@
 import static com.github.javaparser.utils.Utils.assertNotNull;
 
 public class PrettyPrinterConfiguration {
-    private boolean normalizeEolInComments = false;
+    private boolean normalizeEolInComment = false;
     private boolean printComments = true;
     private boolean printJavaDoc = true;
     private boolean columnAlignParameters = false;
@@ -45,12 +45,12 @@ public PrettyPrinterConfiguration setIndent(String indent) {
         return this;
     }
 
-    public boolean isNormalizeEolInComments() {
+    public boolean isNormalizeEolInComment() {
-        return normalizeEolInComments;
+        return normalizeEolInComment;
     }
 
-    public PrettyPrinterConfiguration setNormalizeEolInComments(boolean normalizeEolInComments) {
+    public PrettyPrinterConfiguration setNormalizeEolInComment(boolean normalizeEolInComment) {
-        this.normalizeEolInComments = normalizeEolInComments;
+        this.normalizeEolInComment = normalizeEolInComment;
         return this;
     }
 

diff --git a/javaparser-testing/src/test/java/com/github/javaparser/bdd/steps/PrettyPrintingSteps.java b/javaparser-testing/src/test/java/com/github/javaparser/bdd/steps/PrettyPrintingSteps.java
@@ -21,7 +21,6 @@
 
 package com.github.javaparser.bdd.steps;
 
-import com.github.javaparser.JavaParser;
 import com.github.javaparser.ParseException;
 import com.github.javaparser.ast.CompilationUnit;
 import com.github.javaparser.ast.Node;
@@ -38,7 +37,6 @@
 import java.net.URL;
 
 import static com.github.javaparser.JavaParser.*;
-import static com.github.javaparser.utils.Utils.EOL;
 import static com.github.javaparser.utils.Utils.readerToString;
 import static org.junit.Assert.assertEquals;
 
@@ -116,7 +114,7 @@ public void isPrintedAs(String src) {
 
     @Then("it is printed with normalized EOL in comments as:$src")
     public void isPrintedWithEolAs(String src) {
-        PrettyPrinterConfiguration conf = new PrettyPrinterConfiguration().setNormalizeEolInComments(true);
+        PrettyPrinterConfiguration conf = new PrettyPrinterConfiguration().setNormalizeEolInComment(true);
         assertEquals(src.trim(), resultNode.toString(conf).trim());
     }
 }