wumpz · wumpz · commit aed1d31c2b90 · 2017-08-30T13:46:55.000+02:00
diff --git a/src/main/java/com/github/difflib/DiffUtils.java b/src/main/java/com/github/difflib/DiffUtils.java
@@ -25,9 +25,9 @@
 import com.github.difflib.patch.Delta;
 import com.github.difflib.patch.Patch;
 import com.github.difflib.patch.PatchFailedException;
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
-import java.util.LinkedList;
 import java.util.List;
 import java.util.Objects;
 import java.util.function.BiPredicate;
@@ -111,8 +111,8 @@ public static <T> Patch<T> diff(List<T> original, List<T> revised,
      * @return
      */
     public static Patch<String> diffInline(String original, String revised) throws DiffException {
-        LinkedList<String> origList = new LinkedList<>();
-        LinkedList<String> revList = new LinkedList<>();
+        List<String> origList = new ArrayList<>();
+        List<String> revList = new ArrayList<>();
         for (Character character : original.toCharArray()) {
             origList.add(character.toString());
         }
diff --git a/src/main/java/com/github/difflib/patch/Patch.java b/src/main/java/com/github/difflib/patch/Patch.java
@@ -25,7 +25,6 @@
 import java.util.ArrayList;
 import java.util.Collections;
 import static java.util.Comparator.comparing;
-import java.util.LinkedList;
 import java.util.List;
 import java.util.ListIterator;
 
@@ -37,16 +36,24 @@
  */
 public final class Patch<T> {
 
-    private final List<Delta<T>> deltas = new LinkedList<>();
+    private final List<Delta<T>> deltas;
 
+    public Patch() {
+        this(10);
+    }
+    
+    public Patch(int estimatedPatchSize) {
+         deltas = new ArrayList<>(estimatedPatchSize);
+    }
+    
     /**
      * Apply this patch to the given target
      *
      * @return the patched text
      * @throws PatchFailedException if can't apply patch
      */
     public List<T> applyTo(List<T> target) throws PatchFailedException {
-        List<T> result = new LinkedList<>(target);
+        List<T> result = new ArrayList<>(target);
         ListIterator<Delta<T>> it = getDeltas().listIterator(deltas.size());
         while (it.hasPrevious()) {
             Delta<T> delta = it.previous();
@@ -62,7 +69,7 @@ public List<T> applyTo(List<T> target) throws PatchFailedException {
      * @return the restored text
      */
     public List<T> restore(List<T> target) {
-        List<T> result = new LinkedList<>(target);
+        List<T> result = new ArrayList<>(target);
         ListIterator<Delta<T>> it = getDeltas().listIterator(deltas.size());
         while (it.hasPrevious()) {
             Delta<T> delta = it.previous();
@@ -96,7 +103,7 @@ public String toString() {
     }
     
     public static <T> Patch<T> generate(List<T> original, List<T> revised, List<Change> changes) {
-        Patch<T> patch = new Patch<>();
+        Patch<T> patch = new Patch<>(changes.size());
         for (Change change : changes) {
             Chunk<T> orgChunk = new Chunk<>(change.startOriginal, new ArrayList<>(original.subList(change.startOriginal, change.endOriginal)));
             Chunk<T> revChunk = new Chunk<>(change.startRevised, new ArrayList<>(revised.subList(change.startRevised, change.endRevised)));
diff --git a/src/main/java/com/github/difflib/text/DiffRowGenerator.java b/src/main/java/com/github/difflib/text/DiffRowGenerator.java
@@ -315,17 +315,19 @@ private List<DiffRow> generateInlineDiffs(Delta<String> delta) throws DiffExcept
         List<String> rev = StringUtils.normalize(delta.getRevised().getLines());
         List<String> origList;
         List<String> revList;
+        String joinedOrig = String.join("\n", orig);
+        String joinedRev = String.join("\n", rev);
 
         if (inlineDiffByWord) {
-            origList = splitStringPreserveDelimiter(String.join("\n", orig));
-            revList = splitStringPreserveDelimiter(String.join("\n", rev));
+            origList = splitStringPreserveDelimiter(joinedOrig);
+            revList = splitStringPreserveDelimiter(joinedRev);
         } else {
-            origList = new LinkedList<>();
-            revList = new LinkedList<>();
-            for (Character character : String.join("\n", orig).toCharArray()) {
+            origList = new ArrayList<>(joinedOrig.length());
+            revList = new ArrayList<>(joinedRev.length());
+            for (Character character : joinedOrig.toCharArray()) {
                 origList.add(character.toString());
             }
-            for (Character character : String.join("\n", rev).toCharArray()) {
+            for (Character character : joinedRev.toCharArray()) {
                 revList.add(character.toString());
             }
         }
