@@ -42,7 +42,7 @@ public final class DiffUtils { |
42 | 42 | /** |
43 | 43 | * Sets the default diff algorithm factory to be used by all diff routines. |
44 | 44 | * |
45 | | - * @param factory a {@link DiffAlgorithmFactory} represnting the new default diff algorithm factory. |
| 45 | + * @param factory a {@link DiffAlgorithmFactory} representing the new default diff algorithm factory. |
46 | 46 | */ |
47 | 47 | public static void withDefaultDiffAlgorithmFactory(DiffAlgorithmFactory factory) { |
48 | 48 | DEFAULT_DIFF = factory; |
@@ -52,9 +52,9 @@ public static void withDefaultDiffAlgorithmFactory(DiffAlgorithmFactory factory) |
52 | 52 | * Computes the difference between two sequences of elements using the default diff algorithm. |
53 | 53 | * |
54 | 54 | * @param <T> a generic representing the type of the elements to be compared. |
55 | | - * @param original a {@link List} represnting the original sequence of elements. Must not be {@code null}. |
56 | | - * @param revised a {@link List} represnting the revised sequence of elements. Must not be {@code null}. |
57 | | - * @param progress a {@link DiffAlgorithmListener} represnting the progress listener. Can be {@code null}. |
| 55 | + * @param original a {@link List} representing the original sequence of elements. Must not be {@code null}. |
| 56 | + * @param revised a {@link List} representing the revised sequence of elements. Must not be {@code null}. |
| 57 | + * @param progress a {@link DiffAlgorithmListener} representing the progress listener. Can be {@code null}. |
58 | 58 | * @return The patch describing the difference between the original and revised sequences. Never {@code null}. |
59 | 59 | */ |
60 | 60 | public static <T> Patch<T> diff(List<T> original, List<T> revised, DiffAlgorithmListener progress) { |
@@ -65,8 +65,8 @@ public static <T> Patch<T> diff(List<T> original, List<T> revised, DiffAlgorithm |
65 | 65 | * Computes the difference between two sequences of elements using the default diff algorithm. |
66 | 66 | * |
67 | 67 | * @param <T> a generic representing the type of the elements to be compared. |
68 | | - * @param original a {@link List} represnting the original sequence of elements. Must not be {@code null}. |
69 | | - * @param revised a {@link List} represnting the revised sequence of elements. Must not be {@code null}. |
| 68 | + * @param original a {@link List} representing the original sequence of elements. Must not be {@code null}. |
| 69 | + * @param revised a {@link List} representing the revised sequence of elements. Must not be {@code null}. |
70 | 70 | * @return The patch describing the difference between the original and revised sequences. Never {@code null}. |
71 | 71 | */ |
72 | 72 | public static <T> Patch<T> diff(List<T> original, List<T> revised) { |
@@ -77,9 +77,9 @@ public static <T> Patch<T> diff(List<T> original, List<T> revised) { |
77 | 77 | * Computes the difference between two sequences of elements using the default diff algorithm. |
78 | 78 | * |
79 | 79 | * @param <T> a generic representing the type of the elements to be compared. |
80 | | - * @param original a {@link List} represnting the original sequence of elements. Must not be {@code null}. |
81 | | - * @param revised a {@link List} represnting the revised sequence of elements. Must not be {@code null}. |
82 | | - * @param includeEqualParts a {@link boolean} represnting whether to include equal parts in the resulting patch. |
| 80 | + * @param original a {@link List} representing the original sequence of elements. Must not be {@code null}. |
| 81 | + * @param revised a {@link List} representing the revised sequence of elements. Must not be {@code null}. |
| 82 | + * @param includeEqualParts a {@link boolean} representing whether to include equal parts in the resulting patch. |
83 | 83 | * @return The patch describing the difference between the original and revised sequences. Never {@code null}. |
84 | 84 | */ |
85 | 85 | public static <T> Patch<T> diff(List<T> original, List<T> revised, boolean includeEqualParts) { |
@@ -89,9 +89,9 @@ public static <T> Patch<T> diff(List<T> original, List<T> revised, boolean inclu |
89 | 89 | /** |
90 | 90 | * Computes the difference between two strings using the default diff algorithm. |
91 | 91 | * |
92 | | - * @param sourceText a {@link String} represnting the original string. Must not be {@code null}. |
93 | | - * @param targetText a {@link String} represnting the revised string. Must not be {@code null}. |
94 | | - * @param progress a {@link DiffAlgorithmListener} represnting the progress listener. Can be {@code null}. |
| 92 | + * @param sourceText a {@link String} representing the original string. Must not be {@code null}. |
| 93 | + * @param targetText a {@link String} representing the revised string. Must not be {@code null}. |
| 94 | + * @param progress a {@link DiffAlgorithmListener} representing the progress listener. Can be {@code null}. |
95 | 95 | * @return The patch describing the difference between the original and revised strings. Never {@code null}. |
96 | 96 | */ |
97 | 97 | public static Patch<String> diff(String sourceText, String targetText, |
@@ -105,9 +105,9 @@ public static Patch<String> diff(String sourceText, String targetText, |
105 | 105 | * Computes the difference between the original and revised list of elements |
106 | 106 | * with default diff algorithm |
107 | 107 | * |
108 | | - * @param source a {@link List} represnting the original text. Must not be {@code null}. |
109 | | - * @param target a {@link List} represnting the revised text. Must not be {@code null}. |
110 | | - * @param equalizer a {@link BiPredicate} represnting the equalizer object to replace the default compare |
| 108 | + * @param source a {@link List} representing the original text. Must not be {@code null}. |
| 109 | + * @param target a {@link List} representing the revised text. Must not be {@code null}. |
| 110 | + * @param equalizer a {@link BiPredicate} representing the equalizer object to replace the default compare |
111 | 111 | * algorithm (Object.equals). If {@code null} the default equalizer of the |
112 | 112 | * default algorithm is used. |
113 | 113 | * @return The patch describing the difference between the original and |
@@ -131,10 +131,10 @@ public static <T> Patch<T> diff(List<T> original, List<T> revised, |
131 | 131 | * Computes the difference between the original and revised list of elements |
132 | 132 | * with default diff algorithm |
133 | 133 | * |
134 | | - * @param original a {@link List} represnting the original text. Must not be {@code null}. |
135 | | - * @param revised a {@link List} represnting the revised text. Must not be {@code null}. |
136 | | - * @param algorithm a {@link DiffAlgorithmI} represnting the diff algorithm. Must not be {@code null}. |
137 | | - * @param progress a {@link DiffAlgorithmListener} represnting the diff algorithm listener. |
| 134 | + * @param original a {@link List} representing the original text. Must not be {@code null}. |
| 135 | + * @param revised a {@link List} representing the revised text. Must not be {@code null}. |
| 136 | + * @param algorithm a {@link DiffAlgorithmI} representing the diff algorithm. Must not be {@code null}. |
| 137 | + * @param progress a {@link DiffAlgorithmListener} representing the diff algorithm listener. |
138 | 138 | * @param includeEqualParts Include equal data parts into the patch. |
139 | 139 | * @return The patch describing the difference between the original and |
140 | 140 | * revised sequences. Never {@code null}. |
@@ -154,9 +154,9 @@ public static <T> Patch<T> diff(List<T> original, List<T> revised, |
154 | 154 | * Computes the difference between the original and revised list of elements |
155 | 155 | * with default diff algorithm |
156 | 156 | * |
157 | | - * @param original a {@link List} represnting the original text. Must not be {@code null}. |
158 | | - * @param revised a {@link List} represnting the revised text. Must not be {@code null}. |
159 | | - * @param algorithm a {@link DiffAlgorithmI} represnting the diff algorithm. Must not be {@code null}. |
| 157 | + * @param original a {@link List} representing the original text. Must not be {@code null}. |
| 158 | + * @param revised a {@link List} representing the revised text. Must not be {@code null}. |
| 159 | + * @param algorithm a {@link DiffAlgorithmI} representing the diff algorithm. Must not be {@code null}. |
160 | 160 | * @return The patch describing the difference between the original and |
161 | 161 | * revised sequences. Never {@code null}. |
162 | 162 | */ |
@@ -169,8 +169,8 @@ public static <T> Patch<T> diff(List<T> original, List<T> revised, DiffAlgorithm |
169 | 169 | * "trick" to make out of texts lists of characters, like DiffRowGenerator |
170 | 170 | * does and merges those changes at the end together again. |
171 | 171 | * |
172 | | - * @param original a {@link String} represnting the original text. Must not be {@code null}. |
173 | | - * @param revised a {@link String} represnting the revised text. Must not be {@code null}. |
| 172 | + * @param original a {@link String} representing the original text. Must not be {@code null}. |
| 173 | + * @param revised a {@link String} representing the revised text. Must not be {@code null}. |
174 | 174 | * @return The patch describing the difference between the original and |
175 | 175 | * revised sequences. Never {@code null}. |
176 | 176 | */ |
@@ -194,8 +194,8 @@ public static Patch<String> diffInline(String original, String revised) { |
194 | 194 | /** |
195 | 195 | * Applies the given patch to the original list and returns the revised list. |
196 | 196 | * |
197 | | - * @param original a {@link List} represnting the original list. |
198 | | - * @param patch a {@link List} represnting the patch to apply. |
| 197 | + * @param original a {@link List} representing the original list. |
| 198 | + * @param patch a {@link List} representing the patch to apply. |
199 | 199 | * @return the revised list. |
200 | 200 | * @throws PatchFailedException if the patch cannot be applied. |
201 | 201 | */ |
@@ -207,8 +207,8 @@ public static <T> List<T> patch(List<T> original, Patch<T> patch) |
207 | 207 | /** |
208 | 208 | * Applies the given patch to the revised list and returns the original list. |
209 | 209 | * |
210 | | - * @param revised a {@link List} represnting the revised list. |
211 | | - * @param patch a {@link Patch} represnting the patch to apply. |
| 210 | + * @param revised a {@link List} representing the revised list. |
| 211 | + * @param patch a {@link Patch} representing the patch to apply. |
212 | 212 | * @return the original list. |
213 | 213 | * @throws PatchFailedException if the patch cannot be applied. |
214 | 214 | */ |
|