From c9d28e89d561e7b32aa95935d6b21cbba4c6abf3 Mon Sep 17 00:00:00 2001
From: buczekp <buczekp>
Date: Wed, 6 Jul 2011 09:46:46 +0000
Subject: [PATCH] [LMS-2354] minor: reverted verbose heading in embedded mode
SVN: 22012
---
.../client/web/client/application/Dict.java | 3 ---
...terialFeaturesFromAllExperimentsComponent.java | 15 ++-------------
2 files changed, 2 insertions(+), 16 deletions(-)
diff --git a/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/client/web/client/application/Dict.java b/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/client/web/client/application/Dict.java
index b89ece68f91..808f61b9ef4 100644
--- a/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/client/web/client/application/Dict.java
+++ b/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/client/web/client/application/Dict.java
@@ -113,9 +113,6 @@ public final class Dict extends ch.systemsx.cisd.openbis.generic.client.web.clie
public static final String MATERIAL_IN_ALL_ASSAYS = "MATERIAL_IN_ALL_ASSAYS";
- public static final String MATERIAL_IN_ALL_ASSAYS_OF_PROJECT =
- "MATERIAL_IN_ALL_ASSAYS_OF_PROJECT";
-
private Dict()
{
// Can not be instantiated.
diff --git a/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/client/web/client/application/detailviewers/MaterialFeaturesFromAllExperimentsComponent.java b/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/client/web/client/application/detailviewers/MaterialFeaturesFromAllExperimentsComponent.java
index bda748f93aa..234c09ab83f 100644
--- a/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/client/web/client/application/detailviewers/MaterialFeaturesFromAllExperimentsComponent.java
+++ b/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/client/web/client/application/detailviewers/MaterialFeaturesFromAllExperimentsComponent.java
@@ -18,7 +18,6 @@ package ch.systemsx.cisd.openbis.plugin.screening.client.web.client.application.
import ch.systemsx.cisd.openbis.generic.client.web.client.application.IViewContext;
import ch.systemsx.cisd.openbis.generic.client.web.client.application.ui.grid.IDisposableComponent;
-import ch.systemsx.cisd.openbis.generic.shared.basic.dto.BasicProjectIdentifier;
import ch.systemsx.cisd.openbis.generic.shared.basic.dto.Material;
import ch.systemsx.cisd.openbis.plugin.screening.client.web.client.IScreeningClientServiceAsync;
import ch.systemsx.cisd.openbis.plugin.screening.client.web.client.application.Dict;
@@ -66,18 +65,8 @@ public class MaterialFeaturesFromAllExperimentsComponent
{
if (screeningViewContext.getModel().isEmbeddedMode())
{
- BasicProjectIdentifier projectIdentifierOrNull =
- experimentSearchCriteria.tryGetProjectIdentifier();
- if (projectIdentifierOrNull != null)
- {
- return screeningViewContext.getMessage(Dict.MATERIAL_IN_ALL_ASSAYS_OF_PROJECT,
- MaterialComponentUtils.getMaterialFullName(material, true),
- projectIdentifierOrNull);
- } else
- {
- return screeningViewContext.getMessage(Dict.MATERIAL_IN_ALL_ASSAYS,
- MaterialComponentUtils.getMaterialFullName(material, true));
- }
+ return screeningViewContext.getMessage(Dict.MATERIAL_IN_ALL_ASSAYS,
+ MaterialComponentUtils.getMaterialFullName(material, true));
} else
{
// header is not needed in SIMPLE & NORMAL view mode because there the context is clear
--
GitLab