diff --git a/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/client/web/client/application/detailviewers/MaterialFeaturesFromAllExperimentsGrid.java b/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/client/web/client/application/detailviewers/MaterialFeaturesFromAllExperimentsGrid.java
index fd7ef66cb06f2b4e82c338f19e6dceaac8929f52..b133d5606207e85c3f4af8b2a5b0b6526a8d5600 100644
--- a/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/client/web/client/application/detailviewers/MaterialFeaturesFromAllExperimentsGrid.java
+++ b/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/client/web/client/application/detailviewers/MaterialFeaturesFromAllExperimentsGrid.java
@@ -38,8 +38,8 @@ import ch.systemsx.cisd.openbis.plugin.screening.client.web.client.application.D
import ch.systemsx.cisd.openbis.plugin.screening.client.web.client.application.ui.columns.specific.ScreeningLinkExtractor;
import ch.systemsx.cisd.openbis.plugin.screening.shared.basic.dto.ExperimentReference;
import ch.systemsx.cisd.openbis.plugin.screening.shared.basic.dto.MaterialSimpleFeatureVectorSummary;
-import ch.systemsx.cisd.openbis.plugin.screening.shared.basic.dto.WellSearchCriteria.ExperimentSearchCriteria;
import ch.systemsx.cisd.openbis.plugin.screening.shared.basic.dto.WellSearchCriteria.ExperimentSearchByProjectCriteria;
+import ch.systemsx.cisd.openbis.plugin.screening.shared.basic.dto.WellSearchCriteria.ExperimentSearchCriteria;
import ch.systemsx.cisd.openbis.plugin.screening.shared.basic.dto.grids.MaterialFeatureVectorsFromAllExperimentsGridColumnIDs;
/**
@@ -113,7 +113,7 @@ public class MaterialFeaturesFromAllExperimentsGrid extends
private void linkMaterialInExperiment()
{
registerListenerAndLinkGenerator(
- MaterialFeatureVectorsFromAllExperimentsGridColumnIDs.MATERIAL,
+ MaterialFeatureVectorsFromAllExperimentsGridColumnIDs.EXPERIMENT,
new ICellListenerAndLinkGenerator<MaterialSimpleFeatureVectorSummary>()
{
public void handle(
diff --git a/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/client/web/public/screening-dictionary.js b/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/client/web/public/screening-dictionary.js
index c746af97361af0ebe5b89784ef2f10e1216291d3..cddd80974b62bcec5d44ce68f1edb79d91f09853 100644
--- a/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/client/web/public/screening-dictionary.js
+++ b/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/client/web/public/screening-dictionary.js
@@ -96,7 +96,6 @@ material_replica_feature_summary_MEDIAN: "Median",
material_replica_feature_summary_DEVIATION: "Deviation",
material_features_from_all_experiments_ASSAY: "Experiment",
-material_features_from_all_experiments_MATERIAL: "Details",
MATERIAL_FEATURES_FROM_ALL_EXPERIMENTS_SECTION: "All Experiments",
EXACT_MATCH_ONLY: "Exact Matches Only",
diff --git a/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/client/web/server/MaterialFeatureVectorsFromAllExperimentsProvider.java b/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/client/web/server/MaterialFeatureVectorsFromAllExperimentsProvider.java
deleted file mode 100644
index 5a78079aa1c35c1b46c98b40af6fdc61681cdab9..0000000000000000000000000000000000000000
--- a/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/client/web/server/MaterialFeatureVectorsFromAllExperimentsProvider.java
+++ /dev/null
@@ -1,113 +0,0 @@
-/*
- * Copyright 2011 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.client.web.server;
-
-import static ch.systemsx.cisd.openbis.plugin.screening.shared.basic.dto.grids.MaterialFeatureVectorsFromAllExperimentsGridColumnIDs.EXPERIMENT;
-
-import java.util.List;
-
-import ch.systemsx.cisd.openbis.generic.client.web.server.resultset.AbstractTableModelProvider;
-import ch.systemsx.cisd.openbis.generic.shared.basic.TechId;
-import ch.systemsx.cisd.openbis.generic.shared.basic.dto.CodeAndLabel;
-import ch.systemsx.cisd.openbis.generic.shared.basic.dto.EntityKind;
-import ch.systemsx.cisd.openbis.generic.shared.basic.dto.EntityTableCell;
-import ch.systemsx.cisd.openbis.generic.shared.basic.dto.TypedTableModel;
-import ch.systemsx.cisd.openbis.generic.shared.util.IColumnGroup;
-import ch.systemsx.cisd.openbis.generic.shared.util.TypedTableModelBuilder;
-import ch.systemsx.cisd.openbis.plugin.screening.shared.IScreeningServer;
-import ch.systemsx.cisd.openbis.plugin.screening.shared.basic.dto.ExperimentReference;
-import ch.systemsx.cisd.openbis.plugin.screening.shared.basic.dto.MaterialSimpleFeatureVectorSummary;
-import ch.systemsx.cisd.openbis.plugin.screening.shared.basic.dto.WellSearchCriteria.ExperimentSearchByProjectCriteria;
-
-/**
- * A provider for material replica feature summaries.
- *
- * @author Kaloyan Enimanev
- */
-class MaterialFeatureVectorsFromAllExperimentsProvider extends
- AbstractTableModelProvider<MaterialSimpleFeatureVectorSummary>
-{
- private final IScreeningServer server;
-
- private final String sessionToken;
-
- private final TechId materialId;
-
- private final ExperimentSearchByProjectCriteria experimentSearchCriteria;
-
- public MaterialFeatureVectorsFromAllExperimentsProvider(IScreeningServer server,
- String sessionToken, TechId materialId,
- ExperimentSearchByProjectCriteria experimentSearchCriteria)
- {
- this.server = server;
- this.sessionToken = sessionToken;
- this.materialId = materialId;
- this.experimentSearchCriteria = experimentSearchCriteria;
- }
-
- @Override
- public TypedTableModel<MaterialSimpleFeatureVectorSummary> createTableModel()
- {
- TypedTableModelBuilder<MaterialSimpleFeatureVectorSummary> builder =
- new TypedTableModelBuilder<MaterialSimpleFeatureVectorSummary>();
- List<MaterialSimpleFeatureVectorSummary> summaries =
- server.getMaterialFeatureVectorsFromAllExperiments(sessionToken, materialId,
- experimentSearchCriteria);
-
- builder.addColumn(EXPERIMENT);
- createFeatureColumns(builder, summaries);
- for (MaterialSimpleFeatureVectorSummary row : summaries)
- {
- addRow(builder, row);
- }
-
- return builder.getModel();
- }
-
- private void createFeatureColumns(
- TypedTableModelBuilder<MaterialSimpleFeatureVectorSummary> builder,
- List<MaterialSimpleFeatureVectorSummary> summaries)
- {
- IColumnGroup columnGroup = builder.columnGroup("FEATURES");
- for (MaterialSimpleFeatureVectorSummary summary : summaries)
- {
- for (CodeAndLabel codeAndLabel : summary.getFeatureDescriptions())
- {
- columnGroup.column(codeAndLabel.getCode()).withTitle(codeAndLabel.getLabel());
- }
- }
- }
-
- private void addRow(TypedTableModelBuilder<MaterialSimpleFeatureVectorSummary> builder,
- MaterialSimpleFeatureVectorSummary row)
- {
- builder.addRow(row);
- ExperimentReference exp = row.getExperiment();
- EntityTableCell experimentCell =
- new EntityTableCell(EntityKind.EXPERIMENT, exp.getPermId(), exp.getIdentifier());
- experimentCell.setLinkText(exp.getCode());
- builder.column(EXPERIMENT).withEntityKind(EntityKind.EXPERIMENT).addValue(experimentCell);
-
- float[] features = row.getFeatureVectorSummary();
- List<CodeAndLabel> descriptions = row.getFeatureDescriptions();
- for (int i = 0; i < features.length; i++)
- {
- CodeAndLabel description = descriptions.get(i);
- builder.column(description.getCode()).addDouble((double) features[i]);
- }
- }
-}
diff --git a/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/client/web/server/resultset/MaterialFeatureVectorsFromAllExperimentsProvider.java b/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/client/web/server/resultset/MaterialFeatureVectorsFromAllExperimentsProvider.java
index 4e0f7dc6b4b115ced2e8c2ffd64714fb03f14c95..c654ca051075a07b2535af6c116d2d29156c7c40 100644
--- a/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/client/web/server/resultset/MaterialFeatureVectorsFromAllExperimentsProvider.java
+++ b/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/client/web/server/resultset/MaterialFeatureVectorsFromAllExperimentsProvider.java
@@ -17,15 +17,12 @@
package ch.systemsx.cisd.openbis.plugin.screening.client.web.server.resultset;
import static ch.systemsx.cisd.openbis.plugin.screening.shared.basic.dto.grids.MaterialFeatureVectorsFromAllExperimentsGridColumnIDs.EXPERIMENT;
-import static ch.systemsx.cisd.openbis.plugin.screening.shared.basic.dto.grids.MaterialFeatureVectorsFromAllExperimentsGridColumnIDs.MATERIAL;
import java.util.List;
import ch.systemsx.cisd.openbis.generic.client.web.server.resultset.AbstractTableModelProvider;
import ch.systemsx.cisd.openbis.generic.shared.basic.TechId;
import ch.systemsx.cisd.openbis.generic.shared.basic.dto.CodeAndLabel;
-import ch.systemsx.cisd.openbis.generic.shared.basic.dto.EntityKind;
-import ch.systemsx.cisd.openbis.generic.shared.basic.dto.EntityTableCell;
import ch.systemsx.cisd.openbis.generic.shared.basic.dto.TypedTableModel;
import ch.systemsx.cisd.openbis.generic.shared.util.IColumnGroup;
import ch.systemsx.cisd.openbis.generic.shared.util.TypedTableModelBuilder;
@@ -69,7 +66,6 @@ public class MaterialFeatureVectorsFromAllExperimentsProvider extends
server.getMaterialFeatureVectorsFromAllExperiments(sessionToken, materialId,
experimentSearchCriteria);
- builder.addColumn(MATERIAL);
builder.addColumn(EXPERIMENT);
createFeatureColumns(builder, summaries);
@@ -100,12 +96,8 @@ public class MaterialFeatureVectorsFromAllExperimentsProvider extends
{
builder.addRow(row);
- ExperimentReference exp = row.getExperiment();
- EntityTableCell experimentCell =
- new EntityTableCell(EntityKind.EXPERIMENT, exp.getPermId(), exp.getIdentifier());
- experimentCell.setLinkText(exp.getCode());
- builder.column(MATERIAL).addString(ScreeningProviderMessages.SHOW_DETAILS_MSG);
- builder.column(EXPERIMENT).addString(exp.getCode());
+ ExperimentReference experiment = row.getExperiment();
+ builder.column(EXPERIMENT).addString(experiment.getCode());
float[] features = row.getFeatureVectorSummary();
List<CodeAndLabel> descriptions = row.getFeatureDescriptions();
diff --git a/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/shared/basic/dto/grids/MaterialFeatureVectorsFromAllExperimentsGridColumnIDs.java b/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/shared/basic/dto/grids/MaterialFeatureVectorsFromAllExperimentsGridColumnIDs.java
index 0cfa798c88d4eb12efdd0656230abfe7c25bfe11..86525f72d1eed06565edc08bc92e4eada9e5b8d8 100644
--- a/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/shared/basic/dto/grids/MaterialFeatureVectorsFromAllExperimentsGridColumnIDs.java
+++ b/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/shared/basic/dto/grids/MaterialFeatureVectorsFromAllExperimentsGridColumnIDs.java
@@ -21,8 +21,5 @@ package ch.systemsx.cisd.openbis.plugin.screening.shared.basic.dto.grids;
*/
public class MaterialFeatureVectorsFromAllExperimentsGridColumnIDs
{
-
public static final String EXPERIMENT = "ASSAY";
-
- public static final String MATERIAL = "MATERIAL";
}