Moved DifferenceElement classes out of difference package to reduce v…

…isibility
javaparser · May 19, 2018 · 8718d4a · 8718d4a
1 parent b7bd15d
commit 8718d4a
Show file tree

Hide file tree

Showing 11 changed files with 16 additions and 30 deletions.
diff --git a/...va/com/github/javaparser/printer/lexicalpreservation/DifferenceElementCalculatorTest.java b/...va/com/github/javaparser/printer/lexicalpreservation/DifferenceElementCalculatorTest.java
@@ -18,7 +18,6 @@
 import com.github.javaparser.printer.concretesyntaxmodel.CsmToken;
 import com.github.javaparser.printer.concretesyntaxmodel.CsmUnindent;
 import com.github.javaparser.printer.lexicalpreservation.LexicalDifferenceCalculator.CsmChild;
-import com.github.javaparser.printer.lexicalpreservation.difference.DifferenceElement;
 import org.junit.Test;
 
 import java.io.IOException;
@@ -29,7 +28,7 @@
 
 import static com.github.javaparser.TokenTypes.eolTokenKind;
 import static com.github.javaparser.TokenTypes.spaceTokenKind;
-import static com.github.javaparser.printer.lexicalpreservation.difference.DifferenceElement.*;
+import static com.github.javaparser.printer.lexicalpreservation.DifferenceElement.*;
 import static org.junit.Assert.assertEquals;
 
 public class DifferenceElementCalculatorTest extends AbstractLexicalPreservingTest {

diff --git a/...va/com/github/javaparser/printer/lexicalpreservation/LexicalDifferenceCalculatorTest.java b/...va/com/github/javaparser/printer/lexicalpreservation/LexicalDifferenceCalculatorTest.java
@@ -17,7 +17,6 @@
 import com.github.javaparser.printer.ConcreteSyntaxModel;
 import com.github.javaparser.printer.concretesyntaxmodel.CsmElement;
 import com.github.javaparser.printer.concretesyntaxmodel.CsmToken;
-import com.github.javaparser.printer.lexicalpreservation.difference.DifferenceElement;
 import org.junit.Test;
 
 import java.io.IOException;

diff --git a/...lexicalpreservation/difference/Added.java → ...er/printer/lexicalpreservation/Added.java b/...lexicalpreservation/difference/Added.java → ...er/printer/lexicalpreservation/Added.java
@@ -1,18 +1,14 @@
-package com.github.javaparser.printer.lexicalpreservation.difference;
+package com.github.javaparser.printer.lexicalpreservation;
 
 import com.github.javaparser.printer.concretesyntaxmodel.CsmElement;
 import com.github.javaparser.printer.concretesyntaxmodel.CsmIndent;
 import com.github.javaparser.printer.concretesyntaxmodel.CsmToken;
 import com.github.javaparser.printer.concretesyntaxmodel.CsmUnindent;
-import com.github.javaparser.printer.lexicalpreservation.ChildTextElement;
-import com.github.javaparser.printer.lexicalpreservation.LexicalDifferenceCalculator;
-import com.github.javaparser.printer.lexicalpreservation.TextElement;
-import com.github.javaparser.printer.lexicalpreservation.TokenTextElement;
 
 public class Added implements DifferenceElement {
-    final CsmElement element;
+    private final CsmElement element;
 
-    public Added(CsmElement element) {
+    Added(CsmElement element) {
         this.element = element;
     }
 

diff --git a/...rser-core/src/main/java/com/github/javaparser/printer/lexicalpreservation/Difference.java b/...rser-core/src/main/java/com/github/javaparser/printer/lexicalpreservation/Difference.java
@@ -6,7 +6,6 @@
 import com.github.javaparser.ast.comments.Comment;
 import com.github.javaparser.printer.concretesyntaxmodel.*;
 import com.github.javaparser.printer.lexicalpreservation.LexicalDifferenceCalculator.CsmChild;
-import com.github.javaparser.printer.lexicalpreservation.difference.*;
 
 import java.util.*;
 

diff --git a/...rvation/difference/DifferenceElement.java → ...exicalpreservation/DifferenceElement.java b/...rvation/difference/DifferenceElement.java → ...exicalpreservation/DifferenceElement.java
@@ -1,7 +1,6 @@
-package com.github.javaparser.printer.lexicalpreservation.difference;
+package com.github.javaparser.printer.lexicalpreservation;
 
 import com.github.javaparser.printer.concretesyntaxmodel.CsmElement;
-import com.github.javaparser.printer.lexicalpreservation.DifferenceElementCalculator;
 
 public interface DifferenceElement {
     static DifferenceElement added(CsmElement element) {
@@ -19,7 +18,7 @@ static DifferenceElement kept(CsmElement element) {
     /**
      * Return the CsmElement considered in this DifferenceElement.
      */
-    public CsmElement getElement();
+    CsmElement getElement();
 
-    public boolean isAdded();
+    boolean isAdded();
 }
diff --git a/...n/java/com/github/javaparser/printer/lexicalpreservation/DifferenceElementCalculator.java b/...n/java/com/github/javaparser/printer/lexicalpreservation/DifferenceElementCalculator.java
@@ -2,11 +2,10 @@
 
 import com.github.javaparser.ast.Node;
 import com.github.javaparser.printer.concretesyntaxmodel.*;
-import com.github.javaparser.printer.lexicalpreservation.difference.*;
 
 import java.util.*;
 
-public class DifferenceElementCalculator {
+class DifferenceElementCalculator {
     static boolean matching(CsmElement a, CsmElement b) {
         if (a instanceof LexicalDifferenceCalculator.CsmChild) {
             if (b instanceof LexicalDifferenceCalculator.CsmChild) {
@@ -191,7 +190,7 @@ private static List<DifferenceElement> calculateImpl(LexicalDifferenceCalculator
         return elements;
     }
 
-    static long cost(List<DifferenceElement> elements) {
+    private static long cost(List<DifferenceElement> elements) {
         return elements.stream().filter(e -> !(e instanceof Kept)).count();
     }
 

diff --git a/.../lexicalpreservation/difference/Kept.java → ...ser/printer/lexicalpreservation/Kept.java b/.../lexicalpreservation/difference/Kept.java → ...ser/printer/lexicalpreservation/Kept.java
@@ -1,18 +1,16 @@
-package com.github.javaparser.printer.lexicalpreservation.difference;
+package com.github.javaparser.printer.lexicalpreservation;
 
 import com.github.javaparser.TokenTypes;
 import com.github.javaparser.ast.type.PrimitiveType;
 import com.github.javaparser.printer.concretesyntaxmodel.CsmElement;
 import com.github.javaparser.printer.concretesyntaxmodel.CsmIndent;
 import com.github.javaparser.printer.concretesyntaxmodel.CsmToken;
 import com.github.javaparser.printer.concretesyntaxmodel.CsmUnindent;
-import com.github.javaparser.printer.lexicalpreservation.DifferenceElementCalculator;
-import com.github.javaparser.printer.lexicalpreservation.LexicalDifferenceCalculator;
 
 public class Kept implements DifferenceElement {
     private final CsmElement element;
 
-    public Kept(CsmElement element) {
+    Kept(CsmElement element) {
         this.element = element;
     }
 

diff --git a/...n/java/com/github/javaparser/printer/lexicalpreservation/LexicalDifferenceCalculator.java b/...n/java/com/github/javaparser/printer/lexicalpreservation/LexicalDifferenceCalculator.java
@@ -11,7 +11,6 @@
 import com.github.javaparser.printer.SourcePrinter;
 import com.github.javaparser.printer.concretesyntaxmodel.*;
 import com.github.javaparser.printer.lexicalpreservation.changes.*;
-import com.github.javaparser.printer.lexicalpreservation.difference.DifferenceElement;
 
 import java.util.*;
 

diff --git a/...main/java/com/github/javaparser/printer/lexicalpreservation/LexicalPreservingPrinter.java b/...main/java/com/github/javaparser/printer/lexicalpreservation/LexicalPreservingPrinter.java
@@ -38,7 +38,6 @@
 import com.github.javaparser.printer.concretesyntaxmodel.CsmElement;
 import com.github.javaparser.printer.concretesyntaxmodel.CsmMix;
 import com.github.javaparser.printer.concretesyntaxmodel.CsmToken;
-import com.github.javaparser.printer.lexicalpreservation.difference.DifferenceElement;
 import com.github.javaparser.utils.Pair;
 import com.github.javaparser.utils.Utils;
 

diff --git a/...xicalpreservation/difference/Removed.java → .../printer/lexicalpreservation/Removed.java b/...xicalpreservation/difference/Removed.java → .../printer/lexicalpreservation/Removed.java
@@ -1,15 +1,14 @@
-package com.github.javaparser.printer.lexicalpreservation.difference;
+package com.github.javaparser.printer.lexicalpreservation;
 
 import com.github.javaparser.ast.Node;
 import com.github.javaparser.ast.type.PrimitiveType;
 import com.github.javaparser.printer.concretesyntaxmodel.CsmElement;
 import com.github.javaparser.printer.concretesyntaxmodel.CsmToken;
-import com.github.javaparser.printer.lexicalpreservation.LexicalDifferenceCalculator;
 
 public class Removed implements DifferenceElement {
-    final CsmElement element;
+    private final CsmElement element;
 
-    public Removed(CsmElement element) {
+    Removed(CsmElement element) {
         this.element = element;
     }
 

diff --git a/...alpreservation/difference/Reshuffled.java → ...inter/lexicalpreservation/Reshuffled.java b/...alpreservation/difference/Reshuffled.java → ...inter/lexicalpreservation/Reshuffled.java
@@ -1,4 +1,4 @@
-package com.github.javaparser.printer.lexicalpreservation.difference;
+package com.github.javaparser.printer.lexicalpreservation;
 
 import com.github.javaparser.printer.concretesyntaxmodel.CsmMix;
 
@@ -10,7 +10,7 @@ public class Reshuffled implements DifferenceElement {
     private final CsmMix previousOrder;
     private final CsmMix nextOrder;
 
-    public Reshuffled(CsmMix previousOrder, CsmMix nextOrder) {
+    Reshuffled(CsmMix previousOrder, CsmMix nextOrder) {
         this.previousOrder = previousOrder;
         this.nextOrder = nextOrder;
     }