Skip to content

Commit a61ebaa

Browse files
authored
Merge pull request #516 from digital-preservation/DR2-2016_dragAndDropExtMatchingIsCaseSensitive
Make drag and drop extension matching is case insensitive
2 parents 3f3faf4 + f0b5472 commit a61ebaa

File tree

1 file changed

+4
-3
lines changed

1 file changed

+4
-3
lines changed

csv-validator-ui/src/main/scala/uk/gov/nationalarchives/csv/validator/ui/CsvValidatorUi.scala

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -262,19 +262,20 @@ object CsvValidatorUi extends SimpleSwingApplication {
262262
val numOfFilesDropped = files.length
263263
lazy val filePaths = files.map(_.getAbsolutePath)
264264
lazy val (file1Ext, file2Ext) = {
265-
val fileExtensions = filePaths.map(_.split('.').last)
265+
val fileExtensions = filePaths.map(_.split('.').last.toLowerCase)
266266
(fileExtensions.head, fileExtensions.last)
267267
}
268268

269269
if(numOfFilesDropped > 2) showErrorDialog("Drop a maximum of 2 files.")
270270
else if (numOfFilesDropped == 2 && Set(file1Ext, file2Ext) != Set("csv", "csvs"))
271271
showErrorDialog("Drop a single '.csv' file and its corresponding '.csvs' file.")
272272
else filePaths.map { filePath =>
273-
if(filePath.endsWith(".csv")) {
273+
val lowercasedFilePath = filePath.toLowerCase
274+
if(lowercasedFilePath.endsWith(".csv")) {
274275
txtCsvFile.setText(filePath)
275276
true
276277
}
277-
else if(filePath.endsWith(".csvs")) {
278+
else if(lowercasedFilePath.endsWith(".csvs")) {
278279
txtCsvSchemaFile.setText(filePath)
279280
true
280281
}

0 commit comments

Comments
 (0)