From 2a22271ca2e63c4397044730aed97997bbfdbb6c Mon Sep 17 00:00:00 2001
From: tpylak <tpylak>
Date: Fri, 23 Apr 2010 14:36:24 +0000
Subject: [PATCH] SE-236 genedata import: fix
SVN: 15607
---
.../openbis/dss/genedata/HCSImageFileExtractor.java | 13 ++++++-------
1 file changed, 6 insertions(+), 7 deletions(-)
diff --git a/screening/source/java/ch/systemsx/cisd/openbis/dss/genedata/HCSImageFileExtractor.java b/screening/source/java/ch/systemsx/cisd/openbis/dss/genedata/HCSImageFileExtractor.java
index 0b67c6d41eb..e9d49b9f983 100644
--- a/screening/source/java/ch/systemsx/cisd/openbis/dss/genedata/HCSImageFileExtractor.java
+++ b/screening/source/java/ch/systemsx/cisd/openbis/dss/genedata/HCSImageFileExtractor.java
@@ -29,11 +29,10 @@ import ch.systemsx.cisd.etlserver.plugins.AbstractHCSImageFileExtractor;
import ch.systemsx.cisd.openbis.dss.generic.shared.dto.DataSetInformation;
/**
- *
- *
* @author Franz-Josef Elmer
*/
-public class HCSImageFileExtractor extends AbstractHCSImageFileExtractor implements IHCSImageFileExtractor
+public class HCSImageFileExtractor extends AbstractHCSImageFileExtractor implements
+ IHCSImageFileExtractor
{
public HCSImageFileExtractor(final Properties properties)
{
@@ -46,12 +45,12 @@ public class HCSImageFileExtractor extends AbstractHCSImageFileExtractor impleme
super(wellGeometry);
}
-
public HCSImageFileExtractionResult process(IDirectory incomingDataSetDirectory,
DataSetInformation dataSetInformation, IHCSImageFileAccepter accepter)
{
assert incomingDataSetDirectory != null;
- return process(incomingDataSetDirectory.listFiles(null, false), dataSetInformation, accepter);
+ return process(incomingDataSetDirectory.listFiles(null, false), dataSetInformation,
+ accepter);
}
@Override
@@ -73,7 +72,7 @@ public class HCSImageFileExtractor extends AbstractHCSImageFileExtractor impleme
tokens[2] = wellAndTileCoordinates.substring(6);
return tokens;
}
-
+
@Override
protected int getChannelWavelength(String channel)
{
@@ -99,7 +98,7 @@ public class HCSImageFileExtractor extends AbstractHCSImageFileExtractor impleme
{
int row = Integer.parseInt(plateLocation.substring(0, 3));
int column = Integer.parseInt(plateLocation.substring(3));
- return new Location(row, column);
+ return new Location(column, row);
} catch (NumberFormatException ex)
{
return null;
--
GitLab