Commit 6fbaf444 authored 14 years ago by tpylak

LMS-1555 fix dependencies (allow openBIS to read feature vectors), deal with...

LMS-1555 fix dependencies (allow openBIS to read feature vectors), deal with the case where more than one DSS is present

SVN: 17892

parent 8e9a125a

No related merge requests found

Hide whitespace changes

Inline Side-by-side

Showing

datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/AbstractFileTableReportingPlugin.java 7 additions, 5 deletions

...er/plugins/standard/AbstractFileTableReportingPlugin.java
datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/tasks/DatasetFileLines.java 8 additions, 6 deletions

...is/dss/generic/server/plugins/tasks/DatasetFileLines.java
datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/utils/CodeAndLabelUtil.java 21 additions, 71 deletions

...sd/openbis/dss/generic/shared/utils/CodeAndLabelUtil.java
datastore_server/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/shared/utils/CodeAndLabelTest.java 10 additions, 9 deletions

...sd/openbis/dss/generic/shared/utils/CodeAndLabelTest.java
openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/CodeAndLabel.java 83 additions, 0 deletions

...ystemsx/cisd/openbis/generic/shared/dto/CodeAndLabel.java
screening/source/java/ch/systemsx/cisd/openbis/dss/etl/AbstractHCSImageFileExtractor.java 2 additions, 2 deletions

...x/cisd/openbis/dss/etl/AbstractHCSImageFileExtractor.java
screening/source/java/ch/systemsx/cisd/openbis/dss/etl/featurevector/CsvToCanonicalFeatureVector.java 3 additions, 2 deletions

...is/dss/etl/featurevector/CsvToCanonicalFeatureVector.java
screening/source/java/ch/systemsx/cisd/openbis/dss/etl/genedata/GenedataFormatToCanonicalFeatureVector.java 2 additions, 2 deletions

.../etl/genedata/GenedataFormatToCanonicalFeatureVector.java
screening/source/java/ch/systemsx/cisd/openbis/dss/generic/server/TabularDataGraphServlet.java 34 additions, 18 deletions

...d/openbis/dss/generic/server/TabularDataGraphServlet.java
screening/source/java/ch/systemsx/cisd/openbis/dss/generic/server/graph/AbstractTabularDataGraph.java 1 addition, 1 deletion

...is/dss/generic/server/graph/AbstractTabularDataGraph.java
screening/source/java/ch/systemsx/cisd/openbis/dss/generic/server/graph/TabularDataGraphCollectionConfiguration.java 12 additions, 11 deletions

...server/graph/TabularDataGraphCollectionConfiguration.java
screening/source/java/ch/systemsx/cisd/openbis/dss/generic/server/graph/TabularDataGraphConfiguration.java 1 addition, 1 deletion

...s/generic/server/graph/TabularDataGraphConfiguration.java
screening/source/java/ch/systemsx/cisd/openbis/dss/generic/server/graph/TabularDataHeatmapConfiguration.java 1 addition, 1 deletion

...generic/server/graph/TabularDataHeatmapConfiguration.java
screening/source/java/ch/systemsx/cisd/openbis/dss/generic/server/graph/TabularDataHistogramConfiguration.java 1 addition, 1 deletion

...neric/server/graph/TabularDataHistogramConfiguration.java
screening/source/java/ch/systemsx/cisd/openbis/dss/generic/server/graph/TabularDataScatterplotConfiguration.java 1 addition, 1 deletion

...ric/server/graph/TabularDataScatterplotConfiguration.java
screening/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/ImageAnalysisMergedRowsReportingPlugin.java 36 additions, 17 deletions

...erver/plugins/ImageAnalysisMergedRowsReportingPlugin.java
screening/source/java/ch/systemsx/cisd/openbis/dss/screening/server/DssServiceRpcScreening.java 23 additions, 9 deletions

.../openbis/dss/screening/server/DssServiceRpcScreening.java
screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/server/IScreeningBusinessObjectFactory.java 7 additions, 0 deletions

...gin/screening/server/IScreeningBusinessObjectFactory.java
screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/server/ScreeningBusinessObjectFactory.java 21 additions, 1 deletion

...ugin/screening/server/ScreeningBusinessObjectFactory.java
screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/server/logic/PlateMaterialLocationsLoader.java 54 additions, 9 deletions

.../screening/server/logic/PlateMaterialLocationsLoader.java

with 328 additions and 167 deletions

Please register or to comment