Skip to content

Commit a85362e

Browse files
committed
git-svn-id: https://svn.apache.org/repos/asf/commons/proper/codec/trunk@1544347 13f79535-47bb-0310-9956-ffa450edef68
1 parent 2e92a87 commit a85362e

6 files changed

Lines changed: 31 additions & 31 deletions

File tree

src/main/java/org/apache/commons/codec/binary/BaseNCodecOutputStream.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -99,15 +99,15 @@ public void write(final byte b[], final int offset, final int len) throws IOExce
9999
}
100100

101101
/**
102-
* Flushes this output stream and forces any buffered output bytes to be written out to the stream. If propogate is
102+
* Flushes this output stream and forces any buffered output bytes to be written out to the stream. If propagate is
103103
* true, the wrapped stream will also be flushed.
104104
*
105-
* @param propogate
105+
* @param propagate
106106
* boolean flag to indicate whether the wrapped OutputStream should also be flushed.
107107
* @throws IOException
108108
* if an I/O error occurs.
109109
*/
110-
private void flush(final boolean propogate) throws IOException {
110+
private void flush(final boolean propagate) throws IOException {
111111
final int avail = baseNCodec.available(context);
112112
if (avail > 0) {
113113
final byte[] buf = new byte[avail];
@@ -116,7 +116,7 @@ private void flush(final boolean propogate) throws IOException {
116116
out.write(buf, 0, c);
117117
}
118118
}
119-
if (propogate) {
119+
if (propagate) {
120120
out.flush();
121121
}
122122
}

src/main/java/org/apache/commons/codec/language/DoubleMetaphone.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -622,7 +622,7 @@ private int handleS(final String value, final DoubleMetaphoneResult result, int
622622
contains(value, index + 1, 1, "Z")) {
623623
//-- german & anglicisations, e.g. "smith" match "schmidt" //
624624
// "snider" match "schneider" --//
625-
//-- also, -sz- in slavic language altho in hungarian it //
625+
//-- also, -sz- in slavic language although in hungarian it //
626626
// is pronounced "s" --//
627627
result.append('S', 'X');
628628
index = contains(value, index + 1, 1, "Z") ? index + 2 : index + 1;
@@ -850,7 +850,7 @@ private boolean conditionM0(final String value, final int index) {
850850
//-- BEGIN HELPER FUNCTIONS --//
851851

852852
/**
853-
* Determines whether or not a value is of slavo-germanic orgin. A value is
853+
* Determines whether or not a value is of slavo-germanic origin. A value is
854854
* of slavo-germanic origin if it contians any of 'W', 'K', 'CZ', or 'WITZ'.
855855
*/
856856
private boolean isSlavoGermanic(final String value) {

src/site/xdoc/mail-lists.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,7 @@ limitations under the License.
149149
<td>
150150
<strong>Commons Commits List</strong>
151151
<br /><br />
152-
Only for e-mails automatically generated by the <a href="source-repository.html">source control</a> sytem.
152+
Only for e-mails automatically generated by the <a href="source-repository.html">source control</a> system.
153153
<br /><br />
154154
</td>
155155
<td><a href="mailto:commits-subscribe@commons.apache.org">Subscribe</a></td>

src/test/java/org/apache/commons/codec/binary/Base32InputStreamTest.java

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -278,17 +278,17 @@ public void testBase32InputStreamByteByByte() throws Exception {
278278
* the data from above, but decoded
279279
* @param chunkSize
280280
* chunk size (line-length) of the base32 encoded data.
281-
* @param seperator
281+
* @param separator
282282
* Line separator in the base32 encoded data.
283283
* @throws Exception
284284
* Usually signifies a bug in the Base32 commons-codec implementation.
285285
*/
286-
private void testByChunk(final byte[] encoded, final byte[] decoded, final int chunkSize, final byte[] seperator) throws Exception {
286+
private void testByChunk(final byte[] encoded, final byte[] decoded, final int chunkSize, final byte[] separator) throws Exception {
287287

288288
// Start with encode.
289289
InputStream in;
290290

291-
in = new Base32InputStream(new ByteArrayInputStream(decoded), true, chunkSize, seperator);
291+
in = new Base32InputStream(new ByteArrayInputStream(decoded), true, chunkSize, separator);
292292
byte[] output = Base32TestData.streamToBytes(in);
293293

294294
assertEquals("EOF", -1, in.read());
@@ -306,7 +306,7 @@ private void testByChunk(final byte[] encoded, final byte[] decoded, final int c
306306
// I always wanted to do this! (wrap encoder with decoder etc etc).
307307
in = new ByteArrayInputStream(decoded);
308308
for (int i = 0; i < 10; i++) {
309-
in = new Base32InputStream(in, true, chunkSize, seperator);
309+
in = new Base32InputStream(in, true, chunkSize, separator);
310310
in = new Base32InputStream(in, false);
311311
}
312312
output = Base32TestData.streamToBytes(in);
@@ -330,16 +330,16 @@ private void testByChunk(final byte[] encoded, final byte[] decoded, final int c
330330
* the data from above, but decoded
331331
* @param chunkSize
332332
* chunk size (line-length) of the base32 encoded data.
333-
* @param seperator
333+
* @param separator
334334
* Line separator in the base32 encoded data.
335335
* @throws Exception
336336
* Usually signifies a bug in the Base32 commons-codec implementation.
337337
*/
338-
private void testByteByByte(final byte[] encoded, final byte[] decoded, final int chunkSize, final byte[] seperator) throws Exception {
338+
private void testByteByByte(final byte[] encoded, final byte[] decoded, final int chunkSize, final byte[] separator) throws Exception {
339339

340340
// Start with encode.
341341
InputStream in;
342-
in = new Base32InputStream(new ByteArrayInputStream(decoded), true, chunkSize, seperator);
342+
in = new Base32InputStream(new ByteArrayInputStream(decoded), true, chunkSize, separator);
343343
byte[] output = new byte[encoded.length];
344344
for (int i = 0; i < output.length; i++) {
345345
output[i] = (byte) in.read();
@@ -367,7 +367,7 @@ private void testByteByByte(final byte[] encoded, final byte[] decoded, final in
367367
// I always wanted to do this! (wrap encoder with decoder etc etc).
368368
in = new ByteArrayInputStream(decoded);
369369
for (int i = 0; i < 10; i++) {
370-
in = new Base32InputStream(in, true, chunkSize, seperator);
370+
in = new Base32InputStream(in, true, chunkSize, separator);
371371
in = new Base32InputStream(in, false);
372372
}
373373
output = new byte[decoded.length];

src/test/java/org/apache/commons/codec/binary/Base32OutputStreamTest.java

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -170,16 +170,16 @@ public void testBase32OutputStreamByteByByte() throws Exception {
170170
* the data from above, but decoded
171171
* @param chunkSize
172172
* chunk size (line-length) of the Base32 encoded data.
173-
* @param seperator
173+
* @param separator
174174
* Line separator in the Base32 encoded data.
175175
* @throws Exception
176176
* Usually signifies a bug in the Base32 commons-codec implementation.
177177
*/
178-
private void testByChunk(final byte[] encoded, final byte[] decoded, final int chunkSize, final byte[] seperator) throws Exception {
178+
private void testByChunk(final byte[] encoded, final byte[] decoded, final int chunkSize, final byte[] separator) throws Exception {
179179

180180
// Start with encode.
181181
ByteArrayOutputStream byteOut = new ByteArrayOutputStream();
182-
OutputStream out = new Base32OutputStream(byteOut, true, chunkSize, seperator);
182+
OutputStream out = new Base32OutputStream(byteOut, true, chunkSize, separator);
183183
out.write(decoded);
184184
out.close();
185185
byte[] output = byteOut.toByteArray();
@@ -198,7 +198,7 @@ private void testByChunk(final byte[] encoded, final byte[] decoded, final int c
198198
out = byteOut;
199199
for (int i = 0; i < 10; i++) {
200200
out = new Base32OutputStream(out, false);
201-
out = new Base32OutputStream(out, true, chunkSize, seperator);
201+
out = new Base32OutputStream(out, true, chunkSize, separator);
202202
}
203203
out.write(decoded);
204204
out.close();
@@ -220,16 +220,16 @@ private void testByChunk(final byte[] encoded, final byte[] decoded, final int c
220220
* the data from above, but decoded
221221
* @param chunkSize
222222
* chunk size (line-length) of the Base32 encoded data.
223-
* @param seperator
223+
* @param separator
224224
* Line separator in the Base32 encoded data.
225225
* @throws Exception
226226
* Usually signifies a bug in the Base32 commons-codec implementation.
227227
*/
228-
private void testByteByByte(final byte[] encoded, final byte[] decoded, final int chunkSize, final byte[] seperator) throws Exception {
228+
private void testByteByByte(final byte[] encoded, final byte[] decoded, final int chunkSize, final byte[] separator) throws Exception {
229229

230230
// Start with encode.
231231
ByteArrayOutputStream byteOut = new ByteArrayOutputStream();
232-
OutputStream out = new Base32OutputStream(byteOut, true, chunkSize, seperator);
232+
OutputStream out = new Base32OutputStream(byteOut, true, chunkSize, separator);
233233
for (final byte element : decoded) {
234234
out.write(element);
235235
}
@@ -263,7 +263,7 @@ private void testByteByByte(final byte[] encoded, final byte[] decoded, final in
263263
out = byteOut;
264264
for (int i = 0; i < 10; i++) {
265265
out = new Base32OutputStream(out, false);
266-
out = new Base32OutputStream(out, true, chunkSize, seperator);
266+
out = new Base32OutputStream(out, true, chunkSize, separator);
267267
}
268268
for (final byte element : decoded) {
269269
out.write(element);

src/test/java/org/apache/commons/codec/binary/Base64InputStreamTest.java

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -291,16 +291,16 @@ public void testBase64InputStreamByteByByte() throws Exception {
291291
* the data from above, but decoded
292292
* @param chunkSize
293293
* chunk size (line-length) of the base64 encoded data.
294-
* @param seperator
294+
* @param separator
295295
* Line separator in the base64 encoded data.
296296
* @throws Exception
297297
* Usually signifies a bug in the Base64 commons-codec implementation.
298298
*/
299-
private void testByChunk(final byte[] encoded, final byte[] decoded, final int chunkSize, final byte[] seperator) throws Exception {
299+
private void testByChunk(final byte[] encoded, final byte[] decoded, final int chunkSize, final byte[] separator) throws Exception {
300300

301301
// Start with encode.
302302
InputStream in;
303-
in = new Base64InputStream(new ByteArrayInputStream(decoded), true, chunkSize, seperator);
303+
in = new Base64InputStream(new ByteArrayInputStream(decoded), true, chunkSize, separator);
304304
byte[] output = Base64TestData.streamToBytes(in);
305305

306306
assertEquals("EOF", -1, in.read());
@@ -320,7 +320,7 @@ private void testByChunk(final byte[] encoded, final byte[] decoded, final int c
320320
// I always wanted to do this! (wrap encoder with decoder etc etc).
321321
in = new ByteArrayInputStream(decoded);
322322
for (int i = 0; i < 10; i++) {
323-
in = new Base64InputStream(in, true, chunkSize, seperator);
323+
in = new Base64InputStream(in, true, chunkSize, separator);
324324
in = new Base64InputStream(in, false);
325325
}
326326
output = Base64TestData.streamToBytes(in);
@@ -344,16 +344,16 @@ private void testByChunk(final byte[] encoded, final byte[] decoded, final int c
344344
* the data from above, but decoded
345345
* @param chunkSize
346346
* chunk size (line-length) of the base64 encoded data.
347-
* @param seperator
347+
* @param separator
348348
* Line separator in the base64 encoded data.
349349
* @throws Exception
350350
* Usually signifies a bug in the Base64 commons-codec implementation.
351351
*/
352-
private void testByteByByte(final byte[] encoded, final byte[] decoded, final int chunkSize, final byte[] seperator) throws Exception {
352+
private void testByteByByte(final byte[] encoded, final byte[] decoded, final int chunkSize, final byte[] separator) throws Exception {
353353

354354
// Start with encode.
355355
InputStream in;
356-
in = new Base64InputStream(new ByteArrayInputStream(decoded), true, chunkSize, seperator);
356+
in = new Base64InputStream(new ByteArrayInputStream(decoded), true, chunkSize, separator);
357357
byte[] output = new byte[encoded.length];
358358
for (int i = 0; i < output.length; i++) {
359359
output[i] = (byte) in.read();
@@ -380,7 +380,7 @@ private void testByteByByte(final byte[] encoded, final byte[] decoded, final in
380380
// I always wanted to do this! (wrap encoder with decoder etc etc).
381381
in = new ByteArrayInputStream(decoded);
382382
for (int i = 0; i < 10; i++) {
383-
in = new Base64InputStream(in, true, chunkSize, seperator);
383+
in = new Base64InputStream(in, true, chunkSize, separator);
384384
in = new Base64InputStream(in, false);
385385
}
386386
output = new byte[decoded.length];

0 commit comments

Comments
 (0)