Skip to content

Commit 480e813

Browse files
committed
Javadoc
Use "period", not "dot" which is how Windows and Linux talk about the character that separates a file's name from its extension
1 parent 82248ce commit 480e813

2 files changed

Lines changed: 31 additions & 31 deletions

File tree

src/main/java/org/apache/commons/io/FilenameUtils.java

Lines changed: 29 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -405,7 +405,7 @@ private static String doNormalize(final String fileName, final char separator, f
405405
}
406406
}
407407

408-
// dot slash
408+
// period slash
409409
for (int i = prefix + 1; i < size; i++) {
410410
if (array[i] == separator && array[i - 1] == '.' &&
411411
(i == prefix + 1 || array[i - 2] == separator)) {
@@ -418,7 +418,7 @@ private static String doNormalize(final String fileName, final char separator, f
418418
}
419419
}
420420

421-
// double dot slash
421+
// double period slash
422422
outer:
423423
for (int i = prefix + 2; i < size; i++) {
424424
if (array[i] == separator && array[i - 1] == '.' && array[i - 2] == '.' &&
@@ -595,7 +595,7 @@ private static int getAdsCriticalOffset(final String fileName) {
595595
* Gets the base name, minus the full path and extension, from a full file name.
596596
* <p>
597597
* This method will handle a path in either Unix or Windows format.
598-
* The text after the last forward or backslash and before the last dot is returned.
598+
* The text after the last forward or backslash and before the last period is returned.
599599
* </p>
600600
* <pre>
601601
* a/b/c.txt --&gt; c
@@ -620,8 +620,8 @@ public static String getBaseName(final String fileName) {
620620
/**
621621
* Gets the extension of a file name.
622622
* <p>
623-
* This method returns the textual part of the file name after the last dot.
624-
* There must be no directory separator after the dot.
623+
* This method returns the textual part of the file name after the last period.
624+
* There must be no directory separator after the period.
625625
* </p>
626626
* <pre>
627627
* foo.txt --&gt; "txt"
@@ -963,9 +963,9 @@ public static int getPrefixLength(final String fileName) {
963963
}
964964

965965
/**
966-
* Returns the index of the last extension separator character, which is a dot.
966+
* Returns the index of the last extension separator character, which is a period.
967967
* <p>
968-
* This method also checks that there is no directory separator after the last dot. To do this it uses
968+
* This method also checks that there is no directory separator after the last period. To do this it uses
969969
* {@link #indexOfLastSeparator(String)} which will handle a file in either Unix or Windows format.
970970
* </p>
971971
* <p>
@@ -1029,7 +1029,7 @@ private static boolean isEmpty(final String string) {
10291029
* Checks whether the extension of the file name is one of those specified.
10301030
* <p>
10311031
* This method obtains the extension as the textual part of the file name
1032-
* after the last dot. There must be no directory separator after the dot.
1032+
* after the last period. There must be no directory separator after the period.
10331033
* The extension check is case-sensitive on all platforms.
10341034
*
10351035
* @param fileName the file name, null returns false
@@ -1053,7 +1053,7 @@ public static boolean isExtension(final String fileName, final Collection<String
10531053
* Checks whether the extension of the file name is that specified.
10541054
* <p>
10551055
* This method obtains the extension as the textual part of the file name
1056-
* after the last dot. There must be no directory separator after the dot.
1056+
* after the last period. There must be no directory separator after the period.
10571057
* The extension check is case-sensitive on all platforms.
10581058
*
10591059
* @param fileName the file name, null returns false
@@ -1077,7 +1077,7 @@ public static boolean isExtension(final String fileName, final String extension)
10771077
* Checks whether the extension of the file name is one of those specified.
10781078
* <p>
10791079
* This method obtains the extension as the textual part of the file name
1080-
* after the last dot. There must be no directory separator after the dot.
1080+
* after the last period. There must be no directory separator after the period.
10811081
* The extension check is case-sensitive on all platforms.
10821082
*
10831083
* @param fileName the file name, null returns false
@@ -1207,7 +1207,7 @@ private static boolean isRFC3986HostName(final String name) {
12071207
final String[] parts = name.split("\\.", -1);
12081208
for (int i = 0; i < parts.length; i++) {
12091209
if (parts[i].isEmpty()) {
1210-
// trailing dot is legal, otherwise we've hit a .. sequence
1210+
// trailing period is legal, otherwise we've hit a .. sequence
12111211
return i == parts.length - 1;
12121212
}
12131213
if (!REG_NAME_PART_PATTERN.matcher(parts[i]).matches()) {
@@ -1253,17 +1253,17 @@ private static boolean isValidHostName(final String name) {
12531253
}
12541254

12551255
/**
1256-
* Normalizes a path, removing double and single dot path steps.
1256+
* Normalizes a path, removing double and single period path steps.
12571257
* <p>
12581258
* This method normalizes a path to a standard format.
12591259
* The input may contain separators in either Unix or Windows format.
12601260
* The output will contain separators in the format of the system.
12611261
* <p>
12621262
* A trailing slash will be retained.
12631263
* A double slash will be merged to a single slash (but UNC names are handled).
1264-
* A single dot path segment will be removed.
1265-
* A double dot will cause that path segment and the one before to be removed.
1266-
* If the double dot has no parent path segment, {@code null} is returned.
1264+
* A single period path segment will be removed.
1265+
* A double period will cause that path segment and the one before to be removed.
1266+
* If the double period has no parent path segment, {@code null} is returned.
12671267
* <p>
12681268
* The output will be the same on both Unix and Windows except
12691269
* for the separator character.
@@ -1297,17 +1297,17 @@ public static String normalize(final String fileName) {
12971297
}
12981298

12991299
/**
1300-
* Normalizes a path, removing double and single dot path steps.
1300+
* Normalizes a path, removing double and single period path steps.
13011301
* <p>
13021302
* This method normalizes a path to a standard format.
13031303
* The input may contain separators in either Unix or Windows format.
13041304
* The output will contain separators in the format specified.
13051305
* <p>
13061306
* A trailing slash will be retained.
13071307
* A double slash will be merged to a single slash (but UNC names are handled).
1308-
* A single dot path segment will be removed.
1309-
* A double dot will cause that path segment and the one before to be removed.
1310-
* If the double dot has no parent path segment to work with, {@code null}
1308+
* A single period path segment will be removed.
1309+
* A double period will cause that path segment and the one before to be removed.
1310+
* If the double period has no parent path segment to work with, {@code null}
13111311
* is returned.
13121312
* <p>
13131313
* The output will be the same on both Unix and Windows except
@@ -1346,7 +1346,7 @@ public static String normalize(final String fileName, final boolean unixSeparato
13461346
}
13471347

13481348
/**
1349-
* Normalizes a path, removing double and single dot path steps,
1349+
* Normalizes a path, removing double and single period path steps,
13501350
* and removing any final directory separator.
13511351
* <p>
13521352
* This method normalizes a path to a standard format.
@@ -1355,9 +1355,9 @@ public static String normalize(final String fileName, final boolean unixSeparato
13551355
* <p>
13561356
* A trailing slash will be removed.
13571357
* A double slash will be merged to a single slash (but UNC names are handled).
1358-
* A single dot path segment will be removed.
1359-
* A double dot will cause that path segment and the one before to be removed.
1360-
* If the double dot has no parent path segment to work with, {@code null}
1358+
* A single period path segment will be removed.
1359+
* A double period will cause that path segment and the one before to be removed.
1360+
* If the double period has no parent path segment to work with, {@code null}
13611361
* is returned.
13621362
* <p>
13631363
* The output will be the same on both Unix and Windows except
@@ -1392,7 +1392,7 @@ public static String normalizeNoEndSeparator(final String fileName) {
13921392
}
13931393

13941394
/**
1395-
* Normalizes a path, removing double and single dot path steps,
1395+
* Normalizes a path, removing double and single period path steps,
13961396
* and removing any final directory separator.
13971397
* <p>
13981398
* This method normalizes a path to a standard format.
@@ -1401,9 +1401,9 @@ public static String normalizeNoEndSeparator(final String fileName) {
14011401
* <p>
14021402
* A trailing slash will be removed.
14031403
* A double slash will be merged to a single slash (but UNC names are handled).
1404-
* A single dot path segment will be removed.
1405-
* A double dot will cause that path segment and the one before to be removed.
1406-
* If the double dot has no parent path segment to work with, {@code null}
1404+
* A single period path segment will be removed.
1405+
* A double period will cause that path segment and the one before to be removed.
1406+
* If the double period has no parent path segment to work with, {@code null}
14071407
* is returned.
14081408
* <p>
14091409
* The output will be the same on both Unix and Windows including
@@ -1442,8 +1442,8 @@ public static String normalizeNoEndSeparator(final String fileName, final boolea
14421442
/**
14431443
* Removes the extension from a fileName.
14441444
* <p>
1445-
* This method returns the textual part of the file name before the last dot.
1446-
* There must be no directory separator after the dot.
1445+
* This method returns the textual part of the file name before the last period.
1446+
* There must be no directory separator after the period.
14471447
* <pre>
14481448
* foo.txt --&gt; foo
14491449
* .txt --&gt; "" (empty string)

src/main/java/org/apache/commons/io/file/PathUtils.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -855,7 +855,7 @@ public static AclFileAttributeView getAclFileAttributeView(final Path path, fina
855855
/**
856856
* Gets the base name (the part up to and not including the last ".") of the last path segment of a file name.
857857
* <p>
858-
* Will return the file name itself if it doesn't contain any dots. All leading directories of the {@code file name} parameter are skipped.
858+
* Will return the file name itself if it doesn't contain any periods. All leading directories of the {@code file name} parameter are skipped.
859859
* </p>
860860
*
861861
* @return the base name of file name
@@ -885,7 +885,7 @@ public static DosFileAttributeView getDosFileAttributeView(final Path path, fina
885885
/**
886886
* Gets the extension of a Path.
887887
* <p>
888-
* This method returns the textual part of the Path after the last dot.
888+
* This method returns the textual part of the Path after the last period.
889889
* </p>
890890
* <pre>
891891
* foo.txt --&gt; "txt"

0 commit comments

Comments
 (0)