@@ -110,7 +110,7 @@ public void handleFileUpload(FileUploadEvent event) {
110
110
resetValues ();
111
111
if (!csvLines .isEmpty ()) {
112
112
importedCsvHeaderLine = csvLines .get (0 );
113
- metadataKeys = new LinkedList <>( Arrays . asList ( csvLines . get ( 0 ). split ( csvSeparator , - 1 )) );
113
+ updateMetadataKeys ( );
114
114
if (csvLines .size () > 1 ) {
115
115
importedCsvLines = csvLines .subList (1 , csvLines .size ());
116
116
records = massImportService .parseLines (importedCsvLines , csvSeparator );
@@ -133,14 +133,19 @@ private void resetValues() {
133
133
* Event listender function called when user switches CSV separator character used to split text lines into cells.
134
134
*/
135
135
public void changeSeparator () {
136
- metadataKeys = new LinkedList <>( Arrays . asList ( importedCsvHeaderLine . split ( csvSeparator , - 1 )) );
136
+ updateMetadataKeys ( );
137
137
try {
138
138
records = massImportService .parseLines (importedCsvLines , csvSeparator );
139
139
} catch (IOException | CsvException e ) {
140
140
Helper .setErrorMessage (e );
141
141
}
142
142
}
143
143
144
+ private void updateMetadataKeys () {
145
+ metadataKeys = Arrays .stream (importedCsvHeaderLine .split (csvSeparator , -1 )).map (String ::trim )
146
+ .collect (Collectors .toList ());
147
+ }
148
+
144
149
/**
145
150
* Add new CSV lines.
146
151
*/
@@ -215,7 +220,7 @@ private void importRecords(Map<String, Map<String, List<String>>> processMetadat
215
220
*/
216
221
public String getColumnHeader (Integer columnIndex ) {
217
222
if (columnIndex < metadataKeys .size ()) {
218
- return metadataKeys .get (columnIndex );
223
+ return Helper . getTranslation ( metadataKeys .get (columnIndex ) );
219
224
}
220
225
return "" ;
221
226
}
0 commit comments