diff --git a/screening/source/java/ch/systemsx/cisd/openbis/dss/etl/featurevector/CsvToCanonicalFeatureVector.java b/screening/source/java/ch/systemsx/cisd/openbis/dss/etl/featurevector/CsvToCanonicalFeatureVector.java
index ef95b16238ffebb625a528e0d2611517efd0d493..9f023385fc400a24b11e2d059846ed70d05d124f 100644
--- a/screening/source/java/ch/systemsx/cisd/openbis/dss/etl/featurevector/CsvToCanonicalFeatureVector.java
+++ b/screening/source/java/ch/systemsx/cisd/openbis/dss/etl/featurevector/CsvToCanonicalFeatureVector.java
@@ -23,8 +23,8 @@ import java.util.List;
import ch.systemsx.cisd.openbis.dss.generic.server.plugins.tasks.DatasetFileLines;
import ch.systemsx.cisd.openbis.plugin.screening.shared.api.v1.dto.Geometry;
-import ch.systemsx.cisd.openbis.plugin.screening.shared.basic.dto.PlateFeatureValues;
import ch.systemsx.cisd.openbis.plugin.screening.shared.basic.dto.WellLocation;
+import ch.systemsx.cisd.openbis.plugin.screening.shared.dto.PlateFeatureValues;
import ch.systemsx.cisd.openbis.plugin.screening.shared.imaging.dataaccess.ImgFeatureDefDTO;
import ch.systemsx.cisd.openbis.plugin.screening.shared.imaging.dataaccess.ImgFeatureValuesDTO;
diff --git a/screening/source/java/ch/systemsx/cisd/openbis/dss/etl/genedata/GenedataFormatToCanonicalFeatureVector.java b/screening/source/java/ch/systemsx/cisd/openbis/dss/etl/genedata/GenedataFormatToCanonicalFeatureVector.java
index 1e4d75142a3f074ac6d25c0ad3f157ef99e5b208..6623683d5aea01208b33e330d55765440ef75eeb 100644
--- a/screening/source/java/ch/systemsx/cisd/openbis/dss/etl/genedata/GenedataFormatToCanonicalFeatureVector.java
+++ b/screening/source/java/ch/systemsx/cisd/openbis/dss/etl/genedata/GenedataFormatToCanonicalFeatureVector.java
@@ -27,8 +27,8 @@ import org.apache.commons.lang.StringUtils;
import ch.systemsx.cisd.common.exceptions.UserFailureException;
import ch.systemsx.cisd.openbis.dss.etl.featurevector.CanonicalFeatureVector;
import ch.systemsx.cisd.openbis.plugin.screening.shared.api.v1.dto.Geometry;
-import ch.systemsx.cisd.openbis.plugin.screening.shared.basic.dto.PlateFeatureValues;
import ch.systemsx.cisd.openbis.plugin.screening.shared.basic.dto.WellLocation;
+import ch.systemsx.cisd.openbis.plugin.screening.shared.dto.PlateFeatureValues;
import ch.systemsx.cisd.openbis.plugin.screening.shared.imaging.dataaccess.ImgFeatureDefDTO;
import ch.systemsx.cisd.openbis.plugin.screening.shared.imaging.dataaccess.ImgFeatureValuesDTO;
diff --git a/screening/source/java/ch/systemsx/cisd/openbis/dss/generic/server/FeatureTableBuilder.java b/screening/source/java/ch/systemsx/cisd/openbis/dss/generic/server/FeatureTableBuilder.java
index 9c92b65082fd8b0cbd2421235dca3c6a9d1b4fa0..121b2f3a4bc07a7910525da7b81e21633e8abd7e 100644
--- a/screening/source/java/ch/systemsx/cisd/openbis/dss/generic/server/FeatureTableBuilder.java
+++ b/screening/source/java/ch/systemsx/cisd/openbis/dss/generic/server/FeatureTableBuilder.java
@@ -29,7 +29,7 @@ import java.util.Map.Entry;
import ch.systemsx.cisd.common.exceptions.UserFailureException;
import ch.systemsx.cisd.openbis.dss.generic.shared.IEncapsulatedOpenBISService;
import ch.systemsx.cisd.openbis.generic.shared.dto.identifier.SampleIdentifier;
-import ch.systemsx.cisd.openbis.plugin.screening.shared.basic.dto.PlateFeatureValues;
+import ch.systemsx.cisd.openbis.plugin.screening.shared.dto.PlateFeatureValues;
import ch.systemsx.cisd.openbis.plugin.screening.shared.imaging.dataaccess.IImagingQueryDAO;
import ch.systemsx.cisd.openbis.plugin.screening.shared.imaging.dataaccess.ImgContainerDTO;
import ch.systemsx.cisd.openbis.plugin.screening.shared.imaging.dataaccess.ImgDatasetDTO;
diff --git a/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/shared/basic/dto/WellLocation.java b/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/shared/basic/dto/WellLocation.java
index 995256043c5190cd1d4c8ac699508658d3080a78..fe3b0da80197a29ceeb735ec9f4f477422282f5f 100644
--- a/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/shared/basic/dto/WellLocation.java
+++ b/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/shared/basic/dto/WellLocation.java
@@ -18,8 +18,6 @@ package ch.systemsx.cisd.openbis.plugin.screening.shared.basic.dto;
import com.google.gwt.user.client.rpc.IsSerializable;
-import ch.systemsx.cisd.openbis.plugin.screening.shared.api.v1.dto.Geometry;
-
/**
* Describes position of the well on the plate.
*
@@ -29,56 +27,10 @@ public class WellLocation implements IsSerializable
{
private static final int MAX_LETTER_NUMBER = getLetterNumber('Z');
- static final String NOT_POSITIVE = "Given coordinate '%s' must be > 0 (%d <= 0).";
-
private int row;
private int column;
- /** Calculates the row from the given cartesian coordinates. */
- public static int calcRow(Geometry geometry, int x, int y)
- {
- assert geometry != null;
- assert x >= 0 && x < geometry.getWidth() : x;
- assert y >= 0 && y < geometry.getHeight() : y;
-
- return geometry.getHeight() - y;
- }
-
- /** Calculates the column from the given cartesian coordinates. */
- public static int calcColumn(Geometry geometry, int x, int y)
- {
- assert geometry != null;
- assert x >= 0 && x < geometry.getWidth() : "X is " + x + " (allowed: (0,"
- + (geometry.getWidth() - 1) + ")";
- assert y >= 0 && y < geometry.getHeight() : "Y is " + y + " (allowed: (0,"
- + (geometry.getHeight() - 1) + ")";
-
- return x + 1;
- }
-
- /** Calculates the cartesian x coordinate. */
- public static int calcX(Geometry geometry, int row, int col)
- {
- assert geometry != null;
- assert row > 0 && row <= geometry.getHeight() : "Row is " + row + " (allowed: (1,"
- + geometry.getHeight() + ")";
- assert col > 0 && col <= geometry.getWidth() : "Col is " + col + " (allowed: (1,"
- + geometry.getWidth() + ")";
-
- return col - 1;
- }
-
- /** Calculates the cartesian y coordinate. */
- public static int calcY(Geometry geometry, int row, int col)
- {
- assert geometry != null;
- assert row > 0 && row <= geometry.getHeight() : row;
- assert col > 0 && col <= geometry.getWidth() : col;
-
- return geometry.getHeight() - row;
- }
-
/**
* Parses a location given as a string and returns a {@link WellLocation}. The location has to
* start with one or more letters ignoring case. This letter section code the x-coordinate with
@@ -232,12 +184,17 @@ public class WellLocation implements IsSerializable
public WellLocation(int row, int column)
{
- assert row > 0 : String.format(NOT_POSITIVE, "row", row);
- assert column > 0 : String.format(NOT_POSITIVE, "column", column);
+ assert row > 0 : createNonPositiveErrorMsg("row", row);
+ assert column > 0 : createNonPositiveErrorMsg("column", column);
this.row = row;
this.column = column;
}
+ private String createNonPositiveErrorMsg(String field, int value)
+ {
+ return "Given coordinate '" + field + "' must be > 0 (" + value + " <= 0).";
+ }
+
/** The row (rowCount - y where y is the cartesian coordinate). Starts with 1. */
public int getRow()
{
@@ -250,18 +207,6 @@ public class WellLocation implements IsSerializable
return column;
}
- /** Calculates the cartesian X coordinate. */
- public int calcX(Geometry geometry)
- {
- return calcX(geometry, row, column);
- }
-
- /** Calculates the cartesian y coordinate. */
- public int calcY(Geometry geometry)
- {
- return calcY(geometry, row, column);
- }
-
//
// Object
//
diff --git a/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/shared/basic/dto/PlateFeatureValues.java b/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/shared/dto/PlateFeatureValues.java
similarity index 85%
rename from screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/shared/basic/dto/PlateFeatureValues.java
rename to screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/shared/dto/PlateFeatureValues.java
index 090ee88c2964cf1161246875b7a9973ceb96bb35..8916463b73413f971e2288e8b827f9aacea63ec1 100644
--- a/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/shared/basic/dto/PlateFeatureValues.java
+++ b/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/shared/dto/PlateFeatureValues.java
@@ -14,18 +14,20 @@
* limitations under the License.
*/
-package ch.systemsx.cisd.openbis.plugin.screening.shared.basic.dto;
+package ch.systemsx.cisd.openbis.plugin.screening.shared.dto;
import ch.systemsx.cisd.base.convert.NativeTaggedArray;
import ch.systemsx.cisd.base.mdarray.MDFloatArray;
import ch.systemsx.cisd.openbis.plugin.screening.shared.api.v1.dto.Geometry;
+import ch.systemsx.cisd.openbis.plugin.screening.shared.basic.dto.WellLocation;
/**
* A class for providing the values of one feature for screening plate. It uses a two-dimensional
- * {@link MDFloatArray} in the back-end and provides access by row and column as well as by
- * 0-based cartesian coordinates.
+ * {@link MDFloatArray} in the back-end and provides access by row and column as well as by 0-based
+ * cartesian coordinates.
* <p>
* The row-column coordinates are obtained from the cartesian coordinates by:
+ *
* <pre>
* row = dimY - y
* col = x + 1
@@ -89,8 +91,8 @@ public final class PlateFeatureValues
*/
public void setForWellLocation(float value, int row, int col)
{
- valueArray.set(value, WellLocation.calcX(geometry, row, col), WellLocation.calcY(geometry,
- row, col));
+ valueArray.set(value, WellLocationUtils.calcX(geometry, row, col), WellLocationUtils.calcY(
+ geometry, row, col));
}
/**
@@ -99,8 +101,8 @@ public final class PlateFeatureValues
*/
public float getForWellLocation(int row, int col)
{
- return valueArray.get(WellLocation.calcX(geometry, row, col), WellLocation.calcY(geometry,
- row, col));
+ return valueArray.get(WellLocationUtils.calcX(geometry, row, col), WellLocationUtils.calcY(
+ geometry, row, col));
}
/**
@@ -109,7 +111,8 @@ public final class PlateFeatureValues
*/
public void setForWellLocation(float value, WellLocation wellLocation)
{
- valueArray.set(value, wellLocation.calcX(geometry), wellLocation.calcY(geometry));
+ valueArray.set(value, WellLocationUtils.calcX(geometry, wellLocation), WellLocationUtils
+ .calcY(geometry, wellLocation));
}
/**
@@ -118,7 +121,8 @@ public final class PlateFeatureValues
*/
public float getForWellLocation(WellLocation wellLocation)
{
- return valueArray.get(wellLocation.calcX(geometry), wellLocation.calcY(geometry));
+ return valueArray.get(WellLocationUtils.calcX(geometry, wellLocation), WellLocationUtils
+ .calcY(geometry, wellLocation));
}
/**
diff --git a/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/shared/dto/WellLocationUtils.java b/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/shared/dto/WellLocationUtils.java
new file mode 100644
index 0000000000000000000000000000000000000000..d74418b28b68eedcbd78495e3d413f18ecde6f0c
--- /dev/null
+++ b/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/shared/dto/WellLocationUtils.java
@@ -0,0 +1,84 @@
+/*
+ * Copyright 2010 ETH Zuerich, CISD
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package ch.systemsx.cisd.openbis.plugin.screening.shared.dto;
+
+import ch.systemsx.cisd.openbis.plugin.screening.shared.api.v1.dto.Geometry;
+import ch.systemsx.cisd.openbis.plugin.screening.shared.basic.dto.WellLocation;
+
+/**
+ * Utility class to convert well location to Cartesian coordinates.
+ *
+ * @author Tomasz Pylak
+ */
+public class WellLocationUtils
+{
+ /** Calculates the row from the given Cartesian coordinates. */
+ public static int calcRow(Geometry geometry, int x, int y)
+ {
+ assert geometry != null;
+ assert x >= 0 && x < geometry.getWidth() : x;
+ assert y >= 0 && y < geometry.getHeight() : y;
+
+ return geometry.getHeight() - y;
+ }
+
+ /** Calculates the column from the given Cartesian coordinates. */
+ public static int calcColumn(Geometry geometry, int x, int y)
+ {
+ assert geometry != null;
+ assert x >= 0 && x < geometry.getWidth() : "X is " + x + " (allowed: (0,"
+ + (geometry.getWidth() - 1) + ")";
+ assert y >= 0 && y < geometry.getHeight() : "Y is " + y + " (allowed: (0,"
+ + (geometry.getHeight() - 1) + ")";
+
+ return x + 1;
+ }
+
+ /** Calculates the Cartesian x coordinate. */
+ public static int calcX(Geometry geometry, int row, int col)
+ {
+ assert geometry != null;
+ assert row > 0 && row <= geometry.getHeight() : "Row is " + row + " (allowed: (1,"
+ + geometry.getHeight() + ")";
+ assert col > 0 && col <= geometry.getWidth() : "Col is " + col + " (allowed: (1,"
+ + geometry.getWidth() + ")";
+
+ return col - 1;
+ }
+
+ /** Calculates the Cartesian x coordinate. */
+ public static int calcX(Geometry geometry, WellLocation wellLocation)
+ {
+ return calcX(geometry, wellLocation.getRow(), wellLocation.getColumn());
+ }
+
+ /** Calculates the Cartesian y coordinate. */
+ public static int calcY(Geometry geometry, WellLocation wellLocation)
+ {
+ return calcY(geometry, wellLocation.getRow(), wellLocation.getColumn());
+ }
+
+ /** Calculates the Cartesian y coordinate. */
+ public static int calcY(Geometry geometry, int row, int col)
+ {
+ assert geometry != null;
+ assert row > 0 && row <= geometry.getHeight() : row;
+ assert col > 0 && col <= geometry.getWidth() : col;
+
+ return geometry.getHeight() - row;
+ }
+}
diff --git a/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/shared/imaging/dataaccess/ImgFeatureValuesDTO.java b/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/shared/imaging/dataaccess/ImgFeatureValuesDTO.java
index e7a016759ffce26b4cf0daf4bcf7a3d77e84af1a..a3c0800ab503e1ce4ceaeaf4f4d91976774f3737 100644
--- a/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/shared/imaging/dataaccess/ImgFeatureValuesDTO.java
+++ b/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/shared/imaging/dataaccess/ImgFeatureValuesDTO.java
@@ -20,7 +20,7 @@ import net.lemnik.eodsql.AutoGeneratedKeys;
import net.lemnik.eodsql.ResultColumn;
import ch.systemsx.cisd.common.utilities.AbstractHashable;
-import ch.systemsx.cisd.openbis.plugin.screening.shared.basic.dto.PlateFeatureValues;
+import ch.systemsx.cisd.openbis.plugin.screening.shared.dto.PlateFeatureValues;
/**
* Corresponds to a row in the FEATURE_VALUES table.
diff --git a/screening/sourceTest/java/ch/systemsx/cisd/openbis/dss/etl/featurevector/CsvToCanonicalFeatureVectorTest.java b/screening/sourceTest/java/ch/systemsx/cisd/openbis/dss/etl/featurevector/CsvToCanonicalFeatureVectorTest.java
index 625bcffd56351363355ecb5d9d0db76013489baa..9b1201514e1a2b901b0d279540ecdf39921d0a78 100644
--- a/screening/sourceTest/java/ch/systemsx/cisd/openbis/dss/etl/featurevector/CsvToCanonicalFeatureVectorTest.java
+++ b/screening/sourceTest/java/ch/systemsx/cisd/openbis/dss/etl/featurevector/CsvToCanonicalFeatureVectorTest.java
@@ -32,7 +32,7 @@ import ch.systemsx.cisd.common.exceptions.UserFailureException;
import ch.systemsx.cisd.openbis.dss.etl.featurevector.CsvToCanonicalFeatureVector.CsvToCanonicalFeatureVectorConfiguration;
import ch.systemsx.cisd.openbis.dss.generic.server.plugins.tasks.DatasetFileLines;
import ch.systemsx.cisd.openbis.plugin.screening.shared.api.v1.dto.Geometry;
-import ch.systemsx.cisd.openbis.plugin.screening.shared.basic.dto.PlateFeatureValues;
+import ch.systemsx.cisd.openbis.plugin.screening.shared.dto.PlateFeatureValues;
import ch.systemsx.cisd.openbis.plugin.screening.shared.imaging.dataaccess.ImgFeatureDefDTO;
import ch.systemsx.cisd.openbis.plugin.screening.shared.imaging.dataaccess.ImgFeatureValuesDTO;
diff --git a/screening/sourceTest/java/ch/systemsx/cisd/openbis/dss/etl/featurevector/FeatureVectorUploaderTest.java b/screening/sourceTest/java/ch/systemsx/cisd/openbis/dss/etl/featurevector/FeatureVectorUploaderTest.java
index 4d5396cc3502462f40177bf9dd195a2861cb36e0..73f3d3e02684f78304cd0a57f6bab59a35faf317 100644
--- a/screening/sourceTest/java/ch/systemsx/cisd/openbis/dss/etl/featurevector/FeatureVectorUploaderTest.java
+++ b/screening/sourceTest/java/ch/systemsx/cisd/openbis/dss/etl/featurevector/FeatureVectorUploaderTest.java
@@ -28,7 +28,7 @@ import org.testng.annotations.Test;
import ch.systemsx.cisd.openbis.dss.etl.ScreeningContainerDatasetInfo;
import ch.systemsx.cisd.openbis.plugin.screening.shared.api.v1.dto.Geometry;
-import ch.systemsx.cisd.openbis.plugin.screening.shared.basic.dto.PlateFeatureValues;
+import ch.systemsx.cisd.openbis.plugin.screening.shared.dto.PlateFeatureValues;
import ch.systemsx.cisd.openbis.plugin.screening.shared.imaging.dataaccess.AbstractDBTest;
import ch.systemsx.cisd.openbis.plugin.screening.shared.imaging.dataaccess.DBUtils;
import ch.systemsx.cisd.openbis.plugin.screening.shared.imaging.dataaccess.IImagingQueryDAO;
diff --git a/screening/sourceTest/java/ch/systemsx/cisd/openbis/dss/etl/genedata/GenedataFormatToCanonicalFeatureVectorTest.java b/screening/sourceTest/java/ch/systemsx/cisd/openbis/dss/etl/genedata/GenedataFormatToCanonicalFeatureVectorTest.java
index 0a25dae856856c0b6fbbc00e69fb0273803d6913..17ff9db8c628b31e1e1d0d4801b5d4b34e87f92f 100644
--- a/screening/sourceTest/java/ch/systemsx/cisd/openbis/dss/etl/genedata/GenedataFormatToCanonicalFeatureVectorTest.java
+++ b/screening/sourceTest/java/ch/systemsx/cisd/openbis/dss/etl/genedata/GenedataFormatToCanonicalFeatureVectorTest.java
@@ -25,7 +25,7 @@ import org.testng.annotations.Test;
import ch.systemsx.cisd.base.tests.AbstractFileSystemTestCase;
import ch.systemsx.cisd.common.filesystem.FileUtilities;
import ch.systemsx.cisd.openbis.dss.etl.featurevector.CanonicalFeatureVector;
-import ch.systemsx.cisd.openbis.plugin.screening.shared.basic.dto.PlateFeatureValues;
+import ch.systemsx.cisd.openbis.plugin.screening.shared.dto.PlateFeatureValues;
import ch.systemsx.cisd.openbis.plugin.screening.shared.imaging.dataaccess.ImgFeatureDefDTO;
import ch.systemsx.cisd.openbis.plugin.screening.shared.imaging.dataaccess.ImgFeatureValuesDTO;
diff --git a/screening/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/ImageAnalysisMergedRowsReportingPluginTest.java b/screening/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/ImageAnalysisMergedRowsReportingPluginTest.java
index 02ef038b6a96c1ab50f3baa072dde898a06b175a..111f1106b3506bbded438a3eb175ae95523a00a5 100644
--- a/screening/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/ImageAnalysisMergedRowsReportingPluginTest.java
+++ b/screening/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/ImageAnalysisMergedRowsReportingPluginTest.java
@@ -37,7 +37,7 @@ import ch.systemsx.cisd.openbis.generic.shared.basic.dto.TableModelRow;
import ch.systemsx.cisd.openbis.generic.shared.dto.DatasetDescription;
import ch.systemsx.cisd.openbis.generic.shared.dto.identifier.SampleIdentifier;
import ch.systemsx.cisd.openbis.generic.shared.dto.identifier.SpaceIdentifier;
-import ch.systemsx.cisd.openbis.plugin.screening.shared.basic.dto.PlateFeatureValues;
+import ch.systemsx.cisd.openbis.plugin.screening.shared.dto.PlateFeatureValues;
import ch.systemsx.cisd.openbis.plugin.screening.shared.imaging.dataaccess.IImagingQueryDAO;
import ch.systemsx.cisd.openbis.plugin.screening.shared.imaging.dataaccess.ImgContainerDTO;
import ch.systemsx.cisd.openbis.plugin.screening.shared.imaging.dataaccess.ImgDatasetDTO;
diff --git a/screening/sourceTest/java/ch/systemsx/cisd/openbis/dss/screening/server/DssServiceRpcScreeningTest.java b/screening/sourceTest/java/ch/systemsx/cisd/openbis/dss/screening/server/DssServiceRpcScreeningTest.java
index 0df77df4c58d667f3f3c3d7e079fe474c9a67c32..6ef04417ef3b02b8b0eff94d723714883c945ab1 100644
--- a/screening/sourceTest/java/ch/systemsx/cisd/openbis/dss/screening/server/DssServiceRpcScreeningTest.java
+++ b/screening/sourceTest/java/ch/systemsx/cisd/openbis/dss/screening/server/DssServiceRpcScreeningTest.java
@@ -36,7 +36,7 @@ import ch.systemsx.cisd.openbis.plugin.screening.shared.api.v1.dto.FeatureVector
import ch.systemsx.cisd.openbis.plugin.screening.shared.api.v1.dto.FeatureVectorDataset;
import ch.systemsx.cisd.openbis.plugin.screening.shared.api.v1.dto.FeatureVectorDatasetReference;
import ch.systemsx.cisd.openbis.plugin.screening.shared.api.v1.dto.IFeatureVectorDatasetIdentifier;
-import ch.systemsx.cisd.openbis.plugin.screening.shared.basic.dto.PlateFeatureValues;
+import ch.systemsx.cisd.openbis.plugin.screening.shared.dto.PlateFeatureValues;
import ch.systemsx.cisd.openbis.plugin.screening.shared.imaging.dataaccess.IImagingQueryDAO;
import ch.systemsx.cisd.openbis.plugin.screening.shared.imaging.dataaccess.ImgContainerDTO;
import ch.systemsx.cisd.openbis.plugin.screening.shared.imaging.dataaccess.ImgDatasetDTO;
diff --git a/screening/sourceTest/java/ch/systemsx/cisd/openbis/plugin/screening/shared/basic/dto/PlateFeatureValuesTest.java b/screening/sourceTest/java/ch/systemsx/cisd/openbis/plugin/screening/shared/basic/dto/PlateFeatureValuesTest.java
index a6c1e2d7ad46fcb3af2d8ad5391bf2dd07f0c18c..3fd5d6977bb8ed8034792032d245265559cb5eae 100644
--- a/screening/sourceTest/java/ch/systemsx/cisd/openbis/plugin/screening/shared/basic/dto/PlateFeatureValuesTest.java
+++ b/screening/sourceTest/java/ch/systemsx/cisd/openbis/plugin/screening/shared/basic/dto/PlateFeatureValuesTest.java
@@ -19,6 +19,7 @@ package ch.systemsx.cisd.openbis.plugin.screening.shared.basic.dto;
import org.testng.annotations.Test;
import ch.systemsx.cisd.openbis.plugin.screening.shared.api.v1.dto.Geometry;
+import ch.systemsx.cisd.openbis.plugin.screening.shared.dto.PlateFeatureValues;
import static org.testng.AssertJUnit.*;
diff --git a/screening/sourceTest/java/ch/systemsx/cisd/openbis/plugin/screening/shared/imaging/dataaccess/FeatureVectorDAOTest.java b/screening/sourceTest/java/ch/systemsx/cisd/openbis/plugin/screening/shared/imaging/dataaccess/FeatureVectorDAOTest.java
index 7bbe086e7572ad26d70821bd58ebf317538a4a90..1fa1c670033e042fbbca20dd2bdae7cdda01aa0a 100644
--- a/screening/sourceTest/java/ch/systemsx/cisd/openbis/plugin/screening/shared/imaging/dataaccess/FeatureVectorDAOTest.java
+++ b/screening/sourceTest/java/ch/systemsx/cisd/openbis/plugin/screening/shared/imaging/dataaccess/FeatureVectorDAOTest.java
@@ -25,7 +25,7 @@ import org.testng.annotations.BeforeClass;
import org.testng.annotations.Test;
import ch.systemsx.cisd.openbis.plugin.screening.shared.api.v1.dto.Geometry;
-import ch.systemsx.cisd.openbis.plugin.screening.shared.basic.dto.PlateFeatureValues;
+import ch.systemsx.cisd.openbis.plugin.screening.shared.dto.PlateFeatureValues;
import ch.systemsx.cisd.openbis.plugin.screening.shared.imaging.dataaccess.IImagingQueryDAO;
import ch.systemsx.cisd.openbis.plugin.screening.shared.imaging.dataaccess.ImgContainerDTO;
import ch.systemsx.cisd.openbis.plugin.screening.shared.imaging.dataaccess.ImgDatasetDTO;