renamed a Pair parameter to reflect pair semantics

Change-Id: I1a1256a8fce950f7b77d70422388672aa26bd2fe
This commit is contained in:
Axel Uhl committed 2017-11-24 18:04:17 +01:00
1 parent f5d263e26a
commit e91dfdbc43
1 file changed
+5 -5
@@ -50,7 +50,7 @@ public class SensorDataImportServlet extends AbstractFileUploadServlet {
* Searches the requested importer in the importers provided by the OSGi registry and imports the priovided sensor
* data file.
*
* @param files
* @param importerNamesAndFiles
* the file items together with the names of the importer to use for importing the respective file's
* contents; the importer names are matched against {@link DoubleVectorFixImporter#getType()} for all
* importers found registered in the OSGi registry. The first matching importer is used for the file. The
@@ -59,15 +59,15 @@ public class SensorDataImportServlet extends AbstractFileUploadServlet {
* @throws IOException
*/
private Iterable<TrackFileImportDeviceIdentifier> importFiles(boolean enableDownsampler,
Iterable<Pair<String, FileItem>> files) throws IOException {
Iterable<Pair<String, FileItem>> importerNamesAndFiles) throws IOException {
final Set<TrackFileImportDeviceIdentifier> deviceIds = new HashSet<>();
final Map<DeviceIdentifier, TimePoint> from = new HashMap<>();
final Map<DeviceIdentifier, TimePoint> to = new HashMap<>();
final Collection<DoubleVectorFixImporter> availableImporters = new LinkedHashSet<>();
availableImporters.addAll(getOSGiRegisteredImporters());
for (Pair<String, FileItem> file : files) {
final String requestedImporterName = file.getA();
final FileItem fi = file.getB();
for (Pair<String, FileItem> importerNameAndFile : importerNamesAndFiles) {
final String requestedImporterName = importerNameAndFile.getA();
final FileItem fi = importerNameAndFile.getB();
DoubleVectorFixImporter importerToUse = null;
for (DoubleVectorFixImporter candidate : availableImporters) {
if (candidate.getType().equals(requestedImporterName)) {