Small code and doc improvements

Remove unnecessary else-branch and use Collections.isEmpty().
Add doc comment for splitFilename()
This commit is contained in:
TobiGr 2023-09-17 15:31:06 +02:00
parent 6df808f266
commit 4e41e12bd2

View file

@ -102,24 +102,24 @@ public class StoredDirectoryHelper {
} }
} }
if (matches.size() < 1) { if (matches.isEmpty()) {
return createFile(name, mime, true); return createFile(name, mime, true);
} else { }
// check if the filename is in use
String lcName = name.toLowerCase();
for (final String testName : matches) {
if (testName.equals(lcName)) {
lcName = null;
break;
}
}
// check if not in use // check if the filename is in use
if (lcName != null) { String lcName = name.toLowerCase();
return createFile(name, mime, true); for (final String testName : matches) {
if (testName.equals(lcName)) {
lcName = null;
break;
} }
} }
// create file if filename not in use
if (lcName != null) {
return createFile(name, mime, true);
}
Collections.sort(matches, String::compareTo); Collections.sort(matches, String::compareTo);
for (int i = 1; i < 1000; i++) { for (int i = 1; i < 1000; i++) {
@ -261,6 +261,12 @@ public class StoredDirectoryHelper {
} }
} }
/**
* Splits the filename into the name and extension.
*
* @param filename The filename to split
* @return A String array with the name at index 0 and extension at index 1
*/
private static String[] splitFilename(@NonNull final String filename) { private static String[] splitFilename(@NonNull final String filename) {
final int dotIndex = filename.lastIndexOf('.'); final int dotIndex = filename.lastIndexOf('.');