From c3ac7b1e07f99ed0c72cd73f169fdc4282e70ddf Mon Sep 17 00:00:00 2001
From: ribeaudc <ribeaudc>
Date: Tue, 18 Nov 2008 14:19:28 +0000
Subject: [PATCH] change: - 'generatedFrom' -> 'Parent X', 'partOf' ->
'Container X'.
SVN: 9009
---
.../generic/client/web/public/generic-dictionary.js | 4 ++--
.../application/sample/GenericSampleViewer.java | 9 ++-------
.../client/application/ScreeningSampleViewer.java | 12 +++---------
3 files changed, 7 insertions(+), 18 deletions(-)
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/public/generic-dictionary.js b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/public/generic-dictionary.js
index 38805d0f657..fd5d504c047 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/public/generic-dictionary.js
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/public/generic-dictionary.js
@@ -51,8 +51,8 @@ var generic = {
experiment: "Experiment",
experiment_identifier: "Experiment Identifier",
generated_samples: "Generated Samples",
- generated_from: "Parent (gener.) {0}",
- part_of: "Parent (cont.) {0}",
+ generated_from: "Parent {0}",
+ part_of: "Container {0}",
//
// Invalidation
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/sample/GenericSampleViewer.java b/openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/sample/GenericSampleViewer.java
index 44c78c38394..8553d739b7c 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/sample/GenericSampleViewer.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/sample/GenericSampleViewer.java
@@ -57,7 +57,6 @@ import ch.systemsx.cisd.openbis.generic.client.web.client.application.model.Mode
import ch.systemsx.cisd.openbis.generic.client.web.client.application.model.SampleModel;
import ch.systemsx.cisd.openbis.generic.client.web.client.application.ui.ColumnConfigFactory;
import ch.systemsx.cisd.openbis.generic.client.web.client.application.ui.PropertyValueRenderers;
-import ch.systemsx.cisd.openbis.generic.client.web.client.application.ui.property.ObjectArrayPropertyValueRenderer;
import ch.systemsx.cisd.openbis.generic.client.web.client.application.ui.property.PropertyGrid;
import ch.systemsx.cisd.openbis.generic.client.web.client.application.util.IMessageProvider;
import ch.systemsx.cisd.openbis.generic.client.web.client.dto.ExternalData;
@@ -280,7 +279,7 @@ public final class GenericSampleViewer extends LayoutContainer
Sample generatedFrom = sample.getGeneratedFrom();
for (int i = 0; i < sampleType.getGeneratedFromHierarchyDepth() && generatedFrom != null; i++)
{
- properties.put(generatedFrom.getSampleType().getDescription(), generatedFrom);
+ properties.put(messageProvider.getMessage("generated_from", i + 1), generatedFrom);
generatedFrom = generatedFrom.getGeneratedFrom();
}
for (final SampleProperty property : sample.getProperties())
@@ -311,12 +310,8 @@ public final class GenericSampleViewer extends LayoutContainer
.createPersonPropertyValueRenderer(messageProvider));
propertyGrid.registerPropertyValueRenderer(SampleType.class, PropertyValueRenderers
.createSampleTypePropertyValueRenderer(messageProvider));
- propertyGrid.registerPropertyValueRenderer(Sample[].class,
- new ObjectArrayPropertyValueRenderer<Sample>(messageProvider,
- PropertyValueRenderers.createSamplePropertyValueRenderer(messageProvider,
- true)));
propertyGrid.registerPropertyValueRenderer(Sample.class, PropertyValueRenderers
- .createSamplePropertyValueRenderer(messageProvider, false));
+ .createSamplePropertyValueRenderer(messageProvider, true));
propertyGrid.registerPropertyValueRenderer(Invalidation.class, PropertyValueRenderers
.createInvalidationPropertyValueRenderer(messageProvider));
propertyGrid.registerPropertyValueRenderer(SampleProperty.class, PropertyValueRenderers
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/plugin/screening/client/web/client/application/ScreeningSampleViewer.java b/openbis/source/java/ch/systemsx/cisd/openbis/plugin/screening/client/web/client/application/ScreeningSampleViewer.java
index 07b75ae4b4b..4347e9e32a6 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/plugin/screening/client/web/client/application/ScreeningSampleViewer.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/plugin/screening/client/web/client/application/ScreeningSampleViewer.java
@@ -29,7 +29,6 @@ import ch.systemsx.cisd.openbis.generic.client.web.client.application.AbstractAs
import ch.systemsx.cisd.openbis.generic.client.web.client.application.GenericConstants;
import ch.systemsx.cisd.openbis.generic.client.web.client.application.IViewContext;
import ch.systemsx.cisd.openbis.generic.client.web.client.application.ui.PropertyValueRenderers;
-import ch.systemsx.cisd.openbis.generic.client.web.client.application.ui.property.ObjectArrayPropertyValueRenderer;
import ch.systemsx.cisd.openbis.generic.client.web.client.application.ui.property.PropertyGrid;
import ch.systemsx.cisd.openbis.generic.client.web.client.application.util.IMessageProvider;
import ch.systemsx.cisd.openbis.generic.client.web.client.dto.Invalidation;
@@ -74,8 +73,7 @@ public final class ScreeningSampleViewer extends LayoutContainer
properties.put(messageProvider.getMessage("sample"), sample);
properties.put(messageProvider.getMessage("sample_type"), sampleType);
properties.put(messageProvider.getMessage(REGISTRATOR), sample.getRegistrator());
- properties.put(messageProvider.getMessage(REGISTRATION_DATE), sample
- .getRegistrationDate());
+ properties.put(messageProvider.getMessage(REGISTRATION_DATE), sample.getRegistrationDate());
if (generated.length > 0)
{
properties.put(messageProvider.getMessage("generated_samples"), generated);
@@ -87,7 +85,7 @@ public final class ScreeningSampleViewer extends LayoutContainer
Sample generatedFrom = sample.getGeneratedFrom();
for (int i = 0; i < sampleType.getGeneratedFromHierarchyDepth() && generatedFrom != null; i++)
{
- properties.put(generatedFrom.getSampleType().getDescription(), generatedFrom);
+ properties.put(messageProvider.getMessage("generated_from", i + 1), generatedFrom);
generatedFrom = generatedFrom.getGeneratedFrom();
}
for (final SampleProperty property : sample.getProperties())
@@ -108,12 +106,8 @@ public final class ScreeningSampleViewer extends LayoutContainer
.createPersonPropertyValueRenderer(messageProvider));
propertyGrid.registerPropertyValueRenderer(SampleType.class, PropertyValueRenderers
.createSampleTypePropertyValueRenderer(messageProvider));
- propertyGrid.registerPropertyValueRenderer(Sample[].class,
- new ObjectArrayPropertyValueRenderer<Sample>(messageProvider,
- PropertyValueRenderers.createSamplePropertyValueRenderer(messageProvider,
- true)));
propertyGrid.registerPropertyValueRenderer(Sample.class, PropertyValueRenderers
- .createSamplePropertyValueRenderer(messageProvider, false));
+ .createSamplePropertyValueRenderer(messageProvider, true));
propertyGrid.registerPropertyValueRenderer(Invalidation.class, PropertyValueRenderers
.createInvalidationPropertyValueRenderer(messageProvider));
propertyGrid.registerPropertyValueRenderer(SampleProperty.class, PropertyValueRenderers
--
GitLab