From 4c00a82833b1d2eae39d4db3dcbeab107cdf1d22 Mon Sep 17 00:00:00 2001
From: felmer <felmer>
Date: Wed, 15 Dec 2010 12:34:22 +0000
Subject: [PATCH] LMS-1783 bug concerning display settings for different sample
types fixed
SVN: 19150
---
.../ui/sample/SampleBrowserGrid2.java | 24 +++++++++++++++++++
1 file changed, 24 insertions(+)
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/sample/SampleBrowserGrid2.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/sample/SampleBrowserGrid2.java
index 3f8767adc20..b7395404a7c 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/sample/SampleBrowserGrid2.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/sample/SampleBrowserGrid2.java
@@ -76,6 +76,7 @@ import ch.systemsx.cisd.openbis.generic.shared.basic.dto.BasicEntityType;
import ch.systemsx.cisd.openbis.generic.shared.basic.dto.DatabaseModificationKind;
import ch.systemsx.cisd.openbis.generic.shared.basic.dto.DatabaseModificationKind.ObjectKind;
import ch.systemsx.cisd.openbis.generic.shared.basic.dto.EntityKind;
+import ch.systemsx.cisd.openbis.generic.shared.basic.dto.EntityType;
import ch.systemsx.cisd.openbis.generic.shared.basic.dto.Experiment;
import ch.systemsx.cisd.openbis.generic.shared.basic.dto.ISerializableComparable;
import ch.systemsx.cisd.openbis.generic.shared.basic.dto.ListSampleCriteria;
@@ -331,6 +332,29 @@ public class SampleBrowserGrid2 extends TypedTableGrid<Sample>
linkContainer();
}
+ @Override
+ public String getGridDisplayTypeID()
+ {
+ ListSampleDisplayCriteria criteria = getCriteriaProvider().tryGetCriteria();
+ String suffix = createDisplayIdSuffix(EntityKind.SAMPLE, criteria == null ? null : criteria.tryGetSampleType());
+ return createGridDisplayTypeID(suffix);
+ }
+
+ private static String createDisplayIdSuffix(EntityKind entityKindOrNull,
+ EntityType entityTypeOrNull)
+ {
+ String suffix = "";
+ if (entityKindOrNull != null)
+ {
+ suffix += "-" + entityKindOrNull.toString();
+ }
+ if (entityTypeOrNull != null)
+ {
+ suffix += "-" + entityTypeOrNull.getCode();
+ }
+ return suffix;
+ }
+
private void linkSample()
{
ICellListenerAndLinkGenerator<Sample> listenerLinkGenerator =
--
GitLab