From 1f5baec14d4ddaca8f93c10e4feb0284819d5bff Mon Sep 17 00:00:00 2001
From: felmer <felmer>
Date: Thu, 28 Apr 2011 06:58:18 +0000
Subject: [PATCH] LMS-2215 classes moved from screening to datastore_server
SVN: 21069
---
.../generic/server/AbstractTabularDataGraphServlet.java | 0
.../dss/generic/server/FileTabularDataGraphServlet.java | 2 +-
.../dss/generic/server/graph/AbstractTabularDataGraph.java | 0
.../openbis/dss/generic/server/graph/HeatmapDataset.java | 0
.../dss/generic/server/graph/ITabularDataGraph.java | 0
.../generic/server/graph/SpreadsheetColumnTickUnit.java | 4 ++--
.../graph/TabularDataGraphCollectionConfiguration.java | 7 +++----
.../server/graph/TabularDataGraphConfiguration.java | 0
.../dss/generic/server/graph/TabularDataHeatmap.java | 0
.../server/graph/TabularDataHeatmapConfiguration.java | 0
.../dss/generic/server/graph/TabularDataHistogram.java | 0
.../server/graph/TabularDataHistogramConfiguration.java | 0
.../dss/generic/server/graph/TabularDataScatterplot.java | 0
.../server/graph/TabularDataScatterplotConfiguration.java | 0
.../dss/generic/server/graph/TabularDataTickUnit.java | 0
.../generic/server/graph/TabularDataTickUnitSource.java | 0
.../FileBasedImageAnalysisGraphReportingPlugin.java | 0
.../dss/generic/shared}/utils/CsvFileReaderHelper.java | 2 +-
.../dss/etl/featurevector/CsvFeatureVectorMigrator.java | 2 +-
.../dss/etl/featurevector/CsvFeatureVectorParser.java | 2 +-
.../FeatureVectorStorageProcessorConfiguration.java | 2 +-
21 files changed, 10 insertions(+), 11 deletions(-)
rename {screening => datastore_server}/source/java/ch/systemsx/cisd/openbis/dss/generic/server/AbstractTabularDataGraphServlet.java (100%)
rename {screening => datastore_server}/source/java/ch/systemsx/cisd/openbis/dss/generic/server/FileTabularDataGraphServlet.java (95%)
rename {screening => datastore_server}/source/java/ch/systemsx/cisd/openbis/dss/generic/server/graph/AbstractTabularDataGraph.java (100%)
rename {screening => datastore_server}/source/java/ch/systemsx/cisd/openbis/dss/generic/server/graph/HeatmapDataset.java (100%)
rename {screening => datastore_server}/source/java/ch/systemsx/cisd/openbis/dss/generic/server/graph/ITabularDataGraph.java (100%)
rename {screening => datastore_server}/source/java/ch/systemsx/cisd/openbis/dss/generic/server/graph/SpreadsheetColumnTickUnit.java (92%)
rename {screening => datastore_server}/source/java/ch/systemsx/cisd/openbis/dss/generic/server/graph/TabularDataGraphCollectionConfiguration.java (97%)
rename {screening => datastore_server}/source/java/ch/systemsx/cisd/openbis/dss/generic/server/graph/TabularDataGraphConfiguration.java (100%)
rename {screening => datastore_server}/source/java/ch/systemsx/cisd/openbis/dss/generic/server/graph/TabularDataHeatmap.java (100%)
rename {screening => datastore_server}/source/java/ch/systemsx/cisd/openbis/dss/generic/server/graph/TabularDataHeatmapConfiguration.java (100%)
rename {screening => datastore_server}/source/java/ch/systemsx/cisd/openbis/dss/generic/server/graph/TabularDataHistogram.java (100%)
rename {screening => datastore_server}/source/java/ch/systemsx/cisd/openbis/dss/generic/server/graph/TabularDataHistogramConfiguration.java (100%)
rename {screening => datastore_server}/source/java/ch/systemsx/cisd/openbis/dss/generic/server/graph/TabularDataScatterplot.java (100%)
rename {screening => datastore_server}/source/java/ch/systemsx/cisd/openbis/dss/generic/server/graph/TabularDataScatterplotConfiguration.java (100%)
rename {screening => datastore_server}/source/java/ch/systemsx/cisd/openbis/dss/generic/server/graph/TabularDataTickUnit.java (100%)
rename {screening => datastore_server}/source/java/ch/systemsx/cisd/openbis/dss/generic/server/graph/TabularDataTickUnitSource.java (100%)
rename {screening => datastore_server}/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/FileBasedImageAnalysisGraphReportingPlugin.java (100%)
rename {screening/source/java/ch/systemsx/cisd => datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/shared}/utils/CsvFileReaderHelper.java (98%)
diff --git a/screening/source/java/ch/systemsx/cisd/openbis/dss/generic/server/AbstractTabularDataGraphServlet.java b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/AbstractTabularDataGraphServlet.java
similarity index 100%
rename from screening/source/java/ch/systemsx/cisd/openbis/dss/generic/server/AbstractTabularDataGraphServlet.java
rename to datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/AbstractTabularDataGraphServlet.java
diff --git a/screening/source/java/ch/systemsx/cisd/openbis/dss/generic/server/FileTabularDataGraphServlet.java b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/FileTabularDataGraphServlet.java
similarity index 95%
rename from screening/source/java/ch/systemsx/cisd/openbis/dss/generic/server/FileTabularDataGraphServlet.java
rename to datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/FileTabularDataGraphServlet.java
index df7ed6ce97e..ef67dc98f60 100644
--- a/screening/source/java/ch/systemsx/cisd/openbis/dss/generic/server/FileTabularDataGraphServlet.java
+++ b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/FileTabularDataGraphServlet.java
@@ -21,7 +21,7 @@ import java.io.IOException;
import ch.systemsx.cisd.common.exceptions.UserFailureException;
import ch.systemsx.cisd.openbis.dss.generic.server.plugins.tasks.ITabularData;
-import ch.systemsx.cisd.utils.CsvFileReaderHelper;
+import ch.systemsx.cisd.openbis.dss.generic.shared.utils.CsvFileReaderHelper;
/**
* @author Chandrasekhar Ramakrishnan
diff --git a/screening/source/java/ch/systemsx/cisd/openbis/dss/generic/server/graph/AbstractTabularDataGraph.java b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/graph/AbstractTabularDataGraph.java
similarity index 100%
rename from screening/source/java/ch/systemsx/cisd/openbis/dss/generic/server/graph/AbstractTabularDataGraph.java
rename to datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/graph/AbstractTabularDataGraph.java
diff --git a/screening/source/java/ch/systemsx/cisd/openbis/dss/generic/server/graph/HeatmapDataset.java b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/graph/HeatmapDataset.java
similarity index 100%
rename from screening/source/java/ch/systemsx/cisd/openbis/dss/generic/server/graph/HeatmapDataset.java
rename to datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/graph/HeatmapDataset.java
diff --git a/screening/source/java/ch/systemsx/cisd/openbis/dss/generic/server/graph/ITabularDataGraph.java b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/graph/ITabularDataGraph.java
similarity index 100%
rename from screening/source/java/ch/systemsx/cisd/openbis/dss/generic/server/graph/ITabularDataGraph.java
rename to datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/graph/ITabularDataGraph.java
diff --git a/screening/source/java/ch/systemsx/cisd/openbis/dss/generic/server/graph/SpreadsheetColumnTickUnit.java b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/graph/SpreadsheetColumnTickUnit.java
similarity index 92%
rename from screening/source/java/ch/systemsx/cisd/openbis/dss/generic/server/graph/SpreadsheetColumnTickUnit.java
rename to datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/graph/SpreadsheetColumnTickUnit.java
index b5c0e8682de..2e36820d5da 100644
--- a/screening/source/java/ch/systemsx/cisd/openbis/dss/generic/server/graph/SpreadsheetColumnTickUnit.java
+++ b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/graph/SpreadsheetColumnTickUnit.java
@@ -18,7 +18,7 @@ package ch.systemsx.cisd.openbis.dss.generic.server.graph;
import org.jfree.chart.axis.NumberTickUnit;
-import ch.systemsx.cisd.openbis.plugin.screening.shared.basic.PlateUtils;
+import ch.systemsx.cisd.common.geometry.ConversionUtils;
/**
* @author Chandrasekhar Ramakrishnan
@@ -62,6 +62,6 @@ public class SpreadsheetColumnTickUnit extends NumberTickUnit
{
return "";
}
- return PlateUtils.translateRowNumberIntoLetterCode((int) value);
+ return ConversionUtils.translateRowNumberIntoLetterCode((int) value);
}
}
diff --git a/screening/source/java/ch/systemsx/cisd/openbis/dss/generic/server/graph/TabularDataGraphCollectionConfiguration.java b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/graph/TabularDataGraphCollectionConfiguration.java
similarity index 97%
rename from screening/source/java/ch/systemsx/cisd/openbis/dss/generic/server/graph/TabularDataGraphCollectionConfiguration.java
rename to datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/graph/TabularDataGraphCollectionConfiguration.java
index 572eb11bb7e..9e6ba0f63d3 100644
--- a/screening/source/java/ch/systemsx/cisd/openbis/dss/generic/server/graph/TabularDataGraphCollectionConfiguration.java
+++ b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/graph/TabularDataGraphCollectionConfiguration.java
@@ -30,12 +30,11 @@ import ch.systemsx.cisd.common.exceptions.EnvironmentFailureException;
import ch.systemsx.cisd.common.utilities.PropertyParametersUtil;
import ch.systemsx.cisd.common.utilities.PropertyParametersUtil.SectionProperties;
import ch.systemsx.cisd.common.utilities.PropertyUtils;
-import ch.systemsx.cisd.openbis.dss.generic.server.TabularDataGraphServlet;
import ch.systemsx.cisd.openbis.dss.generic.server.graph.TabularDataGraphConfiguration.GraphType;
import ch.systemsx.cisd.openbis.dss.generic.server.plugins.tasks.ITabularData;
import ch.systemsx.cisd.openbis.dss.generic.shared.utils.CodeAndLabelUtil;
+import ch.systemsx.cisd.openbis.dss.generic.shared.utils.CsvFileReaderHelper.ICsvFileReaderConfiguration;
import ch.systemsx.cisd.openbis.generic.shared.basic.dto.CodeAndLabel;
-import ch.systemsx.cisd.utils.CsvFileReaderHelper.ICsvFileReaderConfiguration;
/**
* @author Chandrasekhar Ramakrishnan
@@ -183,10 +182,10 @@ public class TabularDataGraphCollectionConfiguration implements ICsvFileReaderCo
// specified.
CodeAndLabel xAxis =
getCodeAndLabelWithDefault(props, X_AXIS_KEY,
- TabularDataGraphServlet.WELL_ROW_COLUMN);
+ "Row");
CodeAndLabel yAxis =
getCodeAndLabelWithDefault(props, Y_AXIS_KEY,
- TabularDataGraphServlet.WELL_COLUMN_COLUMN);
+ "Column");
CodeAndLabel zAxis = getCodeAndLabel(props, COLUMN_KEY);
if (xAxis.equals(yAxis))
{
diff --git a/screening/source/java/ch/systemsx/cisd/openbis/dss/generic/server/graph/TabularDataGraphConfiguration.java b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/graph/TabularDataGraphConfiguration.java
similarity index 100%
rename from screening/source/java/ch/systemsx/cisd/openbis/dss/generic/server/graph/TabularDataGraphConfiguration.java
rename to datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/graph/TabularDataGraphConfiguration.java
diff --git a/screening/source/java/ch/systemsx/cisd/openbis/dss/generic/server/graph/TabularDataHeatmap.java b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/graph/TabularDataHeatmap.java
similarity index 100%
rename from screening/source/java/ch/systemsx/cisd/openbis/dss/generic/server/graph/TabularDataHeatmap.java
rename to datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/graph/TabularDataHeatmap.java
diff --git a/screening/source/java/ch/systemsx/cisd/openbis/dss/generic/server/graph/TabularDataHeatmapConfiguration.java b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/graph/TabularDataHeatmapConfiguration.java
similarity index 100%
rename from screening/source/java/ch/systemsx/cisd/openbis/dss/generic/server/graph/TabularDataHeatmapConfiguration.java
rename to datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/graph/TabularDataHeatmapConfiguration.java
diff --git a/screening/source/java/ch/systemsx/cisd/openbis/dss/generic/server/graph/TabularDataHistogram.java b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/graph/TabularDataHistogram.java
similarity index 100%
rename from screening/source/java/ch/systemsx/cisd/openbis/dss/generic/server/graph/TabularDataHistogram.java
rename to datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/graph/TabularDataHistogram.java
diff --git a/screening/source/java/ch/systemsx/cisd/openbis/dss/generic/server/graph/TabularDataHistogramConfiguration.java b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/graph/TabularDataHistogramConfiguration.java
similarity index 100%
rename from screening/source/java/ch/systemsx/cisd/openbis/dss/generic/server/graph/TabularDataHistogramConfiguration.java
rename to datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/graph/TabularDataHistogramConfiguration.java
diff --git a/screening/source/java/ch/systemsx/cisd/openbis/dss/generic/server/graph/TabularDataScatterplot.java b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/graph/TabularDataScatterplot.java
similarity index 100%
rename from screening/source/java/ch/systemsx/cisd/openbis/dss/generic/server/graph/TabularDataScatterplot.java
rename to datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/graph/TabularDataScatterplot.java
diff --git a/screening/source/java/ch/systemsx/cisd/openbis/dss/generic/server/graph/TabularDataScatterplotConfiguration.java b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/graph/TabularDataScatterplotConfiguration.java
similarity index 100%
rename from screening/source/java/ch/systemsx/cisd/openbis/dss/generic/server/graph/TabularDataScatterplotConfiguration.java
rename to datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/graph/TabularDataScatterplotConfiguration.java
diff --git a/screening/source/java/ch/systemsx/cisd/openbis/dss/generic/server/graph/TabularDataTickUnit.java b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/graph/TabularDataTickUnit.java
similarity index 100%
rename from screening/source/java/ch/systemsx/cisd/openbis/dss/generic/server/graph/TabularDataTickUnit.java
rename to datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/graph/TabularDataTickUnit.java
diff --git a/screening/source/java/ch/systemsx/cisd/openbis/dss/generic/server/graph/TabularDataTickUnitSource.java b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/graph/TabularDataTickUnitSource.java
similarity index 100%
rename from screening/source/java/ch/systemsx/cisd/openbis/dss/generic/server/graph/TabularDataTickUnitSource.java
rename to datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/graph/TabularDataTickUnitSource.java
diff --git a/screening/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/FileBasedImageAnalysisGraphReportingPlugin.java b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/FileBasedImageAnalysisGraphReportingPlugin.java
similarity index 100%
rename from screening/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/FileBasedImageAnalysisGraphReportingPlugin.java
rename to datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/FileBasedImageAnalysisGraphReportingPlugin.java
diff --git a/screening/source/java/ch/systemsx/cisd/utils/CsvFileReaderHelper.java b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/utils/CsvFileReaderHelper.java
similarity index 98%
rename from screening/source/java/ch/systemsx/cisd/utils/CsvFileReaderHelper.java
rename to datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/utils/CsvFileReaderHelper.java
index 2a752f299c1..22f3454155a 100644
--- a/screening/source/java/ch/systemsx/cisd/utils/CsvFileReaderHelper.java
+++ b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/utils/CsvFileReaderHelper.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package ch.systemsx.cisd.utils;
+package ch.systemsx.cisd.openbis.dss.generic.shared.utils;
import java.io.File;
import java.io.FileInputStream;
diff --git a/screening/source/java/ch/systemsx/cisd/openbis/dss/etl/featurevector/CsvFeatureVectorMigrator.java b/screening/source/java/ch/systemsx/cisd/openbis/dss/etl/featurevector/CsvFeatureVectorMigrator.java
index 94b201d5aff..daa7fa233ab 100644
--- a/screening/source/java/ch/systemsx/cisd/openbis/dss/etl/featurevector/CsvFeatureVectorMigrator.java
+++ b/screening/source/java/ch/systemsx/cisd/openbis/dss/etl/featurevector/CsvFeatureVectorMigrator.java
@@ -28,8 +28,8 @@ import ch.systemsx.cisd.openbis.dss.etl.HCSContainerDatasetInfo;
import ch.systemsx.cisd.openbis.dss.etl.dataaccess.IImagingQueryDAO;
import ch.systemsx.cisd.openbis.dss.etl.featurevector.CsvFeatureVectorParser.CsvFeatureVectorParserConfiguration;
import ch.systemsx.cisd.openbis.dss.generic.server.plugins.tasks.DatasetFileLines;
+import ch.systemsx.cisd.openbis.dss.generic.shared.utils.CsvFileReaderHelper;
import ch.systemsx.cisd.openbis.generic.shared.dto.SimpleDataSetInformationDTO;
-import ch.systemsx.cisd.utils.CsvFileReaderHelper;
/**
* @author Chandrasekhar Ramakrishnan
diff --git a/screening/source/java/ch/systemsx/cisd/openbis/dss/etl/featurevector/CsvFeatureVectorParser.java b/screening/source/java/ch/systemsx/cisd/openbis/dss/etl/featurevector/CsvFeatureVectorParser.java
index 44611286369..976e31e6473 100644
--- a/screening/source/java/ch/systemsx/cisd/openbis/dss/etl/featurevector/CsvFeatureVectorParser.java
+++ b/screening/source/java/ch/systemsx/cisd/openbis/dss/etl/featurevector/CsvFeatureVectorParser.java
@@ -29,10 +29,10 @@ import ch.systemsx.cisd.common.utilities.Counters;
import ch.systemsx.cisd.openbis.dss.etl.dto.api.impl.FeatureDefinition;
import ch.systemsx.cisd.openbis.dss.generic.server.plugins.tasks.DatasetFileLines;
import ch.systemsx.cisd.openbis.dss.generic.shared.utils.CodeAndLabelUtil;
+import ch.systemsx.cisd.openbis.dss.generic.shared.utils.CsvFileReaderHelper;
import ch.systemsx.cisd.openbis.generic.shared.basic.dto.CodeAndLabel;
import ch.systemsx.cisd.openbis.plugin.screening.shared.basic.dto.WellLocation;
import ch.systemsx.cisd.openbis.plugin.screening.shared.imaging.dataaccess.ImgFeatureDefDTO;
-import ch.systemsx.cisd.utils.CsvFileReaderHelper;
/**
* Converts feature vectors from CSV files to {@link FeatureDefinition} objects.
diff --git a/screening/source/java/ch/systemsx/cisd/openbis/dss/etl/featurevector/FeatureVectorStorageProcessorConfiguration.java b/screening/source/java/ch/systemsx/cisd/openbis/dss/etl/featurevector/FeatureVectorStorageProcessorConfiguration.java
index 19e5942378e..e1a2ed592a0 100644
--- a/screening/source/java/ch/systemsx/cisd/openbis/dss/etl/featurevector/FeatureVectorStorageProcessorConfiguration.java
+++ b/screening/source/java/ch/systemsx/cisd/openbis/dss/etl/featurevector/FeatureVectorStorageProcessorConfiguration.java
@@ -23,7 +23,7 @@ import java.util.Set;
import ch.rinn.restrictions.Private;
import ch.systemsx.cisd.common.utilities.PropertyUtils;
-import ch.systemsx.cisd.utils.CsvFileReaderHelper.ICsvFileReaderConfiguration;
+import ch.systemsx.cisd.openbis.dss.generic.shared.utils.CsvFileReaderHelper.ICsvFileReaderConfiguration;
class FeatureVectorStorageProcessorConfiguration implements
ICsvFileReaderConfiguration
--
GitLab