diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/Dict.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/Dict.java
index 56fe063e06aa86f0a4447c6da96d75bfd0ebb222..76802ff98516a99a1ebbbbb527d67daa7239fc2f 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/Dict.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/Dict.java
@@ -459,6 +459,8 @@ public abstract class Dict
public static final String INCORRECT_MATERIAL_SYNTAX = "incorrect_material_syntax";
+ public static final String TITLE_CHOOSE_EXPERIMENT = "TITLE_CHOOSE_EXPERIMENT";
+
//
// Unclassified
//
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/field/EntityChooserDialog.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/field/EntityChooserDialog.java
index b9c0ba809df2e232a18f9d549422e2b5ebd058ca..baad0634b45565f5758b5fbd6490d611dd4e451c 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/field/EntityChooserDialog.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/field/EntityChooserDialog.java
@@ -52,10 +52,10 @@ class EntityChooserDialog<T> extends SimpleDialog
}
public EntityChooserDialog(DisposableEntityChooser<T> entityBrowser,
- ChosenEntitySetter<T> chosenEntitySetter, IMessageProvider messageProvider)
+ ChosenEntitySetter<T> chosenEntitySetter, String title, IMessageProvider messageProvider)
{
- super(entityBrowser.getComponent(), messageProvider.getMessage(Dict.TITLE_CHOOSE_MATERIAL),
- messageProvider.getMessage(Dict.BUTTON_CHOOSE), messageProvider);
+ super(entityBrowser.getComponent(), title, messageProvider.getMessage(Dict.BUTTON_CHOOSE),
+ messageProvider);
this.entityBrowser = entityBrowser;
this.onAcceptAction = createAcceptAction(chosenEntitySetter, entityBrowser);
this.onCancelAction = createCancelAction(chosenEntitySetter, entityBrowser);
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/field/ExperimentChooserField.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/field/ExperimentChooserField.java
index 57081ee76b13bc491315c8cca53ee0d624c7db4f..4fbece5055d1e9373f17c112833686039056faf7 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/field/ExperimentChooserField.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/field/ExperimentChooserField.java
@@ -32,7 +32,6 @@ import ch.systemsx.cisd.openbis.generic.client.web.client.application.ui.experim
import ch.systemsx.cisd.openbis.generic.client.web.client.application.ui.field.EntityChooserDialog.ChosenEntitySetter;
import ch.systemsx.cisd.openbis.generic.client.web.client.application.ui.grid.DisposableEntityChooser;
import ch.systemsx.cisd.openbis.generic.client.web.client.application.ui.widget.FieldUtil;
-import ch.systemsx.cisd.openbis.generic.client.web.client.application.util.IMessageProvider;
import ch.systemsx.cisd.openbis.generic.client.web.client.dto.Experiment;
import ch.systemsx.cisd.openbis.generic.client.web.client.dto.ExperimentIdentifier;
import ch.systemsx.cisd.openbis.generic.client.web.client.dto.Group;
@@ -111,7 +110,9 @@ public final class ExperimentChooserField extends TextField<String> implements
{
DisposableEntityChooser<Experiment> browser =
ExperimentBrowserGrid.createChooser(viewContext, group);
- new EntityChooserDialog<Experiment>(browser, chosenMaterialField, viewContext).show();
+ String title = viewContext.getMessage(Dict.TITLE_CHOOSE_EXPERIMENT);
+ new EntityChooserDialog<Experiment>(browser, chosenMaterialField, title, viewContext)
+ .show();
}
// ------------------
@@ -163,18 +164,10 @@ public final class ExperimentChooserField extends TextField<String> implements
if (initialValueOrNull != null)
{
setValue(initialValueOrNull);
- } else
- {
- setEmptyText(createEmptyText(viewContext));
}
FieldUtil.setMandatoryFlag(this, mandatory);
}
- private static String createEmptyText(IMessageProvider messageProvider)
- {
- return messageProvider.getMessage(Dict.BUTTON_CHOOSE, "an experiment");
- }
-
@Override
protected boolean validateValue(String val)
{
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/field/MaterialChooserField.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/field/MaterialChooserField.java
index 909160a0820754932c6b04624045831e45bb46cb..75361f73bf2fc280d1fef08052e58a7d364617ea 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/field/MaterialChooserField.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/field/MaterialChooserField.java
@@ -32,7 +32,6 @@ import ch.systemsx.cisd.openbis.generic.client.web.client.application.ui.field.E
import ch.systemsx.cisd.openbis.generic.client.web.client.application.ui.grid.DisposableEntityChooser;
import ch.systemsx.cisd.openbis.generic.client.web.client.application.ui.material.MaterialBrowserGrid;
import ch.systemsx.cisd.openbis.generic.client.web.client.application.ui.widget.FieldUtil;
-import ch.systemsx.cisd.openbis.generic.client.web.client.application.util.IMessageProvider;
import ch.systemsx.cisd.openbis.generic.client.web.client.dto.Material;
import ch.systemsx.cisd.openbis.generic.shared.basic.dto.MaterialIdentifier;
import ch.systemsx.cisd.openbis.generic.shared.basic.dto.MaterialType;
@@ -71,7 +70,9 @@ public final class MaterialChooserField extends TextField<String> implements
{
DisposableEntityChooser<Material> materialBrowser =
MaterialBrowserGrid.create(viewContext, materialTypeOrNull);
- new EntityChooserDialog<Material>(materialBrowser, chosenMaterialField, viewContext).show();
+ String title = viewContext.getMessage(Dict.TITLE_CHOOSE_MATERIAL);
+ new EntityChooserDialog<Material>(materialBrowser, chosenMaterialField, title, viewContext)
+ .show();
}
// ------------------
@@ -112,25 +113,10 @@ public final class MaterialChooserField extends TextField<String> implements
if (initialValueOrNull != null)
{
setValue(initialValueOrNull);
- } else
- {
- setEmptyText(createEmptyText(materialTypeOrNull, viewContext));
}
FieldUtil.setMandatoryFlag(this, mandatory);
}
- private static String createEmptyText(MaterialType materialTypeOrNull,
- IMessageProvider messageProvider)
- {
- if (materialTypeOrNull == null)
- {
- return messageProvider.getMessage(Dict.CHOOSE_ANY_MATERIAL);
- } else
- {
- return messageProvider.getMessage(Dict.COMBO_BOX_CHOOSE, materialTypeOrNull.getCode());
- }
- }
-
@Override
protected boolean validateValue(String val)
{
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/public/common-dictionary.js b/openbis/source/java/ch/systemsx/cisd/openbis/public/common-dictionary.js
index 2f43f440bc142492c07ae33c9b8f4210a1150eed..204534a0113a06b4449a1aaa960a8c3aee066dba 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/public/common-dictionary.js
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/public/common-dictionary.js
@@ -302,6 +302,7 @@ var common = {
title_choose_material: "Choose a Material",
choose_any_material: "Choose Any Material...",
incorrect_material_syntax: "Incorrect material specification. Please provide the material code followed by the type in brackets: 'code (type)'.",
+ TITLE_CHOOSE_EXPERIMENT: "Choose an Experiment",
// LAST LINE: KEEP IT AT THE END
lastline: "" // we need a line without a comma